Skip to content

v2.0.x: ompi/debuggers: make the binary bit reproducible #2556

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 13, 2016
Merged

v2.0.x: ompi/debuggers: make the binary bit reproducible #2556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion ompi/debuggers/ompi_common_dll.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* reserved.
* Copyright (c) 2008-2009 Sun Microsystems, Inc. All rights reserved.
* Copyright (c) 2012-2013 Inria. All rights reserved.
* Copyright (c) 2014-2015 Research Organization for Information Science
* Copyright (c) 2014-2016 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* Copyright (c) 2014 Intel, Inc. All rights reserved.
* Copyright (c) 2015 Los Alamos National Security, LLC. All rights
Expand Down Expand Up @@ -44,6 +44,8 @@

#include "ompi_common_dll_defs.h"

#include <string.h>

/* Basic callbacks into the debugger */
const mqs_basic_callbacks *mqs_basic_entrypoints = NULL;

Expand Down Expand Up @@ -629,3 +631,20 @@ int ompi_fetch_opal_pointer_array_item(mqs_process *proc, mqs_taddr_t addr,

return mqs_ok;
}

int ompi_get_lib_version(char * buf, int size) {
int ret;
ret = snprintf(buf, size-1, "Open MPI v%d.%d.%d%s%s%s%s%s%s%s%s%s",
OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, OMPI_RELEASE_VERSION,
(strlen(OMPI_GREEK_VERSION) > 0)?OMPI_GREEK_VERSION:"",
(strlen(OPAL_PACKAGE_STRING) > 0)?", package: ":"",
(strlen(OPAL_PACKAGE_STRING) > 0)?OPAL_PACKAGE_STRING:"",
(strlen(OPAL_IDENT_STRING)> 0)?", ident: ":"",
(strlen(OPAL_IDENT_STRING)> 0)?OMPI_IDENT_STRING:"",
(strlen(OMPI_REPO_REV) > 0)?", repo rev: ":"",
(strlen(OMPI_REPO_REV) > 0)?OMPI_REPO_REV:"",
(strlen(OMPI_RELEASE_DATE) > 0)?", ":"",
(strlen(OMPI_RELEASE_DATE) > 0)?OMPI_RELEASE_DATE:"");
buf[size-1] = '\0';
return ret;
}
4 changes: 4 additions & 0 deletions ompi/debuggers/ompi_common_dll_defs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
* Copyright (c) 2012-2013 Inria. All rights reserved.
* Copyright (c) 2015 Los Alamos National Security, LLC. All rights
* reserved.
* Copyright (c) 2016 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand Down Expand Up @@ -330,4 +332,6 @@ int ompi_fetch_opal_pointer_array_info(mqs_process *proc, mqs_taddr_t addr,
int ompi_fetch_opal_pointer_array_item(mqs_process *proc, mqs_taddr_t addr,
mpi_process_info *p_info, int index,
mqs_taddr_t *item);
#define OMPI_MAX_VER_SIZE 256
int ompi_get_lib_version(char *buf, int size);
#endif
11 changes: 9 additions & 2 deletions ompi/debuggers/ompi_mpihandles_dll.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
* reserved.
* Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved.
* Copyright (c) 2012-2013 Inria. All rights reserved.
* Copyright (c) 2016 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand Down Expand Up @@ -164,12 +166,17 @@ int mpidbg_interface_version_compatibility(void)
}


static char mpidbg_version_str[OMPI_MAX_VER_SIZE];

/* Returns a string specific to OMPI */
char *mpidbg_version_string(void)
{
int offset;
printf("mpidbg_version_string\n");
return "Open MPI handle interpretation support for parallel"
" debuggers compiled on " __DATE__;
offset = snprintf(mpidbg_version_str, OMPI_MAX_VER_SIZE-1,
"Open MPI handle interpretation support for parallel debuggers ");
ompi_get_lib_version(mpidbg_version_str+offset, OMPI_MAX_VER_SIZE-offset);
return mpidbg_version_str;
}


Expand Down
9 changes: 9 additions & 0 deletions ompi/debuggers/ompi_msgq_dll.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
* Copyright (c) 2015 Los Alamos National Security, LLC. All rights
* reserved.
* Copyright (c) 2016 Intel, Inc. All rights reserved.
* Copyright (c) 2016 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand Down Expand Up @@ -186,11 +188,18 @@ int mqs_version_compatibility (void)
return MQS_INTERFACE_COMPATIBILITY;
} /* mqs_version_compatibility */

static char mqs_version_str[OMPI_MAX_VER_SIZE];

/* This one can say what you like */
char *mqs_version_string (void)
{
return "Open MPI message queue support for parallel"
" debuggers compiled on " __DATE__;
int offset;
offset = snprintf(mqs_version_str, OMPI_MAX_VER_SIZE-1,
"Open MPI message queue support for parallel debuggers ");
ompi_get_lib_version(mqs_version_str+offset, OMPI_MAX_VER_SIZE-offset);
return mqs_version_str;
} /* mqs_version_string */

/* So the debugger can tell what interface width the library was compiled with */
Expand Down