1
1

Moving the actual work into src/mpi/info/* files. This will allow

us to call Info related functions from lower layers without having
to make calls to the MPI layer calls.

This commit was SVN r730.
Этот коммит содержится в:
Prabhanjan Kambadur 2004-02-11 15:23:43 +00:00
родитель 598dc1f68e
Коммит f6cd55432b
8 изменённых файлов: 55 добавлений и 142 удалений

Просмотреть файл

@ -27,9 +27,8 @@
* @retval MPI_ERR_NOKEY * @retval MPI_ERR_NOKEY
*/ */
int MPI_Info_delete(MPI_Info info, char *key) { int MPI_Info_delete(MPI_Info info, char *key) {
lam_info_entry_t *search;
lam_info_entry_t *found;
int key_length; int key_length;
int err;
/** /**
* This function merely deletes the (key,val) pair in info * This function merely deletes the (key,val) pair in info
*/ */
@ -44,21 +43,11 @@ int MPI_Info_delete(MPI_Info info, char *key) {
return MPI_ERR_INFO_KEY; return MPI_ERR_INFO_KEY;
} }
search = lam_info_find_key (info, key); err = lam_info_delete (info, key);
if (NULL == search){ if (MPI_ERR_INFO_NOKEY == err) {
printf ("Invalid key given\n"); printf ("Invalid Key given\n");
return MPI_ERR_INFO_NOKEY; return err;
} else {
/*
* An entry with this key value was found. Remove the item
* and free the memory allocated to it
*/
found = (lam_info_entry_t *)
lam_list_remove_item (&(info->super),
(lam_list_item_t *)search);
OBJ_RELEASE(search);
} }
return err;
return MPI_SUCCESS;
} }

Просмотреть файл

@ -21,6 +21,7 @@
* *
* @retval MPI_SUCCESS * @retval MPI_SUCCESS
* @retval MPI_ERR_ARG * @retval MPI_ERR_ARG
* @retval MPI_ERR_SYSRESOURCE
* *
* Not only will the (key, value) pairs be duplicated, the order of keys * Not only will the (key, value) pairs be duplicated, the order of keys
* will be the same in 'newinfo' as it is in 'info'. * will be the same in 'newinfo' as it is in 'info'.
@ -28,9 +29,7 @@
* 'MPI_Info_free'. * 'MPI_Info_free'.
*/ */
int MPI_Info_dup(MPI_Info info, MPI_Info *newinfo) { int MPI_Info_dup(MPI_Info info, MPI_Info *newinfo) {
lam_info_entry_t *iterator;
int err; int err;
int nkeys;
/** /**
* Here we need to do 2 things * Here we need to do 2 things
* 1. Create a newinfo object using MPI_Info_create * 1. Create a newinfo object using MPI_Info_create
@ -54,18 +53,12 @@ int MPI_Info_dup(MPI_Info info, MPI_Info *newinfo) {
/* /*
* Now to actually duplicate all the values * Now to actually duplicate all the values
*/ */
err = MPI_Info_get_nkeys (info, &nkeys); err = lam_info_dup (info, newinfo);
for (iterator = (lam_info_entry_t *)lam_list_get_first(&(info->super)); if (err == MPI_ERR_SYSRESOURCE) {
nkeys > 0; printf ("Resources are not sufficient to finish dup'ing\n");
nkeys--) {
err = MPI_Info_set (*newinfo, iterator->ie_key, iterator->ie_value);
if (MPI_SUCCESS != err) {
printf ("Failed to set a key in newinfo\n");
return err; return err;
} }
iterator = (lam_info_entry_t *)iterator->super.lam_list_next;
}
return MPI_SUCCESS; return MPI_SUCCESS;
} }

Просмотреть файл

