1
1

pmix: fix process name parsing on 32 bits systems

opal_process_name_t is an uint64_t which is not equivalent to
an unsigned long on 32 bits systems.
this is now parsed as an unsigned long long.

This commit was SVN r32592.
Этот коммит содержится в:
Gilles Gouaillardet 2014-08-25 03:08:02 +00:00
родитель e8eb07ad87
Коммит d743da18bf
3 изменённых файлов: 9 добавлений и 3 удалений

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

@ -3,6 +3,8 @@
* Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights
* reserved.
* Copyright (c) 2014 Intel, Inc. All rights reserved.
* Copyright (c) 2014 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -348,7 +350,7 @@ int opal_pmix_base_cache_keys_locally(const opal_identifier_t* id, const char* k
kv->data.uint32 = strtoul(tmp3, NULL, 10);
break;
case OPAL_UINT64:
kv->data.uint64 = strtoul(tmp3, NULL, 10);
kv->data.uint64 = strtoull(tmp3, NULL, 10);
break;
case OPAL_BYTE_OBJECT:
if (size == 0xffff) {

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

@ -1,6 +1,8 @@
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
/*
* Copyright (c) 2014 Intel, Inc. All rights reserved.
* Copyright (c) 2014 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -172,7 +174,7 @@ static int native_init(void)
if (0 != access(uri[1], R_OK)) {
return OPAL_ERR_NOT_FOUND;
}
mca_pmix_native_component.server = strtoul(uri[0], NULL, 10);
mca_pmix_native_component.server = strtoull(uri[0], NULL, 10);
snprintf(mca_pmix_native_component.address.sun_path,
sizeof(mca_pmix_native_component.address.sun_path)-1,
"%s", uri[1]);

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

@ -1,5 +1,7 @@
/*
* Copyright (c) 2014 Intel, Inc. All rights reserved.
* Copyright (c) 2014 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -123,7 +125,7 @@ static int pmix_native_component_query(mca_base_module_t **module, int *priority
} else {
/* if PMIx is present, then we need to use it */
mca_pmix_native_component.uri = strdup(t);
mca_pmix_native_component.id = strtoul(id, NULL, 10);
mca_pmix_native_component.id = strtoull(id, NULL, 10);
opal_proc_set_name(&mca_pmix_native_component.id);
*priority = 100;
}