From ad5810e33f0313dc4ce50650f94d2b23c9238dd7 Mon Sep 17 00:00:00 2001 From: George Bosilca Date: Thu, 5 Oct 2006 05:22:22 +0000 Subject: [PATCH] ORTE_DECLSPEC what needs to be ORTE_DECLSPES. This commit was SVN r11997. --- orte/mca/ras/base/ras_private.h | 14 ++++----- orte/mca/rds/base/rds_private.h | 2 +- orte/mca/rmaps/base/base.h | 2 +- orte/mca/rmaps/base/rmaps_private.h | 47 ++++++++++++----------------- orte/mca/rmaps/rmaps_types.h | 4 +-- orte/mca/rmgr/base/rmgr_private.h | 12 ++++---- 6 files changed, 36 insertions(+), 45 deletions(-) diff --git a/orte/mca/ras/base/ras_private.h b/orte/mca/ras/base/ras_private.h index 63e8a263fc..eafc5f05ed 100644 --- a/orte/mca/ras/base/ras_private.h +++ b/orte/mca/ras/base/ras_private.h @@ -78,38 +78,38 @@ ORTE_DECLSPEC int orte_ras_base_allocate_nodes(orte_jobid_t jobid, /* * Query the registry for all available nodes */ -int orte_ras_base_node_query(opal_list_t*); +ORTE_DECLSPEC int orte_ras_base_node_query(opal_list_t*); /* * Query the registry for a specific node */ -orte_ras_node_t* orte_ras_base_node_lookup(orte_cellid_t, const char* nodename); +ORTE_DECLSPEC orte_ras_node_t* orte_ras_base_node_lookup(orte_cellid_t, const char* nodename); /** * Query the registry for all nodes allocated to a specific job */ -int orte_ras_base_node_query_alloc(opal_list_t*, orte_jobid_t); +ORTE_DECLSPEC int orte_ras_base_node_query_alloc(opal_list_t*, orte_jobid_t); /** * Add the specified node definitions to the registry */ -int orte_ras_base_node_insert(opal_list_t*); +ORTE_DECLSPEC int orte_ras_base_node_insert(opal_list_t*); /** * Delete the specified nodes from the registry */ -int orte_ras_base_node_delete(opal_list_t*); +ORTE_DECLSPEC int orte_ras_base_node_delete(opal_list_t*); /** * Assign the allocated slots on the specified nodes to the * indicated jobid. */ -int orte_ras_base_node_assign(opal_list_t*, orte_jobid_t); +ORTE_DECLSPEC int orte_ras_base_node_assign(opal_list_t*, orte_jobid_t); /** * Check to see if the node segment is empty */ -int orte_ras_base_node_segment_empty(bool *empty); +ORTE_DECLSPEC int orte_ras_base_node_segment_empty(bool *empty); /* diff --git a/orte/mca/rds/base/rds_private.h b/orte/mca/rds/base/rds_private.h index e960ffdca3..2a0ef5c12d 100644 --- a/orte/mca/rds/base/rds_private.h +++ b/orte/mca/rds/base/rds_private.h @@ -60,7 +60,7 @@ void orte_rds_base_recv(int status, orte_process_name_t* sender, /* * utility functions for use within the RDS */ -int orte_rds_base_store_resource(opal_list_t *resource_list); +ORTE_DECLSPEC int orte_rds_base_store_resource(opal_list_t *resource_list); /* * the "null" component functions diff --git a/orte/mca/rmaps/base/base.h b/orte/mca/rmaps/base/base.h index 961e6592fb..57f624515b 100644 --- a/orte/mca/rmaps/base/base.h +++ b/orte/mca/rmaps/base/base.h @@ -58,7 +58,7 @@ extern "C" { /** whether or not we allow oversubscription of nodes */ bool oversubscribe; } orte_rmaps_base_t; - + ORTE_DECLSPEC OBJ_CLASS_DECLARATION(orte_rmaps_base_t); /** * Global instance of rmaps-wide framework data */ diff --git a/orte/mca/rmaps/base/rmaps_private.h b/orte/mca/rmaps/base/rmaps_private.h index 8ec5c0e033..b41e823887 100644 --- a/orte/mca/rmaps/base/rmaps_private.h +++ b/orte/mca/rmaps/base/rmaps_private.h @@ -47,12 +47,6 @@ typedef uint8_t orte_rmaps_cmd_flag_t; /* define some commands */ #define ORTE_RMAPS_MAP_CMD 0x01 -/* Internal support */ -int orte_rmaps_base_comm_start(void); -void orte_rmaps_base_recv(int status, orte_process_name_t* sender, - orte_buffer_t* buffer, orte_rml_tag_t tag, - void* cbdata); - /* * RMAPS component/module/priority tuple */ @@ -69,19 +63,19 @@ struct orte_rmaps_base_cmp_t { /* Convenience typedef */ typedef struct orte_rmaps_base_cmp_t orte_rmaps_base_cmp_t; /* Class declaration */ -ORTE_DECLSPEC OBJ_CLASS_DECLARATION(orte_rmaps_base_cmp_t); +OBJ_CLASS_DECLARATION(orte_rmaps_base_cmp_t); /* * Base functions */ -ORTE_DECLSPEC int orte_rmaps_base_map(orte_jobid_t job, char *desired_mapper); +int orte_rmaps_base_map(orte_jobid_t job, char *desired_mapper); /* * NO_OP functions */ -ORTE_DECLSPEC int orte_rmaps_base_map_no_op(orte_jobid_t job, char *desired_mapper); +int orte_rmaps_base_map_no_op(orte_jobid_t job, char *desired_mapper); /* * communication functions @@ -95,27 +89,24 @@ void orte_rmaps_base_recv(int status, orte_process_name_t* sender, /* * Internal support functions */ -int orte_rmaps_base_mapped_node_query(opal_list_t* mapping_list, opal_list_t* nodes_alloc, orte_jobid_t jobid); -int orte_rmaps_base_get_map(orte_jobid_t, opal_list_t* mapping); -int orte_rmaps_base_set_map(orte_jobid_t, opal_list_t* mapping); -int orte_rmaps_base_get_node_map(orte_cellid_t, orte_jobid_t, const char*, opal_list_t* mapping); +ORTE_DECLSPEC int orte_rmaps_base_mapped_node_query(opal_list_t* mapping_list, opal_list_t* nodes_alloc, orte_jobid_t jobid); +ORTE_DECLSPEC int orte_rmaps_base_get_map(orte_jobid_t, opal_list_t* mapping); +ORTE_DECLSPEC int orte_rmaps_base_set_map(orte_jobid_t, opal_list_t* mapping); +ORTE_DECLSPEC int orte_rmaps_base_get_node_map(orte_cellid_t, orte_jobid_t, const char*, opal_list_t* mapping); -int orte_rmaps_base_get_target_nodes(opal_list_t* node_list, orte_jobid_t jobid, orte_std_cntr_t *total_num_slots); -int orte_rmaps_base_update_node_usage(opal_list_t *nodes); -int orte_rmaps_base_get_mapped_targets(opal_list_t *mapped_node_list, - orte_app_context_t *app, - opal_list_t *master_node_list, - orte_std_cntr_t *total_num_slots); +ORTE_DECLSPEC int orte_rmaps_base_get_target_nodes(opal_list_t* node_list, orte_jobid_t jobid, orte_std_cntr_t *total_num_slots); +ORTE_DECLSPEC int orte_rmaps_base_update_node_usage(opal_list_t *nodes); +ORTE_DECLSPEC int orte_rmaps_base_get_mapped_targets(opal_list_t *mapped_node_list, + orte_app_context_t *app, + opal_list_t *master_node_list, + orte_std_cntr_t *total_num_slots); -int orte_rmaps_base_claim_slot(orte_rmaps_base_map_t *map, - orte_ras_node_t *current_node, - orte_jobid_t jobid, orte_vpid_t vpid, - int proc_index, - opal_list_t *nodes, - opal_list_t *fully_used_nodes); - -int orte_rmaps_base_set_vpid_range(orte_jobid_t jobid, orte_vpid_t start, orte_vpid_t range); -int orte_rmaps_base_get_vpid_range(orte_jobid_t jobid, orte_vpid_t *start, orte_vpid_t *range); +ORTE_DECLSPEC int orte_rmaps_base_claim_slot(orte_rmaps_base_map_t *map, + orte_ras_node_t *current_node, + orte_jobid_t jobid, orte_vpid_t vpid, + int proc_index, + opal_list_t *nodes, + opal_list_t *fully_used_nodes); /** Local data type functions */ void orte_rmaps_base_std_obj_release(orte_data_value_t *value); diff --git a/orte/mca/rmaps/rmaps_types.h b/orte/mca/rmaps/rmaps_types.h index 4fece7dd7e..825d5aa8bc 100644 --- a/orte/mca/rmaps/rmaps_types.h +++ b/orte/mca/rmaps/rmaps_types.h @@ -66,7 +66,7 @@ struct orte_rmaps_base_proc_t { }; typedef struct orte_rmaps_base_proc_t orte_rmaps_base_proc_t; -OBJ_CLASS_DECLARATION(orte_rmaps_base_proc_t); +ORTE_DECLSPEC OBJ_CLASS_DECLARATION(orte_rmaps_base_proc_t); /* @@ -83,7 +83,7 @@ struct orte_rmaps_base_map_t { }; typedef struct orte_rmaps_base_map_t orte_rmaps_base_map_t; -OBJ_CLASS_DECLARATION(orte_rmaps_base_map_t); +ORTE_DECLSPEC OBJ_CLASS_DECLARATION(orte_rmaps_base_map_t); #if defined(c_plusplus) || defined(__cplusplus) diff --git a/orte/mca/rmgr/base/rmgr_private.h b/orte/mca/rmgr/base/rmgr_private.h index 52a15cea78..791ca1856e 100644 --- a/orte/mca/rmgr/base/rmgr_private.h +++ b/orte/mca/rmgr/base/rmgr_private.h @@ -93,11 +93,11 @@ int orte_rmgr_base_spawn_not_available( orte_rmgr_cb_fn_t cbfn, orte_proc_state_t cb_conditions); -int orte_rmgr_base_connect(orte_std_cntr_t num_connect, - orte_process_name_t *connect); +ORTE_DECLSPEC int orte_rmgr_base_connect(orte_std_cntr_t num_connect, + orte_process_name_t *connect); -int orte_rmgr_base_disconnect(orte_std_cntr_t num_disconnect, - orte_process_name_t *disconnect); +ORTE_DECLSPEC int orte_rmgr_base_disconnect(orte_std_cntr_t num_disconnect, + orte_process_name_t *disconnect); int orte_rmgr_base_finalize_not_available(void); @@ -108,9 +108,9 @@ ORTE_DECLSPEC int orte_rmgr_base_proc_stage_gate_init(orte_jobid_t job); ORTE_DECLSPEC int orte_rmgr_base_proc_stage_gate_mgr(orte_gpr_notify_message_t *msg); -int orte_rmgr_base_comm_start(void); +ORTE_DECLSPEC int orte_rmgr_base_comm_start(void); -int orte_rmgr_base_comm_stop(void); +ORTE_DECLSPEC int orte_rmgr_base_comm_stop(void); void orte_rmgr_base_recv(int status, orte_process_name_t* sender, orte_buffer_t* buffer, orte_rml_tag_t tag,