From 80576d00093e1bbbc79317aae710156078342f19 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@llnl.gov>
Date: Wed, 8 Sep 2010 16:54:39 +0000
Subject: [PATCH] Fixed xlator for the cray plugin to resolve symbols correctly
---
src/common/plugin.c | 5 +++++
src/common/plugrack.c | 7 +++++++
src/common/slurm_xlator.h | 17 ++++++++++++++++-
3 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/src/common/plugin.c b/src/common/plugin.c
index 29810175266..c71469a7b07 100644
--- a/src/common/plugin.c
+++ b/src/common/plugin.c
@@ -68,6 +68,11 @@
# include <stdlib.h>
# endif
+strong_alias(plugin_get_syms, slurm_plugin_get_syms);
+strong_alias(plugin_load_and_link, slurm_plugin_load_and_link);
+strong_alias(plugin_strerror, slurm_plugin_strerror);
+strong_alias(plugin_unload, slurm_plugin_unload);
+
/* dlerror() on AIX sometimes fails, revert to strerror() as needed */
static char *_dlerror(void)
{
diff --git a/src/common/plugrack.c b/src/common/plugrack.c
index d5240371bef..1cc2fd09f63 100644
--- a/src/common/plugrack.c
+++ b/src/common/plugrack.c
@@ -88,6 +88,13 @@ char *strchr(), *strrchr();
#include "src/common/xstring.h"
#include "src/common/plugrack.h"
+strong_alias(plugrack_create, slurm_plugrack_create);
+strong_alias(plugrack_destroy, slurm_plugrack_destroy);
+strong_alias(plugrack_read_dir, slurm_plugrack_read_dir);
+strong_alias(plugrack_set_major_type, slurm_plugrack_set_major_type);
+strong_alias(plugrack_set_paranoia, slurm_plugrack_set_paranoia);
+strong_alias(plugrack_use_by_type, slurm_plugrack_use_by_type);
+
/*
* Represents a plugin in the rack.
*
diff --git a/src/common/slurm_xlator.h b/src/common/slurm_xlator.h
index 73fe79b59cd..16c681da816 100644
--- a/src/common/slurm_xlator.h
+++ b/src/common/slurm_xlator.h
@@ -29,7 +29,8 @@
*****************************************************************************
* Copyright (C) 2004 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
- * Written by Mark Grondona <grondona1@llnl.gov>, Morris Jette <jette1@llnl.gov>
+ * Written by Mark Grondona <grondona1@llnl.gov>,
+ * Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
*
* This file is part of SLURM, a resource management program.
@@ -301,6 +302,20 @@
#define slurmdbd_free_usage_msg slurmdb_slurmdbd_free_usage_msg
#define slurmdbd_free_id_rc_msg slurmdb_slurmdbd_free_id_rc_msg
+/* plugin.[ch] functions */
+#define plugin_get_syms slurm_plugin_get_syms
+#define plugin_load_and_link slurm_plugin_load_and_link
+#define plugin_strerror slurm_plugin_strerror
+#define plugin_unload slurm_plugin_unload
+
+/* plugrack.[ch] functions */
+#define plugrack_create slurm_plugrack_create
+#define plugrack_destroy slurm_plugrack_destroy
+#define plugrack_read_dir slurm_plugrack_read_dir
+#define plugrack_set_major_type slurm_plugrack_set_major_type
+#define plugrack_set_paranoia slurm_plugrack_set_paranoia
+#define plugrack_use_by_type slurm_plugrack_use_by_type
+
#endif /* USE_ALIAS */
/* Include the function definitions after redefining their names. */
--
GitLab