ports/openmpi
ports/openmpi
1
1
Fork 0
Code Releases Activity

Update ORTE frameworks to use the MCA framework system.

Browse Source 
This commit was SVN r28240.
This commit is contained in:
Nathan Hjelm 2013-03-27 21:14:43 +00:00
parent 365cf48db5
commit c041156f60
203 changed files with 2018 additions and 3385 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -1,4 +1,7 @@
# Automatically generated by build-gitignore.pl; edits may be lost!
ompi/include/ompi/frameworks.h
opal/include/opal/frameworks.h
orte/include/orte/frameworks.h
.libs
.deps
.libs

3
ompi/mca/allocator/base/Makefile.am
View File

@ -20,5 +20,4 @@ headers += \
base/base.h
libmca_allocator_la_SOURCES += \
base/allocator_base_open.c \
base/allocator_base_close.c
base/allocator_base_frame.c

1
opal/mca/base/mca_base_framework.c
View File

@ -12,6 +12,7 @@
#include "opal/include/opal_config.h"
#include "opal/include/opal/constants.h"
#include "opal/util/output.h"
#include "mca_base_framework.h"
#include "mca_base_var.h"

60
orte/mca/dfs/app/dfs_app.c
View File

@ -153,7 +153,7 @@ static void recv_dfs(int status, orte_process_name_t* sender,
return;
}
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s recvd cmd %d from sender %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), (int)cmd,
ORTE_NAME_PRINT(sender));
@ -186,7 +186,7 @@ static void recv_dfs(int status, orte_process_name_t* sender,
}
}
if (NULL == dfs) {
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s recvd open file - no corresponding request found for local fd %d",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), local_fd);
ORTE_ERROR_LOG(ORTE_ERR_NOT_FOUND);
@ -197,7 +197,7 @@ static void recv_dfs(int status, orte_process_name_t* sender,
* the error value to the caller
*/
if (remote_fd < 0) {
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s recvd open file response error file %s [error: %d]",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
dfs->uri, remote_fd);
@ -227,7 +227,7 @@ static void recv_dfs(int status, orte_process_name_t* sender,
/* return the local_fd to the caller for
* subsequent operations
*/
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s recvd open file completed for file %s [local fd: %d remote fd: %d]",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
dfs->uri, trk->local_fd, remote_fd);
@ -259,7 +259,7 @@ static void recv_dfs(int status, orte_process_name_t* sender,
}
}
if (NULL == dfs) {
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s recvd size - no corresponding request found for local fd %d",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), local_fd);
ORTE_ERROR_LOG(ORTE_ERR_NOT_FOUND);
@ -301,7 +301,7 @@ static void recv_dfs(int status, orte_process_name_t* sender,
}
}
if (NULL == dfs) {
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s recvd seek - no corresponding request found for local fd %d",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), local_fd);
ORTE_ERROR_LOG(ORTE_ERR_NOT_FOUND);
@ -343,7 +343,7 @@ static void recv_dfs(int status, orte_process_name_t* sender,
}
}
if (NULL == dfs) {
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s recvd read - no corresponding request found for local fd %d",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), local_fd);
ORTE_ERROR_LOG(ORTE_ERR_NOT_FOUND);
@ -393,7 +393,7 @@ static void recv_dfs(int status, orte_process_name_t* sender,
}
}
if (NULL == dfs) {
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s recvd post - no corresponding request found",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME));
ORTE_ERROR_LOG(ORTE_ERR_NOT_FOUND);
@ -426,7 +426,7 @@ static void recv_dfs(int status, orte_process_name_t* sender,
}
}
if (NULL == dfs) {
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s recvd getfm - no corresponding request found",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME));
ORTE_ERROR_LOG(ORTE_ERR_NOT_FOUND);
@ -459,7 +459,7 @@ static void open_local_file(orte_dfs_request_t *dfs)
OBJ_RELEASE(dfs);
return;
}
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s opening local file %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
filename);
@ -488,7 +488,7 @@ static void open_local_file(orte_dfs_request_t *dfs)
/* the file is locally hosted */
trk->host_daemon.jobid = ORTE_PROC_MY_DAEMON->jobid;
trk->host_daemon.vpid = ORTE_PROC_MY_DAEMON->vpid;
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s local file %s mapped localfd %d to remotefd %d",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
filename, trk->local_fd, trk->remote_fd);
@ -541,7 +541,7 @@ static void process_opens(int fd, short args, void *cbdata)
if (0 == strcmp(host, orte_process_info.nodename) ||
0 == strcmp(host, "localhost") ||
opal_ifislocal(host)) {
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s file %s on local host",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
filename);
@ -554,7 +554,7 @@ static void process_opens(int fd, short args, void *cbdata)
/* ident the daemon on that host */
daemon.jobid = ORTE_PROC_MY_DAEMON->jobid;
/* fetch the daemon for this hostname */
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s looking for daemon on host %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), host);
v = &daemon.vpid;
@ -564,7 +564,7 @@ static void process_opens(int fd, short args, void *cbdata)
goto complete;
}
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s file %s on host %s daemon %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
filename, host, ORTE_NAME_PRINT(&daemon));
@ -573,7 +573,7 @@ static void process_opens(int fd, short args, void *cbdata)
* treat this as local
*/
if (daemon.vpid == ORTE_PROC_MY_DAEMON->vpid) {
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s local file %s on same daemon",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
filename);
@ -610,7 +610,7 @@ static void process_opens(int fd, short args, void *cbdata)
goto complete;
}
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s sending open file request to %s file %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
ORTE_NAME_PRINT(&daemon),
@ -649,7 +649,7 @@ static void dfs_open(char *uri,
{
orte_dfs_request_t *dfs;
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s opening file %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), uri);
@ -672,7 +672,7 @@ static void process_close(int fd, short args, void *cbdata)
opal_buffer_t *buffer;
int rc;
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s closing fd %d",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
close_dfs->local_fd);
@ -716,7 +716,7 @@ static void process_close(int fd, short args, void *cbdata)
goto complete;
}
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s sending close file request to %s for fd %d",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
ORTE_NAME_PRINT(&trk->host_daemon),
@ -745,7 +745,7 @@ static void dfs_close(int fd,
{
orte_dfs_request_t *dfs;
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s close called on fd %d",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), fd);
@ -768,7 +768,7 @@ static void process_sizes(int fd, short args, void *cbdata)
int rc;
struct stat buf;
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s processing get_size on fd %d",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
size_dfs->local_fd);
@ -797,7 +797,7 @@ static void process_sizes(int fd, short args, void *cbdata)
/* stat the file and get its size */
if (0 > stat(trk->filename, &buf)) {
/* cannot stat file */
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s could not stat %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
trk->filename);
@ -838,7 +838,7 @@ static void process_sizes(int fd, short args, void *cbdata)
goto complete;
}
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s sending get_size request to %s for fd %d",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
ORTE_NAME_PRINT(&trk->host_daemon),
@ -868,7 +868,7 @@ static void dfs_get_file_size(int fd,
{
orte_dfs_request_t *dfs;
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s get_size called on fd %d",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), fd);
@ -893,7 +893,7 @@ static void process_seeks(int fd, short args, void *cbdata)
int rc;
struct stat buf;
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s processing seek on fd %d",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
seek_dfs->local_fd);
@ -919,14 +919,14 @@ static void process_seeks(int fd, short args, void *cbdata)
* stuck the "whence" value in the remote_fd
*/
if (trk->host_daemon.vpid == ORTE_PROC_MY_DAEMON->vpid) {
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s local seek on fd %d",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
seek_dfs->local_fd);
/* stat the file and get its size */
if (0 > stat(trk->filename, &buf)) {
/* cannot stat file */
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s could not stat %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
trk->filename);
@ -992,7 +992,7 @@ static void process_seeks(int fd, short args, void *cbdata)
goto complete;
}
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s sending seek file request to %s for fd %d",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
ORTE_NAME_PRINT(&trk->host_daemon),
@ -1019,7 +1019,7 @@ static void dfs_seek(int fd, long offset, int whence,
{
orte_dfs_request_t *dfs;
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s seek called on fd %d",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), fd);
@ -1104,7 +1104,7 @@ static void process_reads(int fd, short args, void *cbdata)
goto complete;
}
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s sending read file request to %s for fd %d",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
ORTE_NAME_PRINT(&trk->host_daemon),

5
orte/mca/dfs/base/Makefile.am
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2012 Los Alamos National Security, LLC. All rights reserved.
# Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
@ -11,6 +11,5 @@ headers += \
base/base.h
libmca_dfs_la_SOURCES += \
base/dfs_base_close.c \
base/dfs_base_select.c \
base/dfs_base_open.c
base/dfs_base_frame.c

17
orte/mca/dfs/base/base.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012 Los Alamos National Security, Inc. All rights reserved.
* Copyright (c) 2012-2013 Los Alamos National Security, Inc. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -29,20 +29,11 @@
BEGIN_C_DECLS
/*
* MCA Framework functions
* MCA Framework
*/
ORTE_DECLSPEC int orte_dfs_base_open(void);
ORTE_DECLSPEC extern mca_base_framework_t orte_dfs_base_framework;
/* select a component */
ORTE_DECLSPEC int orte_dfs_base_select(void);
ORTE_DECLSPEC int orte_dfs_base_close(void);
/* define a struct to hold framework-global values */
typedef struct {
int output;
bool initialized;
opal_list_t components_available;
} orte_dfs_base_t;
ORTE_DECLSPEC extern orte_dfs_base_t orte_dfs_base;
/* tracker for active files */
typedef struct {

48
orte/mca/dfs/base/dfs_base_close.c
View File

@ -1,48 +0,0 @@
/*
* Copyright (c) 2012 Los Alamos National Security, Inc. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
*
* $HEADER$
*/
#include "orte_config.h"
#include "orte/constants.h"
#include <stdio.h>
#include "opal/mca/mca.h"
#include "opal/mca/base/base.h"
#include "orte/mca/dfs/dfs.h"
#include "orte/mca/dfs/base/base.h"
int orte_dfs_base_close(void)
{
/* if not initialized, then skip this action. */
if (!orte_dfs_base.initialized) {
return ORTE_SUCCESS;
}
/* Close selected component */
if (NULL != orte_dfs.finalize) {
orte_dfs.finalize();
}
/* Close all remaining available components (may be one if this is a
* OMPI RTE program, or [possibly] multiple if this is ompi_info)
*/
mca_base_components_close(orte_dfs_base.output,
&orte_dfs_base.components_available,
NULL);
/* Close the framework output */
opal_output_close (orte_dfs_base.output);
orte_dfs_base.output = -1;
orte_dfs_base.initialized = false;
return ORTE_SUCCESS;
}

46
orte/mca/dfs/base/dfs_base_open.c → orte/mca/dfs/base/dfs_base_frame.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012 Los Alamos National Security, Inc. All rights reserved.
* Copyright (c) 2012-2013 Los Alamos National Security, Inc. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -37,10 +37,6 @@
/*
* Globals
*/
opal_list_t orte_dfs_base_components_available;
orte_dfs_base_t orte_dfs_base;
orte_dfs_base_module_t orte_dfs = {
NULL,
NULL,
@ -55,36 +51,30 @@ orte_dfs_base_module_t orte_dfs = {
NULL
};
static int orte_dfs_base_close(void)
{
/* Close selected component */
if (NULL != orte_dfs.finalize) {
orte_dfs.finalize();
}
return mca_base_framework_components_close(&orte_dfs_base_framework, NULL);
}
/**
* Function for finding and opening either all MCA components, or the one
* that was specifically requested via a MCA parameter.
*/
int orte_dfs_base_open(void)
static int orte_dfs_base_open(mca_base_open_flag_t flags)
{
/* Only pass this way once */
if( orte_dfs_base.initialized ) {
return ORTE_SUCCESS;
}
orte_dfs_base.output = opal_output_open(NULL);
/*
* Open up all available components
*/
if (ORTE_SUCCESS !=
mca_base_components_open("dfs",
orte_dfs_base.output,
mca_dfs_base_static_components,
&orte_dfs_base.components_available,
true)) {
return ORTE_ERROR;
}
orte_dfs_base.initialized = true;
return ORTE_SUCCESS;
/* Open up all available components */
return mca_base_framework_components_open(&orte_dfs_base_framework, flags);
}
MCA_BASE_FRAMEWORK_DECLARE(orte, dfs, "ORTE Distributed File System",
NULL, orte_dfs_base_open, orte_dfs_base_close,
mca_dfs_base_static_components, 0);
/* instantiate classes */
static void trk_con(orte_dfs_tracker_t *trk)

4
orte/mca/dfs/base/dfs_base_select.c
View File

@ -30,8 +30,8 @@ int orte_dfs_base_select(void)
/*
* Select the best component
*/
if (OPAL_SUCCESS != mca_base_select("dfs", orte_dfs_base.output,
&orte_dfs_base.components_available,
if (OPAL_SUCCESS != mca_base_select("dfs", orte_dfs_base_framework.framework_output,
&orte_dfs_base_framework.framework_components,
(mca_base_module_t **) &best_module,
(mca_base_component_t **) &best_component)) {
/* This will only happen if no component was selected, which

110
orte/mca/dfs/orted/dfs_orted.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012 Los Alamos National Security, LLC.
* Copyright (c) 2012-2013 Los Alamos National Security, LLC.
* All rights reserved.
* $COPYRIGHT$
*
@ -149,7 +149,7 @@ OBJ_CLASS_INSTANCE(worker_req_t,
do { \
worker_thread_t *wt; \
wt = (worker_thread_t*)opal_pointer_array_get_item(&worker_threads, wt_cntr); \
opal_output_verbose(1, orte_dfs_base.output, \
opal_output_verbose(1, orte_dfs_base_framework.framework_output, \
"%s assigning req to worker thread %d", \
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), \
wt->idx); \
@ -207,7 +207,7 @@ static int init(void)
return rc;
}
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s starting %d worker threads",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
orte_dfs_orted_num_worker_threads);
@ -263,7 +263,7 @@ static void open_local_file(orte_dfs_request_t *dfs)
}
return;
}
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s opening local file %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
filename);
@ -289,7 +289,7 @@ static void open_local_file(orte_dfs_request_t *dfs)
/* the file is locally hosted */
trk->host_daemon.jobid = ORTE_PROC_MY_DAEMON->jobid;
trk->host_daemon.vpid = ORTE_PROC_MY_DAEMON->vpid;
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s local file %s mapped localfd %d to remotefd %d",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
filename, trk->local_fd, trk->remote_fd);
@ -339,7 +339,7 @@ static void process_opens(int fd, short args, void *cbdata)
0 == strcmp(host, orte_process_info.nodename) ||
0 == strcmp(host, "localhost") ||
opal_ifislocal(host)) {
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s file %s on local host",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
filename);
@ -365,7 +365,7 @@ static void process_opens(int fd, short args, void *cbdata)
ORTE_ERROR_LOG(ORTE_ERR_NOT_FOUND);
goto complete;
}
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s file %s on host %s daemon %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
filename, host, ORTE_NAME_PRINT(&node->daemon->name));
@ -373,7 +373,7 @@ static void process_opens(int fd, short args, void *cbdata)
* treat this as local
*/
if (node->daemon->name.vpid == ORTE_PROC_MY_DAEMON->vpid) {
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s local file %s on same daemon",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
filename);
@ -407,7 +407,7 @@ static void process_opens(int fd, short args, void *cbdata)
goto complete;
}
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s sending open file request to %s file %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
ORTE_NAME_PRINT(&node->daemon->name),
@ -440,7 +440,7 @@ static void dfs_open(char *uri,
{
orte_dfs_request_t *dfs;
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s opening file %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), uri);
@ -463,7 +463,7 @@ static void process_close(int fd, short args, void *cbdata)
opal_buffer_t *buffer;
int rc;
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s closing fd %d",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
close_dfs->local_fd);
@ -507,7 +507,7 @@ static void process_close(int fd, short args, void *cbdata)
goto complete;
}
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s sending close file request to %s for fd %d",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
ORTE_NAME_PRINT(&trk->host_daemon),
@ -536,7 +536,7 @@ static void dfs_close(int fd,
{
orte_dfs_request_t *dfs;
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s close called on fd %d",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), fd);
@ -559,7 +559,7 @@ static void process_sizes(int fd, short args, void *cbdata)
int rc;
struct stat buf;
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s processing get_size on fd %d",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
size_dfs->local_fd);
@ -588,7 +588,7 @@ static void process_sizes(int fd, short args, void *cbdata)
/* stat the file and get its size */
if (0 > stat(trk->filename, &buf)) {
/* cannot stat file */
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s could not stat %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
trk->filename);
@ -612,7 +612,7 @@ static void process_sizes(int fd, short args, void *cbdata)
goto complete;
}
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s sending get_size request to %s for fd %d",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
ORTE_NAME_PRINT(&trk->host_daemon),
@ -639,7 +639,7 @@ static void dfs_get_file_size(int fd,
{
orte_dfs_request_t *dfs;
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s get_size called on fd %d",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), fd);
@ -664,7 +664,7 @@ static void process_seeks(int fd, short args, void *cbdata)
int rc;
struct stat buf;
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s processing seek on fd %d",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
seek_dfs->local_fd);
@ -690,14 +690,14 @@ static void process_seeks(int fd, short args, void *cbdata)
* stuck the "whence" value in the remote_fd
*/
if (trk->host_daemon.vpid == ORTE_PROC_MY_DAEMON->vpid) {
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s local seek on fd %d",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
seek_dfs->local_fd);
/* stat the file and get its size */
if (0 > stat(trk->filename, &buf)) {
/* cannot stat file */
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s could not stat %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
trk->filename);
@ -760,7 +760,7 @@ static void process_seeks(int fd, short args, void *cbdata)
goto complete;
}
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s sending seek file request to %s for fd %d",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
ORTE_NAME_PRINT(&trk->host_daemon),
@ -785,7 +785,7 @@ static void dfs_seek(int fd, long offset, int whence,
{
orte_dfs_request_t *dfs;
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s seek called on fd %d",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), fd);
@ -870,7 +870,7 @@ static void process_reads(int fd, short args, void *cbdata)
goto complete;
}
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s sending read file request to %s for fd %d",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
ORTE_NAME_PRINT(&trk->host_daemon),
@ -918,7 +918,7 @@ static void process_posts(int fd, short args, void *cbdata)
opal_list_item_t *item;
int rc;
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s posting file map containing %d bytes for target %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
(int)dfs->bptr->bytes_used, ORTE_NAME_PRINT(&dfs->target));
@ -964,7 +964,7 @@ static void process_posts(int fd, short args, void *cbdata)
goto cleanup;
}
vfm->num_entries++;
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s target %s now has %d entries",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
ORTE_NAME_PRINT(&dfs->target),
@ -1090,7 +1090,7 @@ static void dfs_get_file_map(orte_process_name_t *target,
{
orte_dfs_request_t *dfs;
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s get file map for %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
ORTE_NAME_PRINT(target));
@ -1147,7 +1147,7 @@ static void process_load(int fd, short args, void *cbdata)
goto complete;
}
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s loading file maps from %d vpids",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), nvpids);
@ -1165,7 +1165,7 @@ static void process_load(int fd, short args, void *cbdata)
ORTE_ERROR_LOG(rc);
goto complete;
}
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s loading %d entries in file map for vpid %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
entries, ORTE_VPID_PRINT(vpid));
@ -1203,7 +1203,7 @@ static void dfs_load_file_maps(orte_jobid_t jobid,
{
orte_dfs_request_t *dfs;
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s loading file maps for %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
ORTE_JOBID_PRINT(jobid));
@ -1259,7 +1259,7 @@ static void dfs_purge_file_maps(orte_jobid_t jobid,
{
orte_dfs_request_t *dfs;
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s purging file maps for job %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
ORTE_JOBID_PRINT(jobid));
@ -1312,7 +1312,7 @@ static void recv_dfs_cmd(int status, orte_process_name_t* sender,
return;
}
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s received command %d from %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), (int)cmd,
ORTE_NAME_PRINT(sender));
@ -1348,7 +1348,7 @@ static void recv_dfs_cmd(int status, orte_process_name_t* sender,
return;
}
/* no worker threads, so attempt to open the file */
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s opening file %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
filename);
@ -1436,7 +1436,7 @@ static void recv_dfs_cmd(int status, orte_process_name_t* sender,
/* no worker threads, so stat the file and get its size */
if (0 > stat(trk->filename, &buf)) {
/* cannot stat file */
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s could not stat %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
trk->filename);
@ -1518,13 +1518,13 @@ static void recv_dfs_cmd(int status, orte_process_name_t* sender,
/* no worker threads, so stat the file and get its size */
if (0 > stat(trk->filename, &buf)) {
/* cannot stat file */
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s seek could not stat %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
trk->filename);
} else if (buf.st_size < i64 && SEEK_SET == whence) {
/* seek would take us past EOF */
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s seek SET past EOF on file %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
trk->filename);
@ -1532,7 +1532,7 @@ static void recv_dfs_cmd(int status, orte_process_name_t* sender,
} else if (buf.st_size < (off_t)(trk->location + i64) &&
SEEK_CUR == whence) {
/* seek would take us past EOF */
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s seek CUR past EOF on file %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
trk->filename);
@ -1565,7 +1565,7 @@ static void recv_dfs_cmd(int status, orte_process_name_t* sender,
return;
}
/* send it */
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s sending %ld offset back to %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
(long)bytes_read,
@ -1620,7 +1620,7 @@ static void recv_dfs_cmd(int status, orte_process_name_t* sender,
ORTE_DFS_POST_WORKER(wrkr, remote_read);
return;
} else {
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s reading %ld bytes from local fd %d",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
(long)i64, my_fd);
@ -1659,7 +1659,7 @@ static void recv_dfs_cmd(int status, orte_process_name_t* sender,
}
}
/* send it */
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s sending %ld bytes back to %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
(long)bytes_read,
@ -1677,7 +1677,7 @@ static void recv_dfs_cmd(int status, orte_process_name_t* sender,
break;
case ORTE_DFS_POST_CMD:
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s received post command from %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
ORTE_NAME_PRINT(sender));
@ -1735,7 +1735,7 @@ static void recv_dfs_cmd(int status, orte_process_name_t* sender,
ORTE_ERROR_LOG(rc);
return;
}
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s received relayed posts from sender %s for source %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
ORTE_NAME_PRINT(sender),
@ -1884,7 +1884,7 @@ static void recv_dfs_cmd(int status, orte_process_name_t* sender,
}
}
OBJ_DESTRUCT(&bucket);
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s getf-cmd: returning %d maps with %d bytes to sender %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), nmaps,
(int)answer->bytes_used, ORTE_NAME_PRINT(sender));
@ -1922,7 +1922,7 @@ static void recv_dfs_data(int status, orte_process_name_t* sender,
return;
}
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s recvd:data cmd %d from sender %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), (int)cmd,
ORTE_NAME_PRINT(sender));
@ -1955,7 +1955,7 @@ static void recv_dfs_data(int status, orte_process_name_t* sender,
}
}
if (NULL == dfs) {
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s recvd:data open file - no corresponding request found for local fd %d",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), local_fd);
ORTE_ERROR_LOG(ORTE_ERR_NOT_FOUND);
@ -1966,7 +1966,7 @@ static void recv_dfs_data(int status, orte_process_name_t* sender,
* the error value to the caller
*/
if (remote_fd < 0) {
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s recvd:data open file response error file %s [error: %d]",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
dfs->uri, remote_fd);
@ -1993,7 +1993,7 @@ static void recv_dfs_data(int status, orte_process_name_t* sender,
/* return the local_fd to the caller for
* subsequent operations
*/
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s recvd:data open file completed for file %s [local fd: %d remote fd: %d]",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
dfs->uri, trk->local_fd, remote_fd);
@ -2025,7 +2025,7 @@ static void recv_dfs_data(int status, orte_process_name_t* sender,
}
}
if (NULL == dfs) {
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s recvd:data size - no corresponding request found for local fd %d",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), local_fd);
ORTE_ERROR_LOG(ORTE_ERR_NOT_FOUND);
@ -2067,7 +2067,7 @@ static void recv_dfs_data(int status, orte_process_name_t* sender,
}
}
if (NULL == dfs) {
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s recvd:data read - no corresponding request found for local fd %d",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), local_fd);
ORTE_ERROR_LOG(ORTE_ERR_NOT_FOUND);
@ -2121,7 +2121,7 @@ static void remote_open(int fd, short args, void *cbdata)
int rc;
/* attempt to open the file */
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s opening file %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
req->trk->filename);
@ -2162,7 +2162,7 @@ static void remote_size(int fd, short args, void *cbdata)
if (0 > stat(req->trk->filename, &buf)) {
/* cannot stat file */
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s could not stat %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
req->trk->filename);
@ -2204,13 +2204,13 @@ static void remote_seek(int fd, short args, void *cbdata)
/* stat the file and get its size */
if (0 > stat(req->trk->filename, &buf)) {
/* cannot stat file */
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s seek could not stat %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
req->trk->filename);
} else if (buf.st_size < req->nbytes && SEEK_SET == req->whence) {
/* seek would take us past EOF */
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s seek SET past EOF on file %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
req->trk->filename);
@ -2218,7 +2218,7 @@ static void remote_seek(int fd, short args, void *cbdata)
} else if (buf.st_size < (off_t)(req->trk->location + req->nbytes) &&
SEEK_CUR == req->whence) {
/* seek would take us past EOF */
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s seek CUR past EOF on file %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
req->trk->filename);
@ -2266,7 +2266,7 @@ static void remote_read(int fd, short args, void *cbdata)
int rc;
/* do the read */
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s issuing read",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME));
read_buf = (uint8_t*)malloc(req->nbytes);
@ -2298,7 +2298,7 @@ static void remote_read(int fd, short args, void *cbdata)
}
}
/* send it */
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s sending %ld bytes back to %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
(long)bytes_read,

