ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

modified locking

Просмотр исходного кода 
This commit was SVN r2698.
Этот коммит содержится в:
Tim Woodall 2004-09-16 08:26:57 +00:00
родитель d0e308fbc4
Коммит 0ffa11b904
3 изменённых файлов: 166 добавлений и 81 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

138
src/mca/gpr/replica/gpr_replica.c
Просмотреть файл

@ -32,9 +32,17 @@
int gpr_replica_delete_segment(char *segment)
{
mca_gpr_replica_segment_t *seg;
int rc;
OMPI_THREAD_LOCK(&mca_gpr_replica_mutex);
rc = gpr_replica_delete_segment_nl(segment);
OMPI_THREAD_UNLOCK(&mca_gpr_replica_mutex);
return rc;
}
int gpr_replica_delete_segment_nl(char *segment)
{
mca_gpr_replica_segment_t *seg;
if (mca_gpr_replica_debug) {
ompi_output(0, "[%d,%d,%d] gpr replica: delete_segment entered", ompi_process_info.name->cellid,
@ -50,17 +58,25 @@ int gpr_replica_delete_segment(char *segment)
OBJ_RELEASE(seg);
if (OMPI_SUCCESS != gpr_replica_delete_key(segment, NULL)) { /* couldn't remove dictionary entry */
OMPI_THREAD_UNLOCK(&mca_gpr_replica_mutex);
return OMPI_ERROR;
}
OMPI_THREAD_UNLOCK(&mca_gpr_replica_mutex);
return OMPI_SUCCESS;
}
int gpr_replica_put(ompi_registry_mode_t addr_mode, char *segment,
char **tokens, ompi_registry_object_t object,
ompi_registry_object_size_t size)
{
int rc;
OMPI_THREAD_LOCK(&mca_gpr_replica_mutex);
rc = gpr_replica_put_nl(addr_mode, segment, tokens, object, size);
OMPI_THREAD_UNLOCK(&mca_gpr_replica_mutex);
return rc;
}
int gpr_replica_put_nl(ompi_registry_mode_t addr_mode, char *segment,
char **tokens, ompi_registry_object_t object,
ompi_registry_object_size_t size)
{
ompi_list_t *keylist;
mca_gpr_replica_keytable_t *keyptr;
@ -94,8 +110,6 @@ int gpr_replica_put(ompi_registry_mode_t addr_mode, char *segment,
*/
put_mode = addr_mode & OMPI_REGISTRY_OVERWRITE;
OMPI_THREAD_LOCK(&mca_gpr_replica_mutex);
/* find the segment */
seg = gpr_replica_find_seg(true, segment);
if (NULL == seg) { /* couldn't find segment or create it */
@ -198,13 +212,22 @@ int gpr_replica_put(ompi_registry_mode_t addr_mode, char *segment,
ompi_process_info.name->jobid, ompi_process_info.name->vpid);
}
OMPI_THREAD_UNLOCK(&mca_gpr_replica_mutex);
return return_code;
}
int gpr_replica_delete_object(ompi_registry_mode_t addr_mode,
char *segment, char **tokens)
{
int rc;
OMPI_THREAD_LOCK(&mca_gpr_replica_mutex);
rc = gpr_replica_delete_object_nl(addr_mode, segment, tokens);
OMPI_THREAD_UNLOCK(&mca_gpr_replica_mutex);
return rc;
}
int gpr_replica_delete_object_nl(ompi_registry_mode_t addr_mode,
char *segment, char **tokens)
{
mca_gpr_replica_core_t *reg, *prev;
mca_gpr_replica_keytable_t *keyptr;
@ -229,12 +252,10 @@ int gpr_replica_delete_object(ompi_registry_mode_t addr_mode,
return OMPI_ERROR;
}
OMPI_THREAD_LOCK(&mca_gpr_replica_mutex);
/* find the specified segment */
seg = gpr_replica_find_seg(false, segment);
if (NULL == seg) { /* segment not found */
OMPI_THREAD_UNLOCK(&mca_gpr_replica_mutex);
return OMPI_ERROR;
}
@ -316,12 +337,19 @@ int gpr_replica_delete_object(ompi_registry_mode_t addr_mode,
free(keys);
}
OMPI_THREAD_UNLOCK(&mca_gpr_replica_mutex);
return return_code;
}
ompi_list_t* gpr_replica_index(char *segment)
{
ompi_list_t* list;
OMPI_THREAD_LOCK(&mca_gpr_replica_mutex);
list = gpr_replica_index_nl(segment);
OMPI_THREAD_UNLOCK(&mca_gpr_replica_mutex);
return list;
}
ompi_list_t* gpr_replica_index_nl(char *segment)
{
ompi_list_t *answer;
mca_gpr_replica_keytable_t *ptr;
@ -333,8 +361,6 @@ ompi_list_t* gpr_replica_index(char *segment)
ompi_process_info.name->jobid, ompi_process_info.name->vpid, segment);
}
OMPI_THREAD_LOCK(&mca_gpr_replica_mutex);
answer = OBJ_NEW(ompi_list_t);
if (NULL == segment) { /* looking for index of global registry */
@ -349,7 +375,6 @@ ompi_list_t* gpr_replica_index(char *segment)
/* find the specified segment */
seg = gpr_replica_find_seg(false, segment);
if (NULL == seg) { /* segment not found */
OMPI_THREAD_UNLOCK(&mca_gpr_replica_mutex);
return answer;
}
/* got segment - now index that dictionary */
@ -362,8 +387,6 @@ ompi_list_t* gpr_replica_index(char *segment)
}
}
OMPI_THREAD_UNLOCK(&mca_gpr_replica_mutex);
return answer;
}
@ -371,6 +394,19 @@ int gpr_replica_subscribe(ompi_registry_mode_t addr_mode,
ompi_registry_notify_action_t action,
char *segment, char **tokens,
ompi_registry_notify_cb_fn_t cb_func, void *user_tag)
{
int rc;
OMPI_THREAD_LOCK(&mca_gpr_replica_mutex);
rc = gpr_replica_subscribe_nl(addr_mode,action,segment,tokens,cb_func,user_tag);
OMPI_THREAD_UNLOCK(&mca_gpr_replica_mutex);
return rc;
}
int gpr_replica_subscribe_nl(ompi_registry_mode_t addr_mode,
ompi_registry_notify_action_t action,
char *segment, char **tokens,
ompi_registry_notify_cb_fn_t cb_func, void *user_tag)
{
mca_gpr_notify_request_tracker_t *trackptr;
mca_gpr_idtag_list_t *ptr_free_id;
@ -388,7 +424,6 @@ int gpr_replica_subscribe(ompi_registry_mode_t addr_mode,
return OMPI_ERROR;
}
OMPI_THREAD_LOCK(&mca_gpr_replica_mutex);
/* enter request on notify tracking system */
trackptr = OBJ_NEW(mca_gpr_notify_request_tracker_t);
@ -416,18 +451,29 @@ int gpr_replica_subscribe(ompi_registry_mode_t addr_mode,
notify_msg->trig_synchro = OMPI_REGISTRY_SYNCHRO_MODE_NONE;
gpr_replica_process_triggers(segment, trig, notify_msg);
}
OMPI_THREAD_UNLOCK(&mca_gpr_replica_mutex);
return OMPI_SUCCESS;
} else {
OBJ_RELEASE(trackptr);
OMPI_THREAD_UNLOCK(&mca_gpr_replica_mutex);
return OMPI_ERROR;
}
}
int gpr_replica_unsubscribe(ompi_registry_mode_t addr_mode,
ompi_registry_notify_action_t action,
char *segment, char **tokens)
{
int rc;
OMPI_THREAD_LOCK(&mca_gpr_replica_mutex);
rc = gpr_replica_unsubscribe_nl(addr_mode,action,segment,tokens);
OMPI_THREAD_UNLOCK(&mca_gpr_replica_mutex);
return rc;
}
int gpr_replica_unsubscribe_nl(ompi_registry_mode_t addr_mode,
ompi_registry_notify_action_t action,
char *segment, char **tokens)
{
mca_gpr_notify_request_tracker_t *trackptr;
mca_gpr_notify_id_t id_tag;
@ -443,12 +489,10 @@ int gpr_replica_unsubscribe(ompi_registry_mode_t addr_mode,
return OMPI_ERROR;
}
OMPI_THREAD_LOCK(&mca_gpr_replica_mutex);
/* find trigger on replica - return id_tag */
if (MCA_GPR_NOTIFY_ID_MAX == (id_tag = gpr_replica_remove_trigger(OMPI_REGISTRY_SYNCHRO_MODE_NONE, action,
addr_mode, segment, tokens, 0))) {
OMPI_THREAD_UNLOCK(&mca_gpr_replica_mutex);
return OMPI_ERROR;
}
@ -463,20 +507,29 @@ int gpr_replica_unsubscribe(ompi_registry_mode_t addr_mode,
ompi_list_remove_item(&mca_gpr_replica_notify_request_tracker, &trackptr->item);
OBJ_RELEASE(trackptr);
OMPI_THREAD_UNLOCK(&mca_gpr_replica_mutex);
return OMPI_SUCCESS;
}
/* if we get here, then couldn't find request */
OMPI_THREAD_UNLOCK(&mca_gpr_replica_mutex);
return OMPI_ERROR;
}
int gpr_replica_synchro(ompi_registry_synchro_mode_t synchro_mode,
ompi_registry_mode_t addr_mode,
char *segment, char **tokens, int trigger,
ompi_registry_notify_cb_fn_t cb_func, void *user_tag)
{
int rc;
OMPI_THREAD_LOCK(&mca_gpr_replica_mutex);
rc = gpr_replica_synchro_nl(synchro_mode,addr_mode,segment,tokens,trigger,cb_func,user_tag);
OMPI_THREAD_UNLOCK(&mca_gpr_replica_mutex);
return rc;
}
int gpr_replica_synchro_nl(ompi_registry_synchro_mode_t synchro_mode,
ompi_registry_mode_t addr_mode,
char *segment, char **tokens, int trigger,
ompi_registry_notify_cb_fn_t cb_func, void *user_tag)
{
mca_gpr_notify_request_tracker_t *trackptr;
mca_gpr_idtag_list_t *ptr_free_id;
@ -494,7 +547,6 @@ int gpr_replica_synchro(ompi_registry_synchro_mode_t synchro_mode,
return OMPI_ERROR;
}
OMPI_THREAD_LOCK(&mca_gpr_replica_mutex);
/* enter request on notify tracking system */
trackptr = OBJ_NEW(mca_gpr_notify_request_tracker_t);
trackptr->requestor = NULL;
@ -524,10 +576,8 @@ int gpr_replica_synchro(ompi_registry_synchro_mode_t synchro_mode,
notify_msg->trig_synchro = trig->synch_mode;
gpr_replica_process_triggers(segment, trig, notify_msg);
}
OMPI_THREAD_UNLOCK(&mca_gpr_replica_mutex);
return OMPI_SUCCESS;
} else {
OMPI_THREAD_UNLOCK(&mca_gpr_replica_mutex);
OBJ_RELEASE(trackptr);
return OMPI_ERROR;
}
@ -536,6 +586,17 @@ int gpr_replica_synchro(ompi_registry_synchro_mode_t synchro_mode,
int gpr_replica_cancel_synchro(ompi_registry_synchro_mode_t synchro_mode,
ompi_registry_mode_t addr_mode,
char *segment, char **tokens, int trigger)
{
int rc;
OMPI_THREAD_LOCK(&mca_gpr_replica_mutex);
rc = gpr_replica_cancel_synchro_nl(synchro_mode,addr_mode,segment,tokens,trigger);
OMPI_THREAD_UNLOCK(&mca_gpr_replica_mutex);
return rc;
}
int gpr_replica_cancel_synchro_nl(ompi_registry_synchro_mode_t synchro_mode,
ompi_registry_mode_t addr_mode,
char *segment, char **tokens, int trigger)
{
mca_gpr_notify_request_tracker_t *trackptr;
mca_gpr_notify_id_t id_tag;
@ -551,11 +612,9 @@ int gpr_replica_cancel_synchro(ompi_registry_synchro_mode_t synchro_mode,
return OMPI_ERROR;
}
OMPI_THREAD_LOCK(&mca_gpr_replica_mutex);
/* find trigger on replica - return id_tag */
if (MCA_GPR_NOTIFY_ID_MAX == (id_tag = gpr_replica_remove_trigger(synchro_mode, OMPI_REGISTRY_NOTIFY_NONE,
addr_mode, segment, tokens, trigger))) {
OMPI_THREAD_UNLOCK(&mca_gpr_replica_mutex);
return OMPI_ERROR;
}
@ -570,17 +629,25 @@ int gpr_replica_cancel_synchro(ompi_registry_synchro_mode_t synchro_mode,
ompi_list_remove_item(&mca_gpr_replica_notify_request_tracker, &trackptr->item);
OBJ_RELEASE(trackptr);
OMPI_THREAD_UNLOCK(&mca_gpr_replica_mutex);
return OMPI_SUCCESS;
}
/* if we get here, then couldn't find request */
OMPI_THREAD_UNLOCK(&mca_gpr_replica_mutex);
return OMPI_ERROR;
}
ompi_list_t* gpr_replica_get(ompi_registry_mode_t addr_mode,
char *segment, char **tokens)
{
ompi_list_t* list;
OMPI_THREAD_LOCK(&mca_gpr_replica_mutex);
list = gpr_replica_get_nl(addr_mode, segment, tokens);
OMPI_THREAD_UNLOCK(&mca_gpr_replica_mutex);
return list;
}
ompi_list_t* gpr_replica_get_nl(ompi_registry_mode_t addr_mode,
char *segment, char **tokens)
{
mca_gpr_replica_segment_t *seg=NULL;
ompi_list_t *answer=NULL;
@ -603,11 +670,9 @@ ompi_list_t* gpr_replica_get(ompi_registry_mode_t addr_mode,
return answer;
}
OMPI_THREAD_LOCK(&mca_gpr_replica_mutex);
/* find the specified segment */
seg = gpr_replica_find_seg(false, segment);
if (NULL == seg) { /* segment not found */
OMPI_THREAD_UNLOCK(&mca_gpr_replica_mutex);
return answer;
}
if (mca_gpr_replica_debug) {
@ -623,7 +688,6 @@ ompi_list_t* gpr_replica_get(ompi_registry_mode_t addr_mode,
/* convert tokens to list of keys */
keylist = gpr_replica_get_key_list(segment, tokens);
if (0 == (num_tokens = ompi_list_get_size(keylist))) {
OMPI_THREAD_UNLOCK(&mca_gpr_replica_mutex);
return answer;
}
@ -679,8 +743,6 @@ ompi_list_t* gpr_replica_get(ompi_registry_mode_t addr_mode,
ompi_output(0, "[%d,%d,%d] gpr replica-get: leaving", ompi_process_info.name->cellid,
ompi_process_info.name->jobid, ompi_process_info.name->vpid);
}
OMPI_THREAD_UNLOCK(&mca_gpr_replica_mutex);
return answer;
}

23
src/mca/gpr/replica/gpr_replica.h
Просмотреть файл

@ -200,36 +200,59 @@ int mca_gpr_replica_finalize(void);
*/
int gpr_replica_delete_segment(char *segment);
int gpr_replica_delete_segment_nl(char *segment);
int gpr_replica_put(ompi_registry_mode_t addr_mode, char *segment,
char **tokens, ompi_registry_object_t object,
ompi_registry_object_size_t size);
int gpr_replica_put_nl(ompi_registry_mode_t addr_mode, char *segment,
char **tokens, ompi_registry_object_t object,
ompi_registry_object_size_t size);
int gpr_replica_delete_object(ompi_registry_mode_t addr_mode,
char *segment, char **tokens);
int gpr_replica_delete_object_nl(ompi_registry_mode_t addr_mode,
char *segment, char **tokens);
ompi_list_t* gpr_replica_index(char *segment);
ompi_list_t* gpr_replica_index_nl(char *segment);
int gpr_replica_subscribe(ompi_registry_mode_t addr_mode,
ompi_registry_notify_action_t action,
char *segment, char **tokens,
ompi_registry_notify_cb_fn_t cb_func, void *user_tag);
int gpr_replica_subscribe_nl(ompi_registry_mode_t addr_mode,
ompi_registry_notify_action_t action,
char *segment, char **tokens,
ompi_registry_notify_cb_fn_t cb_func, void *user_tag);
int gpr_replica_unsubscribe(ompi_registry_mode_t addr_mode,
ompi_registry_notify_action_t action,
char *segment, char **tokens);
int gpr_replica_unsubscribe_nl(ompi_registry_mode_t addr_mode,
ompi_registry_notify_action_t action,
char *segment, char **tokens);
int gpr_replica_synchro(ompi_registry_synchro_mode_t synchro_mode,
ompi_registry_mode_t addr_mode,
char *segment, char **tokens, int trigger,
ompi_registry_notify_cb_fn_t cb_func, void *user_tag);
int gpr_replica_synchro_nl(ompi_registry_synchro_mode_t synchro_mode,
ompi_registry_mode_t addr_mode,
char *segment, char **tokens, int trigger,
ompi_registry_notify_cb_fn_t cb_func, void *user_tag);
int gpr_replica_cancel_synchro(ompi_registry_synchro_mode_t synchro_mode,
ompi_registry_mode_t addr_mode,
char *segment, char **tokens, int trigger);
int gpr_replica_cancel_synchro_nl(ompi_registry_synchro_mode_t synchro_mode,
ompi_registry_mode_t addr_mode,
char *segment, char **tokens, int trigger);
ompi_list_t* gpr_replica_get(ompi_registry_mode_t addr_mode,
char *segment, char **tokens);
ompi_list_t* gpr_replica_get_nl(ompi_registry_mode_t addr_mode,
char *segment, char **tokens);
ompi_list_t* gpr_replica_test_internals(int level);

86
src/mca/gpr/replica/gpr_replica_internals.c
Просмотреть файл

@ -42,11 +42,11 @@ mca_gpr_replica_segment_t *gpr_replica_define_segment(char *segment)
mca_gpr_replica_segment_t *seg;
mca_gpr_replica_key_t key;
OMPI_THREAD_LOCK(&mca_gpr_replica_internals_mutex);
/* OMPI_THREAD_LOCK(&mca_gpr_replica_internals_mutex); */
key = gpr_replica_define_key(segment, NULL);
if (MCA_GPR_REPLICA_KEY_MAX == key) { /* got some kind of error code */
OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex);
/* OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex); */
return NULL;
}
@ -55,7 +55,7 @@ mca_gpr_replica_segment_t *gpr_replica_define_segment(char *segment)
seg->segment = key;
ompi_list_append(&mca_gpr_replica_head.registry, &seg->item);
OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex);
/* OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex); */
return seg;
}
@ -66,7 +66,7 @@ mca_gpr_replica_segment_t *gpr_replica_find_seg(bool create, char *segment)
mca_gpr_replica_keytable_t *ptr_seg;
mca_gpr_replica_segment_t *seg;
OMPI_THREAD_LOCK(&mca_gpr_replica_internals_mutex);
/* OMPI_THREAD_LOCK(&mca_gpr_replica_internals_mutex); */
/* search the registry segments to find which one is being referenced */
for (ptr_seg = (mca_gpr_replica_keytable_t*)ompi_list_get_first(&mca_gpr_replica_head.segment_dict);
@ -78,14 +78,14 @@ mca_gpr_replica_segment_t *gpr_replica_find_seg(bool create, char *segment)
seg != (mca_gpr_replica_segment_t*)ompi_list_get_end(&mca_gpr_replica_head.registry);
seg = (mca_gpr_replica_segment_t*)ompi_list_get_next(seg)) {
if(seg->segment == ptr_seg->key) {
OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex);
/* OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex); */
return(seg);
}
}
}
}
OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex);
/* OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex); */
if (create) {
/* didn't find the dictionary entry - create it */
@ -100,7 +100,7 @@ mca_gpr_replica_keytable_t *gpr_replica_find_dict_entry(char *segment, char *tok
mca_gpr_replica_keytable_t *ptr_key;
mca_gpr_replica_segment_t *seg;
OMPI_THREAD_LOCK(&mca_gpr_replica_internals_mutex);
/* OMPI_THREAD_LOCK(&mca_gpr_replica_internals_mutex); */
/* search the registry segments to find which one is being referenced */
for (ptr_seg = (mca_gpr_replica_keytable_t*)ompi_list_get_first(&mca_gpr_replica_head.segment_dict);
@ -108,7 +108,7 @@ mca_gpr_replica_keytable_t *gpr_replica_find_dict_entry(char *segment, char *tok
ptr_seg = (mca_gpr_replica_keytable_t*)ompi_list_get_next(ptr_seg)) {
if (0 == strcmp(segment, ptr_seg->token)) {
if (NULL == token) { /* just want segment token-key pair */
OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex);
/* OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex); */
return(ptr_seg);
}
/* search registry to find segment */
@ -121,19 +121,19 @@ mca_gpr_replica_keytable_t *gpr_replica_find_dict_entry(char *segment, char *tok
ptr_key != (mca_gpr_replica_keytable_t*)ompi_list_get_end(&seg->keytable);
ptr_key = (mca_gpr_replica_keytable_t*)ompi_list_get_next(ptr_key)) {
if (0 == strcmp(token, ptr_key->token)) {
OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex);
/* OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex); */
return(ptr_key);
}
}
OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex);
/* OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex); */
return(NULL); /* couldn't find the specified entry */
}
}
OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex);
/* OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex); */
return(NULL); /* couldn't find segment, even though we found entry in registry dict */
}
}
OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex);
/* OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex); */
return(NULL); /* couldn't find segment token-key pair */
}
@ -174,7 +174,7 @@ char *gpr_replica_get_token(char *segment, mca_gpr_replica_key_t key)
return NULL;
}
OMPI_THREAD_LOCK(&mca_gpr_replica_internals_mutex);
/* OMPI_THREAD_LOCK(&mca_gpr_replica_internals_mutex); */
/* find the matching key */
for (ptr_key = (mca_gpr_replica_keytable_t*)ompi_list_get_first(&seg->keytable);
@ -182,11 +182,11 @@ char *gpr_replica_get_token(char *segment, mca_gpr_replica_key_t key)
ptr_key = (mca_gpr_replica_keytable_t*)ompi_list_get_next(ptr_key)) {
if (key == ptr_key->key) {
answer = strdup(ptr_key->token);
OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex);
/* OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex); */
return answer;
}
}
OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex);
/* OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex); */
return(NULL); /* couldn't find the specified entry */
}
@ -227,7 +227,7 @@ mca_gpr_replica_key_t gpr_replica_define_key(char *segment, char *token)
/* if token is NULL, then this is defining a segment name. Check dictionary to ensure uniqueness */
if (NULL == token) {
OMPI_THREAD_LOCK(&mca_gpr_replica_internals_mutex);
/* OMPI_THREAD_LOCK(&mca_gpr_replica_internals_mutex); */
for (ptr_seg = (mca_gpr_replica_keytable_t*)ompi_list_get_first(&mca_gpr_replica_head.segment_dict);
ptr_seg != (mca_gpr_replica_keytable_t*)ompi_list_get_end(&mca_gpr_replica_head.segment_dict);
@ -245,7 +245,7 @@ mca_gpr_replica_key_t gpr_replica_define_key(char *segment, char *token)
mca_gpr_replica_head.lastkey++;
new->key = mca_gpr_replica_head.lastkey;
} else { /* out of keys */
OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex);
/* OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex); */
return MCA_GPR_REPLICA_KEY_MAX;
}
} else {
@ -253,10 +253,10 @@ mca_gpr_replica_key_t gpr_replica_define_key(char *segment, char *token)
new->key = ptr_key->key;
}
ompi_list_append(&mca_gpr_replica_head.segment_dict, &new->item);
OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex);
/* OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex); */
return new->key;
}
OMPI_THREAD_LOCK(&mca_gpr_replica_internals_mutex);
/* OMPI_THREAD_LOCK(&mca_gpr_replica_internals_mutex); */
/* okay, token is specified */
/* search the registry segments to find which one is being referenced */
@ -267,7 +267,7 @@ mca_gpr_replica_key_t gpr_replica_define_key(char *segment, char *token)
ptr_key != (mca_gpr_replica_keytable_t*)ompi_list_get_end(&seg->keytable);
ptr_key = (mca_gpr_replica_keytable_t*)ompi_list_get_next(ptr_key)) {
if (0 == strcmp(token, ptr_key->token)) {
OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex);
/* OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex); */
return ptr_key->key; /* already taken, report value */
}
}
@ -282,7 +282,7 @@ mca_gpr_replica_key_t gpr_replica_define_key(char *segment, char *token)
new->key = ptr_key->key;
}
ompi_list_append(&seg->keytable, &new->item);
OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex);
/* OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex); */
return new->key;
}
/* couldn't find segment */
@ -302,7 +302,7 @@ int gpr_replica_delete_key(char *segment, char *token)
return(OMPI_ERROR);
}
OMPI_THREAD_LOCK(&mca_gpr_replica_internals_mutex);
/* OMPI_THREAD_LOCK(&mca_gpr_replica_internals_mutex); */
/* find the segment */
seg = gpr_replica_find_seg(false, segment);
@ -311,13 +311,13 @@ int gpr_replica_delete_key(char *segment, char *token)
/* if specified token is NULL, then this is deleting a segment name.*/
if (NULL == token) {
if (OMPI_SUCCESS != gpr_replica_empty_segment(seg)) { /* couldn't empty segment */
OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex);
/* OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex); */
return OMPI_ERROR;
}
/* now remove the dictionary entry from the global registry dictionary*/
ptr_seg = gpr_replica_find_dict_entry(segment, NULL);
if (NULL == ptr_seg) { /* failed to find dictionary entry */
OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex);
/* OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex); */
return OMPI_ERROR;
}
@ -330,7 +330,7 @@ int gpr_replica_delete_key(char *segment, char *token)
/* remove the dictionary entry */
ompi_list_remove_item(&mca_gpr_replica_head.segment_dict, &ptr_seg->item);
OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex);
/* OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex); */
return(OMPI_SUCCESS);
@ -358,15 +358,15 @@ int gpr_replica_delete_key(char *segment, char *token)
/* now remove the dictionary entry from the segment's dictionary */
ompi_list_remove_item(&seg->keytable, &ptr_key->item);
OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex);
/* OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex); */
return(OMPI_SUCCESS);
}
}
OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex);
/* OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex); */
return(OMPI_ERROR); /* if we get here, then we couldn't find token in dictionary */
}
}
OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex);
/* OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex); */
return(OMPI_ERROR); /* if we get here, then we couldn't find segment */
}
@ -378,7 +378,7 @@ int gpr_replica_empty_segment(mca_gpr_replica_segment_t *seg)
/* need to free memory from each entry - remove_last returns pointer to the entry */
OMPI_THREAD_LOCK(&mca_gpr_replica_internals_mutex);
/* OMPI_THREAD_LOCK(&mca_gpr_replica_internals_mutex); */
/* empty the segment's registry */
while (!ompi_list_is_empty(&seg->registry_entries)) {
@ -401,7 +401,7 @@ int gpr_replica_empty_segment(mca_gpr_replica_segment_t *seg)
ompi_list_remove_item(&mca_gpr_replica_head.registry, &seg->item);
OBJ_RELEASE(seg);
OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex);
/* OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex); */
return OMPI_SUCCESS;
}
@ -500,11 +500,11 @@ gpr_replica_construct_trigger(ompi_registry_synchro_mode_t synchro_mode,
mca_gpr_replica_key_t *keyptr;
int i, num_tokens;
OMPI_THREAD_LOCK(&mca_gpr_replica_internals_mutex);
/* OMPI_THREAD_LOCK(&mca_gpr_replica_internals_mutex); */
seg = gpr_replica_find_seg(true, segment);
if (NULL == seg) { /* couldn't find or create segment */
OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex);
/* OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex); */
return NULL;
}
@ -572,7 +572,7 @@ gpr_replica_construct_trigger(ompi_registry_synchro_mode_t synchro_mode,
ompi_list_append(&seg->triggers, &trig->item);
OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex);
/* OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex); */
return trig;
@ -591,11 +591,11 @@ mca_gpr_notify_id_t gpr_replica_remove_trigger(ompi_registry_synchro_mode_t sync
int i=0, num_tokens=0;
bool found=false, mismatch=false;
OMPI_THREAD_LOCK(&mca_gpr_replica_internals_mutex);
/* OMPI_THREAD_LOCK(&mca_gpr_replica_internals_mutex); */
seg = gpr_replica_find_seg(false, segment);
if (NULL == seg) { /* couldn't find segment */
OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex);
/* OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex); */
return MCA_GPR_NOTIFY_ID_MAX;
}
@ -654,11 +654,11 @@ mca_gpr_notify_id_t gpr_replica_remove_trigger(ompi_registry_synchro_mode_t sync
id_tag = trig->id_tag;
ompi_list_remove_item(&seg->triggers, &trig->item);
OBJ_RELEASE(trig);
OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex);
/* OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex); */
return id_tag;
}
OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex);
/* OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex); */
return MCA_GPR_NOTIFY_ID_MAX;
}
@ -682,7 +682,7 @@ ompi_registry_notify_message_t *gpr_replica_construct_notify_message(ompi_regist
return NULL;
}
reg_entries = gpr_replica_get(addr_mode, segment, tokens);
reg_entries = gpr_replica_get_nl(addr_mode, segment, tokens);
/* compute number of tokens */
tokptr = tokens;
@ -746,7 +746,7 @@ void gpr_replica_process_triggers(char *segment,
return;
}
OMPI_THREAD_LOCK(&mca_gpr_replica_internals_mutex);
/* OMPI_THREAD_LOCK(&mca_gpr_replica_internals_mutex); */
seg = gpr_replica_find_seg(false, segment);
if (NULL == seg) { /* couldn't find segment */
@ -772,7 +772,7 @@ void gpr_replica_process_triggers(char *segment,
if (!found) { /* didn't find request */
ompi_output(0, "Notification error - request not found");
OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex);
/* OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex); */
return;
}
@ -823,7 +823,7 @@ void gpr_replica_process_triggers(char *segment,
ompi_process_info.name->jobid, ompi_process_info.name->vpid);
}
OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex);
/* OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex); */
}
@ -839,7 +839,7 @@ ompi_list_t *gpr_replica_test_internals(int level)
mca_gpr_replica_keytable_t *dict_entry;
bool success;
OMPI_THREAD_LOCK(&mca_gpr_replica_internals_mutex);
/* OMPI_THREAD_LOCK(&mca_gpr_replica_internals_mutex); */
test_results = OBJ_NEW(ompi_list_t);
@ -1033,7 +1033,7 @@ ompi_list_t *gpr_replica_test_internals(int level)
/* check ability to empty segment */
OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex);
/* OMPI_THREAD_UNLOCK(&mca_gpr_replica_internals_mutex); */
return test_results;
}