@ -24,8 +24,6 @@
* Upon successful completion, 'info' will be set to 'MPI_INFO_NULL'. * Upon successful completion, 'info' will be set to 'MPI_INFO_NULL'.
*/ */
int MPI_Info_free(MPI_Info *info) { int MPI_Info_free(MPI_Info *info) {
lam_info_entry_t *iterator;
int nkeys;
int err; int err;
/* /*
* Free all the alloced items from MPI_Info info. * Free all the alloced items from MPI_Info info.
@ -40,30 +38,11 @@ int MPI_Info_free(MPI_Info *info) {
} }
/* /*
* Now to actually free all the values * Now call the back end. Once again, it does not look like
* there can be any error from this, but then who knows. Have
* to recheck this part too.
*/ */
err = MPI_Info_get_nkeys(*info, &nkeys); err = lam_info_free (info);
/*
* We could just get each element from the list and then call
* MPI_Info_delete. But this causes unnecessary delay because
* MPI_Info_delete has extra logic to it. So, do the simple
* remove operation to save time.
*/
for (iterator = (lam_info_entry_t *)lam_list_get_first(&((*info)->super));
nkeys > 0;
nkeys--) {
iterator = (lam_info_entry_t *)iterator->super.lam_list_next;
OBJ_RELEASE(iterator->super.lam_list_prev);
}
/*
* Anju:
* Add things to remove the fortran handle from the mapping table
*/
OBJ_RELEASE(*info);
*info = MPI_INFO_NULL;
return MPI_SUCCESS; return MPI_SUCCESS;
} }

Просмотреть файл

@ -36,9 +36,8 @@
int MPI_Info_get(MPI_Info info, char *key, int valuelen, int MPI_Info_get(MPI_Info info, char *key, int valuelen,
char *value, int *flag) { char *value, int *flag) {
lam_info_entry_t *search; int err;
int key_length; int key_length;
int value_length;
/* /*
* Simple function. All we need to do is search for the value * Simple function. All we need to do is search for the value
@ -56,29 +55,12 @@ int MPI_Info_get(MPI_Info info, char *key, int valuelen,
return MPI_ERR_INFO_KEY; return MPI_ERR_INFO_KEY;
} }
search = lam_info_find_key (info, key); err = lam_info_get (info, key, valuelen, value, flag);
if (NULL == search){
*flag = 0;
} else {
/* /*
* We have found the element, so we can return the value * Once again, lam_info_get does not return any error. So, as of
* Set the flag, value_length and value * now there is no error condition to check for. But maybe this
* needs to be re-evaluated and then something can be done
*/ */
*flag = 1;
value_length = strlen(search->ie_value);
/*
* If the stored value is shorter than valuelen, then
* we can copy the entire value out. Else, we have to
* copy ONLY valuelen bytes out
*/
if (value_length < valuelen ) {
strcpy(value, search->ie_value);
} else {
lam_strncpy(value, search->ie_value, valuelen);
value[valuelen] = 0;
}
}
return MPI_SUCCESS; return MPI_SUCCESS;
} }

Просмотреть файл

@ -27,12 +27,18 @@
* containing the key-value pairs * containing the key-value pairs
*/ */
int MPI_Info_get_nkeys(MPI_Info info, int *nkeys) { int MPI_Info_get_nkeys(MPI_Info info, int *nkeys) {
int err;
if (NULL == info){ if (NULL == info){
printf ("Invalid MPI_Info handle passed\n"); printf ("Invalid MPI_Info handle passed\n");
return MPI_ERR_ARG; return MPI_ERR_ARG;
} }
*nkeys = (int) lam_list_get_size(&(info->super)); err = lam_info_get_nkeys(info, nkeys);
/*
* check if there are any errors. There does not seem to be any
* error possible in this. But have to look at it again
*/
return MPI_SUCCESS; return MPI_SUCCESS;
} }

Просмотреть файл