44
orte/mca/dfs/test/dfs_test.c
View File

@ -153,7 +153,7 @@ static void recv_dfs(int status, orte_process_name_t* sender,
return;
}
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s recvd cmd %d from sender %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), (int)cmd,
ORTE_NAME_PRINT(sender));
@ -186,7 +186,7 @@ static void recv_dfs(int status, orte_process_name_t* sender,
}
}
if (NULL == dfs) {
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s recvd open file - no corresponding request found for local fd %d",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), local_fd);
ORTE_ERROR_LOG(ORTE_ERR_NOT_FOUND);
@ -197,7 +197,7 @@ static void recv_dfs(int status, orte_process_name_t* sender,
* the error value to the caller
*/
if (remote_fd < 0) {
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s recvd open file response error file %s [error: %d]",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
dfs->uri, remote_fd);
@ -224,7 +224,7 @@ static void recv_dfs(int status, orte_process_name_t* sender,
/* return the local_fd to the caller for
* subsequent operations
*/
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s recvd open file completed for file %s [local fd: %d remote fd: %d]",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
dfs->uri, trk->local_fd, remote_fd);
@ -256,7 +256,7 @@ static void recv_dfs(int status, orte_process_name_t* sender,
}
}
if (NULL == dfs) {
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s recvd size - no corresponding request found for local fd %d",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), local_fd);
ORTE_ERROR_LOG(ORTE_ERR_NOT_FOUND);
@ -298,7 +298,7 @@ static void recv_dfs(int status, orte_process_name_t* sender,
}
}
if (NULL == dfs) {
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s recvd seek - no corresponding request found for local fd %d",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), local_fd);
ORTE_ERROR_LOG(ORTE_ERR_NOT_FOUND);
@ -340,7 +340,7 @@ static void recv_dfs(int status, orte_process_name_t* sender,
}
}
if (NULL == dfs) {
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s recvd read - no corresponding request found for local fd %d",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), local_fd);
ORTE_ERROR_LOG(ORTE_ERR_NOT_FOUND);
@ -390,7 +390,7 @@ static void recv_dfs(int status, orte_process_name_t* sender,
}
}
if (NULL == dfs) {
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s recvd post - no corresponding request found",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME));
ORTE_ERROR_LOG(ORTE_ERR_NOT_FOUND);
@ -423,7 +423,7 @@ static void recv_dfs(int status, orte_process_name_t* sender,
}
}
if (NULL == dfs) {
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s recvd getfm - no corresponding request found",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME));
ORTE_ERROR_LOG(ORTE_ERR_NOT_FOUND);
@ -498,7 +498,7 @@ static void process_opens(int fd, short args, void *cbdata)
ORTE_ERROR_LOG(ORTE_ERR_NOT_FOUND);
goto complete;
}
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s file %s on host %s daemon %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
filename, host, ORTE_NAME_PRINT(&daemon));
@ -530,7 +530,7 @@ static void process_opens(int fd, short args, void *cbdata)
goto complete;
}
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s sending open file request to %s file %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
ORTE_NAME_PRINT(&daemon),
@ -569,7 +569,7 @@ static void dfs_open(char *uri,
{
orte_dfs_request_t *dfs;
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s opening file %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), uri);
@ -592,7 +592,7 @@ static void process_close(int fd, short args, void *cbdata)
opal_buffer_t *buffer;
int rc;
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s closing fd %d",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
close_dfs->local_fd);
@ -630,7 +630,7 @@ static void process_close(int fd, short args, void *cbdata)
goto complete;
}
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s sending close file request to %s for fd %d",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
ORTE_NAME_PRINT(&trk->host_daemon),
@ -659,7 +659,7 @@ static void dfs_close(int fd,
{
orte_dfs_request_t *dfs;
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s close called on fd %d",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), fd);
@ -681,7 +681,7 @@ static void process_sizes(int fd, short args, void *cbdata)
opal_buffer_t *buffer;
int rc;
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s processing get_size on fd %d",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
size_dfs->local_fd);
@ -730,7 +730,7 @@ static void process_sizes(int fd, short args, void *cbdata)
goto complete;
}
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s sending get_size request to %s for fd %d",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
ORTE_NAME_PRINT(&trk->host_daemon),
@ -760,7 +760,7 @@ static void dfs_get_file_size(int fd,
{
orte_dfs_request_t *dfs;
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,
"%s get_size called on fd %d",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), fd);
@ -784,7 +784,7 @@ static void process_seeks(int fd, short args, void *cbdata)
int64_t i64;
int rc;
opal_output_verbose(1, orte_dfs_base.output,
opal_output_verbose(1, orte_dfs_base_framework.framework_output,