Permalink
Browse files

Update ORTE frameworks to use the MCA framework system.

  • Loading branch information...
1 parent e44d6aa commit 73e621b3684b1cbaee56a65b46a855af8ca76808 @rhc54 rhc54 committed with Mar 5, 2013
Showing with 1,992 additions and 3,359 deletions.
  1. +3 −0 .gitignore
  2. +1 −2 ompi/mca/allocator/base/Makefile.am
  3. +1 −0 opal/mca/base/mca_base_framework.c
  4. +30 −30 orte/mca/dfs/app/dfs_app.c
  5. +2 −3 orte/mca/dfs/base/Makefile.am
  6. +4 −13 orte/mca/dfs/base/base.h
  7. +0 −48 orte/mca/dfs/base/dfs_base_close.c
  8. +18 −28 orte/mca/dfs/base/{dfs_base_open.c → dfs_base_frame.c}
  9. +2 −2 orte/mca/dfs/base/dfs_base_select.c
  10. +55 −55 orte/mca/dfs/orted/dfs_orted.c
  11. +22 −22 orte/mca/dfs/test/dfs_test.c
  12. +2 −2 orte/mca/errmgr/base/Makefile.am
  13. +4 −13 orte/mca/errmgr/base/base.h
  14. +0 −64 orte/mca/errmgr/base/errmgr_base_close.c
  15. +1 −1 orte/mca/errmgr/base/errmgr_base_fns.c
  16. +23 −33 orte/mca/errmgr/base/{errmgr_base_open.c → errmgr_base_frame.c}
  17. +3 −3 orte/mca/errmgr/base/errmgr_base_select.c
  18. +12 −12 orte/mca/errmgr/base/errmgr_base_tool.c
  19. +3 −3 orte/mca/errmgr/default_app/errmgr_default_app.c
  20. +21 −21 orte/mca/errmgr/default_hnp/errmgr_default_hnp.c
  21. +13 −13 orte/mca/errmgr/default_orted/errmgr_default_orted.c
  22. +4 −4 orte/mca/ess/alps/ess_alps_module.c
  23. +2 −2 orte/mca/ess/base/Makefile.am
  24. +2 −19 orte/mca/ess/base/base.h
  25. +0 −51 orte/mca/ess/base/ess_base_close.c
  26. +9 −9 orte/mca/ess/base/ess_base_fns.c
  27. +12 −20 orte/mca/ess/base/{ess_base_open.c → ess_base_frame.c}
  28. +2 −4 orte/mca/ess/base/ess_base_select.c
  29. +31 −19 orte/mca/ess/base/ess_base_std_app.c
  30. +43 −24 orte/mca/ess/base/ess_base_std_orted.c
  31. +12 −12 orte/mca/ess/base/ess_base_std_tool.c
  32. +5 −5 orte/mca/ess/env/ess_env_module.c
  33. +49 −32 orte/mca/ess/hnp/ess_hnp_module.c
  34. +1 −1 orte/mca/ess/lsf/ess_lsf_module.c
  35. +2 −2 orte/mca/ess/singleton/ess_singleton_module.c
  36. +3 −3 orte/mca/ess/slurm/ess_slurm_module.c
  37. +2 −2 orte/mca/ess/tm/ess_tm_module.c
  38. +1 −2 orte/mca/filem/base/Makefile.am
  39. +8 −36 orte/mca/filem/base/base.h
  40. +0 −45 orte/mca/filem/base/filem_base_close.c
  41. +17 −19 orte/mca/filem/base/{filem_base_open.c → filem_base_frame.c}
  42. +6 −6 orte/mca/filem/base/filem_base_receive.c
  43. +2 −3 orte/mca/filem/base/filem_base_select.c
  44. +39 −39 orte/mca/filem/raw/filem_raw_module.c
  45. +5 −5 orte/mca/filem/rsh/filem_rsh_component.c
  46. +53 −53 orte/mca/filem/rsh/filem_rsh_module.c
  47. +8 −8 orte/mca/grpcomm/bad/grpcomm_bad_module.c
  48. +2 −3 orte/mca/grpcomm/base/Makefile.am
  49. +7 −8 orte/mca/grpcomm/base/base.h
  50. +0 −58 orte/mca/grpcomm/base/grpcomm_base_close.c
  51. +22 −13 orte/mca/grpcomm/base/{grpcomm_base_open.c → grpcomm_base_frame.c}
  52. +4 −4 orte/mca/grpcomm/base/grpcomm_base_select.c
  53. +5 −5 orte/mca/grpcomm/hier/grpcomm_hier_module.c
  54. +5 −5 orte/mca/grpcomm/pmi/grpcomm_pmi_module.c
  55. +1 −2 orte/mca/iof/base/Makefile.am
  56. +10 −7 orte/mca/iof/base/base.h
  57. +0 −51 orte/mca/iof/base/iof_base_close.c
  58. +23 −22 orte/mca/iof/base/{iof_base_open.c → iof_base_frame.c}
  59. +4 −4 orte/mca/iof/base/iof_base_output.c
  60. +2 −2 orte/mca/iof/base/iof_base_select.c
  61. +15 −15 orte/mca/iof/hnp/iof_hnp.c
  62. +6 −6 orte/mca/iof/hnp/iof_hnp_read.c
  63. +4 −4 orte/mca/iof/hnp/iof_hnp_receive.c
  64. +13 −13 orte/mca/iof/mr_hnp/iof_mrhnp.c
  65. +7 −7 orte/mca/iof/mr_hnp/iof_mrhnp_read.c
  66. +1 −1 orte/mca/iof/mr_hnp/iof_mrhnp_receive.c
  67. +9 −9 orte/mca/iof/mr_orted/iof_mrorted.c
  68. +4 −4 orte/mca/iof/mr_orted/iof_mrorted_read.c
  69. +3 −3 orte/mca/iof/mr_orted/iof_mrorted_receive.c
  70. +9 −9 orte/mca/iof/orted/iof_orted.c
  71. +3 −3 orte/mca/iof/orted/iof_orted_read.c
  72. +3 −3 orte/mca/iof/orted/iof_orted_receive.c
  73. +2 −2 orte/mca/iof/tool/iof_tool.c
  74. +2 −2 orte/mca/iof/tool/iof_tool_receive.c
  75. +2 −3 orte/mca/odls/base/Makefile.am
  76. +4 −35 orte/mca/odls/base/base.h
  77. +0 −68 orte/mca/odls/base/odls_base_close.c
  78. +57 −57 orte/mca/odls/base/odls_base_default_fns.c
  79. +31 −28 orte/mca/odls/base/{odls_base_open.c → odls_base_frame.c}
  80. +2 −10 orte/mca/odls/base/odls_base_select.c
  81. +9 −9 orte/mca/odls/default/odls_default_module.c
  82. +2 −2 orte/mca/oob/base/Makefile.am
  83. +2 −42 orte/mca/oob/base/base.h
  84. +0 −70 orte/mca/oob/base/oob_base_close.c
  85. +14 −33 orte/mca/oob/base/{oob_base_open.c → oob_base_frame.c}
  86. +21 −48 orte/mca/oob/base/oob_base_init.c
  87. +3 −3 orte/mca/plm/alps/plm_alps_module.c
  88. +1 −2 orte/mca/plm/base/Makefile.am
  89. +4 −33 orte/mca/plm/base/base.h
  90. +0 −72 orte/mca/plm/base/plm_base_close.c
  91. +30 −29 orte/mca/plm/base/{plm_base_open.c → plm_base_frame.c}
  92. +2 −2 orte/mca/plm/base/plm_base_jobid.c
  93. +31 −31 orte/mca/plm/base/plm_base_launch_support.c
  94. +5 −5 orte/mca/plm/base/plm_base_orted_cmds.c
  95. +2 −2 orte/mca/plm/base/plm_base_proxy.c
  96. +11 −11 orte/mca/plm/base/plm_base_receive.c
  97. +5 −5 orte/mca/plm/base/plm_base_select.c
  98. +3 −3 orte/mca/plm/base/plm_private.h
  99. +1 −1 orte/mca/plm/lsf/plm_lsf_component.c
  100. +4 −4 orte/mca/plm/lsf/plm_lsf_module.c
  101. +4 −5 orte/mca/plm/rsh/plm_rsh_component.c
  102. +31 −31 orte/mca/plm/rsh/plm_rsh_module.c
  103. +1 −1 orte/mca/plm/slurm/plm_slurm_component.c
  104. +13 −13 orte/mca/plm/slurm/plm_slurm_module.c
  105. +10 −10 orte/mca/plm/tm/plm_tm_module.c
  106. +3 −3 orte/mca/ras/alps/ras_alps_component.c
  107. +19 −19 orte/mca/ras/alps/ras_alps_module.c
  108. +1 −2 orte/mca/ras/base/Makefile.am
  109. +6 −10 orte/mca/ras/base/base.h
  110. +12 −12 orte/mca/ras/base/ras_base_allocate.c
  111. +3 −3 orte/mca/ras/base/ras_base_close.c
  112. +19 −17 orte/mca/ras/base/{ras_base_open.c → ras_base_frame.c}
  113. +3 −3 orte/mca/ras/base/ras_base_node.c
  114. +4 −2 orte/mca/ras/base/ras_base_select.c
  115. +2 −2 orte/mca/ras/gridengine/ras_gridengine_component.c
  116. +2 −2 orte/mca/ras/loadleveler/ras_loadleveler_component.c
  117. +6 −6 orte/mca/ras/loadleveler/ras_loadleveler_module.c
  118. +1 −1 orte/mca/ras/simulator/ras_sim_module.c
  119. +1 −1 orte/mca/ras/slurm/ras_slurm_component.c
  120. +13 −13 orte/mca/ras/slurm/ras_slurm_module.c
  121. +4 −4 orte/mca/ras/tm/ras_tm_module.c
  122. +1 −2 orte/mca/rmaps/base/Makefile.am
  123. +5 −15 orte/mca/rmaps/base/base.h
  124. +17 −17 orte/mca/rmaps/base/rmaps_base_binding.c
  125. +0 −49 orte/mca/rmaps/base/rmaps_base_close.c
  126. +24 −15 orte/mca/rmaps/base/{rmaps_base_open.c → rmaps_base_frame.c}
  127. +3 −3 orte/mca/rmaps/base/rmaps_base_map_job.c
  128. +28 −28 orte/mca/rmaps/base/rmaps_base_ranking.c
  129. +7 −7 orte/mca/rmaps/base/rmaps_base_select.c
  130. +15 −15 orte/mca/rmaps/base/rmaps_base_support_fns.c
  131. +5 −5 orte/mca/rmaps/lama/rmaps_lama_component.c
  132. +26 −26 orte/mca/rmaps/lama/rmaps_lama_max_tree.c
  133. +56 −56 orte/mca/rmaps/lama/rmaps_lama_module.c
  134. +5 −5 orte/mca/rmaps/lama/rmaps_lama_params.c
  135. +10 −10 orte/mca/rmaps/ppr/rmaps_ppr.c
  136. +3 −3 orte/mca/rmaps/rank_file/rmaps_rank_file.c
  137. +28 −28 orte/mca/rmaps/resilient/rmaps_resilient.c
  138. +4 −4 orte/mca/rmaps/round_robin/rmaps_rr.c
  139. +19 −19 orte/mca/rmaps/round_robin/rmaps_rr_mappers.c
  140. +5 −5 orte/mca/rmaps/seq/rmaps_seq.c
  141. +11 −11 orte/mca/rmaps/staged/rmaps_staged.c
  142. +1 −1 orte/mca/rml/base/Makefile.am
  143. +5 −65 orte/mca/rml/base/base.h
  144. +1 −1 orte/mca/rml/base/rml_base_contact.c
  145. +21 −58 orte/mca/rml/base/{rml_base_components.c → rml_base_frame.c}
  146. +2 −2 orte/mca/rml/base/rml_base_receive.c
  147. +8 −19 orte/mca/rml/oob/rml_oob_component.c
  148. +1 −1 orte/mca/rml/oob/rml_oob_recv.c
  149. +3 −3 orte/mca/rml/oob/rml_oob_send.c
  150. +1 −1 orte/mca/routed/base/Makefile.am
  151. +4 −7 orte/mca/routed/base/base.h
  152. +4 −4 orte/mca/routed/base/routed_base_fns.c
  153. +32 −77 orte/mca/routed/base/{routed_base_components.c → routed_base_frame.c}
  154. +30 −30 orte/mca/routed/binomial/routed_binomial.c
  155. +20 −20 orte/mca/routed/debruijn/routed_debruijn.c
  156. +9 −9 orte/mca/routed/direct/routed_direct.c
  157. +22 −22 orte/mca/routed/radix/routed_radix.c
  158. +2 −3 orte/mca/sensor/base/Makefile.am
  159. +4 −13 orte/mca/sensor/base/base.h
  160. +0 −50 orte/mca/sensor/base/sensor_base_close.c
  161. +5 −5 orte/mca/sensor/base/sensor_base_fns.c
  162. +28 −21 orte/mca/sensor/base/{sensor_base_open.c → sensor_base_frame.c}
  163. +8 −8 orte/mca/sensor/base/sensor_base_select.c
  164. +0 −1 orte/mca/sensor/base/sensor_private.h
  165. +7 −7 orte/mca/sensor/file/sensor_file.c
  166. +6 −6 orte/mca/sensor/ft_tester/sensor_ft_tester.c
  167. +10 −10 orte/mca/sensor/heartbeat/sensor_heartbeat.c
  168. +8 −8 orte/mca/sensor/resusage/sensor_resusage.c
  169. +2 −2 orte/mca/snapc/base/Makefile.am
  170. +67 −93 orte/mca/snapc/base/base.h
  171. +0 −52 orte/mca/snapc/base/snapc_base_close.c
  172. +20 −20 orte/mca/snapc/base/snapc_base_fns.c
  173. +17 −31 orte/mca/snapc/base/{snapc_base_open.c → snapc_base_frame.c}
  174. +5 −41 orte/mca/snapc/base/snapc_base_select.c
  175. +1 −1 orte/mca/snapc/full/snapc_full_component.c
  176. +1 −2 orte/mca/sstore/base/Makefile.am
  177. +50 −76 orte/mca/sstore/base/base.h
  178. +0 −37 orte/mca/sstore/base/sstore_base_close.c
  179. +3 −3 orte/mca/sstore/base/sstore_base_fns.c
  180. +27 −22 orte/mca/sstore/base/{sstore_base_open.c → sstore_base_frame.c}
  181. +2 −3 orte/mca/sstore/base/sstore_base_select.c
  182. +1 −1 orte/mca/sstore/central/sstore_central_app.c
  183. +1 −1 orte/mca/sstore/central/sstore_central_component.c
  184. +1 −1 orte/mca/sstore/central/sstore_central_global.c
  185. +1 −1 orte/mca/sstore/stage/sstore_stage_app.c
  186. +1 −1 orte/mca/sstore/stage/sstore_stage_component.c
  187. +1 −1 orte/mca/sstore/stage/sstore_stage_global.c
  188. +2 −3 orte/mca/state/base/Makefile.am
  189. +2 −17 orte/mca/state/base/base.h
  190. +0 −48 orte/mca/state/base/state_base_close.c
  191. +26 −26 orte/mca/state/base/state_base_fns.c
  192. +20 −30 orte/mca/state/base/{state_base_open.c → state_base_frame.c}
  193. +2 −3 orte/mca/state/base/state_base_select.c
  194. +1 −11 orte/mca/state/base/state_private.h
  195. +2 −2 orte/mca/state/hnp/state_hnp.c
  196. +2 −2 orte/mca/state/novm/state_novm.c
  197. +7 −7 orte/mca/state/orted/state_orted.c
  198. +4 −4 orte/mca/state/staged_hnp/state_staged_hnp.c
  199. +5 −5 orte/mca/state/staged_orted/state_staged_orted.c
  200. +6 −6 orte/mca/state/state.h
  201. +1 −1 orte/runtime/orte_finalize.c
  202. +87 −203 orte/runtime/orte_info_support.c
  203. +2 −1 orte/runtime/orte_init.c
View
@@ -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
@@ -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
@@ -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"
View
@@ -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),
@@ -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
View
@@ -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 {
@@ -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;
-}
Oops, something went wrong.

0 comments on commit 73e621b

Please sign in to comment.