@ -25,8 +25,8 @@
* @retval MPI_ERR_ARG * @retval MPI_ERR_ARG
*/ */
int MPI_Info_get_nthkey(MPI_Info info, int n, char *key) { int MPI_Info_get_nthkey(MPI_Info info, int n, char *key) {
lam_info_entry_t *iterator;
int nkeys; int nkeys;
int err;
/* /*
* 1. Check if info is a valid handle * 1. Check if info is a valid handle
@ -45,19 +45,14 @@ int MPI_Info_get_nthkey(MPI_Info info, int n, char *key) {
return MPI_ERR_ARG; return MPI_ERR_ARG;
} else { } else {
/* /*
* Iterate over and over till we get to the nth key * Everything seems alright. Call the back end key copy
*/ */
iterator = (lam_info_entry_t *)lam_list_get_first(&(info->super)); err = lam_info_get_nthkey (info, n, key);
for ( ; n > 0; n--) {
iterator = (lam_info_entry_t *)
iterator->super.lam_list_next;
} }
/* /*
* iterator is of the type lam_list_item_t. We have to * Have to check whether there are any error condditions. It appears
* cast it to lam_info_entry_t before we can use it to * that there are not too many error conditions from the look of it
* access the value
*/ */
strcpy(key, iterator->ie_key);
}
return MPI_SUCCESS; return MPI_SUCCESS;
} }

Просмотреть файл

@ -35,8 +35,8 @@
int MPI_Info_get_valuelen(MPI_Info info, char *key, int *valuelen, int MPI_Info_get_valuelen(MPI_Info info, char *key, int *valuelen,
int *flag) { int *flag) {
lam_info_entry_t *search;
int key_length; int key_length;
int err;
/* /*
* Simple function. All we need to do is search for the value * Simple function. All we need to do is search for the value
@ -53,17 +53,11 @@ int MPI_Info_get_valuelen(MPI_Info info, char *key, int *valuelen,
return MPI_ERR_INFO_KEY; return MPI_ERR_INFO_KEY;
} }
search = lam_info_find_key (info, key); err = lam_info_get_valuelen (info, key, valuelen, flag);
if (NULL == search){
*flag = 0;
} else {
/* /*
* We have found the element, so we can return the value * Once again, the error problem. lam_info_get_valuelen
* Set the flag, value_length and value * does not have an obvious error return.
*/ */
*flag = 1; return err;
*valuelen = strlen(search->ie_value);
}
return MPI_SUCCESS;
} }

Просмотреть файл

@ -37,12 +37,9 @@
* and MPI_ERR_INFO_VALUE are raised * and MPI_ERR_INFO_VALUE are raised
*/ */
int MPI_Info_set(MPI_Info info, char *key, char *value) { int MPI_Info_set(MPI_Info info, char *key, char *value) {
int err;
lam_info_entry_t *new_info;
lam_info_entry_t *old_info;
int key_length; int key_length;
int value_length; int value_length;
char *new_value;
/* /*
* Error conditions are * Error conditions are
@ -74,38 +71,16 @@ int MPI_Info_set(MPI_Info info, char *key, char *value) {
} }
/* /*
* If all is right with the arguments, then: * If all is right with the arguments, then call the back-end
* 1. Allocate space for value * allocator.
* 2. Check if the key was associated with a previous value
* - If so delete that value and store the new value
* 3. Store the (key, value) pair
*/ */
new_value = malloc(value_length * sizeof(char)); err = lam_info_set (info, key, value);
if (NULL == new_value) {
if (MPI_ERR_SYSRESOURCE == err) {
printf ("Unable to malloc memory for new (key, value) pair\n"); printf ("Unable to malloc memory for new (key, value) pair\n");
return MPI_ERR_SYSRESOURCE; return err;
} }
strcpy (new_value, value); return err;
old_info = lam_info_find_key (info, key);
if (NULL != old_info) {
/*
* key already exists. remove the value associated with it
*/
free(old_info->ie_value);
old_info->ie_value = new_value;
} else {
new_info = OBJ_NEW(lam_info_entry_t);
if (NULL == new_info) {
printf ("Unable to malloc memory for new (key, value) pair\n");
return MPI_ERR_SYSRESOURCE;
}
strcpy (new_info->ie_key, key);
new_info->ie_value = new_value;
lam_list_append (&(info->super), (lam_list_item_t *) new_info);
}
return MPI_SUCCESS;
} }