And ORTE is ready for prime-time. All Windows tricks are in:
- use the OPAL functions for PATH and environment variables - make all headers C++ friendly - no unamed structures - no implicit cast. Plus a full implementation for the orte_wait functions. This commit was SVN r11347.
This commit is contained in:
parent
aecdfc80eb
commit
f52c10d18e
@ -2,7 +2,7 @@
|
||||
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||
* University Research and Technology
|
||||
* Corporation. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The University of Tennessee and The University
|
||||
* Copyright (c) 2004-2006 The University of Tennessee and The University
|
||||
* of Tennessee Research Foundation. All rights
|
||||
* reserved.
|
||||
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
@ -47,6 +47,7 @@
|
||||
#if defined(c_plusplus) || defined(__cplusplus)
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
struct orte_bitmap_t {
|
||||
opal_object_t super; /**< Subclass of opal_object_t */
|
||||
unsigned char *bitmap; /**< The actual bitmap array of characters */
|
||||
@ -155,7 +156,7 @@ ORTE_DECLSPEC int orte_bitmap_set_all_bits(orte_bitmap_t *bm);
|
||||
*/
|
||||
static inline int orte_bitmap_size(orte_bitmap_t *bm)
|
||||
{
|
||||
return (NULL == bm) ? 0 : bm->legal_numbits;
|
||||
return (NULL == bm) ? 0 : (int)bm->legal_numbits;
|
||||
}
|
||||
|
||||
#if defined(c_plusplus) || defined(__cplusplus)
|
||||
|
@ -2,7 +2,7 @@
|
||||
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||
* University Research and Technology
|
||||
* Corporation. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The University of Tennessee and The University
|
||||
* Copyright (c) 2004-2006 The University of Tennessee and The University
|
||||
* of Tennessee Research Foundation. All rights
|
||||
* reserved.
|
||||
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
@ -94,7 +94,7 @@ int orte_pointer_array_init(orte_pointer_array_t **array,
|
||||
(*array)->size = block_size;
|
||||
}
|
||||
|
||||
(*array)->addr = (void *)malloc(num_bytes);
|
||||
(*array)->addr = (void **)malloc(num_bytes);
|
||||
if (NULL == (*array)->addr) { /* out of memory */
|
||||
OBJ_RELEASE(*array);
|
||||
return ORTE_ERR_OUT_OF_RESOURCE;
|
||||
@ -396,7 +396,7 @@ static bool grow_table(orte_pointer_array_t *table)
|
||||
/* Adjust structure counters and pointers */
|
||||
|
||||
table->number_free += new_size - table->size;
|
||||
table->addr = p;
|
||||
table->addr = (void**)p;
|
||||
for (i = table->size; i < new_size; ++i) {
|
||||
table->addr[i] = NULL;
|
||||
}
|
||||
|
@ -2,7 +2,7 @@
|
||||
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||
* University Research and Technology
|
||||
* Corporation. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The University of Tennessee and The University
|
||||
* Copyright (c) 2004-2006 The University of Tennessee and The University
|
||||
* of Tennessee Research Foundation. All rights
|
||||
* reserved.
|
||||
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
@ -39,9 +39,6 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
ORTE_DECLSPEC extern opal_class_t orte_value_array_t_class;
|
||||
|
||||
|
||||
struct orte_value_array_t
|
||||
{
|
||||
opal_object_t super;
|
||||
@ -52,7 +49,7 @@ struct orte_value_array_t
|
||||
};
|
||||
typedef struct orte_value_array_t orte_value_array_t;
|
||||
|
||||
|
||||
ORTE_DECLSPEC OBJ_CLASS_DECLARATION(orte_value_array_t);
|
||||
|
||||
/**
|
||||
* Initialize the array to hold items by value. This routine must
|
||||
|
@ -1,8 +1,10 @@
|
||||
/*
|
||||
* Copyright (c) 2004-2005 The Trustees of Indiana University.
|
||||
* All rights reserved.
|
||||
* Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
|
||||
* All rights reserved.
|
||||
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||
* University Research and Technology
|
||||
* Corporation. All rights reserved.
|
||||
* Copyright (c) 2004-2006 The University of Tennessee and The University
|
||||
* of Tennessee Research Foundation. All rights
|
||||
* reserved.
|
||||
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
* University of Stuttgart. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
@ -61,56 +63,56 @@ int orte_dss_arith(orte_data_value_t *value, orte_data_value_t *operand, orte_ds
|
||||
|
||||
switch(operand->type) {
|
||||
case ORTE_INT:
|
||||
orte_dss_arith_int(value->data, operand->data, operation);
|
||||
orte_dss_arith_int((int*)value->data, (int*)operand->data, operation);
|
||||
break;
|
||||
|
||||
case ORTE_UINT:
|
||||
orte_dss_arith_uint(value->data, operand->data, operation);
|
||||
orte_dss_arith_uint((uint*)value->data, (uint*)operand->data, operation);
|
||||
break;
|
||||
|
||||
case ORTE_SIZE:
|
||||
orte_dss_arith_size(value->data, operand->data, operation);
|
||||
orte_dss_arith_size((size_t*)value->data, (size_t*)operand->data, operation);
|
||||
break;
|
||||
|
||||
case ORTE_PID:
|
||||
orte_dss_arith_pid(value->data, operand->data, operation);
|
||||
orte_dss_arith_pid((pid_t*)value->data, (pid_t*)operand->data, operation);
|
||||
break;
|
||||
|
||||
case ORTE_BYTE:
|
||||
case ORTE_UINT8:
|
||||
orte_dss_arith_byte(value->data, operand->data, operation);
|
||||
orte_dss_arith_byte((uint8_t*)value->data, (uint8_t*)operand->data, operation);
|
||||
break;
|
||||
|
||||
case ORTE_INT8:
|
||||
orte_dss_arith_int8(value->data, operand->data, operation);
|
||||
orte_dss_arith_int8((int8_t*)value->data, (int8_t*)operand->data, operation);
|
||||
break;
|
||||
|
||||
case ORTE_INT16:
|
||||
orte_dss_arith_int16(value->data, operand->data, operation);
|
||||
orte_dss_arith_int16((int16_t*)value->data, (int16_t*)operand->data, operation);
|
||||
break;
|
||||
|
||||
case ORTE_UINT16:
|
||||
orte_dss_arith_uint16(value->data, operand->data, operation);
|
||||
orte_dss_arith_uint16((uint16_t*)value->data, (uint16_t*)operand->data, operation);
|
||||
break;
|
||||
|
||||
case ORTE_INT32:
|
||||
orte_dss_arith_int32(value->data, operand->data, operation);
|
||||
orte_dss_arith_int32((int32_t*)value->data, (int32_t*)operand->data, operation);
|
||||
break;
|
||||
|
||||
case ORTE_UINT32:
|
||||
orte_dss_arith_uint32(value->data, operand->data, operation);
|
||||
orte_dss_arith_uint32((uint32_t*)value->data, (uint32_t*)operand->data, operation);
|
||||
break;
|
||||
|
||||
case ORTE_INT64:
|
||||
orte_dss_arith_int64(value->data, operand->data, operation);
|
||||
orte_dss_arith_int64((int64_t*)value->data, (int64_t*)operand->data, operation);
|
||||
break;
|
||||
|
||||
case ORTE_UINT64:
|
||||
orte_dss_arith_uint64(value->data, operand->data, operation);
|
||||
orte_dss_arith_uint64((uint64_t*)value->data, (uint64_t*)operand->data, operation);
|
||||
break;
|
||||
|
||||
case ORTE_STD_CNTR:
|
||||
orte_dss_arith_std_cntr(value->data, operand->data, operation);
|
||||
orte_dss_arith_std_cntr((orte_std_cntr_t*)value->data, (orte_std_cntr_t*)operand->data, operation);
|
||||
break;
|
||||
|
||||
default:
|
||||
@ -149,78 +151,78 @@ int orte_dss_increment(orte_data_value_t *value)
|
||||
switch(value->type) {
|
||||
case ORTE_INT:
|
||||
one = 1;
|
||||
orte_dss_arith_int(value->data, &one, ORTE_DSS_ADD);
|
||||
orte_dss_arith_int((int*)value->data, &one, ORTE_DSS_ADD);
|
||||
break;
|
||||
|
||||
case ORTE_UINT:
|
||||
uone = 1;
|
||||
orte_dss_arith_uint(value->data, &uone, ORTE_DSS_ADD);
|
||||
orte_dss_arith_uint((uint*)value->data, &uone, ORTE_DSS_ADD);
|
||||
break;
|
||||
|
||||
case ORTE_SIZE:
|
||||
sone = 1;
|
||||
orte_dss_arith_size(value->data, &sone, ORTE_DSS_ADD);
|
||||
orte_dss_arith_size((size_t*)value->data, &sone, ORTE_DSS_ADD);
|
||||
break;
|
||||
|
||||
case ORTE_PID:
|
||||
pone = 1;
|
||||
orte_dss_arith_pid(value->data, &pone, ORTE_DSS_ADD);
|
||||
orte_dss_arith_pid((pid_t*)value->data, &pone, ORTE_DSS_ADD);
|
||||
break;
|
||||
|
||||
case ORTE_BYTE:
|
||||
case ORTE_UINT8:
|
||||
u8one = 1;
|
||||
orte_dss_arith_byte(value->data, &u8one, ORTE_DSS_ADD);
|
||||
orte_dss_arith_byte((uint8_t*)value->data, &u8one, ORTE_DSS_ADD);
|
||||
break;
|
||||
|
||||
case ORTE_INT8:
|
||||
i8one = 1;
|
||||
orte_dss_arith_int8(value->data, &i8one, ORTE_DSS_ADD);
|
||||
orte_dss_arith_int8((int8_t*)value->data, &i8one, ORTE_DSS_ADD);
|
||||
break;
|
||||
|
||||
case ORTE_INT16:
|
||||
i16one = 1;
|
||||
orte_dss_arith_int16(value->data, &i16one, ORTE_DSS_ADD);
|
||||
orte_dss_arith_int16((int16_t*)value->data, &i16one, ORTE_DSS_ADD);
|
||||
break;
|
||||
|
||||
case ORTE_UINT16:
|
||||
u16one = 1;
|
||||
orte_dss_arith_uint16(value->data, &u16one, ORTE_DSS_ADD);
|
||||
orte_dss_arith_uint16((uint16_t*)value->data, &u16one, ORTE_DSS_ADD);
|
||||
break;
|
||||
|
||||
case ORTE_INT32:
|
||||
i32one = 1;
|
||||
orte_dss_arith_int32(value->data, &i32one, ORTE_DSS_ADD);
|
||||
orte_dss_arith_int32((int32_t*)value->data, &i32one, ORTE_DSS_ADD);
|
||||
break;
|
||||
|
||||
case ORTE_UINT32:
|
||||
u32one = 1;
|
||||
orte_dss_arith_uint32(value->data, &u32one, ORTE_DSS_ADD);
|
||||
orte_dss_arith_uint32((uint32_t*)value->data, &u32one, ORTE_DSS_ADD);
|
||||
break;
|
||||
|
||||
case ORTE_INT64:
|
||||
i64one = 1;
|
||||
orte_dss_arith_int64(value->data, &i64one, ORTE_DSS_ADD);
|
||||
orte_dss_arith_int64((int64_t*)value->data, &i64one, ORTE_DSS_ADD);
|
||||
break;
|
||||
|
||||
case ORTE_UINT64:
|
||||
u64one = 1;
|
||||
orte_dss_arith_uint64(value->data, &u64one, ORTE_DSS_ADD);
|
||||
orte_dss_arith_uint64((uint64_t*)value->data, &u64one, ORTE_DSS_ADD);
|
||||
break;
|
||||
|
||||
case ORTE_DAEMON_CMD:
|
||||
daemoncmdone = 1;
|
||||
orte_dss_arith_daemon_cmd(value->data, &daemoncmdone, ORTE_DSS_ADD);
|
||||
orte_dss_arith_daemon_cmd((orte_daemon_cmd_flag_t*)value->data, &daemoncmdone, ORTE_DSS_ADD);
|
||||
break;
|
||||
|
||||
case ORTE_DATA_TYPE:
|
||||
datatypeone = 1;
|
||||
orte_dss_arith_data_type(value->data, &datatypeone, ORTE_DSS_ADD);
|
||||
orte_dss_arith_data_type((orte_data_type_t*)value->data, &datatypeone, ORTE_DSS_ADD);
|
||||
break;
|
||||
|
||||
case ORTE_STD_CNTR:
|
||||
stdcntrone = 1;
|
||||
orte_dss_arith_std_cntr(value->data, &stdcntrone, ORTE_DSS_ADD);
|
||||
orte_dss_arith_std_cntr((orte_std_cntr_t*)value->data, &stdcntrone, ORTE_DSS_ADD);
|
||||
break;
|
||||
|
||||
default:
|
||||
@ -259,78 +261,78 @@ int orte_dss_decrement(orte_data_value_t *value)
|
||||
switch(value->type) {
|
||||
case ORTE_INT:
|
||||
one = 1;
|
||||
orte_dss_arith_int(value->data, &one, ORTE_DSS_SUB);
|
||||
orte_dss_arith_int((int*)value->data, &one, ORTE_DSS_SUB);
|
||||
break;
|
||||
|
||||
case ORTE_UINT:
|
||||
uone = 1;
|
||||
orte_dss_arith_uint(value->data, &uone, ORTE_DSS_SUB);
|
||||
orte_dss_arith_uint((uint*)value->data, &uone, ORTE_DSS_SUB);
|
||||
break;
|
||||
|
||||
case ORTE_SIZE:
|
||||
sone = 1;
|
||||
orte_dss_arith_size(value->data, &sone, ORTE_DSS_SUB);
|
||||
orte_dss_arith_size((size_t*)value->data, &sone, ORTE_DSS_SUB);
|
||||
break;
|
||||
|
||||
case ORTE_PID:
|
||||
pone = 1;
|
||||
orte_dss_arith_pid(value->data, &pone, ORTE_DSS_SUB);
|
||||
orte_dss_arith_pid((pid_t*)value->data, &pone, ORTE_DSS_SUB);
|
||||
break;
|
||||
|
||||
case ORTE_BYTE:
|
||||
case ORTE_UINT8:
|
||||
u8one = 1;
|
||||
orte_dss_arith_byte(value->data, &u8one, ORTE_DSS_SUB);
|
||||
orte_dss_arith_byte((uint8_t*)value->data, &u8one, ORTE_DSS_SUB);
|
||||
break;
|
||||
|
||||
case ORTE_INT8:
|
||||
i8one = 1;
|
||||
orte_dss_arith_int8(value->data, &i8one, ORTE_DSS_SUB);
|
||||
orte_dss_arith_int8((int8_t*)value->data, &i8one, ORTE_DSS_SUB);
|
||||
break;
|
||||
|
||||
case ORTE_INT16:
|
||||
i16one = 1;
|
||||
orte_dss_arith_int16(value->data, &i16one, ORTE_DSS_SUB);
|
||||
orte_dss_arith_int16((int16_t*)value->data, &i16one, ORTE_DSS_SUB);
|
||||
break;
|
||||
|
||||
case ORTE_UINT16:
|
||||
u16one = 1;
|
||||
orte_dss_arith_uint16(value->data, &u16one, ORTE_DSS_SUB);
|
||||
orte_dss_arith_uint16((uint16_t*)value->data, &u16one, ORTE_DSS_SUB);
|
||||
break;
|
||||
|
||||
case ORTE_INT32:
|
||||
i32one = 1;
|
||||
orte_dss_arith_int32(value->data, &i32one, ORTE_DSS_SUB);
|
||||
orte_dss_arith_int32((int32_t*)value->data, &i32one, ORTE_DSS_SUB);
|
||||
break;
|
||||
|
||||
case ORTE_UINT32:
|
||||
u32one = 1;
|
||||
orte_dss_arith_uint32(value->data, &u32one, ORTE_DSS_SUB);
|
||||
orte_dss_arith_uint32((uint32_t*)value->data, &u32one, ORTE_DSS_SUB);
|
||||
break;
|
||||
|
||||
case ORTE_INT64:
|
||||
i64one = 1;
|
||||
orte_dss_arith_int64(value->data, &i64one, ORTE_DSS_SUB);
|
||||
orte_dss_arith_int64((int64_t*)value->data, &i64one, ORTE_DSS_SUB);
|
||||
break;
|
||||
|
||||
case ORTE_UINT64:
|
||||
u64one = 1;
|
||||
orte_dss_arith_uint64(value->data, &u64one, ORTE_DSS_SUB);
|
||||
orte_dss_arith_uint64((uint64_t*)value->data, &u64one, ORTE_DSS_SUB);
|
||||
break;
|
||||
|
||||
case ORTE_DAEMON_CMD:
|
||||
daemoncmdone = 1;
|
||||
orte_dss_arith_daemon_cmd(value->data, &daemoncmdone, ORTE_DSS_SUB);
|
||||
orte_dss_arith_daemon_cmd((orte_daemon_cmd_flag_t*)value->data, &daemoncmdone, ORTE_DSS_SUB);
|
||||
break;
|
||||
|
||||
case ORTE_DATA_TYPE:
|
||||
datatypeone = 1;
|
||||
orte_dss_arith_data_type(value->data, &datatypeone, ORTE_DSS_SUB);
|
||||
orte_dss_arith_data_type((orte_data_type_t*)value->data, &datatypeone, ORTE_DSS_SUB);
|
||||
break;
|
||||
|
||||
case ORTE_STD_CNTR:
|
||||
stdcntrone = 1;
|
||||
orte_dss_arith_std_cntr(value->data, &stdcntrone, ORTE_DSS_SUB);
|
||||
orte_dss_arith_std_cntr((orte_std_cntr_t*)value->data, &stdcntrone, ORTE_DSS_SUB);
|
||||
break;
|
||||
|
||||
default:
|
||||
|
@ -1,8 +1,10 @@
|
||||
/*
|
||||
* Copyright (c) 2004-2005 The Trustees of Indiana University.
|
||||
* All rights reserved.
|
||||
* Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
|
||||
* All rights reserved.
|
||||
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||
* University Research and Technology
|
||||
* Corporation. All rights reserved.
|
||||
* Copyright (c) 2004-2006 The University of Tennessee and The University
|
||||
* of Tennessee Research Foundation. All rights
|
||||
* reserved.
|
||||
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
* University of Stuttgart. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
@ -40,7 +42,7 @@ int orte_dss_compare(void *value1, void *value2, orte_data_type_t type)
|
||||
/* Lookup the compare function for this type and call it */
|
||||
|
||||
if (!(type < orte_dss_types->size) ||
|
||||
(NULL == (info = orte_pointer_array_get_item(orte_dss_types, type)))) {
|
||||
(NULL == (info = (orte_dss_type_info_t*)orte_pointer_array_get_item(orte_dss_types, type)))) {
|
||||
ORTE_ERROR_LOG(ORTE_ERR_UNKNOWN_DATA_TYPE);
|
||||
return ORTE_ERR_UNKNOWN_DATA_TYPE;
|
||||
}
|
||||
|
@ -1,8 +1,10 @@
|
||||
/*
|
||||
* Copyright (c) 2004-2005 The Trustees of Indiana University.
|
||||
* All rights reserved.
|
||||
* Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
|
||||
* All rights reserved.
|
||||
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||
* University Research and Technology
|
||||
* Corporation. All rights reserved.
|
||||
* Copyright (c) 2004-2006 The University of Tennessee and The University
|
||||
* of Tennessee Research Foundation. All rights
|
||||
* reserved.
|
||||
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
* University of Stuttgart. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
@ -44,7 +46,7 @@ int orte_dss_copy(void **dest, void *src, orte_data_type_t type)
|
||||
/* Lookup the copy function for this type and call it */
|
||||
|
||||
if (!(type < orte_dss_types->size) ||
|
||||
(NULL == (info = orte_pointer_array_get_item(orte_dss_types, type)))) {
|
||||
(NULL == (info = (orte_dss_type_info_t*)orte_pointer_array_get_item(orte_dss_types, type)))) {
|
||||
ORTE_ERROR_LOG(ORTE_ERR_UNKNOWN_DATA_TYPE);
|
||||
return ORTE_ERR_UNKNOWN_DATA_TYPE;
|
||||
}
|
||||
|
@ -3,7 +3,7 @@
|
||||
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||
* University Research and Technology
|
||||
* Corporation. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The University of Tennessee and The University
|
||||
* Copyright (c) 2004-2006 The University of Tennessee and The University
|
||||
* of Tennessee Research Foundation. All rights
|
||||
* reserved.
|
||||
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
@ -142,7 +142,7 @@ struct orte_dss_type_info_t {
|
||||
* Convenience typedef
|
||||
*/
|
||||
typedef struct orte_dss_type_info_t orte_dss_type_info_t;
|
||||
OBJ_CLASS_DECLARATION(orte_dss_type_info_t);
|
||||
ORTE_DECLSPEC OBJ_CLASS_DECLARATION(orte_dss_type_info_t);
|
||||
|
||||
/*
|
||||
* globals needed within dss
|
||||
|
@ -2,7 +2,7 @@
|
||||
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||
* University Research and Technology
|
||||
* Corporation. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The University of Tennessee and The University
|
||||
* Copyright (c) 2004-2006 The University of Tennessee and The University
|
||||
* of Tennessee Research Foundation. All rights
|
||||
* reserved.
|
||||
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
@ -60,13 +60,13 @@ char* orte_dss_buffer_extend(orte_buffer_t *buffer, size_t bytes_to_add)
|
||||
pack_offset = ((char*) buffer->pack_ptr) - ((char*) buffer->base_ptr);
|
||||
unpack_offset = ((char*) buffer->unpack_ptr) -
|
||||
((char*) buffer->base_ptr);
|
||||
buffer->base_ptr = realloc(buffer->base_ptr,
|
||||
num_pages * orte_dss_page_size);
|
||||
buffer->base_ptr = (char*)realloc(buffer->base_ptr,
|
||||
num_pages * orte_dss_page_size);
|
||||
} else {
|
||||
pack_offset = 0;
|
||||
unpack_offset = 0;
|
||||
buffer->bytes_used = 0;
|
||||
buffer->base_ptr = malloc(num_pages * orte_dss_page_size);
|
||||
buffer->base_ptr = (char*)malloc(num_pages * orte_dss_page_size);
|
||||
}
|
||||
|
||||
if (NULL == buffer->base_ptr) {
|
||||
@ -113,7 +113,7 @@ int orte_dss_store_data_type(orte_buffer_t *buffer, orte_data_type_t type)
|
||||
|
||||
/* Lookup the pack function for the actual orte_data_type type and call it */
|
||||
|
||||
if (NULL == (info = orte_pointer_array_get_item(orte_dss_types, ORTE_DATA_TYPE_T))) {
|
||||
if (NULL == (info = (orte_dss_type_info_t*)orte_pointer_array_get_item(orte_dss_types, ORTE_DATA_TYPE_T))) {
|
||||
ORTE_ERROR_LOG(ORTE_ERR_PACK_FAILURE);
|
||||
return ORTE_ERR_PACK_FAILURE;
|
||||
}
|
||||
@ -133,7 +133,7 @@ int orte_dss_get_data_type(orte_buffer_t *buffer, orte_data_type_t *type)
|
||||
|
||||
/* Lookup the unpack function for the actual orte_data_type type and call it */
|
||||
|
||||
if (NULL == (info = orte_pointer_array_get_item(orte_dss_types, ORTE_DATA_TYPE_T))) {
|
||||
if (NULL == (info = (orte_dss_type_info_t*)orte_pointer_array_get_item(orte_dss_types, ORTE_DATA_TYPE_T))) {
|
||||
ORTE_ERROR_LOG(ORTE_ERR_PACK_FAILURE);
|
||||
return ORTE_ERR_PACK_FAILURE;
|
||||
}
|
||||
|
@ -2,7 +2,7 @@
|
||||
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||
* University Research and Technology
|
||||
* Corporation. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The University of Tennessee and The University
|
||||
* Copyright (c) 2004-2006 The University of Tennessee and The University
|
||||
* of Tennessee Research Foundation. All rights
|
||||
* reserved.
|
||||
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
@ -90,7 +90,7 @@ int orte_dss_load(orte_buffer_t *buffer, void *payload,
|
||||
}
|
||||
|
||||
/* populate the buffer */
|
||||
buffer->base_ptr = payload;
|
||||
buffer->base_ptr = (char*)payload;
|
||||
|
||||
/* set pack/unpack pointers */
|
||||
buffer->pack_ptr = ((char*)buffer->base_ptr) + bytes_used;
|
||||
|
@ -2,7 +2,7 @@
|
||||
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||
* University Research and Technology
|
||||
* Corporation. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The University of Tennessee and The University
|
||||
* Copyright (c) 2004-2006 The University of Tennessee and The University
|
||||
* of Tennessee Research Foundation. All rights
|
||||
* reserved.
|
||||
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
@ -34,7 +34,7 @@ char *orte_dss_lookup_data_type(orte_data_type_t type)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
info = orte_pointer_array_get_item(orte_dss_types, type);
|
||||
info = (orte_dss_type_info_t*)orte_pointer_array_get_item(orte_dss_types, type);
|
||||
if (NULL != info) { /* type found on list */
|
||||
name = strdup(info->odti_name);
|
||||
return name;
|
||||
|
@ -2,7 +2,7 @@
|
||||
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||
* University Research and Technology
|
||||
* Corporation. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The University of Tennessee and The University
|
||||
* Copyright (c) 2004-2006 The University of Tennessee and The University
|
||||
* of Tennessee Research Foundation. All rights
|
||||
* reserved.
|
||||
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
@ -466,7 +466,7 @@ int orte_dss_close(void)
|
||||
orte_dss_initialized = false;
|
||||
|
||||
for (i = 0 ; i < orte_pointer_array_get_size(orte_dss_types) ; ++i) {
|
||||
orte_dss_type_info_t *info = orte_pointer_array_get_item(orte_dss_types, i);
|
||||
orte_dss_type_info_t *info = (orte_dss_type_info_t*)orte_pointer_array_get_item(orte_dss_types, i);
|
||||
if (NULL != info) {
|
||||
OBJ_RELEASE(info);
|
||||
}
|
||||
|
@ -2,7 +2,7 @@
|
||||
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||
* University Research and Technology
|
||||
* Corporation. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The University of Tennessee and The University
|
||||
* Copyright (c) 2004-2006 The University of Tennessee and The University
|
||||
* of Tennessee Research Foundation. All rights
|
||||
* reserved.
|
||||
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
@ -79,7 +79,7 @@ int orte_dss_pack_buffer(orte_buffer_t *buffer, void *src, orte_std_cntr_t num_v
|
||||
|
||||
/* Lookup the pack function for this type and call it */
|
||||
|
||||
if (NULL == (info = orte_pointer_array_get_item(orte_dss_types, type))) {
|
||||
if (NULL == (info = (orte_dss_type_info_t*)orte_pointer_array_get_item(orte_dss_types, type))) {
|
||||
ORTE_ERROR_LOG(ORTE_ERR_PACK_FAILURE);
|
||||
return ORTE_ERR_PACK_FAILURE;
|
||||
}
|
||||
@ -396,7 +396,7 @@ int orte_dss_pack_data_value(orte_buffer_t *buffer, void *src, orte_std_cntr_t n
|
||||
|
||||
/* Lookup the pack function for this type and call it */
|
||||
|
||||
if (NULL == (info = orte_pointer_array_get_item(orte_dss_types, sdv[i]->type))) {
|
||||
if (NULL == (info = (orte_dss_type_info_t*)orte_pointer_array_get_item(orte_dss_types, sdv[i]->type))) {
|
||||
ORTE_ERROR_LOG(ORTE_ERR_PACK_FAILURE);
|
||||
return ORTE_ERR_PACK_FAILURE;
|
||||
}
|
||||
|
@ -1,8 +1,10 @@
|
||||
/*
|
||||
* Copyright (c) 2004-2005 The Trustees of Indiana University.
|
||||
* All rights reserved.
|
||||
* Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
|
||||
* All rights reserved.
|
||||
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||
* University Research and Technology
|
||||
* Corporation. All rights reserved.
|
||||
* Copyright (c) 2004-2006 The University of Tennessee and The University
|
||||
* of Tennessee Research Foundation. All rights
|
||||
* reserved.
|
||||
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
* University of Stuttgart. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
@ -41,7 +43,7 @@ int orte_dss_print(char **output, char *prefix, void *src, orte_data_type_t type
|
||||
/* Lookup the print function for this type and call it */
|
||||
|
||||
if (!(type < orte_dss_types->size) ||
|
||||
(NULL == (info = orte_pointer_array_get_item(orte_dss_types, type)))) {
|
||||
(NULL == (info = (orte_dss_type_info_t*)orte_pointer_array_get_item(orte_dss_types, type)))) {
|
||||
ORTE_ERROR_LOG(ORTE_ERR_UNKNOWN_DATA_TYPE);
|
||||
return ORTE_ERR_UNKNOWN_DATA_TYPE;
|
||||
}
|
||||
@ -303,8 +305,13 @@ int orte_dss_print_int32(char **output, char *prefix, int32_t *src, orte_data_ty
|
||||
|
||||
return ORTE_SUCCESS;
|
||||
}
|
||||
|
||||
int orte_dss_print_uint64(char **output, char *prefix, uint64_t *src, orte_data_type_t type)
|
||||
int orte_dss_print_uint64(char **output, char *prefix,
|
||||
#ifdef HAVE_INT64_T
|
||||
uint64_t *src,
|
||||
#else
|
||||
void *src,
|
||||
#endif /* HAVE_INT64_T */
|
||||
orte_data_type_t type)
|
||||
{
|
||||
char *prefx;
|
||||
|
||||
@ -318,12 +325,22 @@ int orte_dss_print_uint64(char **output, char *prefix, uint64_t *src, orte_data_
|
||||
return ORTE_SUCCESS;
|
||||
}
|
||||
|
||||
#ifdef HAVE_INT64_T
|
||||
asprintf(output, "%sData type: ORTE_UINT64\tValue: %lu", prefx, (unsigned long) *src);
|
||||
#else
|
||||
asprintf(output, "%sData type: ORTE_UINT64\tValue: unsupported", prefx);
|
||||
#endif /* HAVE_INT64_T */
|
||||
|
||||
return ORTE_SUCCESS;
|
||||
}
|
||||
|
||||
int orte_dss_print_int64(char **output, char *prefix, int64_t *src, orte_data_type_t type)
|
||||
int orte_dss_print_int64(char **output, char *prefix,
|
||||
#ifdef HAVE_INT64_T
|
||||
int64_t *src,
|
||||
#else
|
||||
void *src,
|
||||
#endif /* HAVE_INT64_T */
|
||||
orte_data_type_t type)
|
||||
{
|
||||
char *prefx;
|
||||
|
||||
@ -337,7 +354,11 @@ int orte_dss_print_int64(char **output, char *prefix, int64_t *src, orte_data_ty
|
||||
return ORTE_SUCCESS;
|
||||
}
|
||||
|
||||
#ifdef HAVE_INT64_T
|
||||
asprintf(output, "%sData type: ORTE_INT64\tValue: %ld", prefx, (long) *src);
|
||||
#else
|
||||
asprintf(output, "%sData type: ORTE_INT64\tValue: unsupported", prefx);
|
||||
#endif /* HAVE_INT64_T */
|
||||
|
||||
return ORTE_SUCCESS;
|
||||
}
|
||||
|
@ -1,8 +1,10 @@
|
||||
/*
|
||||
* Copyright (c) 2004-2005 The Trustees of Indiana University.
|
||||
* All rights reserved.
|
||||
* Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
|
||||
* All rights reserved.
|
||||
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||
* University Research and Technology
|
||||
* Corporation. All rights reserved.
|
||||
* Copyright (c) 2004-2006 The University of Tennessee and The University
|
||||
* of Tennessee Research Foundation. All rights
|
||||
* reserved.
|
||||
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
* University of Stuttgart. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
@ -39,7 +41,7 @@ void orte_dss_release(orte_data_value_t *value)
|
||||
/* Lookup the release function for this type and call it */
|
||||
|
||||
if (!(value->type < orte_dss_types->size) ||
|
||||
(NULL == (info = orte_pointer_array_get_item(orte_dss_types, value->type)))) {
|
||||
(NULL == (info = (orte_dss_type_info_t*)orte_pointer_array_get_item(orte_dss_types, value->type)))) {
|
||||
ORTE_ERROR_LOG(ORTE_ERR_UNKNOWN_DATA_TYPE);
|
||||
return;
|
||||
}
|
||||
@ -72,7 +74,7 @@ void orte_dss_release_byte_object(orte_data_value_t *value)
|
||||
{
|
||||
orte_byte_object_t *bo;
|
||||
|
||||
bo = value->data;
|
||||
bo = (orte_byte_object_t*)value->data;
|
||||
free(bo->bytes);
|
||||
|
||||
free(value->data);
|
||||
|
@ -1,8 +1,10 @@
|
||||
/*
|
||||
* Copyright (c) 2004-2005 The Trustees of Indiana University.
|
||||
* All rights reserved.
|
||||
* Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
|
||||
* All rights reserved.
|
||||
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||
* University Research and Technology
|
||||
* Corporation. All rights reserved.
|
||||
* Copyright (c) 2004-2006 The University of Tennessee and The University
|
||||
* of Tennessee Research Foundation. All rights
|
||||
* reserved.
|
||||
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
* University of Stuttgart. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
@ -41,7 +43,7 @@ int orte_dss_size(size_t *size, void *src, orte_data_type_t type)
|
||||
/* Lookup the size function for this type and call it */
|
||||
|
||||
if (!(type < orte_dss_types->size) ||
|
||||
(NULL == (info = orte_pointer_array_get_item(orte_dss_types, type)))) {
|
||||
(NULL == (info = (orte_dss_type_info_t*)orte_pointer_array_get_item(orte_dss_types, type)))) {
|
||||
ORTE_ERROR_LOG(ORTE_ERR_UNKNOWN_DATA_TYPE);
|
||||
return ORTE_ERR_UNKNOWN_DATA_TYPE;
|
||||
}
|
||||
|
@ -3,7 +3,7 @@
|
||||
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||
* University Research and Technology
|
||||
* Corporation. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The University of Tennessee and The University
|
||||
* Copyright (c) 2004-2006 The University of Tennessee and The University
|
||||
* of Tennessee Research Foundation. All rights
|
||||
* reserved.
|
||||
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
@ -49,7 +49,7 @@ typedef struct {
|
||||
orte_data_type_t type; /* the type of value stored */
|
||||
void *data;
|
||||
} orte_data_value_t;
|
||||
OBJ_CLASS_DECLARATION(orte_data_value_t);
|
||||
ORTE_DECLSPEC OBJ_CLASS_DECLARATION(orte_data_value_t);
|
||||
|
||||
#define ORTE_DATA_VALUE_EMPTY {{OBJ_CLASS(orte_data_value_t),0}, ORTE_UNDEF, NULL}
|
||||
|
||||
|
@ -2,7 +2,7 @@
|
||||
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||
* University Research and Technology
|
||||
* Corporation. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The University of Tennessee and The University
|
||||
* Copyright (c) 2004-2006 The University of Tennessee and The University
|
||||
* of Tennessee Research Foundation. All rights
|
||||
* reserved.
|
||||
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
@ -67,15 +67,15 @@
|
||||
/* NOTE: do not need to deal with endianness here, as the unpacking of
|
||||
the underling sender-side type will do that for us. Repeat: the
|
||||
data in tmpbuf[] is already in host byte order. */
|
||||
#define UNPACK_SIZE_MISMATCH_FOUND(unpack_type, tmptype, tmpdsstype) \
|
||||
do { \
|
||||
orte_std_cntr_t i; \
|
||||
tmptype *tmpbuf = malloc(sizeof(tmptype) * *num_vals); \
|
||||
#define UNPACK_SIZE_MISMATCH_FOUND(unpack_type, tmptype, tmpdsstype) \
|
||||
do { \
|
||||
orte_std_cntr_t i; \
|
||||
tmptype *tmpbuf = (tmptype*)malloc(sizeof(tmptype) * (*num_vals)); \
|
||||
ret = orte_dss_unpack_buffer(buffer, tmpbuf, num_vals, tmpdsstype); \
|
||||
for (i = 0 ; i < *num_vals ; ++i) { \
|
||||
((unpack_type*) dest)[i] = tmpbuf[i]; \
|
||||
} \
|
||||
free(tmpbuf); \
|
||||
for (i = 0 ; i < *num_vals ; ++i) { \
|
||||
((unpack_type*) dest)[i] = (unpack_type)(tmpbuf[i]); \
|
||||
} \
|
||||
free(tmpbuf); \
|
||||
} while (0)
|
||||
|
||||
|
||||
@ -181,7 +181,7 @@ int orte_dss_unpack_buffer(orte_buffer_t *buffer, void *dst, orte_std_cntr_t *nu
|
||||
|
||||
/* Lookup the unpack function for this type and call it */
|
||||
|
||||
if (NULL == (info = orte_pointer_array_get_item(orte_dss_types, type))) {
|
||||
if (NULL == (info = (orte_dss_type_info_t*)orte_pointer_array_get_item(orte_dss_types, type))) {
|
||||
ORTE_ERROR_LOG(ORTE_ERR_UNPACK_FAILURE);
|
||||
return ORTE_ERR_UNPACK_FAILURE;
|
||||
}
|
||||
@ -499,7 +499,7 @@ int orte_dss_unpack_string(orte_buffer_t *buffer, void *dest,
|
||||
if (0 == len) { /* zero-length string - unpack the NULL */
|
||||
sdest[i] = NULL;
|
||||
} else {
|
||||
sdest[i] = malloc(len);
|
||||
sdest[i] = (char*)malloc(len);
|
||||
if (NULL == sdest[i]) {
|
||||
ORTE_ERROR_LOG(ORTE_ERR_OUT_OF_RESOURCE);
|
||||
return ORTE_ERR_OUT_OF_RESOURCE;
|
||||
@ -687,7 +687,7 @@ int orte_dss_unpack_data_value(orte_buffer_t *buffer, void *dest, orte_std_cntr_
|
||||
|
||||
/* Lookup the unpack function for this type and call it */
|
||||
|
||||
if (NULL == (info = orte_pointer_array_get_item(orte_dss_types, ddv[i]->type))) {
|
||||
if (NULL == (info = (orte_dss_type_info_t*)orte_pointer_array_get_item(orte_dss_types, ddv[i]->type))) {
|
||||
ORTE_ERROR_LOG(ORTE_ERR_PACK_FAILURE);
|
||||
return ORTE_ERR_PACK_FAILURE;
|
||||
}
|
||||
|
@ -2,7 +2,7 @@
|
||||
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||
* University Research and Technology
|
||||
* Corporation. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The University of Tennessee and The University
|
||||
* Copyright (c) 2004-2006 The University of Tennessee and The University
|
||||
* of Tennessee Research Foundation. All rights
|
||||
* reserved.
|
||||
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
@ -20,6 +20,11 @@
|
||||
#define ORTE_CONSTANTS_H
|
||||
|
||||
#include "opal/constants.h"
|
||||
#include "orte_config.h"
|
||||
|
||||
#if defined(c_plusplus) || defined(__cplusplus)
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#define ORTE_ERR_BASE OPAL_ERR_MAX
|
||||
|
||||
@ -93,7 +98,11 @@ enum {
|
||||
#define ORTE_ERR_MAX (ORTE_ERR_BASE - 100)
|
||||
|
||||
/* include the prototype for the error-to-string converter */
|
||||
const char * orte_err2str(int errnum);
|
||||
ORTE_DECLSPEC const char* orte_err2str(int errnum);
|
||||
|
||||
#if defined(c_plusplus) || defined(__cplusplus)
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* ORTE_CONSTANTS_H */
|
||||
|
||||
|
@ -2,7 +2,7 @@
|
||||
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||
* University Research and Technology
|
||||
* Corporation. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The University of Tennessee and The University
|
||||
* Copyright (c) 2004-2006 The University of Tennessee and The University
|
||||
* of Tennessee Research Foundation. All rights
|
||||
* reserved.
|
||||
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
@ -64,9 +64,6 @@
|
||||
#include "orte/orte_constants.h"
|
||||
#include "orte/orte_types.h"
|
||||
|
||||
#include "opal/threads/mutex.h"
|
||||
#include "opal/threads/condition.h"
|
||||
|
||||
#include "opal/class/opal_list.h"
|
||||
#include "orte/dss/dss_types.h"
|
||||
|
||||
@ -120,16 +117,16 @@ typedef uint8_t orte_gpr_cmd_flag_t;
|
||||
ORTE_DECLSPEC int orte_gpr_base_select(void);
|
||||
ORTE_DECLSPEC int orte_gpr_base_close(void);
|
||||
|
||||
int orte_gpr_base_create_value(orte_gpr_value_t **value,
|
||||
orte_gpr_addr_mode_t addr_mode,
|
||||
char *segment,
|
||||
orte_std_cntr_t cnt, /**< Number of keyval objects */
|
||||
orte_std_cntr_t num_tokens);
|
||||
ORTE_DECLSPEC int orte_gpr_base_create_value(orte_gpr_value_t **value,
|
||||
orte_gpr_addr_mode_t addr_mode,
|
||||
char *segment,
|
||||
orte_std_cntr_t cnt, /**< Number of keyval objects */
|
||||
orte_std_cntr_t num_tokens);
|
||||
|
||||
int orte_gpr_base_create_keyval(orte_gpr_keyval_t **keyval,
|
||||
char *key,
|
||||
orte_data_type_t type,
|
||||
void *data);
|
||||
ORTE_DECLSPEC int orte_gpr_base_create_keyval(orte_gpr_keyval_t **keyval,
|
||||
char *key,
|
||||
orte_data_type_t type,
|
||||
void *data);
|
||||
|
||||
ORTE_DECLSPEC int orte_gpr_base_put_1(orte_gpr_addr_mode_t addr_mode,
|
||||
char *segment, char **tokens,
|
||||
|
@ -1,8 +1,10 @@
|
||||
/*
|
||||
* Copyright (c) 2004-2005 The Trustees of Indiana University.
|
||||
* All rights reserved.
|
||||
* Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
|
||||
* All rights reserved.
|
||||
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||
* University Research and Technology
|
||||
* Corporation. All rights reserved.
|
||||
* Copyright (c) 2004-2006 The University of Tennessee and The University
|
||||
* of Tennessee Research Foundation. All rights
|
||||
* reserved.
|
||||
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
* University of Stuttgart. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
@ -227,7 +229,7 @@ int orte_gpr_base_print_gpr_value(char **output, char *prefix, orte_gpr_value_t
|
||||
asprintf(&pfx, "%s\t", prefx);
|
||||
for (j=0; j < value->cnt; j++) {
|
||||
if (ORTE_SUCCESS != (rc = orte_gpr_base_print_keyval(&tmp2, pfx,
|
||||
(void*)(value->keyvals[j]), ORTE_GPR_KEYVAL))) {
|
||||
(orte_gpr_keyval_t*)(value->keyvals[j]), ORTE_GPR_KEYVAL))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
free(tmp);
|
||||
free(pfx);
|
||||
@ -315,7 +317,7 @@ int orte_gpr_base_print_subscription(char **output, char *prefix, orte_gpr_subsc
|
||||
/* indent another level for values */
|
||||
asprintf(&pfx, "%s\t", prefx);
|
||||
for (j=0; j < sub->cnt; j++) {
|
||||
if (ORTE_SUCCESS != (rc = orte_gpr_base_print_gpr_value(&tmp2, pfx, (void*)(sub->values[j]), ORTE_GPR_VALUE))) {
|
||||
if (ORTE_SUCCESS != (rc = orte_gpr_base_print_gpr_value(&tmp2, pfx, (orte_gpr_value_t*)(sub->values[j]), ORTE_GPR_VALUE))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
free(tmp);
|
||||
free(pfx);
|
||||
@ -392,7 +394,7 @@ int orte_gpr_base_print_trigger(char **output, char *prefix, orte_gpr_trigger_t
|
||||
/* indent another level for values */
|
||||
asprintf(&pfx, "%s\t", prefx);
|
||||
for (j=0; j < trig->cnt; j++) {
|
||||
if (ORTE_SUCCESS != (rc = orte_gpr_base_print_gpr_value(&tmp2, pfx, (void*)(trig->values[j]), ORTE_GPR_VALUE))) {
|
||||
if (ORTE_SUCCESS != (rc = orte_gpr_base_print_gpr_value(&tmp2, pfx, (orte_gpr_value_t*)(trig->values[j]), ORTE_GPR_VALUE))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
free(tmp);
|
||||
free(pfx);
|
||||
@ -442,7 +444,7 @@ int orte_gpr_base_print_notify_data(char **output, char *prefix, orte_gpr_notify
|
||||
i < (data->values)->size; i++) {
|
||||
if (NULL != values[i]) {
|
||||
j++;
|
||||
if (ORTE_SUCCESS != (rc = orte_gpr_base_print_gpr_value(&tmp2, pfx, (void*)values[i], ORTE_GPR_VALUE))) {
|
||||
if (ORTE_SUCCESS != (rc = orte_gpr_base_print_gpr_value(&tmp2, pfx, (orte_gpr_value_t*)values[i], ORTE_GPR_VALUE))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
free(tmp);
|
||||
return rc;
|
||||
@ -505,7 +507,7 @@ int orte_gpr_base_print_notify_msg(char **output, char *prefix, orte_gpr_notify_
|
||||
i < (msg->data)->size; i++) {
|
||||
if (NULL != data[i]) {
|
||||
j++;
|
||||
if (ORTE_SUCCESS != (rc = orte_gpr_base_print_notify_data(&tmp2, pfx, (void*)data[i], ORTE_GPR_NOTIFY_DATA))) {
|
||||
if (ORTE_SUCCESS != (rc = orte_gpr_base_print_notify_data(&tmp2, pfx, (orte_gpr_notify_data_t*)data[i], ORTE_GPR_NOTIFY_DATA))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
free(tmp);
|
||||
return rc;
|
||||
|
@ -2,7 +2,7 @@
|
||||
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||
* University Research and Technology
|
||||
* Corporation. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The University of Tennessee and The University
|
||||
* Copyright (c) 2004-2006 The University of Tennessee and The University
|
||||
* of Tennessee Research Foundation. All rights
|
||||
* reserved.
|
||||
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
@ -318,7 +318,8 @@ int orte_gpr_base_open(void)
|
||||
kill_prefix.lds_verbose_level = value;
|
||||
}
|
||||
orte_gpr_base_output = opal_output_open(&kill_prefix);
|
||||
|
||||
OBJ_DESTRUCT(&kill_prefix);
|
||||
|
||||
id = mca_base_param_register_int("gpr", "base", "maxsize", NULL,
|
||||
ORTE_GPR_ARRAY_MAX_SIZE);
|
||||
mca_base_param_lookup_int(id, ¶m);
|
||||
@ -513,7 +514,6 @@ int orte_gpr_base_open(void)
|
||||
}
|
||||
|
||||
/* Open up all available components */
|
||||
|
||||
if (ORTE_SUCCESS !=
|
||||
mca_base_components_open("gpr",
|
||||
orte_gpr_base_output,
|
||||
|
@ -3,7 +3,7 @@
|
||||
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||
* University Research and Technology
|
||||
* Corporation. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The University of Tennessee and The University
|
||||
* Copyright (c) 2004-2006 The University of Tennessee and The University
|
||||
* of Tennessee Research Foundation. All rights
|
||||
* reserved.
|
||||
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
@ -159,7 +159,7 @@ ORTE_DECLSPEC OBJ_CLASS_DECLARATION(orte_gpr_value_t);
|
||||
* Each block of data is associated with a specified callback function and contains
|
||||
* data from a single segment, one or more containers with one or more keyvals/container.
|
||||
*/
|
||||
typedef struct {
|
||||
typedef struct orte_gpr_notify_data_t {
|
||||
opal_object_t super; /**< Makes this an object */
|
||||
char *target; /**< Name of the associated subscripton, if provided */
|
||||
orte_gpr_subscription_id_t id; /**< Number of the associated subscription */
|
||||
|
@ -3,7 +3,7 @@
|
||||
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||
* University Research and Technology
|
||||
* Corporation. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The University of Tennessee and The University
|
||||
* Copyright (c) 2004-2006 The University of Tennessee and The University
|
||||
* of Tennessee Research Foundation. All rights
|
||||
* reserved.
|
||||
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
@ -21,7 +21,7 @@
|
||||
|
||||
#include "orte/mca/gpr/gpr.h"
|
||||
#include "orte/orte_constants.h"
|
||||
|
||||
#include "orte/mca/gpr/null/gpr_null.h"
|
||||
|
||||
extern orte_gpr_base_module_t orte_gpr_null_module;
|
||||
|
||||
|
@ -3,7 +3,7 @@
|
||||
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||
* University Research and Technology
|
||||
* Corporation. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The University of Tennessee and The University
|
||||
* Copyright (c) 2004-2006 The University of Tennessee and The University
|
||||
* of Tennessee Research Foundation. All rights
|
||||
* reserved.
|
||||
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
@ -25,6 +25,8 @@
|
||||
|
||||
#include "orte/orte_types.h"
|
||||
#include "opal/class/opal_object.h"
|
||||
#include "opal/threads/mutex.h"
|
||||
#include "opal/threads/condition.h"
|
||||
#include "orte/class/orte_pointer_array.h"
|
||||
#include "orte/dss/dss_types.h"
|
||||
#include "orte/util/proc_info.h"
|
||||
@ -95,7 +97,6 @@ typedef struct {
|
||||
int compound_cmd_waiting;
|
||||
} orte_gpr_proxy_globals_t;
|
||||
|
||||
|
||||
extern orte_gpr_proxy_globals_t orte_gpr_proxy_globals;
|
||||
|
||||
/*
|
||||
@ -242,6 +243,11 @@ orte_gpr_proxy_enter_trigger(orte_std_cntr_t cnt, orte_gpr_trigger_t **triggers)
|
||||
int
|
||||
orte_gpr_proxy_remove_trigger(orte_gpr_proxy_trigger_t *trig);
|
||||
|
||||
/*
|
||||
*
|
||||
*/
|
||||
ORTE_MODULE_DECLSPEC extern mca_gpr_base_component_t mca_gpr_proxy_component;
|
||||
|
||||
#if defined(c_plusplus) || defined(__cplusplus)
|
||||
}
|
||||
#endif
|
||||
|
@ -2,7 +2,7 @@
|
||||
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||
* University Research and Technology
|
||||
* Corporation. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The University of Tennessee and The University
|
||||
* Copyright (c) 2004-2006 The University of Tennessee and The University
|
||||
* of Tennessee Research Foundation. All rights
|
||||
* reserved.
|
||||
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
@ -50,8 +50,6 @@ typedef struct {
|
||||
orte_data_value_t value;
|
||||
} orte_gpr_replica_ival_list_t;
|
||||
|
||||
OBJ_CLASS_DECLARATION(orte_gpr_replica_ival_list_t);
|
||||
|
||||
/* constructor */
|
||||
static void orte_gpr_replica_ival_list_constructor(orte_gpr_replica_ival_list_t* ptr)
|
||||
{
|
||||
@ -82,8 +80,6 @@ typedef struct {
|
||||
opal_list_t *ival_list; /* list of ival_list_t of values found by get */
|
||||
} orte_gpr_replica_get_list_t;
|
||||
|
||||
OBJ_CLASS_DECLARATION(orte_gpr_replica_get_list_t);
|
||||
|
||||
/* constructor */
|
||||
static void orte_gpr_replica_get_list_constructor(orte_gpr_replica_get_list_t* ptr)
|
||||
{
|
||||
|
@ -3,7 +3,7 @@
|
||||
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||
* University Research and Technology
|
||||
* Corporation. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The University of Tennessee and The University
|
||||
* Copyright (c) 2004-2006 The University of Tennessee and The University
|
||||
* of Tennessee Research Foundation. All rights
|
||||
* reserved.
|
||||
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
@ -441,6 +441,8 @@ orte_gpr_base_module_t *orte_gpr_replica_init(bool *allow_multi_user_threads, bo
|
||||
int orte_gpr_replica_finalize(void);
|
||||
int orte_gpr_replica_module_init(void);
|
||||
|
||||
ORTE_MODULE_DECLSPEC extern mca_gpr_base_component_t mca_gpr_replica_component;
|
||||
|
||||