From c97a202517610834cb044fb5a8bb9887a08ef81c Mon Sep 17 00:00:00 2001 From: Barry Rountree Date: Thu, 30 Jul 2026 22:27:21 -0700 Subject: [PATCH 01/21] [prune-config] Removes --enable-bluegene Performed by Claude Code + Opus --- configure.ac | 44 +--- configure.common.ac | 24 +- doc/spindle_launch_README.md | 9 +- m4/lx_detect_bluegene.m4 | 75 ------ src/biter/bgq_daemon_ids.c | 248 ------------------ src/biter/bgq_ids.c | 42 --- src/biter/biterc.c | 4 - src/client/biter/Makefile.am | 6 - src/client/client_comlib/client_api_pipe.c | 3 +- src/client/configure.ac | 1 - src/client/ldsolookup/Makefile.am | 4 - src/fe/configure.ac | 1 - src/fe/launchmon/spindle_fe_lmon.cc | 7 - src/fe/startup/config_mgr.cc | 4 - src/fe/startup/parse_launcher.cc | 7 +- src/fe/startup/parseargs.cc | 9 - src/include/spindle_launch.h | 4 +- src/logging/spindle_logc.c | 2 +- .../auditserver/ldcs_audit_server_filemngt.c | 4 - src/server/biter/Makefile.am | 5 - src/server/configure.ac | 1 - src/server/launchmon/spindle_be_lmon.cc | 5 +- testsuite/Makefile.am | 5 - 23 files changed, 23 insertions(+), 491 deletions(-) delete mode 100644 m4/lx_detect_bluegene.m4 delete mode 100644 src/biter/bgq_daemon_ids.c delete mode 100644 src/biter/bgq_ids.c diff --git a/configure.ac b/configure.ac index b2c519d4..75c180cf 100644 --- a/configure.ac +++ b/configure.ac @@ -105,48 +105,26 @@ AC_OUTPUT AC_DEFUN([SET_BE_COMPILER_VAR],[ VARNAME=\$BE_$1 BE_VAR=`eval echo $VARNAME` - if test "x$OS_BUILD" == "xbluegene"; then - if test "x$BE_VAR" != "x"; then - CLIENT_$1=$BE_VAR - elif test "x$2" != "x"; then - CLIENT_$1=$2 - elif test "x$USER_SPECIFIED_COMPS" == "xtrue"; then - echo Setting CLIENT_$1 to $$1 - CLIENT_$1= - else - CLIENT_$1=$$1 - fi - SERVER_$1=$$1 - FE_$1=$$1 - elif test "x$OS_BUILD" == "xlinux"; then - if test "x$BE_VAR" == "x"; then - if test "x$USER_SPECIFIED_COMPS" == "x"; then - BE_VAR=$$1 - fi - fi - CLIENT_$1=$BE_VAR - SERVER_$1=$BE_VAR - FE_$1=$$1 - fi]) + if test "x$BE_VAR" == "x"; then + if test "x$USER_SPECIFIED_COMPS" == "x"; then + BE_VAR=$$1 + fi + fi + CLIENT_$1=$BE_VAR + SERVER_$1=$BE_VAR + FE_$1=$$1 +]) if test "$BE_CC x $BE_CXX x $BE_host" != " x x "; then USER_SPECIFIED_COMPS="true" fi -if test "x$OS_BUILD" == "xbluegene"; then - if test -d /bgsys/drivers/toolchain/V1R2M1/gnu-linux/bin; then - BG_COMP_PATH=/bgsys/drivers/toolchain/V1R2M1/gnu-linux/bin/ - elif test -d /bgsys/drivers/toolchain/V1R2M0/gnu-linux/bin; then - BG_COMP_PATH=/bgsys/drivers/toolchain/V1R2M0/gnu-linux/bin/ - fi -fi - -SET_BE_COMPILER_VAR([CC], [${BG_COMP_PATH}powerpc64-bgq-linux-gcc]) +SET_BE_COMPILER_VAR([CC]) SET_BE_COMPILER_VAR([CFLAGS]) SET_BE_COMPILER_VAR([LDFLAGS]) SET_BE_COMPILER_VAR([LIBS]) SET_BE_COMPILER_VAR([CPPFLAGS]) -SET_BE_COMPILER_VAR([CXX], [${BG_COMP_PATH}powerpc64-bgq-linux-c++]) +SET_BE_COMPILER_VAR([CXX]) SET_BE_COMPILER_VAR([CXXFLAGS]) SET_BE_COMPILER_VAR([CPP], [${BG_COMP_PATH}powerpc64-bgq-linux-cpp]) SET_BE_COMPILER_VAR([CXXCPP]) diff --git a/configure.common.ac b/configure.common.ac index 1b187f2e..d1709f30 100644 --- a/configure.common.ac +++ b/configure.common.ac @@ -121,12 +121,7 @@ AC_DEFINE_UNQUOTED([NEWTHREAD_LOCALE_BUG],[$LOCALE_FAULT_BUG],[Defined if GLIBC #OS Detection -AC_ARG_ENABLE(bluegene, - [AS_HELP_STRING([--enable-bluegene],[Build Spindle for BlueGene/Q])], - [OS_BUILD=bluegene],) -if test "x$OS_BUILD" == "x"; then - OS_BUILD=linux -fi +OS_BUILD=linux #Startup type AC_ARG_WITH(hostbin, @@ -202,12 +197,7 @@ AC_DEFINE_UNQUOTED([BROKEN_SRUN],[$BROKEN_SRUN],[Whether we are using a broken s AC_DEFINE_UNQUOTED([HAVE_SRUN_EXTERNAL_LAUNCHER],[$HAVE_EXT_LAUNCHER],[Whether srun supports --external-launcher]) #Runmode detection (pipe/socket or cobo/msocket communications) -if test "x$OS_BUILD" == "xlinux"; then - CLIENT_SERVER_COM=pipes -fi -if test "x$OS_BUILD" == "xbluegene"; then - CLIENT_SERVER_COM=biter -fi +CLIENT_SERVER_COM=pipes SERVER_SERVER_COM=cobo AC_ARG_ENABLE(pipes, @@ -291,19 +281,14 @@ if test "x$target_cpu" == "xaarch64"; then fi #OS defines -AM_CONDITIONAL([BGQ_BLD], [test "x$OS_BUILD" == "xbluegene"]) +AM_CONDITIONAL([BGQ_BLD], [false]) AM_CONDITIONAL([LINUX_BLD], [test "x$OS_BUILD" == "xlinux"]) AM_CONDITIONAL([X86_64_BLD], [test "x$ARCH_BUILD" == "xx86_64"]) AM_CONDITIONAL([PPC64_BLD], [test "x$ARCH_BUILD" == "xppc64"]) AM_CONDITIONAL([PPC64LE_BLD], [test "x$ARCH_BUILD" == "xppc64le"]) AM_CONDITIONAL([AARCH64_BLD], [test "x$ARCH_BUILD" == "xaarch64"]) -if test "x$OS_BUILD" == "xlinux"; then AC_DEFINE([os_linux],[1],[Define if we're compiling for a linux target]) -fi -if test "x$OS_BUILD" == "xbluegene"; then -AC_DEFINE([os_bluegene],[1],[Define if we're compiling for a BlueGene target]) -fi #Python prefix AC_ARG_WITH(python-prefix, @@ -357,9 +342,6 @@ fi AC_ARG_ENABLE(cleanup-process, [AS_HELP_STRING([--enable-cleanup-process],[Default to using a dedicated process to clean relocated files])], [CLEANUP_PROC="true"],) -if test "x$OS_BUILD" == "xbluegene"; then - CLEANUP_PROC="true" -fi #Audit options AC_ARG_ENABLE(subaudit-as-default, diff --git a/doc/spindle_launch_README.md b/doc/spindle_launch_README.md index a30c8df8..b45ef86b 100644 --- a/doc/spindle_launch_README.md +++ b/doc/spindle_launch_README.md @@ -81,10 +81,8 @@ we have to break ABI compatibility. - `OPT_REMAPEXEC` - Use a remapping hack to make /proc/PID/exe point to original exe - `OPT_LOGUSAGE` - Log usage information to a file - - `OPT_SHMCACHE` - Use a shared memory cache optimization (only needed - on BlueGene) - - `OPT_SUBAUDIT` - Use the subaudit mechanism (needed on BlueGene and - very old GLIBCs) + - `OPT_SHMCACHE` - Use a shared memory cache optimization + - `OPT_SUBAUDIT` - Use the subaudit mechanism (needed on very old GLIBCs) - `OPT_PERSIST` - Spindle servers should remain running after all clients exit. - `OPT_SEC` - Security mode, set to one of the below `OPT_SEC_*` @@ -172,8 +170,7 @@ we have to break ABI compatibility. start Spindle servers. *This is the value that should be used with this API*. - `unsigned int shm_cache_size` - When using a shared memory cache - between clients, this is the size in bytes of the cache. This is - only used on BlueGene systems. + between clients, this is the size in bytes of the cache. - `char *location` - The staging directory where Spindle should store relocated files. This should preferably be on local and scalable storage, such as a RAMDISK or SSD. You can use environment variables diff --git a/m4/lx_detect_bluegene.m4 b/m4/lx_detect_bluegene.m4 deleted file mode 100644 index 2777ff3d..00000000 --- a/m4/lx_detect_bluegene.m4 +++ /dev/null @@ -1,75 +0,0 @@ -################################################################################################# -# Copyright (c) 2010, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory -# Written by Todd Gamblin, tgamblin@llnl.gov. -# LLNL-CODE-417602 -# All rights reserved. -# -# This file is part of Libra. For details, see http://github.com/tgamblin/libra. -# Please also read the LICENSE file for further information. -# -# Redistribution and use in source and binary forms, with or without modification, are -# permitted provided that the following conditions are met: -# -# * Redistributions of source code must retain the above copyright notice, this list of -# conditions and the disclaimer below. -# * Redistributions in binary form must reproduce the above copyright notice, this list of -# conditions and the disclaimer (as noted below) in the documentation and/or other materials -# provided with the distribution. -# * Neither the name of the LLNS/LLNL nor the names of its contributors may be used to endorse -# or promote products derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS -# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL -# LAWRENCE LIVERMORE NATIONAL SECURITY, LLC, THE U.S. DEPARTMENT OF ENERGY OR CONTRIBUTORS BE -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -################################################################################################# - -# -# LX_DETECT_BLUEGENE -# -# Defines some compile-time tests to detect BlueGene architectures. -# This will AC_DEFINE the following macros if detected: -# -# BLUEGENE_L If BlueGene/L architecture is detected -# BLUEGENE_P If BlueGene/P architecture is detected -# BLUEGENE_Q If BlueGene/Q architecture is detected -# -AC_DEFUN([LX_DETECT_BLUEGENE], -[ - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#ifndef __blrts__ -#error "not BlueGene/L" -#endif /* __blrts__ */ -]])], - [ - AC_DEFINE([os_bgl],[1],[Define if we're compiling for a BlueGene/L system]) - AC_DEFINE([os_bg],[1],[Define if we're compiling for any BlueGene system]) - ]) - - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#ifdef __linux__ -#include -#endif /* __linux__ */ -#if !(defined(__bgp__) || defined(CONFIG_BGP)) -#error "not BlueGene/P" -#endif /* !(defined(__bgp__) || defined(CONFIG_BGP)) */ -]])], - [ - AC_DEFINE([os_bgp],[1],[Define if we're compiling for a BlueGene/P system]) - AC_DEFINE([os_bg],[1],[Define if we're compiling for any BlueGene system]) - ]) - - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if !defined(__bgq__) -#error "not BlueGene/Q" -#endif -]])], - [ - AC_DEFINE([os_bgq],[1],[Define if we're compiling for a BlueGene/Q system]) - AC_DEFINE([os_bg],[1],[Define if we're compiling for any BlueGene system]) - ]) - -]) diff --git a/src/biter/bgq_daemon_ids.c b/src/biter/bgq_daemon_ids.c deleted file mode 100644 index f64c2203..00000000 --- a/src/biter/bgq_daemon_ids.c +++ /dev/null @@ -1,248 +0,0 @@ -/* -This file is part of Spindle. For copyright information see the COPYRIGHT -file in the top level directory, or at -https://github.com/hpc/Spindle/blob/master/COPYRIGHT - -This program is free software; you can redistribute it and/or modify it under -the terms of the GNU Lesser General Public License (as published by the Free Software -Foundation) version 2.1 dated February 1999. This program is distributed in the -hope that it will be useful, but WITHOUT ANY WARRANTY; without even the IMPLIED -WARRANTY OF MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms -and conditions of the GNU Lesser General Public License for more details. You should -have received a copy of the GNU Lesser General Public License along with this -program; if not, write to the Free Software Foundation, Inc., 59 Temple -Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "spindle_debug.h" -#include "ldcs_api.h" - -#define MAX_CNS_PER_ION 256 - -typedef struct socket_hash_t { - uint32_t max_rank; - uint32_t num_ranks; - uint32_t hash_val; - char *socket_name; -} socket_hash_t; - -typedef struct cn_info_t { - uint32_t max_rank; - uint32_t num_ranks; -} cn_info_t; - -static int num_cns; -static cn_info_t *cns = NULL; - -static uint32_t *rank_table; -static unsigned int max_ranks_per_cn; -static unsigned int max_rank; - -#define RANK(X, Y) rank_table[X * max_ranks_per_cn + Y] - -static int write_rank_file(const char *tmpdir, socket_hash_t *socket_hash, unsigned int socket_hash_size) -{ - int fd; - unsigned int i; - char prepath[MAX_PATH_LEN+1]; - char path[MAX_PATH_LEN+1]; - ssize_t result; - - /* Open rankFile.pre */ - snprintf(prepath, MAX_PATH_LEN, "%s/rankFile.pre", tmpdir); - prepath[MAX_PATH_LEN] = '\0'; - fd = open(prepath, O_CREAT|O_EXCL|O_WRONLY, 0600); - if (fd == -1) { - err_printf("Unable to create rankfile %s: %s\n", prepath, strerror(errno)); - return -1; - } - - /* Write the rank counts to rankFile.pre */ - for (i = 0; i < socket_hash_size; i++) { - if (!socket_hash[i].socket_name) - continue; - result = write(fd, & socket_hash[i].max_rank, sizeof(socket_hash[i].max_rank)); - if (result == -1) { - err_printf("Unable to write max_rank to %s: %s\n", prepath, strerror(errno)); - return -1; - } - result = write(fd, & socket_hash[i].num_ranks, sizeof(socket_hash[i].num_ranks)); - if (result == -1) { - err_printf("Unable to write num_ranks to %s: %s\n", prepath, strerror(errno)); - return -1; - } - } - close(fd); - - /* Move rankFile.pre to rankFile */ - snprintf(path, MAX_PATH_LEN, "%s/rankFile", tmpdir); - prepath[MAX_PATH_LEN] = '\0'; - result = rename(prepath, path); - if (result == -1) { - err_printf("Unable to rename %s to %s\n", prepath, path); - return -1; - } - - return 0; -} - -static unsigned int str_hash(const char *str) -{ - unsigned long hash = 5381; - int c; - while ((c = *str++)) - hash = ((hash << 5) + hash) + c; - return hash; -} - -static socket_hash_t *find_or_add_in_table(const char *socket_name, socket_hash_t *table) -{ - unsigned int hash_val; - int i, start_val; - - hash_val = str_hash(socket_name); - i = start_val = (hash_val % MAX_CNS_PER_ION); - - for (;;) { - if (hash_val == table[i].hash_val && strcmp(socket_name, table[i].socket_name) == 0) - return table + i; - if (table[i].socket_name == NULL) { - table[i].socket_name = strdup(socket_name); - table[i].hash_val = hash_val; - table[i].max_rank = table[i].num_ranks = 0; - num_cns++; - return table + i; - } - - i++; - if (i == MAX_CNS_PER_ION) - i = 0; - assert(i != start_val); - } -} - -int biterd_init_comms(const char *tmpdir) -{ - static int ret_val = -1; - int jobid, rank, i, j; - char *jobid_s, *fname; - char path[128], socket_path[128]; - DIR *dir; - struct dirent *de; - ssize_t result; - socket_hash_t *entry; - socket_hash_t socket_hash[MAX_CNS_PER_ION]; - - if (cns) - return ret_val; - - jobid_s = getenv("BG_JOBID"); - if (jobid_s == NULL) - return -1; - jobid = atoi(jobid_s); - - snprintf(path, sizeof(path), "/jobs/%d/toolctl_rank", jobid); - dir = opendir(path); - if (dir == NULL) - return -1; - - memset(socket_hash, 0, sizeof(socket_hash)); - while ((de = readdir(dir)) != NULL) { - fname = de->d_name; - if (fname[0] == '\0' || fname[0] == '.') - continue; - rank = atoi(fname); - - snprintf(path, sizeof(path), "/jobs/%d/toolctl_rank/%d", jobid, rank); - - memset(socket_path, 0, sizeof(socket_path)); - result = readlink(path, socket_path, sizeof(socket_path)); - socket_path[sizeof(socket_path)-1] = '\0'; - if (result == -1) { - closedir(dir); - return -1; - } - - entry = find_or_add_in_table(socket_path, socket_hash); - assert(entry); - - if (rank > entry->max_rank) - entry->max_rank = rank; - if (rank > max_rank) - max_rank = rank; - entry->num_ranks++; - if (entry->num_ranks > max_ranks_per_cn) - max_ranks_per_cn = entry->num_ranks; - } - - closedir(dir); - - result = write_rank_file(tmpdir, socket_hash, MAX_CNS_PER_ION); - if (result == -1) - return -1; - - cns = malloc(sizeof(cn_info_t) * num_cns); - for (i = 0, j = 0; i < MAX_CNS_PER_ION; i++) { - if (socket_hash[i].socket_name == NULL) - continue; - - assert(j < num_cns); - cns[j].max_rank = socket_hash[i].max_rank; - cns[j].num_ranks = socket_hash[i].num_ranks; - j++; - free(socket_hash[i].socket_name); - } - - rank_table = malloc(sizeof(rank_table[0]) * max_ranks_per_cn * num_cns); - assert(rank_table); - - ret_val = 0; - return ret_val; -} - -int biterd_num_compute_nodes() -{ - return num_cns; -} - -int biterd_ranks_in_cn(int cn_id) -{ - assert(cn_id < num_cns); - return cns[cn_id].num_ranks; -} - -int biterd_unique_num_for_cn(int cn_id) -{ - assert(cn_id < num_cns); - return cns[cn_id].max_rank; -} - -int biterd_register_rank(int session_id, uint32_t client_id, uint32_t rank) -{ - assert(session_id >= 0 && session_id < num_cns); - assert(client_id < cns[session_id].num_ranks); - assert(rank <= cns[session_id].max_rank); - assert(rank <= max_rank); - assert(rank_table); - - RANK(session_id, client_id) = rank; - return 0; -} - -int biterd_get_rank(int compute_node_id, int client_id) -{ - return RANK(compute_node_id, client_id); -} - diff --git a/src/biter/bgq_ids.c b/src/biter/bgq_ids.c deleted file mode 100644 index b87cac96..00000000 --- a/src/biter/bgq_ids.c +++ /dev/null @@ -1,42 +0,0 @@ -/* -This file is part of Spindle. For copyright information see the COPYRIGHT -file in the top level directory, or at -https://github.com/hpc/Spindle/blob/master/COPYRIGHT - -This program is free software; you can redistribute it and/or modify it under -the terms of the GNU Lesser General Public License (as published by the Free Software -Foundation) version 2.1 dated February 1999. This program is distributed in the -hope that it will be useful, but WITHOUT ANY WARRANTY; without even the IMPLIED -WARRANTY OF MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms -and conditions of the GNU Lesser General Public License for more details. You should -have received a copy of the GNU Lesser General Public License along with this -program; if not, write to the Free Software Foundation, Inc., 59 Temple -Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -#include -#include -#include "spi/include/kernel/location.h" -#include "spi/include/kernel/process.h" -#include "ids.h" -#include "spindle_debug.h" - -#define MEMORY_BARRIER __sync_synchronize() - -extern int take_queue_lock(void *session); -extern int release_queue_lock(void *session); - -int biterc_get_job_id() -{ - int result = (int) Kernel_GetJobID(); - if (result == INT_MIN) - result = INT_MAX; - else if (result < 0) - result *= -1; - return result; -} - -unsigned int biterc_get_rank(int session_id) -{ - return Kernel_GetRank(); -} diff --git a/src/biter/biterc.c b/src/biter/biterc.c index dae112f1..1a76ac64 100644 --- a/src/biter/biterc.c +++ b/src/biter/biterc.c @@ -219,12 +219,8 @@ static int biter_connect(const char *tmpdir, biterc_session_t *session) shminfo_t *shm = session->shm; biter_header_t *biter_header = & shm->shared_header->biter; -#if defined(os_bluegene) - unique_number = biterc_get_unique_number(session, tmpdir, shm->shared_header+1); -#else unique_number = 0; (void) biterc_get_unique_number; -#endif rank = biterc_get_rank(sessions - session); debug_printf3("biter rank = %u\n", rank); diff --git a/src/client/biter/Makefile.am b/src/client/biter/Makefile.am index 1306bb3b..2fb0b44b 100644 --- a/src/client/biter/Makefile.am +++ b/src/client/biter/Makefile.am @@ -9,10 +9,4 @@ libsheep_la_SOURCES = $(top_srcdir)/../biter/sheep.c $(top_srcdir)/../biter/shmu AM_CPPFLAGS = -I$(top_srcdir)/../biter -I$(top_srcdir)/../logging -I$(top_srcdir)/../include -I$(top_srcdir)/../utils AM_CFLAGS = -fvisibility=hidden -if BGQ_BLD -AM_CPPFLAGS += -I/bgsys/drivers/ppcfloor/comm/lib/gnu -I/bgsys/drivers/ppcfloor -I/bgsys/drivers/ppcfloor/comm/sys/include -I/bgsys/drivers/ppcfloor/spi/include -I/bgsys/drivers/ppcfloor/spi/include/kernel/cnk -libbiterc_la_SOURCES += $(top_srcdir)/../biter/bgq_ids.c -endif -if LINUX_BLD libbiterc_la_SOURCES += $(top_srcdir)/../biter/linux_ids.c -endif diff --git a/src/client/client_comlib/client_api_pipe.c b/src/client/client_comlib/client_api_pipe.c index 7f3df457..f7159951 100644 --- a/src/client/client_comlib/client_api_pipe.c +++ b/src/client/client_comlib/client_api_pipe.c @@ -106,8 +106,7 @@ static int read_pipe(int fd, void *data, int bytes) /* If we've just exec'd, we may have lost the fds for our pipe connection with the server. Parse /proc/self/fd for the open fds and find the ones that point to the pipes. This only works on Linux based systems with /proc - mounted. But, on the BlueGene alternative we won't be dealing with execs - anyways. + mounted. */ static int find_existing_fds(char *in_path, char *out_path, int *in_fd, int *out_fd) { diff --git a/src/client/configure.ac b/src/client/configure.ac index 59ab5d99..1a47aced 100644 --- a/src/client/configure.ac +++ b/src/client/configure.ac @@ -15,7 +15,6 @@ SPINDLE_BUILD_ROOT=`pwd`/../.. SPINDLE_SOURCE_ROOT=`realpath ${srcdir}/../..` #Include common ops -m4_include([../../m4/lx_detect_bluegene.m4]) m4_include([../../configure.common.ac]) CHECK_MMAP([cl]) diff --git a/src/client/ldsolookup/Makefile.am b/src/client/ldsolookup/Makefile.am index 88280c81..f7e756dc 100644 --- a/src/client/ldsolookup/Makefile.am +++ b/src/client/ldsolookup/Makefile.am @@ -8,8 +8,4 @@ print_ldso_entry_CPPFLAGS = -DLIBEXECDIR=\"$(pkglibexecdir)\" libprint_ldso_audit_la_LDFLAGS = -shared -avoid-version -if BGQ_BLD -print_ldso_entry_LDFLAGS = -dynamic -endif - diff --git a/src/fe/configure.ac b/src/fe/configure.ac index e6382b5a..7ad2f3ff 100644 --- a/src/fe/configure.ac +++ b/src/fe/configure.ac @@ -17,7 +17,6 @@ SPINDLE_BUILD_ROOT=`pwd`/../.. SPINDLE_SOURCE_ROOT=`realpath ${srcdir}/../..` #Include common ops -m4_include([../../m4/lx_detect_bluegene.m4]) m4_include([../../configure.common.ac]) CHOOSE_SEC CHOOSE_DEF_AUDIT diff --git a/src/fe/launchmon/spindle_fe_lmon.cc b/src/fe/launchmon/spindle_fe_lmon.cc index 142464cb..f18d4251 100644 --- a/src/fe/launchmon/spindle_fe_lmon.cc +++ b/src/fe/launchmon/spindle_fe_lmon.cc @@ -40,11 +40,7 @@ using namespace std; #error Expected LAUNCHMON_BIN_DIR to be defined #endif -#if defined(os_bluegene) -#define PUSH_ENV_DEFAULT_VAL true -#else #define PUSH_ENV_DEFAULT_VAL false -#endif static bool push_env = PUSH_ENV_DEFAULT_VAL; @@ -101,9 +97,6 @@ void LMonLauncher::initEnvironment() setenv("LMON_PREFIX", LAUNCHMON_BIN_DIR "/..", 0); setenv("LMON_LAUNCHMON_ENGINE_PATH", LAUNCHMON_BIN_DIR "/launchmon", 0); setenv("LMON_NEWLAUNCHMON_ENGINE_PATH", LAUNCHMON_BIN_DIR "/newlaunchmon", 0); -#if defined(os_bluegene) - setenv("LMON_DONT_STOP_APP", "1", 1); -#endif } static const char *pt_to_string(const MPIR_PROCDESC_EXT &pt) { diff --git a/src/fe/startup/config_mgr.cc b/src/fe/startup/config_mgr.cc index e1368642..65ab9248 100644 --- a/src/fe/startup/config_mgr.cc +++ b/src/fe/startup/config_mgr.cc @@ -104,11 +104,7 @@ using namespace std; #define AUDITTYPE_STR "audit" #endif -#if defined(os_bluegene) -#define SHMCACHE_SIZE_STR "2048" -#else #define SHMCACHE_SIZE_STR "0" -#endif #if defined(HOSTBIN_PATH) #define HOSTBIN_ENABLE_STR "true" diff --git a/src/fe/startup/parse_launcher.cc b/src/fe/startup/parse_launcher.cc index 4484e998..f6ca3f2b 100644 --- a/src/fe/startup/parse_launcher.cc +++ b/src/fe/startup/parse_launcher.cc @@ -317,17 +317,12 @@ void ModifyArgv::modifyCmdLine() for (; p < argc; p++) { if (p == parser->appExecutableAt()) { -#if defined(os_bluegene) - string bg_env_str = parser->getParser()->getBGString(); - parser->getParser()->addBGEnvStr(n, new_argv, bg_env_str, default_libstr, intercept_libstr, commpath, number, options, shmcache_size); -#else char **a_argv; int a_argc; getApplicationArgsFE(params, &a_argc, &a_argv); - for (int i = 0; i < a_argc; i++) + for (int i = 0; i < a_argc; i++) new_argv[n++] = a_argv[i]; (void) default_libstr; (void) intercept_libstr; //Not needed on linux -#endif } if (!parser->getParser()->includeArg(argc, argv, p)) continue; diff --git a/src/fe/startup/parseargs.cc b/src/fe/startup/parseargs.cc index 2600f1ff..65fdcb07 100644 --- a/src/fe/startup/parseargs.cc +++ b/src/fe/startup/parseargs.cc @@ -58,24 +58,15 @@ using namespace std; #endif #if !defined(USE_SUBAUDIT_BY_DEFAULT) /* May be defined via configure */ -#if defined(os_bluegene) -#define DEFAULT_USE_SUBAUDIT 1 -#else #define DEFAULT_USE_SUBAUDIT 0 -#endif #else #define DEFAULT_USE_SUBAUDIT 1 #endif #define DEFAULT_PERSIST 0 -#if defined(os_bluegene) -#define SHM_DEFAULT_SIZE 2048 -#define SHM_MIN_SIZE 4 -#else #define SHM_DEFAULT_SIZE 0 #define SHM_MIN_SIZE 0 -#endif #define DEFAULT_MSGCACHE_BUFFER_KB 1024 #define DEFAULT_MSGCACHE_TIMEOUT_MS 100 diff --git a/src/include/spindle_launch.h b/src/include/spindle_launch.h index 98121396..b3d26bfe 100644 --- a/src/include/spindle_launch.h +++ b/src/include/spindle_launch.h @@ -46,8 +46,8 @@ extern "C" { #define OPT_NOHIDE (1 << 13) /* Hide Spindle's communication FDs from application */ #define OPT_REMAPEXEC (1 << 14) /* Use remapping hack to make /proc/PID/exe point to original exe */ #define OPT_LOGUSAGE (1 << 15) /* Log usage information to a file */ -#define OPT_SHMCACHE (1 << 16) /* Use a shared memory cache optimization (only needed on BlueGene) */ -#define OPT_SUBAUDIT (1 << 17) /* Use subaudit mechanism (needed on BlueGene and very old GLIBCs) */ +#define OPT_SHMCACHE (1 << 16) /* Use a shared memory cache optimization */ +#define OPT_SUBAUDIT (1 << 17) /* Use subaudit mechanism (needed on very old GLIBCs) */ #define OPT_PERSIST (1 << 18) /* Spindle servers should not exit when all clients exit. */ #define OPT_SEC (7 << 19) /* Security mode, one of the below OPT_SEC_* values */ #define OPT_SESSION (1 << 22) /* Session mode, where Spindle lifetime spans jobs */ diff --git a/src/logging/spindle_logc.c b/src/logging/spindle_logc.c index 4e82300f..de99dfca 100644 --- a/src/logging/spindle_logc.c +++ b/src/logging/spindle_logc.c @@ -69,7 +69,7 @@ int fileExists(char *name) void spawnLogDaemon(char *tempdir) { -#if !defined(SPINDLECLIENT) || !defined(os_bluegene) +#if !defined(SPINDLECLIENT) int result = fork(); if (result == 0) { result = fork(); diff --git a/src/server/auditserver/ldcs_audit_server_filemngt.c b/src/server/auditserver/ldcs_audit_server_filemngt.c index 1d0f410b..4fa75f0e 100644 --- a/src/server/auditserver/ldcs_audit_server_filemngt.c +++ b/src/server/auditserver/ldcs_audit_server_filemngt.c @@ -742,7 +742,6 @@ static int ldso_metadata_sym(char *pathname, ldso_info_t *ldsoinfo) return ret; } -#if !defined(os_bgq) static int ldso_metadata_run(char *pathname, ldso_info_t *ldsoinfo) { FILE *f; @@ -780,7 +779,6 @@ static int ldso_metadata_run(char *pathname, ldso_info_t *ldsoinfo) ldsoinfo->errno_offset = 0; return 0; } -#endif int filemngt_get_ldso_metadata(char *pathname, ldso_info_t *ldsoinfo) { @@ -791,12 +789,10 @@ int filemngt_get_ldso_metadata(char *pathname, ldso_info_t *ldsoinfo) if (result == 0) return 0; -#if !defined(os_bgq) debug_printf("Getting symbol offsets of %s from invoking print_ldso_entry\n", pathname); result = ldso_metadata_run(pathname, ldsoinfo); if (result == 0) return 0; -#endif err_printf("Could not find any mechanism for fetching ldso metadata of %s\n", pathname); return -1; diff --git a/src/server/biter/Makefile.am b/src/server/biter/Makefile.am index 694191dd..5ec10f21 100644 --- a/src/server/biter/Makefile.am +++ b/src/server/biter/Makefile.am @@ -6,10 +6,5 @@ libbiterd_la_SOURCES = $(top_srcdir)/../biter/biterd.c $(top_srcdir)/../biter/se libbiterd_la_CFLAGS = -DSERVER AM_CPPFLAGS = -I$(top_srcdir)/../biter -I$(top_srcdir)/../logging -I$(top_srcdir)/../include -if BGQ_BLD -libbiterd_la_SOURCES += $(top_srcdir)/../biter/bgq_daemon_ids.c -endif -if LINUX_BLD libbiterd_la_SOURCES += $(top_srcdir)/../biter/linux_daemon_ids.c -endif diff --git a/src/server/configure.ac b/src/server/configure.ac index 4f0de390..46ccafae 100644 --- a/src/server/configure.ac +++ b/src/server/configure.ac @@ -17,7 +17,6 @@ SPINDLE_BUILD_ROOT=`pwd`/../.. SPINDLE_SOURCE_ROOT=`realpath ${srcdir}/../..` #Include common ops -m4_include([../../m4/lx_detect_bluegene.m4]) m4_include([../../configure.common.ac]) CHOOSE_SEC diff --git a/src/server/launchmon/spindle_be_lmon.cc b/src/server/launchmon/spindle_be_lmon.cc index d4a45b77..39e35b92 100644 --- a/src/server/launchmon/spindle_be_lmon.cc +++ b/src/server/launchmon/spindle_be_lmon.cc @@ -109,8 +109,6 @@ int releaseApplication(spindle_args_t *) { free (proctab); return(rc); -#elif defined(os_bluegene) - return 0; #else #error Unknown OS #endif @@ -205,8 +203,7 @@ int startLaunchmonBE(int argc, char *argv[], int security_type) } push_env = (conn_info.send_env != 0); - /* Broadcast environment to all nodes if necessary (currently done - on BGQ). */ + /* Broadcast environment to all nodes if necessary. */ if (push_env) { rc = LMON_be_recvUsrData(&environ_str); if (rc != LMON_OK) { diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am index 1ce88385..5ee1abce 100644 --- a/testsuite/Makefile.am +++ b/testsuite/Makefile.am @@ -5,13 +5,8 @@ BUILT_SOURCES = libtest10.so libtest11.so libtest12.so libtest13.so libtest14.so BUILT_SOURCES += crash_test crash_test_fixedaddr crash_test_pie libcrashfuncs.so libcrashctor.so libcrashfixed.so run_crash_tests.sh -if BGQ_BLD -DYNAMIC_FLAG=-dynamic -IS_BLUEGENE=true -else DYNAMIC_FLAG= IS_BLUEGENE=false -endif libgenerator_SOURCES = libgenerator.c From f8a23acbf3b1eeae023bbdb76629edfec0d11b56 Mon Sep 17 00:00:00 2001 From: Barry Rountree Date: Thu, 30 Jul 2026 22:29:16 -0700 Subject: [PATCH 02/21] [prune-config] Changes post bootstrap.sh (--enable-bluegene) --- config.h.in | 3 - configure | 398 +++++++-------------------- src/client/Makefile.in | 1 - src/client/auditclient/Makefile.in | 1 - src/client/beboot/Makefile.in | 1 - src/client/biter/Makefile.in | 41 +-- src/client/client/Makefile.in | 1 - src/client/client_comlib/Makefile.in | 1 - src/client/config.h.in | 3 - src/client/configure | 74 +---- src/client/ldsolookup/Makefile.in | 8 +- src/client/logging/Makefile.in | 1 - src/client/shm_cache/Makefile.in | 1 - src/client/spindle_api/Makefile.in | 1 - src/client/subaudit/Makefile.in | 1 - src/fe/Makefile.in | 1 - src/fe/cobo/Makefile.in | 1 - src/fe/comlib/Makefile.in | 1 - src/fe/config.h.in | 3 - src/fe/configure | 74 +---- src/fe/flux/Makefile.in | 1 - src/fe/hostbin/Makefile.in | 1 - src/fe/launchmon/Makefile.in | 1 - src/fe/logging/Makefile.in | 1 - src/fe/openmpi_intercept/Makefile.in | 1 - src/fe/startup/Makefile.in | 1 - src/server/Makefile.in | 1 - src/server/auditserver/Makefile.in | 1 - src/server/biter/Makefile.in | 37 +-- src/server/cache/Makefile.in | 1 - src/server/cobo/Makefile.in | 1 - src/server/comlib/Makefile.in | 1 - src/server/config.h.in | 3 - src/server/configure | 74 +---- src/server/launchmon/Makefile.in | 1 - src/server/logging/Makefile.in | 1 - src/server/startup/Makefile.in | 1 - testsuite/Makefile.in | 6 +- 38 files changed, 125 insertions(+), 625 deletions(-) diff --git a/config.h.in b/config.h.in index 00b83ef3..8e018768 100644 --- a/config.h.in +++ b/config.h.in @@ -186,8 +186,5 @@ /* Define if we're compiling for an x86_64 target */ #undef arch_x86_64 -/* Define if we're compiling for a BlueGene target */ -#undef os_bluegene - /* Define if we're compiling for a linux target */ #undef os_linux diff --git a/configure b/configure index 6b54926e..e24f6b19 100755 --- a/configure +++ b/configure @@ -858,7 +858,6 @@ enable_slurm enable_slurm_plugin enable_flux_plugin with_slurm_dir -enable_bluegene with_hostbin with_rsh_launch with_rsh_cmd @@ -1557,7 +1556,6 @@ Optional Features: launching --enable-slurm-plugin Builds in support for running with SLURM via plugin --enable-flux-plugin Builds in support for running flux via a plugin - --enable-bluegene Build Spindle for BlueGene/Q --enable-pipes Use pipes for server/client communication --enable-socket Use sockets for server/client communication --enable-shmem Use shared memory for server/client communication @@ -16864,14 +16862,7 @@ _ACEOF #OS Detection -# Check whether --enable-bluegene was given. -if test "${enable_bluegene+set}" = set; then : - enableval=$enable_bluegene; OS_BUILD=bluegene -fi - -if test "x$OS_BUILD" == "x"; then - OS_BUILD=linux -fi +OS_BUILD=linux #Startup type @@ -17031,12 +17022,7 @@ _ACEOF #Runmode detection (pipe/socket or cobo/msocket communications) -if test "x$OS_BUILD" == "xlinux"; then - CLIENT_SERVER_COM=pipes -fi -if test "x$OS_BUILD" == "xbluegene"; then - CLIENT_SERVER_COM=biter -fi +CLIENT_SERVER_COM=pipes SERVER_SERVER_COM=cobo # Check whether --enable-pipes was given. @@ -17201,7 +17187,7 @@ $as_echo "#define arch_aarch64 1" >>confdefs.h fi #OS defines - if test "x$OS_BUILD" == "xbluegene"; then + if false; then BGQ_BLD_TRUE= BGQ_BLD_FALSE='#' else @@ -17250,16 +17236,9 @@ else fi -if test "x$OS_BUILD" == "xlinux"; then $as_echo "#define os_linux 1" >>confdefs.h -fi -if test "x$OS_BUILD" == "xbluegene"; then - -$as_echo "#define os_bluegene 1" >>confdefs.h - -fi #Python prefix @@ -17382,9 +17361,6 @@ if test "${enable_cleanup_process+set}" = set; then : enableval=$enable_cleanup_process; CLEANUP_PROC="true" fi -if test "x$OS_BUILD" == "xbluegene"; then - CLEANUP_PROC="true" -fi #Audit options # Check whether --enable-subaudit-as-default was given. @@ -21643,326 +21619,150 @@ if test "$BE_CC x $BE_CXX x $BE_host" != " x x "; then USER_SPECIFIED_COMPS="true" fi -if test "x$OS_BUILD" == "xbluegene"; then - if test -d /bgsys/drivers/toolchain/V1R2M1/gnu-linux/bin; then - BG_COMP_PATH=/bgsys/drivers/toolchain/V1R2M1/gnu-linux/bin/ - elif test -d /bgsys/drivers/toolchain/V1R2M0/gnu-linux/bin; then - BG_COMP_PATH=/bgsys/drivers/toolchain/V1R2M0/gnu-linux/bin/ - fi -fi - VARNAME=\$BE_CC BE_VAR=`eval echo $VARNAME` - if test "x$OS_BUILD" == "xbluegene"; then - if test "x$BE_VAR" != "x"; then - CLIENT_CC=$BE_VAR - elif test "x${BG_COMP_PATH}powerpc64-bgq-linux-gcc" != "x"; then - CLIENT_CC=${BG_COMP_PATH}powerpc64-bgq-linux-gcc - elif test "x$USER_SPECIFIED_COMPS" == "xtrue"; then - echo Setting CLIENT_CC to $CC - CLIENT_CC= - else - CLIENT_CC=$CC - fi - SERVER_CC=$CC - FE_CC=$CC - elif test "x$OS_BUILD" == "xlinux"; then - if test "x$BE_VAR" == "x"; then - if test "x$USER_SPECIFIED_COMPS" == "x"; then - BE_VAR=$CC - fi - fi - CLIENT_CC=$BE_VAR - SERVER_CC=$BE_VAR - FE_CC=$CC + if test "x$BE_VAR" == "x"; then + if test "x$USER_SPECIFIED_COMPS" == "x"; then + BE_VAR=$CC + fi fi + CLIENT_CC=$BE_VAR + SERVER_CC=$BE_VAR + FE_CC=$CC + VARNAME=\$BE_CFLAGS BE_VAR=`eval echo $VARNAME` - if test "x$OS_BUILD" == "xbluegene"; then - if test "x$BE_VAR" != "x"; then - CLIENT_CFLAGS=$BE_VAR - elif test "x" != "x"; then - CLIENT_CFLAGS= - elif test "x$USER_SPECIFIED_COMPS" == "xtrue"; then - echo Setting CLIENT_CFLAGS to $CFLAGS - CLIENT_CFLAGS= - else - CLIENT_CFLAGS=$CFLAGS - fi - SERVER_CFLAGS=$CFLAGS - FE_CFLAGS=$CFLAGS - elif test "x$OS_BUILD" == "xlinux"; then - if test "x$BE_VAR" == "x"; then - if test "x$USER_SPECIFIED_COMPS" == "x"; then - BE_VAR=$CFLAGS - fi - fi - CLIENT_CFLAGS=$BE_VAR - SERVER_CFLAGS=$BE_VAR - FE_CFLAGS=$CFLAGS + if test "x$BE_VAR" == "x"; then + if test "x$USER_SPECIFIED_COMPS" == "x"; then + BE_VAR=$CFLAGS + fi fi + CLIENT_CFLAGS=$BE_VAR + SERVER_CFLAGS=$BE_VAR + FE_CFLAGS=$CFLAGS + VARNAME=\$BE_LDFLAGS BE_VAR=`eval echo $VARNAME` - if test "x$OS_BUILD" == "xbluegene"; then - if test "x$BE_VAR" != "x"; then - CLIENT_LDFLAGS=$BE_VAR - elif test "x" != "x"; then - CLIENT_LDFLAGS= - elif test "x$USER_SPECIFIED_COMPS" == "xtrue"; then - echo Setting CLIENT_LDFLAGS to $LDFLAGS - CLIENT_LDFLAGS= - else - CLIENT_LDFLAGS=$LDFLAGS - fi - SERVER_LDFLAGS=$LDFLAGS - FE_LDFLAGS=$LDFLAGS - elif test "x$OS_BUILD" == "xlinux"; then - if test "x$BE_VAR" == "x"; then - if test "x$USER_SPECIFIED_COMPS" == "x"; then - BE_VAR=$LDFLAGS - fi - fi - CLIENT_LDFLAGS=$BE_VAR - SERVER_LDFLAGS=$BE_VAR - FE_LDFLAGS=$LDFLAGS + if test "x$BE_VAR" == "x"; then + if test "x$USER_SPECIFIED_COMPS" == "x"; then + BE_VAR=$LDFLAGS + fi fi + CLIENT_LDFLAGS=$BE_VAR + SERVER_LDFLAGS=$BE_VAR + FE_LDFLAGS=$LDFLAGS + VARNAME=\$BE_LIBS BE_VAR=`eval echo $VARNAME` - if test "x$OS_BUILD" == "xbluegene"; then - if test "x$BE_VAR" != "x"; then - CLIENT_LIBS=$BE_VAR - elif test "x" != "x"; then - CLIENT_LIBS= - elif test "x$USER_SPECIFIED_COMPS" == "xtrue"; then - echo Setting CLIENT_LIBS to $LIBS - CLIENT_LIBS= - else - CLIENT_LIBS=$LIBS - fi - SERVER_LIBS=$LIBS - FE_LIBS=$LIBS - elif test "x$OS_BUILD" == "xlinux"; then - if test "x$BE_VAR" == "x"; then - if test "x$USER_SPECIFIED_COMPS" == "x"; then - BE_VAR=$LIBS - fi - fi - CLIENT_LIBS=$BE_VAR - SERVER_LIBS=$BE_VAR - FE_LIBS=$LIBS + if test "x$BE_VAR" == "x"; then + if test "x$USER_SPECIFIED_COMPS" == "x"; then + BE_VAR=$LIBS + fi fi + CLIENT_LIBS=$BE_VAR + SERVER_LIBS=$BE_VAR + FE_LIBS=$LIBS + VARNAME=\$BE_CPPFLAGS BE_VAR=`eval echo $VARNAME` - if test "x$OS_BUILD" == "xbluegene"; then - if test "x$BE_VAR" != "x"; then - CLIENT_CPPFLAGS=$BE_VAR - elif test "x" != "x"; then - CLIENT_CPPFLAGS= - elif test "x$USER_SPECIFIED_COMPS" == "xtrue"; then - echo Setting CLIENT_CPPFLAGS to $CPPFLAGS - CLIENT_CPPFLAGS= - else - CLIENT_CPPFLAGS=$CPPFLAGS - fi - SERVER_CPPFLAGS=$CPPFLAGS - FE_CPPFLAGS=$CPPFLAGS - elif test "x$OS_BUILD" == "xlinux"; then - if test "x$BE_VAR" == "x"; then - if test "x$USER_SPECIFIED_COMPS" == "x"; then - BE_VAR=$CPPFLAGS - fi - fi - CLIENT_CPPFLAGS=$BE_VAR - SERVER_CPPFLAGS=$BE_VAR - FE_CPPFLAGS=$CPPFLAGS + if test "x$BE_VAR" == "x"; then + if test "x$USER_SPECIFIED_COMPS" == "x"; then + BE_VAR=$CPPFLAGS + fi fi + CLIENT_CPPFLAGS=$BE_VAR + SERVER_CPPFLAGS=$BE_VAR + FE_CPPFLAGS=$CPPFLAGS + VARNAME=\$BE_CXX BE_VAR=`eval echo $VARNAME` - if test "x$OS_BUILD" == "xbluegene"; then - if test "x$BE_VAR" != "x"; then - CLIENT_CXX=$BE_VAR - elif test "x${BG_COMP_PATH}powerpc64-bgq-linux-c++" != "x"; then - CLIENT_CXX=${BG_COMP_PATH}powerpc64-bgq-linux-c++ - elif test "x$USER_SPECIFIED_COMPS" == "xtrue"; then - echo Setting CLIENT_CXX to $CXX - CLIENT_CXX= - else - CLIENT_CXX=$CXX - fi - SERVER_CXX=$CXX - FE_CXX=$CXX - elif test "x$OS_BUILD" == "xlinux"; then - if test "x$BE_VAR" == "x"; then - if test "x$USER_SPECIFIED_COMPS" == "x"; then - BE_VAR=$CXX - fi - fi - CLIENT_CXX=$BE_VAR - SERVER_CXX=$BE_VAR - FE_CXX=$CXX + if test "x$BE_VAR" == "x"; then + if test "x$USER_SPECIFIED_COMPS" == "x"; then + BE_VAR=$CXX + fi fi + CLIENT_CXX=$BE_VAR + SERVER_CXX=$BE_VAR + FE_CXX=$CXX + VARNAME=\$BE_CXXFLAGS BE_VAR=`eval echo $VARNAME` - if test "x$OS_BUILD" == "xbluegene"; then - if test "x$BE_VAR" != "x"; then - CLIENT_CXXFLAGS=$BE_VAR - elif test "x" != "x"; then - CLIENT_CXXFLAGS= - elif test "x$USER_SPECIFIED_COMPS" == "xtrue"; then - echo Setting CLIENT_CXXFLAGS to $CXXFLAGS - CLIENT_CXXFLAGS= - else - CLIENT_CXXFLAGS=$CXXFLAGS - fi - SERVER_CXXFLAGS=$CXXFLAGS - FE_CXXFLAGS=$CXXFLAGS - elif test "x$OS_BUILD" == "xlinux"; then - if test "x$BE_VAR" == "x"; then - if test "x$USER_SPECIFIED_COMPS" == "x"; then - BE_VAR=$CXXFLAGS - fi - fi - CLIENT_CXXFLAGS=$BE_VAR - SERVER_CXXFLAGS=$BE_VAR - FE_CXXFLAGS=$CXXFLAGS + if test "x$BE_VAR" == "x"; then + if test "x$USER_SPECIFIED_COMPS" == "x"; then + BE_VAR=$CXXFLAGS + fi fi + CLIENT_CXXFLAGS=$BE_VAR + SERVER_CXXFLAGS=$BE_VAR + FE_CXXFLAGS=$CXXFLAGS + VARNAME=\$BE_CPP BE_VAR=`eval echo $VARNAME` - if test "x$OS_BUILD" == "xbluegene"; then - if test "x$BE_VAR" != "x"; then - CLIENT_CPP=$BE_VAR - elif test "x${BG_COMP_PATH}powerpc64-bgq-linux-cpp" != "x"; then - CLIENT_CPP=${BG_COMP_PATH}powerpc64-bgq-linux-cpp - elif test "x$USER_SPECIFIED_COMPS" == "xtrue"; then - echo Setting CLIENT_CPP to $CPP - CLIENT_CPP= - else - CLIENT_CPP=$CPP - fi - SERVER_CPP=$CPP - FE_CPP=$CPP - elif test "x$OS_BUILD" == "xlinux"; then - if test "x$BE_VAR" == "x"; then - if test "x$USER_SPECIFIED_COMPS" == "x"; then - BE_VAR=$CPP - fi - fi - CLIENT_CPP=$BE_VAR - SERVER_CPP=$BE_VAR - FE_CPP=$CPP + if test "x$BE_VAR" == "x"; then + if test "x$USER_SPECIFIED_COMPS" == "x"; then + BE_VAR=$CPP + fi fi + CLIENT_CPP=$BE_VAR + SERVER_CPP=$BE_VAR + FE_CPP=$CPP + VARNAME=\$BE_CXXCPP BE_VAR=`eval echo $VARNAME` - if test "x$OS_BUILD" == "xbluegene"; then - if test "x$BE_VAR" != "x"; then - CLIENT_CXXCPP=$BE_VAR - elif test "x" != "x"; then - CLIENT_CXXCPP= - elif test "x$USER_SPECIFIED_COMPS" == "xtrue"; then - echo Setting CLIENT_CXXCPP to $CXXCPP - CLIENT_CXXCPP= - else - CLIENT_CXXCPP=$CXXCPP - fi - SERVER_CXXCPP=$CXXCPP - FE_CXXCPP=$CXXCPP - elif test "x$OS_BUILD" == "xlinux"; then - if test "x$BE_VAR" == "x"; then - if test "x$USER_SPECIFIED_COMPS" == "x"; then - BE_VAR=$CXXCPP - fi - fi - CLIENT_CXXCPP=$BE_VAR - SERVER_CXXCPP=$BE_VAR - FE_CXXCPP=$CXXCPP + if test "x$BE_VAR" == "x"; then + if test "x$USER_SPECIFIED_COMPS" == "x"; then + BE_VAR=$CXXCPP + fi fi + CLIENT_CXXCPP=$BE_VAR + SERVER_CXXCPP=$BE_VAR + FE_CXXCPP=$CXXCPP + VARNAME=\$BE_STRIP BE_VAR=`eval echo $VARNAME` - if test "x$OS_BUILD" == "xbluegene"; then - if test "x$BE_VAR" != "x"; then - CLIENT_STRIP=$BE_VAR - elif test "x${BG_COMP_PATH}powerpc64-bgq-linux-strip" != "x"; then - CLIENT_STRIP=${BG_COMP_PATH}powerpc64-bgq-linux-strip - elif test "x$USER_SPECIFIED_COMPS" == "xtrue"; then - echo Setting CLIENT_STRIP to $STRIP - CLIENT_STRIP= - else - CLIENT_STRIP=$STRIP - fi - SERVER_STRIP=$STRIP - FE_STRIP=$STRIP - elif test "x$OS_BUILD" == "xlinux"; then - if test "x$BE_VAR" == "x"; then - if test "x$USER_SPECIFIED_COMPS" == "x"; then - BE_VAR=$STRIP - fi - fi - CLIENT_STRIP=$BE_VAR - SERVER_STRIP=$BE_VAR - FE_STRIP=$STRIP + if test "x$BE_VAR" == "x"; then + if test "x$USER_SPECIFIED_COMPS" == "x"; then + BE_VAR=$STRIP + fi fi + CLIENT_STRIP=$BE_VAR + SERVER_STRIP=$BE_VAR + FE_STRIP=$STRIP + VARNAME=\$BE_AR BE_VAR=`eval echo $VARNAME` - if test "x$OS_BUILD" == "xbluegene"; then - if test "x$BE_VAR" != "x"; then - CLIENT_AR=$BE_VAR - elif test "x${BG_COMP_PATH}powerpc64-bgq-linux-ar" != "x"; then - CLIENT_AR=${BG_COMP_PATH}powerpc64-bgq-linux-ar - elif test "x$USER_SPECIFIED_COMPS" == "xtrue"; then - echo Setting CLIENT_AR to $AR - CLIENT_AR= - else - CLIENT_AR=$AR - fi - SERVER_AR=$AR - FE_AR=$AR - elif test "x$OS_BUILD" == "xlinux"; then - if test "x$BE_VAR" == "x"; then - if test "x$USER_SPECIFIED_COMPS" == "x"; then - BE_VAR=$AR - fi - fi - CLIENT_AR=$BE_VAR - SERVER_AR=$BE_VAR - FE_AR=$AR + if test "x$BE_VAR" == "x"; then + if test "x$USER_SPECIFIED_COMPS" == "x"; then + BE_VAR=$AR + fi fi + CLIENT_AR=$BE_VAR + SERVER_AR=$BE_VAR + FE_AR=$AR + VARNAME=\$BE_host BE_VAR=`eval echo $VARNAME` - if test "x$OS_BUILD" == "xbluegene"; then - if test "x$BE_VAR" != "x"; then - CLIENT_host=$BE_VAR - elif test "xpowerpc64-bgq-linux" != "x"; then - CLIENT_host=powerpc64-bgq-linux - elif test "x$USER_SPECIFIED_COMPS" == "xtrue"; then - echo Setting CLIENT_host to $host - CLIENT_host= - else - CLIENT_host=$host - fi - SERVER_host=$host - FE_host=$host - elif test "x$OS_BUILD" == "xlinux"; then - if test "x$BE_VAR" == "x"; then - if test "x$USER_SPECIFIED_COMPS" == "x"; then - BE_VAR=$host - fi - fi - CLIENT_host=$BE_VAR - SERVER_host=$BE_VAR - FE_host=$host + if test "x$BE_VAR" == "x"; then + if test "x$USER_SPECIFIED_COMPS" == "x"; then + BE_VAR=$host + fi fi + CLIENT_host=$BE_VAR + SERVER_host=$BE_VAR + FE_host=$host + diff --git a/src/client/Makefile.in b/src/client/Makefile.in index 935a500a..eab8eb6f 100644 --- a/src/client/Makefile.in +++ b/src/client/Makefile.in @@ -96,7 +96,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/ltversion.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ $(top_srcdir)/../../m4/pkg.m4 \ - $(top_srcdir)/../../m4/lx_detect_bluegene.m4 \ $(top_srcdir)/../../configure.common.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ diff --git a/src/client/auditclient/Makefile.in b/src/client/auditclient/Makefile.in index a7bfbe96..5278d8cf 100644 --- a/src/client/auditclient/Makefile.in +++ b/src/client/auditclient/Makefile.in @@ -100,7 +100,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/ltversion.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ $(top_srcdir)/../../m4/pkg.m4 \ - $(top_srcdir)/../../m4/lx_detect_bluegene.m4 \ $(top_srcdir)/../../configure.common.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ diff --git a/src/client/beboot/Makefile.in b/src/client/beboot/Makefile.in index a50318b5..d73b66ee 100644 --- a/src/client/beboot/Makefile.in +++ b/src/client/beboot/Makefile.in @@ -100,7 +100,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/ltversion.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ $(top_srcdir)/../../m4/pkg.m4 \ - $(top_srcdir)/../../m4/lx_detect_bluegene.m4 \ $(top_srcdir)/../../configure.common.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ diff --git a/src/client/biter/Makefile.in b/src/client/biter/Makefile.in index f7779fb7..6ecbb9bb 100644 --- a/src/client/biter/Makefile.in +++ b/src/client/biter/Makefile.in @@ -89,9 +89,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -@BGQ_BLD_TRUE@am__append_1 = -I/bgsys/drivers/ppcfloor/comm/lib/gnu -I/bgsys/drivers/ppcfloor -I/bgsys/drivers/ppcfloor/comm/sys/include -I/bgsys/drivers/ppcfloor/spi/include -I/bgsys/drivers/ppcfloor/spi/include/kernel/cnk -@BGQ_BLD_TRUE@am__append_2 = $(top_srcdir)/../biter/bgq_ids.c -@LINUX_BLD_TRUE@am__append_3 = $(top_srcdir)/../biter/linux_ids.c subdir = biter ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ @@ -100,7 +97,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/ltversion.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ $(top_srcdir)/../../m4/pkg.m4 \ - $(top_srcdir)/../../m4/lx_detect_bluegene.m4 \ $(top_srcdir)/../../configure.common.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -112,19 +108,12 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) libbiterc_la_DEPENDENCIES = libsheep.la -am__libbiterc_la_SOURCES_DIST = $(top_srcdir)/../biter/biterc.c \ - $(top_srcdir)/../biter/client_queue.c \ - $(top_srcdir)/../biter/demultiplex.c \ - $(top_srcdir)/../biter/bgq_ids.c \ - $(top_srcdir)/../biter/linux_ids.c am__dirstamp = $(am__leading_dot)dirstamp -@BGQ_BLD_TRUE@am__objects_1 = $(top_builddir)/../biter/libbiterc_la-bgq_ids.lo -@LINUX_BLD_TRUE@am__objects_2 = $(top_builddir)/../biter/libbiterc_la-linux_ids.lo am_libbiterc_la_OBJECTS = \ $(top_builddir)/../biter/libbiterc_la-biterc.lo \ $(top_builddir)/../biter/libbiterc_la-client_queue.lo \ $(top_builddir)/../biter/libbiterc_la-demultiplex.lo \ - $(am__objects_1) $(am__objects_2) + $(top_builddir)/../biter/libbiterc_la-linux_ids.lo libbiterc_la_OBJECTS = $(am_libbiterc_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -154,7 +143,6 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/../../scripts/depcomp am__maybe_remake_depfiles = depfiles am__depfiles_remade = \ - $(top_builddir)/../biter/$(DEPDIR)/libbiterc_la-bgq_ids.Plo \ $(top_builddir)/../biter/$(DEPDIR)/libbiterc_la-biterc.Plo \ $(top_builddir)/../biter/$(DEPDIR)/libbiterc_la-client_queue.Plo \ $(top_builddir)/../biter/$(DEPDIR)/libbiterc_la-demultiplex.Plo \ @@ -182,7 +170,7 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = SOURCES = $(libbiterc_la_SOURCES) $(libsheep_la_SOURCES) -DIST_SOURCES = $(am__libbiterc_la_SOURCES_DIST) $(libsheep_la_SOURCES) +DIST_SOURCES = $(libbiterc_la_SOURCES) $(libsheep_la_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -347,14 +335,12 @@ top_srcdir = @top_srcdir@ noinst_LTLIBRARIES = libbiterc.la libsheep.la libbiterc_la_SOURCES = $(top_srcdir)/../biter/biterc.c \ $(top_srcdir)/../biter/client_queue.c \ - $(top_srcdir)/../biter/demultiplex.c $(am__append_2) \ - $(am__append_3) + $(top_srcdir)/../biter/demultiplex.c \ + $(top_srcdir)/../biter/linux_ids.c libbiterc_la_CFLAGS = -DCLIENT libbiterc_la_LIBADD = libsheep.la libsheep_la_SOURCES = $(top_srcdir)/../biter/sheep.c $(top_srcdir)/../biter/shmutil.c $(top_srcdir)/../biter/shm_wrappers.c -AM_CPPFLAGS = -I$(top_srcdir)/../biter -I$(top_srcdir)/../logging \ - -I$(top_srcdir)/../include -I$(top_srcdir)/../utils \ - $(am__append_1) +AM_CPPFLAGS = -I$(top_srcdir)/../biter -I$(top_srcdir)/../logging -I$(top_srcdir)/../include -I$(top_srcdir)/../utils AM_CFLAGS = -fvisibility=hidden all: all-am @@ -415,9 +401,6 @@ $(top_builddir)/../biter/libbiterc_la-client_queue.lo: \ $(top_builddir)/../biter/libbiterc_la-demultiplex.lo: \ $(top_builddir)/../biter/$(am__dirstamp) \ $(top_builddir)/../biter/$(DEPDIR)/$(am__dirstamp) -$(top_builddir)/../biter/libbiterc_la-bgq_ids.lo: \ - $(top_builddir)/../biter/$(am__dirstamp) \ - $(top_builddir)/../biter/$(DEPDIR)/$(am__dirstamp) $(top_builddir)/../biter/libbiterc_la-linux_ids.lo: \ $(top_builddir)/../biter/$(am__dirstamp) \ $(top_builddir)/../biter/$(DEPDIR)/$(am__dirstamp) @@ -445,7 +428,6 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@$(top_builddir)/../biter/$(DEPDIR)/libbiterc_la-bgq_ids.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@$(top_builddir)/../biter/$(DEPDIR)/libbiterc_la-biterc.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@$(top_builddir)/../biter/$(DEPDIR)/libbiterc_la-client_queue.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@$(top_builddir)/../biter/$(DEPDIR)/libbiterc_la-demultiplex.Plo@am__quote@ # am--include-marker @@ -505,13 +487,6 @@ $(top_builddir)/../biter/libbiterc_la-demultiplex.lo: $(top_builddir)/../biter/d @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbiterc_la_CFLAGS) $(CFLAGS) -c -o $(top_builddir)/../biter/libbiterc_la-demultiplex.lo `test -f '$(top_builddir)/../biter/demultiplex.c' || echo '$(srcdir)/'`$(top_builddir)/../biter/demultiplex.c -$(top_builddir)/../biter/libbiterc_la-bgq_ids.lo: $(top_builddir)/../biter/bgq_ids.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbiterc_la_CFLAGS) $(CFLAGS) -MT $(top_builddir)/../biter/libbiterc_la-bgq_ids.lo -MD -MP -MF $(top_builddir)/../biter/$(DEPDIR)/libbiterc_la-bgq_ids.Tpo -c -o $(top_builddir)/../biter/libbiterc_la-bgq_ids.lo `test -f '$(top_builddir)/../biter/bgq_ids.c' || echo '$(srcdir)/'`$(top_builddir)/../biter/bgq_ids.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(top_builddir)/../biter/$(DEPDIR)/libbiterc_la-bgq_ids.Tpo $(top_builddir)/../biter/$(DEPDIR)/libbiterc_la-bgq_ids.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_builddir)/../biter/bgq_ids.c' object='$(top_builddir)/../biter/libbiterc_la-bgq_ids.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbiterc_la_CFLAGS) $(CFLAGS) -c -o $(top_builddir)/../biter/libbiterc_la-bgq_ids.lo `test -f '$(top_builddir)/../biter/bgq_ids.c' || echo '$(srcdir)/'`$(top_builddir)/../biter/bgq_ids.c - $(top_builddir)/../biter/libbiterc_la-linux_ids.lo: $(top_builddir)/../biter/linux_ids.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbiterc_la_CFLAGS) $(CFLAGS) -MT $(top_builddir)/../biter/libbiterc_la-linux_ids.lo -MD -MP -MF $(top_builddir)/../biter/$(DEPDIR)/libbiterc_la-linux_ids.Tpo -c -o $(top_builddir)/../biter/libbiterc_la-linux_ids.lo `test -f '$(top_builddir)/../biter/linux_ids.c' || echo '$(srcdir)/'`$(top_builddir)/../biter/linux_ids.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(top_builddir)/../biter/$(DEPDIR)/libbiterc_la-linux_ids.Tpo $(top_builddir)/../biter/$(DEPDIR)/libbiterc_la-linux_ids.Plo @@ -653,8 +628,7 @@ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ mostlyclean-am distclean: distclean-am - -rm -f $(top_builddir)/../biter/$(DEPDIR)/libbiterc_la-bgq_ids.Plo - -rm -f $(top_builddir)/../biter/$(DEPDIR)/libbiterc_la-biterc.Plo + -rm -f $(top_builddir)/../biter/$(DEPDIR)/libbiterc_la-biterc.Plo -rm -f $(top_builddir)/../biter/$(DEPDIR)/libbiterc_la-client_queue.Plo -rm -f $(top_builddir)/../biter/$(DEPDIR)/libbiterc_la-demultiplex.Plo -rm -f $(top_builddir)/../biter/$(DEPDIR)/libbiterc_la-linux_ids.Plo @@ -706,8 +680,7 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f $(top_builddir)/../biter/$(DEPDIR)/libbiterc_la-bgq_ids.Plo - -rm -f $(top_builddir)/../biter/$(DEPDIR)/libbiterc_la-biterc.Plo + -rm -f $(top_builddir)/../biter/$(DEPDIR)/libbiterc_la-biterc.Plo -rm -f $(top_builddir)/../biter/$(DEPDIR)/libbiterc_la-client_queue.Plo -rm -f $(top_builddir)/../biter/$(DEPDIR)/libbiterc_la-demultiplex.Plo -rm -f $(top_builddir)/../biter/$(DEPDIR)/libbiterc_la-linux_ids.Plo diff --git a/src/client/client/Makefile.in b/src/client/client/Makefile.in index d45c5c95..45fde4cc 100644 --- a/src/client/client/Makefile.in +++ b/src/client/client/Makefile.in @@ -101,7 +101,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/ltversion.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ $(top_srcdir)/../../m4/pkg.m4 \ - $(top_srcdir)/../../m4/lx_detect_bluegene.m4 \ $(top_srcdir)/../../configure.common.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ diff --git a/src/client/client_comlib/Makefile.in b/src/client/client_comlib/Makefile.in index cf33f5e9..34c46bd6 100644 --- a/src/client/client_comlib/Makefile.in +++ b/src/client/client_comlib/Makefile.in @@ -97,7 +97,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/ltversion.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ $(top_srcdir)/../../m4/pkg.m4 \ - $(top_srcdir)/../../m4/lx_detect_bluegene.m4 \ $(top_srcdir)/../../configure.common.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ diff --git a/src/client/config.h.in b/src/client/config.h.in index 872b9278..024428c7 100644 --- a/src/client/config.h.in +++ b/src/client/config.h.in @@ -170,8 +170,5 @@ /* Define if we're compiling for an x86_64 target */ #undef arch_x86_64 -/* Define if we're compiling for a BlueGene target */ -#undef os_bluegene - /* Define if we're compiling for a linux target */ #undef os_linux diff --git a/src/client/configure b/src/client/configure index 18f13fa5..a014bc50 100755 --- a/src/client/configure +++ b/src/client/configure @@ -821,7 +821,6 @@ enable_slurm enable_slurm_plugin enable_flux_plugin with_slurm_dir -enable_bluegene with_hostbin with_rsh_launch with_rsh_cmd @@ -1501,7 +1500,6 @@ Optional Features: launching --enable-slurm-plugin Builds in support for running with SLURM via plugin --enable-flux-plugin Builds in support for running flux via a plugin - --enable-bluegene Build Spindle for BlueGene/Q --enable-pipes Use pipes for server/client communication --enable-socket Use sockets for server/client communication --enable-shmem Use shared memory for server/client communication @@ -12503,50 +12501,6 @@ SPINDLE_BUILD_ROOT=`pwd`/../.. SPINDLE_SOURCE_ROOT=`realpath ${srcdir}/../..` #Include common ops -################################################################################################# -# Copyright (c) 2010, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory -# Written by Todd Gamblin, tgamblin@llnl.gov. -# LLNL-CODE-417602 -# All rights reserved. -# -# This file is part of Libra. For details, see http://github.com/tgamblin/libra. -# Please also read the LICENSE file for further information. -# -# Redistribution and use in source and binary forms, with or without modification, are -# permitted provided that the following conditions are met: -# -# * Redistributions of source code must retain the above copyright notice, this list of -# conditions and the disclaimer below. -# * Redistributions in binary form must reproduce the above copyright notice, this list of -# conditions and the disclaimer (as noted below) in the documentation and/or other materials -# provided with the distribution. -# * Neither the name of the LLNS/LLNL nor the names of its contributors may be used to endorse -# or promote products derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS -# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL -# LAWRENCE LIVERMORE NATIONAL SECURITY, LLC, THE U.S. DEPARTMENT OF ENERGY OR CONTRIBUTORS BE -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -################################################################################################# - -# -# LX_DETECT_BLUEGENE -# -# Defines some compile-time tests to detect BlueGene architectures. -# This will AC_DEFINE the following macros if detected: -# -# BLUEGENE_L If BlueGene/L architecture is detected -# BLUEGENE_P If BlueGene/P architecture is detected -# BLUEGENE_Q If BlueGene/Q architecture is detected -# - - #Configure operations that are common between the Spindle and Spindle-client configurations #Network port and local storage location DEFAULT_PORT=21940 @@ -12789,14 +12743,7 @@ _ACEOF #OS Detection -# Check whether --enable-bluegene was given. -if test "${enable_bluegene+set}" = set; then : - enableval=$enable_bluegene; OS_BUILD=bluegene -fi - -if test "x$OS_BUILD" == "x"; then - OS_BUILD=linux -fi +OS_BUILD=linux #Startup type @@ -12956,12 +12903,7 @@ _ACEOF #Runmode detection (pipe/socket or cobo/msocket communications) -if test "x$OS_BUILD" == "xlinux"; then - CLIENT_SERVER_COM=pipes -fi -if test "x$OS_BUILD" == "xbluegene"; then - CLIENT_SERVER_COM=biter -fi +CLIENT_SERVER_COM=pipes SERVER_SERVER_COM=cobo # Check whether --enable-pipes was given. @@ -13126,7 +13068,7 @@ $as_echo "#define arch_aarch64 1" >>confdefs.h fi #OS defines - if test "x$OS_BUILD" == "xbluegene"; then + if false; then BGQ_BLD_TRUE= BGQ_BLD_FALSE='#' else @@ -13175,16 +13117,9 @@ else fi -if test "x$OS_BUILD" == "xlinux"; then $as_echo "#define os_linux 1" >>confdefs.h -fi -if test "x$OS_BUILD" == "xbluegene"; then - -$as_echo "#define os_bluegene 1" >>confdefs.h - -fi #Python prefix @@ -13307,9 +13242,6 @@ if test "${enable_cleanup_process+set}" = set; then : enableval=$enable_cleanup_process; CLEANUP_PROC="true" fi -if test "x$OS_BUILD" == "xbluegene"; then - CLEANUP_PROC="true" -fi #Audit options # Check whether --enable-subaudit-as-default was given. diff --git a/src/client/ldsolookup/Makefile.in b/src/client/ldsolookup/Makefile.in index 181924c6..5339cb63 100644 --- a/src/client/ldsolookup/Makefile.in +++ b/src/client/ldsolookup/Makefile.in @@ -99,7 +99,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/ltversion.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ $(top_srcdir)/../../m4/pkg.m4 \ - $(top_srcdir)/../../m4/lx_detect_bluegene.m4 \ $(top_srcdir)/../../configure.common.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -155,10 +154,6 @@ am_print_ldso_entry_OBJECTS = \ print_ldso_entry-print_ldso_entry.$(OBJEXT) print_ldso_entry_OBJECTS = $(am_print_ldso_entry_OBJECTS) print_ldso_entry_LDADD = $(LDADD) -print_ldso_entry_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(AM_CFLAGS) $(CFLAGS) $(print_ldso_entry_LDFLAGS) $(LDFLAGS) \ - -o $@ AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -365,7 +360,6 @@ print_ldso_entry_SOURCES = print_ldso_entry.c libprint_ldso_audit_la_SOURCES = print_ldso_audit.c print_ldso_entry_CPPFLAGS = -DLIBEXECDIR=\"$(pkglibexecdir)\" libprint_ldso_audit_la_LDFLAGS = -shared -avoid-version -@BGQ_BLD_TRUE@print_ldso_entry_LDFLAGS = -dynamic all: all-am .SUFFIXES: @@ -489,7 +483,7 @@ libprint_ldso_audit.la: $(libprint_ldso_audit_la_OBJECTS) $(libprint_ldso_audit_ print_ldso_entry$(EXEEXT): $(print_ldso_entry_OBJECTS) $(print_ldso_entry_DEPENDENCIES) $(EXTRA_print_ldso_entry_DEPENDENCIES) @rm -f print_ldso_entry$(EXEEXT) - $(AM_V_CCLD)$(print_ldso_entry_LINK) $(print_ldso_entry_OBJECTS) $(print_ldso_entry_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(print_ldso_entry_OBJECTS) $(print_ldso_entry_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) diff --git a/src/client/logging/Makefile.in b/src/client/logging/Makefile.in index b4ed786e..de85341e 100644 --- a/src/client/logging/Makefile.in +++ b/src/client/logging/Makefile.in @@ -97,7 +97,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/ltversion.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ $(top_srcdir)/../../m4/pkg.m4 \ - $(top_srcdir)/../../m4/lx_detect_bluegene.m4 \ $(top_srcdir)/../../configure.common.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ diff --git a/src/client/shm_cache/Makefile.in b/src/client/shm_cache/Makefile.in index b1298cdf..c0138ce6 100644 --- a/src/client/shm_cache/Makefile.in +++ b/src/client/shm_cache/Makefile.in @@ -97,7 +97,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/ltversion.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ $(top_srcdir)/../../m4/pkg.m4 \ - $(top_srcdir)/../../m4/lx_detect_bluegene.m4 \ $(top_srcdir)/../../configure.common.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ diff --git a/src/client/spindle_api/Makefile.in b/src/client/spindle_api/Makefile.in index bd9d4241..05c0f3b5 100644 --- a/src/client/spindle_api/Makefile.in +++ b/src/client/spindle_api/Makefile.in @@ -98,7 +98,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/ltversion.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ $(top_srcdir)/../../m4/pkg.m4 \ - $(top_srcdir)/../../m4/lx_detect_bluegene.m4 \ $(top_srcdir)/../../configure.common.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ diff --git a/src/client/subaudit/Makefile.in b/src/client/subaudit/Makefile.in index 9869cec9..0fb66700 100644 --- a/src/client/subaudit/Makefile.in +++ b/src/client/subaudit/Makefile.in @@ -100,7 +100,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/ltversion.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ $(top_srcdir)/../../m4/pkg.m4 \ - $(top_srcdir)/../../m4/lx_detect_bluegene.m4 \ $(top_srcdir)/../../configure.common.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ diff --git a/src/fe/Makefile.in b/src/fe/Makefile.in index cf6d4c9a..ac3869e2 100644 --- a/src/fe/Makefile.in +++ b/src/fe/Makefile.in @@ -96,7 +96,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/ltversion.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ $(top_srcdir)/../../m4/pkg.m4 \ - $(top_srcdir)/../../m4/lx_detect_bluegene.m4 \ $(top_srcdir)/../../configure.common.ac \ $(top_srcdir)/../../m4/lmon.m4 \ $(top_srcdir)/../../m4/launcher.m4 $(top_srcdir)/configure.ac diff --git a/src/fe/cobo/Makefile.in b/src/fe/cobo/Makefile.in index f204598a..6b9376fa 100644 --- a/src/fe/cobo/Makefile.in +++ b/src/fe/cobo/Makefile.in @@ -97,7 +97,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/ltversion.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ $(top_srcdir)/../../m4/pkg.m4 \ - $(top_srcdir)/../../m4/lx_detect_bluegene.m4 \ $(top_srcdir)/../../configure.common.ac \ $(top_srcdir)/../../m4/lmon.m4 \ $(top_srcdir)/../../m4/launcher.m4 $(top_srcdir)/configure.ac diff --git a/src/fe/comlib/Makefile.in b/src/fe/comlib/Makefile.in index b9f4599b..284a718b 100644 --- a/src/fe/comlib/Makefile.in +++ b/src/fe/comlib/Makefile.in @@ -97,7 +97,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/ltversion.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ $(top_srcdir)/../../m4/pkg.m4 \ - $(top_srcdir)/../../m4/lx_detect_bluegene.m4 \ $(top_srcdir)/../../configure.common.ac \ $(top_srcdir)/../../m4/lmon.m4 \ $(top_srcdir)/../../m4/launcher.m4 $(top_srcdir)/configure.ac diff --git a/src/fe/config.h.in b/src/fe/config.h.in index 20a30383..ef1f4762 100644 --- a/src/fe/config.h.in +++ b/src/fe/config.h.in @@ -218,8 +218,5 @@ /* Define if we're compiling for an x86_64 target */ #undef arch_x86_64 -/* Define if we're compiling for a BlueGene target */ -#undef os_bluegene - /* Define if we're compiling for a linux target */ #undef os_linux diff --git a/src/fe/configure b/src/fe/configure index 73def515..6a4e545a 100755 --- a/src/fe/configure +++ b/src/fe/configure @@ -842,7 +842,6 @@ enable_slurm enable_slurm_plugin enable_flux_plugin with_slurm_dir -enable_bluegene with_hostbin with_rsh_launch with_rsh_cmd @@ -1534,7 +1533,6 @@ Optional Features: launching --enable-slurm-plugin Builds in support for running with SLURM via plugin --enable-flux-plugin Builds in support for running flux via a plugin - --enable-bluegene Build Spindle for BlueGene/Q --enable-pipes Use pipes for server/client communication --enable-socket Use sockets for server/client communication --enable-shmem Use shared memory for server/client communication @@ -16353,50 +16351,6 @@ SPINDLE_BUILD_ROOT=`pwd`/../.. SPINDLE_SOURCE_ROOT=`realpath ${srcdir}/../..` #Include common ops -################################################################################################# -# Copyright (c) 2010, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory -# Written by Todd Gamblin, tgamblin@llnl.gov. -# LLNL-CODE-417602 -# All rights reserved. -# -# This file is part of Libra. For details, see http://github.com/tgamblin/libra. -# Please also read the LICENSE file for further information. -# -# Redistribution and use in source and binary forms, with or without modification, are -# permitted provided that the following conditions are met: -# -# * Redistributions of source code must retain the above copyright notice, this list of -# conditions and the disclaimer below. -# * Redistributions in binary form must reproduce the above copyright notice, this list of -# conditions and the disclaimer (as noted below) in the documentation and/or other materials -# provided with the distribution. -# * Neither the name of the LLNS/LLNL nor the names of its contributors may be used to endorse -# or promote products derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS -# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL -# LAWRENCE LIVERMORE NATIONAL SECURITY, LLC, THE U.S. DEPARTMENT OF ENERGY OR CONTRIBUTORS BE -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -################################################################################################# - -# -# LX_DETECT_BLUEGENE -# -# Defines some compile-time tests to detect BlueGene architectures. -# This will AC_DEFINE the following macros if detected: -# -# BLUEGENE_L If BlueGene/L architecture is detected -# BLUEGENE_P If BlueGene/P architecture is detected -# BLUEGENE_Q If BlueGene/Q architecture is detected -# - - #Configure operations that are common between the Spindle and Spindle-client configurations #Network port and local storage location DEFAULT_PORT=21940 @@ -16639,14 +16593,7 @@ _ACEOF #OS Detection -# Check whether --enable-bluegene was given. -if test "${enable_bluegene+set}" = set; then : - enableval=$enable_bluegene; OS_BUILD=bluegene -fi - -if test "x$OS_BUILD" == "x"; then - OS_BUILD=linux -fi +OS_BUILD=linux #Startup type @@ -16806,12 +16753,7 @@ _ACEOF #Runmode detection (pipe/socket or cobo/msocket communications) -if test "x$OS_BUILD" == "xlinux"; then - CLIENT_SERVER_COM=pipes -fi -if test "x$OS_BUILD" == "xbluegene"; then - CLIENT_SERVER_COM=biter -fi +CLIENT_SERVER_COM=pipes SERVER_SERVER_COM=cobo # Check whether --enable-pipes was given. @@ -16976,7 +16918,7 @@ $as_echo "#define arch_aarch64 1" >>confdefs.h fi #OS defines - if test "x$OS_BUILD" == "xbluegene"; then + if false; then BGQ_BLD_TRUE= BGQ_BLD_FALSE='#' else @@ -17025,16 +16967,9 @@ else fi -if test "x$OS_BUILD" == "xlinux"; then $as_echo "#define os_linux 1" >>confdefs.h -fi -if test "x$OS_BUILD" == "xbluegene"; then - -$as_echo "#define os_bluegene 1" >>confdefs.h - -fi #Python prefix @@ -17157,9 +17092,6 @@ if test "${enable_cleanup_process+set}" = set; then : enableval=$enable_cleanup_process; CLEANUP_PROC="true" fi -if test "x$OS_BUILD" == "xbluegene"; then - CLEANUP_PROC="true" -fi #Audit options # Check whether --enable-subaudit-as-default was given. diff --git a/src/fe/flux/Makefile.in b/src/fe/flux/Makefile.in index 85336eb7..3bfc2dbc 100644 --- a/src/fe/flux/Makefile.in +++ b/src/fe/flux/Makefile.in @@ -97,7 +97,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/ltversion.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ $(top_srcdir)/../../m4/pkg.m4 \ - $(top_srcdir)/../../m4/lx_detect_bluegene.m4 \ $(top_srcdir)/../../configure.common.ac \ $(top_srcdir)/../../m4/lmon.m4 \ $(top_srcdir)/../../m4/launcher.m4 $(top_srcdir)/configure.ac diff --git a/src/fe/hostbin/Makefile.in b/src/fe/hostbin/Makefile.in index 6a819fde..1fbd7d77 100644 --- a/src/fe/hostbin/Makefile.in +++ b/src/fe/hostbin/Makefile.in @@ -97,7 +97,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/ltversion.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ $(top_srcdir)/../../m4/pkg.m4 \ - $(top_srcdir)/../../m4/lx_detect_bluegene.m4 \ $(top_srcdir)/../../configure.common.ac \ $(top_srcdir)/../../m4/lmon.m4 \ $(top_srcdir)/../../m4/launcher.m4 $(top_srcdir)/configure.ac diff --git a/src/fe/launchmon/Makefile.in b/src/fe/launchmon/Makefile.in index 719e52e2..fe4eee50 100644 --- a/src/fe/launchmon/Makefile.in +++ b/src/fe/launchmon/Makefile.in @@ -97,7 +97,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/ltversion.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ $(top_srcdir)/../../m4/pkg.m4 \ - $(top_srcdir)/../../m4/lx_detect_bluegene.m4 \ $(top_srcdir)/../../configure.common.ac \ $(top_srcdir)/../../m4/lmon.m4 \ $(top_srcdir)/../../m4/launcher.m4 $(top_srcdir)/configure.ac diff --git a/src/fe/logging/Makefile.in b/src/fe/logging/Makefile.in index 9e123c46..5a071bed 100644 --- a/src/fe/logging/Makefile.in +++ b/src/fe/logging/Makefile.in @@ -99,7 +99,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/ltversion.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ $(top_srcdir)/../../m4/pkg.m4 \ - $(top_srcdir)/../../m4/lx_detect_bluegene.m4 \ $(top_srcdir)/../../configure.common.ac \ $(top_srcdir)/../../m4/lmon.m4 \ $(top_srcdir)/../../m4/launcher.m4 $(top_srcdir)/configure.ac diff --git a/src/fe/openmpi_intercept/Makefile.in b/src/fe/openmpi_intercept/Makefile.in index 2683d265..d2cd3e4d 100644 --- a/src/fe/openmpi_intercept/Makefile.in +++ b/src/fe/openmpi_intercept/Makefile.in @@ -97,7 +97,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/ltversion.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ $(top_srcdir)/../../m4/pkg.m4 \ - $(top_srcdir)/../../m4/lx_detect_bluegene.m4 \ $(top_srcdir)/../../configure.common.ac \ $(top_srcdir)/../../m4/lmon.m4 \ $(top_srcdir)/../../m4/launcher.m4 $(top_srcdir)/configure.ac diff --git a/src/fe/startup/Makefile.in b/src/fe/startup/Makefile.in index 0f678858..93ce5b2a 100644 --- a/src/fe/startup/Makefile.in +++ b/src/fe/startup/Makefile.in @@ -106,7 +106,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/ltversion.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ $(top_srcdir)/../../m4/pkg.m4 \ - $(top_srcdir)/../../m4/lx_detect_bluegene.m4 \ $(top_srcdir)/../../configure.common.ac \ $(top_srcdir)/../../m4/lmon.m4 \ $(top_srcdir)/../../m4/launcher.m4 $(top_srcdir)/configure.ac diff --git a/src/server/Makefile.in b/src/server/Makefile.in index 4c6bf3b3..1537d17d 100644 --- a/src/server/Makefile.in +++ b/src/server/Makefile.in @@ -96,7 +96,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/ltversion.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ $(top_srcdir)/../../m4/pkg.m4 \ - $(top_srcdir)/../../m4/lx_detect_bluegene.m4 \ $(top_srcdir)/../../configure.common.ac \ $(top_srcdir)/../../m4/lmon.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ diff --git a/src/server/auditserver/Makefile.in b/src/server/auditserver/Makefile.in index cede46ff..ebf13f9d 100644 --- a/src/server/auditserver/Makefile.in +++ b/src/server/auditserver/Makefile.in @@ -97,7 +97,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/ltversion.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ $(top_srcdir)/../../m4/pkg.m4 \ - $(top_srcdir)/../../m4/lx_detect_bluegene.m4 \ $(top_srcdir)/../../configure.common.ac \ $(top_srcdir)/../../m4/lmon.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ diff --git a/src/server/biter/Makefile.in b/src/server/biter/Makefile.in index d57b6e3f..22d413d3 100644 --- a/src/server/biter/Makefile.in +++ b/src/server/biter/Makefile.in @@ -89,8 +89,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -@BGQ_BLD_TRUE@am__append_1 = $(top_srcdir)/../biter/bgq_daemon_ids.c -@LINUX_BLD_TRUE@am__append_2 = $(top_srcdir)/../biter/linux_daemon_ids.c subdir = biter ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ @@ -99,7 +97,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/ltversion.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ $(top_srcdir)/../../m4/pkg.m4 \ - $(top_srcdir)/../../m4/lx_detect_bluegene.m4 \ $(top_srcdir)/../../configure.common.ac \ $(top_srcdir)/../../m4/lmon.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -111,19 +108,12 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) libbiterd_la_LIBADD = -am__libbiterd_la_SOURCES_DIST = $(top_srcdir)/../biter/biterd.c \ - $(top_srcdir)/../biter/server_queue.c \ - $(top_srcdir)/../biter/demultiplex.c \ - $(top_srcdir)/../biter/bgq_daemon_ids.c \ - $(top_srcdir)/../biter/linux_daemon_ids.c am__dirstamp = $(am__leading_dot)dirstamp -@BGQ_BLD_TRUE@am__objects_1 = $(top_builddir)/../biter/libbiterd_la-bgq_daemon_ids.lo -@LINUX_BLD_TRUE@am__objects_2 = $(top_builddir)/../biter/libbiterd_la-linux_daemon_ids.lo am_libbiterd_la_OBJECTS = \ $(top_builddir)/../biter/libbiterd_la-biterd.lo \ $(top_builddir)/../biter/libbiterd_la-server_queue.lo \ $(top_builddir)/../biter/libbiterd_la-demultiplex.lo \ - $(am__objects_1) $(am__objects_2) + $(top_builddir)/../biter/libbiterd_la-linux_daemon_ids.lo libbiterd_la_OBJECTS = $(am_libbiterd_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -147,7 +137,7 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/../../scripts/depcomp am__maybe_remake_depfiles = depfiles -am__depfiles_remade = $(top_builddir)/../biter/$(DEPDIR)/libbiterd_la-bgq_daemon_ids.Plo \ +am__depfiles_remade = \ $(top_builddir)/../biter/$(DEPDIR)/libbiterd_la-biterd.Plo \ $(top_builddir)/../biter/$(DEPDIR)/libbiterd_la-demultiplex.Plo \ $(top_builddir)/../biter/$(DEPDIR)/libbiterd_la-linux_daemon_ids.Plo \ @@ -172,7 +162,7 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = SOURCES = $(libbiterd_la_SOURCES) -DIST_SOURCES = $(am__libbiterd_la_SOURCES_DIST) +DIST_SOURCES = $(libbiterd_la_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -355,8 +345,8 @@ noinst_LTLIBRARIES = libbiterd.la AM_CFLAGS = -fvisibility=hidden libbiterd_la_SOURCES = $(top_srcdir)/../biter/biterd.c \ $(top_srcdir)/../biter/server_queue.c \ - $(top_srcdir)/../biter/demultiplex.c $(am__append_1) \ - $(am__append_2) + $(top_srcdir)/../biter/demultiplex.c \ + $(top_srcdir)/../biter/linux_daemon_ids.c libbiterd_la_CFLAGS = -DSERVER AM_CPPFLAGS = -I$(top_srcdir)/../biter -I$(top_srcdir)/../logging -I$(top_srcdir)/../include all: all-am @@ -418,9 +408,6 @@ $(top_builddir)/../biter/libbiterd_la-server_queue.lo: \ $(top_builddir)/../biter/libbiterd_la-demultiplex.lo: \ $(top_builddir)/../biter/$(am__dirstamp) \ $(top_builddir)/../biter/$(DEPDIR)/$(am__dirstamp) -$(top_builddir)/../biter/libbiterd_la-bgq_daemon_ids.lo: \ - $(top_builddir)/../biter/$(am__dirstamp) \ - $(top_builddir)/../biter/$(DEPDIR)/$(am__dirstamp) $(top_builddir)/../biter/libbiterd_la-linux_daemon_ids.lo: \ $(top_builddir)/../biter/$(am__dirstamp) \ $(top_builddir)/../biter/$(DEPDIR)/$(am__dirstamp) @@ -436,7 +423,6 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@$(top_builddir)/../biter/$(DEPDIR)/libbiterd_la-bgq_daemon_ids.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@$(top_builddir)/../biter/$(DEPDIR)/libbiterd_la-biterd.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@$(top_builddir)/../biter/$(DEPDIR)/libbiterd_la-demultiplex.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@$(top_builddir)/../biter/$(DEPDIR)/libbiterd_la-linux_daemon_ids.Plo@am__quote@ # am--include-marker @@ -493,13 +479,6 @@ $(top_builddir)/../biter/libbiterd_la-demultiplex.lo: $(top_builddir)/../biter/d @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbiterd_la_CFLAGS) $(CFLAGS) -c -o $(top_builddir)/../biter/libbiterd_la-demultiplex.lo `test -f '$(top_builddir)/../biter/demultiplex.c' || echo '$(srcdir)/'`$(top_builddir)/../biter/demultiplex.c -$(top_builddir)/../biter/libbiterd_la-bgq_daemon_ids.lo: $(top_builddir)/../biter/bgq_daemon_ids.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbiterd_la_CFLAGS) $(CFLAGS) -MT $(top_builddir)/../biter/libbiterd_la-bgq_daemon_ids.lo -MD -MP -MF $(top_builddir)/../biter/$(DEPDIR)/libbiterd_la-bgq_daemon_ids.Tpo -c -o $(top_builddir)/../biter/libbiterd_la-bgq_daemon_ids.lo `test -f '$(top_builddir)/../biter/bgq_daemon_ids.c' || echo '$(srcdir)/'`$(top_builddir)/../biter/bgq_daemon_ids.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(top_builddir)/../biter/$(DEPDIR)/libbiterd_la-bgq_daemon_ids.Tpo $(top_builddir)/../biter/$(DEPDIR)/libbiterd_la-bgq_daemon_ids.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_builddir)/../biter/bgq_daemon_ids.c' object='$(top_builddir)/../biter/libbiterd_la-bgq_daemon_ids.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbiterd_la_CFLAGS) $(CFLAGS) -c -o $(top_builddir)/../biter/libbiterd_la-bgq_daemon_ids.lo `test -f '$(top_builddir)/../biter/bgq_daemon_ids.c' || echo '$(srcdir)/'`$(top_builddir)/../biter/bgq_daemon_ids.c - $(top_builddir)/../biter/libbiterd_la-linux_daemon_ids.lo: $(top_builddir)/../biter/linux_daemon_ids.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbiterd_la_CFLAGS) $(CFLAGS) -MT $(top_builddir)/../biter/libbiterd_la-linux_daemon_ids.lo -MD -MP -MF $(top_builddir)/../biter/$(DEPDIR)/libbiterd_la-linux_daemon_ids.Tpo -c -o $(top_builddir)/../biter/libbiterd_la-linux_daemon_ids.lo `test -f '$(top_builddir)/../biter/linux_daemon_ids.c' || echo '$(srcdir)/'`$(top_builddir)/../biter/linux_daemon_ids.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(top_builddir)/../biter/$(DEPDIR)/libbiterd_la-linux_daemon_ids.Tpo $(top_builddir)/../biter/$(DEPDIR)/libbiterd_la-linux_daemon_ids.Plo @@ -641,8 +620,7 @@ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ mostlyclean-am distclean: distclean-am - -rm -f $(top_builddir)/../biter/$(DEPDIR)/libbiterd_la-bgq_daemon_ids.Plo - -rm -f $(top_builddir)/../biter/$(DEPDIR)/libbiterd_la-biterd.Plo + -rm -f $(top_builddir)/../biter/$(DEPDIR)/libbiterd_la-biterd.Plo -rm -f $(top_builddir)/../biter/$(DEPDIR)/libbiterd_la-demultiplex.Plo -rm -f $(top_builddir)/../biter/$(DEPDIR)/libbiterd_la-linux_daemon_ids.Plo -rm -f $(top_builddir)/../biter/$(DEPDIR)/libbiterd_la-server_queue.Plo @@ -691,8 +669,7 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f $(top_builddir)/../biter/$(DEPDIR)/libbiterd_la-bgq_daemon_ids.Plo - -rm -f $(top_builddir)/../biter/$(DEPDIR)/libbiterd_la-biterd.Plo + -rm -f $(top_builddir)/../biter/$(DEPDIR)/libbiterd_la-biterd.Plo -rm -f $(top_builddir)/../biter/$(DEPDIR)/libbiterd_la-demultiplex.Plo -rm -f $(top_builddir)/../biter/$(DEPDIR)/libbiterd_la-linux_daemon_ids.Plo -rm -f $(top_builddir)/../biter/$(DEPDIR)/libbiterd_la-server_queue.Plo diff --git a/src/server/cache/Makefile.in b/src/server/cache/Makefile.in index 3cb81709..772dc1bd 100644 --- a/src/server/cache/Makefile.in +++ b/src/server/cache/Makefile.in @@ -97,7 +97,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/ltversion.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ $(top_srcdir)/../../m4/pkg.m4 \ - $(top_srcdir)/../../m4/lx_detect_bluegene.m4 \ $(top_srcdir)/../../configure.common.ac \ $(top_srcdir)/../../m4/lmon.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ diff --git a/src/server/cobo/Makefile.in b/src/server/cobo/Makefile.in index 599b3f5d..8541b749 100644 --- a/src/server/cobo/Makefile.in +++ b/src/server/cobo/Makefile.in @@ -97,7 +97,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/ltversion.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ $(top_srcdir)/../../m4/pkg.m4 \ - $(top_srcdir)/../../m4/lx_detect_bluegene.m4 \ $(top_srcdir)/../../configure.common.ac \ $(top_srcdir)/../../m4/lmon.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ diff --git a/src/server/comlib/Makefile.in b/src/server/comlib/Makefile.in index b3c072ff..04011f69 100644 --- a/src/server/comlib/Makefile.in +++ b/src/server/comlib/Makefile.in @@ -98,7 +98,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/ltversion.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ $(top_srcdir)/../../m4/pkg.m4 \ - $(top_srcdir)/../../m4/lx_detect_bluegene.m4 \ $(top_srcdir)/../../configure.common.ac \ $(top_srcdir)/../../m4/lmon.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ diff --git a/src/server/config.h.in b/src/server/config.h.in index 14c85b47..8499401f 100644 --- a/src/server/config.h.in +++ b/src/server/config.h.in @@ -197,8 +197,5 @@ /* Define if we're compiling for an x86_64 target */ #undef arch_x86_64 -/* Define if we're compiling for a BlueGene target */ -#undef os_bluegene - /* Define if we're compiling for a linux target */ #undef os_linux diff --git a/src/server/configure b/src/server/configure index 71d5fb82..c64aa657 100755 --- a/src/server/configure +++ b/src/server/configure @@ -848,7 +848,6 @@ enable_slurm enable_slurm_plugin enable_flux_plugin with_slurm_dir -enable_bluegene with_hostbin with_rsh_launch with_rsh_cmd @@ -1536,7 +1535,6 @@ Optional Features: launching --enable-slurm-plugin Builds in support for running with SLURM via plugin --enable-flux-plugin Builds in support for running flux via a plugin - --enable-bluegene Build Spindle for BlueGene/Q --enable-pipes Use pipes for server/client communication --enable-socket Use sockets for server/client communication --enable-shmem Use shared memory for server/client communication @@ -16350,50 +16348,6 @@ SPINDLE_BUILD_ROOT=`pwd`/../.. SPINDLE_SOURCE_ROOT=`realpath ${srcdir}/../..` #Include common ops -################################################################################################# -# Copyright (c) 2010, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory -# Written by Todd Gamblin, tgamblin@llnl.gov. -# LLNL-CODE-417602 -# All rights reserved. -# -# This file is part of Libra. For details, see http://github.com/tgamblin/libra. -# Please also read the LICENSE file for further information. -# -# Redistribution and use in source and binary forms, with or without modification, are -# permitted provided that the following conditions are met: -# -# * Redistributions of source code must retain the above copyright notice, this list of -# conditions and the disclaimer below. -# * Redistributions in binary form must reproduce the above copyright notice, this list of -# conditions and the disclaimer (as noted below) in the documentation and/or other materials -# provided with the distribution. -# * Neither the name of the LLNS/LLNL nor the names of its contributors may be used to endorse -# or promote products derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS -# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL -# LAWRENCE LIVERMORE NATIONAL SECURITY, LLC, THE U.S. DEPARTMENT OF ENERGY OR CONTRIBUTORS BE -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -################################################################################################# - -# -# LX_DETECT_BLUEGENE -# -# Defines some compile-time tests to detect BlueGene architectures. -# This will AC_DEFINE the following macros if detected: -# -# BLUEGENE_L If BlueGene/L architecture is detected -# BLUEGENE_P If BlueGene/P architecture is detected -# BLUEGENE_Q If BlueGene/Q architecture is detected -# - - #Configure operations that are common between the Spindle and Spindle-client configurations #Network port and local storage location DEFAULT_PORT=21940 @@ -16636,14 +16590,7 @@ _ACEOF #OS Detection -# Check whether --enable-bluegene was given. -if test "${enable_bluegene+set}" = set; then : - enableval=$enable_bluegene; OS_BUILD=bluegene -fi - -if test "x$OS_BUILD" == "x"; then - OS_BUILD=linux -fi +OS_BUILD=linux #Startup type @@ -16803,12 +16750,7 @@ _ACEOF #Runmode detection (pipe/socket or cobo/msocket communications) -if test "x$OS_BUILD" == "xlinux"; then - CLIENT_SERVER_COM=pipes -fi -if test "x$OS_BUILD" == "xbluegene"; then - CLIENT_SERVER_COM=biter -fi +CLIENT_SERVER_COM=pipes SERVER_SERVER_COM=cobo # Check whether --enable-pipes was given. @@ -16973,7 +16915,7 @@ $as_echo "#define arch_aarch64 1" >>confdefs.h fi #OS defines - if test "x$OS_BUILD" == "xbluegene"; then + if false; then BGQ_BLD_TRUE= BGQ_BLD_FALSE='#' else @@ -17022,16 +16964,9 @@ else fi -if test "x$OS_BUILD" == "xlinux"; then $as_echo "#define os_linux 1" >>confdefs.h -fi -if test "x$OS_BUILD" == "xbluegene"; then - -$as_echo "#define os_bluegene 1" >>confdefs.h - -fi #Python prefix @@ -17154,9 +17089,6 @@ if test "${enable_cleanup_process+set}" = set; then : enableval=$enable_cleanup_process; CLEANUP_PROC="true" fi -if test "x$OS_BUILD" == "xbluegene"; then - CLEANUP_PROC="true" -fi #Audit options # Check whether --enable-subaudit-as-default was given. diff --git a/src/server/launchmon/Makefile.in b/src/server/launchmon/Makefile.in index fcca4c64..49d5e37d 100644 --- a/src/server/launchmon/Makefile.in +++ b/src/server/launchmon/Makefile.in @@ -97,7 +97,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/ltversion.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ $(top_srcdir)/../../m4/pkg.m4 \ - $(top_srcdir)/../../m4/lx_detect_bluegene.m4 \ $(top_srcdir)/../../configure.common.ac \ $(top_srcdir)/../../m4/lmon.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ diff --git a/src/server/logging/Makefile.in b/src/server/logging/Makefile.in index 6e5eb206..ff52f729 100644 --- a/src/server/logging/Makefile.in +++ b/src/server/logging/Makefile.in @@ -99,7 +99,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/ltversion.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ $(top_srcdir)/../../m4/pkg.m4 \ - $(top_srcdir)/../../m4/lx_detect_bluegene.m4 \ $(top_srcdir)/../../configure.common.ac \ $(top_srcdir)/../../m4/lmon.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ diff --git a/src/server/startup/Makefile.in b/src/server/startup/Makefile.in index 32d2421a..9e327f6d 100644 --- a/src/server/startup/Makefile.in +++ b/src/server/startup/Makefile.in @@ -108,7 +108,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/ltversion.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ $(top_srcdir)/../../m4/pkg.m4 \ - $(top_srcdir)/../../m4/lx_detect_bluegene.m4 \ $(top_srcdir)/../../configure.common.ac \ $(top_srcdir)/../../m4/lmon.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in index f3402c0a..fb991f42 100644 --- a/testsuite/Makefile.in +++ b/testsuite/Makefile.in @@ -362,10 +362,8 @@ BUILT_SOURCES = libtest10.so libtest11.so libtest12.so libtest13.so \ crash_test crash_test_fixedaddr crash_test_pie \ libcrashfuncs.so libcrashctor.so libcrashfixed.so \ run_crash_tests.sh -@BGQ_BLD_FALSE@DYNAMIC_FLAG = -@BGQ_BLD_TRUE@DYNAMIC_FLAG = -dynamic -@BGQ_BLD_FALSE@IS_BLUEGENE = false -@BGQ_BLD_TRUE@IS_BLUEGENE = true +DYNAMIC_FLAG = +IS_BLUEGENE = false libgenerator_SOURCES = libgenerator.c test_driverSOURCES = $(top_srcdir)/testsuite/test_driver.c test_driverCFLAGS = -DLPATH=$(top_builddir)/testsuite -I$(top_srcdir)/src/client/spindle_api -I$(top_srcdir)/src/utils $(MPI_CFLAGS) -Wall -I$(top_builddir) From ae91484158049d23228e9d519840790e947d9044 Mon Sep 17 00:00:00 2001 From: Barry Rountree Date: Thu, 30 Jul 2026 22:56:44 -0700 Subject: [PATCH 03/21] [prune-config] Removes --enable-subaudit-as-default. Per Claude Code + Opus. --- configure.common.ac | 12 ------------ src/fe/startup/config_mgr.cc | 4 ---- src/fe/startup/parseargs.cc | 12 ------------ 3 files changed, 28 deletions(-) diff --git a/configure.common.ac b/configure.common.ac index d1709f30..0c5e2527 100644 --- a/configure.common.ac +++ b/configure.common.ac @@ -343,11 +343,6 @@ AC_ARG_ENABLE(cleanup-process, [AS_HELP_STRING([--enable-cleanup-process],[Default to using a dedicated process to clean relocated files])], [CLEANUP_PROC="true"],) -#Audit options -AC_ARG_ENABLE(subaudit-as-default, - [AS_HELP_STRING([--enable-subaudit-as-default],[Enable subaudit option as defaulted to on])], - [USE_SUBAUDIT_BY_DEFAULT="true"]) - if test "x$ENABLE_FLUX_PLUGIN" = "xtrue"; then # Check for whether to build Flux shell plugin PKG_CHECK_MODULES([FLUX_CORE], [flux-core > 0.40.0], [], [ENABLE_FLUX_PLUGIN=false]) @@ -437,13 +432,6 @@ AC_ARG_ENABLE(remap-pageone, AC_DEFUN([CHOOSE_DEF_AUDIT],[ AC_LANG_PUSH(C) - AC_MSG_CHECKING([set subaudit as defaulted to on...]) - if test "x$USE_SUBAUDIT_BY_DEFAULT" != "x"; then - AC_MSG_NOTICE([yes]) - AC_DEFINE([USE_SUBAUDIT_BY_DEFAULT], [1], [Use subaudit by default]) - else - AC_MSG_NOTICE([no]) - fi ]) AC_DEFUN([CHECK_MMAP],[ diff --git a/src/fe/startup/config_mgr.cc b/src/fe/startup/config_mgr.cc index 65ab9248..15d5bc57 100644 --- a/src/fe/startup/config_mgr.cc +++ b/src/fe/startup/config_mgr.cc @@ -98,11 +98,7 @@ using namespace std; #define NUMA_EXCLUDES_STR "" #endif -#if defined(USE_SUBAUDIT_BY_DEFAULT) -#define AUDITTYPE_STR "subaudit" -#else #define AUDITTYPE_STR "audit" -#endif #define SHMCACHE_SIZE_STR "0" diff --git a/src/fe/startup/parseargs.cc b/src/fe/startup/parseargs.cc index 65fdcb07..e7a3326c 100644 --- a/src/fe/startup/parseargs.cc +++ b/src/fe/startup/parseargs.cc @@ -57,12 +57,6 @@ using namespace std; #define DEFAULT_CLEAN_PROC_INT 0 #endif -#if !defined(USE_SUBAUDIT_BY_DEFAULT) /* May be defined via configure */ -#define DEFAULT_USE_SUBAUDIT 0 -#else -#define DEFAULT_USE_SUBAUDIT 1 -#endif - #define DEFAULT_PERSIST 0 #define SHM_DEFAULT_SIZE 0 @@ -72,12 +66,6 @@ using namespace std; #define DEFAULT_MSGCACHE_TIMEOUT_MS 100 #define DEFAULT_MSGCACHE_ON 0 -#if DEFAULT_USE_SUBAUDIT == 1 -#define DEFAULT_USE_SUBAUDIT_STR "subaudit" -#else -#define DEFAULT_USE_SUBAUDIT_STR "audit" -#endif - #if DEFAULT_PERSIST == 1 #define DEFAULT_PERSIST_STR "Yes" #else From 26c82fbf7094190d20ade3da1e672bb48173796e Mon Sep 17 00:00:00 2001 From: Barry Rountree Date: Thu, 30 Jul 2026 22:57:56 -0700 Subject: [PATCH 04/21] [prune-config] Changes post bootstrap.sh (--enable-subaudit-...) --- configure | 10 ---------- src/client/configure | 10 ---------- src/fe/config.h.in | 3 --- src/fe/configure | 22 ---------------------- src/server/configure | 10 ---------- 5 files changed, 55 deletions(-) diff --git a/configure b/configure index e24f6b19..eaaa9fb2 100755 --- a/configure +++ b/configure @@ -873,7 +873,6 @@ enable_numa with_numa_excludes with_usage_logging enable_cleanup_process -enable_subaudit_as_default enable_sec_munge enable_sec_keydir enable_sec_launchmon @@ -1566,8 +1565,6 @@ Optional Features: --enable-cleanup-process Default to using a dedicated process to clean relocated files - --enable-subaudit-as-default - Enable subaudit option as defaulted to on --enable-sec-munge Enable munge for connection authentication --enable-sec-keydir=keydir Enable filesystem directory 'keydir' to propagate @@ -17362,13 +17359,6 @@ if test "${enable_cleanup_process+set}" = set; then : fi -#Audit options -# Check whether --enable-subaudit-as-default was given. -if test "${enable_subaudit_as_default+set}" = set; then : - enableval=$enable_subaudit_as_default; USE_SUBAUDIT_BY_DEFAULT="true" -fi - - if test "x$ENABLE_FLUX_PLUGIN" = "xtrue"; then # Check for whether to build Flux shell plugin diff --git a/src/client/configure b/src/client/configure index a014bc50..0655ab4d 100755 --- a/src/client/configure +++ b/src/client/configure @@ -836,7 +836,6 @@ enable_numa with_numa_excludes with_usage_logging enable_cleanup_process -enable_subaudit_as_default enable_sec_munge enable_sec_keydir enable_sec_launchmon @@ -1510,8 +1509,6 @@ Optional Features: --enable-cleanup-process Default to using a dedicated process to clean relocated files - --enable-subaudit-as-default - Enable subaudit option as defaulted to on --enable-sec-munge Enable munge for connection authentication --enable-sec-keydir=keydir Enable filesystem directory 'keydir' to propagate @@ -13243,13 +13240,6 @@ if test "${enable_cleanup_process+set}" = set; then : fi -#Audit options -# Check whether --enable-subaudit-as-default was given. -if test "${enable_subaudit_as_default+set}" = set; then : - enableval=$enable_subaudit_as_default; USE_SUBAUDIT_BY_DEFAULT="true" -fi - - if test "x$ENABLE_FLUX_PLUGIN" = "xtrue"; then # Check for whether to build Flux shell plugin diff --git a/src/fe/config.h.in b/src/fe/config.h.in index ef1f4762..d5e8a5ce 100644 --- a/src/fe/config.h.in +++ b/src/fe/config.h.in @@ -197,9 +197,6 @@ /* The file for storing usage logs */ #undef USAGE_LOGGING_FILE -/* Use subaudit by default */ -#undef USE_SUBAUDIT_BY_DEFAULT - /* Version number of package */ #undef VERSION diff --git a/src/fe/configure b/src/fe/configure index 6a4e545a..b1a73917 100755 --- a/src/fe/configure +++ b/src/fe/configure @@ -857,7 +857,6 @@ enable_numa with_numa_excludes with_usage_logging enable_cleanup_process -enable_subaudit_as_default enable_sec_munge enable_sec_keydir enable_sec_launchmon @@ -1543,8 +1542,6 @@ Optional Features: --enable-cleanup-process Default to using a dedicated process to clean relocated files - --enable-subaudit-as-default - Enable subaudit option as defaulted to on --enable-sec-munge Enable munge for connection authentication --enable-sec-keydir=keydir Enable filesystem directory 'keydir' to propagate @@ -17093,13 +17090,6 @@ if test "${enable_cleanup_process+set}" = set; then : fi -#Audit options -# Check whether --enable-subaudit-as-default was given. -if test "${enable_subaudit_as_default+set}" = set; then : - enableval=$enable_subaudit_as_default; USE_SUBAUDIT_BY_DEFAULT="true" -fi - - if test "x$ENABLE_FLUX_PLUGIN" = "xtrue"; then # Check for whether to build Flux shell plugin @@ -17794,18 +17784,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - { $as_echo "$as_me:${as_lineno-$LINENO}: checking set subaudit as defaulted to on..." >&5 -$as_echo_n "checking set subaudit as defaulted to on...... " >&6; } - if test "x$USE_SUBAUDIT_BY_DEFAULT" != "x"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: yes" >&5 -$as_echo "$as_me: yes" >&6;} - -$as_echo "#define USE_SUBAUDIT_BY_DEFAULT 1" >>confdefs.h - - else - { $as_echo "$as_me:${as_lineno-$LINENO}: no" >&5 -$as_echo "$as_me: no" >&6;} - fi #Include LaunchMON diff --git a/src/server/configure b/src/server/configure index c64aa657..e34c88a3 100755 --- a/src/server/configure +++ b/src/server/configure @@ -863,7 +863,6 @@ enable_numa with_numa_excludes with_usage_logging enable_cleanup_process -enable_subaudit_as_default enable_sec_munge enable_sec_keydir enable_sec_launchmon @@ -1545,8 +1544,6 @@ Optional Features: --enable-cleanup-process Default to using a dedicated process to clean relocated files - --enable-subaudit-as-default - Enable subaudit option as defaulted to on --enable-sec-munge Enable munge for connection authentication --enable-sec-keydir=keydir Enable filesystem directory 'keydir' to propagate @@ -17090,13 +17087,6 @@ if test "${enable_cleanup_process+set}" = set; then : fi -#Audit options -# Check whether --enable-subaudit-as-default was given. -if test "${enable_subaudit_as_default+set}" = set; then : - enableval=$enable_subaudit_as_default; USE_SUBAUDIT_BY_DEFAULT="true" -fi - - if test "x$ENABLE_FLUX_PLUGIN" = "xtrue"; then # Check for whether to build Flux shell plugin From 2f679a55ead11a0a3adaff1e6076cfdc8ea7befe Mon Sep 17 00:00:00 2001 From: Barry Rountree Date: Thu, 30 Jul 2026 23:05:22 -0700 Subject: [PATCH 05/21] [prune-config] Removes --enable-shmem Per Claude Code + Opus --- configure.common.ac | 4 ---- src/client/client_comlib/client_wrappers.c | 2 -- src/server/comlib/Makefile.am | 6 ------ src/server/comlib/ldcs_api_wrapper.c | 2 -- 4 files changed, 14 deletions(-) diff --git a/configure.common.ac b/configure.common.ac index 0c5e2527..684a486a 100644 --- a/configure.common.ac +++ b/configure.common.ac @@ -206,9 +206,6 @@ AC_ARG_ENABLE(pipes, AC_ARG_ENABLE(socket, [AS_HELP_STRING([--enable-socket],[Use sockets for server/client communication])], [CLIENT_SERVER_COM=sockets;],) -AC_ARG_ENABLE(shmem, - [AS_HELP_STRING([--enable-shmem],[Use shared memory for server/client communication])], - [CLIENT_SERVER_COM=shmem;],) AC_ARG_ENABLE(biter, [AS_HELP_STRING([--enable-biter],[Use biter for server/client communication])], [CLIENT_SERVER_COM=biter;],) @@ -223,7 +220,6 @@ AC_ARG_ENABLE(cobo, AM_CONDITIONAL([PIPES], [test x$CLIENT_SERVER_COM == xpipes]) AM_CONDITIONAL([SOCKETS], [test x$CLIENT_SERVER_COM == xsocket]) -AM_CONDITIONAL([SHMEM], [test x$CLIENT_SERVER_COM == xshmem]) AM_CONDITIONAL([BITER], [test x$CLIENT_SERVER_COM == xbiter]) AM_CONDITIONAL([MSOCKET], [test x$SERVER_SERVER_COM == xmsocket]) AM_CONDITIONAL([COBO], [test x$SERVER_SERVER_COM == xcobo]) diff --git a/src/client/client_comlib/client_wrappers.c b/src/client/client_comlib/client_wrappers.c index ff8488ec..f1c8c186 100644 --- a/src/client/client_comlib/client_wrappers.c +++ b/src/client/client_comlib/client_wrappers.c @@ -25,8 +25,6 @@ #define COMM socket #elif defined(COMM_BITER) #define COMM biter -#elif defined(COMM_SHMEM) -#define COMM shmem #else #error Unknown communication type #endif diff --git a/src/server/comlib/Makefile.am b/src/server/comlib/Makefile.am index 2731931f..58ff7915 100644 --- a/src/server/comlib/Makefile.am +++ b/src/server/comlib/Makefile.am @@ -15,9 +15,3 @@ libserver_socket_la_SOURCES = ldcs_api_socket.c $(BASE_SRCS) noinst_LTLIBRARIES += libserver_biter.la libserver_biter_la_CPPFLAGS = $(AM_CPPFLAGS) -Dcomm=biter -I$(top_srcdir)/../biter libserver_biter_la_SOURCES = ldcs_api_biter.c $(BASE_SRCS) - -if SHMEM -noinst_LTLIBRARIES += libserver_shmem.la -libserver_shmem_la_CPPFLAGS = $(AM_CPPFLAGS) -Dcomm=shmem -libserver_shmem_la_SOURCES = ldcs_api_shmem.c $(BASE_SRCS) -endif diff --git a/src/server/comlib/ldcs_api_wrapper.c b/src/server/comlib/ldcs_api_wrapper.c index 4b5a66a1..2eb42202 100644 --- a/src/server/comlib/ldcs_api_wrapper.c +++ b/src/server/comlib/ldcs_api_wrapper.c @@ -26,8 +26,6 @@ Place, Suite 330, Boston, MA 02111-1307 USA #define COMM socket #elif defined(COMM_BITER) #define COMM biter -#elif defined(COMM_SHMEM) -#define COMM shmem #else #error Unknown communication type #endif From 5dda934b7699fc8bf60eed8e8e8b239dd588821f Mon Sep 17 00:00:00 2001 From: Barry Rountree Date: Thu, 30 Jul 2026 23:05:54 -0700 Subject: [PATCH 06/21] [prune-config] Changes post bootstrap.sh (--enable-shmem) --- configure | 21 ---------- src/client/configure | 21 ---------- src/fe/configure | 21 ---------- src/server/comlib/Makefile.in | 73 +++-------------------------------- src/server/configure | 21 ---------- 5 files changed, 5 insertions(+), 152 deletions(-) diff --git a/configure b/configure index eaaa9fb2..4b79f676 100755 --- a/configure +++ b/configure @@ -692,8 +692,6 @@ MSOCKET_FALSE MSOCKET_TRUE BITER_FALSE BITER_TRUE -SHMEM_FALSE -SHMEM_TRUE SOCKETS_FALSE SOCKETS_TRUE PIPES_FALSE @@ -864,7 +862,6 @@ with_rsh_cmd with_slurm_launch enable_pipes enable_socket -enable_shmem enable_biter enable_msocket enable_cobo @@ -1557,7 +1554,6 @@ Optional Features: --enable-flux-plugin Builds in support for running flux via a plugin --enable-pipes Use pipes for server/client communication --enable-socket Use sockets for server/client communication - --enable-shmem Use shared memory for server/client communication --enable-biter Use biter for server/client communication --enable-msocket Use msocket for inter-server communication --enable-cobo Use msocket for inter-server communication @@ -17032,11 +17028,6 @@ if test "${enable_socket+set}" = set; then : enableval=$enable_socket; CLIENT_SERVER_COM=sockets; fi -# Check whether --enable-shmem was given. -if test "${enable_shmem+set}" = set; then : - enableval=$enable_shmem; CLIENT_SERVER_COM=shmem; -fi - # Check whether --enable-biter was given. if test "${enable_biter+set}" = set; then : enableval=$enable_biter; CLIENT_SERVER_COM=biter; @@ -17071,14 +17062,6 @@ else SOCKETS_FALSE= fi - if test x$CLIENT_SERVER_COM == xshmem; then - SHMEM_TRUE= - SHMEM_FALSE='#' -else - SHMEM_TRUE='#' - SHMEM_FALSE= -fi - if test x$CLIENT_SERVER_COM == xbiter; then BITER_TRUE= BITER_FALSE='#' @@ -19042,10 +19025,6 @@ if test -z "${SOCKETS_TRUE}" && test -z "${SOCKETS_FALSE}"; then as_fn_error $? "conditional \"SOCKETS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${SHMEM_TRUE}" && test -z "${SHMEM_FALSE}"; then - as_fn_error $? "conditional \"SHMEM\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${BITER_TRUE}" && test -z "${BITER_FALSE}"; then as_fn_error $? "conditional \"BITER\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/src/client/configure b/src/client/configure index 0655ab4d..1672556c 100755 --- a/src/client/configure +++ b/src/client/configure @@ -665,8 +665,6 @@ MSOCKET_FALSE MSOCKET_TRUE BITER_FALSE BITER_TRUE -SHMEM_FALSE -SHMEM_TRUE SOCKETS_FALSE SOCKETS_TRUE PIPES_FALSE @@ -827,7 +825,6 @@ with_rsh_cmd with_slurm_launch enable_pipes enable_socket -enable_shmem enable_biter enable_msocket enable_cobo @@ -1501,7 +1498,6 @@ Optional Features: --enable-flux-plugin Builds in support for running flux via a plugin --enable-pipes Use pipes for server/client communication --enable-socket Use sockets for server/client communication - --enable-shmem Use shared memory for server/client communication --enable-biter Use biter for server/client communication --enable-msocket Use msocket for inter-server communication --enable-cobo Use msocket for inter-server communication @@ -12913,11 +12909,6 @@ if test "${enable_socket+set}" = set; then : enableval=$enable_socket; CLIENT_SERVER_COM=sockets; fi -# Check whether --enable-shmem was given. -if test "${enable_shmem+set}" = set; then : - enableval=$enable_shmem; CLIENT_SERVER_COM=shmem; -fi - # Check whether --enable-biter was given. if test "${enable_biter+set}" = set; then : enableval=$enable_biter; CLIENT_SERVER_COM=biter; @@ -12952,14 +12943,6 @@ else SOCKETS_FALSE= fi - if test x$CLIENT_SERVER_COM == xshmem; then - SHMEM_TRUE= - SHMEM_FALSE='#' -else - SHMEM_TRUE='#' - SHMEM_FALSE= -fi - if test x$CLIENT_SERVER_COM == xbiter; then BITER_TRUE= BITER_FALSE='#' @@ -13888,10 +13871,6 @@ if test -z "${SOCKETS_TRUE}" && test -z "${SOCKETS_FALSE}"; then as_fn_error $? "conditional \"SOCKETS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${SHMEM_TRUE}" && test -z "${SHMEM_FALSE}"; then - as_fn_error $? "conditional \"SHMEM\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${BITER_TRUE}" && test -z "${BITER_FALSE}"; then as_fn_error $? "conditional \"BITER\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/src/fe/configure b/src/fe/configure index b1a73917..d898f507 100755 --- a/src/fe/configure +++ b/src/fe/configure @@ -679,8 +679,6 @@ MSOCKET_FALSE MSOCKET_TRUE BITER_FALSE BITER_TRUE -SHMEM_FALSE -SHMEM_TRUE SOCKETS_FALSE SOCKETS_TRUE PIPES_FALSE @@ -848,7 +846,6 @@ with_rsh_cmd with_slurm_launch enable_pipes enable_socket -enable_shmem enable_biter enable_msocket enable_cobo @@ -1534,7 +1531,6 @@ Optional Features: --enable-flux-plugin Builds in support for running flux via a plugin --enable-pipes Use pipes for server/client communication --enable-socket Use sockets for server/client communication - --enable-shmem Use shared memory for server/client communication --enable-biter Use biter for server/client communication --enable-msocket Use msocket for inter-server communication --enable-cobo Use msocket for inter-server communication @@ -16763,11 +16759,6 @@ if test "${enable_socket+set}" = set; then : enableval=$enable_socket; CLIENT_SERVER_COM=sockets; fi -# Check whether --enable-shmem was given. -if test "${enable_shmem+set}" = set; then : - enableval=$enable_shmem; CLIENT_SERVER_COM=shmem; -fi - # Check whether --enable-biter was given. if test "${enable_biter+set}" = set; then : enableval=$enable_biter; CLIENT_SERVER_COM=biter; @@ -16802,14 +16793,6 @@ else SOCKETS_FALSE= fi - if test x$CLIENT_SERVER_COM == xshmem; then - SHMEM_TRUE= - SHMEM_FALSE='#' -else - SHMEM_TRUE='#' - SHMEM_FALSE= -fi - if test x$CLIENT_SERVER_COM == xbiter; then BITER_TRUE= BITER_FALSE='#' @@ -18260,10 +18243,6 @@ if test -z "${SOCKETS_TRUE}" && test -z "${SOCKETS_FALSE}"; then as_fn_error $? "conditional \"SOCKETS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${SHMEM_TRUE}" && test -z "${SHMEM_FALSE}"; then - as_fn_error $? "conditional \"SHMEM\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${BITER_TRUE}" && test -z "${BITER_FALSE}"; then as_fn_error $? "conditional \"BITER\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/src/server/comlib/Makefile.in b/src/server/comlib/Makefile.in index 04011f69..f565b511 100644 --- a/src/server/comlib/Makefile.in +++ b/src/server/comlib/Makefile.in @@ -89,7 +89,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -@SHMEM_TRUE@am__append_1 = libserver_shmem.la subdir = comlib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ @@ -126,23 +125,12 @@ am__objects_2 = libserver_pipe_la-ldcs_api_util.lo \ am_libserver_pipe_la_OBJECTS = libserver_pipe_la-ldcs_api_pipe.lo \ libserver_pipe_la-ldcs_api_pipe_notify.lo $(am__objects_2) libserver_pipe_la_OBJECTS = $(am_libserver_pipe_la_OBJECTS) -libserver_shmem_la_LIBADD = -am__libserver_shmem_la_SOURCES_DIST = ldcs_api_shmem.c ldcs_api_util.c \ - ldcs_api_listen.c ldcs_api_wrapper.c -am__objects_3 = libserver_shmem_la-ldcs_api_util.lo \ - libserver_shmem_la-ldcs_api_listen.lo \ - libserver_shmem_la-ldcs_api_wrapper.lo -@SHMEM_TRUE@am_libserver_shmem_la_OBJECTS = \ -@SHMEM_TRUE@ libserver_shmem_la-ldcs_api_shmem.lo \ -@SHMEM_TRUE@ $(am__objects_3) -libserver_shmem_la_OBJECTS = $(am_libserver_shmem_la_OBJECTS) -@SHMEM_TRUE@am_libserver_shmem_la_rpath = libserver_socket_la_LIBADD = -am__objects_4 = libserver_socket_la-ldcs_api_util.lo \ +am__objects_3 = libserver_socket_la-ldcs_api_util.lo \ libserver_socket_la-ldcs_api_listen.lo \ libserver_socket_la-ldcs_api_wrapper.lo am_libserver_socket_la_OBJECTS = \ - libserver_socket_la-ldcs_api_socket.lo $(am__objects_4) + libserver_socket_la-ldcs_api_socket.lo $(am__objects_3) libserver_socket_la_OBJECTS = $(am_libserver_socket_la_OBJECTS) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -169,10 +157,6 @@ am__depfiles_remade = \ ./$(DEPDIR)/libserver_pipe_la-ldcs_api_pipe_notify.Plo \ ./$(DEPDIR)/libserver_pipe_la-ldcs_api_util.Plo \ ./$(DEPDIR)/libserver_pipe_la-ldcs_api_wrapper.Plo \ - ./$(DEPDIR)/libserver_shmem_la-ldcs_api_listen.Plo \ - ./$(DEPDIR)/libserver_shmem_la-ldcs_api_shmem.Plo \ - ./$(DEPDIR)/libserver_shmem_la-ldcs_api_util.Plo \ - ./$(DEPDIR)/libserver_shmem_la-ldcs_api_wrapper.Plo \ ./$(DEPDIR)/libserver_socket_la-ldcs_api_listen.Plo \ ./$(DEPDIR)/libserver_socket_la-ldcs_api_socket.Plo \ ./$(DEPDIR)/libserver_socket_la-ldcs_api_util.Plo \ @@ -197,11 +181,9 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = SOURCES = $(libserver_biter_la_SOURCES) $(libserver_pipe_la_SOURCES) \ - $(libserver_shmem_la_SOURCES) $(libserver_socket_la_SOURCES) -DIST_SOURCES = $(libserver_biter_la_SOURCES) \ - $(libserver_pipe_la_SOURCES) \ - $(am__libserver_shmem_la_SOURCES_DIST) \ $(libserver_socket_la_SOURCES) +DIST_SOURCES = $(libserver_biter_la_SOURCES) \ + $(libserver_pipe_la_SOURCES) $(libserver_socket_la_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -381,7 +363,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ noinst_LTLIBRARIES = libserver_pipe.la libserver_socket.la \ - libserver_biter.la $(am__append_1) + libserver_biter.la AM_CPPFLAGS = -I$(top_srcdir)/../logging -I$(top_srcdir)/../include -I$(top_srcdir)/auditserver -I$(top_srcdir)/cache BASE_SRCS = ldcs_api_util.c ldcs_api_listen.c ldcs_api_wrapper.c libserver_pipe_la_CPPFLAGS = $(AM_CPPFLAGS) -Dcomm=pipe @@ -390,8 +372,6 @@ libserver_socket_la_CPPFLAGS = $(AM_CPPFLAGS) -Dcomm=socket libserver_socket_la_SOURCES = ldcs_api_socket.c $(BASE_SRCS) libserver_biter_la_CPPFLAGS = $(AM_CPPFLAGS) -Dcomm=biter -I$(top_srcdir)/../biter libserver_biter_la_SOURCES = ldcs_api_biter.c $(BASE_SRCS) -@SHMEM_TRUE@libserver_shmem_la_CPPFLAGS = $(AM_CPPFLAGS) -Dcomm=shmem -@SHMEM_TRUE@libserver_shmem_la_SOURCES = ldcs_api_shmem.c $(BASE_SRCS) all: all-am .SUFFIXES: @@ -443,9 +423,6 @@ libserver_biter.la: $(libserver_biter_la_OBJECTS) $(libserver_biter_la_DEPENDENC libserver_pipe.la: $(libserver_pipe_la_OBJECTS) $(libserver_pipe_la_DEPENDENCIES) $(EXTRA_libserver_pipe_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libserver_pipe_la_OBJECTS) $(libserver_pipe_la_LIBADD) $(LIBS) -libserver_shmem.la: $(libserver_shmem_la_OBJECTS) $(libserver_shmem_la_DEPENDENCIES) $(EXTRA_libserver_shmem_la_DEPENDENCIES) - $(AM_V_CCLD)$(LINK) $(am_libserver_shmem_la_rpath) $(libserver_shmem_la_OBJECTS) $(libserver_shmem_la_LIBADD) $(LIBS) - libserver_socket.la: $(libserver_socket_la_OBJECTS) $(libserver_socket_la_DEPENDENCIES) $(EXTRA_libserver_socket_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libserver_socket_la_OBJECTS) $(libserver_socket_la_LIBADD) $(LIBS) @@ -464,10 +441,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libserver_pipe_la-ldcs_api_pipe_notify.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libserver_pipe_la-ldcs_api_util.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libserver_pipe_la-ldcs_api_wrapper.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libserver_shmem_la-ldcs_api_listen.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libserver_shmem_la-ldcs_api_shmem.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libserver_shmem_la-ldcs_api_util.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libserver_shmem_la-ldcs_api_wrapper.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libserver_socket_la-ldcs_api_listen.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libserver_socket_la-ldcs_api_socket.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libserver_socket_la-ldcs_api_util.Plo@am__quote@ # am--include-marker @@ -566,34 +539,6 @@ libserver_pipe_la-ldcs_api_wrapper.lo: ldcs_api_wrapper.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libserver_pipe_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libserver_pipe_la-ldcs_api_wrapper.lo `test -f 'ldcs_api_wrapper.c' || echo '$(srcdir)/'`ldcs_api_wrapper.c -libserver_shmem_la-ldcs_api_shmem.lo: ldcs_api_shmem.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libserver_shmem_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libserver_shmem_la-ldcs_api_shmem.lo -MD -MP -MF $(DEPDIR)/libserver_shmem_la-ldcs_api_shmem.Tpo -c -o libserver_shmem_la-ldcs_api_shmem.lo `test -f 'ldcs_api_shmem.c' || echo '$(srcdir)/'`ldcs_api_shmem.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libserver_shmem_la-ldcs_api_shmem.Tpo $(DEPDIR)/libserver_shmem_la-ldcs_api_shmem.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ldcs_api_shmem.c' object='libserver_shmem_la-ldcs_api_shmem.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libserver_shmem_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libserver_shmem_la-ldcs_api_shmem.lo `test -f 'ldcs_api_shmem.c' || echo '$(srcdir)/'`ldcs_api_shmem.c - -libserver_shmem_la-ldcs_api_util.lo: ldcs_api_util.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libserver_shmem_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libserver_shmem_la-ldcs_api_util.lo -MD -MP -MF $(DEPDIR)/libserver_shmem_la-ldcs_api_util.Tpo -c -o libserver_shmem_la-ldcs_api_util.lo `test -f 'ldcs_api_util.c' || echo '$(srcdir)/'`ldcs_api_util.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libserver_shmem_la-ldcs_api_util.Tpo $(DEPDIR)/libserver_shmem_la-ldcs_api_util.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ldcs_api_util.c' object='libserver_shmem_la-ldcs_api_util.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libserver_shmem_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libserver_shmem_la-ldcs_api_util.lo `test -f 'ldcs_api_util.c' || echo '$(srcdir)/'`ldcs_api_util.c - -libserver_shmem_la-ldcs_api_listen.lo: ldcs_api_listen.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libserver_shmem_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libserver_shmem_la-ldcs_api_listen.lo -MD -MP -MF $(DEPDIR)/libserver_shmem_la-ldcs_api_listen.Tpo -c -o libserver_shmem_la-ldcs_api_listen.lo `test -f 'ldcs_api_listen.c' || echo '$(srcdir)/'`ldcs_api_listen.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libserver_shmem_la-ldcs_api_listen.Tpo $(DEPDIR)/libserver_shmem_la-ldcs_api_listen.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ldcs_api_listen.c' object='libserver_shmem_la-ldcs_api_listen.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libserver_shmem_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libserver_shmem_la-ldcs_api_listen.lo `test -f 'ldcs_api_listen.c' || echo '$(srcdir)/'`ldcs_api_listen.c - -libserver_shmem_la-ldcs_api_wrapper.lo: ldcs_api_wrapper.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libserver_shmem_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libserver_shmem_la-ldcs_api_wrapper.lo -MD -MP -MF $(DEPDIR)/libserver_shmem_la-ldcs_api_wrapper.Tpo -c -o libserver_shmem_la-ldcs_api_wrapper.lo `test -f 'ldcs_api_wrapper.c' || echo '$(srcdir)/'`ldcs_api_wrapper.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libserver_shmem_la-ldcs_api_wrapper.Tpo $(DEPDIR)/libserver_shmem_la-ldcs_api_wrapper.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ldcs_api_wrapper.c' object='libserver_shmem_la-ldcs_api_wrapper.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libserver_shmem_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libserver_shmem_la-ldcs_api_wrapper.lo `test -f 'ldcs_api_wrapper.c' || echo '$(srcdir)/'`ldcs_api_wrapper.c - libserver_socket_la-ldcs_api_socket.lo: ldcs_api_socket.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libserver_socket_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libserver_socket_la-ldcs_api_socket.lo -MD -MP -MF $(DEPDIR)/libserver_socket_la-ldcs_api_socket.Tpo -c -o libserver_socket_la-ldcs_api_socket.lo `test -f 'ldcs_api_socket.c' || echo '$(srcdir)/'`ldcs_api_socket.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libserver_socket_la-ldcs_api_socket.Tpo $(DEPDIR)/libserver_socket_la-ldcs_api_socket.Plo @@ -762,10 +707,6 @@ distclean: distclean-am -rm -f ./$(DEPDIR)/libserver_pipe_la-ldcs_api_pipe_notify.Plo -rm -f ./$(DEPDIR)/libserver_pipe_la-ldcs_api_util.Plo -rm -f ./$(DEPDIR)/libserver_pipe_la-ldcs_api_wrapper.Plo - -rm -f ./$(DEPDIR)/libserver_shmem_la-ldcs_api_listen.Plo - -rm -f ./$(DEPDIR)/libserver_shmem_la-ldcs_api_shmem.Plo - -rm -f ./$(DEPDIR)/libserver_shmem_la-ldcs_api_util.Plo - -rm -f ./$(DEPDIR)/libserver_shmem_la-ldcs_api_wrapper.Plo -rm -f ./$(DEPDIR)/libserver_socket_la-ldcs_api_listen.Plo -rm -f ./$(DEPDIR)/libserver_socket_la-ldcs_api_socket.Plo -rm -f ./$(DEPDIR)/libserver_socket_la-ldcs_api_util.Plo @@ -824,10 +765,6 @@ maintainer-clean: maintainer-clean-am -rm -f ./$(DEPDIR)/libserver_pipe_la-ldcs_api_pipe_notify.Plo -rm -f ./$(DEPDIR)/libserver_pipe_la-ldcs_api_util.Plo -rm -f ./$(DEPDIR)/libserver_pipe_la-ldcs_api_wrapper.Plo - -rm -f ./$(DEPDIR)/libserver_shmem_la-ldcs_api_listen.Plo - -rm -f ./$(DEPDIR)/libserver_shmem_la-ldcs_api_shmem.Plo - -rm -f ./$(DEPDIR)/libserver_shmem_la-ldcs_api_util.Plo - -rm -f ./$(DEPDIR)/libserver_shmem_la-ldcs_api_wrapper.Plo -rm -f ./$(DEPDIR)/libserver_socket_la-ldcs_api_listen.Plo -rm -f ./$(DEPDIR)/libserver_socket_la-ldcs_api_socket.Plo -rm -f ./$(DEPDIR)/libserver_socket_la-ldcs_api_util.Plo diff --git a/src/server/configure b/src/server/configure index e34c88a3..96d9eaa2 100755 --- a/src/server/configure +++ b/src/server/configure @@ -685,8 +685,6 @@ MSOCKET_FALSE MSOCKET_TRUE BITER_FALSE BITER_TRUE -SHMEM_FALSE -SHMEM_TRUE SOCKETS_FALSE SOCKETS_TRUE PIPES_FALSE @@ -854,7 +852,6 @@ with_rsh_cmd with_slurm_launch enable_pipes enable_socket -enable_shmem enable_biter enable_msocket enable_cobo @@ -1536,7 +1533,6 @@ Optional Features: --enable-flux-plugin Builds in support for running flux via a plugin --enable-pipes Use pipes for server/client communication --enable-socket Use sockets for server/client communication - --enable-shmem Use shared memory for server/client communication --enable-biter Use biter for server/client communication --enable-msocket Use msocket for inter-server communication --enable-cobo Use msocket for inter-server communication @@ -16760,11 +16756,6 @@ if test "${enable_socket+set}" = set; then : enableval=$enable_socket; CLIENT_SERVER_COM=sockets; fi -# Check whether --enable-shmem was given. -if test "${enable_shmem+set}" = set; then : - enableval=$enable_shmem; CLIENT_SERVER_COM=shmem; -fi - # Check whether --enable-biter was given. if test "${enable_biter+set}" = set; then : enableval=$enable_biter; CLIENT_SERVER_COM=biter; @@ -16799,14 +16790,6 @@ else SOCKETS_FALSE= fi - if test x$CLIENT_SERVER_COM == xshmem; then - SHMEM_TRUE= - SHMEM_FALSE='#' -else - SHMEM_TRUE='#' - SHMEM_FALSE= -fi - if test x$CLIENT_SERVER_COM == xbiter; then BITER_TRUE= BITER_FALSE='#' @@ -18316,10 +18299,6 @@ if test -z "${SOCKETS_TRUE}" && test -z "${SOCKETS_FALSE}"; then as_fn_error $? "conditional \"SOCKETS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${SHMEM_TRUE}" && test -z "${SHMEM_FALSE}"; then - as_fn_error $? "conditional \"SHMEM\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${BITER_TRUE}" && test -z "${BITER_FALSE}"; then as_fn_error $? "conditional \"BITER\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 From efc49f80bffa0a2bf9c3c23c326cda2493188e59 Mon Sep 17 00:00:00 2001 From: Barry Rountree Date: Thu, 30 Jul 2026 23:28:31 -0700 Subject: [PATCH 07/21] [prune-config] Removes --enable-socket Per Claude Code + Opus --- configure.common.ac | 7 - src/client/auditclient/Makefile.am | 9 +- src/client/client/Makefile.am | 6 - src/client/client_comlib/Makefile.am | 4 - src/client/client_comlib/client_api_socket.c | 246 ------------- src/client/client_comlib/client_wrappers.c | 2 - src/client/instrclient/Makefile.am | 9 +- src/client/subaudit/Makefile.am | 7 - src/server/comlib/Makefile.am | 4 - src/server/comlib/ldcs_api_socket.c | 348 ------------------- src/server/comlib/ldcs_api_socket.h | 43 --- src/server/comlib/ldcs_api_wrapper.c | 2 - src/server/startup/Makefile.am | 3 - 13 files changed, 2 insertions(+), 688 deletions(-) delete mode 100644 src/client/client_comlib/client_api_socket.c delete mode 100644 src/server/comlib/ldcs_api_socket.c delete mode 100644 src/server/comlib/ldcs_api_socket.h diff --git a/configure.common.ac b/configure.common.ac index 684a486a..abc413a0 100644 --- a/configure.common.ac +++ b/configure.common.ac @@ -203,9 +203,6 @@ SERVER_SERVER_COM=cobo AC_ARG_ENABLE(pipes, [AS_HELP_STRING([--enable-pipes],[Use pipes for server/client communication])], [CLIENT_SERVER_COM=pipes;],) -AC_ARG_ENABLE(socket, - [AS_HELP_STRING([--enable-socket],[Use sockets for server/client communication])], - [CLIENT_SERVER_COM=sockets;],) AC_ARG_ENABLE(biter, [AS_HELP_STRING([--enable-biter],[Use biter for server/client communication])], [CLIENT_SERVER_COM=biter;],) @@ -219,7 +216,6 @@ AC_ARG_ENABLE(cobo, [SERVER_SERVER_COM=cobo;],) AM_CONDITIONAL([PIPES], [test x$CLIENT_SERVER_COM == xpipes]) -AM_CONDITIONAL([SOCKETS], [test x$CLIENT_SERVER_COM == xsocket]) AM_CONDITIONAL([BITER], [test x$CLIENT_SERVER_COM == xbiter]) AM_CONDITIONAL([MSOCKET], [test x$SERVER_SERVER_COM == xmsocket]) AM_CONDITIONAL([COBO], [test x$SERVER_SERVER_COM == xcobo]) @@ -227,9 +223,6 @@ AM_CONDITIONAL([COBO], [test x$SERVER_SERVER_COM == xcobo]) if test "x$CLIENT_SERVER_COM" == "xpipes"; then AC_DEFINE([COMM_PIPES],[1],[Define if were using pipes for client/server communication]) fi -if test "x$CLIENT_SERVER_COM" == "xsocket"; then - AC_DEFINE([COMM_SOCKET],[1],[Define if were using sockets for client/server communication]) -fi if test "x$CLIENT_SERVER_COM" == "xbiter"; then AC_DEFINE([COMM_BITER],[1],[Define if were using biter for client/server communication]) fi diff --git a/src/client/auditclient/Makefile.am b/src/client/auditclient/Makefile.am index 94305b76..f0ce5fea 100644 --- a/src/client/auditclient/Makefile.am +++ b/src/client/auditclient/Makefile.am @@ -1,8 +1,5 @@ -pkglib_LTLIBRARIES = +pkglib_LTLIBRARIES = -if SOCKETS -pkglib_LTLIBRARIES += libspindle_audit_socket.la -endif if PIPES pkglib_LTLIBRARIES += libspindle_audit_pipe.la endif @@ -30,10 +27,6 @@ endif AUDITLIB = $(top_builddir)/client/libspindle_audit.la -libspindle_audit_socket_la_SOURCES = $(BASE_SRCS) $(ARCH_SRCS) -libspindle_audit_socket_la_LIBADD = $(top_builddir)/client/libspindlec_socket.la $(AUDITLIB) -libspindle_audit_socket_la_LDFLAGS = -shared -avoid-version -Wl,-rpath,$(GLIBC_BE_DIR) - libspindle_audit_pipe_la_SOURCES = $(BASE_SRCS) $(ARCH_SRCS) libspindle_audit_pipe_la_LIBADD = $(top_builddir)/client/libspindlec_pipe.la $(AUDITLIB) libspindle_audit_pipe_la_LDFLAGS = -shared -avoid-version -Wl,-rpath,$(GLIBC_BE_DIR) diff --git a/src/client/client/Makefile.am b/src/client/client/Makefile.am index 47085b75..dd20b144 100644 --- a/src/client/client/Makefile.am +++ b/src/client/client/Makefile.am @@ -1,9 +1,6 @@ noinst_LTLIBRARIES = libspindle_audit.la #noinst_LTLIBRARIES += libspindle_instr.la -if SOCKETS -noinst_LTLIBRARIES += libspindlec_socket.la -endif if PIPES noinst_LTLIBRARIES += libspindlec_pipe.la endif @@ -28,9 +25,6 @@ BASE_SRCS += $(top_srcdir)/crash_handler/crash_io.c \ $(top_srcdir)/crash_handler/crash_lib_offset.c \ $(top_srcdir)/crash_handler/crash_sigchain.c -libspindlec_socket_la_SOURCES = $(BASE_SRCS) -libspindlec_socket_la_LIBADD = $(top_builddir)/client_comlib/libclient_socket.la $(top_builddir)/logging/libspindleclogc.la $(top_builddir)/shm_cache/libshmcache.la - libspindlec_pipe_la_SOURCES = $(BASE_SRCS) libspindlec_pipe_la_LIBADD = $(top_builddir)/client_comlib/libclient_pipe.la $(top_builddir)/logging/libspindleclogc.la $(top_builddir)/shm_cache/libshmcache.la diff --git a/src/client/client_comlib/Makefile.am b/src/client/client_comlib/Makefile.am index 7c02cf6a..6c1be2f9 100644 --- a/src/client/client_comlib/Makefile.am +++ b/src/client/client_comlib/Makefile.am @@ -10,10 +10,6 @@ noinst_LTLIBRARIES += libclient_pipe.la libclient_pipe_la_CPPFLAGS = $(AM_CPPFLAGS) -DCOMM=pipe libclient_pipe_la_SOURCES = client_api_pipe.c $(BASE_SRCS) -noinst_LTLIBRARIES += libclient_socket.la -libclient_socket_la_CPPFLAGS = $(AM_CPPFLAGS) -DCOMM=socket -libclient_socket_la_SOURCES = client_api_socket.c $(BASE_SRCS) - noinst_LTLIBRARIES += libclient_biter.la libclient_biter_la_CPPFLAGS = $(AM_CPPFLAGS) -DCOMM=biter -I$(top_srcdir)/../biter libclient_biter_la_LIBADD = $(top_builddir)/biter/libbiterc.la diff --git a/src/client/client_comlib/client_api_socket.c b/src/client/client_comlib/client_api_socket.c deleted file mode 100644 index ee3edba3..00000000 --- a/src/client/client_comlib/client_api_socket.c +++ /dev/null @@ -1,246 +0,0 @@ -/* - This file is part of Spindle. For copyright information see the COPYRIGHT - file in the top level directory, or at - https://github.com/hpc/Spindle/blob/master/COPYRIGHT - - This program is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License (as published by the Free Software - Foundation) version 2.1 dated February 1999. This program is distributed in the - hope that it will be useful, but WITHOUT ANY WARRANTY; without even the IMPLIED - WARRANTY OF MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms - and conditions of the GNU Lesser General Public License for more details. You should - have received a copy of the GNU Lesser General Public License along with this - program; if not, write to the Free Software Foundation, Inc., 59 Temple - Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -#define _GNU_SOURCE - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "client_heap.h" -#include "ldcs_api_socket.h" -#include "ldcs_api.h" - -#define MAX_FD 1 -static struct fdlist_entry_t ldcs_socket_fdlist[MAX_FD]; - -static int get_new_fd_socket() -{ - /* Each client should establish one connection */ - return 0; -} - -static size_t _ldcs_read_socket(int fd, void *data, int bytes, ldcs_read_block_t block) { - - ssize_t btoread, bread, left, bsumread; - char *dataptr; - - left = bytes; - bsumread = 0; - dataptr = (char*) data; - - while (left > 0) { - btoread = left; - bread = read(fd, dataptr, btoread); - if(bread<0) { - if( (errno==EAGAIN) || (errno==EWOULDBLOCK) ) { - debug_printf3("read from socket: got EAGAIN or EWOULDBLOCK\n"); - if(block==LDCS_READ_NO_BLOCK) return(0); - else continue; - } else { - debug_printf3("read from socket: %zu bytes ... errno=%d (%s)\n",bread,errno,strerror(errno)); - } - } else { - debug_printf3("read from socket: %zu bytes ...\n",bread); - } - - if(bread>0) { - left -= bread; - dataptr += bread; - bsumread += bread; - } else { - if(bread==0) return(bsumread); - else return(bread); - } - } - return (bsumread); -} - -static int _ldcs_write_socket(int fd, const void *data, int bytes ) { - int left,bsumwrote; - size_t bwrite, bwrote; - char *dataptr; - - left = bytes; - bsumwrote = 0; - dataptr = (char*) data; - - while (left > 0) { - bwrite = left; - bwrote = write(fd, dataptr, bwrite); - left -= bwrote; - dataptr += bwrote; - bsumwrote += bwrote; - } - return (bsumwrote); -} - - -int client_open_connection_socket(char* hostname, int portno) -{ - int sockfd, fd; - struct sockaddr_in serv_addr; - struct hostent *server; - - fd=get_new_fd_socket(); - if(fd<0) return(-1); - ldcs_socket_fdlist[fd].type=LDCS_SOCKET_FD_TYPE_CONN; - - sockfd = socket(AF_INET, SOCK_STREAM, 0); - if (sockfd < 0) _error("ERROR opening socket"); - - debug_printf3("after socket: -> sockfd=%d\n",sockfd); - - server = gethostbyname(hostname); - debug_printf3("after gethostbyname: -> server=%p\n",server); - if (server == NULL) { - fprintf(stderr,"ERROR, no such host\n"); - exit(0); - } - - debug_printf3("after gethostbyname: -> hostname=%s\n",server->h_name); - - bzero((char *) &serv_addr, sizeof(serv_addr)); - serv_addr.sin_family = AF_INET; - bcopy((char *)server->h_addr, - (char *)&serv_addr.sin_addr.s_addr, - server->h_length); - serv_addr.sin_port = htons(portno); - debug_printf3("after port: -> port=%d\n",portno); - - ldcs_socket_fdlist[fd].fd=sockfd; - - - if (connect(sockfd,(struct sockaddr *) &serv_addr,sizeof(serv_addr)) < 0) { - return(-1); - } - - debug_printf3("after connect: -> port=%d\n",portno); - - return(fd); - -} - -char *client_get_connection_string_socket(int fd) -{ - int sockfd = ldcs_socket_fdlist[fd].fd; - - int slen = 64; - char *str = (char *) spindle_malloc(slen); - if (!str) - return NULL; - snprintf(str, slen, "%d", sockfd); - return str; -} - -int client_register_connection_socket(char *connection_str) -{ - int sockfd, result; - - result = sscanf(connection_str, "%d", &sockfd); - if (result != 1) - return -1; - - int fd = get_new_fd_socket(); - if (fd < 0) - return -1; - - ldcs_socket_fdlist[fd].type = LDCS_SOCKET_FD_TYPE_CONN; - ldcs_socket_fdlist[fd].fd = sockfd; - - return fd; -} - -int client_close_connection_socket(int fd) -{ - int rc=0; - int sockfd; - - if ((fd<0) || (fd>MAX_FD) ) _error("wrong fd"); - - sockfd=ldcs_socket_fdlist[fd].fd; - - if(sockfd<0) return(-1); - - rc=close(sockfd); - - return(rc); -} - -int client_send_msg_socket(int fd, ldcs_message_t * msg) { - - char help[41]; - int n, connfd; - if ((fd<0) || (fd>MAX_FD) ) _error("wrong fd"); - connfd=ldcs_socket_fdlist[fd].fd; - - bzero(help,41);if(msg->data) strncpy(help,msg->data,40); - debug_printf3("sending message of type: %s len=%zu data=%s ...\n", - _message_type_to_str(msg->header.type), - msg->header.len,help ); - - n = _ldcs_write_socket(connfd,&msg->header,sizeof(msg->header)); - if (n < 0) _error("ERROR writing header to socket"); - - if(msg->header.len>0) { - n = _ldcs_write_socket(connfd,(void *) msg->data,msg->header.len); - if (n < 0) _error("ERROR writing data to socket"); - } - - - return(0); -} - -int client_recv_msg_static_socket(int fd, ldcs_message_t *msg, ldcs_read_block_t block) { - char help[41]; - int rc=0, connfd; - size_t n; - if ((fd<0) || (fd>MAX_FD) ) _error("wrong fd"); - connfd=ldcs_socket_fdlist[fd].fd; - - - n = _ldcs_read_socket(connfd,&msg->header,sizeof(msg->header), block); - if (n == 0) return(rc); - - if(msg->header.len>0) { - - msg->data = (char *) spindle_malloc(msg->header.len); - if (!msg) _error("could not allocate memory for message data"); - - n = _ldcs_read_socket(connfd,msg->data,msg->header.len, LDCS_READ_BLOCK); - if (n == 0) return(rc); - if (n != msg->header.len) _error("received different number of bytes for message data"); - - } else { - msg->data = NULL; - } - - bzero(help,41);if(msg->data) strncpy(help,msg->data,40); - debug_printf3("received message of type: %s len=%zu data=%s ...\n", - _message_type_to_str(msg->header.type), - msg->header.len,help ); - - return(0); -} diff --git a/src/client/client_comlib/client_wrappers.c b/src/client/client_comlib/client_wrappers.c index f1c8c186..c211acfa 100644 --- a/src/client/client_comlib/client_wrappers.c +++ b/src/client/client_comlib/client_wrappers.c @@ -21,8 +21,6 @@ #if !defined(COMM) #if defined(COMM_PIPES) #define COMM pipe -#elif defined(COMM_SOCKETS) -#define COMM socket #elif defined(COMM_BITER) #define COMM biter #else diff --git a/src/client/instrclient/Makefile.am b/src/client/instrclient/Makefile.am index 05436cb2..99463c88 100644 --- a/src/client/instrclient/Makefile.am +++ b/src/client/instrclient/Makefile.am @@ -1,8 +1,5 @@ -pkglibexec_LTLIBRARIES = +pkglibexec_LTLIBRARIES = -if SOCKETS -pkglibexec_LTLIBRARIES += libspindle_instr_socket.la -endif if PIPES pkglibexec_LTLIBRARIES += libspindle_instr_pipe.la endif @@ -18,10 +15,6 @@ INSTRLIB = $(top_builddir)/client/libspindle_instr.la AM_CFLAGS = -fvisibility=hidden -libspindle_instr_socket_la_SOURCES = $(BASE_SRCS) -libspindle_instr_socket_la_LIBADD = $(top_builddir)/client/libspindlec_socket.la $(INSTRLIB) -libspindle_instr_socket_la_LDFLAGS = -shared -avoid-version - libspindle_instr_pipe_la_SOURCES = $(BASE_SRCS) libspindle_instr_pipe_la_LIBADD = $(top_builddir)/client/libspindlec_pipe.la $(INSTRLIB) libspindle_instr_pipe_la_LDFLAGS = -shared -avoid-version diff --git a/src/client/subaudit/Makefile.am b/src/client/subaudit/Makefile.am index 0d0cb4a1..6fd25571 100644 --- a/src/client/subaudit/Makefile.am +++ b/src/client/subaudit/Makefile.am @@ -1,8 +1,5 @@ pkglib_LTLIBRARIES = libspindleint.la -if SOCKETS -pkglib_LTLIBRARIES += libspindle_subaudit_socket.la -endif if PIPES pkglib_LTLIBRARIES += libspindle_subaudit_pipe.la endif @@ -21,10 +18,6 @@ AUDITLIB = $(top_builddir)/client/libspindle_audit.la libspindleint_la_SOURCES = preloadlib.c libspindleint_la_LDFLAGS = -shared -avoid-version -libspindle_subaudit_socket_la_SOURCES = $(BASE_SRCS) -libspindle_subaudit_socket_la_LIBADD = $(top_builddir)/client/libspindlec_socket.la $(AUDITLIB) -libspindle_subaudit_socket_la_LDFLAGS = -shared -avoid-version - libspindle_subaudit_pipe_la_SOURCES = $(BASE_SRCS) libspindle_subaudit_pipe_la_LIBADD = $(top_builddir)/client/libspindlec_pipe.la $(AUDITLIB) libspindle_subaudit_pipe_la_LDFLAGS = -shared -avoid-version diff --git a/src/server/comlib/Makefile.am b/src/server/comlib/Makefile.am index 58ff7915..91f96ef1 100644 --- a/src/server/comlib/Makefile.am +++ b/src/server/comlib/Makefile.am @@ -8,10 +8,6 @@ noinst_LTLIBRARIES += libserver_pipe.la libserver_pipe_la_CPPFLAGS = $(AM_CPPFLAGS) -Dcomm=pipe libserver_pipe_la_SOURCES = ldcs_api_pipe.c ldcs_api_pipe_notify.c $(BASE_SRCS) -noinst_LTLIBRARIES += libserver_socket.la -libserver_socket_la_CPPFLAGS = $(AM_CPPFLAGS) -Dcomm=socket -libserver_socket_la_SOURCES = ldcs_api_socket.c $(BASE_SRCS) - noinst_LTLIBRARIES += libserver_biter.la libserver_biter_la_CPPFLAGS = $(AM_CPPFLAGS) -Dcomm=biter -I$(top_srcdir)/../biter libserver_biter_la_SOURCES = ldcs_api_biter.c $(BASE_SRCS) diff --git a/src/server/comlib/ldcs_api_socket.c b/src/server/comlib/ldcs_api_socket.c deleted file mode 100644 index 33b8d761..00000000 --- a/src/server/comlib/ldcs_api_socket.c +++ /dev/null @@ -1,348 +0,0 @@ -/* -This file is part of Spindle. For copyright information see the COPYRIGHT -file in the top level directory, or at -https://github.com/hpc/Spindle/blob/master/COPYRIGHT - -This program is free software; you can redistribute it and/or modify it under -the terms of the GNU Lesser General Public License (as published by the Free Software -Foundation) version 2.1 dated February 1999. This program is distributed in the -hope that it will be useful, but WITHOUT ANY WARRANTY; without even the IMPLIED -WARRANTY OF MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms -and conditions of the GNU Lesser General Public License for more details. You should -have received a copy of the GNU Lesser General Public License along with this -program; if not, write to the Free Software Foundation, Inc., 59 Temple -Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "ldcs_api.h" -#include "spindle_launch.h" -#include "ldcs_api_socket.h" -#include "ldcs_audit_server_process.h" - -/* ************************************************************** */ -/* FD list */ -/* ************************************************************** */ - -#define MAX_FD 100 - -struct fdlist_entry_t ldcs_socket_fdlist[MAX_FD]; -int ldcs_fdlist_socket_cnt=-1; - -int get_new_fd_socket () { - int fd; - if(ldcs_fdlist_socket_cnt==-1) { - /* init fd list */ - for(fd=0;fdMAX_FD) ) _error("wrong fd"); - if(ldcs_socket_fdlist[fd].inuse) { - if(ldcs_socket_fdlist[fd].type==LDCS_SOCKET_FD_TYPE_SERVER) { - realfd=ldcs_socket_fdlist[fd].server_fd; - } - if(ldcs_socket_fdlist[fd].type==LDCS_SOCKET_FD_TYPE_CONN) { - realfd=ldcs_socket_fdlist[fd].fd; - } - } - return(realfd); -} - -/* ************************************************************** */ -/* SERVER functions */ -/* ************************************************************** */ - - -int ldcs_create_server_socket(char* location, number_t number) { - (void)location; - int fd, sockfd; - struct sockaddr_in serv_addr; - - fd=get_new_fd_socket(); - if(fd<0) return(-1); - - sockfd = socket(AF_INET, SOCK_STREAM, 0); - if (sockfd < 0) _error("ERROR opening socket"); - - debug_printf3("after socket: -> sockfd=%d\n",sockfd); - - bzero((char *) &serv_addr, sizeof(serv_addr)); - serv_addr.sin_family = AF_INET; - serv_addr.sin_addr.s_addr = INADDR_ANY; - serv_addr.sin_port = htons((int) number); - if (bind(sockfd, (struct sockaddr *) &serv_addr, - sizeof(serv_addr)) < 0) { - debug_printf3("after bind: -> could not bind %lu \n", (unsigned long) number); - return(-1); - } - - debug_printf3("after bind: -> sockfd=%d\n",sockfd); - - listen(sockfd,5); - - debug_printf3("after listen: -> sockfd=%d\n",sockfd); - - ldcs_socket_fdlist[fd].type=LDCS_SOCKET_FD_TYPE_SERVER; - ldcs_socket_fdlist[fd].server_fd=sockfd; - ldcs_socket_fdlist[fd].conn_list=NULL; - ldcs_socket_fdlist[fd].conn_list_size=0; - ldcs_socket_fdlist[fd].conn_list_used=0; - - return(fd); -} - -int ldcs_open_server_connection_socket(int fd) { - struct sockaddr_in cli_addr; - socklen_t clilen; - int connfd, serverfd, newsockfd; - - if ((fd<0) || (fd>MAX_FD) ) _error("wrong fd"); - serverfd=ldcs_socket_fdlist[fd].server_fd; - if(serverfd<0) return(-1); - - clilen = sizeof(cli_addr); - newsockfd = accept(serverfd, - (struct sockaddr *) &cli_addr, - &clilen); - if (newsockfd < 0) _error("ERROR on accept"); - debug_printf3("after accept: -> serverfd=%d newsockfd=%d\n",serverfd,newsockfd); - - /* add info to server fd data structure */ - connfd=get_new_fd_socket(); - if(connfd<0) return(-1); - - ldcs_socket_fdlist[connfd].type=LDCS_SOCKET_FD_TYPE_CONN; - ldcs_socket_fdlist[connfd].fd=newsockfd; - ldcs_socket_fdlist[connfd].server_fd=fd; - - ldcs_socket_fdlist[fd].conn_list_used++; - if (ldcs_socket_fdlist[fd].conn_list_used > ldcs_socket_fdlist[fd].conn_list_size) { - ldcs_socket_fdlist[fd].conn_list = realloc(ldcs_socket_fdlist[fd].conn_list, - (ldcs_socket_fdlist[fd].conn_list_used + 15) * sizeof(int) - ); - ldcs_socket_fdlist[fd].conn_list_size = ldcs_socket_fdlist[fd].conn_list_used + 15; - } - ldcs_socket_fdlist[fd].conn_list[ldcs_socket_fdlist[fd].conn_list_used-1]=connfd; - - return(connfd); -}; - -int ldcs_open_server_connections_socket(int fd, int nc, int *more_avail) { - (void)nc; - *more_avail=0; - return(ldcs_open_server_connection_socket(fd)); -}; - -int ldcs_close_server_connection_socket(int fd) { - int sockfd; - if ((fd<0) || (fd>MAX_FD) ) _error("wrong fd"); - sockfd=ldcs_socket_fdlist[fd].fd; - if(sockfd<0) return(-1); - close(sockfd); - return(0); -}; - -int ldcs_destroy_server_socket(int fd) { - int serverfd; - if ((fd<0) || (fd>MAX_FD) ) _error("wrong fd"); - serverfd=ldcs_socket_fdlist[fd].server_fd; - if(serverfd<0) return(-1); - close(serverfd); - return(0); -}; - - -/* ************************************************************** */ -/* message transfer functions */ -/* ************************************************************** */ -static size_t _ldcs_read_socket(int fd, void *data, int bytes, ldcs_read_block_t block) { - - ssize_t btoread, bread, left, bsumread; - char *dataptr; - - left = bytes; - bsumread = 0; - dataptr = (char*) data; - - while (left > 0) { - btoread = left; - bread = read(fd, dataptr, btoread); - if(bread<0) { - if( (errno==EAGAIN) || (errno==EWOULDBLOCK) ) { - debug_printf3("read from socket: got EAGAIN or EWOULDBLOCK\n"); - if(block==LDCS_READ_NO_BLOCK) return(0); - else continue; - } else { - debug_printf3("read from socket: %ld bytes ... errno=%d (%s)\n",bread,errno,strerror(errno)); - } - } else { - debug_printf3("read from socket: %ld bytes ...\n",bread); - } - - if(bread>0) { - left -= bread; - dataptr += bread; - bsumread += bread; - } else { - if(bread==0) return(bsumread); - else return(bread); - } - } - return (bsumread); -} - -static int _ldcs_write_socket(int fd, const void *data, int bytes ) { - int left,bsumwrote; - size_t bwrite, bwrote; - char *dataptr; - - left = bytes; - bsumwrote = 0; - dataptr = (char*) data; - - while (left > 0) { - bwrite = left; - bwrote = write(fd, dataptr, bwrite); - left -= bwrote; - dataptr += bwrote; - bsumwrote += bwrote; - } - return (bsumwrote); -} - -int ldcs_send_msg_socket(int fd, ldcs_message_t * msg) { - - char help[41]; - int n, connfd; - if ((fd<0) || (fd>MAX_FD) ) _error("wrong fd"); - connfd=ldcs_socket_fdlist[fd].fd; - - bzero(help,41);if(msg->data) strncpy(help,msg->data,40); - debug_printf3("sending message of type: %s len=%lu data=%s ...\n", - _message_type_to_str(msg->header.type), - msg->header.len,help ); - - n = _ldcs_write_socket(connfd,&msg->header,sizeof(msg->header)); - if (n < 0) _error("ERROR writing header to socket"); - - if(msg->header.len>0) { - n = _ldcs_write_socket(connfd,(void *) msg->data,msg->header.len); - if (n < 0) _error("ERROR writing data to socket"); - } - - - return(0); -} - -ldcs_message_t * ldcs_recv_msg_socket(int fd, ldcs_read_block_t block) { - ldcs_message_t *msg; - char help[41]; - size_t n; - int connfd; - if ((fd<0) || (fd>MAX_FD) ) _error("wrong fd"); - connfd=ldcs_socket_fdlist[fd].fd; - - msg = (ldcs_message_t *) malloc(sizeof(ldcs_message_t)); - if (!msg) _error("could not allocate memory for message"); - - - n = _ldcs_read_socket(connfd,&msg->header,sizeof(msg->header), block); - if (n == 0) { - free(msg); - return(NULL); - } - - if(msg->header.len>0) { - - msg->data = (char *) malloc(msg->header.len); - if (!msg) _error("could not allocate memory for message data"); - - n = _ldcs_read_socket(connfd,msg->data,msg->header.len, LDCS_READ_BLOCK); - if (n != msg->header.len) _error("received different number of bytes for message data"); - - } else { - msg->data = NULL; - } - - bzero(help,41);if(msg->data) strncpy(help,msg->data,40); - debug_printf3("received message of type: %s len=%lu data=%s ...\n", - _message_type_to_str(msg->header.type), - msg->header.len,help ); - - return(msg); -} - - -int ldcs_recv_msg_static_socket(int fd, ldcs_message_t *msg, ldcs_read_block_t block) { - char help[41]; - int rc=0, connfd; - size_t n; - if ((fd<0) || (fd>MAX_FD) ) _error("wrong fd"); - connfd=ldcs_socket_fdlist[fd].fd; - - - n = _ldcs_read_socket(connfd,&msg->header,sizeof(msg->header), block); - if (n == 0) return(rc); - - if(msg->header.len>0) { - - msg->data = (char *) malloc(msg->header.len); - if (!msg) _error("could not allocate memory for message data"); - - n = _ldcs_read_socket(connfd,msg->data,msg->header.len, LDCS_READ_BLOCK); - if (n == 0) return(rc); - if (n != msg->header.len) _error("received different number of bytes for message data"); - - } else { - msg->data = NULL; - } - - bzero(help,41);if(msg->data) strncpy(help,msg->data,40); - debug_printf3("received message of type: %s len=%lu data=%s ...\n", - _message_type_to_str(msg->header.type), - msg->header.len,help ); - - return(0); -} - -int ldcs_get_aux_fd_socket() -{ - return -1; -} - -int ldcs_socket_id_to_nc_socket(int id, int fd, ldcs_process_data_t *process_data) -{ - (void)fd; - (void)process_data; - return id; -} diff --git a/src/server/comlib/ldcs_api_socket.h b/src/server/comlib/ldcs_api_socket.h deleted file mode 100644 index f34f94c6..00000000 --- a/src/server/comlib/ldcs_api_socket.h +++ /dev/null @@ -1,43 +0,0 @@ -/* -This file is part of Spindle. For copyright information see the COPYRIGHT -file in the top level directory, or at -https://github.com/hpc/Spindle/blob/master/COPYRIGHT - -This program is free software; you can redistribute it and/or modify it under -the terms of the GNU Lesser General Public License (as published by the Free Software -Foundation) version 2.1 dated February 1999. This program is distributed in the -hope that it will be useful, but WITHOUT ANY WARRANTY; without even the IMPLIED -WARRANTY OF MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms -and conditions of the GNU Lesser General Public License for more details. You should -have received a copy of the GNU Lesser General Public License along with this -program; if not, write to the Free Software Foundation, Inc., 59 Temple -Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -#ifndef LDCS_API_SOCKET_H -#define LDCS_API_SOCKET_H - -typedef enum { - LDCS_SOCKET_FD_TYPE_SERVER, - LDCS_SOCKET_FD_TYPE_CONN, - LDCS_SOCKET_FD_TYPE_UNKNOWN -} fd_list_entry_type_t; - -struct fdlist_entry_t -{ - int inuse; - fd_list_entry_type_t type; - - /* server part */ - int server_fd; - int conn_list_size; - int conn_list_used; - int *conn_list; - - /* connection part */ - int fd; - int serverid; -}; - -#endif - diff --git a/src/server/comlib/ldcs_api_wrapper.c b/src/server/comlib/ldcs_api_wrapper.c index 2eb42202..9e49be82 100644 --- a/src/server/comlib/ldcs_api_wrapper.c +++ b/src/server/comlib/ldcs_api_wrapper.c @@ -22,8 +22,6 @@ Place, Suite 330, Boston, MA 02111-1307 USA #if !defined(COMM) #if defined(COMM_PIPES) #define COMM pipe -#elif defined(COMM_SOCKETS) -#define COMM socket #elif defined(COMM_BITER) #define COMM biter #else diff --git a/src/server/startup/Makefile.am b/src/server/startup/Makefile.am index 1b9a7785..5081c986 100644 --- a/src/server/startup/Makefile.am +++ b/src/server/startup/Makefile.am @@ -13,9 +13,6 @@ endif if MSOCKET CORE_LDADD += $(top_builddir)/auditserver/libaudit_server_msocket.la endif -if SOCKETS -CORE_LDADD += $(top_builddir)/comlib/libserver_socket.la -endif if PIPES CORE_LDADD += $(top_builddir)/comlib/libserver_pipe.la endif From 912968cecc78081e6a45d64f2cc085dbe896b61c Mon Sep 17 00:00:00 2001 From: Barry Rountree Date: Thu, 30 Jul 2026 23:29:22 -0700 Subject: [PATCH 08/21] [prune-config] Changes post bootstrap.sh (--enable-socket) --- config.h.in | 3 -- configure | 26 ----------- src/client/auditclient/Makefile.in | 35 +++------------ src/client/client/Makefile.in | 25 +++-------- src/client/client_comlib/Makefile.in | 66 ++-------------------------- src/client/config.h.in | 3 -- src/client/configure | 26 ----------- src/client/subaudit/Makefile.in | 27 ++---------- src/fe/config.h.in | 3 -- src/fe/configure | 26 ----------- src/server/comlib/Makefile.in | 66 ++-------------------------- src/server/config.h.in | 3 -- src/server/configure | 26 ----------- src/server/startup/Makefile.in | 24 +++++----- 14 files changed, 32 insertions(+), 327 deletions(-) diff --git a/config.h.in b/config.h.in index 8e018768..19dfa44e 100644 --- a/config.h.in +++ b/config.h.in @@ -24,9 +24,6 @@ /* Define if were using pipes for client/server communication */ #undef COMM_PIPES -/* Define if were using sockets for client/server communication */ -#undef COMM_SOCKET - /* Enable --crash-dedup by default */ #undef CRASH_DEDUP_ENABLED_BY_DEFAULT diff --git a/configure b/configure index 4b79f676..1359b2c3 100755 --- a/configure +++ b/configure @@ -692,8 +692,6 @@ MSOCKET_FALSE MSOCKET_TRUE BITER_FALSE BITER_TRUE -SOCKETS_FALSE -SOCKETS_TRUE PIPES_FALSE PIPES_TRUE SRUN_PATH @@ -861,7 +859,6 @@ with_rsh_launch with_rsh_cmd with_slurm_launch enable_pipes -enable_socket enable_biter enable_msocket enable_cobo @@ -1553,7 +1550,6 @@ Optional Features: --enable-slurm-plugin Builds in support for running with SLURM via plugin --enable-flux-plugin Builds in support for running flux via a plugin --enable-pipes Use pipes for server/client communication - --enable-socket Use sockets for server/client communication --enable-biter Use biter for server/client communication --enable-msocket Use msocket for inter-server communication --enable-cobo Use msocket for inter-server communication @@ -17023,11 +17019,6 @@ if test "${enable_pipes+set}" = set; then : enableval=$enable_pipes; CLIENT_SERVER_COM=pipes; fi -# Check whether --enable-socket was given. -if test "${enable_socket+set}" = set; then : - enableval=$enable_socket; CLIENT_SERVER_COM=sockets; -fi - # Check whether --enable-biter was given. if test "${enable_biter+set}" = set; then : enableval=$enable_biter; CLIENT_SERVER_COM=biter; @@ -17054,14 +17045,6 @@ else PIPES_FALSE= fi - if test x$CLIENT_SERVER_COM == xsocket; then - SOCKETS_TRUE= - SOCKETS_FALSE='#' -else - SOCKETS_TRUE='#' - SOCKETS_FALSE= -fi - if test x$CLIENT_SERVER_COM == xbiter; then BITER_TRUE= BITER_FALSE='#' @@ -17091,11 +17074,6 @@ if test "x$CLIENT_SERVER_COM" == "xpipes"; then $as_echo "#define COMM_PIPES 1" >>confdefs.h -fi -if test "x$CLIENT_SERVER_COM" == "xsocket"; then - -$as_echo "#define COMM_SOCKET 1" >>confdefs.h - fi if test "x$CLIENT_SERVER_COM" == "xbiter"; then @@ -19021,10 +18999,6 @@ if test -z "${PIPES_TRUE}" && test -z "${PIPES_FALSE}"; then as_fn_error $? "conditional \"PIPES\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${SOCKETS_TRUE}" && test -z "${SOCKETS_FALSE}"; then - as_fn_error $? "conditional \"SOCKETS\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${BITER_TRUE}" && test -z "${BITER_FALSE}"; then as_fn_error $? "conditional \"BITER\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/src/client/auditclient/Makefile.in b/src/client/auditclient/Makefile.in index 5278d8cf..2491fab6 100644 --- a/src/client/auditclient/Makefile.in +++ b/src/client/auditclient/Makefile.in @@ -89,9 +89,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -@SOCKETS_TRUE@am__append_1 = libspindle_audit_socket.la -@PIPES_TRUE@am__append_2 = libspindle_audit_pipe.la -@BITER_TRUE@am__append_3 = libspindle_audit_biter.la +@PIPES_TRUE@am__append_1 = libspindle_audit_pipe.la +@BITER_TRUE@am__append_2 = libspindle_audit_biter.la subdir = auditclient ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ @@ -180,22 +179,6 @@ libspindle_audit_pipe_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_CFLAGS) $(CFLAGS) $(libspindle_audit_pipe_la_LDFLAGS) \ $(LDFLAGS) -o $@ @PIPES_TRUE@am_libspindle_audit_pipe_la_rpath = -rpath $(pkglibdir) -libspindle_audit_socket_la_DEPENDENCIES = \ - $(top_builddir)/client/libspindlec_socket.la $(AUDITLIB) -am__libspindle_audit_socket_la_SOURCES_DIST = auditclient.c \ - auditclient_common.c patch_linkmap.c redirect.c bindgot.c \ - writablegot.c patch_bad_dtv.c malloc_wrapper.c fixlocale.c \ - auditclient_aarch64.c auditclient_ppc64.c auditclient_x86_64.c -am_libspindle_audit_socket_la_OBJECTS = $(am__objects_1) \ - $(am__objects_2) -libspindle_audit_socket_la_OBJECTS = \ - $(am_libspindle_audit_socket_la_OBJECTS) -libspindle_audit_socket_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(AM_CFLAGS) $(CFLAGS) $(libspindle_audit_socket_la_LDFLAGS) \ - $(LDFLAGS) -o $@ -@SOCKETS_TRUE@am_libspindle_audit_socket_la_rpath = -rpath \ -@SOCKETS_TRUE@ $(pkglibdir) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -239,11 +222,9 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = SOURCES = $(libspindle_audit_biter_la_SOURCES) \ - $(libspindle_audit_pipe_la_SOURCES) \ - $(libspindle_audit_socket_la_SOURCES) + $(libspindle_audit_pipe_la_SOURCES) DIST_SOURCES = $(am__libspindle_audit_biter_la_SOURCES_DIST) \ - $(am__libspindle_audit_pipe_la_SOURCES_DIST) \ - $(am__libspindle_audit_socket_la_SOURCES_DIST) + $(am__libspindle_audit_pipe_la_SOURCES_DIST) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -405,7 +386,7 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -pkglib_LTLIBRARIES = $(am__append_1) $(am__append_2) $(am__append_3) +pkglib_LTLIBRARIES = $(am__append_1) $(am__append_2) AM_CFLAGS = -fvisibility=hidden AM_CPPFLAGS = -I$(top_srcdir)/../logging -I$(top_srcdir)/../include -I$(top_srcdir)/client -I$(top_srcdir)/client_comlib -I$(top_srcdir)/crash_handler BASE_SRCS = auditclient.c auditclient_common.c patch_linkmap.c redirect.c bindgot.c writablegot.c patch_bad_dtv.c malloc_wrapper.c fixlocale.c @@ -414,9 +395,6 @@ BASE_SRCS = auditclient.c auditclient_common.c patch_linkmap.c redirect.c bindgo @PPC64_BLD_TRUE@ARCH_SRCS = auditclient_ppc64.c @X86_64_BLD_TRUE@ARCH_SRCS = auditclient_x86_64.c AUDITLIB = $(top_builddir)/client/libspindle_audit.la -libspindle_audit_socket_la_SOURCES = $(BASE_SRCS) $(ARCH_SRCS) -libspindle_audit_socket_la_LIBADD = $(top_builddir)/client/libspindlec_socket.la $(AUDITLIB) -libspindle_audit_socket_la_LDFLAGS = -shared -avoid-version -Wl,-rpath,$(GLIBC_BE_DIR) libspindle_audit_pipe_la_SOURCES = $(BASE_SRCS) $(ARCH_SRCS) libspindle_audit_pipe_la_LIBADD = $(top_builddir)/client/libspindlec_pipe.la $(AUDITLIB) libspindle_audit_pipe_la_LDFLAGS = -shared -avoid-version -Wl,-rpath,$(GLIBC_BE_DIR) @@ -498,9 +476,6 @@ libspindle_audit_biter.la: $(libspindle_audit_biter_la_OBJECTS) $(libspindle_aud libspindle_audit_pipe.la: $(libspindle_audit_pipe_la_OBJECTS) $(libspindle_audit_pipe_la_DEPENDENCIES) $(EXTRA_libspindle_audit_pipe_la_DEPENDENCIES) $(AM_V_CCLD)$(libspindle_audit_pipe_la_LINK) $(am_libspindle_audit_pipe_la_rpath) $(libspindle_audit_pipe_la_OBJECTS) $(libspindle_audit_pipe_la_LIBADD) $(LIBS) -libspindle_audit_socket.la: $(libspindle_audit_socket_la_OBJECTS) $(libspindle_audit_socket_la_DEPENDENCIES) $(EXTRA_libspindle_audit_socket_la_DEPENDENCIES) - $(AM_V_CCLD)$(libspindle_audit_socket_la_LINK) $(am_libspindle_audit_socket_la_rpath) $(libspindle_audit_socket_la_OBJECTS) $(libspindle_audit_socket_la_LIBADD) $(LIBS) - mostlyclean-compile: -rm -f *.$(OBJEXT) diff --git a/src/client/client/Makefile.in b/src/client/client/Makefile.in index 45fde4cc..d9e99dc0 100644 --- a/src/client/client/Makefile.in +++ b/src/client/client/Makefile.in @@ -90,9 +90,8 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ #noinst_LTLIBRARIES += libspindle_instr.la -@SOCKETS_TRUE@am__append_1 = libspindlec_socket.la -@PIPES_TRUE@am__append_2 = libspindlec_pipe.la -@BITER_TRUE@am__append_3 = libspindlec_biter.la +@PIPES_TRUE@am__append_1 = libspindlec_pipe.la +@BITER_TRUE@am__append_2 = libspindlec_biter.la subdir = client ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ @@ -152,13 +151,6 @@ libspindlec_pipe_la_DEPENDENCIES = \ am_libspindlec_pipe_la_OBJECTS = $(am__objects_2) libspindlec_pipe_la_OBJECTS = $(am_libspindlec_pipe_la_OBJECTS) @PIPES_TRUE@am_libspindlec_pipe_la_rpath = -libspindlec_socket_la_DEPENDENCIES = \ - $(top_builddir)/client_comlib/libclient_socket.la \ - $(top_builddir)/logging/libspindleclogc.la \ - $(top_builddir)/shm_cache/libshmcache.la -am_libspindlec_socket_la_OBJECTS = $(am__objects_2) -libspindlec_socket_la_OBJECTS = $(am_libspindlec_socket_la_OBJECTS) -@SOCKETS_TRUE@am_libspindlec_socket_la_rpath = AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -215,11 +207,9 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = SOURCES = $(libspindle_audit_la_SOURCES) \ - $(libspindlec_biter_la_SOURCES) $(libspindlec_pipe_la_SOURCES) \ - $(libspindlec_socket_la_SOURCES) + $(libspindlec_biter_la_SOURCES) $(libspindlec_pipe_la_SOURCES) DIST_SOURCES = $(libspindle_audit_la_SOURCES) \ - $(libspindlec_biter_la_SOURCES) $(libspindlec_pipe_la_SOURCES) \ - $(libspindlec_socket_la_SOURCES) + $(libspindlec_biter_la_SOURCES) $(libspindlec_pipe_la_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -382,7 +372,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ noinst_LTLIBRARIES = libspindle_audit.la $(am__append_1) \ - $(am__append_2) $(am__append_3) + $(am__append_2) AM_CFLAGS = -fvisibility=hidden AM_CPPFLAGS = -I$(top_srcdir)/../logging -I$(top_srcdir)/client_comlib -I$(top_srcdir)/../include -I$(top_srcdir)/shm_cache -I$(top_srcdir)/subaudit -I$(top_srcdir)/../utils -I$(top_srcdir)/auditclient -I$(top_srcdir)/client -I$(top_srcdir)/crash_handler INTERCEPT_SRCS = intercept_open.c intercept_exec.c intercept_stat.c intercept_readlink.c intercept_spindleapi.c intercept.c spindle_regex.c patch_interception.c realpath.c $(top_srcdir)/../utils/fileutil.c @@ -395,8 +385,6 @@ BASE_SRCS = client.c lookup.c should_intercept.c exec_util.c \ $(top_srcdir)/crash_handler/crash_handler.c \ $(top_srcdir)/crash_handler/crash_lib_offset.c \ $(top_srcdir)/crash_handler/crash_sigchain.c -libspindlec_socket_la_SOURCES = $(BASE_SRCS) -libspindlec_socket_la_LIBADD = $(top_builddir)/client_comlib/libclient_socket.la $(top_builddir)/logging/libspindleclogc.la $(top_builddir)/shm_cache/libshmcache.la libspindlec_pipe_la_SOURCES = $(BASE_SRCS) libspindlec_pipe_la_LIBADD = $(top_builddir)/client_comlib/libclient_pipe.la $(top_builddir)/logging/libspindleclogc.la $(top_builddir)/shm_cache/libshmcache.la libspindlec_biter_la_SOURCES = $(BASE_SRCS) @@ -493,9 +481,6 @@ libspindlec_biter.la: $(libspindlec_biter_la_OBJECTS) $(libspindlec_biter_la_DEP libspindlec_pipe.la: $(libspindlec_pipe_la_OBJECTS) $(libspindlec_pipe_la_DEPENDENCIES) $(EXTRA_libspindlec_pipe_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(am_libspindlec_pipe_la_rpath) $(libspindlec_pipe_la_OBJECTS) $(libspindlec_pipe_la_LIBADD) $(LIBS) -libspindlec_socket.la: $(libspindlec_socket_la_OBJECTS) $(libspindlec_socket_la_DEPENDENCIES) $(EXTRA_libspindlec_socket_la_DEPENDENCIES) - $(AM_V_CCLD)$(LINK) $(am_libspindlec_socket_la_rpath) $(libspindlec_socket_la_OBJECTS) $(libspindlec_socket_la_LIBADD) $(LIBS) - mostlyclean-compile: -rm -f *.$(OBJEXT) -rm -f $(top_builddir)/../utils/*.$(OBJEXT) diff --git a/src/client/client_comlib/Makefile.in b/src/client/client_comlib/Makefile.in index 34c46bd6..9ca035ab 100644 --- a/src/client/client_comlib/Makefile.in +++ b/src/client/client_comlib/Makefile.in @@ -125,13 +125,6 @@ am__objects_2 = libclient_pipe_la-client_api.lo \ am_libclient_pipe_la_OBJECTS = libclient_pipe_la-client_api_pipe.lo \ $(am__objects_2) libclient_pipe_la_OBJECTS = $(am_libclient_pipe_la_OBJECTS) -libclient_socket_la_LIBADD = -am__objects_3 = libclient_socket_la-client_api.lo \ - libclient_socket_la-client_heap.lo \ - libclient_socket_la-client_wrappers.lo -am_libclient_socket_la_OBJECTS = \ - libclient_socket_la-client_api_socket.lo $(am__objects_3) -libclient_socket_la_OBJECTS = $(am_libclient_socket_la_OBJECTS) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -154,11 +147,7 @@ am__depfiles_remade = ./$(DEPDIR)/libclient_biter_la-client_api.Plo \ ./$(DEPDIR)/libclient_pipe_la-client_api.Plo \ ./$(DEPDIR)/libclient_pipe_la-client_api_pipe.Plo \ ./$(DEPDIR)/libclient_pipe_la-client_heap.Plo \ - ./$(DEPDIR)/libclient_pipe_la-client_wrappers.Plo \ - ./$(DEPDIR)/libclient_socket_la-client_api.Plo \ - ./$(DEPDIR)/libclient_socket_la-client_api_socket.Plo \ - ./$(DEPDIR)/libclient_socket_la-client_heap.Plo \ - ./$(DEPDIR)/libclient_socket_la-client_wrappers.Plo + ./$(DEPDIR)/libclient_pipe_la-client_wrappers.Plo am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -178,10 +167,9 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = $(libclient_biter_la_SOURCES) $(libclient_pipe_la_SOURCES) \ - $(libclient_socket_la_SOURCES) +SOURCES = $(libclient_biter_la_SOURCES) $(libclient_pipe_la_SOURCES) DIST_SOURCES = $(libclient_biter_la_SOURCES) \ - $(libclient_pipe_la_SOURCES) $(libclient_socket_la_SOURCES) + $(libclient_pipe_la_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -343,15 +331,12 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -noinst_LTLIBRARIES = libclient_pipe.la libclient_socket.la \ - libclient_biter.la +noinst_LTLIBRARIES = libclient_pipe.la libclient_biter.la AM_CPPFLAGS = -I$(top_srcdir)/../logging -I$(top_srcdir)/../include BASE_SRCS = client_api.c client_heap.c client_wrappers.c AM_CFLAGS = -fvisibility=hidden libclient_pipe_la_CPPFLAGS = $(AM_CPPFLAGS) -DCOMM=pipe libclient_pipe_la_SOURCES = client_api_pipe.c $(BASE_SRCS) -libclient_socket_la_CPPFLAGS = $(AM_CPPFLAGS) -DCOMM=socket -libclient_socket_la_SOURCES = client_api_socket.c $(BASE_SRCS) libclient_biter_la_CPPFLAGS = $(AM_CPPFLAGS) -DCOMM=biter -I$(top_srcdir)/../biter libclient_biter_la_LIBADD = $(top_builddir)/biter/libbiterc.la libclient_biter_la_SOURCES = client_api_biter.c $(BASE_SRCS) @@ -406,9 +391,6 @@ libclient_biter.la: $(libclient_biter_la_OBJECTS) $(libclient_biter_la_DEPENDENC libclient_pipe.la: $(libclient_pipe_la_OBJECTS) $(libclient_pipe_la_DEPENDENCIES) $(EXTRA_libclient_pipe_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libclient_pipe_la_OBJECTS) $(libclient_pipe_la_LIBADD) $(LIBS) -libclient_socket.la: $(libclient_socket_la_OBJECTS) $(libclient_socket_la_DEPENDENCIES) $(EXTRA_libclient_socket_la_DEPENDENCIES) - $(AM_V_CCLD)$(LINK) $(libclient_socket_la_OBJECTS) $(libclient_socket_la_LIBADD) $(LIBS) - mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -423,10 +405,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclient_pipe_la-client_api_pipe.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclient_pipe_la-client_heap.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclient_pipe_la-client_wrappers.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclient_socket_la-client_api.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclient_socket_la-client_api_socket.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclient_socket_la-client_heap.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclient_socket_la-client_wrappers.Plo@am__quote@ # am--include-marker $(am__depfiles_remade): @$(MKDIR_P) $(@D) @@ -514,34 +492,6 @@ libclient_pipe_la-client_wrappers.lo: client_wrappers.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libclient_pipe_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libclient_pipe_la-client_wrappers.lo `test -f 'client_wrappers.c' || echo '$(srcdir)/'`client_wrappers.c -libclient_socket_la-client_api_socket.lo: client_api_socket.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libclient_socket_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libclient_socket_la-client_api_socket.lo -MD -MP -MF $(DEPDIR)/libclient_socket_la-client_api_socket.Tpo -c -o libclient_socket_la-client_api_socket.lo `test -f 'client_api_socket.c' || echo '$(srcdir)/'`client_api_socket.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libclient_socket_la-client_api_socket.Tpo $(DEPDIR)/libclient_socket_la-client_api_socket.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='client_api_socket.c' object='libclient_socket_la-client_api_socket.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libclient_socket_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libclient_socket_la-client_api_socket.lo `test -f 'client_api_socket.c' || echo '$(srcdir)/'`client_api_socket.c - -libclient_socket_la-client_api.lo: client_api.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libclient_socket_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libclient_socket_la-client_api.lo -MD -MP -MF $(DEPDIR)/libclient_socket_la-client_api.Tpo -c -o libclient_socket_la-client_api.lo `test -f 'client_api.c' || echo '$(srcdir)/'`client_api.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libclient_socket_la-client_api.Tpo $(DEPDIR)/libclient_socket_la-client_api.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='client_api.c' object='libclient_socket_la-client_api.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libclient_socket_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libclient_socket_la-client_api.lo `test -f 'client_api.c' || echo '$(srcdir)/'`client_api.c - -libclient_socket_la-client_heap.lo: client_heap.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libclient_socket_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libclient_socket_la-client_heap.lo -MD -MP -MF $(DEPDIR)/libclient_socket_la-client_heap.Tpo -c -o libclient_socket_la-client_heap.lo `test -f 'client_heap.c' || echo '$(srcdir)/'`client_heap.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libclient_socket_la-client_heap.Tpo $(DEPDIR)/libclient_socket_la-client_heap.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='client_heap.c' object='libclient_socket_la-client_heap.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libclient_socket_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libclient_socket_la-client_heap.lo `test -f 'client_heap.c' || echo '$(srcdir)/'`client_heap.c - -libclient_socket_la-client_wrappers.lo: client_wrappers.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libclient_socket_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libclient_socket_la-client_wrappers.lo -MD -MP -MF $(DEPDIR)/libclient_socket_la-client_wrappers.Tpo -c -o libclient_socket_la-client_wrappers.lo `test -f 'client_wrappers.c' || echo '$(srcdir)/'`client_wrappers.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libclient_socket_la-client_wrappers.Tpo $(DEPDIR)/libclient_socket_la-client_wrappers.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='client_wrappers.c' object='libclient_socket_la-client_wrappers.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libclient_socket_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libclient_socket_la-client_wrappers.lo `test -f 'client_wrappers.c' || echo '$(srcdir)/'`client_wrappers.c - mostlyclean-libtool: -rm -f *.lo @@ -681,10 +631,6 @@ distclean: distclean-am -rm -f ./$(DEPDIR)/libclient_pipe_la-client_api_pipe.Plo -rm -f ./$(DEPDIR)/libclient_pipe_la-client_heap.Plo -rm -f ./$(DEPDIR)/libclient_pipe_la-client_wrappers.Plo - -rm -f ./$(DEPDIR)/libclient_socket_la-client_api.Plo - -rm -f ./$(DEPDIR)/libclient_socket_la-client_api_socket.Plo - -rm -f ./$(DEPDIR)/libclient_socket_la-client_heap.Plo - -rm -f ./$(DEPDIR)/libclient_socket_la-client_wrappers.Plo -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -738,10 +684,6 @@ maintainer-clean: maintainer-clean-am -rm -f ./$(DEPDIR)/libclient_pipe_la-client_api_pipe.Plo -rm -f ./$(DEPDIR)/libclient_pipe_la-client_heap.Plo -rm -f ./$(DEPDIR)/libclient_pipe_la-client_wrappers.Plo - -rm -f ./$(DEPDIR)/libclient_socket_la-client_api.Plo - -rm -f ./$(DEPDIR)/libclient_socket_la-client_api_socket.Plo - -rm -f ./$(DEPDIR)/libclient_socket_la-client_heap.Plo - -rm -f ./$(DEPDIR)/libclient_socket_la-client_wrappers.Plo -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff --git a/src/client/config.h.in b/src/client/config.h.in index 024428c7..0d95c145 100644 --- a/src/client/config.h.in +++ b/src/client/config.h.in @@ -24,9 +24,6 @@ /* Define if were using pipes for client/server communication */ #undef COMM_PIPES -/* Define if were using sockets for client/server communication */ -#undef COMM_SOCKET - /* Enable --crash-dedup by default */ #undef CRASH_DEDUP_ENABLED_BY_DEFAULT diff --git a/src/client/configure b/src/client/configure index 1672556c..50d7a653 100755 --- a/src/client/configure +++ b/src/client/configure @@ -665,8 +665,6 @@ MSOCKET_FALSE MSOCKET_TRUE BITER_FALSE BITER_TRUE -SOCKETS_FALSE -SOCKETS_TRUE PIPES_FALSE PIPES_TRUE SRUN_PATH @@ -824,7 +822,6 @@ with_rsh_launch with_rsh_cmd with_slurm_launch enable_pipes -enable_socket enable_biter enable_msocket enable_cobo @@ -1497,7 +1494,6 @@ Optional Features: --enable-slurm-plugin Builds in support for running with SLURM via plugin --enable-flux-plugin Builds in support for running flux via a plugin --enable-pipes Use pipes for server/client communication - --enable-socket Use sockets for server/client communication --enable-biter Use biter for server/client communication --enable-msocket Use msocket for inter-server communication --enable-cobo Use msocket for inter-server communication @@ -12904,11 +12900,6 @@ if test "${enable_pipes+set}" = set; then : enableval=$enable_pipes; CLIENT_SERVER_COM=pipes; fi -# Check whether --enable-socket was given. -if test "${enable_socket+set}" = set; then : - enableval=$enable_socket; CLIENT_SERVER_COM=sockets; -fi - # Check whether --enable-biter was given. if test "${enable_biter+set}" = set; then : enableval=$enable_biter; CLIENT_SERVER_COM=biter; @@ -12935,14 +12926,6 @@ else PIPES_FALSE= fi - if test x$CLIENT_SERVER_COM == xsocket; then - SOCKETS_TRUE= - SOCKETS_FALSE='#' -else - SOCKETS_TRUE='#' - SOCKETS_FALSE= -fi - if test x$CLIENT_SERVER_COM == xbiter; then BITER_TRUE= BITER_FALSE='#' @@ -12972,11 +12955,6 @@ if test "x$CLIENT_SERVER_COM" == "xpipes"; then $as_echo "#define COMM_PIPES 1" >>confdefs.h -fi -if test "x$CLIENT_SERVER_COM" == "xsocket"; then - -$as_echo "#define COMM_SOCKET 1" >>confdefs.h - fi if test "x$CLIENT_SERVER_COM" == "xbiter"; then @@ -13867,10 +13845,6 @@ if test -z "${PIPES_TRUE}" && test -z "${PIPES_FALSE}"; then as_fn_error $? "conditional \"PIPES\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${SOCKETS_TRUE}" && test -z "${SOCKETS_FALSE}"; then - as_fn_error $? "conditional \"SOCKETS\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${BITER_TRUE}" && test -z "${BITER_FALSE}"; then as_fn_error $? "conditional \"BITER\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/src/client/subaudit/Makefile.in b/src/client/subaudit/Makefile.in index 0fb66700..1f58982c 100644 --- a/src/client/subaudit/Makefile.in +++ b/src/client/subaudit/Makefile.in @@ -89,9 +89,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -@SOCKETS_TRUE@am__append_1 = libspindle_subaudit_socket.la -@PIPES_TRUE@am__append_2 = libspindle_subaudit_pipe.la -@BITER_TRUE@am__append_3 = libspindle_subaudit_biter.la +@PIPES_TRUE@am__append_1 = libspindle_subaudit_pipe.la +@BITER_TRUE@am__append_2 = libspindle_subaudit_biter.la subdir = subaudit ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ @@ -167,17 +166,6 @@ libspindle_subaudit_pipe_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_CFLAGS) $(CFLAGS) $(libspindle_subaudit_pipe_la_LDFLAGS) \ $(LDFLAGS) -o $@ @PIPES_TRUE@am_libspindle_subaudit_pipe_la_rpath = -rpath $(pkglibdir) -libspindle_subaudit_socket_la_DEPENDENCIES = \ - $(top_builddir)/client/libspindlec_socket.la $(AUDITLIB) -am_libspindle_subaudit_socket_la_OBJECTS = $(am__objects_1) -libspindle_subaudit_socket_la_OBJECTS = \ - $(am_libspindle_subaudit_socket_la_OBJECTS) -libspindle_subaudit_socket_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(AM_CFLAGS) $(CFLAGS) \ - $(libspindle_subaudit_socket_la_LDFLAGS) $(LDFLAGS) -o $@ -@SOCKETS_TRUE@am_libspindle_subaudit_socket_la_rpath = -rpath \ -@SOCKETS_TRUE@ $(pkglibdir) libspindleint_la_LIBADD = am_libspindleint_la_OBJECTS = preloadlib.lo libspindleint_la_OBJECTS = $(am_libspindleint_la_OBJECTS) @@ -226,11 +214,9 @@ am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = SOURCES = $(libspindle_subaudit_biter_la_SOURCES) \ $(libspindle_subaudit_pipe_la_SOURCES) \ - $(libspindle_subaudit_socket_la_SOURCES) \ $(libspindleint_la_SOURCES) DIST_SOURCES = $(libspindle_subaudit_biter_la_SOURCES) \ $(libspindle_subaudit_pipe_la_SOURCES) \ - $(libspindle_subaudit_socket_la_SOURCES) \ $(libspindleint_la_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ @@ -393,17 +379,13 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -pkglib_LTLIBRARIES = libspindleint.la $(am__append_1) $(am__append_2) \ - $(am__append_3) +pkglib_LTLIBRARIES = libspindleint.la $(am__append_1) $(am__append_2) AM_CFLAGS = -fvisibility=hidden AM_CPPFLAGS = -I$(top_srcdir)/../logging -I$(top_srcdir)/../include -I$(top_srcdir)/client -I$(top_srcdir)/client_comlib -I$(top_srcdir)/auditclient -I$(top_srcdir)/../utils -I$(top_srcdir)/crash_handler BASE_SRCS = subaudit.c intercept_malloc.c update_pltbind.c ../auditclient/auditclient_common.c ../auditclient/patch_linkmap.c ../auditclient/fixlocale.c AUDITLIB = $(top_builddir)/client/libspindle_audit.la libspindleint_la_SOURCES = preloadlib.c libspindleint_la_LDFLAGS = -shared -avoid-version -libspindle_subaudit_socket_la_SOURCES = $(BASE_SRCS) -libspindle_subaudit_socket_la_LIBADD = $(top_builddir)/client/libspindlec_socket.la $(AUDITLIB) -libspindle_subaudit_socket_la_LDFLAGS = -shared -avoid-version libspindle_subaudit_pipe_la_SOURCES = $(BASE_SRCS) libspindle_subaudit_pipe_la_LIBADD = $(top_builddir)/client/libspindlec_pipe.la $(AUDITLIB) libspindle_subaudit_pipe_la_LDFLAGS = -shared -avoid-version @@ -497,9 +479,6 @@ libspindle_subaudit_biter.la: $(libspindle_subaudit_biter_la_OBJECTS) $(libspind libspindle_subaudit_pipe.la: $(libspindle_subaudit_pipe_la_OBJECTS) $(libspindle_subaudit_pipe_la_DEPENDENCIES) $(EXTRA_libspindle_subaudit_pipe_la_DEPENDENCIES) $(AM_V_CCLD)$(libspindle_subaudit_pipe_la_LINK) $(am_libspindle_subaudit_pipe_la_rpath) $(libspindle_subaudit_pipe_la_OBJECTS) $(libspindle_subaudit_pipe_la_LIBADD) $(LIBS) -libspindle_subaudit_socket.la: $(libspindle_subaudit_socket_la_OBJECTS) $(libspindle_subaudit_socket_la_DEPENDENCIES) $(EXTRA_libspindle_subaudit_socket_la_DEPENDENCIES) - $(AM_V_CCLD)$(libspindle_subaudit_socket_la_LINK) $(am_libspindle_subaudit_socket_la_rpath) $(libspindle_subaudit_socket_la_OBJECTS) $(libspindle_subaudit_socket_la_LIBADD) $(LIBS) - libspindleint.la: $(libspindleint_la_OBJECTS) $(libspindleint_la_DEPENDENCIES) $(EXTRA_libspindleint_la_DEPENDENCIES) $(AM_V_CCLD)$(libspindleint_la_LINK) -rpath $(pkglibdir) $(libspindleint_la_OBJECTS) $(libspindleint_la_LIBADD) $(LIBS) diff --git a/src/fe/config.h.in b/src/fe/config.h.in index d5e8a5ce..40039721 100644 --- a/src/fe/config.h.in +++ b/src/fe/config.h.in @@ -24,9 +24,6 @@ /* Define if were using pipes for client/server communication */ #undef COMM_PIPES -/* Define if were using sockets for client/server communication */ -#undef COMM_SOCKET - /* Enable --crash-dedup by default */ #undef CRASH_DEDUP_ENABLED_BY_DEFAULT diff --git a/src/fe/configure b/src/fe/configure index d898f507..61c6a749 100755 --- a/src/fe/configure +++ b/src/fe/configure @@ -679,8 +679,6 @@ MSOCKET_FALSE MSOCKET_TRUE BITER_FALSE BITER_TRUE -SOCKETS_FALSE -SOCKETS_TRUE PIPES_FALSE PIPES_TRUE SRUN_PATH @@ -845,7 +843,6 @@ with_rsh_launch with_rsh_cmd with_slurm_launch enable_pipes -enable_socket enable_biter enable_msocket enable_cobo @@ -1530,7 +1527,6 @@ Optional Features: --enable-slurm-plugin Builds in support for running with SLURM via plugin --enable-flux-plugin Builds in support for running flux via a plugin --enable-pipes Use pipes for server/client communication - --enable-socket Use sockets for server/client communication --enable-biter Use biter for server/client communication --enable-msocket Use msocket for inter-server communication --enable-cobo Use msocket for inter-server communication @@ -16754,11 +16750,6 @@ if test "${enable_pipes+set}" = set; then : enableval=$enable_pipes; CLIENT_SERVER_COM=pipes; fi -# Check whether --enable-socket was given. -if test "${enable_socket+set}" = set; then : - enableval=$enable_socket; CLIENT_SERVER_COM=sockets; -fi - # Check whether --enable-biter was given. if test "${enable_biter+set}" = set; then : enableval=$enable_biter; CLIENT_SERVER_COM=biter; @@ -16785,14 +16776,6 @@ else PIPES_FALSE= fi - if test x$CLIENT_SERVER_COM == xsocket; then - SOCKETS_TRUE= - SOCKETS_FALSE='#' -else - SOCKETS_TRUE='#' - SOCKETS_FALSE= -fi - if test x$CLIENT_SERVER_COM == xbiter; then BITER_TRUE= BITER_FALSE='#' @@ -16822,11 +16805,6 @@ if test "x$CLIENT_SERVER_COM" == "xpipes"; then $as_echo "#define COMM_PIPES 1" >>confdefs.h -fi -if test "x$CLIENT_SERVER_COM" == "xsocket"; then - -$as_echo "#define COMM_SOCKET 1" >>confdefs.h - fi if test "x$CLIENT_SERVER_COM" == "xbiter"; then @@ -18239,10 +18217,6 @@ if test -z "${PIPES_TRUE}" && test -z "${PIPES_FALSE}"; then as_fn_error $? "conditional \"PIPES\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${SOCKETS_TRUE}" && test -z "${SOCKETS_FALSE}"; then - as_fn_error $? "conditional \"SOCKETS\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${BITER_TRUE}" && test -z "${BITER_FALSE}"; then as_fn_error $? "conditional \"BITER\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/src/server/comlib/Makefile.in b/src/server/comlib/Makefile.in index f565b511..9af929ce 100644 --- a/src/server/comlib/Makefile.in +++ b/src/server/comlib/Makefile.in @@ -125,13 +125,6 @@ am__objects_2 = libserver_pipe_la-ldcs_api_util.lo \ am_libserver_pipe_la_OBJECTS = libserver_pipe_la-ldcs_api_pipe.lo \ libserver_pipe_la-ldcs_api_pipe_notify.lo $(am__objects_2) libserver_pipe_la_OBJECTS = $(am_libserver_pipe_la_OBJECTS) -libserver_socket_la_LIBADD = -am__objects_3 = libserver_socket_la-ldcs_api_util.lo \ - libserver_socket_la-ldcs_api_listen.lo \ - libserver_socket_la-ldcs_api_wrapper.lo -am_libserver_socket_la_OBJECTS = \ - libserver_socket_la-ldcs_api_socket.lo $(am__objects_3) -libserver_socket_la_OBJECTS = $(am_libserver_socket_la_OBJECTS) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -156,11 +149,7 @@ am__depfiles_remade = \ ./$(DEPDIR)/libserver_pipe_la-ldcs_api_pipe.Plo \ ./$(DEPDIR)/libserver_pipe_la-ldcs_api_pipe_notify.Plo \ ./$(DEPDIR)/libserver_pipe_la-ldcs_api_util.Plo \ - ./$(DEPDIR)/libserver_pipe_la-ldcs_api_wrapper.Plo \ - ./$(DEPDIR)/libserver_socket_la-ldcs_api_listen.Plo \ - ./$(DEPDIR)/libserver_socket_la-ldcs_api_socket.Plo \ - ./$(DEPDIR)/libserver_socket_la-ldcs_api_util.Plo \ - ./$(DEPDIR)/libserver_socket_la-ldcs_api_wrapper.Plo + ./$(DEPDIR)/libserver_pipe_la-ldcs_api_wrapper.Plo am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -180,10 +169,9 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = $(libserver_biter_la_SOURCES) $(libserver_pipe_la_SOURCES) \ - $(libserver_socket_la_SOURCES) +SOURCES = $(libserver_biter_la_SOURCES) $(libserver_pipe_la_SOURCES) DIST_SOURCES = $(libserver_biter_la_SOURCES) \ - $(libserver_pipe_la_SOURCES) $(libserver_socket_la_SOURCES) + $(libserver_pipe_la_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -362,14 +350,11 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -noinst_LTLIBRARIES = libserver_pipe.la libserver_socket.la \ - libserver_biter.la +noinst_LTLIBRARIES = libserver_pipe.la libserver_biter.la AM_CPPFLAGS = -I$(top_srcdir)/../logging -I$(top_srcdir)/../include -I$(top_srcdir)/auditserver -I$(top_srcdir)/cache BASE_SRCS = ldcs_api_util.c ldcs_api_listen.c ldcs_api_wrapper.c libserver_pipe_la_CPPFLAGS = $(AM_CPPFLAGS) -Dcomm=pipe libserver_pipe_la_SOURCES = ldcs_api_pipe.c ldcs_api_pipe_notify.c $(BASE_SRCS) -libserver_socket_la_CPPFLAGS = $(AM_CPPFLAGS) -Dcomm=socket -libserver_socket_la_SOURCES = ldcs_api_socket.c $(BASE_SRCS) libserver_biter_la_CPPFLAGS = $(AM_CPPFLAGS) -Dcomm=biter -I$(top_srcdir)/../biter libserver_biter_la_SOURCES = ldcs_api_biter.c $(BASE_SRCS) all: all-am @@ -423,9 +408,6 @@ libserver_biter.la: $(libserver_biter_la_OBJECTS) $(libserver_biter_la_DEPENDENC libserver_pipe.la: $(libserver_pipe_la_OBJECTS) $(libserver_pipe_la_DEPENDENCIES) $(EXTRA_libserver_pipe_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libserver_pipe_la_OBJECTS) $(libserver_pipe_la_LIBADD) $(LIBS) -libserver_socket.la: $(libserver_socket_la_OBJECTS) $(libserver_socket_la_DEPENDENCIES) $(EXTRA_libserver_socket_la_DEPENDENCIES) - $(AM_V_CCLD)$(LINK) $(libserver_socket_la_OBJECTS) $(libserver_socket_la_LIBADD) $(LIBS) - mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -441,10 +423,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libserver_pipe_la-ldcs_api_pipe_notify.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libserver_pipe_la-ldcs_api_util.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libserver_pipe_la-ldcs_api_wrapper.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libserver_socket_la-ldcs_api_listen.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libserver_socket_la-ldcs_api_socket.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libserver_socket_la-ldcs_api_util.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libserver_socket_la-ldcs_api_wrapper.Plo@am__quote@ # am--include-marker $(am__depfiles_remade): @$(MKDIR_P) $(@D) @@ -539,34 +517,6 @@ libserver_pipe_la-ldcs_api_wrapper.lo: ldcs_api_wrapper.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libserver_pipe_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libserver_pipe_la-ldcs_api_wrapper.lo `test -f 'ldcs_api_wrapper.c' || echo '$(srcdir)/'`ldcs_api_wrapper.c -libserver_socket_la-ldcs_api_socket.lo: ldcs_api_socket.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libserver_socket_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libserver_socket_la-ldcs_api_socket.lo -MD -MP -MF $(DEPDIR)/libserver_socket_la-ldcs_api_socket.Tpo -c -o libserver_socket_la-ldcs_api_socket.lo `test -f 'ldcs_api_socket.c' || echo '$(srcdir)/'`ldcs_api_socket.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libserver_socket_la-ldcs_api_socket.Tpo $(DEPDIR)/libserver_socket_la-ldcs_api_socket.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ldcs_api_socket.c' object='libserver_socket_la-ldcs_api_socket.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libserver_socket_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libserver_socket_la-ldcs_api_socket.lo `test -f 'ldcs_api_socket.c' || echo '$(srcdir)/'`ldcs_api_socket.c - -libserver_socket_la-ldcs_api_util.lo: ldcs_api_util.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libserver_socket_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libserver_socket_la-ldcs_api_util.lo -MD -MP -MF $(DEPDIR)/libserver_socket_la-ldcs_api_util.Tpo -c -o libserver_socket_la-ldcs_api_util.lo `test -f 'ldcs_api_util.c' || echo '$(srcdir)/'`ldcs_api_util.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libserver_socket_la-ldcs_api_util.Tpo $(DEPDIR)/libserver_socket_la-ldcs_api_util.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ldcs_api_util.c' object='libserver_socket_la-ldcs_api_util.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libserver_socket_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libserver_socket_la-ldcs_api_util.lo `test -f 'ldcs_api_util.c' || echo '$(srcdir)/'`ldcs_api_util.c - -libserver_socket_la-ldcs_api_listen.lo: ldcs_api_listen.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libserver_socket_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libserver_socket_la-ldcs_api_listen.lo -MD -MP -MF $(DEPDIR)/libserver_socket_la-ldcs_api_listen.Tpo -c -o libserver_socket_la-ldcs_api_listen.lo `test -f 'ldcs_api_listen.c' || echo '$(srcdir)/'`ldcs_api_listen.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libserver_socket_la-ldcs_api_listen.Tpo $(DEPDIR)/libserver_socket_la-ldcs_api_listen.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ldcs_api_listen.c' object='libserver_socket_la-ldcs_api_listen.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libserver_socket_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libserver_socket_la-ldcs_api_listen.lo `test -f 'ldcs_api_listen.c' || echo '$(srcdir)/'`ldcs_api_listen.c - -libserver_socket_la-ldcs_api_wrapper.lo: ldcs_api_wrapper.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libserver_socket_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libserver_socket_la-ldcs_api_wrapper.lo -MD -MP -MF $(DEPDIR)/libserver_socket_la-ldcs_api_wrapper.Tpo -c -o libserver_socket_la-ldcs_api_wrapper.lo `test -f 'ldcs_api_wrapper.c' || echo '$(srcdir)/'`ldcs_api_wrapper.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libserver_socket_la-ldcs_api_wrapper.Tpo $(DEPDIR)/libserver_socket_la-ldcs_api_wrapper.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ldcs_api_wrapper.c' object='libserver_socket_la-ldcs_api_wrapper.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libserver_socket_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libserver_socket_la-ldcs_api_wrapper.lo `test -f 'ldcs_api_wrapper.c' || echo '$(srcdir)/'`ldcs_api_wrapper.c - mostlyclean-libtool: -rm -f *.lo @@ -707,10 +657,6 @@ distclean: distclean-am -rm -f ./$(DEPDIR)/libserver_pipe_la-ldcs_api_pipe_notify.Plo -rm -f ./$(DEPDIR)/libserver_pipe_la-ldcs_api_util.Plo -rm -f ./$(DEPDIR)/libserver_pipe_la-ldcs_api_wrapper.Plo - -rm -f ./$(DEPDIR)/libserver_socket_la-ldcs_api_listen.Plo - -rm -f ./$(DEPDIR)/libserver_socket_la-ldcs_api_socket.Plo - -rm -f ./$(DEPDIR)/libserver_socket_la-ldcs_api_util.Plo - -rm -f ./$(DEPDIR)/libserver_socket_la-ldcs_api_wrapper.Plo -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -765,10 +711,6 @@ maintainer-clean: maintainer-clean-am -rm -f ./$(DEPDIR)/libserver_pipe_la-ldcs_api_pipe_notify.Plo -rm -f ./$(DEPDIR)/libserver_pipe_la-ldcs_api_util.Plo -rm -f ./$(DEPDIR)/libserver_pipe_la-ldcs_api_wrapper.Plo - -rm -f ./$(DEPDIR)/libserver_socket_la-ldcs_api_listen.Plo - -rm -f ./$(DEPDIR)/libserver_socket_la-ldcs_api_socket.Plo - -rm -f ./$(DEPDIR)/libserver_socket_la-ldcs_api_util.Plo - -rm -f ./$(DEPDIR)/libserver_socket_la-ldcs_api_wrapper.Plo -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff --git a/src/server/config.h.in b/src/server/config.h.in index 8499401f..58970484 100644 --- a/src/server/config.h.in +++ b/src/server/config.h.in @@ -24,9 +24,6 @@ /* Define if were using pipes for client/server communication */ #undef COMM_PIPES -/* Define if were using sockets for client/server communication */ -#undef COMM_SOCKET - /* Enable --crash-dedup by default */ #undef CRASH_DEDUP_ENABLED_BY_DEFAULT diff --git a/src/server/configure b/src/server/configure index 96d9eaa2..9327319e 100755 --- a/src/server/configure +++ b/src/server/configure @@ -685,8 +685,6 @@ MSOCKET_FALSE MSOCKET_TRUE BITER_FALSE BITER_TRUE -SOCKETS_FALSE -SOCKETS_TRUE PIPES_FALSE PIPES_TRUE SRUN_PATH @@ -851,7 +849,6 @@ with_rsh_launch with_rsh_cmd with_slurm_launch enable_pipes -enable_socket enable_biter enable_msocket enable_cobo @@ -1532,7 +1529,6 @@ Optional Features: --enable-slurm-plugin Builds in support for running with SLURM via plugin --enable-flux-plugin Builds in support for running flux via a plugin --enable-pipes Use pipes for server/client communication - --enable-socket Use sockets for server/client communication --enable-biter Use biter for server/client communication --enable-msocket Use msocket for inter-server communication --enable-cobo Use msocket for inter-server communication @@ -16751,11 +16747,6 @@ if test "${enable_pipes+set}" = set; then : enableval=$enable_pipes; CLIENT_SERVER_COM=pipes; fi -# Check whether --enable-socket was given. -if test "${enable_socket+set}" = set; then : - enableval=$enable_socket; CLIENT_SERVER_COM=sockets; -fi - # Check whether --enable-biter was given. if test "${enable_biter+set}" = set; then : enableval=$enable_biter; CLIENT_SERVER_COM=biter; @@ -16782,14 +16773,6 @@ else PIPES_FALSE= fi - if test x$CLIENT_SERVER_COM == xsocket; then - SOCKETS_TRUE= - SOCKETS_FALSE='#' -else - SOCKETS_TRUE='#' - SOCKETS_FALSE= -fi - if test x$CLIENT_SERVER_COM == xbiter; then BITER_TRUE= BITER_FALSE='#' @@ -16819,11 +16802,6 @@ if test "x$CLIENT_SERVER_COM" == "xpipes"; then $as_echo "#define COMM_PIPES 1" >>confdefs.h -fi -if test "x$CLIENT_SERVER_COM" == "xsocket"; then - -$as_echo "#define COMM_SOCKET 1" >>confdefs.h - fi if test "x$CLIENT_SERVER_COM" == "xbiter"; then @@ -18295,10 +18273,6 @@ if test -z "${PIPES_TRUE}" && test -z "${PIPES_FALSE}"; then as_fn_error $? "conditional \"PIPES\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${SOCKETS_TRUE}" && test -z "${SOCKETS_FALSE}"; then - as_fn_error $? "conditional \"SOCKETS\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${BITER_TRUE}" && test -z "${BITER_FALSE}"; then as_fn_error $? "conditional \"BITER\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/src/server/startup/Makefile.in b/src/server/startup/Makefile.in index 9e327f6d..91601597 100644 --- a/src/server/startup/Makefile.in +++ b/src/server/startup/Makefile.in @@ -93,13 +93,12 @@ target_triplet = @target@ pkglibexec_PROGRAMS = spindle_be$(EXEEXT) @COBO_TRUE@am__append_1 = $(top_builddir)/auditserver/libaudit_server_cobo.la @MSOCKET_TRUE@am__append_2 = $(top_builddir)/auditserver/libaudit_server_msocket.la -@SOCKETS_TRUE@am__append_3 = $(top_builddir)/comlib/libserver_socket.la -@PIPES_TRUE@am__append_4 = $(top_builddir)/comlib/libserver_pipe.la -@BITER_TRUE@am__append_5 = $(top_builddir)/comlib/libserver_biter.la $(top_builddir)/biter/libbiterd.la -@USE_NUMA_TRUE@am__append_6 = -lnuma -@LINK_LIBSTDCXX_STATIC_TRUE@am__append_7 = $(STATIC_LIBGCC_OPT) -L. -@LMON_DYNAMIC_TRUE@@LMON_TRUE@am__append_8 = $(top_builddir)/launchmon/libbelmon.la $(LAUNCHMON_LIB) $(LAUNCHMON_RMCOMM) -lmonbeapi -lgcrypt -lpthread -@LMON_DYNAMIC_FALSE@@LMON_TRUE@am__append_9 = $(top_builddir)/launchmon/libbelmon.la $(LAUNCHMON_STATIC_LIBS) +@PIPES_TRUE@am__append_3 = $(top_builddir)/comlib/libserver_pipe.la +@BITER_TRUE@am__append_4 = $(top_builddir)/comlib/libserver_biter.la $(top_builddir)/biter/libbiterd.la +@USE_NUMA_TRUE@am__append_5 = -lnuma +@LINK_LIBSTDCXX_STATIC_TRUE@am__append_6 = $(STATIC_LIBGCC_OPT) -L. +@LMON_DYNAMIC_TRUE@@LMON_TRUE@am__append_7 = $(top_builddir)/launchmon/libbelmon.la $(LAUNCHMON_LIB) $(LAUNCHMON_RMCOMM) -lmonbeapi -lgcrypt -lpthread +@LMON_DYNAMIC_FALSE@@LMON_TRUE@am__append_8 = $(top_builddir)/launchmon/libbelmon.la $(LAUNCHMON_STATIC_LIBS) subdir = startup ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ @@ -150,8 +149,7 @@ LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) am__DEPENDENCIES_1 = am__DEPENDENCIES_2 = $(top_builddir)/logging/libspindledlogc.la \ $(am__append_1) $(am__append_2) $(am__append_3) \ - $(am__append_4) $(am__append_5) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__append_4) $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) libspindlebe_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \ $(am__DEPENDENCIES_1) am__dirstamp = $(am__leading_dot)dirstamp @@ -469,7 +467,7 @@ CORE_SOURCES = spindle_be.cc hookexec.c $(top_srcdir)/../utils/parseloc.c $(top_ CORE_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/comlib -I$(top_srcdir)/cache -I$(top_srcdir)/auditserver -I$(top_srcdir)/../client/beboot -I$(top_srcdir)/../include -I$(top_srcdir)/../utils -I$(top_srcdir)/../cobo -DTRACK_MKDIR -DLOOKUP_PREV_MKDIR -DLIBEXECDIR=\"$(pkglibexecdir)\" CORE_LDADD = $(top_builddir)/logging/libspindledlogc.la -ldl \ $(am__append_1) $(am__append_2) $(am__append_3) \ - $(am__append_4) $(am__append_5) $(am__append_6) $(GCRYPT_LIBS) + $(am__append_4) $(am__append_5) $(GCRYPT_LIBS) libspindlebe_la_CPPFLAGS = $(CORE_CPPFLAGS) -DSPINDLEBELIB libspindlebe_la_SOURCES = $(CORE_SOURCES) libspindlebe_la_LIBADD = $(CORE_LDADD) $(MUNGE_DYN_LIB) @@ -477,11 +475,11 @@ libspindlebe_la_LDFLAGS = -version-info $(SPINDLEBE_LIB_VERSION) libspindlebe_static_la_CPPFLAGS = $(libspindlebe_la_CPPFLAGS) libspindlebe_static_la_SOURCES = $(libspindlebe_la_SOURCES) libspindlebe_static_la_LIBADD = $(libspindlebe_la_LIBADD) -spindle_be_LDFLAGS = -static $(am__append_7) +spindle_be_LDFLAGS = -static $(am__append_6) spindle_be_CPPFLAGS = $(CORE_CPPFLAGS) spindle_be_SOURCES = spindle_be_main.cc spindle_be_serial.cc spindle_be_hostbin.cc spindle_be_mpilaunch.cc $(top_srcdir)/../utils/rshlaunch.c $(CORE_SOURCES) -spindle_be_LDADD = $(CORE_LDADD) $(MUNGE_LIBS) $(am__append_8) \ - $(am__append_9) +spindle_be_LDADD = $(CORE_LDADD) $(MUNGE_LIBS) $(am__append_7) \ + $(am__append_8) @LINK_LIBSTDCXX_STATIC_TRUE@CLEANFILES = ./libstdc++.a @LINK_LIBSTDCXX_STATIC_TRUE@BUILT_SOURCES = ./libstdc++.a all: $(BUILT_SOURCES) From e3171f79a455239230ce79dedf5a556d160f654b Mon Sep 17 00:00:00 2001 From: Barry Rountree Date: Thu, 30 Jul 2026 23:43:28 -0700 Subject: [PATCH 09/21] [prune-config] Removes --enable-biter Per Claude Code + Opus --- configure.common.ac | 7 - src/client/auditclient/Makefile.am | 7 - src/client/beboot/Makefile.am | 3 - src/client/client/Makefile.am | 6 - src/client/client_comlib/Makefile.am | 5 - src/client/client_comlib/client_api_biter.c | 154 ----------- src/client/client_comlib/client_wrappers.c | 2 - src/client/instrclient/Makefile.am | 7 - src/client/shm_cache/Makefile.am | 3 - src/client/subaudit/Makefile.am | 7 - src/server/comlib/Makefile.am | 4 - src/server/comlib/ldcs_api_biter.c | 292 -------------------- src/server/comlib/ldcs_api_wrapper.c | 2 - src/server/startup/Makefile.am | 3 - 14 files changed, 502 deletions(-) delete mode 100644 src/client/client_comlib/client_api_biter.c delete mode 100644 src/server/comlib/ldcs_api_biter.c diff --git a/configure.common.ac b/configure.common.ac index abc413a0..7ff073da 100644 --- a/configure.common.ac +++ b/configure.common.ac @@ -203,9 +203,6 @@ SERVER_SERVER_COM=cobo AC_ARG_ENABLE(pipes, [AS_HELP_STRING([--enable-pipes],[Use pipes for server/client communication])], [CLIENT_SERVER_COM=pipes;],) -AC_ARG_ENABLE(biter, - [AS_HELP_STRING([--enable-biter],[Use biter for server/client communication])], - [CLIENT_SERVER_COM=biter;],) AC_ARG_ENABLE(msocket, @@ -216,16 +213,12 @@ AC_ARG_ENABLE(cobo, [SERVER_SERVER_COM=cobo;],) AM_CONDITIONAL([PIPES], [test x$CLIENT_SERVER_COM == xpipes]) -AM_CONDITIONAL([BITER], [test x$CLIENT_SERVER_COM == xbiter]) AM_CONDITIONAL([MSOCKET], [test x$SERVER_SERVER_COM == xmsocket]) AM_CONDITIONAL([COBO], [test x$SERVER_SERVER_COM == xcobo]) if test "x$CLIENT_SERVER_COM" == "xpipes"; then AC_DEFINE([COMM_PIPES],[1],[Define if were using pipes for client/server communication]) fi -if test "x$CLIENT_SERVER_COM" == "xbiter"; then - AC_DEFINE([COMM_BITER],[1],[Define if were using biter for client/server communication]) -fi if test "x$SERVER_SERVER_COM" == "xmsocket"; then AC_DEFINE([COMM_MSOCKET],[1],[Define if were using msocket for server/server communication]) fi diff --git a/src/client/auditclient/Makefile.am b/src/client/auditclient/Makefile.am index f0ce5fea..addaffc7 100644 --- a/src/client/auditclient/Makefile.am +++ b/src/client/auditclient/Makefile.am @@ -3,9 +3,6 @@ pkglib_LTLIBRARIES = if PIPES pkglib_LTLIBRARIES += libspindle_audit_pipe.la endif -if BITER -pkglib_LTLIBRARIES += libspindle_audit_biter.la -endif AM_CFLAGS = -fvisibility=hidden @@ -30,7 +27,3 @@ AUDITLIB = $(top_builddir)/client/libspindle_audit.la libspindle_audit_pipe_la_SOURCES = $(BASE_SRCS) $(ARCH_SRCS) libspindle_audit_pipe_la_LIBADD = $(top_builddir)/client/libspindlec_pipe.la $(AUDITLIB) libspindle_audit_pipe_la_LDFLAGS = -shared -avoid-version -Wl,-rpath,$(GLIBC_BE_DIR) - -libspindle_audit_biter_la_SOURCES = $(BASE_SRCS) $(ARCH_SRCS) -libspindle_audit_biter_la_LIBADD = $(top_builddir)/client/libspindlec_biter.la $(AUDITLIB) -libspindle_audit_biter_la_LDFLAGS = -shared -avoid-version -Wl,-rpath,$(GLIBC_BE_DIR) diff --git a/src/client/beboot/Makefile.am b/src/client/beboot/Makefile.am index e7b3d577..e3c0b22a 100644 --- a/src/client/beboot/Makefile.am +++ b/src/client/beboot/Makefile.am @@ -8,6 +8,3 @@ spindle_bootstrap_SOURCES = spindle_bootstrap.c $(top_srcdir)/../utils/parseloc. if PIPES spindle_bootstrap_LDADD += $(top_builddir)/client_comlib/libclient_pipe.la endif -if BITER -spindle_bootstrap_LDADD += $(top_builddir)/client_comlib/libclient_biter.la $(top_builddir)/biter/libbiterc.la -endif diff --git a/src/client/client/Makefile.am b/src/client/client/Makefile.am index dd20b144..c7a5181e 100644 --- a/src/client/client/Makefile.am +++ b/src/client/client/Makefile.am @@ -4,9 +4,6 @@ noinst_LTLIBRARIES = libspindle_audit.la if PIPES noinst_LTLIBRARIES += libspindlec_pipe.la endif -if BITER -noinst_LTLIBRARIES += libspindlec_biter.la -endif AM_CFLAGS = -fvisibility=hidden @@ -28,9 +25,6 @@ BASE_SRCS += $(top_srcdir)/crash_handler/crash_io.c \ libspindlec_pipe_la_SOURCES = $(BASE_SRCS) libspindlec_pipe_la_LIBADD = $(top_builddir)/client_comlib/libclient_pipe.la $(top_builddir)/logging/libspindleclogc.la $(top_builddir)/shm_cache/libshmcache.la -libspindlec_biter_la_SOURCES = $(BASE_SRCS) -libspindlec_biter_la_LIBADD = $(top_builddir)/client_comlib/libclient_biter.la $(top_builddir)/logging/libspindleclogc.la $(top_builddir)/shm_cache/libshmcache.la - libspindle_audit_la_SOURCES = $(INTERCEPT_SRCS) libspindle_audit_la_CPPFLAGS = -DAUDIT_LIB $(AM_CPPFLAGS) diff --git a/src/client/client_comlib/Makefile.am b/src/client/client_comlib/Makefile.am index 6c1be2f9..ffb48d5a 100644 --- a/src/client/client_comlib/Makefile.am +++ b/src/client/client_comlib/Makefile.am @@ -9,8 +9,3 @@ AM_CFLAGS = -fvisibility=hidden noinst_LTLIBRARIES += libclient_pipe.la libclient_pipe_la_CPPFLAGS = $(AM_CPPFLAGS) -DCOMM=pipe libclient_pipe_la_SOURCES = client_api_pipe.c $(BASE_SRCS) - -noinst_LTLIBRARIES += libclient_biter.la -libclient_biter_la_CPPFLAGS = $(AM_CPPFLAGS) -DCOMM=biter -I$(top_srcdir)/../biter -libclient_biter_la_LIBADD = $(top_builddir)/biter/libbiterc.la -libclient_biter_la_SOURCES = client_api_biter.c $(BASE_SRCS) diff --git a/src/client/client_comlib/client_api_biter.c b/src/client/client_comlib/client_api_biter.c deleted file mode 100644 index 88092f97..00000000 --- a/src/client/client_comlib/client_api_biter.c +++ /dev/null @@ -1,154 +0,0 @@ -/* -This file is part of Spindle. For copyright information see the COPYRIGHT -file in the top level directory, or at -https://github.com/hpc/Spindle/blob/master/COPYRIGHT - -This program is free software; you can redistribute it and/or modify it under -the terms of the GNU Lesser General Public License (as published by the Free Software -Foundation) version 2.1 dated February 1999. This program is distributed in the -hope that it will be useful, but WITHOUT ANY WARRANTY; without even the IMPLIED -WARRANTY OF MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms -and conditions of the GNU Lesser General Public License for more details. You should -have received a copy of the GNU Lesser General Public License along with this -program; if not, write to the Free Software Foundation, Inc., 59 Temple -Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -#define _GNU_SOURCE - - -#include -#include - -#include "biterc.h" -#include "ldcs_api.h" -#include "config.h" -#include "spindle_debug.h" -#include "client_heap.h" -#include "spindle_launch.h" - -static int session = -1; -static char *cached_location; - -extern unsigned int shm_cachesize; - -int client_open_connection_biter(char* location, number_t number) -{ - (void)number; - debug_printf3("Calling biterc_newsession(%s, %lu)\n", location, (unsigned long) shm_cachesize); - session = biterc_newsession(location, shm_cachesize); - if (session == -1) { - err_printf("Client failed to create connection: %s\n", biterc_lasterror_str()); - } - cached_location = location; - return session; -} - -int client_close_connection_biter(int connid) -{ - if (connid != session) { - err_printf("Invalid connection ID passed to client_close_connection_biter\n"); - return -1; - } - session = -1; - return 0; -} - -int client_register_connection_biter(char *connection_str) -{ - (void)connection_str; - return 0; -} - -char *client_get_connection_string_biter(int fd) -{ - (void)fd; - return NULL; -} - -int client_send_msg_biter(int connid, ldcs_message_t *msg) -{ - int result; - - if (connid != session) { - err_printf("Invalid connection ID passed to client_send_msg_biter\n"); - return -1; - } - - debug_printf3("sending message of size len=%lu\n", msg->header.len); - - result = biterc_write(connid, &msg->header, sizeof(msg->header)); - if (result == -1) { - err_printf("Error writing message header in biter client\n"); - return -1; - } - - if (msg->header.len == 0) - return 0; - - result = biterc_write(connid, msg->data, msg->header.len); - if (result == -1) { - err_printf("Error writing message body in biter client\n"); - return -1; - } - - return 0; -} - -static int client_recv_msg_biter(int connid, ldcs_message_t *msg, ldcs_read_block_t block, int is_dynamic) -{ - int result; - - msg->header.type=LDCS_MSG_UNKNOWN; - msg->header.len=0; - - if (connid != session) { - err_printf("Invalid connection ID passed to client_recv_msg_biter\n"); - return -1; - } - - assert(block == LDCS_READ_BLOCK); /* Non-blocking isn't implemented yet */ - - debug_printf3("Reading %d bytes for header from biter\n", (int) sizeof(msg->header)); - result = biterc_read(connid, &msg->header, sizeof(msg->header)); - if (result == -1) { - err_printf("Error reading message header in biter client: %s\n", biterc_lasterror_str()); - return -1; - } - if (result == 0) { - err_printf("EOF reading message header in biter client: %s\n", biterc_lasterror_str()); - return -1; - } - - if (msg->header.len == 0) { - msg->data = NULL; - return 0; - } - - if (is_dynamic) { - msg->data = (char *) spindle_malloc(msg->header.len); - assert(msg->data); - } - - debug_printf3("Reading %d bytes for body from biter\n", (int) msg->header.len); - result = biterc_read(connid, msg->data, msg->header.len); - if (result == -1) - err_printf("Error reading message body in biter client: %s\n", biterc_lasterror_str()); - return result; -} - -int client_recv_msg_static_biter(int fd, ldcs_message_t *msg, ldcs_read_block_t block) -{ - return client_recv_msg_biter(fd, msg, block, 0); -} - -int client_recv_msg_dynamic_biter(int fd, ldcs_message_t *msg, ldcs_read_block_t block) -{ - return client_recv_msg_biter(fd, msg, block, 1); -} - -int is_client_fd(int connid, int fd) -{ - (void)connid; - return biterc_is_client_fd(session, fd); -} diff --git a/src/client/client_comlib/client_wrappers.c b/src/client/client_comlib/client_wrappers.c index c211acfa..0ef517eb 100644 --- a/src/client/client_comlib/client_wrappers.c +++ b/src/client/client_comlib/client_wrappers.c @@ -21,8 +21,6 @@ #if !defined(COMM) #if defined(COMM_PIPES) #define COMM pipe -#elif defined(COMM_BITER) -#define COMM biter #else #error Unknown communication type #endif diff --git a/src/client/instrclient/Makefile.am b/src/client/instrclient/Makefile.am index 99463c88..a061e9b7 100644 --- a/src/client/instrclient/Makefile.am +++ b/src/client/instrclient/Makefile.am @@ -3,9 +3,6 @@ pkglibexec_LTLIBRARIES = if PIPES pkglibexec_LTLIBRARIES += libspindle_instr_pipe.la endif -if BITER -pkglibexec_LTLIBRARIES += libspindle_instr_biter.la -endif AM_CPPFLAGS = -I$(top_srcdir)/../logging -I$(top_srcdir)/../include -I$(top_srcdir)/client -I$(top_srcdir)/client_comlib @@ -18,7 +15,3 @@ AM_CFLAGS = -fvisibility=hidden libspindle_instr_pipe_la_SOURCES = $(BASE_SRCS) libspindle_instr_pipe_la_LIBADD = $(top_builddir)/client/libspindlec_pipe.la $(INSTRLIB) libspindle_instr_pipe_la_LDFLAGS = -shared -avoid-version - -libspindle_instr_biter_la_SOURCES = $(BASE_SRCS) -libspindle_instr_biter_la_LIBADD = $(top_builddir)/client/libspindlec_biter.la $(INSTRLIB) -libspindle_instr_biter_la_LDFLAGS = -shared -avoid-version diff --git a/src/client/shm_cache/Makefile.am b/src/client/shm_cache/Makefile.am index 939d4192..b3cd8009 100644 --- a/src/client/shm_cache/Makefile.am +++ b/src/client/shm_cache/Makefile.am @@ -3,9 +3,6 @@ noinst_LTLIBRARIES = libshmcache.la AM_CFLAGS = -fvisibility=hidden libshmcache_la_SOURCES = shmcache.c -if BITER -else libshmcache_la_LIBADD = $(top_builddir)/biter/libsheep.la -endif AM_CPPFLAGS = -I$(top_srcdir)/../biter -I$(top_srcdir)/shm_cache -I$(top_srcdir)/../logging -I$(top_srcdir)/client_comlib -I$(top_srcdir)/../include -I$(top_srcdir)/../utils diff --git a/src/client/subaudit/Makefile.am b/src/client/subaudit/Makefile.am index 6fd25571..48541622 100644 --- a/src/client/subaudit/Makefile.am +++ b/src/client/subaudit/Makefile.am @@ -3,9 +3,6 @@ pkglib_LTLIBRARIES = libspindleint.la if PIPES pkglib_LTLIBRARIES += libspindle_subaudit_pipe.la endif -if BITER -pkglib_LTLIBRARIES += libspindle_subaudit_biter.la -endif AM_CFLAGS = -fvisibility=hidden @@ -21,7 +18,3 @@ libspindleint_la_LDFLAGS = -shared -avoid-version libspindle_subaudit_pipe_la_SOURCES = $(BASE_SRCS) libspindle_subaudit_pipe_la_LIBADD = $(top_builddir)/client/libspindlec_pipe.la $(AUDITLIB) libspindle_subaudit_pipe_la_LDFLAGS = -shared -avoid-version - -libspindle_subaudit_biter_la_SOURCES = $(BASE_SRCS) -libspindle_subaudit_biter_la_LIBADD = $(top_builddir)/client/libspindlec_biter.la $(AUDITLIB) -libspindle_subaudit_biter_la_LDFLAGS = -shared -avoid-version diff --git a/src/server/comlib/Makefile.am b/src/server/comlib/Makefile.am index 91f96ef1..7c376bac 100644 --- a/src/server/comlib/Makefile.am +++ b/src/server/comlib/Makefile.am @@ -7,7 +7,3 @@ BASE_SRCS = ldcs_api_util.c ldcs_api_listen.c ldcs_api_wrapper.c noinst_LTLIBRARIES += libserver_pipe.la libserver_pipe_la_CPPFLAGS = $(AM_CPPFLAGS) -Dcomm=pipe libserver_pipe_la_SOURCES = ldcs_api_pipe.c ldcs_api_pipe_notify.c $(BASE_SRCS) - -noinst_LTLIBRARIES += libserver_biter.la -libserver_biter_la_CPPFLAGS = $(AM_CPPFLAGS) -Dcomm=biter -I$(top_srcdir)/../biter -libserver_biter_la_SOURCES = ldcs_api_biter.c $(BASE_SRCS) diff --git a/src/server/comlib/ldcs_api_biter.c b/src/server/comlib/ldcs_api_biter.c deleted file mode 100644 index 6520be4d..00000000 --- a/src/server/comlib/ldcs_api_biter.c +++ /dev/null @@ -1,292 +0,0 @@ -/* -This file is part of Spindle. For copyright information see the COPYRIGHT -file in the top level directory, or at -https://github.com/hpc/Spindle/blob/master/COPYRIGHT - -This program is free software; you can redistribute it and/or modify it under -the terms of the GNU Lesser General Public License (as published by the Free Software -Foundation) version 2.1 dated February 1999. This program is distributed in the -hope that it will be useful, but WITHOUT ANY WARRANTY; without even the IMPLIED -WARRANTY OF MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms -and conditions of the GNU Lesser General Public License for more details. You should -have received a copy of the GNU Lesser General Public License along with this -program; if not, write to the Free Software Foundation, Inc., 59 Temple -Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -#include -#include -#include -#include - -#include "biterd.h" -#include "ldcs_api.h" -#include "config.h" -#include "spindle_debug.h" -#include "ldcs_audit_server_process.h" -#include "spindle_launch.h" - -static int num_cns; -static char *tmpdir; -static number_t number; -static int *num_live_procs; -static uint16_t **session_proc_to_nc; -static int server_id = INT32_MAX; -static int clients_avail_r_fd; -static int clients_avail_w_fd; - -#define NEW_CLIENT_ID(SESSION, PROC) ((((uint16_t) SESSION) << 16) | ((uint16_t) PROC)) -#define CLIENT_ID_SESSION(CLIENTID) ((int) (CLIENTID >> 16)) -#define CLIENT_ID_PROC(CLIENTID) ((int) (CLIENTID & ((1 << 16)-1))) - -int ldcs_create_server_biter(char* location, number_t num) -{ - int clients_avail[2]; - int result; - char a_byte = 'a'; - - biterd_init_comms(location); - - num_cns = biterd_num_compute_nodes(); - assert(num_cns > 0); - - num_live_procs = calloc(num_cns, sizeof(*num_live_procs)); - session_proc_to_nc = calloc(num_cns, sizeof(*session_proc_to_nc)); - - tmpdir = location; - number = num; - - result = pipe(clients_avail); - assert(result != -1); - clients_avail_r_fd = clients_avail[0]; - clients_avail_w_fd = clients_avail[1]; - (void)! write(clients_avail_w_fd, &a_byte, sizeof(a_byte)); - - return server_id; -} - -int ldcs_open_server_connection_biter(int id) -{ - (void)id; - assert(0 && "Unused"); - return -1; -} - -int ldcs_open_server_connections_biter(int fd, int nc, int *more_avail) -{ - static int cur_session = -1; - static int cur_proc_in_cn = 0; - static int num_procs_in_cn = 0; - int result, new_client, i; - char a_byte; - - assert(fd == server_id); - - if (cur_proc_in_cn == num_procs_in_cn) { - cur_session++; - result = biterd_newsession(tmpdir, cur_session); - if (result == -1) { - err_printf("Error creating new biterd session %d: %s", cur_session, biterd_lasterror_str()); - return -1; - } - assert(cur_session == result); - cur_proc_in_cn = 0; - num_procs_in_cn = biterd_num_clients(cur_session); - assert(num_procs_in_cn > 0); - debug_printf3("Created new biterd_session %d with fd %d\n", cur_session, biterd_get_fd(cur_session)); - } - - - new_client = NEW_CLIENT_ID(cur_session, cur_proc_in_cn); - debug_printf3("Creating new client %d in session %d, client_id = %d\n", - (int) cur_proc_in_cn, (int) cur_session, (int) new_client); - - if (session_proc_to_nc[cur_session] == NULL) { - session_proc_to_nc[cur_session] = malloc(num_procs_in_cn * sizeof(*(session_proc_to_nc[cur_session]))); - for (i = 0; i < num_procs_in_cn; i++) - session_proc_to_nc[cur_session][i] = -1; - } - session_proc_to_nc[cur_session][cur_proc_in_cn] = nc; - - num_live_procs[cur_session]++; - - cur_proc_in_cn++; - *more_avail = (cur_session < num_cns-1) || (cur_proc_in_cn < num_procs_in_cn); - if (!*more_avail) { - (void)! read(clients_avail_r_fd, &a_byte, sizeof(a_byte)); - } - - return new_client; -} - -int ldcs_close_server_connection_biter(int connid) -{ - int session = CLIENT_ID_SESSION(connid); - int proc = CLIENT_ID_PROC(connid); - - assert(connid != server_id); - assert(num_live_procs[session] > 0); - - debug_printf3("Closing server connection to session %d, client %d\n", session, proc); - - session_proc_to_nc[session][proc] = -1; - num_live_procs[session]--; - if (num_live_procs[session] == 0) { - debug_printf3("Closing server connection to session %d\n", session); - biterd_clean(session); - } - - return 0; -} - -int ldcs_destroy_server_biter(int cid) -{ - int i; - assert(cid == server_id); - debug_printf3("Closing connections to all servers\n"); - for (i = 0; i < num_cns; i++) { - if (num_live_procs[i] > 0) { - debug_printf3("Closing server connections to session %d\n", i); - biterd_clean(i); - num_live_procs[i] = 0; - } - } - - return 0; -} - -int ldcs_send_msg_biter(int fd, ldcs_message_t *msg) -{ - int session = CLIENT_ID_SESSION(fd); - int proc = CLIENT_ID_PROC(fd); - int result; - - assert(fd != server_id); - assert(session < num_cns); - assert(num_live_procs[session]); - assert(proc >= 0 && proc < biterd_num_clients(session)); - - if (spindle_debug_prints) { - int rank = biterd_get_rank(session, proc); - debug_printf3("Sending message of size %lu to rank %d (session = %d, proc = %d)\n", - msg->header.len, rank, session, proc); - } - - result = biterd_write(session, proc, &msg->header, sizeof(msg->header)); - if (result == -1) { - err_printf("Error writing header to session %d, proc %d: %s\n", - session, proc, biterd_lasterror_str()); - return -1; - } - - if (msg->header.len == 0) - return 0; - - result = biterd_write(session, proc, msg->data, msg->header.len); - if (result == -1) { - err_printf("Error writing message of size %lu to session %d, proc %d: %s\n", - msg->header.len, session, proc, biterd_lasterror_str()); - return -1; - } - - return 0; -} - -int ldcs_get_fd_biter(int connid) -{ - int session, proc; - - if (connid == server_id) - return clients_avail_r_fd; - - session = CLIENT_ID_SESSION(connid); - proc = CLIENT_ID_PROC(connid); - - if (proc != 0) - return -1; - - return biterd_get_fd(session); -} - -int ldcs_get_aux_fd_biter() -{ - return biterd_get_aux_fd(); -} - -int ldcs_socket_id_to_nc_biter(int id, int fd, ldcs_process_data_t *process_data) -{ - int session, proc, result; - - if (id == CLIENT_CB_AUX_FD) { - result = biterd_get_session_proc_w_aux_data(&session, &proc); - if (result == -1) { - debug_printf3("Could not find process with aux data, likely already cleared\n"); - /* -2 is non-fatal error return */ - return -2; - } - } - else { - int connid = process_data->client_table[id].connid; - session = CLIENT_ID_SESSION(connid); - proc = biterd_find_client_w_data(session); - debug_printf3("Decoded event on id %d/fd %d to session %d and proc %d\n", - connid, fd, session, proc); - if (proc == -1) { - err_printf("Error finding client with data in session\n"); - return -1; - } - assert(biterd_get_fd(session) == fd); - } - assert(session >= 0 && session < num_cns); - assert(proc >= 0 && proc < biterd_num_clients(session)); - - result = session_proc_to_nc[session][proc]; - assert(result != -1); - return result; -} - -int ldcs_recv_msg_static_biter(int connid, ldcs_message_t *msg, ldcs_read_block_t block) -{ - (void)block; - int session = CLIENT_ID_SESSION(connid); - int proc = CLIENT_ID_PROC(connid); - int result; - - assert(connid != server_id); - assert(session < num_cns); - assert(num_live_procs[session]); - assert(proc < biterd_num_clients(session)); - - msg->header.type = LDCS_MSG_UNKNOWN; - msg->header.len = 0; - - if (spindle_debug_prints) { - int rank = biterd_get_rank(session, proc); - debug_printf3("Receiving message from rank %d (session = %d, proc = %d)\n", - rank, session, proc); - } - - result = biterd_read(session, proc, &msg->header, sizeof(msg->header)); - if (result == -1) { - err_printf("Error reading header from session %d, proc %d: %s\n", - session, proc, biterd_lasterror_str()); - return -1; - } - - debug_printf3("Message to be read is of size %lu (session = %d, proc = %d)\n", - msg->header.len, session, proc); - - if (msg->header.len == 0) { - msg->data = NULL; - return 0; - } - - result = biterd_read(session, proc, msg->data, msg->header.len); - if (result == -1) { - err_printf("Error reading message of size %lu from session %d, proc %d: %s\n", - msg->header.len, session, proc, biterd_lasterror_str()); - return -1; - } - - return 0; -} diff --git a/src/server/comlib/ldcs_api_wrapper.c b/src/server/comlib/ldcs_api_wrapper.c index 9e49be82..2ba08128 100644 --- a/src/server/comlib/ldcs_api_wrapper.c +++ b/src/server/comlib/ldcs_api_wrapper.c @@ -22,8 +22,6 @@ Place, Suite 330, Boston, MA 02111-1307 USA #if !defined(COMM) #if defined(COMM_PIPES) #define COMM pipe -#elif defined(COMM_BITER) -#define COMM biter #else #error Unknown communication type #endif diff --git a/src/server/startup/Makefile.am b/src/server/startup/Makefile.am index 5081c986..5ba57e88 100644 --- a/src/server/startup/Makefile.am +++ b/src/server/startup/Makefile.am @@ -16,9 +16,6 @@ endif if PIPES CORE_LDADD += $(top_builddir)/comlib/libserver_pipe.la endif -if BITER -CORE_LDADD += $(top_builddir)/comlib/libserver_biter.la $(top_builddir)/biter/libbiterd.la -endif if USE_NUMA CORE_LDADD += -lnuma endif From e773d5d36f67ec47b6d7567db560c172efe53514 Mon Sep 17 00:00:00 2001 From: Barry Rountree Date: Thu, 30 Jul 2026 23:43:55 -0700 Subject: [PATCH 10/21] [prune-config] Changes post bootstrap.sh (--enable-biter) --- config.h.in | 3 - configure | 26 --------- src/client/auditclient/Makefile.in | 42 +++----------- src/client/beboot/Makefile.in | 7 +-- src/client/client/Makefile.in | 24 ++------ src/client/client_comlib/Makefile.in | 82 ++++------------------------ src/client/config.h.in | 3 - src/client/configure | 26 --------- src/client/shm_cache/Makefile.in | 5 +- src/client/subaudit/Makefile.in | 36 +++--------- src/fe/config.h.in | 3 - src/fe/configure | 26 --------- src/server/comlib/Makefile.in | 79 ++++----------------------- src/server/config.h.in | 3 - src/server/configure | 26 --------- src/server/startup/Makefile.in | 19 +++---- 16 files changed, 58 insertions(+), 352 deletions(-) diff --git a/config.h.in b/config.h.in index 19dfa44e..1b677e38 100644 --- a/config.h.in +++ b/config.h.in @@ -12,9 +12,6 @@ /* Back-end directory for communication and housekeeping */ #undef COMMPATH -/* Define if were using biter for client/server communication */ -#undef COMM_BITER - /* Define if were using cobo for server/server communication */ #undef COMM_COBO diff --git a/configure b/configure index 1359b2c3..5e606239 100755 --- a/configure +++ b/configure @@ -690,8 +690,6 @@ COBO_FALSE COBO_TRUE MSOCKET_FALSE MSOCKET_TRUE -BITER_FALSE -BITER_TRUE PIPES_FALSE PIPES_TRUE SRUN_PATH @@ -859,7 +857,6 @@ with_rsh_launch with_rsh_cmd with_slurm_launch enable_pipes -enable_biter enable_msocket enable_cobo with_python_prefix @@ -1550,7 +1547,6 @@ Optional Features: --enable-slurm-plugin Builds in support for running with SLURM via plugin --enable-flux-plugin Builds in support for running flux via a plugin --enable-pipes Use pipes for server/client communication - --enable-biter Use biter for server/client communication --enable-msocket Use msocket for inter-server communication --enable-cobo Use msocket for inter-server communication --enable-numa Use libnuma to enable numa optimizations @@ -17019,11 +17015,6 @@ if test "${enable_pipes+set}" = set; then : enableval=$enable_pipes; CLIENT_SERVER_COM=pipes; fi -# Check whether --enable-biter was given. -if test "${enable_biter+set}" = set; then : - enableval=$enable_biter; CLIENT_SERVER_COM=biter; -fi - # Check whether --enable-msocket was given. @@ -17045,14 +17036,6 @@ else PIPES_FALSE= fi - if test x$CLIENT_SERVER_COM == xbiter; then - BITER_TRUE= - BITER_FALSE='#' -else - BITER_TRUE='#' - BITER_FALSE= -fi - if test x$SERVER_SERVER_COM == xmsocket; then MSOCKET_TRUE= MSOCKET_FALSE='#' @@ -17074,11 +17057,6 @@ if test "x$CLIENT_SERVER_COM" == "xpipes"; then $as_echo "#define COMM_PIPES 1" >>confdefs.h -fi -if test "x$CLIENT_SERVER_COM" == "xbiter"; then - -$as_echo "#define COMM_BITER 1" >>confdefs.h - fi if test "x$SERVER_SERVER_COM" == "xmsocket"; then @@ -18999,10 +18977,6 @@ if test -z "${PIPES_TRUE}" && test -z "${PIPES_FALSE}"; then as_fn_error $? "conditional \"PIPES\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${BITER_TRUE}" && test -z "${BITER_FALSE}"; then - as_fn_error $? "conditional \"BITER\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${MSOCKET_TRUE}" && test -z "${MSOCKET_FALSE}"; then as_fn_error $? "conditional \"MSOCKET\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/src/client/auditclient/Makefile.in b/src/client/auditclient/Makefile.in index 2491fab6..9ffe642d 100644 --- a/src/client/auditclient/Makefile.in +++ b/src/client/auditclient/Makefile.in @@ -90,7 +90,6 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ @PIPES_TRUE@am__append_1 = libspindle_audit_pipe.la -@BITER_TRUE@am__append_2 = libspindle_audit_biter.la subdir = auditclient ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ @@ -137,9 +136,9 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(pkglibdir)" LTLIBRARIES = $(pkglib_LTLIBRARIES) -libspindle_audit_biter_la_DEPENDENCIES = \ - $(top_builddir)/client/libspindlec_biter.la $(AUDITLIB) -am__libspindle_audit_biter_la_SOURCES_DIST = auditclient.c \ +libspindle_audit_pipe_la_DEPENDENCIES = \ + $(top_builddir)/client/libspindlec_pipe.la $(AUDITLIB) +am__libspindle_audit_pipe_la_SOURCES_DIST = auditclient.c \ auditclient_common.c patch_linkmap.c redirect.c bindgot.c \ writablegot.c patch_bad_dtv.c malloc_wrapper.c fixlocale.c \ auditclient_aarch64.c auditclient_ppc64.c auditclient_x86_64.c @@ -151,29 +150,14 @@ am__objects_1 = auditclient.lo auditclient_common.lo patch_linkmap.lo \ @AARCH64_BLD_FALSE@@PPC64LE_BLD_TRUE@am__objects_2 = \ @AARCH64_BLD_FALSE@@PPC64LE_BLD_TRUE@ auditclient_ppc64.lo @AARCH64_BLD_TRUE@am__objects_2 = auditclient_aarch64.lo -am_libspindle_audit_biter_la_OBJECTS = $(am__objects_1) \ +am_libspindle_audit_pipe_la_OBJECTS = $(am__objects_1) \ $(am__objects_2) -libspindle_audit_biter_la_OBJECTS = \ - $(am_libspindle_audit_biter_la_OBJECTS) +libspindle_audit_pipe_la_OBJECTS = \ + $(am_libspindle_audit_pipe_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent am__v_lt_1 = -libspindle_audit_biter_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(AM_CFLAGS) $(CFLAGS) $(libspindle_audit_biter_la_LDFLAGS) \ - $(LDFLAGS) -o $@ -@BITER_TRUE@am_libspindle_audit_biter_la_rpath = -rpath $(pkglibdir) -libspindle_audit_pipe_la_DEPENDENCIES = \ - $(top_builddir)/client/libspindlec_pipe.la $(AUDITLIB) -am__libspindle_audit_pipe_la_SOURCES_DIST = auditclient.c \ - auditclient_common.c patch_linkmap.c redirect.c bindgot.c \ - writablegot.c patch_bad_dtv.c malloc_wrapper.c fixlocale.c \ - auditclient_aarch64.c auditclient_ppc64.c auditclient_x86_64.c -am_libspindle_audit_pipe_la_OBJECTS = $(am__objects_1) \ - $(am__objects_2) -libspindle_audit_pipe_la_OBJECTS = \ - $(am_libspindle_audit_pipe_la_OBJECTS) libspindle_audit_pipe_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(AM_CFLAGS) $(CFLAGS) $(libspindle_audit_pipe_la_LDFLAGS) \ @@ -221,10 +205,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = $(libspindle_audit_biter_la_SOURCES) \ - $(libspindle_audit_pipe_la_SOURCES) -DIST_SOURCES = $(am__libspindle_audit_biter_la_SOURCES_DIST) \ - $(am__libspindle_audit_pipe_la_SOURCES_DIST) +SOURCES = $(libspindle_audit_pipe_la_SOURCES) +DIST_SOURCES = $(am__libspindle_audit_pipe_la_SOURCES_DIST) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -386,7 +368,7 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -pkglib_LTLIBRARIES = $(am__append_1) $(am__append_2) +pkglib_LTLIBRARIES = $(am__append_1) AM_CFLAGS = -fvisibility=hidden AM_CPPFLAGS = -I$(top_srcdir)/../logging -I$(top_srcdir)/../include -I$(top_srcdir)/client -I$(top_srcdir)/client_comlib -I$(top_srcdir)/crash_handler BASE_SRCS = auditclient.c auditclient_common.c patch_linkmap.c redirect.c bindgot.c writablegot.c patch_bad_dtv.c malloc_wrapper.c fixlocale.c @@ -398,9 +380,6 @@ AUDITLIB = $(top_builddir)/client/libspindle_audit.la libspindle_audit_pipe_la_SOURCES = $(BASE_SRCS) $(ARCH_SRCS) libspindle_audit_pipe_la_LIBADD = $(top_builddir)/client/libspindlec_pipe.la $(AUDITLIB) libspindle_audit_pipe_la_LDFLAGS = -shared -avoid-version -Wl,-rpath,$(GLIBC_BE_DIR) -libspindle_audit_biter_la_SOURCES = $(BASE_SRCS) $(ARCH_SRCS) -libspindle_audit_biter_la_LIBADD = $(top_builddir)/client/libspindlec_biter.la $(AUDITLIB) -libspindle_audit_biter_la_LDFLAGS = -shared -avoid-version -Wl,-rpath,$(GLIBC_BE_DIR) all: all-am .SUFFIXES: @@ -470,9 +449,6 @@ clean-pkglibLTLIBRARIES: rm -f $${locs}; \ } -libspindle_audit_biter.la: $(libspindle_audit_biter_la_OBJECTS) $(libspindle_audit_biter_la_DEPENDENCIES) $(EXTRA_libspindle_audit_biter_la_DEPENDENCIES) - $(AM_V_CCLD)$(libspindle_audit_biter_la_LINK) $(am_libspindle_audit_biter_la_rpath) $(libspindle_audit_biter_la_OBJECTS) $(libspindle_audit_biter_la_LIBADD) $(LIBS) - libspindle_audit_pipe.la: $(libspindle_audit_pipe_la_OBJECTS) $(libspindle_audit_pipe_la_DEPENDENCIES) $(EXTRA_libspindle_audit_pipe_la_DEPENDENCIES) $(AM_V_CCLD)$(libspindle_audit_pipe_la_LINK) $(am_libspindle_audit_pipe_la_rpath) $(libspindle_audit_pipe_la_OBJECTS) $(libspindle_audit_pipe_la_LIBADD) $(LIBS) diff --git a/src/client/beboot/Makefile.in b/src/client/beboot/Makefile.in index d73b66ee..1d87c983 100644 --- a/src/client/beboot/Makefile.in +++ b/src/client/beboot/Makefile.in @@ -91,7 +91,6 @@ host_triplet = @host@ target_triplet = @target@ pkglibexec_PROGRAMS = spindle_bootstrap$(EXEEXT) @PIPES_TRUE@am__append_1 = $(top_builddir)/client_comlib/libclient_pipe.la -@BITER_TRUE@am__append_2 = $(top_builddir)/client_comlib/libclient_biter.la $(top_builddir)/biter/libbiterc.la subdir = beboot ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ @@ -123,8 +122,7 @@ am_spindle_bootstrap_OBJECTS = \ spindle_bootstrap_OBJECTS = $(am_spindle_bootstrap_OBJECTS) spindle_bootstrap_DEPENDENCIES = \ $(top_builddir)/logging/libspindleclogc.la \ - $(top_builddir)/shm_cache/libshmcache.la $(am__append_1) \ - $(am__append_2) + $(top_builddir)/shm_cache/libshmcache.la $(am__append_1) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent @@ -340,8 +338,7 @@ top_srcdir = @top_srcdir@ spindle_bootstrap_LDFLAGS = $(AM_LDFLAGS) $(STATICFLAG) spindle_bootstrap_CPPFLAGS = $(AM_CPPFLAGS) -DLIBEXECDIR=\"$(pkglibexecdir)\" -DPROGLIBDIR=\"$(pkglibdir)\" -I$(top_srcdir)/../include -I$(top_srcdir)/../logging -I$(top_srcdir)/client_comlib -I$(top_srcdir)/client -I$(top_srcdir)/shm_cache -I$(top_srcdir)/../utils spindle_bootstrap_LDADD = $(top_builddir)/logging/libspindleclogc.la \ - $(top_builddir)/shm_cache/libshmcache.la $(am__append_1) \ - $(am__append_2) + $(top_builddir)/shm_cache/libshmcache.la $(am__append_1) spindle_bootstrap_SOURCES = spindle_bootstrap.c $(top_srcdir)/../utils/parseloc.c $(top_srcdir)/../utils/spindle_mkdir.c $(top_srcdir)/../utils/getcpu.c $(top_srcdir)/client/exec_util.c $(top_srcdir)/client/lookup.c $(top_srcdir)/../utils/fileutil.c all: all-am diff --git a/src/client/client/Makefile.in b/src/client/client/Makefile.in index d9e99dc0..c7becb1a 100644 --- a/src/client/client/Makefile.in +++ b/src/client/client/Makefile.in @@ -91,7 +91,6 @@ host_triplet = @host@ target_triplet = @target@ #noinst_LTLIBRARIES += libspindle_instr.la @PIPES_TRUE@am__append_1 = libspindlec_pipe.la -@BITER_TRUE@am__append_2 = libspindlec_biter.la subdir = client ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ @@ -128,8 +127,8 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent am__v_lt_1 = -libspindlec_biter_la_DEPENDENCIES = \ - $(top_builddir)/client_comlib/libclient_biter.la \ +libspindlec_pipe_la_DEPENDENCIES = \ + $(top_builddir)/client_comlib/libclient_pipe.la \ $(top_builddir)/logging/libspindleclogc.la \ $(top_builddir)/shm_cache/libshmcache.la am__objects_2 = client.lo lookup.lo should_intercept.lo exec_util.lo \ @@ -141,13 +140,6 @@ am__objects_2 = client.lo lookup.lo should_intercept.lo exec_util.lo \ $(top_builddir)/crash_handler/crash_handler.lo \ $(top_builddir)/crash_handler/crash_lib_offset.lo \ $(top_builddir)/crash_handler/crash_sigchain.lo -am_libspindlec_biter_la_OBJECTS = $(am__objects_2) -libspindlec_biter_la_OBJECTS = $(am_libspindlec_biter_la_OBJECTS) -@BITER_TRUE@am_libspindlec_biter_la_rpath = -libspindlec_pipe_la_DEPENDENCIES = \ - $(top_builddir)/client_comlib/libclient_pipe.la \ - $(top_builddir)/logging/libspindleclogc.la \ - $(top_builddir)/shm_cache/libshmcache.la am_libspindlec_pipe_la_OBJECTS = $(am__objects_2) libspindlec_pipe_la_OBJECTS = $(am_libspindlec_pipe_la_OBJECTS) @PIPES_TRUE@am_libspindlec_pipe_la_rpath = @@ -207,9 +199,9 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = SOURCES = $(libspindle_audit_la_SOURCES) \ - $(libspindlec_biter_la_SOURCES) $(libspindlec_pipe_la_SOURCES) + $(libspindlec_pipe_la_SOURCES) DIST_SOURCES = $(libspindle_audit_la_SOURCES) \ - $(libspindlec_biter_la_SOURCES) $(libspindlec_pipe_la_SOURCES) + $(libspindlec_pipe_la_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -371,8 +363,7 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -noinst_LTLIBRARIES = libspindle_audit.la $(am__append_1) \ - $(am__append_2) +noinst_LTLIBRARIES = libspindle_audit.la $(am__append_1) AM_CFLAGS = -fvisibility=hidden AM_CPPFLAGS = -I$(top_srcdir)/../logging -I$(top_srcdir)/client_comlib -I$(top_srcdir)/../include -I$(top_srcdir)/shm_cache -I$(top_srcdir)/subaudit -I$(top_srcdir)/../utils -I$(top_srcdir)/auditclient -I$(top_srcdir)/client -I$(top_srcdir)/crash_handler INTERCEPT_SRCS = intercept_open.c intercept_exec.c intercept_stat.c intercept_readlink.c intercept_spindleapi.c intercept.c spindle_regex.c patch_interception.c realpath.c $(top_srcdir)/../utils/fileutil.c @@ -387,8 +378,6 @@ BASE_SRCS = client.c lookup.c should_intercept.c exec_util.c \ $(top_srcdir)/crash_handler/crash_sigchain.c libspindlec_pipe_la_SOURCES = $(BASE_SRCS) libspindlec_pipe_la_LIBADD = $(top_builddir)/client_comlib/libclient_pipe.la $(top_builddir)/logging/libspindleclogc.la $(top_builddir)/shm_cache/libshmcache.la -libspindlec_biter_la_SOURCES = $(BASE_SRCS) -libspindlec_biter_la_LIBADD = $(top_builddir)/client_comlib/libclient_biter.la $(top_builddir)/logging/libspindleclogc.la $(top_builddir)/shm_cache/libshmcache.la libspindle_audit_la_SOURCES = $(INTERCEPT_SRCS) libspindle_audit_la_CPPFLAGS = -DAUDIT_LIB $(AM_CPPFLAGS) all: all-am @@ -475,9 +464,6 @@ $(top_builddir)/crash_handler/crash_sigchain.lo: \ $(top_builddir)/crash_handler/$(am__dirstamp) \ $(top_builddir)/crash_handler/$(DEPDIR)/$(am__dirstamp) -libspindlec_biter.la: $(libspindlec_biter_la_OBJECTS) $(libspindlec_biter_la_DEPENDENCIES) $(EXTRA_libspindlec_biter_la_DEPENDENCIES) - $(AM_V_CCLD)$(LINK) $(am_libspindlec_biter_la_rpath) $(libspindlec_biter_la_OBJECTS) $(libspindlec_biter_la_LIBADD) $(LIBS) - libspindlec_pipe.la: $(libspindlec_pipe_la_OBJECTS) $(libspindlec_pipe_la_DEPENDENCIES) $(EXTRA_libspindlec_pipe_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(am_libspindlec_pipe_la_rpath) $(libspindlec_pipe_la_OBJECTS) $(libspindlec_pipe_la_LIBADD) $(LIBS) diff --git a/src/client/client_comlib/Makefile.in b/src/client/client_comlib/Makefile.in index 9ca035ab..3ea612ab 100644 --- a/src/client/client_comlib/Makefile.in +++ b/src/client/client_comlib/Makefile.in @@ -107,24 +107,17 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) -libclient_biter_la_DEPENDENCIES = $(top_builddir)/biter/libbiterc.la -am__objects_1 = libclient_biter_la-client_api.lo \ - libclient_biter_la-client_heap.lo \ - libclient_biter_la-client_wrappers.lo -am_libclient_biter_la_OBJECTS = \ - libclient_biter_la-client_api_biter.lo $(am__objects_1) -libclient_biter_la_OBJECTS = $(am_libclient_biter_la_OBJECTS) -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -am__v_lt_0 = --silent -am__v_lt_1 = libclient_pipe_la_LIBADD = -am__objects_2 = libclient_pipe_la-client_api.lo \ +am__objects_1 = libclient_pipe_la-client_api.lo \ libclient_pipe_la-client_heap.lo \ libclient_pipe_la-client_wrappers.lo am_libclient_pipe_la_OBJECTS = libclient_pipe_la-client_api_pipe.lo \ - $(am__objects_2) + $(am__objects_1) libclient_pipe_la_OBJECTS = $(am_libclient_pipe_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -140,11 +133,7 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/../../scripts/depcomp am__maybe_remake_depfiles = depfiles -am__depfiles_remade = ./$(DEPDIR)/libclient_biter_la-client_api.Plo \ - ./$(DEPDIR)/libclient_biter_la-client_api_biter.Plo \ - ./$(DEPDIR)/libclient_biter_la-client_heap.Plo \ - ./$(DEPDIR)/libclient_biter_la-client_wrappers.Plo \ - ./$(DEPDIR)/libclient_pipe_la-client_api.Plo \ +am__depfiles_remade = ./$(DEPDIR)/libclient_pipe_la-client_api.Plo \ ./$(DEPDIR)/libclient_pipe_la-client_api_pipe.Plo \ ./$(DEPDIR)/libclient_pipe_la-client_heap.Plo \ ./$(DEPDIR)/libclient_pipe_la-client_wrappers.Plo @@ -167,9 +156,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = $(libclient_biter_la_SOURCES) $(libclient_pipe_la_SOURCES) -DIST_SOURCES = $(libclient_biter_la_SOURCES) \ - $(libclient_pipe_la_SOURCES) +SOURCES = $(libclient_pipe_la_SOURCES) +DIST_SOURCES = $(libclient_pipe_la_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -331,15 +319,12 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -noinst_LTLIBRARIES = libclient_pipe.la libclient_biter.la +noinst_LTLIBRARIES = libclient_pipe.la AM_CPPFLAGS = -I$(top_srcdir)/../logging -I$(top_srcdir)/../include BASE_SRCS = client_api.c client_heap.c client_wrappers.c AM_CFLAGS = -fvisibility=hidden libclient_pipe_la_CPPFLAGS = $(AM_CPPFLAGS) -DCOMM=pipe libclient_pipe_la_SOURCES = client_api_pipe.c $(BASE_SRCS) -libclient_biter_la_CPPFLAGS = $(AM_CPPFLAGS) -DCOMM=biter -I$(top_srcdir)/../biter -libclient_biter_la_LIBADD = $(top_builddir)/biter/libbiterc.la -libclient_biter_la_SOURCES = client_api_biter.c $(BASE_SRCS) all: all-am .SUFFIXES: @@ -385,9 +370,6 @@ clean-noinstLTLIBRARIES: rm -f $${locs}; \ } -libclient_biter.la: $(libclient_biter_la_OBJECTS) $(libclient_biter_la_DEPENDENCIES) $(EXTRA_libclient_biter_la_DEPENDENCIES) - $(AM_V_CCLD)$(LINK) $(libclient_biter_la_OBJECTS) $(libclient_biter_la_LIBADD) $(LIBS) - libclient_pipe.la: $(libclient_pipe_la_OBJECTS) $(libclient_pipe_la_DEPENDENCIES) $(EXTRA_libclient_pipe_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libclient_pipe_la_OBJECTS) $(libclient_pipe_la_LIBADD) $(LIBS) @@ -397,10 +379,6 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclient_biter_la-client_api.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclient_biter_la-client_api_biter.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclient_biter_la-client_heap.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclient_biter_la-client_wrappers.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclient_pipe_la-client_api.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclient_pipe_la-client_api_pipe.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclient_pipe_la-client_heap.Plo@am__quote@ # am--include-marker @@ -436,34 +414,6 @@ am--depfiles: $(am__depfiles_remade) @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< -libclient_biter_la-client_api_biter.lo: client_api_biter.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libclient_biter_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libclient_biter_la-client_api_biter.lo -MD -MP -MF $(DEPDIR)/libclient_biter_la-client_api_biter.Tpo -c -o libclient_biter_la-client_api_biter.lo `test -f 'client_api_biter.c' || echo '$(srcdir)/'`client_api_biter.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libclient_biter_la-client_api_biter.Tpo $(DEPDIR)/libclient_biter_la-client_api_biter.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='client_api_biter.c' object='libclient_biter_la-client_api_biter.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libclient_biter_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libclient_biter_la-client_api_biter.lo `test -f 'client_api_biter.c' || echo '$(srcdir)/'`client_api_biter.c - -libclient_biter_la-client_api.lo: client_api.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libclient_biter_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libclient_biter_la-client_api.lo -MD -MP -MF $(DEPDIR)/libclient_biter_la-client_api.Tpo -c -o libclient_biter_la-client_api.lo `test -f 'client_api.c' || echo '$(srcdir)/'`client_api.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libclient_biter_la-client_api.Tpo $(DEPDIR)/libclient_biter_la-client_api.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='client_api.c' object='libclient_biter_la-client_api.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libclient_biter_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libclient_biter_la-client_api.lo `test -f 'client_api.c' || echo '$(srcdir)/'`client_api.c - -libclient_biter_la-client_heap.lo: client_heap.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libclient_biter_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libclient_biter_la-client_heap.lo -MD -MP -MF $(DEPDIR)/libclient_biter_la-client_heap.Tpo -c -o libclient_biter_la-client_heap.lo `test -f 'client_heap.c' || echo '$(srcdir)/'`client_heap.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libclient_biter_la-client_heap.Tpo $(DEPDIR)/libclient_biter_la-client_heap.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='client_heap.c' object='libclient_biter_la-client_heap.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libclient_biter_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libclient_biter_la-client_heap.lo `test -f 'client_heap.c' || echo '$(srcdir)/'`client_heap.c - -libclient_biter_la-client_wrappers.lo: client_wrappers.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libclient_biter_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libclient_biter_la-client_wrappers.lo -MD -MP -MF $(DEPDIR)/libclient_biter_la-client_wrappers.Tpo -c -o libclient_biter_la-client_wrappers.lo `test -f 'client_wrappers.c' || echo '$(srcdir)/'`client_wrappers.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libclient_biter_la-client_wrappers.Tpo $(DEPDIR)/libclient_biter_la-client_wrappers.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='client_wrappers.c' object='libclient_biter_la-client_wrappers.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libclient_biter_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libclient_biter_la-client_wrappers.lo `test -f 'client_wrappers.c' || echo '$(srcdir)/'`client_wrappers.c - libclient_pipe_la-client_api_pipe.lo: client_api_pipe.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libclient_pipe_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libclient_pipe_la-client_api_pipe.lo -MD -MP -MF $(DEPDIR)/libclient_pipe_la-client_api_pipe.Tpo -c -o libclient_pipe_la-client_api_pipe.lo `test -f 'client_api_pipe.c' || echo '$(srcdir)/'`client_api_pipe.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libclient_pipe_la-client_api_pipe.Tpo $(DEPDIR)/libclient_pipe_la-client_api_pipe.Plo @@ -623,11 +573,7 @@ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ mostlyclean-am distclean: distclean-am - -rm -f ./$(DEPDIR)/libclient_biter_la-client_api.Plo - -rm -f ./$(DEPDIR)/libclient_biter_la-client_api_biter.Plo - -rm -f ./$(DEPDIR)/libclient_biter_la-client_heap.Plo - -rm -f ./$(DEPDIR)/libclient_biter_la-client_wrappers.Plo - -rm -f ./$(DEPDIR)/libclient_pipe_la-client_api.Plo + -rm -f ./$(DEPDIR)/libclient_pipe_la-client_api.Plo -rm -f ./$(DEPDIR)/libclient_pipe_la-client_api_pipe.Plo -rm -f ./$(DEPDIR)/libclient_pipe_la-client_heap.Plo -rm -f ./$(DEPDIR)/libclient_pipe_la-client_wrappers.Plo @@ -676,11 +622,7 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f ./$(DEPDIR)/libclient_biter_la-client_api.Plo - -rm -f ./$(DEPDIR)/libclient_biter_la-client_api_biter.Plo - -rm -f ./$(DEPDIR)/libclient_biter_la-client_heap.Plo - -rm -f ./$(DEPDIR)/libclient_biter_la-client_wrappers.Plo - -rm -f ./$(DEPDIR)/libclient_pipe_la-client_api.Plo + -rm -f ./$(DEPDIR)/libclient_pipe_la-client_api.Plo -rm -f ./$(DEPDIR)/libclient_pipe_la-client_api_pipe.Plo -rm -f ./$(DEPDIR)/libclient_pipe_la-client_heap.Plo -rm -f ./$(DEPDIR)/libclient_pipe_la-client_wrappers.Plo diff --git a/src/client/config.h.in b/src/client/config.h.in index 0d95c145..ecafee1e 100644 --- a/src/client/config.h.in +++ b/src/client/config.h.in @@ -12,9 +12,6 @@ /* Back-end directory for communication and housekeeping */ #undef COMMPATH -/* Define if were using biter for client/server communication */ -#undef COMM_BITER - /* Define if were using cobo for server/server communication */ #undef COMM_COBO diff --git a/src/client/configure b/src/client/configure index 50d7a653..13ef2abe 100755 --- a/src/client/configure +++ b/src/client/configure @@ -663,8 +663,6 @@ COBO_FALSE COBO_TRUE MSOCKET_FALSE MSOCKET_TRUE -BITER_FALSE -BITER_TRUE PIPES_FALSE PIPES_TRUE SRUN_PATH @@ -822,7 +820,6 @@ with_rsh_launch with_rsh_cmd with_slurm_launch enable_pipes -enable_biter enable_msocket enable_cobo with_python_prefix @@ -1494,7 +1491,6 @@ Optional Features: --enable-slurm-plugin Builds in support for running with SLURM via plugin --enable-flux-plugin Builds in support for running flux via a plugin --enable-pipes Use pipes for server/client communication - --enable-biter Use biter for server/client communication --enable-msocket Use msocket for inter-server communication --enable-cobo Use msocket for inter-server communication --enable-numa Use libnuma to enable numa optimizations @@ -12900,11 +12896,6 @@ if test "${enable_pipes+set}" = set; then : enableval=$enable_pipes; CLIENT_SERVER_COM=pipes; fi -# Check whether --enable-biter was given. -if test "${enable_biter+set}" = set; then : - enableval=$enable_biter; CLIENT_SERVER_COM=biter; -fi - # Check whether --enable-msocket was given. @@ -12926,14 +12917,6 @@ else PIPES_FALSE= fi - if test x$CLIENT_SERVER_COM == xbiter; then - BITER_TRUE= - BITER_FALSE='#' -else - BITER_TRUE='#' - BITER_FALSE= -fi - if test x$SERVER_SERVER_COM == xmsocket; then MSOCKET_TRUE= MSOCKET_FALSE='#' @@ -12955,11 +12938,6 @@ if test "x$CLIENT_SERVER_COM" == "xpipes"; then $as_echo "#define COMM_PIPES 1" >>confdefs.h -fi -if test "x$CLIENT_SERVER_COM" == "xbiter"; then - -$as_echo "#define COMM_BITER 1" >>confdefs.h - fi if test "x$SERVER_SERVER_COM" == "xmsocket"; then @@ -13845,10 +13823,6 @@ if test -z "${PIPES_TRUE}" && test -z "${PIPES_FALSE}"; then as_fn_error $? "conditional \"PIPES\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${BITER_TRUE}" && test -z "${BITER_FALSE}"; then - as_fn_error $? "conditional \"BITER\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${MSOCKET_TRUE}" && test -z "${MSOCKET_FALSE}"; then as_fn_error $? "conditional \"MSOCKET\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/src/client/shm_cache/Makefile.in b/src/client/shm_cache/Makefile.in index c0138ce6..7396b5be 100644 --- a/src/client/shm_cache/Makefile.in +++ b/src/client/shm_cache/Makefile.in @@ -107,8 +107,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) -@BITER_FALSE@libshmcache_la_DEPENDENCIES = \ -@BITER_FALSE@ $(top_builddir)/biter/libsheep.la +libshmcache_la_DEPENDENCIES = $(top_builddir)/biter/libsheep.la am_libshmcache_la_OBJECTS = shmcache.lo libshmcache_la_OBJECTS = $(am_libshmcache_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) @@ -316,7 +315,7 @@ top_srcdir = @top_srcdir@ noinst_LTLIBRARIES = libshmcache.la AM_CFLAGS = -fvisibility=hidden libshmcache_la_SOURCES = shmcache.c -@BITER_FALSE@libshmcache_la_LIBADD = $(top_builddir)/biter/libsheep.la +libshmcache_la_LIBADD = $(top_builddir)/biter/libsheep.la AM_CPPFLAGS = -I$(top_srcdir)/../biter -I$(top_srcdir)/shm_cache -I$(top_srcdir)/../logging -I$(top_srcdir)/client_comlib -I$(top_srcdir)/../include -I$(top_srcdir)/../utils all: all-am diff --git a/src/client/subaudit/Makefile.in b/src/client/subaudit/Makefile.in index 1f58982c..608fde72 100644 --- a/src/client/subaudit/Makefile.in +++ b/src/client/subaudit/Makefile.in @@ -90,7 +90,6 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ @PIPES_TRUE@am__append_1 = libspindle_subaudit_pipe.la -@BITER_TRUE@am__append_2 = libspindle_subaudit_biter.la subdir = subaudit ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ @@ -137,30 +136,19 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(pkglibdir)" LTLIBRARIES = $(pkglib_LTLIBRARIES) -libspindle_subaudit_biter_la_DEPENDENCIES = \ - $(top_builddir)/client/libspindlec_biter.la $(AUDITLIB) +libspindle_subaudit_pipe_la_DEPENDENCIES = \ + $(top_builddir)/client/libspindlec_pipe.la $(AUDITLIB) am__dirstamp = $(am__leading_dot)dirstamp am__objects_1 = subaudit.lo intercept_malloc.lo update_pltbind.lo \ ../auditclient/auditclient_common.lo \ ../auditclient/patch_linkmap.lo ../auditclient/fixlocale.lo -am_libspindle_subaudit_biter_la_OBJECTS = $(am__objects_1) -libspindle_subaudit_biter_la_OBJECTS = \ - $(am_libspindle_subaudit_biter_la_OBJECTS) +am_libspindle_subaudit_pipe_la_OBJECTS = $(am__objects_1) +libspindle_subaudit_pipe_la_OBJECTS = \ + $(am_libspindle_subaudit_pipe_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent am__v_lt_1 = -libspindle_subaudit_biter_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(AM_CFLAGS) $(CFLAGS) $(libspindle_subaudit_biter_la_LDFLAGS) \ - $(LDFLAGS) -o $@ -@BITER_TRUE@am_libspindle_subaudit_biter_la_rpath = -rpath \ -@BITER_TRUE@ $(pkglibdir) -libspindle_subaudit_pipe_la_DEPENDENCIES = \ - $(top_builddir)/client/libspindlec_pipe.la $(AUDITLIB) -am_libspindle_subaudit_pipe_la_OBJECTS = $(am__objects_1) -libspindle_subaudit_pipe_la_OBJECTS = \ - $(am_libspindle_subaudit_pipe_la_OBJECTS) libspindle_subaudit_pipe_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(AM_CFLAGS) $(CFLAGS) $(libspindle_subaudit_pipe_la_LDFLAGS) \ @@ -212,11 +200,9 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = $(libspindle_subaudit_biter_la_SOURCES) \ - $(libspindle_subaudit_pipe_la_SOURCES) \ +SOURCES = $(libspindle_subaudit_pipe_la_SOURCES) \ $(libspindleint_la_SOURCES) -DIST_SOURCES = $(libspindle_subaudit_biter_la_SOURCES) \ - $(libspindle_subaudit_pipe_la_SOURCES) \ +DIST_SOURCES = $(libspindle_subaudit_pipe_la_SOURCES) \ $(libspindleint_la_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ @@ -379,7 +365,7 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -pkglib_LTLIBRARIES = libspindleint.la $(am__append_1) $(am__append_2) +pkglib_LTLIBRARIES = libspindleint.la $(am__append_1) AM_CFLAGS = -fvisibility=hidden AM_CPPFLAGS = -I$(top_srcdir)/../logging -I$(top_srcdir)/../include -I$(top_srcdir)/client -I$(top_srcdir)/client_comlib -I$(top_srcdir)/auditclient -I$(top_srcdir)/../utils -I$(top_srcdir)/crash_handler BASE_SRCS = subaudit.c intercept_malloc.c update_pltbind.c ../auditclient/auditclient_common.c ../auditclient/patch_linkmap.c ../auditclient/fixlocale.c @@ -389,9 +375,6 @@ libspindleint_la_LDFLAGS = -shared -avoid-version libspindle_subaudit_pipe_la_SOURCES = $(BASE_SRCS) libspindle_subaudit_pipe_la_LIBADD = $(top_builddir)/client/libspindlec_pipe.la $(AUDITLIB) libspindle_subaudit_pipe_la_LDFLAGS = -shared -avoid-version -libspindle_subaudit_biter_la_SOURCES = $(BASE_SRCS) -libspindle_subaudit_biter_la_LIBADD = $(top_builddir)/client/libspindlec_biter.la $(AUDITLIB) -libspindle_subaudit_biter_la_LDFLAGS = -shared -avoid-version all: all-am .SUFFIXES: @@ -473,9 +456,6 @@ clean-pkglibLTLIBRARIES: ../auditclient/fixlocale.lo: ../auditclient/$(am__dirstamp) \ ../auditclient/$(DEPDIR)/$(am__dirstamp) -libspindle_subaudit_biter.la: $(libspindle_subaudit_biter_la_OBJECTS) $(libspindle_subaudit_biter_la_DEPENDENCIES) $(EXTRA_libspindle_subaudit_biter_la_DEPENDENCIES) - $(AM_V_CCLD)$(libspindle_subaudit_biter_la_LINK) $(am_libspindle_subaudit_biter_la_rpath) $(libspindle_subaudit_biter_la_OBJECTS) $(libspindle_subaudit_biter_la_LIBADD) $(LIBS) - libspindle_subaudit_pipe.la: $(libspindle_subaudit_pipe_la_OBJECTS) $(libspindle_subaudit_pipe_la_DEPENDENCIES) $(EXTRA_libspindle_subaudit_pipe_la_DEPENDENCIES) $(AM_V_CCLD)$(libspindle_subaudit_pipe_la_LINK) $(am_libspindle_subaudit_pipe_la_rpath) $(libspindle_subaudit_pipe_la_OBJECTS) $(libspindle_subaudit_pipe_la_LIBADD) $(LIBS) diff --git a/src/fe/config.h.in b/src/fe/config.h.in index 40039721..7e349ad2 100644 --- a/src/fe/config.h.in +++ b/src/fe/config.h.in @@ -12,9 +12,6 @@ /* Back-end directory for communication and housekeeping */ #undef COMMPATH -/* Define if were using biter for client/server communication */ -#undef COMM_BITER - /* Define if were using cobo for server/server communication */ #undef COMM_COBO diff --git a/src/fe/configure b/src/fe/configure index 61c6a749..749ba432 100755 --- a/src/fe/configure +++ b/src/fe/configure @@ -677,8 +677,6 @@ COBO_FALSE COBO_TRUE MSOCKET_FALSE MSOCKET_TRUE -BITER_FALSE -BITER_TRUE PIPES_FALSE PIPES_TRUE SRUN_PATH @@ -843,7 +841,6 @@ with_rsh_launch with_rsh_cmd with_slurm_launch enable_pipes -enable_biter enable_msocket enable_cobo with_python_prefix @@ -1527,7 +1524,6 @@ Optional Features: --enable-slurm-plugin Builds in support for running with SLURM via plugin --enable-flux-plugin Builds in support for running flux via a plugin --enable-pipes Use pipes for server/client communication - --enable-biter Use biter for server/client communication --enable-msocket Use msocket for inter-server communication --enable-cobo Use msocket for inter-server communication --enable-numa Use libnuma to enable numa optimizations @@ -16750,11 +16746,6 @@ if test "${enable_pipes+set}" = set; then : enableval=$enable_pipes; CLIENT_SERVER_COM=pipes; fi -# Check whether --enable-biter was given. -if test "${enable_biter+set}" = set; then : - enableval=$enable_biter; CLIENT_SERVER_COM=biter; -fi - # Check whether --enable-msocket was given. @@ -16776,14 +16767,6 @@ else PIPES_FALSE= fi - if test x$CLIENT_SERVER_COM == xbiter; then - BITER_TRUE= - BITER_FALSE='#' -else - BITER_TRUE='#' - BITER_FALSE= -fi - if test x$SERVER_SERVER_COM == xmsocket; then MSOCKET_TRUE= MSOCKET_FALSE='#' @@ -16805,11 +16788,6 @@ if test "x$CLIENT_SERVER_COM" == "xpipes"; then $as_echo "#define COMM_PIPES 1" >>confdefs.h -fi -if test "x$CLIENT_SERVER_COM" == "xbiter"; then - -$as_echo "#define COMM_BITER 1" >>confdefs.h - fi if test "x$SERVER_SERVER_COM" == "xmsocket"; then @@ -18217,10 +18195,6 @@ if test -z "${PIPES_TRUE}" && test -z "${PIPES_FALSE}"; then as_fn_error $? "conditional \"PIPES\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${BITER_TRUE}" && test -z "${BITER_FALSE}"; then - as_fn_error $? "conditional \"BITER\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${MSOCKET_TRUE}" && test -z "${MSOCKET_FALSE}"; then as_fn_error $? "conditional \"MSOCKET\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/src/server/comlib/Makefile.in b/src/server/comlib/Makefile.in index 9af929ce..37682457 100644 --- a/src/server/comlib/Makefile.in +++ b/src/server/comlib/Makefile.in @@ -107,24 +107,17 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) -libserver_biter_la_LIBADD = -am__objects_1 = libserver_biter_la-ldcs_api_util.lo \ - libserver_biter_la-ldcs_api_listen.lo \ - libserver_biter_la-ldcs_api_wrapper.lo -am_libserver_biter_la_OBJECTS = libserver_biter_la-ldcs_api_biter.lo \ - $(am__objects_1) -libserver_biter_la_OBJECTS = $(am_libserver_biter_la_OBJECTS) -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -am__v_lt_0 = --silent -am__v_lt_1 = libserver_pipe_la_LIBADD = -am__objects_2 = libserver_pipe_la-ldcs_api_util.lo \ +am__objects_1 = libserver_pipe_la-ldcs_api_util.lo \ libserver_pipe_la-ldcs_api_listen.lo \ libserver_pipe_la-ldcs_api_wrapper.lo am_libserver_pipe_la_OBJECTS = libserver_pipe_la-ldcs_api_pipe.lo \ - libserver_pipe_la-ldcs_api_pipe_notify.lo $(am__objects_2) + libserver_pipe_la-ldcs_api_pipe_notify.lo $(am__objects_1) libserver_pipe_la_OBJECTS = $(am_libserver_pipe_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -141,10 +134,6 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/../../scripts/depcomp am__maybe_remake_depfiles = depfiles am__depfiles_remade = \ - ./$(DEPDIR)/libserver_biter_la-ldcs_api_biter.Plo \ - ./$(DEPDIR)/libserver_biter_la-ldcs_api_listen.Plo \ - ./$(DEPDIR)/libserver_biter_la-ldcs_api_util.Plo \ - ./$(DEPDIR)/libserver_biter_la-ldcs_api_wrapper.Plo \ ./$(DEPDIR)/libserver_pipe_la-ldcs_api_listen.Plo \ ./$(DEPDIR)/libserver_pipe_la-ldcs_api_pipe.Plo \ ./$(DEPDIR)/libserver_pipe_la-ldcs_api_pipe_notify.Plo \ @@ -169,9 +158,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = $(libserver_biter_la_SOURCES) $(libserver_pipe_la_SOURCES) -DIST_SOURCES = $(libserver_biter_la_SOURCES) \ - $(libserver_pipe_la_SOURCES) +SOURCES = $(libserver_pipe_la_SOURCES) +DIST_SOURCES = $(libserver_pipe_la_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -350,13 +338,11 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -noinst_LTLIBRARIES = libserver_pipe.la libserver_biter.la +noinst_LTLIBRARIES = libserver_pipe.la AM_CPPFLAGS = -I$(top_srcdir)/../logging -I$(top_srcdir)/../include -I$(top_srcdir)/auditserver -I$(top_srcdir)/cache BASE_SRCS = ldcs_api_util.c ldcs_api_listen.c ldcs_api_wrapper.c libserver_pipe_la_CPPFLAGS = $(AM_CPPFLAGS) -Dcomm=pipe libserver_pipe_la_SOURCES = ldcs_api_pipe.c ldcs_api_pipe_notify.c $(BASE_SRCS) -libserver_biter_la_CPPFLAGS = $(AM_CPPFLAGS) -Dcomm=biter -I$(top_srcdir)/../biter -libserver_biter_la_SOURCES = ldcs_api_biter.c $(BASE_SRCS) all: all-am .SUFFIXES: @@ -402,9 +388,6 @@ clean-noinstLTLIBRARIES: rm -f $${locs}; \ } -libserver_biter.la: $(libserver_biter_la_OBJECTS) $(libserver_biter_la_DEPENDENCIES) $(EXTRA_libserver_biter_la_DEPENDENCIES) - $(AM_V_CCLD)$(LINK) $(libserver_biter_la_OBJECTS) $(libserver_biter_la_LIBADD) $(LIBS) - libserver_pipe.la: $(libserver_pipe_la_OBJECTS) $(libserver_pipe_la_DEPENDENCIES) $(EXTRA_libserver_pipe_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libserver_pipe_la_OBJECTS) $(libserver_pipe_la_LIBADD) $(LIBS) @@ -414,10 +397,6 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libserver_biter_la-ldcs_api_biter.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libserver_biter_la-ldcs_api_listen.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libserver_biter_la-ldcs_api_util.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libserver_biter_la-ldcs_api_wrapper.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libserver_pipe_la-ldcs_api_listen.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libserver_pipe_la-ldcs_api_pipe.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libserver_pipe_la-ldcs_api_pipe_notify.Plo@am__quote@ # am--include-marker @@ -454,34 +433,6 @@ am--depfiles: $(am__depfiles_remade) @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< -libserver_biter_la-ldcs_api_biter.lo: ldcs_api_biter.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libserver_biter_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libserver_biter_la-ldcs_api_biter.lo -MD -MP -MF $(DEPDIR)/libserver_biter_la-ldcs_api_biter.Tpo -c -o libserver_biter_la-ldcs_api_biter.lo `test -f 'ldcs_api_biter.c' || echo '$(srcdir)/'`ldcs_api_biter.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libserver_biter_la-ldcs_api_biter.Tpo $(DEPDIR)/libserver_biter_la-ldcs_api_biter.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ldcs_api_biter.c' object='libserver_biter_la-ldcs_api_biter.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libserver_biter_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libserver_biter_la-ldcs_api_biter.lo `test -f 'ldcs_api_biter.c' || echo '$(srcdir)/'`ldcs_api_biter.c - -libserver_biter_la-ldcs_api_util.lo: ldcs_api_util.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libserver_biter_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libserver_biter_la-ldcs_api_util.lo -MD -MP -MF $(DEPDIR)/libserver_biter_la-ldcs_api_util.Tpo -c -o libserver_biter_la-ldcs_api_util.lo `test -f 'ldcs_api_util.c' || echo '$(srcdir)/'`ldcs_api_util.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libserver_biter_la-ldcs_api_util.Tpo $(DEPDIR)/libserver_biter_la-ldcs_api_util.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ldcs_api_util.c' object='libserver_biter_la-ldcs_api_util.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libserver_biter_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libserver_biter_la-ldcs_api_util.lo `test -f 'ldcs_api_util.c' || echo '$(srcdir)/'`ldcs_api_util.c - -libserver_biter_la-ldcs_api_listen.lo: ldcs_api_listen.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libserver_biter_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libserver_biter_la-ldcs_api_listen.lo -MD -MP -MF $(DEPDIR)/libserver_biter_la-ldcs_api_listen.Tpo -c -o libserver_biter_la-ldcs_api_listen.lo `test -f 'ldcs_api_listen.c' || echo '$(srcdir)/'`ldcs_api_listen.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libserver_biter_la-ldcs_api_listen.Tpo $(DEPDIR)/libserver_biter_la-ldcs_api_listen.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ldcs_api_listen.c' object='libserver_biter_la-ldcs_api_listen.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libserver_biter_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libserver_biter_la-ldcs_api_listen.lo `test -f 'ldcs_api_listen.c' || echo '$(srcdir)/'`ldcs_api_listen.c - -libserver_biter_la-ldcs_api_wrapper.lo: ldcs_api_wrapper.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libserver_biter_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libserver_biter_la-ldcs_api_wrapper.lo -MD -MP -MF $(DEPDIR)/libserver_biter_la-ldcs_api_wrapper.Tpo -c -o libserver_biter_la-ldcs_api_wrapper.lo `test -f 'ldcs_api_wrapper.c' || echo '$(srcdir)/'`ldcs_api_wrapper.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libserver_biter_la-ldcs_api_wrapper.Tpo $(DEPDIR)/libserver_biter_la-ldcs_api_wrapper.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ldcs_api_wrapper.c' object='libserver_biter_la-ldcs_api_wrapper.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libserver_biter_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libserver_biter_la-ldcs_api_wrapper.lo `test -f 'ldcs_api_wrapper.c' || echo '$(srcdir)/'`ldcs_api_wrapper.c - libserver_pipe_la-ldcs_api_pipe.lo: ldcs_api_pipe.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libserver_pipe_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libserver_pipe_la-ldcs_api_pipe.lo -MD -MP -MF $(DEPDIR)/libserver_pipe_la-ldcs_api_pipe.Tpo -c -o libserver_pipe_la-ldcs_api_pipe.lo `test -f 'ldcs_api_pipe.c' || echo '$(srcdir)/'`ldcs_api_pipe.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libserver_pipe_la-ldcs_api_pipe.Tpo $(DEPDIR)/libserver_pipe_la-ldcs_api_pipe.Plo @@ -648,11 +599,7 @@ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ mostlyclean-am distclean: distclean-am - -rm -f ./$(DEPDIR)/libserver_biter_la-ldcs_api_biter.Plo - -rm -f ./$(DEPDIR)/libserver_biter_la-ldcs_api_listen.Plo - -rm -f ./$(DEPDIR)/libserver_biter_la-ldcs_api_util.Plo - -rm -f ./$(DEPDIR)/libserver_biter_la-ldcs_api_wrapper.Plo - -rm -f ./$(DEPDIR)/libserver_pipe_la-ldcs_api_listen.Plo + -rm -f ./$(DEPDIR)/libserver_pipe_la-ldcs_api_listen.Plo -rm -f ./$(DEPDIR)/libserver_pipe_la-ldcs_api_pipe.Plo -rm -f ./$(DEPDIR)/libserver_pipe_la-ldcs_api_pipe_notify.Plo -rm -f ./$(DEPDIR)/libserver_pipe_la-ldcs_api_util.Plo @@ -702,11 +649,7 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f ./$(DEPDIR)/libserver_biter_la-ldcs_api_biter.Plo - -rm -f ./$(DEPDIR)/libserver_biter_la-ldcs_api_listen.Plo - -rm -f ./$(DEPDIR)/libserver_biter_la-ldcs_api_util.Plo - -rm -f ./$(DEPDIR)/libserver_biter_la-ldcs_api_wrapper.Plo - -rm -f ./$(DEPDIR)/libserver_pipe_la-ldcs_api_listen.Plo + -rm -f ./$(DEPDIR)/libserver_pipe_la-ldcs_api_listen.Plo -rm -f ./$(DEPDIR)/libserver_pipe_la-ldcs_api_pipe.Plo -rm -f ./$(DEPDIR)/libserver_pipe_la-ldcs_api_pipe_notify.Plo -rm -f ./$(DEPDIR)/libserver_pipe_la-ldcs_api_util.Plo diff --git a/src/server/config.h.in b/src/server/config.h.in index 58970484..edc6617e 100644 --- a/src/server/config.h.in +++ b/src/server/config.h.in @@ -12,9 +12,6 @@ /* Back-end directory for communication and housekeeping */ #undef COMMPATH -/* Define if were using biter for client/server communication */ -#undef COMM_BITER - /* Define if were using cobo for server/server communication */ #undef COMM_COBO diff --git a/src/server/configure b/src/server/configure index 9327319e..6f8c1482 100755 --- a/src/server/configure +++ b/src/server/configure @@ -683,8 +683,6 @@ COBO_FALSE COBO_TRUE MSOCKET_FALSE MSOCKET_TRUE -BITER_FALSE -BITER_TRUE PIPES_FALSE PIPES_TRUE SRUN_PATH @@ -849,7 +847,6 @@ with_rsh_launch with_rsh_cmd with_slurm_launch enable_pipes -enable_biter enable_msocket enable_cobo with_python_prefix @@ -1529,7 +1526,6 @@ Optional Features: --enable-slurm-plugin Builds in support for running with SLURM via plugin --enable-flux-plugin Builds in support for running flux via a plugin --enable-pipes Use pipes for server/client communication - --enable-biter Use biter for server/client communication --enable-msocket Use msocket for inter-server communication --enable-cobo Use msocket for inter-server communication --enable-numa Use libnuma to enable numa optimizations @@ -16747,11 +16743,6 @@ if test "${enable_pipes+set}" = set; then : enableval=$enable_pipes; CLIENT_SERVER_COM=pipes; fi -# Check whether --enable-biter was given. -if test "${enable_biter+set}" = set; then : - enableval=$enable_biter; CLIENT_SERVER_COM=biter; -fi - # Check whether --enable-msocket was given. @@ -16773,14 +16764,6 @@ else PIPES_FALSE= fi - if test x$CLIENT_SERVER_COM == xbiter; then - BITER_TRUE= - BITER_FALSE='#' -else - BITER_TRUE='#' - BITER_FALSE= -fi - if test x$SERVER_SERVER_COM == xmsocket; then MSOCKET_TRUE= MSOCKET_FALSE='#' @@ -16802,11 +16785,6 @@ if test "x$CLIENT_SERVER_COM" == "xpipes"; then $as_echo "#define COMM_PIPES 1" >>confdefs.h -fi -if test "x$CLIENT_SERVER_COM" == "xbiter"; then - -$as_echo "#define COMM_BITER 1" >>confdefs.h - fi if test "x$SERVER_SERVER_COM" == "xmsocket"; then @@ -18273,10 +18251,6 @@ if test -z "${PIPES_TRUE}" && test -z "${PIPES_FALSE}"; then as_fn_error $? "conditional \"PIPES\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${BITER_TRUE}" && test -z "${BITER_FALSE}"; then - as_fn_error $? "conditional \"BITER\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${MSOCKET_TRUE}" && test -z "${MSOCKET_FALSE}"; then as_fn_error $? "conditional \"MSOCKET\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/src/server/startup/Makefile.in b/src/server/startup/Makefile.in index 91601597..54c6cff5 100644 --- a/src/server/startup/Makefile.in +++ b/src/server/startup/Makefile.in @@ -94,11 +94,10 @@ pkglibexec_PROGRAMS = spindle_be$(EXEEXT) @COBO_TRUE@am__append_1 = $(top_builddir)/auditserver/libaudit_server_cobo.la @MSOCKET_TRUE@am__append_2 = $(top_builddir)/auditserver/libaudit_server_msocket.la @PIPES_TRUE@am__append_3 = $(top_builddir)/comlib/libserver_pipe.la -@BITER_TRUE@am__append_4 = $(top_builddir)/comlib/libserver_biter.la $(top_builddir)/biter/libbiterd.la -@USE_NUMA_TRUE@am__append_5 = -lnuma -@LINK_LIBSTDCXX_STATIC_TRUE@am__append_6 = $(STATIC_LIBGCC_OPT) -L. -@LMON_DYNAMIC_TRUE@@LMON_TRUE@am__append_7 = $(top_builddir)/launchmon/libbelmon.la $(LAUNCHMON_LIB) $(LAUNCHMON_RMCOMM) -lmonbeapi -lgcrypt -lpthread -@LMON_DYNAMIC_FALSE@@LMON_TRUE@am__append_8 = $(top_builddir)/launchmon/libbelmon.la $(LAUNCHMON_STATIC_LIBS) +@USE_NUMA_TRUE@am__append_4 = -lnuma +@LINK_LIBSTDCXX_STATIC_TRUE@am__append_5 = $(STATIC_LIBGCC_OPT) -L. +@LMON_DYNAMIC_TRUE@@LMON_TRUE@am__append_6 = $(top_builddir)/launchmon/libbelmon.la $(LAUNCHMON_LIB) $(LAUNCHMON_RMCOMM) -lmonbeapi -lgcrypt -lpthread +@LMON_DYNAMIC_FALSE@@LMON_TRUE@am__append_7 = $(top_builddir)/launchmon/libbelmon.la $(LAUNCHMON_STATIC_LIBS) subdir = startup ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ @@ -149,7 +148,7 @@ LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) am__DEPENDENCIES_1 = am__DEPENDENCIES_2 = $(top_builddir)/logging/libspindledlogc.la \ $(am__append_1) $(am__append_2) $(am__append_3) \ - $(am__append_4) $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) libspindlebe_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \ $(am__DEPENDENCIES_1) am__dirstamp = $(am__leading_dot)dirstamp @@ -467,7 +466,7 @@ CORE_SOURCES = spindle_be.cc hookexec.c $(top_srcdir)/../utils/parseloc.c $(top_ CORE_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/comlib -I$(top_srcdir)/cache -I$(top_srcdir)/auditserver -I$(top_srcdir)/../client/beboot -I$(top_srcdir)/../include -I$(top_srcdir)/../utils -I$(top_srcdir)/../cobo -DTRACK_MKDIR -DLOOKUP_PREV_MKDIR -DLIBEXECDIR=\"$(pkglibexecdir)\" CORE_LDADD = $(top_builddir)/logging/libspindledlogc.la -ldl \ $(am__append_1) $(am__append_2) $(am__append_3) \ - $(am__append_4) $(am__append_5) $(GCRYPT_LIBS) + $(am__append_4) $(GCRYPT_LIBS) libspindlebe_la_CPPFLAGS = $(CORE_CPPFLAGS) -DSPINDLEBELIB libspindlebe_la_SOURCES = $(CORE_SOURCES) libspindlebe_la_LIBADD = $(CORE_LDADD) $(MUNGE_DYN_LIB) @@ -475,11 +474,11 @@ libspindlebe_la_LDFLAGS = -version-info $(SPINDLEBE_LIB_VERSION) libspindlebe_static_la_CPPFLAGS = $(libspindlebe_la_CPPFLAGS) libspindlebe_static_la_SOURCES = $(libspindlebe_la_SOURCES) libspindlebe_static_la_LIBADD = $(libspindlebe_la_LIBADD) -spindle_be_LDFLAGS = -static $(am__append_6) +spindle_be_LDFLAGS = -static $(am__append_5) spindle_be_CPPFLAGS = $(CORE_CPPFLAGS) spindle_be_SOURCES = spindle_be_main.cc spindle_be_serial.cc spindle_be_hostbin.cc spindle_be_mpilaunch.cc $(top_srcdir)/../utils/rshlaunch.c $(CORE_SOURCES) -spindle_be_LDADD = $(CORE_LDADD) $(MUNGE_LIBS) $(am__append_7) \ - $(am__append_8) +spindle_be_LDADD = $(CORE_LDADD) $(MUNGE_LIBS) $(am__append_6) \ + $(am__append_7) @LINK_LIBSTDCXX_STATIC_TRUE@CLEANFILES = ./libstdc++.a @LINK_LIBSTDCXX_STATIC_TRUE@BUILT_SOURCES = ./libstdc++.a all: $(BUILT_SOURCES) From bd3c63a6444b97d66a68bec2ef6735e8c91ba1aa Mon Sep 17 00:00:00 2001 From: Barry Rountree Date: Fri, 31 Jul 2026 00:20:07 -0700 Subject: [PATCH 11/21] [prune-config] Removes --enable-pipes and generic comm layer. Per Claude Code + Opus. --- configure.common.ac | 15 +- src/client/auditclient/Makefile.am | 6 +- src/client/beboot/Makefile.am | 6 +- src/client/client/Makefile.am | 6 +- src/client/client_comlib/Makefile.am | 9 +- src/client/client_comlib/client_api_pipe.c | 122 ++++++++-------- src/client/client_comlib/client_wrappers.c | 81 ----------- src/client/instrclient/Makefile.am | 6 +- src/client/subaudit/Makefile.am | 6 +- src/include/ldcs_api.h | 7 +- src/server/comlib/Makefile.am | 8 +- src/server/comlib/ldcs_api_pipe.c | 162 ++++++++++----------- src/server/comlib/ldcs_api_wrapper.c | 93 ------------ src/server/startup/Makefile.am | 2 - 14 files changed, 156 insertions(+), 373 deletions(-) delete mode 100644 src/client/client_comlib/client_wrappers.c delete mode 100644 src/server/comlib/ldcs_api_wrapper.c diff --git a/configure.common.ac b/configure.common.ac index 7ff073da..91f76cfd 100644 --- a/configure.common.ac +++ b/configure.common.ac @@ -196,14 +196,8 @@ fi AC_DEFINE_UNQUOTED([BROKEN_SRUN],[$BROKEN_SRUN],[Whether we are using a broken srun]) AC_DEFINE_UNQUOTED([HAVE_SRUN_EXTERNAL_LAUNCHER],[$HAVE_EXT_LAUNCHER],[Whether srun supports --external-launcher]) -#Runmode detection (pipe/socket or cobo/msocket communications) -CLIENT_SERVER_COM=pipes - +#Runmode detection (cobo/msocket communications for server/server) SERVER_SERVER_COM=cobo -AC_ARG_ENABLE(pipes, - [AS_HELP_STRING([--enable-pipes],[Use pipes for server/client communication])], - [CLIENT_SERVER_COM=pipes;],) - AC_ARG_ENABLE(msocket, [AS_HELP_STRING([--enable-msocket],[Use msocket for inter-server communication])], @@ -212,13 +206,10 @@ AC_ARG_ENABLE(cobo, [AS_HELP_STRING([--enable-cobo],[Use msocket for inter-server communication])], [SERVER_SERVER_COM=cobo;],) -AM_CONDITIONAL([PIPES], [test x$CLIENT_SERVER_COM == xpipes]) AM_CONDITIONAL([MSOCKET], [test x$SERVER_SERVER_COM == xmsocket]) AM_CONDITIONAL([COBO], [test x$SERVER_SERVER_COM == xcobo]) -if test "x$CLIENT_SERVER_COM" == "xpipes"; then - AC_DEFINE([COMM_PIPES],[1],[Define if were using pipes for client/server communication]) -fi +AC_DEFINE([COMM_PIPES],[1],[Client/server communication uses pipes]) if test "x$SERVER_SERVER_COM" == "xmsocket"; then AC_DEFINE([COMM_MSOCKET],[1],[Define if were using msocket for server/server communication]) fi @@ -226,7 +217,7 @@ if test "x$SERVER_SERVER_COM" == "xcobo"; then AC_DEFINE([COMM_COBO],[1],[Define if were using cobo for server/server communication]) fi -AC_MSG_NOTICE([Communication is $CLIENT_SERVER_COM/$SERVER_SERVER_COM]) +AC_MSG_NOTICE([Communication is pipes/$SERVER_SERVER_COM]) #Architecture detection if test "x$target_cpu" == "xx86_64"; then diff --git a/src/client/auditclient/Makefile.am b/src/client/auditclient/Makefile.am index addaffc7..4b2e7108 100644 --- a/src/client/auditclient/Makefile.am +++ b/src/client/auditclient/Makefile.am @@ -1,8 +1,4 @@ -pkglib_LTLIBRARIES = - -if PIPES -pkglib_LTLIBRARIES += libspindle_audit_pipe.la -endif +pkglib_LTLIBRARIES = libspindle_audit_pipe.la AM_CFLAGS = -fvisibility=hidden diff --git a/src/client/beboot/Makefile.am b/src/client/beboot/Makefile.am index e3c0b22a..e76477c9 100644 --- a/src/client/beboot/Makefile.am +++ b/src/client/beboot/Makefile.am @@ -2,9 +2,5 @@ pkglibexec_PROGRAMS = spindle_bootstrap spindle_bootstrap_LDFLAGS = $(AM_LDFLAGS) $(STATICFLAG) spindle_bootstrap_CPPFLAGS = $(AM_CPPFLAGS) -DLIBEXECDIR=\"$(pkglibexecdir)\" -DPROGLIBDIR=\"$(pkglibdir)\" -I$(top_srcdir)/../include -I$(top_srcdir)/../logging -I$(top_srcdir)/client_comlib -I$(top_srcdir)/client -I$(top_srcdir)/shm_cache -I$(top_srcdir)/../utils -spindle_bootstrap_LDADD = $(top_builddir)/logging/libspindleclogc.la $(top_builddir)/shm_cache/libshmcache.la +spindle_bootstrap_LDADD = $(top_builddir)/logging/libspindleclogc.la $(top_builddir)/shm_cache/libshmcache.la $(top_builddir)/client_comlib/libclient_pipe.la spindle_bootstrap_SOURCES = spindle_bootstrap.c $(top_srcdir)/../utils/parseloc.c $(top_srcdir)/../utils/spindle_mkdir.c $(top_srcdir)/../utils/getcpu.c $(top_srcdir)/client/exec_util.c $(top_srcdir)/client/lookup.c $(top_srcdir)/../utils/fileutil.c - -if PIPES -spindle_bootstrap_LDADD += $(top_builddir)/client_comlib/libclient_pipe.la -endif diff --git a/src/client/client/Makefile.am b/src/client/client/Makefile.am index c7a5181e..74fd1a98 100644 --- a/src/client/client/Makefile.am +++ b/src/client/client/Makefile.am @@ -1,10 +1,6 @@ -noinst_LTLIBRARIES = libspindle_audit.la +noinst_LTLIBRARIES = libspindle_audit.la libspindlec_pipe.la #noinst_LTLIBRARIES += libspindle_instr.la -if PIPES -noinst_LTLIBRARIES += libspindlec_pipe.la -endif - AM_CFLAGS = -fvisibility=hidden AM_CPPFLAGS = -I$(top_srcdir)/../logging -I$(top_srcdir)/client_comlib -I$(top_srcdir)/../include -I$(top_srcdir)/shm_cache -I$(top_srcdir)/subaudit -I$(top_srcdir)/../utils -I$(top_srcdir)/auditclient -I$(top_srcdir)/client -I$(top_srcdir)/crash_handler diff --git a/src/client/client_comlib/Makefile.am b/src/client/client_comlib/Makefile.am index ffb48d5a..056839f9 100644 --- a/src/client/client_comlib/Makefile.am +++ b/src/client/client_comlib/Makefile.am @@ -1,11 +1,6 @@ -noinst_LTLIBRARIES = +noinst_LTLIBRARIES = libclient_pipe.la AM_CPPFLAGS = -I$(top_srcdir)/../logging -I$(top_srcdir)/../include - -BASE_SRCS = client_api.c client_heap.c client_wrappers.c - AM_CFLAGS = -fvisibility=hidden -noinst_LTLIBRARIES += libclient_pipe.la -libclient_pipe_la_CPPFLAGS = $(AM_CPPFLAGS) -DCOMM=pipe -libclient_pipe_la_SOURCES = client_api_pipe.c $(BASE_SRCS) +libclient_pipe_la_SOURCES = client_api_pipe.c client_api.c client_heap.c diff --git a/src/client/client_comlib/client_api_pipe.c b/src/client/client_comlib/client_api_pipe.c index f7159951..443ef420 100644 --- a/src/client/client_comlib/client_api_pipe.c +++ b/src/client/client_comlib/client_api_pipe.c @@ -33,9 +33,9 @@ Place, Suite 330, Boston, MA 02111-1307 USA #include "spindle_launch.h" #define MAX_FD 1 -static struct fdlist_entry_t fdlist_pipe[MAX_FD]; +static struct fdlist_entry_t fdlist[MAX_FD]; -static int get_new_fd_pipe() +static int get_new_fd() { /* Each client should establish one connection, just return 0 as our fd */ return 0; @@ -58,7 +58,7 @@ static int ldcs_mkfifo(char *fifo) return 0; } -static int write_pipe(int fd, const void *data, int bytes) +static int write_fifo(int fd, const void *data, int bytes) { int left,bsumwrote; ssize_t bwrite, bwrote; @@ -82,7 +82,7 @@ static int write_pipe(int fd, const void *data, int bytes) return bsumwrote; } -static int read_pipe(int fd, void *data, int bytes) +static int read_fifo(int fd, void *data, int bytes) { int left; ssize_t btoread, bread; @@ -187,7 +187,7 @@ static int remap_to_high_fd(int fd) #endif } -int client_open_connection_pipe(char* location, number_t number) +int client_open_connection(char* location, number_t number) { (void)number; int fd, result; @@ -198,11 +198,11 @@ int client_open_connection_pipe(char* location, number_t number) int find_r_fd = 0, find_w_fd = 0; debug_printf("Client creating pipe for connection to server\n"); - fd = get_new_fd_pipe(); + fd = get_new_fd(); if (fd < 0) return -1; - fdlist_pipe[fd].type = LDCS_PIPE_FD_TYPE_CONN; + fdlist[fd].type = LDCS_PIPE_FD_TYPE_CONN; /* wait for directory (at most one minute) */ stat_cnt = 0; @@ -224,8 +224,8 @@ int client_open_connection_pipe(char* location, number_t number) find_r_fd = 1; else if (result == -1) return -1; - fdlist_pipe[fd].in_fn = spindle_strdup(fifo); - assert(fdlist_pipe[fd].in_fn); + fdlist[fd].in_fn = spindle_strdup(fifo); + assert(fdlist[fd].in_fn); /* create outgoing fifo */ sprintf(fifo, "%s/spindle_comm/fifo-%d-1", location, getpid()); @@ -234,45 +234,45 @@ int client_open_connection_pipe(char* location, number_t number) find_w_fd = 1; else if (result == -1) return -1; - fdlist_pipe[fd].out_fn = spindle_strdup(fifo); + fdlist[fd].out_fn = spindle_strdup(fifo); /* open fifos */ - fdlist_pipe[fd].in_fd = fdlist_pipe[fd].out_fd = 0; + fdlist[fd].in_fd = fdlist[fd].out_fd = 0; if (find_w_fd || find_r_fd) { /* Fifos already exist. Find existing open fds. */ debug_printf3("Finding existing fds for %s and/or %s\n", - fdlist_pipe[fd].out_fn, fdlist_pipe[fd].in_fn); - find_existing_fds(find_r_fd ? fdlist_pipe[fd].in_fn : NULL, - find_w_fd ? fdlist_pipe[fd].out_fn : NULL, - &fdlist_pipe[fd].in_fd, &fdlist_pipe[fd].out_fd); + fdlist[fd].out_fn, fdlist[fd].in_fn); + find_existing_fds(find_r_fd ? fdlist[fd].in_fn : NULL, + find_w_fd ? fdlist[fd].out_fn : NULL, + &fdlist[fd].in_fd, &fdlist[fd].out_fd); } - if (fdlist_pipe[fd].in_fd == 0) { - debug_printf3("Opening input fifo %s\n", fdlist_pipe[fd].in_fn); - fdlist_pipe[fd].in_fd = open(fdlist_pipe[fd].in_fn, O_RDONLY); - fdlist_pipe[fd].in_fd = remap_to_high_fd(fdlist_pipe[fd].in_fd); + if (fdlist[fd].in_fd == 0) { + debug_printf3("Opening input fifo %s\n", fdlist[fd].in_fn); + fdlist[fd].in_fd = open(fdlist[fd].in_fn, O_RDONLY); + fdlist[fd].in_fd = remap_to_high_fd(fdlist[fd].in_fd); } - debug_printf3("Opened input fifo %s = %d\n", fdlist_pipe[fd].in_fn, fdlist_pipe[fd].in_fd); - if (fdlist_pipe[fd].out_fd == 0) { - debug_printf3("Opening output fifo %s\n", fdlist_pipe[fd].out_fn); - fdlist_pipe[fd].out_fd = open(fdlist_pipe[fd].out_fn, O_WRONLY); - fdlist_pipe[fd].out_fd = remap_to_high_fd(fdlist_pipe[fd].out_fd); + debug_printf3("Opened input fifo %s = %d\n", fdlist[fd].in_fn, fdlist[fd].in_fd); + if (fdlist[fd].out_fd == 0) { + debug_printf3("Opening output fifo %s\n", fdlist[fd].out_fn); + fdlist[fd].out_fd = open(fdlist[fd].out_fn, O_WRONLY); + fdlist[fd].out_fd = remap_to_high_fd(fdlist[fd].out_fd); } - debug_printf3("Opened output fifo %s = %d\n", fdlist_pipe[fd].out_fn, fdlist_pipe[fd].out_fd); + debug_printf3("Opened output fifo %s = %d\n", fdlist[fd].out_fn, fdlist[fd].out_fd); /* Check opened fifos */ - if (fdlist_pipe[fd].in_fd == -1) { - err_printf("Error opening input fifo %s: %s\n", fdlist_pipe[fd].in_fn, strerror(errno)); + if (fdlist[fd].in_fd == -1) { + err_printf("Error opening input fifo %s: %s\n", fdlist[fd].in_fn, strerror(errno)); return -1; } - if (fdlist_pipe[fd].out_fd == -1) { - err_printf("Error opening output fifo %s: %s\n", fdlist_pipe[fd].out_fn, strerror(errno)); + if (fdlist[fd].out_fd == -1) { + err_printf("Error opening output fifo %s: %s\n", fdlist[fd].out_fn, strerror(errno)); return -1; } return fd; } -int client_register_connection_pipe(char *connection_str) +int client_register_connection(char *connection_str) { char *in_name = NULL, *out_name = NULL; int in_fd, out_fd, result; @@ -284,27 +284,27 @@ int client_register_connection_pipe(char *connection_str) return -1; } - int fd = get_new_fd_pipe(); + int fd = get_new_fd(); if (fd < 0) { err_printf("Could not create new pipe\n"); return -1; } - fdlist_pipe[fd].type = LDCS_PIPE_FD_TYPE_CONN; - fdlist_pipe[fd].in_fn = in_name; - fdlist_pipe[fd].out_fn = out_name; - fdlist_pipe[fd].in_fd = in_fd; - fdlist_pipe[fd].out_fd = out_fd; + fdlist[fd].type = LDCS_PIPE_FD_TYPE_CONN; + fdlist[fd].in_fn = in_name; + fdlist[fd].out_fn = out_name; + fdlist[fd].in_fd = in_fd; + fdlist[fd].out_fd = out_fd; return fd; } -char *client_get_connection_string_pipe(int fd) +char *client_get_connection_string(int fd) { - char *in_name = fdlist_pipe[fd].in_fn; - char *out_name = fdlist_pipe[fd].out_fn; - int in_fd = fdlist_pipe[fd].in_fd; - int out_fd = fdlist_pipe[fd].out_fd; + char *in_name = fdlist[fd].in_fn; + char *out_name = fdlist[fd].out_fn; + int in_fd = fdlist[fd].in_fd; + int out_fd = fdlist[fd].out_fd; int slen = strlen(in_name) + strlen(out_name) + 64; char *str = (char *) spindle_malloc(slen); @@ -314,7 +314,7 @@ char *client_get_connection_string_pipe(int fd) return str; } -int client_send_msg_pipe(int fd, ldcs_message_t *msg) { +int client_send_msg(int fd, ldcs_message_t *msg) { int result; @@ -322,21 +322,21 @@ int client_send_msg_pipe(int fd, ldcs_message_t *msg) { debug_printf3("sending message of size len=%lu\n", msg->header.len); - result = write_pipe(fdlist_pipe[fd].out_fd, &msg->header, sizeof(msg->header)); + result = write_fifo(fdlist[fd].out_fd, &msg->header, sizeof(msg->header)); if (result == -1) return -1; if (msg->header.len == 0) return 0; - result = write_pipe(fdlist_pipe[fd].out_fd, (void *) msg->data, msg->header.len); + result = write_fifo(fdlist[fd].out_fd, (void *) msg->data, msg->header.len); if (result == -1) return -1; return 0; } -static int client_recv_msg_pipe(int fd, ldcs_message_t *msg, ldcs_read_block_t block, int is_dynamic) +static int client_recv_msg_internal(int fd, ldcs_message_t *msg, ldcs_read_block_t block, int is_dynamic) { int result; msg->header.type=LDCS_MSG_UNKNOWN; @@ -346,7 +346,7 @@ static int client_recv_msg_pipe(int fd, ldcs_message_t *msg, ldcs_read_block_t b assert(block == LDCS_READ_BLOCK); /* Non-blocking isn't implemented yet */ debug_printf3("Reading %d bytes for header from pipe\n", (int) sizeof(msg->header)); - result = read_pipe(fdlist_pipe[fd].in_fd, &msg->header, sizeof(msg->header)); + result = read_fifo(fdlist[fd].in_fd, &msg->header, sizeof(msg->header)); if (result == -1) { return -1; } @@ -361,56 +361,56 @@ static int client_recv_msg_pipe(int fd, ldcs_message_t *msg, ldcs_read_block_t b } debug_printf3("Reading %lu bytes for payload from pipe\n", msg->header.len); - result = read_pipe(fdlist_pipe[fd].in_fd, msg->data, msg->header.len); + result = read_fifo(fdlist[fd].in_fd, msg->data, msg->header.len); return result; } -int client_recv_msg_dynamic_pipe(int fd, ldcs_message_t *msg, ldcs_read_block_t block) +int client_recv_msg_dynamic(int fd, ldcs_message_t *msg, ldcs_read_block_t block) { - return client_recv_msg_pipe(fd, msg, block, 1); + return client_recv_msg_internal(fd, msg, block, 1); } -int client_recv_msg_static_pipe(int fd, ldcs_message_t *msg, ldcs_read_block_t block) +int client_recv_msg_static(int fd, ldcs_message_t *msg, ldcs_read_block_t block) { - return client_recv_msg_pipe(fd, msg, block, 0); + return client_recv_msg_internal(fd, msg, block, 0); } int is_client_fd(int connfd, int fd) { - return (fdlist_pipe[connfd].in_fd == fd || fdlist_pipe[connfd].out_fd == fd); + return (fdlist[connfd].in_fd == fd || fdlist[connfd].out_fd == fd); } /* Get raw FDs for use in signal handlers. We can't use the send/recv functions here in signal handlers because they are not async-signal-safe. */ -int client_get_raw_fds_pipe(int fd, int *read_fd, int *write_fd) +int client_get_raw_fds(int fd, int *read_fd, int *write_fd) { if (fd < 0 || fd >= MAX_FD) { *read_fd = -1; *write_fd = -1; return -1; } - *read_fd = fdlist_pipe[fd].in_fd; - *write_fd = fdlist_pipe[fd].out_fd; + *read_fd = fdlist[fd].in_fd; + *write_fd = fdlist[fd].out_fd; return 0; } -int client_close_connection_pipe(int fd) +int client_close_connection(int fd) { int result; assert(fd >= 0 && fd < MAX_FD); debug_printf2("Closing client connections. Closing FDs on input %s (%d) and output %s (%d)\n", - fdlist_pipe[fd].in_fn, fdlist_pipe[fd].in_fd, fdlist_pipe[fd].out_fn, fdlist_pipe[fd].out_fd); + fdlist[fd].in_fn, fdlist[fd].in_fd, fdlist[fd].out_fn, fdlist[fd].out_fd); - result = close(fdlist_pipe[fd].in_fd); + result = close(fdlist[fd].in_fd); if(result != 0) { - err_printf("Error while closing fifo %s errno=%d (%s)\n", fdlist_pipe[fd].in_fn, errno, strerror(errno)); + err_printf("Error while closing fifo %s errno=%d (%s)\n", fdlist[fd].in_fn, errno, strerror(errno)); } - result = close(fdlist_pipe[fd].out_fd); + result = close(fdlist[fd].out_fd); if(result != 0) { - err_printf("Error while closing fifo %s errno=%d (%s)\n", fdlist_pipe[fd].out_fn, errno, strerror(errno)); + err_printf("Error while closing fifo %s errno=%d (%s)\n", fdlist[fd].out_fn, errno, strerror(errno)); } return 0; diff --git a/src/client/client_comlib/client_wrappers.c b/src/client/client_comlib/client_wrappers.c deleted file mode 100644 index 0ef517eb..00000000 --- a/src/client/client_comlib/client_wrappers.c +++ /dev/null @@ -1,81 +0,0 @@ -/* - This file is part of Spindle. For copyright information see the COPYRIGHT - file in the top level directory, or at - https://github.com/hpc/Spindle/blob/master/COPYRIGHT - - This program is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License (as published by the Free Software - Foundation) version 2.1 dated February 1999. This program is distributed in the - hope that it will be useful, but WITHOUT ANY WARRANTY; without even the IMPLIED - WARRANTY OF MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms - and conditions of the GNU Lesser General Public License for more details. You should - have received a copy of the GNU Lesser General Public License along with this - program; if not, write to the Free Software Foundation, Inc., 59 Temple - Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -#include "ldcs_api.h" -#include "config.h" -#include "spindle_launch.h" - -#if !defined(COMM) -#if defined(COMM_PIPES) -#define COMM pipe -#else -#error Unknown communication type -#endif -#endif - -#define RENAME3(X, Y) X ## _ ## Y -#define RENAME2(X, Y) RENAME3(X, Y) -#define RENAME(X) RENAME2(X, COMM) - -extern int RENAME(client_open_connection) (char* location, number_t number); -extern int RENAME(client_close_connection) (int connid); -extern int RENAME(client_register_connection) (char *connection_str); -extern char *RENAME(client_get_connection_string) (int fd); -extern int RENAME(client_send_msg) (int connid, ldcs_message_t * msg); -extern int RENAME(client_recv_msg_static) (int fd, ldcs_message_t *msg, ldcs_read_block_t block); -extern int RENAME(client_recv_msg_dynamic) (int fd, ldcs_message_t *msg, ldcs_read_block_t block); -extern int RENAME(client_get_raw_fds) (int fd, int *read_fd, int *write_fd); - -int client_open_connection(char* location, number_t number) -{ - return RENAME(client_open_connection) (location, number); -} - -int client_close_connection(int connid) -{ - return RENAME(client_close_connection) (connid); -} - -int client_register_connection(char *connection_str) -{ - return RENAME(client_register_connection) (connection_str); -} - -char *client_get_connection_string(int fd) -{ - return RENAME(client_get_connection_string) (fd); -} - -int client_send_msg(int connid, ldcs_message_t * msg) -{ - return RENAME(client_send_msg) (connid, msg); -} - -int client_recv_msg_static(int fd, ldcs_message_t *msg, ldcs_read_block_t block) -{ - return RENAME(client_recv_msg_static) (fd, msg, block); -} - -int client_recv_msg_dynamic(int fd, ldcs_message_t *msg, ldcs_read_block_t block) -{ - return RENAME(client_recv_msg_dynamic) (fd, msg, block); -} - -int client_get_raw_fds(int fd, int *read_fd, int *write_fd) -{ - return RENAME(client_get_raw_fds) (fd, read_fd, write_fd); -} - diff --git a/src/client/instrclient/Makefile.am b/src/client/instrclient/Makefile.am index a061e9b7..a9f7d814 100644 --- a/src/client/instrclient/Makefile.am +++ b/src/client/instrclient/Makefile.am @@ -1,8 +1,4 @@ -pkglibexec_LTLIBRARIES = - -if PIPES -pkglibexec_LTLIBRARIES += libspindle_instr_pipe.la -endif +pkglibexec_LTLIBRARIES = libspindle_instr_pipe.la AM_CPPFLAGS = -I$(top_srcdir)/../logging -I$(top_srcdir)/../include -I$(top_srcdir)/client -I$(top_srcdir)/client_comlib diff --git a/src/client/subaudit/Makefile.am b/src/client/subaudit/Makefile.am index 48541622..b9365db8 100644 --- a/src/client/subaudit/Makefile.am +++ b/src/client/subaudit/Makefile.am @@ -1,8 +1,4 @@ -pkglib_LTLIBRARIES = libspindleint.la - -if PIPES -pkglib_LTLIBRARIES += libspindle_subaudit_pipe.la -endif +pkglib_LTLIBRARIES = libspindleint.la libspindle_subaudit_pipe.la AM_CFLAGS = -fvisibility=hidden diff --git a/src/include/ldcs_api.h b/src/include/ldcs_api.h index 220eb349..4e62b51f 100644 --- a/src/include/ldcs_api.h +++ b/src/include/ldcs_api.h @@ -129,15 +129,15 @@ struct ldcs_message_struct typedef struct ldcs_message_struct ldcs_message_t; int ldcs_send_msg(int connid, ldcs_message_t * msg); -ldcs_message_t * ldcs_recv_msg(int fd, ldcs_read_block_t block); int ldcs_recv_msg_static(int fd, ldcs_message_t *msg, ldcs_read_block_t block); int ldcs_get_aux_fd(); - int ldcs_create_server(char* location, number_t number); int ldcs_open_server_connection(int serverid); int ldcs_open_server_connections(int fd, int nc, int *more_avail); int ldcs_close_server_connection(int connid); int ldcs_destroy_server(int cid); +int ldcs_get_fd (int fd); +ldcs_message_t * ldcs_recv_msg(int fd, ldcs_read_block_t block); int ldcs_select(int serverid); int ldcs_msg_init(ldcs_message_t *msg); @@ -145,9 +145,6 @@ int ldcs_msg_free(ldcs_message_t **msg); ldcs_message_t* ldcs_msg_new(); ldcs_message_t* ldcs_msg_copy(ldcs_message_t *msg); -/* get info */ -int ldcs_get_fd (int fd); - /* internal */ char* _message_type_to_str (ldcs_message_ids_t type); void _error(const char *msg); diff --git a/src/server/comlib/Makefile.am b/src/server/comlib/Makefile.am index 7c376bac..2b3f94f1 100644 --- a/src/server/comlib/Makefile.am +++ b/src/server/comlib/Makefile.am @@ -1,9 +1,5 @@ -noinst_LTLIBRARIES = +noinst_LTLIBRARIES = libserver_pipe.la AM_CPPFLAGS = -I$(top_srcdir)/../logging -I$(top_srcdir)/../include -I$(top_srcdir)/auditserver -I$(top_srcdir)/cache -BASE_SRCS = ldcs_api_util.c ldcs_api_listen.c ldcs_api_wrapper.c - -noinst_LTLIBRARIES += libserver_pipe.la -libserver_pipe_la_CPPFLAGS = $(AM_CPPFLAGS) -Dcomm=pipe -libserver_pipe_la_SOURCES = ldcs_api_pipe.c ldcs_api_pipe_notify.c $(BASE_SRCS) +libserver_pipe_la_SOURCES = ldcs_api_pipe.c ldcs_api_pipe_notify.c ldcs_api_util.c ldcs_api_listen.c diff --git a/src/server/comlib/ldcs_api_pipe.c b/src/server/comlib/ldcs_api_pipe.c index 6b49f296..9538f5d0 100644 --- a/src/server/comlib/ldcs_api_pipe.c +++ b/src/server/comlib/ldcs_api_pipe.c @@ -44,7 +44,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA #define FDLIST_INITIAL_SIZE 32 -static struct fdlist_entry_t *fdlist_pipe = NULL; +static struct fdlist_entry_t *fdlist = NULL; static int fdlist_pipe_cnt = 0; static int fdlist_pipe_size = 0; @@ -53,18 +53,18 @@ int get_new_fd_pipe() int i; if (fdlist_pipe_cnt == fdlist_pipe_size) { fdlist_pipe_size = fdlist_pipe_size ? fdlist_pipe_size * 2 : FDLIST_INITIAL_SIZE; - fdlist_pipe = realloc(fdlist_pipe, fdlist_pipe_size * sizeof(struct fdlist_entry_t)); - if (!fdlist_pipe) { - err_printf("Failed to allocate fdlist_pipe of size %d\n", fdlist_pipe_size); + fdlist = realloc(fdlist, fdlist_pipe_size * sizeof(struct fdlist_entry_t)); + if (!fdlist) { + err_printf("Failed to allocate fdlist of size %d\n", fdlist_pipe_size); assert(0); } for (i = fdlist_pipe_cnt; i < fdlist_pipe_size; i++) { - fdlist_pipe[i].inuse = 0; + fdlist[i].inuse = 0; } } for (i = 0; i < fdlist_pipe_size; i++) { - if (!fdlist_pipe[i].inuse) { - fdlist_pipe[i].inuse = 1; + if (!fdlist[i].inuse) { + fdlist[i].inuse = 1; fdlist_pipe_cnt++; return i; } @@ -75,23 +75,23 @@ int get_new_fd_pipe() } void free_fd_pipe (int fd) { - fdlist_pipe[fd].inuse = 0; + fdlist[fd].inuse = 0; fdlist_pipe_cnt--; - if (fdlist_pipe[fd].in_fn) - free(fdlist_pipe[fd].in_fn); - if (fdlist_pipe[fd].out_fn) - free(fdlist_pipe[fd].out_fn); + if (fdlist[fd].in_fn) + free(fdlist[fd].in_fn); + if (fdlist[fd].out_fn) + free(fdlist[fd].out_fn); } -int ldcs_get_fd_pipe (int fd) { +int ldcs_get_fd (int fd) { int realfd=-1; if ((fd<0) || (fd>fdlist_pipe_size) ) _error("wrong fd"); - if(fdlist_pipe[fd].inuse) { - if(fdlist_pipe[fd].type==LDCS_PIPE_FD_TYPE_SERVER) { - realfd=ldcs_notify_get_fd(fdlist_pipe[fd].notify_fd); + if(fdlist[fd].inuse) { + if(fdlist[fd].type==LDCS_PIPE_FD_TYPE_SERVER) { + realfd=ldcs_notify_get_fd(fdlist[fd].notify_fd); } - if(fdlist_pipe[fd].type==LDCS_PIPE_FD_TYPE_CONN) { - realfd=fdlist_pipe[fd].in_fd; + if(fdlist[fd].type==LDCS_PIPE_FD_TYPE_CONN) { + realfd=fdlist[fd].in_fd; } } return(realfd); @@ -100,7 +100,7 @@ int ldcs_get_fd_pipe (int fd) { extern int spindle_mkdir(char *orig_path); -int ldcs_create_server_pipe(char* location, number_t number) { +int ldcs_create_server(char* location, number_t number) { (void)number; int fd; @@ -123,27 +123,27 @@ int ldcs_create_server_pipe(char* location, number_t number) { /* FiFos will be created by client */ /* -> setup notify to get new connections */ - fdlist_pipe[fd].type=LDCS_PIPE_FD_TYPE_SERVER; - fdlist_pipe[fd].notify_fd=ldcs_notify_init(staging_dir); - fdlist_pipe[fd].conn_list=NULL; - fdlist_pipe[fd].conn_list_size=0; - fdlist_pipe[fd].conn_list_used=0; - fdlist_pipe[fd].path=staging_dir; - fdlist_pipe[fd].in_fn=NULL; - fdlist_pipe[fd].out_fn=NULL; + fdlist[fd].type=LDCS_PIPE_FD_TYPE_SERVER; + fdlist[fd].notify_fd=ldcs_notify_init(staging_dir); + fdlist[fd].conn_list=NULL; + fdlist[fd].conn_list_size=0; + fdlist[fd].conn_list_used=0; + fdlist[fd].path=staging_dir; + fdlist[fd].in_fn=NULL; + fdlist[fd].out_fn=NULL; chmod(readypath, S_IRUSR | S_IWUSR); return(fd); } -int ldcs_open_server_connection_pipe(int fd) { +int ldcs_open_server_connection(int fd) { /* */ (void)fd; return(-1); } -int ldcs_open_server_connections_pipe(int fd, int nc, int *more_avail) { +int ldcs_open_server_connections(int fd, int nc, int *more_avail) { (void)nc; int fifoid, inout, connfd; char fifo[MAX_PATH_LEN]; @@ -155,7 +155,7 @@ int ldcs_open_server_connections_pipe(int fd, int nc, int *more_avail) { /* wait until a -1 fifo is created */ for (;;) { - fifo_file=ldcs_notify_get_next_file(fdlist_pipe[fd].notify_fd); + fifo_file=ldcs_notify_get_next_file(fdlist[fd].notify_fd); if(fifo_file) { inout = 0; pid = 0; sscanf(fifo_file, "fifo-%d-%d", &pid, &inout); @@ -168,81 +168,81 @@ int ldcs_open_server_connections_pipe(int fd, int nc, int *more_avail) { connfd=get_new_fd_pipe(); if(connfd<0) return(-1); - fdlist_pipe[connfd].serverfd=fd; - fdlist_pipe[connfd].type=LDCS_PIPE_FD_TYPE_CONN; + fdlist[connfd].serverfd=fd; + fdlist[connfd].type=LDCS_PIPE_FD_TYPE_CONN; - sprintf(fifo, "%s/fifo-%d-0", fdlist_pipe[fd].path , pid ); - fdlist_pipe[connfd].out_fn = strdup(fifo); + sprintf(fifo, "%s/fifo-%d-0", fdlist[fd].path , pid ); + fdlist[connfd].out_fn = strdup(fifo); - sprintf(fifo, "%s/fifo-%d-1", fdlist_pipe[fd].path , pid ); - fdlist_pipe[connfd].in_fn = strdup(fifo); + sprintf(fifo, "%s/fifo-%d-1", fdlist[fd].path , pid ); + fdlist[connfd].in_fn = strdup(fifo); - debug_printf3("before open fifo '%s'\n",fdlist_pipe[connfd].out_fn); - if (-1 == (fifoid = open(fdlist_pipe[connfd].out_fn, O_WRONLY))) _error("open fifo failed"); + debug_printf3("before open fifo '%s'\n",fdlist[connfd].out_fn); + if (-1 == (fifoid = open(fdlist[connfd].out_fn, O_WRONLY))) _error("open fifo failed"); debug_printf3("after open fifo (out): -> fifoid=%d\n",fifoid); - fdlist_pipe[connfd].out_fd=fifoid; + fdlist[connfd].out_fd=fifoid; - debug_printf3("before open fifo '%s'\n",fdlist_pipe[connfd].in_fn); - if (-1 == (fifoid = open(fdlist_pipe[connfd].in_fn, O_RDONLY|O_NONBLOCK))) _error("open fifo failed"); - /* if (-1 == (fifoid = open(fdlist_pipe[connfd].in_fn, O_RDONLY))) _error("open fifo failed"); */ + debug_printf3("before open fifo '%s'\n",fdlist[connfd].in_fn); + if (-1 == (fifoid = open(fdlist[connfd].in_fn, O_RDONLY|O_NONBLOCK))) _error("open fifo failed"); + /* if (-1 == (fifoid = open(fdlist[connfd].in_fn, O_RDONLY))) _error("open fifo failed"); */ debug_printf3("after open fifo (in) : -> fifoid=%d\n",fifoid); - fdlist_pipe[connfd].in_fd=fifoid; + fdlist[connfd].in_fd=fifoid; /* add info to server fd data structure */ - fdlist_pipe[fd].conn_list_used++; - if (fdlist_pipe[fd].conn_list_used > fdlist_pipe[fd].conn_list_size) { - fdlist_pipe[fd].conn_list = realloc(fdlist_pipe[fd].conn_list, - (fdlist_pipe[fd].conn_list_used + 15) * sizeof(int) + fdlist[fd].conn_list_used++; + if (fdlist[fd].conn_list_used > fdlist[fd].conn_list_size) { + fdlist[fd].conn_list = realloc(fdlist[fd].conn_list, + (fdlist[fd].conn_list_used + 15) * sizeof(int) ); - fdlist_pipe[fd].conn_list_size = fdlist_pipe[fd].conn_list_used + 15; + fdlist[fd].conn_list_size = fdlist[fd].conn_list_used + 15; } - fdlist_pipe[fd].conn_list[fdlist_pipe[fd].conn_list_used-1]=connfd; + fdlist[fd].conn_list[fdlist[fd].conn_list_used-1]=connfd; - *more_avail=ldcs_notify_more_avail(fdlist_pipe[fd].notify_fd); + *more_avail=ldcs_notify_more_avail(fdlist[fd].notify_fd); return(connfd); }; -int ldcs_close_server_connection_pipe(int fd) { +int ldcs_close_server_connection(int fd) { int rc=0, serverfd, c; int result; struct stat st; if ((fd<0) || (fd>fdlist_pipe_size) ) _error("wrong fd"); - debug_printf3(" closing fd %d for conn %d, closing connection\n",fdlist_pipe[fd].in_fd,fd); - close(fdlist_pipe[fd].in_fd); - debug_printf3(" closing fd %d for conn %d, closing connection\n",fdlist_pipe[fd].out_fd,fd); - close(fdlist_pipe[fd].out_fd); + debug_printf3(" closing fd %d for conn %d, closing connection\n",fdlist[fd].in_fd,fd); + close(fdlist[fd].in_fd); + debug_printf3(" closing fd %d for conn %d, closing connection\n",fdlist[fd].out_fd,fd); + close(fdlist[fd].out_fd); - result = stat(fdlist_pipe[fd].in_fn, &st); + result = stat(fdlist[fd].in_fn, &st); if (result == -1) - err_printf("stat of %s failed: %s\n", fdlist_pipe[fd].in_fn, strerror(errno)); + err_printf("stat of %s failed: %s\n", fdlist[fd].in_fn, strerror(errno)); if (S_ISFIFO(st.st_mode)) { - result = unlink(fdlist_pipe[fd].in_fn); + result = unlink(fdlist[fd].in_fn); if(result != 0) { - debug_printf3("error while unlink fifo %s errno=%d (%s)\n", fdlist_pipe[fd].in_fn, + debug_printf3("error while unlink fifo %s errno=%d (%s)\n", fdlist[fd].in_fn, errno, strerror(errno)); } } - result = stat(fdlist_pipe[fd].out_fn, &st); + result = stat(fdlist[fd].out_fn, &st); if (result == -1) - err_printf("stat of %s failed: %s\n", fdlist_pipe[fd].out_fn, strerror(errno)); + err_printf("stat of %s failed: %s\n", fdlist[fd].out_fn, strerror(errno)); if (S_ISFIFO(st.st_mode)) { - result = unlink(fdlist_pipe[fd].out_fn); + result = unlink(fdlist[fd].out_fn); if(result != 0) { - debug_printf3("error while unlink fifo %s errno=%d (%s)\n", fdlist_pipe[fd].out_fn, + debug_printf3("error while unlink fifo %s errno=%d (%s)\n", fdlist[fd].out_fn, errno, strerror(errno)); } } /* remove connection from server list */ - serverfd=fdlist_pipe[fd].serverfd; - for(c=0;cfdlist_pipe_size) ) _error("wrong fd"); - ldcs_notify_destroy(fdlist_pipe[fd].notify_fd); + ldcs_notify_destroy(fdlist[fd].notify_fd); - snprintf(path, MAX_PATH_LEN, "%s/ready", fdlist_pipe[fd].path); + snprintf(path, MAX_PATH_LEN, "%s/ready", fdlist[fd].path); unlink(path); - rmdir(fdlist_pipe[fd].path); + rmdir(fdlist[fd].path); free_fd_pipe(fd); return(rc); @@ -271,7 +271,7 @@ int ldcs_destroy_server_pipe(int fd) { /* ************************************************************** */ /* message transfer functions */ /* ************************************************************** */ -int ldcs_send_msg_pipe(int fd, ldcs_message_t * msg) { +int ldcs_send_msg(int fd, ldcs_message_t * msg) { size_t n; @@ -281,10 +281,10 @@ int ldcs_send_msg_pipe(int fd, ldcs_message_t * msg) { _message_type_to_str(msg->header.type), msg->header.len,msg->data ); - n = _ldcs_write_pipe(fdlist_pipe[fd].out_fd,&msg->header,sizeof(msg->header)); + n = _ldcs_write_pipe(fdlist[fd].out_fd,&msg->header,sizeof(msg->header)); if(msg->header.len>0) { - n = _ldcs_write_pipe(fdlist_pipe[fd].out_fd,(void *) msg->data,msg->header.len); + n = _ldcs_write_pipe(fdlist[fd].out_fd,(void *) msg->data,msg->header.len); if (n != msg->header.len) _error("sent different number of bytes for message data"); } @@ -300,7 +300,7 @@ ldcs_message_t * ldcs_recv_msg_pipe(int fd, ldcs_read_block_t block ) { msg = (ldcs_message_t *) malloc(sizeof(ldcs_message_t)); if (!msg) _error("could not allocate memory for message"); - n = _ldcs_read_pipe(fdlist_pipe[fd].in_fd,&msg->header,sizeof(msg->header), block); + n = _ldcs_read_pipe(fdlist[fd].in_fd,&msg->header,sizeof(msg->header), block); if (n == 0) { free(msg); return(NULL); @@ -311,7 +311,7 @@ ldcs_message_t * ldcs_recv_msg_pipe(int fd, ldcs_read_block_t block ) { msg->data = (char *) malloc(msg->header.len); if (!msg) _error("could not allocate memory for message data"); - n = _ldcs_read_pipe(fdlist_pipe[fd].in_fd,msg->data,msg->header.len, LDCS_READ_BLOCK); + n = _ldcs_read_pipe(fdlist[fd].in_fd,msg->data,msg->header.len, LDCS_READ_BLOCK); if (n != msg->header.len) _error("received different number of bytes for message data"); } else { @@ -325,14 +325,14 @@ ldcs_message_t * ldcs_recv_msg_pipe(int fd, ldcs_read_block_t block ) { return(msg); } -int ldcs_recv_msg_static_pipe(int fd, ldcs_message_t *msg, ldcs_read_block_t block) { +int ldcs_recv_msg_static(int fd, ldcs_message_t *msg, ldcs_read_block_t block) { size_t n; int rc=0; msg->header.type=LDCS_MSG_UNKNOWN; msg->header.len=0; if ((fd<0) || (fd>fdlist_pipe_size) ) _error("wrong fd"); - n = _ldcs_read_pipe(fdlist_pipe[fd].in_fd,&msg->header,sizeof(msg->header), block); + n = _ldcs_read_pipe(fdlist[fd].in_fd,&msg->header,sizeof(msg->header), block); if (n == 0) { /* Disconnect. Return an artificial client end message */ debug_printf2("Client disconnected. Returning END message\n"); @@ -343,7 +343,7 @@ int ldcs_recv_msg_static_pipe(int fd, ldcs_message_t *msg, ldcs_read_block_t blo } if(msg->header.len>0) { - n = _ldcs_read_pipe(fdlist_pipe[fd].in_fd,msg->data,msg->header.len, LDCS_READ_BLOCK); + n = _ldcs_read_pipe(fdlist[fd].in_fd,msg->data,msg->header.len, LDCS_READ_BLOCK); if (n == 0) return(rc); if (n != msg->header.len) { @@ -427,12 +427,12 @@ size_t _ldcs_write_pipe(int fd, const void *data, int bytes ) { return (bsumwrote); } -int ldcs_get_aux_fd_pipe() +int ldcs_get_aux_fd() { return -1; } -int ldcs_socket_id_to_nc_pipe(int id, int fd, ldcs_process_data_t *process_data) +int ldcs_socket_id_to_nc(int id, int fd, ldcs_process_data_t *process_data) { (void)fd; (void)process_data; diff --git a/src/server/comlib/ldcs_api_wrapper.c b/src/server/comlib/ldcs_api_wrapper.c deleted file mode 100644 index 2ba08128..00000000 --- a/src/server/comlib/ldcs_api_wrapper.c +++ /dev/null @@ -1,93 +0,0 @@ -/* -This file is part of Spindle. For copyright information see the COPYRIGHT -file in the top level directory, or at -https://github.com/hpc/Spindle/blob/master/COPYRIGHT - -This program is free software; you can redistribute it and/or modify it under -the terms of the GNU Lesser General Public License (as published by the Free Software -Foundation) version 2.1 dated February 1999. This program is distributed in the -hope that it will be useful, but WITHOUT ANY WARRANTY; without even the IMPLIED -WARRANTY OF MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms -and conditions of the GNU Lesser General Public License for more details. You should -have received a copy of the GNU Lesser General Public License along with this -program; if not, write to the Free Software Foundation, Inc., 59 Temple -Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -#include "config.h" -#include "ldcs_api.h" -#include "ldcs_audit_server_process.h" -#include "spindle_launch.h" - -#if !defined(COMM) -#if defined(COMM_PIPES) -#define COMM pipe -#else -#error Unknown communication type -#endif -#endif - -#define RENAME3(X, Y) X ## _ ## Y -#define RENAME2(X, Y) RENAME3(X, Y) -#define RENAME(X) RENAME2(X, COMM) - -extern int RENAME(ldcs_create_server)(char* location, number_t number); -extern int RENAME(ldcs_open_server_connection) (int serverid); -extern int RENAME(ldcs_open_server_connections) (int fd, int nc, int *more_avail); -extern int RENAME(ldcs_close_server_connection) (int connid); -extern int RENAME(ldcs_destroy_server) (int cid); -extern int RENAME(ldcs_send_msg) (int fd, ldcs_message_t *msg); -extern int RENAME(ldcs_get_fd)(int fd); -extern int RENAME(ldcs_get_aux_fd)(); -extern int RENAME(ldcs_recv_msg_static)(int connid, ldcs_message_t *msg, ldcs_read_block_t block); -extern int RENAME(ldcs_socket_id_to_nc)(int id, int fd, ldcs_process_data_t *process_data); - -int ldcs_create_server(char* location, number_t number) -{ - return RENAME(ldcs_create_server)(location, number); -} - -int ldcs_open_server_connection(int serverid) -{ - return RENAME(ldcs_open_server_connection)(serverid); -} - -int ldcs_open_server_connections(int fd, int nc, int *more_avail) -{ - return RENAME(ldcs_open_server_connections)(fd, nc, more_avail); -} - -int ldcs_close_server_connection(int connid) -{ - return RENAME(ldcs_close_server_connection)(connid); -} - -int ldcs_destroy_server(int cid) -{ - return RENAME(ldcs_destroy_server)(cid); -} - -int ldcs_send_msg(int fd, ldcs_message_t *msg) -{ - return RENAME(ldcs_send_msg)(fd, msg); -} - -int ldcs_get_fd(int fd) -{ - return RENAME(ldcs_get_fd)(fd); -} - -int ldcs_recv_msg_static(int connid, ldcs_message_t *msg, ldcs_read_block_t block) -{ - return RENAME(ldcs_recv_msg_static)(connid, msg, block); -} - -int ldcs_get_aux_fd() -{ - return RENAME(ldcs_get_aux_fd)(); -} - -int ldcs_socket_id_to_nc(int id, int fd, ldcs_process_data_t *process_data) -{ - return RENAME(ldcs_socket_id_to_nc)(id, fd, process_data); -} diff --git a/src/server/startup/Makefile.am b/src/server/startup/Makefile.am index 5ba57e88..70c0059b 100644 --- a/src/server/startup/Makefile.am +++ b/src/server/startup/Makefile.am @@ -13,9 +13,7 @@ endif if MSOCKET CORE_LDADD += $(top_builddir)/auditserver/libaudit_server_msocket.la endif -if PIPES CORE_LDADD += $(top_builddir)/comlib/libserver_pipe.la -endif if USE_NUMA CORE_LDADD += -lnuma endif From 833540b66158ead2b60d1ee786c2d41631e06ac2 Mon Sep 17 00:00:00 2001 From: Barry Rountree Date: Fri, 31 Jul 2026 00:21:59 -0700 Subject: [PATCH 12/21] [prune-config] Changes post bootstrap.sh (--enable-pipes) --- config.h.in | 2 +- configure | 32 +---------- src/client/auditclient/Makefile.in | 6 +- src/client/beboot/Makefile.in | 7 +-- src/client/client/Makefile.in | 8 +-- src/client/client_comlib/Makefile.in | 66 +++++----------------- src/client/config.h.in | 2 +- src/client/configure | 32 +---------- src/client/subaudit/Makefile.in | 6 +- src/fe/config.h.in | 2 +- src/fe/configure | 32 +---------- src/server/comlib/Makefile.in | 83 +++++++--------------------- src/server/config.h.in | 2 +- src/server/configure | 32 +---------- src/server/startup/Makefile.in | 25 +++++---- 15 files changed, 72 insertions(+), 265 deletions(-) diff --git a/config.h.in b/config.h.in index 1b677e38..598840e9 100644 --- a/config.h.in +++ b/config.h.in @@ -18,7 +18,7 @@ /* Define if were using msocket for server/server communication */ #undef COMM_MSOCKET -/* Define if were using pipes for client/server communication */ +/* Client/server communication uses pipes */ #undef COMM_PIPES /* Enable --crash-dedup by default */ diff --git a/configure b/configure index 5e606239..961d4f53 100755 --- a/configure +++ b/configure @@ -690,8 +690,6 @@ COBO_FALSE COBO_TRUE MSOCKET_FALSE MSOCKET_TRUE -PIPES_FALSE -PIPES_TRUE SRUN_PATH BLD_FLUXPLUGIN_FALSE BLD_FLUXPLUGIN_TRUE @@ -856,7 +854,6 @@ with_hostbin with_rsh_launch with_rsh_cmd with_slurm_launch -enable_pipes enable_msocket enable_cobo with_python_prefix @@ -1546,7 +1543,6 @@ Optional Features: launching --enable-slurm-plugin Builds in support for running with SLURM via plugin --enable-flux-plugin Builds in support for running flux via a plugin - --enable-pipes Use pipes for server/client communication --enable-msocket Use msocket for inter-server communication --enable-cobo Use msocket for inter-server communication --enable-numa Use libnuma to enable numa optimizations @@ -17006,16 +17002,8 @@ cat >>confdefs.h <<_ACEOF _ACEOF -#Runmode detection (pipe/socket or cobo/msocket communications) -CLIENT_SERVER_COM=pipes - +#Runmode detection (cobo/msocket communications for server/server) SERVER_SERVER_COM=cobo -# Check whether --enable-pipes was given. -if test "${enable_pipes+set}" = set; then : - enableval=$enable_pipes; CLIENT_SERVER_COM=pipes; -fi - - # Check whether --enable-msocket was given. if test "${enable_msocket+set}" = set; then : @@ -17028,14 +17016,6 @@ if test "${enable_cobo+set}" = set; then : fi - if test x$CLIENT_SERVER_COM == xpipes; then - PIPES_TRUE= - PIPES_FALSE='#' -else - PIPES_TRUE='#' - PIPES_FALSE= -fi - if test x$SERVER_SERVER_COM == xmsocket; then MSOCKET_TRUE= MSOCKET_FALSE='#' @@ -17053,11 +17033,9 @@ else fi -if test "x$CLIENT_SERVER_COM" == "xpipes"; then $as_echo "#define COMM_PIPES 1" >>confdefs.h -fi if test "x$SERVER_SERVER_COM" == "xmsocket"; then $as_echo "#define COMM_MSOCKET 1" >>confdefs.h @@ -17069,8 +17047,8 @@ $as_echo "#define COMM_COBO 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: Communication is $CLIENT_SERVER_COM/$SERVER_SERVER_COM" >&5 -$as_echo "$as_me: Communication is $CLIENT_SERVER_COM/$SERVER_SERVER_COM" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: Communication is pipes/$SERVER_SERVER_COM" >&5 +$as_echo "$as_me: Communication is pipes/$SERVER_SERVER_COM" >&6;} #Architecture detection if test "x$target_cpu" == "xx86_64"; then @@ -18973,10 +18951,6 @@ if test -z "${BLD_FLUXPLUGIN_TRUE}" && test -z "${BLD_FLUXPLUGIN_FALSE}"; then as_fn_error $? "conditional \"BLD_FLUXPLUGIN\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${PIPES_TRUE}" && test -z "${PIPES_FALSE}"; then - as_fn_error $? "conditional \"PIPES\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${MSOCKET_TRUE}" && test -z "${MSOCKET_FALSE}"; then as_fn_error $? "conditional \"MSOCKET\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/src/client/auditclient/Makefile.in b/src/client/auditclient/Makefile.in index 9ffe642d..3440cd1f 100644 --- a/src/client/auditclient/Makefile.in +++ b/src/client/auditclient/Makefile.in @@ -89,7 +89,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -@PIPES_TRUE@am__append_1 = libspindle_audit_pipe.la subdir = auditclient ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ @@ -162,7 +161,6 @@ libspindle_audit_pipe_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(AM_CFLAGS) $(CFLAGS) $(libspindle_audit_pipe_la_LDFLAGS) \ $(LDFLAGS) -o $@ -@PIPES_TRUE@am_libspindle_audit_pipe_la_rpath = -rpath $(pkglibdir) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -368,7 +366,7 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -pkglib_LTLIBRARIES = $(am__append_1) +pkglib_LTLIBRARIES = libspindle_audit_pipe.la AM_CFLAGS = -fvisibility=hidden AM_CPPFLAGS = -I$(top_srcdir)/../logging -I$(top_srcdir)/../include -I$(top_srcdir)/client -I$(top_srcdir)/client_comlib -I$(top_srcdir)/crash_handler BASE_SRCS = auditclient.c auditclient_common.c patch_linkmap.c redirect.c bindgot.c writablegot.c patch_bad_dtv.c malloc_wrapper.c fixlocale.c @@ -450,7 +448,7 @@ clean-pkglibLTLIBRARIES: } libspindle_audit_pipe.la: $(libspindle_audit_pipe_la_OBJECTS) $(libspindle_audit_pipe_la_DEPENDENCIES) $(EXTRA_libspindle_audit_pipe_la_DEPENDENCIES) - $(AM_V_CCLD)$(libspindle_audit_pipe_la_LINK) $(am_libspindle_audit_pipe_la_rpath) $(libspindle_audit_pipe_la_OBJECTS) $(libspindle_audit_pipe_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(libspindle_audit_pipe_la_LINK) -rpath $(pkglibdir) $(libspindle_audit_pipe_la_OBJECTS) $(libspindle_audit_pipe_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) diff --git a/src/client/beboot/Makefile.in b/src/client/beboot/Makefile.in index 1d87c983..d0deade3 100644 --- a/src/client/beboot/Makefile.in +++ b/src/client/beboot/Makefile.in @@ -90,7 +90,6 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ pkglibexec_PROGRAMS = spindle_bootstrap$(EXEEXT) -@PIPES_TRUE@am__append_1 = $(top_builddir)/client_comlib/libclient_pipe.la subdir = beboot ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ @@ -122,7 +121,8 @@ am_spindle_bootstrap_OBJECTS = \ spindle_bootstrap_OBJECTS = $(am_spindle_bootstrap_OBJECTS) spindle_bootstrap_DEPENDENCIES = \ $(top_builddir)/logging/libspindleclogc.la \ - $(top_builddir)/shm_cache/libshmcache.la $(am__append_1) + $(top_builddir)/shm_cache/libshmcache.la \ + $(top_builddir)/client_comlib/libclient_pipe.la AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent @@ -337,8 +337,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ spindle_bootstrap_LDFLAGS = $(AM_LDFLAGS) $(STATICFLAG) spindle_bootstrap_CPPFLAGS = $(AM_CPPFLAGS) -DLIBEXECDIR=\"$(pkglibexecdir)\" -DPROGLIBDIR=\"$(pkglibdir)\" -I$(top_srcdir)/../include -I$(top_srcdir)/../logging -I$(top_srcdir)/client_comlib -I$(top_srcdir)/client -I$(top_srcdir)/shm_cache -I$(top_srcdir)/../utils -spindle_bootstrap_LDADD = $(top_builddir)/logging/libspindleclogc.la \ - $(top_builddir)/shm_cache/libshmcache.la $(am__append_1) +spindle_bootstrap_LDADD = $(top_builddir)/logging/libspindleclogc.la $(top_builddir)/shm_cache/libshmcache.la $(top_builddir)/client_comlib/libclient_pipe.la spindle_bootstrap_SOURCES = spindle_bootstrap.c $(top_srcdir)/../utils/parseloc.c $(top_srcdir)/../utils/spindle_mkdir.c $(top_srcdir)/../utils/getcpu.c $(top_srcdir)/client/exec_util.c $(top_srcdir)/client/lookup.c $(top_srcdir)/../utils/fileutil.c all: all-am diff --git a/src/client/client/Makefile.in b/src/client/client/Makefile.in index c7becb1a..23ca3c92 100644 --- a/src/client/client/Makefile.in +++ b/src/client/client/Makefile.in @@ -89,8 +89,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -#noinst_LTLIBRARIES += libspindle_instr.la -@PIPES_TRUE@am__append_1 = libspindlec_pipe.la subdir = client ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ @@ -142,7 +140,6 @@ am__objects_2 = client.lo lookup.lo should_intercept.lo exec_util.lo \ $(top_builddir)/crash_handler/crash_sigchain.lo am_libspindlec_pipe_la_OBJECTS = $(am__objects_2) libspindlec_pipe_la_OBJECTS = $(am_libspindlec_pipe_la_OBJECTS) -@PIPES_TRUE@am_libspindlec_pipe_la_rpath = AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -363,7 +360,8 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -noinst_LTLIBRARIES = libspindle_audit.la $(am__append_1) +noinst_LTLIBRARIES = libspindle_audit.la libspindlec_pipe.la +#noinst_LTLIBRARIES += libspindle_instr.la AM_CFLAGS = -fvisibility=hidden AM_CPPFLAGS = -I$(top_srcdir)/../logging -I$(top_srcdir)/client_comlib -I$(top_srcdir)/../include -I$(top_srcdir)/shm_cache -I$(top_srcdir)/subaudit -I$(top_srcdir)/../utils -I$(top_srcdir)/auditclient -I$(top_srcdir)/client -I$(top_srcdir)/crash_handler INTERCEPT_SRCS = intercept_open.c intercept_exec.c intercept_stat.c intercept_readlink.c intercept_spindleapi.c intercept.c spindle_regex.c patch_interception.c realpath.c $(top_srcdir)/../utils/fileutil.c @@ -465,7 +463,7 @@ $(top_builddir)/crash_handler/crash_sigchain.lo: \ $(top_builddir)/crash_handler/$(DEPDIR)/$(am__dirstamp) libspindlec_pipe.la: $(libspindlec_pipe_la_OBJECTS) $(libspindlec_pipe_la_DEPENDENCIES) $(EXTRA_libspindlec_pipe_la_DEPENDENCIES) - $(AM_V_CCLD)$(LINK) $(am_libspindlec_pipe_la_rpath) $(libspindlec_pipe_la_OBJECTS) $(libspindlec_pipe_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(libspindlec_pipe_la_OBJECTS) $(libspindlec_pipe_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) diff --git a/src/client/client_comlib/Makefile.in b/src/client/client_comlib/Makefile.in index 3ea612ab..8a59b98b 100644 --- a/src/client/client_comlib/Makefile.in +++ b/src/client/client_comlib/Makefile.in @@ -108,11 +108,8 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) libclient_pipe_la_LIBADD = -am__objects_1 = libclient_pipe_la-client_api.lo \ - libclient_pipe_la-client_heap.lo \ - libclient_pipe_la-client_wrappers.lo -am_libclient_pipe_la_OBJECTS = libclient_pipe_la-client_api_pipe.lo \ - $(am__objects_1) +am_libclient_pipe_la_OBJECTS = client_api_pipe.lo client_api.lo \ + client_heap.lo libclient_pipe_la_OBJECTS = $(am_libclient_pipe_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -133,10 +130,8 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/../../scripts/depcomp am__maybe_remake_depfiles = depfiles -am__depfiles_remade = ./$(DEPDIR)/libclient_pipe_la-client_api.Plo \ - ./$(DEPDIR)/libclient_pipe_la-client_api_pipe.Plo \ - ./$(DEPDIR)/libclient_pipe_la-client_heap.Plo \ - ./$(DEPDIR)/libclient_pipe_la-client_wrappers.Plo +am__depfiles_remade = ./$(DEPDIR)/client_api.Plo \ + ./$(DEPDIR)/client_api_pipe.Plo ./$(DEPDIR)/client_heap.Plo am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -321,10 +316,8 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ noinst_LTLIBRARIES = libclient_pipe.la AM_CPPFLAGS = -I$(top_srcdir)/../logging -I$(top_srcdir)/../include -BASE_SRCS = client_api.c client_heap.c client_wrappers.c AM_CFLAGS = -fvisibility=hidden -libclient_pipe_la_CPPFLAGS = $(AM_CPPFLAGS) -DCOMM=pipe -libclient_pipe_la_SOURCES = client_api_pipe.c $(BASE_SRCS) +libclient_pipe_la_SOURCES = client_api_pipe.c client_api.c client_heap.c all: all-am .SUFFIXES: @@ -379,10 +372,9 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclient_pipe_la-client_api.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclient_pipe_la-client_api_pipe.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclient_pipe_la-client_heap.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclient_pipe_la-client_wrappers.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/client_api.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/client_api_pipe.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/client_heap.Plo@am__quote@ # am--include-marker $(am__depfiles_remade): @$(MKDIR_P) $(@D) @@ -414,34 +406,6 @@ am--depfiles: $(am__depfiles_remade) @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< -libclient_pipe_la-client_api_pipe.lo: client_api_pipe.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libclient_pipe_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libclient_pipe_la-client_api_pipe.lo -MD -MP -MF $(DEPDIR)/libclient_pipe_la-client_api_pipe.Tpo -c -o libclient_pipe_la-client_api_pipe.lo `test -f 'client_api_pipe.c' || echo '$(srcdir)/'`client_api_pipe.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libclient_pipe_la-client_api_pipe.Tpo $(DEPDIR)/libclient_pipe_la-client_api_pipe.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='client_api_pipe.c' object='libclient_pipe_la-client_api_pipe.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libclient_pipe_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libclient_pipe_la-client_api_pipe.lo `test -f 'client_api_pipe.c' || echo '$(srcdir)/'`client_api_pipe.c - -libclient_pipe_la-client_api.lo: client_api.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libclient_pipe_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libclient_pipe_la-client_api.lo -MD -MP -MF $(DEPDIR)/libclient_pipe_la-client_api.Tpo -c -o libclient_pipe_la-client_api.lo `test -f 'client_api.c' || echo '$(srcdir)/'`client_api.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libclient_pipe_la-client_api.Tpo $(DEPDIR)/libclient_pipe_la-client_api.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='client_api.c' object='libclient_pipe_la-client_api.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libclient_pipe_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libclient_pipe_la-client_api.lo `test -f 'client_api.c' || echo '$(srcdir)/'`client_api.c - -libclient_pipe_la-client_heap.lo: client_heap.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libclient_pipe_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libclient_pipe_la-client_heap.lo -MD -MP -MF $(DEPDIR)/libclient_pipe_la-client_heap.Tpo -c -o libclient_pipe_la-client_heap.lo `test -f 'client_heap.c' || echo '$(srcdir)/'`client_heap.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libclient_pipe_la-client_heap.Tpo $(DEPDIR)/libclient_pipe_la-client_heap.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='client_heap.c' object='libclient_pipe_la-client_heap.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libclient_pipe_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libclient_pipe_la-client_heap.lo `test -f 'client_heap.c' || echo '$(srcdir)/'`client_heap.c - -libclient_pipe_la-client_wrappers.lo: client_wrappers.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libclient_pipe_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libclient_pipe_la-client_wrappers.lo -MD -MP -MF $(DEPDIR)/libclient_pipe_la-client_wrappers.Tpo -c -o libclient_pipe_la-client_wrappers.lo `test -f 'client_wrappers.c' || echo '$(srcdir)/'`client_wrappers.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libclient_pipe_la-client_wrappers.Tpo $(DEPDIR)/libclient_pipe_la-client_wrappers.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='client_wrappers.c' object='libclient_pipe_la-client_wrappers.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libclient_pipe_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libclient_pipe_la-client_wrappers.lo `test -f 'client_wrappers.c' || echo '$(srcdir)/'`client_wrappers.c - mostlyclean-libtool: -rm -f *.lo @@ -573,10 +537,9 @@ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ mostlyclean-am distclean: distclean-am - -rm -f ./$(DEPDIR)/libclient_pipe_la-client_api.Plo - -rm -f ./$(DEPDIR)/libclient_pipe_la-client_api_pipe.Plo - -rm -f ./$(DEPDIR)/libclient_pipe_la-client_heap.Plo - -rm -f ./$(DEPDIR)/libclient_pipe_la-client_wrappers.Plo + -rm -f ./$(DEPDIR)/client_api.Plo + -rm -f ./$(DEPDIR)/client_api_pipe.Plo + -rm -f ./$(DEPDIR)/client_heap.Plo -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -622,10 +585,9 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f ./$(DEPDIR)/libclient_pipe_la-client_api.Plo - -rm -f ./$(DEPDIR)/libclient_pipe_la-client_api_pipe.Plo - -rm -f ./$(DEPDIR)/libclient_pipe_la-client_heap.Plo - -rm -f ./$(DEPDIR)/libclient_pipe_la-client_wrappers.Plo + -rm -f ./$(DEPDIR)/client_api.Plo + -rm -f ./$(DEPDIR)/client_api_pipe.Plo + -rm -f ./$(DEPDIR)/client_heap.Plo -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff --git a/src/client/config.h.in b/src/client/config.h.in index ecafee1e..fbafd176 100644 --- a/src/client/config.h.in +++ b/src/client/config.h.in @@ -18,7 +18,7 @@ /* Define if were using msocket for server/server communication */ #undef COMM_MSOCKET -/* Define if were using pipes for client/server communication */ +/* Client/server communication uses pipes */ #undef COMM_PIPES /* Enable --crash-dedup by default */ diff --git a/src/client/configure b/src/client/configure index 13ef2abe..13b7b2b7 100755 --- a/src/client/configure +++ b/src/client/configure @@ -663,8 +663,6 @@ COBO_FALSE COBO_TRUE MSOCKET_FALSE MSOCKET_TRUE -PIPES_FALSE -PIPES_TRUE SRUN_PATH BLD_FLUXPLUGIN_FALSE BLD_FLUXPLUGIN_TRUE @@ -819,7 +817,6 @@ with_hostbin with_rsh_launch with_rsh_cmd with_slurm_launch -enable_pipes enable_msocket enable_cobo with_python_prefix @@ -1490,7 +1487,6 @@ Optional Features: launching --enable-slurm-plugin Builds in support for running with SLURM via plugin --enable-flux-plugin Builds in support for running flux via a plugin - --enable-pipes Use pipes for server/client communication --enable-msocket Use msocket for inter-server communication --enable-cobo Use msocket for inter-server communication --enable-numa Use libnuma to enable numa optimizations @@ -12887,16 +12883,8 @@ cat >>confdefs.h <<_ACEOF _ACEOF -#Runmode detection (pipe/socket or cobo/msocket communications) -CLIENT_SERVER_COM=pipes - +#Runmode detection (cobo/msocket communications for server/server) SERVER_SERVER_COM=cobo -# Check whether --enable-pipes was given. -if test "${enable_pipes+set}" = set; then : - enableval=$enable_pipes; CLIENT_SERVER_COM=pipes; -fi - - # Check whether --enable-msocket was given. if test "${enable_msocket+set}" = set; then : @@ -12909,14 +12897,6 @@ if test "${enable_cobo+set}" = set; then : fi - if test x$CLIENT_SERVER_COM == xpipes; then - PIPES_TRUE= - PIPES_FALSE='#' -else - PIPES_TRUE='#' - PIPES_FALSE= -fi - if test x$SERVER_SERVER_COM == xmsocket; then MSOCKET_TRUE= MSOCKET_FALSE='#' @@ -12934,11 +12914,9 @@ else fi -if test "x$CLIENT_SERVER_COM" == "xpipes"; then $as_echo "#define COMM_PIPES 1" >>confdefs.h -fi if test "x$SERVER_SERVER_COM" == "xmsocket"; then $as_echo "#define COMM_MSOCKET 1" >>confdefs.h @@ -12950,8 +12928,8 @@ $as_echo "#define COMM_COBO 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: Communication is $CLIENT_SERVER_COM/$SERVER_SERVER_COM" >&5 -$as_echo "$as_me: Communication is $CLIENT_SERVER_COM/$SERVER_SERVER_COM" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: Communication is pipes/$SERVER_SERVER_COM" >&5 +$as_echo "$as_me: Communication is pipes/$SERVER_SERVER_COM" >&6;} #Architecture detection if test "x$target_cpu" == "xx86_64"; then @@ -13819,10 +13797,6 @@ if test -z "${BLD_FLUXPLUGIN_TRUE}" && test -z "${BLD_FLUXPLUGIN_FALSE}"; then as_fn_error $? "conditional \"BLD_FLUXPLUGIN\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${PIPES_TRUE}" && test -z "${PIPES_FALSE}"; then - as_fn_error $? "conditional \"PIPES\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${MSOCKET_TRUE}" && test -z "${MSOCKET_FALSE}"; then as_fn_error $? "conditional \"MSOCKET\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/src/client/subaudit/Makefile.in b/src/client/subaudit/Makefile.in index 608fde72..538eec9d 100644 --- a/src/client/subaudit/Makefile.in +++ b/src/client/subaudit/Makefile.in @@ -89,7 +89,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -@PIPES_TRUE@am__append_1 = libspindle_subaudit_pipe.la subdir = subaudit ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ @@ -153,7 +152,6 @@ libspindle_subaudit_pipe_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(AM_CFLAGS) $(CFLAGS) $(libspindle_subaudit_pipe_la_LDFLAGS) \ $(LDFLAGS) -o $@ -@PIPES_TRUE@am_libspindle_subaudit_pipe_la_rpath = -rpath $(pkglibdir) libspindleint_la_LIBADD = am_libspindleint_la_OBJECTS = preloadlib.lo libspindleint_la_OBJECTS = $(am_libspindleint_la_OBJECTS) @@ -365,7 +363,7 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -pkglib_LTLIBRARIES = libspindleint.la $(am__append_1) +pkglib_LTLIBRARIES = libspindleint.la libspindle_subaudit_pipe.la AM_CFLAGS = -fvisibility=hidden AM_CPPFLAGS = -I$(top_srcdir)/../logging -I$(top_srcdir)/../include -I$(top_srcdir)/client -I$(top_srcdir)/client_comlib -I$(top_srcdir)/auditclient -I$(top_srcdir)/../utils -I$(top_srcdir)/crash_handler BASE_SRCS = subaudit.c intercept_malloc.c update_pltbind.c ../auditclient/auditclient_common.c ../auditclient/patch_linkmap.c ../auditclient/fixlocale.c @@ -457,7 +455,7 @@ clean-pkglibLTLIBRARIES: ../auditclient/$(DEPDIR)/$(am__dirstamp) libspindle_subaudit_pipe.la: $(libspindle_subaudit_pipe_la_OBJECTS) $(libspindle_subaudit_pipe_la_DEPENDENCIES) $(EXTRA_libspindle_subaudit_pipe_la_DEPENDENCIES) - $(AM_V_CCLD)$(libspindle_subaudit_pipe_la_LINK) $(am_libspindle_subaudit_pipe_la_rpath) $(libspindle_subaudit_pipe_la_OBJECTS) $(libspindle_subaudit_pipe_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(libspindle_subaudit_pipe_la_LINK) -rpath $(pkglibdir) $(libspindle_subaudit_pipe_la_OBJECTS) $(libspindle_subaudit_pipe_la_LIBADD) $(LIBS) libspindleint.la: $(libspindleint_la_OBJECTS) $(libspindleint_la_DEPENDENCIES) $(EXTRA_libspindleint_la_DEPENDENCIES) $(AM_V_CCLD)$(libspindleint_la_LINK) -rpath $(pkglibdir) $(libspindleint_la_OBJECTS) $(libspindleint_la_LIBADD) $(LIBS) diff --git a/src/fe/config.h.in b/src/fe/config.h.in index 7e349ad2..d3f72a1f 100644 --- a/src/fe/config.h.in +++ b/src/fe/config.h.in @@ -18,7 +18,7 @@ /* Define if were using msocket for server/server communication */ #undef COMM_MSOCKET -/* Define if were using pipes for client/server communication */ +/* Client/server communication uses pipes */ #undef COMM_PIPES /* Enable --crash-dedup by default */ diff --git a/src/fe/configure b/src/fe/configure index 749ba432..ab2fb306 100755 --- a/src/fe/configure +++ b/src/fe/configure @@ -677,8 +677,6 @@ COBO_FALSE COBO_TRUE MSOCKET_FALSE MSOCKET_TRUE -PIPES_FALSE -PIPES_TRUE SRUN_PATH BLD_FLUXPLUGIN_FALSE BLD_FLUXPLUGIN_TRUE @@ -840,7 +838,6 @@ with_hostbin with_rsh_launch with_rsh_cmd with_slurm_launch -enable_pipes enable_msocket enable_cobo with_python_prefix @@ -1523,7 +1520,6 @@ Optional Features: launching --enable-slurm-plugin Builds in support for running with SLURM via plugin --enable-flux-plugin Builds in support for running flux via a plugin - --enable-pipes Use pipes for server/client communication --enable-msocket Use msocket for inter-server communication --enable-cobo Use msocket for inter-server communication --enable-numa Use libnuma to enable numa optimizations @@ -16737,16 +16733,8 @@ cat >>confdefs.h <<_ACEOF _ACEOF -#Runmode detection (pipe/socket or cobo/msocket communications) -CLIENT_SERVER_COM=pipes - +#Runmode detection (cobo/msocket communications for server/server) SERVER_SERVER_COM=cobo -# Check whether --enable-pipes was given. -if test "${enable_pipes+set}" = set; then : - enableval=$enable_pipes; CLIENT_SERVER_COM=pipes; -fi - - # Check whether --enable-msocket was given. if test "${enable_msocket+set}" = set; then : @@ -16759,14 +16747,6 @@ if test "${enable_cobo+set}" = set; then : fi - if test x$CLIENT_SERVER_COM == xpipes; then - PIPES_TRUE= - PIPES_FALSE='#' -else - PIPES_TRUE='#' - PIPES_FALSE= -fi - if test x$SERVER_SERVER_COM == xmsocket; then MSOCKET_TRUE= MSOCKET_FALSE='#' @@ -16784,11 +16764,9 @@ else fi -if test "x$CLIENT_SERVER_COM" == "xpipes"; then $as_echo "#define COMM_PIPES 1" >>confdefs.h -fi if test "x$SERVER_SERVER_COM" == "xmsocket"; then $as_echo "#define COMM_MSOCKET 1" >>confdefs.h @@ -16800,8 +16778,8 @@ $as_echo "#define COMM_COBO 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: Communication is $CLIENT_SERVER_COM/$SERVER_SERVER_COM" >&5 -$as_echo "$as_me: Communication is $CLIENT_SERVER_COM/$SERVER_SERVER_COM" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: Communication is pipes/$SERVER_SERVER_COM" >&5 +$as_echo "$as_me: Communication is pipes/$SERVER_SERVER_COM" >&6;} #Architecture detection if test "x$target_cpu" == "xx86_64"; then @@ -18191,10 +18169,6 @@ if test -z "${BLD_FLUXPLUGIN_TRUE}" && test -z "${BLD_FLUXPLUGIN_FALSE}"; then as_fn_error $? "conditional \"BLD_FLUXPLUGIN\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${PIPES_TRUE}" && test -z "${PIPES_FALSE}"; then - as_fn_error $? "conditional \"PIPES\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${MSOCKET_TRUE}" && test -z "${MSOCKET_FALSE}"; then as_fn_error $? "conditional \"MSOCKET\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/src/server/comlib/Makefile.in b/src/server/comlib/Makefile.in index 37682457..e24f6495 100644 --- a/src/server/comlib/Makefile.in +++ b/src/server/comlib/Makefile.in @@ -108,11 +108,8 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) libserver_pipe_la_LIBADD = -am__objects_1 = libserver_pipe_la-ldcs_api_util.lo \ - libserver_pipe_la-ldcs_api_listen.lo \ - libserver_pipe_la-ldcs_api_wrapper.lo -am_libserver_pipe_la_OBJECTS = libserver_pipe_la-ldcs_api_pipe.lo \ - libserver_pipe_la-ldcs_api_pipe_notify.lo $(am__objects_1) +am_libserver_pipe_la_OBJECTS = ldcs_api_pipe.lo \ + ldcs_api_pipe_notify.lo ldcs_api_util.lo ldcs_api_listen.lo libserver_pipe_la_OBJECTS = $(am_libserver_pipe_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -133,12 +130,10 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/../../scripts/depcomp am__maybe_remake_depfiles = depfiles -am__depfiles_remade = \ - ./$(DEPDIR)/libserver_pipe_la-ldcs_api_listen.Plo \ - ./$(DEPDIR)/libserver_pipe_la-ldcs_api_pipe.Plo \ - ./$(DEPDIR)/libserver_pipe_la-ldcs_api_pipe_notify.Plo \ - ./$(DEPDIR)/libserver_pipe_la-ldcs_api_util.Plo \ - ./$(DEPDIR)/libserver_pipe_la-ldcs_api_wrapper.Plo +am__depfiles_remade = ./$(DEPDIR)/ldcs_api_listen.Plo \ + ./$(DEPDIR)/ldcs_api_pipe.Plo \ + ./$(DEPDIR)/ldcs_api_pipe_notify.Plo \ + ./$(DEPDIR)/ldcs_api_util.Plo am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -340,9 +335,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ noinst_LTLIBRARIES = libserver_pipe.la AM_CPPFLAGS = -I$(top_srcdir)/../logging -I$(top_srcdir)/../include -I$(top_srcdir)/auditserver -I$(top_srcdir)/cache -BASE_SRCS = ldcs_api_util.c ldcs_api_listen.c ldcs_api_wrapper.c -libserver_pipe_la_CPPFLAGS = $(AM_CPPFLAGS) -Dcomm=pipe -libserver_pipe_la_SOURCES = ldcs_api_pipe.c ldcs_api_pipe_notify.c $(BASE_SRCS) +libserver_pipe_la_SOURCES = ldcs_api_pipe.c ldcs_api_pipe_notify.c ldcs_api_util.c ldcs_api_listen.c all: all-am .SUFFIXES: @@ -397,11 +390,10 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libserver_pipe_la-ldcs_api_listen.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libserver_pipe_la-ldcs_api_pipe.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libserver_pipe_la-ldcs_api_pipe_notify.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libserver_pipe_la-ldcs_api_util.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libserver_pipe_la-ldcs_api_wrapper.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ldcs_api_listen.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ldcs_api_pipe.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ldcs_api_pipe_notify.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ldcs_api_util.Plo@am__quote@ # am--include-marker $(am__depfiles_remade): @$(MKDIR_P) $(@D) @@ -433,41 +425,6 @@ am--depfiles: $(am__depfiles_remade) @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< -libserver_pipe_la-ldcs_api_pipe.lo: ldcs_api_pipe.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libserver_pipe_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libserver_pipe_la-ldcs_api_pipe.lo -MD -MP -MF $(DEPDIR)/libserver_pipe_la-ldcs_api_pipe.Tpo -c -o libserver_pipe_la-ldcs_api_pipe.lo `test -f 'ldcs_api_pipe.c' || echo '$(srcdir)/'`ldcs_api_pipe.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libserver_pipe_la-ldcs_api_pipe.Tpo $(DEPDIR)/libserver_pipe_la-ldcs_api_pipe.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ldcs_api_pipe.c' object='libserver_pipe_la-ldcs_api_pipe.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libserver_pipe_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libserver_pipe_la-ldcs_api_pipe.lo `test -f 'ldcs_api_pipe.c' || echo '$(srcdir)/'`ldcs_api_pipe.c - -libserver_pipe_la-ldcs_api_pipe_notify.lo: ldcs_api_pipe_notify.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libserver_pipe_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libserver_pipe_la-ldcs_api_pipe_notify.lo -MD -MP -MF $(DEPDIR)/libserver_pipe_la-ldcs_api_pipe_notify.Tpo -c -o libserver_pipe_la-ldcs_api_pipe_notify.lo `test -f 'ldcs_api_pipe_notify.c' || echo '$(srcdir)/'`ldcs_api_pipe_notify.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libserver_pipe_la-ldcs_api_pipe_notify.Tpo $(DEPDIR)/libserver_pipe_la-ldcs_api_pipe_notify.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ldcs_api_pipe_notify.c' object='libserver_pipe_la-ldcs_api_pipe_notify.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libserver_pipe_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libserver_pipe_la-ldcs_api_pipe_notify.lo `test -f 'ldcs_api_pipe_notify.c' || echo '$(srcdir)/'`ldcs_api_pipe_notify.c - -libserver_pipe_la-ldcs_api_util.lo: ldcs_api_util.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libserver_pipe_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libserver_pipe_la-ldcs_api_util.lo -MD -MP -MF $(DEPDIR)/libserver_pipe_la-ldcs_api_util.Tpo -c -o libserver_pipe_la-ldcs_api_util.lo `test -f 'ldcs_api_util.c' || echo '$(srcdir)/'`ldcs_api_util.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libserver_pipe_la-ldcs_api_util.Tpo $(DEPDIR)/libserver_pipe_la-ldcs_api_util.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ldcs_api_util.c' object='libserver_pipe_la-ldcs_api_util.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libserver_pipe_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libserver_pipe_la-ldcs_api_util.lo `test -f 'ldcs_api_util.c' || echo '$(srcdir)/'`ldcs_api_util.c - -libserver_pipe_la-ldcs_api_listen.lo: ldcs_api_listen.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libserver_pipe_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libserver_pipe_la-ldcs_api_listen.lo -MD -MP -MF $(DEPDIR)/libserver_pipe_la-ldcs_api_listen.Tpo -c -o libserver_pipe_la-ldcs_api_listen.lo `test -f 'ldcs_api_listen.c' || echo '$(srcdir)/'`ldcs_api_listen.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libserver_pipe_la-ldcs_api_listen.Tpo $(DEPDIR)/libserver_pipe_la-ldcs_api_listen.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ldcs_api_listen.c' object='libserver_pipe_la-ldcs_api_listen.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libserver_pipe_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libserver_pipe_la-ldcs_api_listen.lo `test -f 'ldcs_api_listen.c' || echo '$(srcdir)/'`ldcs_api_listen.c - -libserver_pipe_la-ldcs_api_wrapper.lo: ldcs_api_wrapper.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libserver_pipe_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libserver_pipe_la-ldcs_api_wrapper.lo -MD -MP -MF $(DEPDIR)/libserver_pipe_la-ldcs_api_wrapper.Tpo -c -o libserver_pipe_la-ldcs_api_wrapper.lo `test -f 'ldcs_api_wrapper.c' || echo '$(srcdir)/'`ldcs_api_wrapper.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libserver_pipe_la-ldcs_api_wrapper.Tpo $(DEPDIR)/libserver_pipe_la-ldcs_api_wrapper.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ldcs_api_wrapper.c' object='libserver_pipe_la-ldcs_api_wrapper.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libserver_pipe_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libserver_pipe_la-ldcs_api_wrapper.lo `test -f 'ldcs_api_wrapper.c' || echo '$(srcdir)/'`ldcs_api_wrapper.c - mostlyclean-libtool: -rm -f *.lo @@ -599,11 +556,10 @@ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ mostlyclean-am distclean: distclean-am - -rm -f ./$(DEPDIR)/libserver_pipe_la-ldcs_api_listen.Plo - -rm -f ./$(DEPDIR)/libserver_pipe_la-ldcs_api_pipe.Plo - -rm -f ./$(DEPDIR)/libserver_pipe_la-ldcs_api_pipe_notify.Plo - -rm -f ./$(DEPDIR)/libserver_pipe_la-ldcs_api_util.Plo - -rm -f ./$(DEPDIR)/libserver_pipe_la-ldcs_api_wrapper.Plo + -rm -f ./$(DEPDIR)/ldcs_api_listen.Plo + -rm -f ./$(DEPDIR)/ldcs_api_pipe.Plo + -rm -f ./$(DEPDIR)/ldcs_api_pipe_notify.Plo + -rm -f ./$(DEPDIR)/ldcs_api_util.Plo -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -649,11 +605,10 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f ./$(DEPDIR)/libserver_pipe_la-ldcs_api_listen.Plo - -rm -f ./$(DEPDIR)/libserver_pipe_la-ldcs_api_pipe.Plo - -rm -f ./$(DEPDIR)/libserver_pipe_la-ldcs_api_pipe_notify.Plo - -rm -f ./$(DEPDIR)/libserver_pipe_la-ldcs_api_util.Plo - -rm -f ./$(DEPDIR)/libserver_pipe_la-ldcs_api_wrapper.Plo + -rm -f ./$(DEPDIR)/ldcs_api_listen.Plo + -rm -f ./$(DEPDIR)/ldcs_api_pipe.Plo + -rm -f ./$(DEPDIR)/ldcs_api_pipe_notify.Plo + -rm -f ./$(DEPDIR)/ldcs_api_util.Plo -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff --git a/src/server/config.h.in b/src/server/config.h.in index edc6617e..36fafcda 100644 --- a/src/server/config.h.in +++ b/src/server/config.h.in @@ -18,7 +18,7 @@ /* Define if were using msocket for server/server communication */ #undef COMM_MSOCKET -/* Define if were using pipes for client/server communication */ +/* Client/server communication uses pipes */ #undef COMM_PIPES /* Enable --crash-dedup by default */ diff --git a/src/server/configure b/src/server/configure index 6f8c1482..afd2a4ac 100755 --- a/src/server/configure +++ b/src/server/configure @@ -683,8 +683,6 @@ COBO_FALSE COBO_TRUE MSOCKET_FALSE MSOCKET_TRUE -PIPES_FALSE -PIPES_TRUE SRUN_PATH BLD_FLUXPLUGIN_FALSE BLD_FLUXPLUGIN_TRUE @@ -846,7 +844,6 @@ with_hostbin with_rsh_launch with_rsh_cmd with_slurm_launch -enable_pipes enable_msocket enable_cobo with_python_prefix @@ -1525,7 +1522,6 @@ Optional Features: launching --enable-slurm-plugin Builds in support for running with SLURM via plugin --enable-flux-plugin Builds in support for running flux via a plugin - --enable-pipes Use pipes for server/client communication --enable-msocket Use msocket for inter-server communication --enable-cobo Use msocket for inter-server communication --enable-numa Use libnuma to enable numa optimizations @@ -16734,16 +16730,8 @@ cat >>confdefs.h <<_ACEOF _ACEOF -#Runmode detection (pipe/socket or cobo/msocket communications) -CLIENT_SERVER_COM=pipes - +#Runmode detection (cobo/msocket communications for server/server) SERVER_SERVER_COM=cobo -# Check whether --enable-pipes was given. -if test "${enable_pipes+set}" = set; then : - enableval=$enable_pipes; CLIENT_SERVER_COM=pipes; -fi - - # Check whether --enable-msocket was given. if test "${enable_msocket+set}" = set; then : @@ -16756,14 +16744,6 @@ if test "${enable_cobo+set}" = set; then : fi - if test x$CLIENT_SERVER_COM == xpipes; then - PIPES_TRUE= - PIPES_FALSE='#' -else - PIPES_TRUE='#' - PIPES_FALSE= -fi - if test x$SERVER_SERVER_COM == xmsocket; then MSOCKET_TRUE= MSOCKET_FALSE='#' @@ -16781,11 +16761,9 @@ else fi -if test "x$CLIENT_SERVER_COM" == "xpipes"; then $as_echo "#define COMM_PIPES 1" >>confdefs.h -fi if test "x$SERVER_SERVER_COM" == "xmsocket"; then $as_echo "#define COMM_MSOCKET 1" >>confdefs.h @@ -16797,8 +16775,8 @@ $as_echo "#define COMM_COBO 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: Communication is $CLIENT_SERVER_COM/$SERVER_SERVER_COM" >&5 -$as_echo "$as_me: Communication is $CLIENT_SERVER_COM/$SERVER_SERVER_COM" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: Communication is pipes/$SERVER_SERVER_COM" >&5 +$as_echo "$as_me: Communication is pipes/$SERVER_SERVER_COM" >&6;} #Architecture detection if test "x$target_cpu" == "xx86_64"; then @@ -18247,10 +18225,6 @@ if test -z "${BLD_FLUXPLUGIN_TRUE}" && test -z "${BLD_FLUXPLUGIN_FALSE}"; then as_fn_error $? "conditional \"BLD_FLUXPLUGIN\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${PIPES_TRUE}" && test -z "${PIPES_FALSE}"; then - as_fn_error $? "conditional \"PIPES\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${MSOCKET_TRUE}" && test -z "${MSOCKET_FALSE}"; then as_fn_error $? "conditional \"MSOCKET\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/src/server/startup/Makefile.in b/src/server/startup/Makefile.in index 54c6cff5..887b820a 100644 --- a/src/server/startup/Makefile.in +++ b/src/server/startup/Makefile.in @@ -93,11 +93,10 @@ target_triplet = @target@ pkglibexec_PROGRAMS = spindle_be$(EXEEXT) @COBO_TRUE@am__append_1 = $(top_builddir)/auditserver/libaudit_server_cobo.la @MSOCKET_TRUE@am__append_2 = $(top_builddir)/auditserver/libaudit_server_msocket.la -@PIPES_TRUE@am__append_3 = $(top_builddir)/comlib/libserver_pipe.la -@USE_NUMA_TRUE@am__append_4 = -lnuma -@LINK_LIBSTDCXX_STATIC_TRUE@am__append_5 = $(STATIC_LIBGCC_OPT) -L. -@LMON_DYNAMIC_TRUE@@LMON_TRUE@am__append_6 = $(top_builddir)/launchmon/libbelmon.la $(LAUNCHMON_LIB) $(LAUNCHMON_RMCOMM) -lmonbeapi -lgcrypt -lpthread -@LMON_DYNAMIC_FALSE@@LMON_TRUE@am__append_7 = $(top_builddir)/launchmon/libbelmon.la $(LAUNCHMON_STATIC_LIBS) +@USE_NUMA_TRUE@am__append_3 = -lnuma +@LINK_LIBSTDCXX_STATIC_TRUE@am__append_4 = $(STATIC_LIBGCC_OPT) -L. +@LMON_DYNAMIC_TRUE@@LMON_TRUE@am__append_5 = $(top_builddir)/launchmon/libbelmon.la $(LAUNCHMON_LIB) $(LAUNCHMON_RMCOMM) -lmonbeapi -lgcrypt -lpthread +@LMON_DYNAMIC_FALSE@@LMON_TRUE@am__append_6 = $(top_builddir)/launchmon/libbelmon.la $(LAUNCHMON_STATIC_LIBS) subdir = startup ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ @@ -147,8 +146,9 @@ am__uninstall_files_from_dir = { \ LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) am__DEPENDENCIES_1 = am__DEPENDENCIES_2 = $(top_builddir)/logging/libspindledlogc.la \ - $(am__append_1) $(am__append_2) $(am__append_3) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__append_1) $(am__append_2) \ + $(top_builddir)/comlib/libserver_pipe.la $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) libspindlebe_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \ $(am__DEPENDENCIES_1) am__dirstamp = $(am__leading_dot)dirstamp @@ -465,8 +465,9 @@ AM_CPPFLAGS = -I$(top_srcdir)/../logging CORE_SOURCES = spindle_be.cc hookexec.c $(top_srcdir)/../utils/parseloc.c $(top_srcdir)/../utils/keyfile.c $(top_srcdir)/../utils/spindle_mkdir.c $(top_srcdir)/../utils/exitnote.c CORE_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/comlib -I$(top_srcdir)/cache -I$(top_srcdir)/auditserver -I$(top_srcdir)/../client/beboot -I$(top_srcdir)/../include -I$(top_srcdir)/../utils -I$(top_srcdir)/../cobo -DTRACK_MKDIR -DLOOKUP_PREV_MKDIR -DLIBEXECDIR=\"$(pkglibexecdir)\" CORE_LDADD = $(top_builddir)/logging/libspindledlogc.la -ldl \ - $(am__append_1) $(am__append_2) $(am__append_3) \ - $(am__append_4) $(GCRYPT_LIBS) + $(am__append_1) $(am__append_2) \ + $(top_builddir)/comlib/libserver_pipe.la $(am__append_3) \ + $(GCRYPT_LIBS) libspindlebe_la_CPPFLAGS = $(CORE_CPPFLAGS) -DSPINDLEBELIB libspindlebe_la_SOURCES = $(CORE_SOURCES) libspindlebe_la_LIBADD = $(CORE_LDADD) $(MUNGE_DYN_LIB) @@ -474,11 +475,11 @@ libspindlebe_la_LDFLAGS = -version-info $(SPINDLEBE_LIB_VERSION) libspindlebe_static_la_CPPFLAGS = $(libspindlebe_la_CPPFLAGS) libspindlebe_static_la_SOURCES = $(libspindlebe_la_SOURCES) libspindlebe_static_la_LIBADD = $(libspindlebe_la_LIBADD) -spindle_be_LDFLAGS = -static $(am__append_5) +spindle_be_LDFLAGS = -static $(am__append_4) spindle_be_CPPFLAGS = $(CORE_CPPFLAGS) spindle_be_SOURCES = spindle_be_main.cc spindle_be_serial.cc spindle_be_hostbin.cc spindle_be_mpilaunch.cc $(top_srcdir)/../utils/rshlaunch.c $(CORE_SOURCES) -spindle_be_LDADD = $(CORE_LDADD) $(MUNGE_LIBS) $(am__append_6) \ - $(am__append_7) +spindle_be_LDADD = $(CORE_LDADD) $(MUNGE_LIBS) $(am__append_5) \ + $(am__append_6) @LINK_LIBSTDCXX_STATIC_TRUE@CLEANFILES = ./libstdc++.a @LINK_LIBSTDCXX_STATIC_TRUE@BUILT_SOURCES = ./libstdc++.a all: $(BUILT_SOURCES) From 54da56b2f94933fd22ca54a916afc8b99f06f819 Mon Sep 17 00:00:00 2001 From: Barry Rountree Date: Fri, 31 Jul 2026 00:51:47 -0700 Subject: [PATCH 13/21] [prune-config] Removes --enable-[msocket|cobo], cobo now default. Per Claude Code + Opus. --- configure.common.ac | 23 +- src/fe/comlib/msocket_fe_comm.c | 232 ------- src/fe/startup/Makefile.am | 9 +- .../ldcs_audit_server_md_msocket.c | 567 ------------------ .../ldcs_audit_server_md_msocket.h | 100 --- .../ldcs_audit_server_md_msocket_topo.c | 282 --------- .../ldcs_audit_server_md_msocket_topo.h | 44 -- .../ldcs_audit_server_md_msocket_util.c | 304 ---------- .../ldcs_audit_server_md_msocket_util.h | 40 -- src/server/startup/Makefile.am | 9 +- 10 files changed, 5 insertions(+), 1605 deletions(-) delete mode 100644 src/fe/comlib/msocket_fe_comm.c delete mode 100644 src/server/auditserver/ldcs_audit_server_md_msocket.c delete mode 100644 src/server/auditserver/ldcs_audit_server_md_msocket.h delete mode 100644 src/server/auditserver/ldcs_audit_server_md_msocket_topo.c delete mode 100644 src/server/auditserver/ldcs_audit_server_md_msocket_topo.h delete mode 100644 src/server/auditserver/ldcs_audit_server_md_msocket_util.c delete mode 100644 src/server/auditserver/ldcs_audit_server_md_msocket_util.h diff --git a/configure.common.ac b/configure.common.ac index 91f76cfd..d2df132b 100644 --- a/configure.common.ac +++ b/configure.common.ac @@ -196,28 +196,11 @@ fi AC_DEFINE_UNQUOTED([BROKEN_SRUN],[$BROKEN_SRUN],[Whether we are using a broken srun]) AC_DEFINE_UNQUOTED([HAVE_SRUN_EXTERNAL_LAUNCHER],[$HAVE_EXT_LAUNCHER],[Whether srun supports --external-launcher]) -#Runmode detection (cobo/msocket communications for server/server) -SERVER_SERVER_COM=cobo - -AC_ARG_ENABLE(msocket, - [AS_HELP_STRING([--enable-msocket],[Use msocket for inter-server communication])], - [SERVER_SERVER_COM=msocket;],) -AC_ARG_ENABLE(cobo, - [AS_HELP_STRING([--enable-cobo],[Use msocket for inter-server communication])], - [SERVER_SERVER_COM=cobo;],) - -AM_CONDITIONAL([MSOCKET], [test x$SERVER_SERVER_COM == xmsocket]) -AM_CONDITIONAL([COBO], [test x$SERVER_SERVER_COM == xcobo]) - +#Communication modes AC_DEFINE([COMM_PIPES],[1],[Client/server communication uses pipes]) -if test "x$SERVER_SERVER_COM" == "xmsocket"; then - AC_DEFINE([COMM_MSOCKET],[1],[Define if were using msocket for server/server communication]) -fi -if test "x$SERVER_SERVER_COM" == "xcobo"; then - AC_DEFINE([COMM_COBO],[1],[Define if were using cobo for server/server communication]) -fi +AC_DEFINE([COMM_COBO],[1],[Server/server communication uses cobo]) -AC_MSG_NOTICE([Communication is pipes/$SERVER_SERVER_COM]) +AC_MSG_NOTICE([Communication is pipes/cobo]) #Architecture detection if test "x$target_cpu" == "xx86_64"; then diff --git a/src/fe/comlib/msocket_fe_comm.c b/src/fe/comlib/msocket_fe_comm.c deleted file mode 100644 index 33412c57..00000000 --- a/src/fe/comlib/msocket_fe_comm.c +++ /dev/null @@ -1,232 +0,0 @@ -/* -This file is part of Spindle. For copyright information see the COPYRIGHT -file in the top level directory, or at -https://github.com/hpc/Spindle/blob/master/COPYRIGHT - -This program is free software; you can redistribute it and/or modify it under -the terms of the GNU Lesser General Public License (as published by the Free Software -Foundation) version 2.1 dated February 1999. This program is distributed in the -hope that it will be useful, but WITHOUT ANY WARRANTY; without even the IMPLIED -WARRANTY OF MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms -and conditions of the GNU Lesser General Public License for more details. You should -have received a copy of the GNU Lesser General Public License along with this -program; if not, write to the Free Software Foundation, Inc., 59 Temple -Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -#include "ldcs_cobo.h" -#include "cobo_comm.h" -#include "spindle_debug.h" -#include "ldcs_api.h" -#include "fe_comm.h" -#include "config.h" - -struct ldcs_msocket_fe_data_struct -{ - int connid; -}; -typedef struct ldcs_msocket_fe_data_struct ldcs_msocket_fe_data_t; - -/* FRONT END functions */ -int ldcs_audit_server_fe_md_open ( char **hostlist, int hostlistsize, unsigned int port, void **data ) { - int rc=0; - int num_ports = 20; - int num_hosts = -1; - int* portlist = malloc(num_ports * sizeof(int)); - int i, sersize, connid; - char *serdata; - ldcs_message_t* msg; - ldcs_message_t *in_msg; - ldcs_msocket_hostinfo_t hostinfo; - int myerank, esize; - int *eportlist; - char **ehostlist; - ldcs_msocket_fe_data_t *fe_data; - - fe_data=(ldcs_msocket_fe_data_t *) malloc(sizeof(ldcs_msocket_fe_data_t)); - if(!fe_data) _error("could not allocate fe_data"); - - - /* get info about server over external fabric, if available */ - if(ldcs_msocket_external_fabric_CB_registered) { - - char buffer[MAX_PATH_LEN]; - rc=gethostname(buffer, MAX_PATH_LEN); - if(!strcmp(buffer,"zam371guest")) { - strcpy(buffer,"localhost"); - } - ldcs_msocket_external_fabric_CB(buffer, -1, &myerank, &esize, &ehostlist, &eportlist, ldcs_msocket_external_fabric_CB_data); - num_hosts=esize; - } else { - - num_hosts=hostlistsize; - /* build our portlist */ - for (i=0; iheader.type=LDCS_MSG_MD_HOSTINFO; - msg->header.mtype=LDCS_MSG_MTYPE_P2P; - msg->header.source=-1; msg->header.from=-1; - msg->header.dest=0; - msg->header.len=sizeof(hostinfo); - msg->alloclen=sizeof(hostinfo); - msg->data=(char *) &hostinfo; - - ldcs_send_msg_socket(connid,msg); - - if(!ldcs_msocket_external_fabric_CB_registered) { - - debug_printf3("processing hostlist of size %d\n",hostlistsize); - ldcs_audit_server_md_msocket_serialize_hostlist(hostlist, hostlistsize, &serdata, &sersize); - debug_printf3("serialized hostlist has size %d\n",sersize); - - /* message for hostlist */ - msg->header.type=LDCS_MSG_MD_HOSTLIST; - msg->header.mtype=LDCS_MSG_MTYPE_P2P; - msg->header.len=sersize; - msg->alloclen=sersize; - msg->data=serdata; - - /* sent message to first host */ - debug_printf3("send msg hostlist\n"); - ldcs_send_msg_socket(connid,msg); - } - - /* message for start of bootstrap */ - msg->header.type=LDCS_MSG_MD_BOOTSTRAP; - msg->header.mtype=LDCS_MSG_MTYPE_P2P; - msg->header.len=0; - msg->alloclen=0; - msg->data=NULL; - - /* sent message to first host */ - debug_printf3("send msg bootstrap\n"); - ldcs_send_msg_socket(connid,msg); - - /* message for ending bootstrap */ - msg->header.type=LDCS_MSG_MD_BOOTSTRAP_END; - msg->header.mtype=LDCS_MSG_MTYPE_BCAST; - msg->header.source=-1; msg->header.from=-1; msg->header.dest=-1; - msg->header.len=0; - msg->alloclen=0; - msg->data=NULL; - - /* sent message to first host */ - debug_printf3("send msg bootstrap end\n"); - ldcs_send_msg_socket(connid,msg); - - - /* receive msg from root node whether bootstrap ended */ - in_msg=ldcs_recv_msg_socket(connid, LDCS_READ_BLOCK); - if(in_msg->header.type==LDCS_MSG_MD_BOOTSTRAP_END_OK) { - fprintf(stderr, "SERVERFE: bootstrap --> successful\n"); - } else { - fprintf(stderr, "SERVERFE: bootstrap --> not successful\n"); - } - ldcs_msg_free(&in_msg); - - fe_data->connid=connid; - *data=fe_data; - - return(rc); - -} - -int ldcs_audit_server_fe_md_preload ( char *filename, void *data ) { - int rc=0; - char buffer[MAX_PATH_LEN]; - ldcs_msocket_fe_data_t *fe_data=(ldcs_msocket_fe_data_t *) data; - FILE * fp; - char * line = NULL, *p; - size_t len = 0; - ssize_t read; - ldcs_message_t out_msg; - ldcs_message_t *in_msg; - - fprintf(stderr,"SERVERFE: open file for list of library for preload: '%s'\n",filename); - fp = fopen(filename, "r"); - if (fp == NULL) { - fprintf(stderr,"SPINDLE FE: preloadfile not found: '%s' ... skipping \n",filename); - return(rc); - } - - out_msg.header.type=LDCS_MSG_PRELOAD_FILE; - out_msg.alloclen=MAX_PATH_LEN; out_msg.data=buffer; - - while( (read = getline(&line, &len, fp)) >= 0) { - - if( (p=strchr(line,'\n')) ) *p='\0'; - if( (p=strchr(line,' ')) ) *p='\0'; - strcpy(buffer,line); - - fprintf(stderr,"SERVERFE: found library for preload: '%s'\n",line); - if( buffer[0]=='#') continue; - - if ( strlen(buffer)==0 ) { - fprintf(stderr,"SERVERFE: unknown line: '%s'\n",buffer); - continue; - } - out_msg.header.len=strlen(buffer)+1; - - debug_printf3("SERVERFE: sent preload msg(%s) to tree root connid=%d\n",out_msg.data, fe_data->connid); - ldcs_send_msg_socket(fe_data->connid,&out_msg); - - fprintf(stderr, "SERVERFE: sent preload msg(%s) to tree root\n",out_msg.data); - - /* receive msg from root node */ - in_msg=ldcs_recv_msg_socket(fe_data->connid, LDCS_READ_BLOCK); - if(in_msg->header.type==LDCS_MSG_PRELOAD_FILE_OK) { - fprintf(stderr, "SERVERFE: --> successful\n"); - } else { - fprintf(stderr, "SERVERFE: --> not successful\n"); - } - ldcs_msg_free(&in_msg); - - } - fclose(fp); - if (line) free(line); - - return(rc); -} - -int ldcs_audit_server_fe_md_close ( void *data ) { - int rc=0; - -#if 0 - int root_fd, ack; - - cobo_server_get_root_socket(&root_fd); - - ldcs_cobo_read_fd(root_fd, &ack, sizeof(ack)); - printf("server_rsh_ldcs: got ack=%d from tree root\n",ack); - - ack=15; - ldcs_cobo_write_fd(root_fd, &ack, sizeof(ack)); - printf("server_rsh_ldcs: sent ack=%d to tree root\n",ack); - - /* open and close the server */ - cobo_server_close(); -#endif - - return(rc); -} diff --git a/src/fe/startup/Makefile.am b/src/fe/startup/Makefile.am index c4daceb3..7f67da5e 100644 --- a/src/fe/startup/Makefile.am +++ b/src/fe/startup/Makefile.am @@ -8,14 +8,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/../logging CORE_SOURCES = spindle_fe.cc parseargs.cc config_parser.cc config_mgr.cc parse_preload.cc $(top_srcdir)/../utils/pathfn.c $(top_srcdir)/../utils/keyfile.c $(top_srcdir)/../utils/parseloc.c $(top_srcdir)/../utils/rshlaunch.c CORE_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/../include -I$(top_srcdir)/comlib -I$(top_srcdir)/../server/cache -I$(top_srcdir)/../server/comlib -I$(top_srcdir)/../utils -I$(top_srcdir)/../cobo -DBINDIR=\"$(pkglibexecdir)\" -DLIBEXECDIR=\"$(pkglibexecdir)\" -DPROGLIBDIR=\"$(pkglibdir)\" -DPKGSYSCONFDIR=\"$(PKGSYSCONF_DIR)\" -CORE_LDADD = $(top_builddir)/logging/libspindleflogc.la -lpthread -if COBO -CORE_LDADD += $(top_builddir)/comlib/libfe_cobo.la $(top_builddir)/cobo/libldcs_cobo.la -endif -if MSOCKET -CORE_LDADD += $(top_builddir)/comlib/libfe_msocket.la -endif -CORE_LDADD += $(MUNGE_DYN_LIB) $(GCRYPT_LIBS) +CORE_LDADD = $(top_builddir)/logging/libspindleflogc.la -lpthread $(top_builddir)/comlib/libfe_cobo.la $(top_builddir)/cobo/libldcs_cobo.la $(MUNGE_DYN_LIB) $(GCRYPT_LIBS) libspindlefe_la_CPPFLAGS = $(CORE_CPPFLAGS) -DSPINDLEFELIB libspindlefe_la_SOURCES = $(CORE_SOURCES) diff --git a/src/server/auditserver/ldcs_audit_server_md_msocket.c b/src/server/auditserver/ldcs_audit_server_md_msocket.c deleted file mode 100644 index 5cfe9f2d..00000000 --- a/src/server/auditserver/ldcs_audit_server_md_msocket.c +++ /dev/null @@ -1,567 +0,0 @@ -/* -This file is part of Spindle. For copyright information see the COPYRIGHT -file in the top level directory, or at -https://github.com/hpc/Spindle/blob/master/COPYRIGHT - -This program is free software; you can redistribute it and/or modify it under -the terms of the GNU Lesser General Public License (as published by the Free Software -Foundation) version 2.1 dated February 1999. This program is distributed in the -hope that it will be useful, but WITHOUT ANY WARRANTY; without even the IMPLIED -WARRANTY OF MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms -and conditions of the GNU Lesser General Public License for more details. You should -have received a copy of the GNU Lesser General Public License along with this -program; if not, write to the Free Software Foundation, Inc., 59 Temple -Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -#include -#include -#include -#include -#include -#include - -#include "ldcs_api.h" -#include "ldcs_api_socket.h" -#include "ldcs_api_listen.h" -#include "ldcs_audit_server_process.h" -#include "ldcs_audit_server_filemngt.h" -#include "ldcs_audit_server_md.h" -#include "ldcs_audit_server_md_msocket.h" -#include "ldcs_audit_server_md_msocket_util.h" -#include "ldcs_audit_server_md_msocket_topo.h" -#include "ldcs_cache.h" - - -ldcs_msocket_data_t ldcs_msocket_data; - -/* callback to gather info from other server over external fabric (connecting server and frontend), e.g. COBO or MPI */ -/* gets local hostname and already openened listening port and returns rank and size of each server (rank of frontend=-1) */ -/* on rank 0 (root) it should return hostlist and portlist of all servers */ -/* on rank -1 (FE) it should return in hostlist and portlist info about root server */ - -int ldcs_msocket_external_fabric_CB_registered=0; -int(*ldcs_msocket_external_fabric_CB) ( char *myhostname, int myport, int *myrank, int *size, char ***hostlist, int **portlist, - void *data ); -void* ldcs_msocket_external_fabric_CB_data=NULL; - -int _ldcs_audit_server_md_msocket_init_CB ( int fd, int nc, void *data ); -int _ldcs_audit_server_md_msocket_comm_CB ( int fd, int nc, void *data ); -int _ldcs_audit_server_md_cobo_bcast_msg ( ldcs_process_data_t *data, ldcs_message_t *msg ); - -int ldcs_register_external_fabric_CB( int cb ( char*, int, int*, int*, char***, int**, void *), - void *data) { - int rc=0; - ldcs_msocket_external_fabric_CB_registered=1; - ldcs_msocket_external_fabric_CB=cb; - ldcs_msocket_external_fabric_CB_data=data; - return(rc); -} - -int ldcs_audit_server_md_init ( ldcs_process_data_t *ldcs_process_data ) { - int rc=0; - - char* ldcs_nportsstr=getenv("LDCS_NPORTS"); - - int usedport; - int serverfd, serverid, i; - - ldcs_msocket_data.default_num_ports = 20; - if(ldcs_nportsstr) { - ldcs_msocket_data.default_num_ports=atoi(ldcs_nportsstr); - } - ldcs_msocket_data.default_portlist = malloc(ldcs_msocket_data.default_num_ports * sizeof(int)); - if(!ldcs_msocket_data.default_portlist) _error("could not allocate portlist"); - for (i=0; ilocation, - ldcs_msocket_data.default_portlist, ldcs_msocket_data.default_num_ports, - &usedport); - if (serverid<0) { - _error("Failed to init msocket\n"); - } - serverfd=ldcs_get_fd_socket(serverid); - - /* init data structure */ - ldcs_msocket_data.serverfd=serverfd; - ldcs_msocket_data.serverid=serverid; - { - char buffer[MAX_PATH_LEN]; - rc=gethostname(buffer, MAX_PATH_LEN); - if(!strcmp(buffer,"zam371guest")) { - strcpy(buffer,"localhost"); - } - ldcs_msocket_data.hostname=strdup(buffer); - ldcs_msocket_data.server_stat.hostname=strdup(buffer); - } - ldcs_msocket_data.procdata=ldcs_process_data; - - ldcs_msocket_data.hostinfo.rank=-2; /* not yet identified */ - ldcs_msocket_data.hostlist=NULL; - - /* if external fabric: distribute and/or get data about local contact info */ - if(ldcs_msocket_external_fabric_CB_registered) { - int myerank,esize; - int *eportlist; - char **ehostlist; - ldcs_msocket_external_fabric_CB(ldcs_msocket_data.hostname, usedport, &myerank, &esize, &ehostlist, &eportlist, ldcs_msocket_external_fabric_CB_data); - ldcs_process_data->md_rank=myerank; - ldcs_process_data->md_size=esize; - ldcs_msocket_data.hostinfo.rank=myerank; - ldcs_msocket_data.hostinfo.size=esize; - ldcs_msocket_data.hostlist=ehostlist; - ldcs_msocket_data.portlist=eportlist; - } - - /* register server listen fd to listener */ - ldcs_listen_register_fd(serverfd, serverid, &_ldcs_audit_server_md_msocket_server_CB, (void *) &ldcs_msocket_data); - - /* go into listen loop to enable startup CB functions, - the listen loop will exists after startup ofd msocket is completed */ - debug_printf3("msocket listen loop starting\n"); - ldcs_listen(); - debug_printf3("msocket listen loop finished\n"); - - ldcs_listen_unregister_fd(serverfd); - - return(rc); -} - -int ldcs_audit_server_md_distribute ( ldcs_process_data_t *ldcs_process_data, ldcs_message_t* msg) { - int rc=0; - - /* rc=_ldcs_audit_server_md_cobo_bcast_msg(ldcs_process_data, msg); */ - - msg->header.mtype=LDCS_MSG_MTYPE_BCAST; - msg->header.dest=-1; - msg->header.source=ldcs_msocket_data.hostinfo.rank; msg->header.from=ldcs_msocket_data.hostinfo.rank; - - /* sent message to first host */ - debug_printf3("route bcast msg %d->%d\n",msg->header.source, msg->header.dest); - ldcs_audit_server_md_msocket_route_msg(&ldcs_msocket_data, msg); - - return(rc); -} - - -int ldcs_audit_server_md_register_fd ( ldcs_process_data_t *ldcs_process_data ) { - int rc=0; - debug_printf3("call not used for md_msocket\n"); - return(rc); -} - -int ldcs_audit_server_md_unregister_fd ( ldcs_process_data_t *ldcs_process_data ) { - int rc=0; - - /* callbacks for md connections are further on needed for bringing down network */ - /* therefore: instead of unregister those, a direct signal is send to listener to end */ - /* the listener will startet again in md_destroy */ - ldcs_listen_signal_end_listen_loop(); - - /* unregister all fds */ - /* ldcs_listen_unregister_fd(parent_fd); */ - - return(rc); -} - -int ldcs_audit_server_md_destroy ( ldcs_process_data_t *ldcs_process_data ) { - int rc=0; - ldcs_message_t *msg=ldcs_msg_new(); - - /* TODO: implement bringdown procedure */ - -#if 0 - if(ldcs_process_data->md_rank==0) { - int root_fd, ack=14; - - /* send all other server signal to stop */ - msg->header.type=LDCS_MSG_END; - msg->header.len=0; - _ldcs_audit_server_md_cobo_bcast_msg(ldcs_process_data, msg); - - /* send all other server signal to destroy */ - msg->header.type=LDCS_MSG_DESTROY; - msg->header.len=0; - _ldcs_audit_server_md_cobo_bcast_msg(ldcs_process_data, msg); - - /* send fe client sognal to stop (ack) */ - cobo_get_parent_socket(&root_fd); - - ldcs_cobo_write_fd(root_fd, &ack, sizeof(ack)); - debug_printf3("sent FE client signal to stop %d\n",ack); - - ldcs_cobo_read_fd(root_fd, &ack, sizeof(ack)); - debug_printf3("read from FE client ack to signal to stop %d\n",ack); - } else { - - /* receive all other server signal to destroy */ - msg->header.type=LDCS_MSG_DESTROY; - msg->header.len=0; - _ldcs_audit_server_md_cobo_bcast_msg(ldcs_process_data, msg); - } - - if (cobo_close() != COBO_SUCCESS) { - debug_printf3("Failed to close\n"); - printf("Failed to close\n"); - exit(1); - } - -#endif - ldcs_msg_free(&msg); - - return(rc); -} - - -int ldcs_audit_server_md_is_responsible ( ldcs_process_data_t *ldcs_process_data, char *filename ) { - int rc=0; - - /* this is the place to aplly the mapping function later on */ - - /* current implementation: only MD rank does file operations */ - if(ldcs_process_data->md_rank==0) { - rc=1; - } else { - rc=0; - } - - debug_printf3("responsible: fn=%s rank=%d --> %s \n",filename, ldcs_process_data->md_rank, (rc)?"YES":"NO"); - - return(rc); -} - -int ldcs_audit_server_md_distribution_required ( ldcs_process_data_t *ldcs_process_data, char *msg ) { - int rc=0; - - /* do distribution of data if more than one server available */ - if(ldcs_process_data->md_size>1) { - rc=1; - } else { - rc=0; - } - return(rc); -} - -int ldcs_audit_server_md_forward_query(ldcs_process_data_t *ldcs_process_data, ldcs_message_t* msg) { - int rc=0; - - /* currently not implemented */ - - return(rc); -} - -int _ldcs_audit_server_md_msocket_server_CB ( int infd, int serverid, void *data ) { - int rc=0; - ldcs_msocket_data_t *ldcs_msocket_data = (ldcs_msocket_data_t *) data ; - int nc, fd, more_avail; - double cb_starttime; - - cb_starttime=ldcs_get_time(); - - debug_printf3("starting callback\n"); - - more_avail=1; - while(more_avail) { - - /* add new connection */ - nc=ldcs_audit_server_md_msocket_get_free_connection_table_entry (ldcs_msocket_data); - - ldcs_msocket_data->connection_table[nc].connid = ldcs_open_server_connections_socket(serverid,&more_avail); - ldcs_msocket_data->connection_table[nc].state = LDCS_CONNECTION_STATUS_ACTIVE; - ldcs_msocket_data->connection_table[nc].null_msg_cnt = 0; - ldcs_msocket_data->connection_table[nc].remote_rank = -2; /* not yet identified */ - printf("SERVER[%02d]: open connection on host %s #c=%02d at %12.4f\n", ldcs_msocket_data->md_rank, - ldcs_msocket_data->hostname, - ldcs_msocket_data->connection_counter,ldcs_get_time()); - - /* register connection fd to listener */ - fd=ldcs_get_fd_socket(ldcs_msocket_data->connection_table[nc].connid); - ldcs_listen_register_fd(fd, nc, &_ldcs_audit_server_md_msocket_connection_CB, (void *) ldcs_msocket_data); - ldcs_msocket_data->server_stat.num_connections++; - } - - /* remember timestamp of connect of first connection */ - if(ldcs_msocket_data->server_stat.starttime<0) { - ldcs_msocket_data->server_stat.starttime=cb_starttime; - } - ldcs_msocket_data->server_stat.server_cb.cnt++; - ldcs_msocket_data->server_stat.server_cb.time+=(ldcs_get_time()-cb_starttime); - - debug_printf3("ending callback\n"); - - return(rc); -} - - -int _ldcs_audit_server_md_msocket_connection_CB ( int fd, int nc, void *data ) { - int rc=0; - ldcs_msocket_data_t *ldcs_msocket_data = (ldcs_msocket_data_t *) data ; - ldcs_process_data_t *ldcs_process_data = ldcs_msocket_data->procdata ; - ldcs_message_t *msg, *out_msg; - double starttime,cb_starttime; -#ifdef LDCSDEBUG - double msg_time; -#endif - int connid, do_route, do_process; - cb_starttime=ldcs_get_time(); - - connid=ldcs_msocket_data->connection_table[nc].connid; - debug_printf3("starting callback for fd=%d nc=%d connid=%d lfd=%d rrank=%d\n",fd,nc,connid,ldcs_get_fd(connid),ldcs_msocket_data->connection_table[nc].remote_rank); - - /* get message */ - starttime=ldcs_get_time(); - msg=ldcs_recv_msg_socket(connid, LDCS_READ_BLOCK); -#ifdef LDCSDEBUG - msg_time=ldcs_get_time()-starttime; - debug_printf3("received message on connection nc=%d connid=%d routing: %d -> %d %s %s (%10.4fs) \n", nc, connid, - msg->header.source, msg->header.dest, - _message_type_to_str(msg->header.type),(msg->header.mtype==LDCS_MSG_MTYPE_P2P)?"P2P":"BCAST", msg_time); -#endif - - /* check if msg dest is not addressed me or must be bcast */ - - if ( msg->header.type==LDCS_MSG_MD_HOSTINFO ) { - /* no hostinfo up to now */ - do_route=0; do_process=1; - } else { - if (msg->header.mtype==LDCS_MSG_MTYPE_P2P) { - if (msg->header.dest==ldcs_msocket_data->hostinfo.rank) { - do_route=0;do_process=1; - } else { - do_route=1;do_process=0; - } - } else { - /* bcast */ - do_route=1; do_process=1; - } - } - - debug_printf3("do_route=%d, do_process=%d \n", do_route, do_process); - - if(do_route) { - ldcs_audit_server_md_msocket_route_msg(ldcs_msocket_data, msg); - } - - if(!do_process) { - ldcs_msg_free(&msg); - return(rc); - } - - /* otherwise process message */ - switch(msg->header.type) { - - case LDCS_MSG_PRELOAD_FILE: - { - debug_printf3("MDSERVER[%02d]: new preload file name received %d (%s)\n", - ldcs_process_data->md_rank,msg->header.len, msg->data); - - - /* send bootstrap msg to client */ - out_msg=ldcs_msg_new(); - out_msg->header.mtype=LDCS_MSG_MTYPE_P2P; - out_msg->header.dest=-1; - out_msg->header.source=ldcs_msocket_data->hostinfo.rank; out_msg->header.from=ldcs_msocket_data->hostinfo.rank; - out_msg->header.len=0; out_msg->alloclen=0; out_msg->data=NULL; - - /* send ack */ - if(rc==1) { - out_msg->header.type=LDCS_MSG_PRELOAD_FILE_OK; - } else { - out_msg->header.type=LDCS_MSG_PRELOAD_FILE_NOT_FOUND; - } - - ldcs_send_msg_socket(connid,out_msg); - - } - break; - - case LDCS_MSG_MD_HOSTINFO: - { - - /* store info about local server only, action at hostlist msg */ - ldcs_msocket_hostinfo_t *hostinfo=(ldcs_msocket_hostinfo_t *) msg->data; - debug_printf3("HOSTINFO: received %d of %d (%d of %d)\n", hostinfo->rank, hostinfo->size, ldcs_msocket_data->hostinfo.rank, ldcs_msocket_data->hostinfo.size); - if(ldcs_msocket_data->hostinfo.rank>=0) { - if(ldcs_msocket_data->hostinfo.rank!=hostinfo->rank) { - _error("different rank from external fabric ..."); - } - } - ldcs_msocket_data->hostinfo.rank=hostinfo->rank; ldcs_msocket_data->hostinfo.size=hostinfo->size; - ldcs_msocket_data->hostinfo.topo=hostinfo->topo; - ldcs_process_data->md_rank=hostinfo->rank; - ldcs_process_data->md_size=hostinfo->size; - - /* info about connection */ - ldcs_msocket_data->connection_table[nc].remote_rank = msg->header.from; - - /* get info about connection? */ - if(ldcs_msocket_data->connection_table[nc].remote_rank!=-2) { - ldcs_msocket_data->connection_table[nc].remote_rank = msg->header.from; - - /* Is this connection part of topo? */ - if ( (hostinfo->cinfo_to==ldcs_process_data->md_rank) && - (hostinfo->cinfo_from>=0) ) { - ldcs_msocket_data->connection_table[nc].ctype=LDCS_CONNECTION_TYPE_TOPO; - /* pocess more info, e.g. dir ... */ - } else { - ldcs_msocket_data->connection_table[nc].ctype=LDCS_CONNECTION_TYPE_CONTROL; - } - } - debug_printf3("MDSERVER[%02d]: hostinfo received from %d (%d of %d, depth %d)\n",ldcs_process_data->md_rank, - msg->header.source, hostinfo->rank,hostinfo->size,hostinfo->depth); - } - break; - - case LDCS_MSG_MD_HOSTLIST: - { - int rank; - - ldcs_msocket_data->hostlist = (char**) malloc(ldcs_process_data->md_size * sizeof(char*)); - if(!ldcs_msocket_data->hostlist) _error("could not allocate hostlist"); - ldcs_msocket_data->portlist = malloc(ldcs_process_data->md_size * sizeof(int)); - if(!ldcs_msocket_data->portlist) _error("could not allocate portlist"); - - for(rank=0;rankmd_size;rank++) { - ldcs_msocket_data->hostlist[rank]=ldcs_audit_server_md_msocket_expand_hostname(msg->data,msg->header.len,rank); - ldcs_msocket_data->portlist[rank]=-1; - } - debug_printf3("MDSERVER: hostlist received from %d (%d bytes)\n",ldcs_process_data->md_rank,msg->header.len); - - } - break; - - - case LDCS_MSG_MD_BOOTSTRAP: - { - if(ldcs_msocket_data->hostinfo.rank==0) { - debug_printf3("MDSERVER: initiate bootstrap of network topology on root node\n"); - ldcs_audit_server_md_msocket_init_topo_bootstrap(ldcs_msocket_data); - } else { - debug_printf3("MDSERVER: run bootstrap of network topology on non-root node\n"); - ldcs_audit_server_md_msocket_run_topo_bootstrap(ldcs_msocket_data, (char *) msg->data, msg->header.len); - } - - } - break; - - case LDCS_MSG_MD_BOOTSTRAP_END: - { - /* ToDo: change to BARRIER over MD server */ - - - /* sent message to first host */ - debug_printf3("switch off initial listening for bootstrap\n"); - - /* signal listener, that listen loop should be ended */ - ldcs_listen_signal_end_listen_loop(); - - if(ldcs_msocket_data->hostinfo.rank==0) { - - out_msg=ldcs_msg_new(); - - /* signal fe that bootstrap is ready */ - out_msg->header.type=LDCS_MSG_MD_BOOTSTRAP_END_OK; - out_msg->header.mtype=LDCS_MSG_MTYPE_P2P; - out_msg->header.dest=-1; - out_msg->header.source=ldcs_msocket_data->hostinfo.rank; out_msg->header.from=ldcs_msocket_data->hostinfo.rank; - out_msg->header.len=0; out_msg->alloclen=0; out_msg->data=NULL; - - - /* sent message to first host */ - debug_printf3("send msg bootstrap end ok\n"); - ldcs_send_msg_socket(connid,out_msg); - - ldcs_msg_free(&out_msg); - - } - - - - } - break; - - case LDCS_MSG_CACHE_ENTRIES: - { - debug_printf3("MDSERVER[%02d]: new cache entries received, insert %d bytes in local cache\n", - ldcs_process_data->md_rank,msg->header.len); - /* printf("MDSERVER[%02d]: recvd NEW ENTRIES: \n", ldcs_process_data->md_rank); */ - - ldcs_process_data->server_stat.distdir.cnt++; - ldcs_process_data->server_stat.distdir.bytes+=msg->header.len; - ldcs_process_data->server_stat.distdir.time+=(ldcs_get_time()-starttime); - -#warning Fix here - //ldcs_cache_storeNewEntriesSerList(msg->data,msg->header.len); - - /* _ldcs_client_process_clients_requests_after_update( ldcs_process_data ); */ - } - break; - - case LDCS_MSG_FILE_DATA: - { - char *filename, *dirname, *localpath; - double starttime; - int domangle; - - debug_printf3("MDSERVER[%02d]: new cache entries received, insert %d bytes in local cache\n", - ldcs_process_data->md_rank,msg->header.len); - /* printf("MDSERVER[%02d]: recvd NEW ENTRIES: \n", ldcs_process_data->md_rank); */ - - /* store file */ - starttime=ldcs_get_time(); -#warning Fix here - //rc=ldcs_audit_server_filemngt_store_file(msg, &filename, &dirname, &localpath, &domangle); - ldcs_process_data->server_stat.libstore.cnt++; - ldcs_process_data->server_stat.libstore.bytes+=rc; - ldcs_process_data->server_stat.libstore.time+=(ldcs_get_time()-starttime); - - /* update cache */ - ldcs_cache_updateLocalPath(filename, dirname, localpath); - ldcs_cache_updateStatus(filename, dirname, LDCS_CACHE_OBJECT_STATUS_LOCAL_PATH); - free(filename); free(dirname); free(localpath); - - ldcs_process_data->server_stat.libdist.cnt++; - ldcs_process_data->server_stat.libdist.bytes+=msg->header.len; - ldcs_process_data->server_stat.libdist.time+=(ldcs_get_time()-starttime); - - _ldcs_client_process_clients_requests_after_update( ldcs_process_data ); - - } - break; - - case LDCS_MSG_END: - { - debug_printf3("MDSERVER[%02d]: END message received \n", ldcs_process_data->md_rank); - - ldcs_audit_server_md_unregister_fd ( ldcs_process_data ); - - ldcs_process_data->md_size=1; - - _ldcs_client_process_clients_requests_after_end( ldcs_process_data ); - } - break; - - default: ; - { - debug_printf3("MDSERVER[%03d]: recvd unknown message of type: %s len=%d data=%s ...\n", - ldcs_process_data->md_rank, - _message_type_to_str(msg->header.type), - msg->header.len, msg->data ); - printf("MDSERVER[%03d]: recvd unknown message of type: %s len=%d data=%s ...\n", ldcs_process_data->md_rank, - _message_type_to_str(msg->header.type), - msg->header.len, msg->data ); - _error("wrong message"); - } - break; - } - ldcs_process_data->server_stat.md_cb.cnt++; - ldcs_process_data->server_stat.md_cb.time+=(ldcs_get_time()-cb_starttime); - - ldcs_msg_free(&msg); - - return(rc); -} - diff --git a/src/server/auditserver/ldcs_audit_server_md_msocket.h b/src/server/auditserver/ldcs_audit_server_md_msocket.h deleted file mode 100644 index 6b4ef22e..00000000 --- a/src/server/auditserver/ldcs_audit_server_md_msocket.h +++ /dev/null @@ -1,100 +0,0 @@ -/* -This file is part of Spindle. For copyright information see the COPYRIGHT -file in the top level directory, or at -https://github.com/hpc/Spindle/blob/master/COPYRIGHT - -This program is free software; you can redistribute it and/or modify it under -the terms of the GNU Lesser General Public License (as published by the Free Software -Foundation) version 2.1 dated February 1999. This program is distributed in the -hope that it will be useful, but WITHOUT ANY WARRANTY; without even the IMPLIED -WARRANTY OF MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms -and conditions of the GNU Lesser General Public License for more details. You should -have received a copy of the GNU Lesser General Public License along with this -program; if not, write to the Free Software Foundation, Inc., 59 Temple -Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -#ifndef LDCS_AUDIT_SERVER_MD_MSOCKET_H -#define LDCS_AUDIT_SERVER_MD_MSOCKET_H - -#include "ldcs_audit_server_process.h" - -/* connection description structure */ -typedef enum { - LDCS_TOPO_TYPE_MULTI_BINOM_TREE, - LDCS_TOPO_TYPE_BINOM_TREE, - LDCS_TOPO_TYPE_BIN_TREE, - LDCS_TOPO_TYPE_RING, - LDCS_TOPO_TYPE_UNKNOWN -} ldcs_topo_type_t; - - -struct ldcs_msocket_hostinfo_struct -{ - int rank; - int size; - int depth; - int cinfo_from; /* contains info about new connection */ - int cinfo_to; - /* int cinfo_dir; */ - ldcs_topo_type_t topo; -}; -typedef struct ldcs_msocket_hostinfo_struct ldcs_msocket_hostinfo_t; - -/* connection description structure */ -typedef enum { - LDCS_CONNECTION_STATUS_ACTIVE, - LDCS_CONNECTION_STATUS_ENDED, - LDCS_CONNECTION_STATUS_FREE, - LDCS_CONNECTION_STATUS_UNKNOWN -} ldcs_connection_status_t; - -typedef enum { - LDCS_CONNECTION_TYPE_CONTROL, - LDCS_CONNECTION_TYPE_TOPO, - LDCS_CONNECTION_TYPE_UNKNOWN -} ldcs_connection_type_t; - -struct ldcs_connection_struct -{ - int connid; - int null_msg_cnt; - ldcs_connection_status_t state; - int remote_rank; - ldcs_connection_type_t ctype; -}; -typedef struct ldcs_connection_struct ldcs_connection_t; - -struct ldcs_msocket_data_struct -{ - int serverid; /* e.g. listening socket */ - int serverfd; - int md_rank; - int md_size; - char *hostname; - int connection_table_size; - int connection_table_used; - int connections_connected; - int connection_counter; - ldcs_connection_t* connection_table; - - ldcs_msocket_hostinfo_t hostinfo; - ldcs_process_data_t *procdata; - - /* port to be tests if exact port number not is known */ - int *default_portlist; - int default_num_ports; - - /* info about all hosts */ - char **hostlist; /* of length md_size */ - int *portlist; /* of length md_size, -1 -> no port info, use default sequence */ - - /* statistics */ - ldcs_server_stat_t server_stat; -}; -typedef struct ldcs_msocket_data_struct ldcs_msocket_data_t; - -int _ldcs_audit_server_md_msocket_server_CB ( int fd, int nc, void *data ); -int _ldcs_audit_server_md_msocket_connection_CB ( int fd, int nc, void *data ); - -#endif diff --git a/src/server/auditserver/ldcs_audit_server_md_msocket_topo.c b/src/server/auditserver/ldcs_audit_server_md_msocket_topo.c deleted file mode 100644 index f482a847..00000000 --- a/src/server/auditserver/ldcs_audit_server_md_msocket_topo.c +++ /dev/null @@ -1,282 +0,0 @@ -/* -This file is part of Spindle. For copyright information see the COPYRIGHT -file in the top level directory, or at -https://github.com/hpc/Spindle/blob/master/COPYRIGHT - -This program is free software; you can redistribute it and/or modify it under -the terms of the GNU Lesser General Public License (as published by the Free Software -Foundation) version 2.1 dated February 1999. This program is distributed in the -hope that it will be useful, but WITHOUT ANY WARRANTY; without even the IMPLIED -WARRANTY OF MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms -and conditions of the GNU Lesser General Public License for more details. You should -have received a copy of the GNU Lesser General Public License along with this -program; if not, write to the Free Software Foundation, Inc., 59 Temple -Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -#include -#include -#include -#include -#include -#include - -#include "ldcs_api.h" -#include "ldcs_api_socket.h" -#include "ldcs_api_listen.h" -#include "ldcs_audit_server_md_msocket.h" -#include "ldcs_audit_server_md_msocket_util.h" -#include "ldcs_audit_server_md_msocket_topo.h" - -int compute_binom_tree(int size, int **connlist, int *connlistsize, int *max_connections); - -int ldcs_audit_server_md_msocket_init_topo_bootstrap(ldcs_msocket_data_t *ldcs_msocket_data) { - int rc=0; - int rank, c, dest; - int *connlist,connlistsize, max_connections; - int sersize; - char *serdata; - int *reachable; - ldcs_msocket_hostinfo_t *hostinfo=&ldcs_msocket_data->hostinfo; - ldcs_msocket_bootstrap_t *bootstrap; - - /* allocate init reachable list */ - reachable=(int *) malloc(hostinfo->size * sizeof(int)); - if(!reachable) _error("could noy allocate memory for reachable list"); - reachable[0]=1; for(rank=1;ranksize;rank++) reachable[rank]=0; - - compute_binom_tree(hostinfo->size, &connlist, &connlistsize, &max_connections); - - for(c=0;c %2d \n",connlist[2*c+0],connlist[2*c+1]); - } - - /* allocate bootstrap data structure */ - bootstrap=ldcs_audit_server_md_msocket_new_bootstrap(max_connections); - - for(rank=0;ranksize;rank++) { - /* search connlist for rank and build bootstrap data - structure,incl. hostname info */ - bootstrap->size=0; - for(c=0;cfromlist[bootstrap->size]=connlist[2*c+0]; - dest=connlist[2*c+1]; - bootstrap->tolist[bootstrap->size]=dest; - bootstrap->tohostlist[bootstrap->size]=ldcs_msocket_data->hostlist[dest]; /* no copy of char !!! */ - bootstrap->toportlist[bootstrap->size]=ldcs_msocket_data->portlist[dest]; - bootstrap->size++; - } - } - - if(rank==0) { - /* apply bootstrap (connect to childs, send hostinfo) */ - _ldcs_audit_server_md_msocket_run_topo_bootstrap(ldcs_msocket_data, bootstrap); - } else { - - if(bootstrap->size>0) { - ldcs_message_t* msg; - msg=ldcs_msg_new(); - - /* serialize bootstrap info */ - ldcs_audit_server_md_msocket_serialize_bootstrap(bootstrap, &serdata, &sersize); - - /* send bootstrap msg to client */ - msg->header.type=LDCS_MSG_MD_BOOTSTRAP; msg->header.mtype=LDCS_MSG_MTYPE_P2P; - msg->header.dest=rank; - msg->header.source=ldcs_msocket_data->hostinfo.rank; msg->header.from=ldcs_msocket_data->hostinfo.rank; - msg->header.len=sersize; msg->alloclen=sersize; - msg->data=serdata; - - /* sent message to first host */ - debug_printf3("rank=%d route bootstrap msg %d->%d\n",rank,msg->header.source, msg->header.dest); - - ldcs_audit_server_md_msocket_route_msg(ldcs_msocket_data, msg); - - free(serdata);msg->data=NULL; - ldcs_msg_free(&msg); - } - } - - } - - free(reachable); - ldcs_audit_server_md_msocket_free_bootstrap(bootstrap); - return(rc); -} - -int ldcs_audit_server_md_msocket_run_topo_bootstrap(ldcs_msocket_data_t *ldcs_msocket_data, char *serbootinfo, int serbootlen) { - int rc=0; - ldcs_msocket_bootstrap_t *bootstrap; - - rc=ldcs_audit_server_md_msocket_deserialize_bootstrap(serbootinfo, serbootlen, &bootstrap); - if(!rc) { - _ldcs_audit_server_md_msocket_run_topo_bootstrap(ldcs_msocket_data, bootstrap); - ldcs_audit_server_md_msocket_free_bootstrap(bootstrap); - } - return(rc); -} - -int _ldcs_audit_server_md_msocket_run_topo_bootstrap(ldcs_msocket_data_t *ldcs_msocket_data, ldcs_msocket_bootstrap_t *bootstrap) { - int rc=0; - int c, connid, nc, fd; - ldcs_message_t* msg; - ldcs_msocket_hostinfo_t hostinfo; - - debug_printf3("starting run bootstrab ..\n"); - ldcs_audit_server_md_msocket_dump_bootstrap(bootstrap); - - for(c=0;csize;c++) { - - if(bootstrap->toportlist[c]>=0) { - connid=ldcs_audit_server_md_msocket_connect(bootstrap->tohostlist[c],&bootstrap->toportlist[c], 1); - } else { - connid=ldcs_audit_server_md_msocket_connect(bootstrap->tohostlist[c], - ldcs_msocket_data->default_portlist, ldcs_msocket_data->default_num_ports); - } - if(connid<=0) { - _error("problems connecting child ..."); - } - /* store connection */ - nc=ldcs_audit_server_md_msocket_get_free_connection_table_entry (ldcs_msocket_data); - ldcs_msocket_data->connection_table[nc].connid = connid; - ldcs_msocket_data->connection_table[nc].state = LDCS_CONNECTION_STATUS_ACTIVE; - ldcs_msocket_data->connection_table[nc].null_msg_cnt = 0; - ldcs_msocket_data->connection_table[nc].remote_rank = bootstrap->tolist[c]; - printf("SERVER[%02d]: open connection on host %s #nc=%02d rrank=%d at %12.4f\n", ldcs_msocket_data->md_rank, - ldcs_msocket_data->hostname, - nc, ldcs_msocket_data->connection_table[nc].remote_rank,ldcs_get_time()); - - debug_printf3("SERVER[%02d]: open connection on host %s #c=%02d rrank=%d at %12.4f\n", ldcs_msocket_data->md_rank, - ldcs_msocket_data->hostname, ldcs_msocket_data->connection_counter, - ldcs_msocket_data->connection_table[nc].remote_rank,ldcs_get_time()); - - /* register connection fd to listener */ - fd=ldcs_get_fd_socket(ldcs_msocket_data->connection_table[nc].connid); - ldcs_listen_register_fd(fd, nc, &_ldcs_audit_server_md_msocket_connection_CB, (void *) ldcs_msocket_data); - ldcs_msocket_data->server_stat.num_connections++; - - /* send hostinfo */ - /* message for hostinfo */ - debug_printf3("send msg hostinfo\n"); - msg=ldcs_msg_new(); - - hostinfo.rank=bootstrap->tolist[c]; hostinfo.size=ldcs_msocket_data->hostinfo.size; - hostinfo.depth=0; - hostinfo.cinfo_from=bootstrap->fromlist[c]; hostinfo.cinfo_to=bootstrap->tolist[c]; - - msg->header.type=LDCS_MSG_MD_HOSTINFO; msg->header.mtype=LDCS_MSG_MTYPE_P2P; - msg->header.dest=bootstrap->tolist[c]; - msg->header.source=ldcs_msocket_data->hostinfo.rank; msg->header.from=ldcs_msocket_data->hostinfo.rank; - msg->header.len=sizeof(hostinfo); msg->alloclen=sizeof(hostinfo); msg->data=(char *) &hostinfo; - ldcs_send_msg_socket(connid,msg); - msg->data=NULL;ldcs_msg_free(&msg); - - } - - return(rc); -} - - -int ldcs_audit_server_md_msocket_route_msg(ldcs_msocket_data_t *ldcs_msocket_data, ldcs_message_t *msg) { - return(ldcs_audit_server_md_msocket_route_msg_binom_tree(ldcs_msocket_data, msg)); -} - -int compute_connections(int size, int **connlist, int *connlistsize, int *max_connections) { - return(compute_binom_tree(size, connlist, connlistsize, max_connections)); -} - -int ldcs_audit_server_md_msocket_route_msg_binom_tree(ldcs_msocket_data_t *ldcs_msocket_data, ldcs_message_t *msg) { - int rrank, nc, found, foundnc, maxrank; - int rc=0; - int dest=msg->header.dest; - - debug_printf3("start route on msg %s %d -> %d -> %d\n",_message_type_to_str(msg->header.type),msg->header.source, msg->header.from, msg->header.dest); - - if(msg->header.mtype==LDCS_MSG_MTYPE_P2P) { - found=0; foundnc=-1;maxrank=-1; - /* searching for max remote rank which less than dest */ - for(nc=0;(ncconnection_table_used) && (!found);nc++) { - rrank=ldcs_msocket_data->connection_table[nc].remote_rank; - debug_printf3(" check for msg with dest %d child nc=%d with rrank=%d maxrank=%d\n",dest,nc,rrank,maxrank); - if(rrank<0) continue; /* not to front end */ - if(rrank==dest) { - found=1;foundnc=nc;maxrank=rrank; - } - if(rrankmaxrank) { - foundnc=nc;maxrank=rrank; - } - } - } - if(found || (foundnc>=0) ) { - debug_printf3("SEND msg with dest %d child nc=%d with rrank=%d connid=%d\n",dest,foundnc,maxrank,ldcs_msocket_data->connection_table[foundnc].connid); - ldcs_send_msg_socket(ldcs_msocket_data->connection_table[foundnc].connid,msg); - } - } - - if(msg->header.mtype==LDCS_MSG_MTYPE_BCAST) { - /* searching for max remote rank which less than dest */ - msg->header.from=ldcs_msocket_data->hostinfo.rank; - for(nc=0;(ncconnection_table_used);nc++) { - rrank=ldcs_msocket_data->connection_table[nc].remote_rank; - debug_printf3("check for bcast msg with dest %d child nc=%d with rrank=%d iam=%d\n",dest,nc,rrank,ldcs_msocket_data->hostinfo.rank); - if(rrank<0) continue; /* not to front end */ - if(rrank<=ldcs_msocket_data->hostinfo.rank) continue; /* not upward in tree */ - - debug_printf3("BCAST msg with dest %d to child nc=%d with rrank=%d connid=%d\n",dest,nc,rrank,ldcs_msocket_data->connection_table[nc].connid); - ldcs_send_msg_socket(ldcs_msocket_data->connection_table[nc].connid,msg); - } - } - - debug_printf3("end route on msg %s %d -> %d -> %d\n",_message_type_to_str(msg->header.type),msg->header.source, msg->header.from, msg->header.dest); - - return(rc); -} - - - int compute_binom_tree(int size, int **connlist, int *connlistsize, int *max_connections) { - int rc=0; - int rank, n=1, ci=0, num_child; - int *clist, *childs; - int max_children = 0; - - while (n < size) { - n <<= 1; - max_children++; - } - - clist = malloc(2*size*sizeof(int)); - if(!clist) _error("could not allocate memory for clist"); - childs = (int*) malloc(max_children * sizeof(int)); - if(!childs) _error("could not allocate memory for childs"); - - - for(rank=0;rank 0) { - int mid = (high - low) / 2 + (high - low) % 2 + low; - if (low == rank) { - childs[num_child] = mid; - num_child++; - } - /* if (mid == rank) { parent = low; } */ - if (mid <= rank) { low = mid; } - else { high = mid-1; } - } - for(n=0;n -#include -#include -#include -#include -#include - -#include "ldcs_api.h" -#include "ldcs_api_socket.h" -#include "ldcs_audit_server_md_msocket_topo.h" -#include "ldcs_audit_server_md_msocket_util.h" - -int ldcs_audit_server_md_msocket_create_server(char *hostname, int *portlist, int num_ports, int *portused) { - int fd=-1; - int port=0, portindex; - - portindex=0; - - while((fd<0) && (portindexconnection_table_used >= ldcs_msocket_data->connection_table_size) { - ldcs_msocket_data->connection_table = realloc(ldcs_msocket_data->connection_table, - (ldcs_msocket_data->connection_table_used + 16) * sizeof(ldcs_connection_t) - ); - ldcs_msocket_data->connection_table_size = ldcs_msocket_data->connection_table_used + 16; - for(nc=ldcs_msocket_data->connection_table_used;(ncconnection_table_used + 16);nc++) { - ldcs_msocket_data->connection_table[nc].state=LDCS_CONNECTION_STATUS_FREE; - } - } - for(nc=0;(ncconnection_table_size);nc++) { - if (ldcs_msocket_data->connection_table[nc].state==LDCS_CONNECTION_STATUS_FREE) break; - } - if(nc==ldcs_msocket_data->connection_table_size) _error("internal error with connection table (table full)"); - - ldcs_msocket_data->connection_table_used++; - ldcs_msocket_data->connection_counter++; - - return(nc); -} - - -ldcs_msocket_bootstrap_t *ldcs_audit_server_md_msocket_new_bootstrap(int max_connections) { - - ldcs_msocket_bootstrap_t *bootstrap=NULL; - - /* allocate bootstrap data structure */ - bootstrap=(ldcs_msocket_bootstrap_t *) malloc(sizeof(ldcs_msocket_bootstrap_t)); - if(!bootstrap) _error("could not allocate memory for bootstrap"); - - bootstrap->size=0; - bootstrap->allocsize=max_connections; - bootstrap->fromlist=(int *) malloc(max_connections * sizeof(int)); - if(!bootstrap->fromlist) _error("could not allocate memory for bootstrap->fromlist"); - bootstrap->tolist=(int *) malloc(max_connections * sizeof(int)); - if(!bootstrap->tolist) _error("could not allocate memory for bootstrap->tolist"); - bootstrap->tohostlist=(char **) malloc(max_connections * sizeof(char *)); - if(!bootstrap->tohostlist) _error("could not allocate memory for bootstrap->toportlist"); - bootstrap->toportlist=(int *) malloc(max_connections * sizeof(int)); - if(!bootstrap->toportlist) _error("could not allocate memory for bootstrap->toportlist"); - - return(bootstrap); -} - -int ldcs_audit_server_md_msocket_free_bootstrap(ldcs_msocket_bootstrap_t *bootstrap) { - int rc=0; - - free(bootstrap->fromlist); - free(bootstrap->tolist); - free(bootstrap->tohostlist); - free(bootstrap->toportlist); - - - return(rc); -} - -int ldcs_audit_server_md_msocket_dump_bootstrap(ldcs_msocket_bootstrap_t *bootstrap) { - int rc=0; - int i; - for (i=0; i < bootstrap->size; i++) { - debug_printf3("DUMP bootstrap: %2d -> %2d (%s,%d)\n", - bootstrap->fromlist[i],bootstrap->tolist[i], - bootstrap->tohostlist[i],bootstrap->toportlist[i]); - } - return(rc); -} - -int ldcs_audit_server_md_msocket_serialize_bootstrap(ldcs_msocket_bootstrap_t *bootstrap, char **rdata, int *rsize) { - int rc=0; - int i; - int size = 0; - char *data=NULL; - int datasize=0; - - - ldcs_audit_server_md_msocket_dump_bootstrap(bootstrap); - - /* check that we have some entries */ - if (bootstrap->size < 0) { - *rdata=NULL; - *rsize=0; - return (-1); - } - - /* determine the total number of bytes to hold the strings including terminating NUL character */ - for (i=0; i < bootstrap->size; i++) { - size += strlen(bootstrap->tohostlist[i]) + 1; - } - - /* determine and allocate the total number of bytes to hold the strings plus offset table */ - datasize = bootstrap->size * sizeof(int) + size; - - /* additional info */ - datasize += ( 3 * bootstrap->size + 2 ) * sizeof(int); - - data = malloc(datasize); - if (data == NULL) { - _error("Failed to allocate hostname table"); - } - - int o = 0; - ((int*)data)[o] = bootstrap->size; o++; - ((int*)data)[o] = bootstrap->allocsize; o++; - - for (i=0; i < bootstrap->size; i++) { - ((int*)data)[o] = bootstrap->fromlist[i]; o++; - } - for (i=0; i < bootstrap->size; i++) { - ((int*)data)[o] = bootstrap->tolist[i]; o++; - } - for (i=0; i < bootstrap->size; i++) { - ((int*)data)[o] = bootstrap->toportlist[i]; o++; - } - - /* copy the strings in and fill in the offsets */ - int offset = o * sizeof(int) + bootstrap->size * sizeof(int); - for (i=0; i < bootstrap->size; i++) { - ((int*)data)[o+i] = offset; - strcpy((char*)(data + offset), bootstrap->tohostlist[i]); - offset += strlen(bootstrap->tohostlist[i]) + 1; - } - - *rdata=data; - *rsize=datasize; - - return(rc); - -} - - -int ldcs_audit_server_md_msocket_deserialize_bootstrap(char *data, int datasize, ldcs_msocket_bootstrap_t **rbootstrap) { - int rc=0; - ldcs_msocket_bootstrap_t *bootstrap; - int size; - int i,o; - - /* check that we have some entries */ - if (datasize <= 0) { - return (-1); - } - - o=0; - size=((int*)data)[o]; o++; - - debug_printf3("deserialize: size = %d\n",size); - - /* check again i we have some entries */ - if (size <= 0) { - return (-1); - } - - bootstrap=ldcs_audit_server_md_msocket_new_bootstrap(size); - - /* allocate bootstrap data structure */ - bootstrap->size=size; - bootstrap->allocsize=((int*)data)[o]; o++; - - for (i=0; i < bootstrap->size; i++) { - bootstrap->fromlist[i]=((int*)data)[o]; o++; - debug_printf3("deserialize: from[%d] = %d\n",i,bootstrap->fromlist[i]); - } - - for (i=0; i < bootstrap->size; i++) { - bootstrap->tolist[i]=((int*)data)[o]; o++; - debug_printf3("deserialize: to[%d] = %d\n",i,bootstrap->tolist[i]); - } - - for (i=0; i < bootstrap->size; i++) { - bootstrap->toportlist[i]=((int*)data)[o]; o++; - debug_printf3("deserialize: toport[%d] = %d\n",i,bootstrap->toportlist[i]); - } - - /* copy the strings in and fill in the offsets */ - int offset = o * sizeof(int) + bootstrap->size * sizeof(int); - for (i=0; i < bootstrap->size; i++) { - offset=((int*)data)[o+i]; - bootstrap->tohostlist[i]=strdup((char*)(data + offset)); - debug_printf3("deserialize: tohost[%d] = %s\n",i,bootstrap->tohostlist[i]); - } - - ldcs_audit_server_md_msocket_dump_bootstrap(bootstrap); - - *rbootstrap=bootstrap; - - return(rc); - -} diff --git a/src/server/auditserver/ldcs_audit_server_md_msocket_util.h b/src/server/auditserver/ldcs_audit_server_md_msocket_util.h deleted file mode 100644 index 7fd48295..00000000 --- a/src/server/auditserver/ldcs_audit_server_md_msocket_util.h +++ /dev/null @@ -1,40 +0,0 @@ -/* -This file is part of Spindle. For copyright information see the COPYRIGHT -file in the top level directory, or at -https://github.com/hpc/Spindle/blob/master/COPYRIGHT - -This program is free software; you can redistribute it and/or modify it under -the terms of the GNU Lesser General Public License (as published by the Free Software -Foundation) version 2.1 dated February 1999. This program is distributed in the -hope that it will be useful, but WITHOUT ANY WARRANTY; without even the IMPLIED -WARRANTY OF MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms -and conditions of the GNU Lesser General Public License for more details. You should -have received a copy of the GNU Lesser General Public License along with this -program; if not, write to the Free Software Foundation, Inc., 59 Temple -Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -#ifndef LDCS_AUDIT_SERVER_MD_MSOCKET_UTIL_H -#define LDCS_AUDIT_SERVER_MD_MSOCKET_UTIL_H - -#include "ldcs_audit_server_md_msocket.h" -#include "ldcs_audit_server_md_msocket_topo.h" - -int ldcs_audit_server_md_msocket_create_server(char * location, int *portlist, int num_ports, int *portused); - -int ldcs_audit_server_md_msocket_serialize_hostlist(char **hostlist, int numhosts, char **rdata, int *rsize); -char* ldcs_audit_server_md_msocket_expand_hostname(char *rdata, int rsize, int rank); - - -ldcs_msocket_bootstrap_t *ldcs_audit_server_md_msocket_new_bootstrap(int max_connections); -int ldcs_audit_server_md_msocket_free_bootstrap(ldcs_msocket_bootstrap_t *bootstrap); -int ldcs_audit_server_md_msocket_dump_bootstrap(ldcs_msocket_bootstrap_t *bootstrap); -int ldcs_audit_server_md_msocket_serialize_bootstrap(ldcs_msocket_bootstrap_t *bootstrap, char **rdata, int *rsize); -int ldcs_audit_server_md_msocket_deserialize_bootstrap(char *data, int datasize, ldcs_msocket_bootstrap_t **rbootstrap); - -int ldcs_audit_server_md_msocket_get_free_connection_table_entry (ldcs_msocket_data_t *ldcs_msocket_data); - -int ldcs_audit_server_md_msocket_connect(char *hostname, int *portlist, int num_ports); - - -#endif diff --git a/src/server/startup/Makefile.am b/src/server/startup/Makefile.am index 70c0059b..ddffdb82 100644 --- a/src/server/startup/Makefile.am +++ b/src/server/startup/Makefile.am @@ -6,14 +6,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/../logging CORE_SOURCES = spindle_be.cc hookexec.c $(top_srcdir)/../utils/parseloc.c $(top_srcdir)/../utils/keyfile.c $(top_srcdir)/../utils/spindle_mkdir.c $(top_srcdir)/../utils/exitnote.c CORE_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/comlib -I$(top_srcdir)/cache -I$(top_srcdir)/auditserver -I$(top_srcdir)/../client/beboot -I$(top_srcdir)/../include -I$(top_srcdir)/../utils -I$(top_srcdir)/../cobo -DTRACK_MKDIR -DLOOKUP_PREV_MKDIR -DLIBEXECDIR=\"$(pkglibexecdir)\" -CORE_LDADD = $(top_builddir)/logging/libspindledlogc.la -ldl -if COBO -CORE_LDADD += $(top_builddir)/auditserver/libaudit_server_cobo.la -endif -if MSOCKET -CORE_LDADD += $(top_builddir)/auditserver/libaudit_server_msocket.la -endif -CORE_LDADD += $(top_builddir)/comlib/libserver_pipe.la +CORE_LDADD = $(top_builddir)/logging/libspindledlogc.la -ldl $(top_builddir)/auditserver/libaudit_server_cobo.la $(top_builddir)/comlib/libserver_pipe.la if USE_NUMA CORE_LDADD += -lnuma endif From 97de8fffb1844f9195a4ae89d4b96eb34738cd06 Mon Sep 17 00:00:00 2001 From: Barry Rountree Date: Fri, 31 Jul 2026 00:53:03 -0700 Subject: [PATCH 14/21] [prune-config] Changes post bootstrap.sh (--enable-[msocket|cobo]) --- config.h.in | 5 +-- configure | 59 ++-------------------------------- src/client/config.h.in | 5 +-- src/client/configure | 59 ++-------------------------------- src/fe/config.h.in | 5 +-- src/fe/configure | 59 ++-------------------------------- src/fe/startup/Makefile.in | 27 +++++++--------- src/server/config.h.in | 5 +-- src/server/configure | 59 ++-------------------------------- src/server/startup/Makefile.in | 22 ++++++------- 10 files changed, 38 insertions(+), 267 deletions(-) diff --git a/config.h.in b/config.h.in index 598840e9..f79a6e51 100644 --- a/config.h.in +++ b/config.h.in @@ -12,12 +12,9 @@ /* Back-end directory for communication and housekeeping */ #undef COMMPATH -/* Define if were using cobo for server/server communication */ +/* Server/server communication uses cobo */ #undef COMM_COBO -/* Define if were using msocket for server/server communication */ -#undef COMM_MSOCKET - /* Client/server communication uses pipes */ #undef COMM_PIPES diff --git a/configure b/configure index 961d4f53..c865f382 100755 --- a/configure +++ b/configure @@ -686,10 +686,6 @@ LINUX_BLD_FALSE LINUX_BLD_TRUE BGQ_BLD_FALSE BGQ_BLD_TRUE -COBO_FALSE -COBO_TRUE -MSOCKET_FALSE -MSOCKET_TRUE SRUN_PATH BLD_FLUXPLUGIN_FALSE BLD_FLUXPLUGIN_TRUE @@ -854,8 +850,6 @@ with_hostbin with_rsh_launch with_rsh_cmd with_slurm_launch -enable_msocket -enable_cobo with_python_prefix enable_numa with_numa_excludes @@ -1543,8 +1537,6 @@ Optional Features: launching --enable-slurm-plugin Builds in support for running with SLURM via plugin --enable-flux-plugin Builds in support for running flux via a plugin - --enable-msocket Use msocket for inter-server communication - --enable-cobo Use msocket for inter-server communication --enable-numa Use libnuma to enable numa optimizations --enable-cleanup-process Default to using a dedicated process to clean @@ -17002,53 +16994,16 @@ cat >>confdefs.h <<_ACEOF _ACEOF -#Runmode detection (cobo/msocket communications for server/server) -SERVER_SERVER_COM=cobo - -# Check whether --enable-msocket was given. -if test "${enable_msocket+set}" = set; then : - enableval=$enable_msocket; SERVER_SERVER_COM=msocket; -fi - -# Check whether --enable-cobo was given. -if test "${enable_cobo+set}" = set; then : - enableval=$enable_cobo; SERVER_SERVER_COM=cobo; -fi - - - if test x$SERVER_SERVER_COM == xmsocket; then - MSOCKET_TRUE= - MSOCKET_FALSE='#' -else - MSOCKET_TRUE='#' - MSOCKET_FALSE= -fi - - if test x$SERVER_SERVER_COM == xcobo; then - COBO_TRUE= - COBO_FALSE='#' -else - COBO_TRUE='#' - COBO_FALSE= -fi - - +#Communication modes $as_echo "#define COMM_PIPES 1" >>confdefs.h -if test "x$SERVER_SERVER_COM" == "xmsocket"; then - -$as_echo "#define COMM_MSOCKET 1" >>confdefs.h - -fi -if test "x$SERVER_SERVER_COM" == "xcobo"; then $as_echo "#define COMM_COBO 1" >>confdefs.h -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: Communication is pipes/$SERVER_SERVER_COM" >&5 -$as_echo "$as_me: Communication is pipes/$SERVER_SERVER_COM" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: Communication is pipes/cobo" >&5 +$as_echo "$as_me: Communication is pipes/cobo" >&6;} #Architecture detection if test "x$target_cpu" == "xx86_64"; then @@ -18951,14 +18906,6 @@ if test -z "${BLD_FLUXPLUGIN_TRUE}" && test -z "${BLD_FLUXPLUGIN_FALSE}"; then as_fn_error $? "conditional \"BLD_FLUXPLUGIN\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${MSOCKET_TRUE}" && test -z "${MSOCKET_FALSE}"; then - as_fn_error $? "conditional \"MSOCKET\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${COBO_TRUE}" && test -z "${COBO_FALSE}"; then - as_fn_error $? "conditional \"COBO\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${BGQ_BLD_TRUE}" && test -z "${BGQ_BLD_FALSE}"; then as_fn_error $? "conditional \"BGQ_BLD\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/src/client/config.h.in b/src/client/config.h.in index fbafd176..112a7fc1 100644 --- a/src/client/config.h.in +++ b/src/client/config.h.in @@ -12,12 +12,9 @@ /* Back-end directory for communication and housekeeping */ #undef COMMPATH -/* Define if were using cobo for server/server communication */ +/* Server/server communication uses cobo */ #undef COMM_COBO -/* Define if were using msocket for server/server communication */ -#undef COMM_MSOCKET - /* Client/server communication uses pipes */ #undef COMM_PIPES diff --git a/src/client/configure b/src/client/configure index 13b7b2b7..42156e2d 100755 --- a/src/client/configure +++ b/src/client/configure @@ -659,10 +659,6 @@ LINUX_BLD_FALSE LINUX_BLD_TRUE BGQ_BLD_FALSE BGQ_BLD_TRUE -COBO_FALSE -COBO_TRUE -MSOCKET_FALSE -MSOCKET_TRUE SRUN_PATH BLD_FLUXPLUGIN_FALSE BLD_FLUXPLUGIN_TRUE @@ -817,8 +813,6 @@ with_hostbin with_rsh_launch with_rsh_cmd with_slurm_launch -enable_msocket -enable_cobo with_python_prefix enable_numa with_numa_excludes @@ -1487,8 +1481,6 @@ Optional Features: launching --enable-slurm-plugin Builds in support for running with SLURM via plugin --enable-flux-plugin Builds in support for running flux via a plugin - --enable-msocket Use msocket for inter-server communication - --enable-cobo Use msocket for inter-server communication --enable-numa Use libnuma to enable numa optimizations --enable-cleanup-process Default to using a dedicated process to clean @@ -12883,53 +12875,16 @@ cat >>confdefs.h <<_ACEOF _ACEOF -#Runmode detection (cobo/msocket communications for server/server) -SERVER_SERVER_COM=cobo - -# Check whether --enable-msocket was given. -if test "${enable_msocket+set}" = set; then : - enableval=$enable_msocket; SERVER_SERVER_COM=msocket; -fi - -# Check whether --enable-cobo was given. -if test "${enable_cobo+set}" = set; then : - enableval=$enable_cobo; SERVER_SERVER_COM=cobo; -fi - - - if test x$SERVER_SERVER_COM == xmsocket; then - MSOCKET_TRUE= - MSOCKET_FALSE='#' -else - MSOCKET_TRUE='#' - MSOCKET_FALSE= -fi - - if test x$SERVER_SERVER_COM == xcobo; then - COBO_TRUE= - COBO_FALSE='#' -else - COBO_TRUE='#' - COBO_FALSE= -fi - - +#Communication modes $as_echo "#define COMM_PIPES 1" >>confdefs.h -if test "x$SERVER_SERVER_COM" == "xmsocket"; then - -$as_echo "#define COMM_MSOCKET 1" >>confdefs.h - -fi -if test "x$SERVER_SERVER_COM" == "xcobo"; then $as_echo "#define COMM_COBO 1" >>confdefs.h -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: Communication is pipes/$SERVER_SERVER_COM" >&5 -$as_echo "$as_me: Communication is pipes/$SERVER_SERVER_COM" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: Communication is pipes/cobo" >&5 +$as_echo "$as_me: Communication is pipes/cobo" >&6;} #Architecture detection if test "x$target_cpu" == "xx86_64"; then @@ -13797,14 +13752,6 @@ if test -z "${BLD_FLUXPLUGIN_TRUE}" && test -z "${BLD_FLUXPLUGIN_FALSE}"; then as_fn_error $? "conditional \"BLD_FLUXPLUGIN\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${MSOCKET_TRUE}" && test -z "${MSOCKET_FALSE}"; then - as_fn_error $? "conditional \"MSOCKET\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${COBO_TRUE}" && test -z "${COBO_FALSE}"; then - as_fn_error $? "conditional \"COBO\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${BGQ_BLD_TRUE}" && test -z "${BGQ_BLD_FALSE}"; then as_fn_error $? "conditional \"BGQ_BLD\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/src/fe/config.h.in b/src/fe/config.h.in index d3f72a1f..cf74d6c0 100644 --- a/src/fe/config.h.in +++ b/src/fe/config.h.in @@ -12,12 +12,9 @@ /* Back-end directory for communication and housekeeping */ #undef COMMPATH -/* Define if were using cobo for server/server communication */ +/* Server/server communication uses cobo */ #undef COMM_COBO -/* Define if were using msocket for server/server communication */ -#undef COMM_MSOCKET - /* Client/server communication uses pipes */ #undef COMM_PIPES diff --git a/src/fe/configure b/src/fe/configure index ab2fb306..e7e46a4d 100755 --- a/src/fe/configure +++ b/src/fe/configure @@ -673,10 +673,6 @@ LINUX_BLD_FALSE LINUX_BLD_TRUE BGQ_BLD_FALSE BGQ_BLD_TRUE -COBO_FALSE -COBO_TRUE -MSOCKET_FALSE -MSOCKET_TRUE SRUN_PATH BLD_FLUXPLUGIN_FALSE BLD_FLUXPLUGIN_TRUE @@ -838,8 +834,6 @@ with_hostbin with_rsh_launch with_rsh_cmd with_slurm_launch -enable_msocket -enable_cobo with_python_prefix enable_numa with_numa_excludes @@ -1520,8 +1514,6 @@ Optional Features: launching --enable-slurm-plugin Builds in support for running with SLURM via plugin --enable-flux-plugin Builds in support for running flux via a plugin - --enable-msocket Use msocket for inter-server communication - --enable-cobo Use msocket for inter-server communication --enable-numa Use libnuma to enable numa optimizations --enable-cleanup-process Default to using a dedicated process to clean @@ -16733,53 +16725,16 @@ cat >>confdefs.h <<_ACEOF _ACEOF -#Runmode detection (cobo/msocket communications for server/server) -SERVER_SERVER_COM=cobo - -# Check whether --enable-msocket was given. -if test "${enable_msocket+set}" = set; then : - enableval=$enable_msocket; SERVER_SERVER_COM=msocket; -fi - -# Check whether --enable-cobo was given. -if test "${enable_cobo+set}" = set; then : - enableval=$enable_cobo; SERVER_SERVER_COM=cobo; -fi - - - if test x$SERVER_SERVER_COM == xmsocket; then - MSOCKET_TRUE= - MSOCKET_FALSE='#' -else - MSOCKET_TRUE='#' - MSOCKET_FALSE= -fi - - if test x$SERVER_SERVER_COM == xcobo; then - COBO_TRUE= - COBO_FALSE='#' -else - COBO_TRUE='#' - COBO_FALSE= -fi - - +#Communication modes $as_echo "#define COMM_PIPES 1" >>confdefs.h -if test "x$SERVER_SERVER_COM" == "xmsocket"; then - -$as_echo "#define COMM_MSOCKET 1" >>confdefs.h - -fi -if test "x$SERVER_SERVER_COM" == "xcobo"; then $as_echo "#define COMM_COBO 1" >>confdefs.h -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: Communication is pipes/$SERVER_SERVER_COM" >&5 -$as_echo "$as_me: Communication is pipes/$SERVER_SERVER_COM" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: Communication is pipes/cobo" >&5 +$as_echo "$as_me: Communication is pipes/cobo" >&6;} #Architecture detection if test "x$target_cpu" == "xx86_64"; then @@ -18169,14 +18124,6 @@ if test -z "${BLD_FLUXPLUGIN_TRUE}" && test -z "${BLD_FLUXPLUGIN_FALSE}"; then as_fn_error $? "conditional \"BLD_FLUXPLUGIN\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${MSOCKET_TRUE}" && test -z "${MSOCKET_FALSE}"; then - as_fn_error $? "conditional \"MSOCKET\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${COBO_TRUE}" && test -z "${COBO_FALSE}"; then - as_fn_error $? "conditional \"COBO\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${BGQ_BLD_TRUE}" && test -z "${BGQ_BLD_FALSE}"; then as_fn_error $? "conditional \"BGQ_BLD\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/src/fe/startup/Makefile.in b/src/fe/startup/Makefile.in index 93ce5b2a..e933809a 100644 --- a/src/fe/startup/Makefile.in +++ b/src/fe/startup/Makefile.in @@ -92,12 +92,10 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ bin_PROGRAMS = spindle$(EXEEXT) -@COBO_TRUE@am__append_1 = $(top_builddir)/comlib/libfe_cobo.la $(top_builddir)/cobo/libldcs_cobo.la -@MSOCKET_TRUE@am__append_2 = $(top_builddir)/comlib/libfe_msocket.la -@BLD_FLUXPLUGIN_TRUE@am__append_3 = $(FLUX_CORE_LIBS) $(FLUX_HOSTLIST_LIBS) $(top_builddir)/flux/libfluxsessionfe.la -@BLD_FLUXPLUGIN_TRUE@am__append_4 = -I$(top_srcdir)/../flux -@BLD_FLUXPLUGIN_TRUE@am__append_5 = launch_flux.cc -@LMON_TRUE@am__append_6 = $(top_builddir)/launchmon/libfelmon.la +@BLD_FLUXPLUGIN_TRUE@am__append_1 = $(FLUX_CORE_LIBS) $(FLUX_HOSTLIST_LIBS) $(top_builddir)/flux/libfluxsessionfe.la +@BLD_FLUXPLUGIN_TRUE@am__append_2 = -I$(top_srcdir)/../flux +@BLD_FLUXPLUGIN_TRUE@am__append_3 = launch_flux.cc +@LMON_TRUE@am__append_4 = $(top_builddir)/launchmon/libfelmon.la subdir = startup ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ @@ -150,7 +148,8 @@ am__uninstall_files_from_dir = { \ LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) am__DEPENDENCIES_1 = am__DEPENDENCIES_2 = $(top_builddir)/logging/libspindleflogc.la \ - $(am__append_1) $(am__append_2) $(am__DEPENDENCIES_1) \ + $(top_builddir)/comlib/libfe_cobo.la \ + $(top_builddir)/cobo/libldcs_cobo.la $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) libspindlefe_la_DEPENDENCIES = $(am__DEPENDENCIES_2) am__dirstamp = $(am__leading_dot)dirstamp @@ -215,7 +214,7 @@ spindle_OBJECTS = $(am_spindle_OBJECTS) spindle_DEPENDENCIES = $(am__DEPENDENCIES_2) \ $(top_builddir)/openmpi_intercept/libparseompi.la \ $(top_builddir)/hostbin/libhostbin.la $(am__DEPENDENCIES_4) \ - $(am__append_6) + $(am__append_4) spindle_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(spindle_LDFLAGS) $(LDFLAGS) -o $@ @@ -494,9 +493,7 @@ include_HEADERS = $(top_srcdir)/../include/spindle_launch.h AM_CPPFLAGS = -I$(top_srcdir)/../logging CORE_SOURCES = spindle_fe.cc parseargs.cc config_parser.cc config_mgr.cc parse_preload.cc $(top_srcdir)/../utils/pathfn.c $(top_srcdir)/../utils/keyfile.c $(top_srcdir)/../utils/parseloc.c $(top_srcdir)/../utils/rshlaunch.c CORE_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/../include -I$(top_srcdir)/comlib -I$(top_srcdir)/../server/cache -I$(top_srcdir)/../server/comlib -I$(top_srcdir)/../utils -I$(top_srcdir)/../cobo -DBINDIR=\"$(pkglibexecdir)\" -DLIBEXECDIR=\"$(pkglibexecdir)\" -DPROGLIBDIR=\"$(pkglibdir)\" -DPKGSYSCONFDIR=\"$(PKGSYSCONF_DIR)\" -CORE_LDADD = $(top_builddir)/logging/libspindleflogc.la -lpthread \ - $(am__append_1) $(am__append_2) $(MUNGE_DYN_LIB) \ - $(GCRYPT_LIBS) +CORE_LDADD = $(top_builddir)/logging/libspindleflogc.la -lpthread $(top_builddir)/comlib/libfe_cobo.la $(top_builddir)/cobo/libldcs_cobo.la $(MUNGE_DYN_LIB) $(GCRYPT_LIBS) libspindlefe_la_CPPFLAGS = $(CORE_CPPFLAGS) -DSPINDLEFELIB libspindlefe_la_SOURCES = $(CORE_SOURCES) libspindlefe_la_LIBADD = $(CORE_LDADD) @@ -504,15 +501,15 @@ libspindlefe_la_LDFLAGS = -version-info $(SPINDLEFE_LIB_VERSION) libspindlefe_static_la_CPPFLAGS = $(libspindlefe_la_CPPFLAGS) libspindlefe_static_la_SOURCES = $(libspindlefe_la_SOURCES) libspindlefe_static_la_LIBADD = $(libspindlefe_la_LIBADD) -spindle_CPPFLAGS = $(CORE_CPPFLAGS) -DSPINDLEEXE $(am__append_4) +spindle_CPPFLAGS = $(CORE_CPPFLAGS) -DSPINDLEEXE $(am__append_2) spindle_SOURCES = spindle_fe_main.cc spindle_fe_serial.cc \ parse_launcher.cc parse_launcher_args.cc launcher.cc \ spindle_session.cc launch_slurm.cc launch_lsf.cc \ - $(CORE_SOURCES) $(am__append_5) + $(CORE_SOURCES) $(am__append_3) spindle_LDADD = $(CORE_LDADD) \ $(top_builddir)/openmpi_intercept/libparseompi.la \ - $(top_builddir)/hostbin/libhostbin.la $(am__append_3) \ - $(am__append_6) + $(top_builddir)/hostbin/libhostbin.la $(am__append_1) \ + $(am__append_4) @BLD_FLUXPLUGIN_TRUE@spindle_LDFLAGS = $(fluxplugin-ldflags) -Wl,--allow-multiple-definition all: all-am diff --git a/src/server/config.h.in b/src/server/config.h.in index 36fafcda..5bc1f60f 100644 --- a/src/server/config.h.in +++ b/src/server/config.h.in @@ -12,12 +12,9 @@ /* Back-end directory for communication and housekeeping */ #undef COMMPATH -/* Define if were using cobo for server/server communication */ +/* Server/server communication uses cobo */ #undef COMM_COBO -/* Define if were using msocket for server/server communication */ -#undef COMM_MSOCKET - /* Client/server communication uses pipes */ #undef COMM_PIPES diff --git a/src/server/configure b/src/server/configure index afd2a4ac..f17afe9f 100755 --- a/src/server/configure +++ b/src/server/configure @@ -679,10 +679,6 @@ LINUX_BLD_FALSE LINUX_BLD_TRUE BGQ_BLD_FALSE BGQ_BLD_TRUE -COBO_FALSE -COBO_TRUE -MSOCKET_FALSE -MSOCKET_TRUE SRUN_PATH BLD_FLUXPLUGIN_FALSE BLD_FLUXPLUGIN_TRUE @@ -844,8 +840,6 @@ with_hostbin with_rsh_launch with_rsh_cmd with_slurm_launch -enable_msocket -enable_cobo with_python_prefix enable_numa with_numa_excludes @@ -1522,8 +1516,6 @@ Optional Features: launching --enable-slurm-plugin Builds in support for running with SLURM via plugin --enable-flux-plugin Builds in support for running flux via a plugin - --enable-msocket Use msocket for inter-server communication - --enable-cobo Use msocket for inter-server communication --enable-numa Use libnuma to enable numa optimizations --enable-cleanup-process Default to using a dedicated process to clean @@ -16730,53 +16722,16 @@ cat >>confdefs.h <<_ACEOF _ACEOF -#Runmode detection (cobo/msocket communications for server/server) -SERVER_SERVER_COM=cobo - -# Check whether --enable-msocket was given. -if test "${enable_msocket+set}" = set; then : - enableval=$enable_msocket; SERVER_SERVER_COM=msocket; -fi - -# Check whether --enable-cobo was given. -if test "${enable_cobo+set}" = set; then : - enableval=$enable_cobo; SERVER_SERVER_COM=cobo; -fi - - - if test x$SERVER_SERVER_COM == xmsocket; then - MSOCKET_TRUE= - MSOCKET_FALSE='#' -else - MSOCKET_TRUE='#' - MSOCKET_FALSE= -fi - - if test x$SERVER_SERVER_COM == xcobo; then - COBO_TRUE= - COBO_FALSE='#' -else - COBO_TRUE='#' - COBO_FALSE= -fi - - +#Communication modes $as_echo "#define COMM_PIPES 1" >>confdefs.h -if test "x$SERVER_SERVER_COM" == "xmsocket"; then - -$as_echo "#define COMM_MSOCKET 1" >>confdefs.h - -fi -if test "x$SERVER_SERVER_COM" == "xcobo"; then $as_echo "#define COMM_COBO 1" >>confdefs.h -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: Communication is pipes/$SERVER_SERVER_COM" >&5 -$as_echo "$as_me: Communication is pipes/$SERVER_SERVER_COM" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: Communication is pipes/cobo" >&5 +$as_echo "$as_me: Communication is pipes/cobo" >&6;} #Architecture detection if test "x$target_cpu" == "xx86_64"; then @@ -18225,14 +18180,6 @@ if test -z "${BLD_FLUXPLUGIN_TRUE}" && test -z "${BLD_FLUXPLUGIN_FALSE}"; then as_fn_error $? "conditional \"BLD_FLUXPLUGIN\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${MSOCKET_TRUE}" && test -z "${MSOCKET_FALSE}"; then - as_fn_error $? "conditional \"MSOCKET\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${COBO_TRUE}" && test -z "${COBO_FALSE}"; then - as_fn_error $? "conditional \"COBO\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${BGQ_BLD_TRUE}" && test -z "${BGQ_BLD_FALSE}"; then as_fn_error $? "conditional \"BGQ_BLD\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/src/server/startup/Makefile.in b/src/server/startup/Makefile.in index 887b820a..a071a72c 100644 --- a/src/server/startup/Makefile.in +++ b/src/server/startup/Makefile.in @@ -91,12 +91,10 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ pkglibexec_PROGRAMS = spindle_be$(EXEEXT) -@COBO_TRUE@am__append_1 = $(top_builddir)/auditserver/libaudit_server_cobo.la -@MSOCKET_TRUE@am__append_2 = $(top_builddir)/auditserver/libaudit_server_msocket.la -@USE_NUMA_TRUE@am__append_3 = -lnuma -@LINK_LIBSTDCXX_STATIC_TRUE@am__append_4 = $(STATIC_LIBGCC_OPT) -L. -@LMON_DYNAMIC_TRUE@@LMON_TRUE@am__append_5 = $(top_builddir)/launchmon/libbelmon.la $(LAUNCHMON_LIB) $(LAUNCHMON_RMCOMM) -lmonbeapi -lgcrypt -lpthread -@LMON_DYNAMIC_FALSE@@LMON_TRUE@am__append_6 = $(top_builddir)/launchmon/libbelmon.la $(LAUNCHMON_STATIC_LIBS) +@USE_NUMA_TRUE@am__append_1 = -lnuma +@LINK_LIBSTDCXX_STATIC_TRUE@am__append_2 = $(STATIC_LIBGCC_OPT) -L. +@LMON_DYNAMIC_TRUE@@LMON_TRUE@am__append_3 = $(top_builddir)/launchmon/libbelmon.la $(LAUNCHMON_LIB) $(LAUNCHMON_RMCOMM) -lmonbeapi -lgcrypt -lpthread +@LMON_DYNAMIC_FALSE@@LMON_TRUE@am__append_4 = $(top_builddir)/launchmon/libbelmon.la $(LAUNCHMON_STATIC_LIBS) subdir = startup ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ @@ -146,7 +144,7 @@ am__uninstall_files_from_dir = { \ LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) am__DEPENDENCIES_1 = am__DEPENDENCIES_2 = $(top_builddir)/logging/libspindledlogc.la \ - $(am__append_1) $(am__append_2) \ + $(top_builddir)/auditserver/libaudit_server_cobo.la \ $(top_builddir)/comlib/libserver_pipe.la $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) libspindlebe_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \ @@ -465,8 +463,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/../logging CORE_SOURCES = spindle_be.cc hookexec.c $(top_srcdir)/../utils/parseloc.c $(top_srcdir)/../utils/keyfile.c $(top_srcdir)/../utils/spindle_mkdir.c $(top_srcdir)/../utils/exitnote.c CORE_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/comlib -I$(top_srcdir)/cache -I$(top_srcdir)/auditserver -I$(top_srcdir)/../client/beboot -I$(top_srcdir)/../include -I$(top_srcdir)/../utils -I$(top_srcdir)/../cobo -DTRACK_MKDIR -DLOOKUP_PREV_MKDIR -DLIBEXECDIR=\"$(pkglibexecdir)\" CORE_LDADD = $(top_builddir)/logging/libspindledlogc.la -ldl \ - $(am__append_1) $(am__append_2) \ - $(top_builddir)/comlib/libserver_pipe.la $(am__append_3) \ + $(top_builddir)/auditserver/libaudit_server_cobo.la \ + $(top_builddir)/comlib/libserver_pipe.la $(am__append_1) \ $(GCRYPT_LIBS) libspindlebe_la_CPPFLAGS = $(CORE_CPPFLAGS) -DSPINDLEBELIB libspindlebe_la_SOURCES = $(CORE_SOURCES) @@ -475,11 +473,11 @@ libspindlebe_la_LDFLAGS = -version-info $(SPINDLEBE_LIB_VERSION) libspindlebe_static_la_CPPFLAGS = $(libspindlebe_la_CPPFLAGS) libspindlebe_static_la_SOURCES = $(libspindlebe_la_SOURCES) libspindlebe_static_la_LIBADD = $(libspindlebe_la_LIBADD) -spindle_be_LDFLAGS = -static $(am__append_4) +spindle_be_LDFLAGS = -static $(am__append_2) spindle_be_CPPFLAGS = $(CORE_CPPFLAGS) spindle_be_SOURCES = spindle_be_main.cc spindle_be_serial.cc spindle_be_hostbin.cc spindle_be_mpilaunch.cc $(top_srcdir)/../utils/rshlaunch.c $(CORE_SOURCES) -spindle_be_LDADD = $(CORE_LDADD) $(MUNGE_LIBS) $(am__append_5) \ - $(am__append_6) +spindle_be_LDADD = $(CORE_LDADD) $(MUNGE_LIBS) $(am__append_3) \ + $(am__append_4) @LINK_LIBSTDCXX_STATIC_TRUE@CLEANFILES = ./libstdc++.a @LINK_LIBSTDCXX_STATIC_TRUE@BUILT_SOURCES = ./libstdc++.a all: $(BUILT_SOURCES) From ae8e73e77a7c4e7257862fa4469e62fbe3ed003c Mon Sep 17 00:00:00 2001 From: Barry Rountree Date: Fri, 31 Jul 2026 07:58:53 -0700 Subject: [PATCH 15/21] [prune-config] Removes --with-glibc-be-dir Per Claude Code + Opus --- configure.common.ac | 12 ------------ src/client/auditclient/Makefile.am | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/configure.common.ac b/configure.common.ac index d2df132b..4a60e60a 100644 --- a/configure.common.ac +++ b/configure.common.ac @@ -326,14 +326,6 @@ else fi AC_DEFINE_UNQUOTED([BINARY_PATCH_LDSO],[$PATCH_LDSO],[Whether it is safe to patch ld.so]) -if test "x$GLIBC_BE_DIR" = "x"; then - # Get glibc location on front-end - CAT=`which cat` - LIBC_FILE=`ldd $CAT | grep libc | awk -F ' ' '{print $3}'` - GLIBC_BE_DIR=`dirname $LIBC_FILE` -fi -AC_MSG_NOTICE([glibc backend location set to $GLIBC_BE_DIR]) - #Security options AC_DEFINE([KEY_SIZE_BYTES], [32], [Number of bytes in keys for gcrypt]) @@ -378,10 +370,6 @@ AC_ARG_WITH(munge-dir, [AS_HELP_STRING([--with-munge-dir=DIR],[Look in DIR for munge installation])], [MUNGE_DIR=${withval}]) -AC_ARG_WITH(glibc-be-dir, - [AS_HELP_STRING([--with-glibc-be-dir=DIR],[If glibc on compute nodes is installed in a non-standard location, then DIR is the directory containing libc.so.6])], - [GLIBC_BE_DIR=${withval}]) - AC_ARG_ENABLE(remap-pageone, [AS_HELP_STRING([--enable-remap-pageone],[Controls mmap behavior when replacing executables. Should be false on older linux systems])], [SET_REMAP_FIRST_PAGE=$enableval],) diff --git a/src/client/auditclient/Makefile.am b/src/client/auditclient/Makefile.am index 4b2e7108..2adb8d90 100644 --- a/src/client/auditclient/Makefile.am +++ b/src/client/auditclient/Makefile.am @@ -22,4 +22,4 @@ AUDITLIB = $(top_builddir)/client/libspindle_audit.la libspindle_audit_pipe_la_SOURCES = $(BASE_SRCS) $(ARCH_SRCS) libspindle_audit_pipe_la_LIBADD = $(top_builddir)/client/libspindlec_pipe.la $(AUDITLIB) -libspindle_audit_pipe_la_LDFLAGS = -shared -avoid-version -Wl,-rpath,$(GLIBC_BE_DIR) +libspindle_audit_pipe_la_LDFLAGS = -shared -avoid-version From b965bd8792a29cc6d309fd9b9ce3109581202599 Mon Sep 17 00:00:00 2001 From: Barry Rountree Date: Fri, 31 Jul 2026 07:59:50 -0700 Subject: [PATCH 16/21] [prune-config] Changes post bootstrap.sh (--with-glibc-be-dir) --- configure | 20 -------------------- src/client/auditclient/Makefile.in | 2 +- src/client/configure | 20 -------------------- src/fe/configure | 20 -------------------- src/server/configure | 20 -------------------- 5 files changed, 1 insertion(+), 81 deletions(-) diff --git a/configure b/configure index c865f382..5afba27b 100755 --- a/configure +++ b/configure @@ -862,7 +862,6 @@ enable_sec_none enable_crash_dedup with_gcrypt_dir with_munge_dir -with_glibc_be_dir enable_remap_pageone with_launchmon with_launchmon_incdir @@ -1595,9 +1594,6 @@ Optional Packages: File for writing usage logs --with-gcrypt-dir=DIR Look in DIR for gcrypt installation --with-munge-dir=DIR Look in DIR for munge installation - --with-glibc-be-dir=DIR If glibc on compute nodes is installed in a - non-standard location, then DIR is the directory - containing libc.so.6 --with-launchmon=DIR Launchmon directory (must contain ./lib and ./include) --with-launchmon-incdir=DIR @@ -17430,15 +17426,6 @@ cat >>confdefs.h <<_ACEOF _ACEOF -if test "x$GLIBC_BE_DIR" = "x"; then - # Get glibc location on front-end - CAT=`which cat` - LIBC_FILE=`ldd $CAT | grep libc | awk -F ' ' '{print $3}'` - GLIBC_BE_DIR=`dirname $LIBC_FILE` -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: glibc backend location set to $GLIBC_BE_DIR" >&5 -$as_echo "$as_me: glibc backend location set to $GLIBC_BE_DIR" >&6;} - #Security options $as_echo "#define KEY_SIZE_BYTES 32" >>confdefs.h @@ -17526,13 +17513,6 @@ if test "${with_munge_dir+set}" = set; then : fi - -# Check whether --with-glibc-be-dir was given. -if test "${with_glibc_be_dir+set}" = set; then : - withval=$with_glibc_be_dir; GLIBC_BE_DIR=${withval} -fi - - # Check whether --enable-remap-pageone was given. if test "${enable_remap_pageone+set}" = set; then : enableval=$enable_remap_pageone; SET_REMAP_FIRST_PAGE=$enableval diff --git a/src/client/auditclient/Makefile.in b/src/client/auditclient/Makefile.in index 3440cd1f..430aa35d 100644 --- a/src/client/auditclient/Makefile.in +++ b/src/client/auditclient/Makefile.in @@ -377,7 +377,7 @@ BASE_SRCS = auditclient.c auditclient_common.c patch_linkmap.c redirect.c bindgo AUDITLIB = $(top_builddir)/client/libspindle_audit.la libspindle_audit_pipe_la_SOURCES = $(BASE_SRCS) $(ARCH_SRCS) libspindle_audit_pipe_la_LIBADD = $(top_builddir)/client/libspindlec_pipe.la $(AUDITLIB) -libspindle_audit_pipe_la_LDFLAGS = -shared -avoid-version -Wl,-rpath,$(GLIBC_BE_DIR) +libspindle_audit_pipe_la_LDFLAGS = -shared -avoid-version all: all-am .SUFFIXES: diff --git a/src/client/configure b/src/client/configure index 42156e2d..965b6a7d 100755 --- a/src/client/configure +++ b/src/client/configure @@ -825,7 +825,6 @@ enable_sec_none enable_crash_dedup with_gcrypt_dir with_munge_dir -with_glibc_be_dir enable_remap_pageone ' ac_precious_vars='build_alias @@ -1537,9 +1536,6 @@ Optional Packages: File for writing usage logs --with-gcrypt-dir=DIR Look in DIR for gcrypt installation --with-munge-dir=DIR Look in DIR for munge installation - --with-glibc-be-dir=DIR If glibc on compute nodes is installed in a - non-standard location, then DIR is the directory - containing libc.so.6 Some influential environment variables: CC C compiler command @@ -13434,15 +13430,6 @@ cat >>confdefs.h <<_ACEOF _ACEOF -if test "x$GLIBC_BE_DIR" = "x"; then - # Get glibc location on front-end - CAT=`which cat` - LIBC_FILE=`ldd $CAT | grep libc | awk -F ' ' '{print $3}'` - GLIBC_BE_DIR=`dirname $LIBC_FILE` -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: glibc backend location set to $GLIBC_BE_DIR" >&5 -$as_echo "$as_me: glibc backend location set to $GLIBC_BE_DIR" >&6;} - #Security options $as_echo "#define KEY_SIZE_BYTES 32" >>confdefs.h @@ -13530,13 +13517,6 @@ if test "${with_munge_dir+set}" = set; then : fi - -# Check whether --with-glibc-be-dir was given. -if test "${with_glibc_be_dir+set}" = set; then : - withval=$with_glibc_be_dir; GLIBC_BE_DIR=${withval} -fi - - # Check whether --enable-remap-pageone was given. if test "${enable_remap_pageone+set}" = set; then : enableval=$enable_remap_pageone; SET_REMAP_FIRST_PAGE=$enableval diff --git a/src/fe/configure b/src/fe/configure index e7e46a4d..a1a76e86 100755 --- a/src/fe/configure +++ b/src/fe/configure @@ -846,7 +846,6 @@ enable_sec_none enable_crash_dedup with_gcrypt_dir with_munge_dir -with_glibc_be_dir enable_remap_pageone with_launchmon with_launchmon_incdir @@ -1575,9 +1574,6 @@ Optional Packages: File for writing usage logs --with-gcrypt-dir=DIR Look in DIR for gcrypt installation --with-munge-dir=DIR Look in DIR for munge installation - --with-glibc-be-dir=DIR If glibc on compute nodes is installed in a - non-standard location, then DIR is the directory - containing libc.so.6 --with-launchmon=DIR Launchmon directory (must contain ./lib and ./include) --with-launchmon-incdir=DIR @@ -17284,15 +17280,6 @@ cat >>confdefs.h <<_ACEOF _ACEOF -if test "x$GLIBC_BE_DIR" = "x"; then - # Get glibc location on front-end - CAT=`which cat` - LIBC_FILE=`ldd $CAT | grep libc | awk -F ' ' '{print $3}'` - GLIBC_BE_DIR=`dirname $LIBC_FILE` -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: glibc backend location set to $GLIBC_BE_DIR" >&5 -$as_echo "$as_me: glibc backend location set to $GLIBC_BE_DIR" >&6;} - #Security options $as_echo "#define KEY_SIZE_BYTES 32" >>confdefs.h @@ -17380,13 +17367,6 @@ if test "${with_munge_dir+set}" = set; then : fi - -# Check whether --with-glibc-be-dir was given. -if test "${with_glibc_be_dir+set}" = set; then : - withval=$with_glibc_be_dir; GLIBC_BE_DIR=${withval} -fi - - # Check whether --enable-remap-pageone was given. if test "${enable_remap_pageone+set}" = set; then : enableval=$enable_remap_pageone; SET_REMAP_FIRST_PAGE=$enableval diff --git a/src/server/configure b/src/server/configure index f17afe9f..e303faca 100755 --- a/src/server/configure +++ b/src/server/configure @@ -852,7 +852,6 @@ enable_sec_none enable_crash_dedup with_gcrypt_dir with_munge_dir -with_glibc_be_dir enable_remap_pageone with_launchmon with_launchmon_incdir @@ -1572,9 +1571,6 @@ Optional Packages: File for writing usage logs --with-gcrypt-dir=DIR Look in DIR for gcrypt installation --with-munge-dir=DIR Look in DIR for munge installation - --with-glibc-be-dir=DIR If glibc on compute nodes is installed in a - non-standard location, then DIR is the directory - containing libc.so.6 --with-launchmon=DIR Launchmon directory (must contain ./lib and ./include) --with-launchmon-incdir=DIR @@ -17281,15 +17277,6 @@ cat >>confdefs.h <<_ACEOF _ACEOF -if test "x$GLIBC_BE_DIR" = "x"; then - # Get glibc location on front-end - CAT=`which cat` - LIBC_FILE=`ldd $CAT | grep libc | awk -F ' ' '{print $3}'` - GLIBC_BE_DIR=`dirname $LIBC_FILE` -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: glibc backend location set to $GLIBC_BE_DIR" >&5 -$as_echo "$as_me: glibc backend location set to $GLIBC_BE_DIR" >&6;} - #Security options $as_echo "#define KEY_SIZE_BYTES 32" >>confdefs.h @@ -17377,13 +17364,6 @@ if test "${with_munge_dir+set}" = set; then : fi - -# Check whether --with-glibc-be-dir was given. -if test "${with_glibc_be_dir+set}" = set; then : - withval=$with_glibc_be_dir; GLIBC_BE_DIR=${withval} -fi - - # Check whether --enable-remap-pageone was given. if test "${enable_remap_pageone+set}" = set; then : enableval=$enable_remap_pageone; SET_REMAP_FIRST_PAGE=$enableval From 7bcbda26c754be254b1a8d59726b13c428e98ffd Mon Sep 17 00:00:00 2001 From: Barry Rountree Date: Fri, 31 Jul 2026 09:15:19 -0700 Subject: [PATCH 17/21] [prune-config] Removes all launchmon options. --- configure.ac | 1 - configure.common.ac | 21 +- m4/lmon.m4 | 90 ---- src/fe/Makefile.am | 5 +- src/fe/configure.ac | 4 +- src/fe/launchmon/Makefile.am | 6 - src/fe/launchmon/Makefile.in | 647 ------------------------ src/fe/launchmon/spindle_fe_lmon.cc | 309 ----------- src/fe/startup/Makefile.am | 4 - src/fe/startup/spindle_fe_main.cc | 12 +- src/server/Makefile.am | 6 +- src/server/configure.ac | 96 ++-- src/server/launchmon/Makefile.am | 4 - src/server/launchmon/Makefile.in | 645 ----------------------- src/server/launchmon/spindle_be_lmon.cc | 249 --------- src/server/startup/Makefile.am | 8 - src/server/startup/spindle_be_main.cc | 11 +- 17 files changed, 54 insertions(+), 2064 deletions(-) delete mode 100644 m4/lmon.m4 delete mode 100644 src/fe/launchmon/Makefile.am delete mode 100644 src/fe/launchmon/Makefile.in delete mode 100644 src/fe/launchmon/spindle_fe_lmon.cc delete mode 100644 src/server/launchmon/Makefile.am delete mode 100644 src/server/launchmon/Makefile.in delete mode 100644 src/server/launchmon/spindle_be_lmon.cc diff --git a/configure.ac b/configure.ac index 75c180cf..338317c1 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,6 @@ SPINDLE_SOURCE_ROOT=`realpath ${srcdir}` #Include common ops m4_include([configure.common.ac]) m4_include([m4/ax_tls.m4]) -m4_include([m4/lmon.m4]) AX_TLS #MPI detection diff --git a/configure.common.ac b/configure.common.ac index 4a60e60a..049917da 100644 --- a/configure.common.ac +++ b/configure.common.ac @@ -345,9 +345,6 @@ AC_ARG_ENABLE(sec-munge, AC_ARG_ENABLE(sec-keydir, [AS_HELP_STRING([--enable-sec-keydir=keydir],[Enable filesystem directory 'keydir' to propagate authentication key for connections])], [WANT_KEYFILE="true";SEC_KEYDIR=$enableval;EXPLICIT_SEC="true"],) -AC_ARG_ENABLE(sec-launchmon, - [AS_HELP_STRING([--enable-sec-launchmon],[Enable LaunchmMON to propagate authentication key for connections])], - [WANT_SECLMON="true";EXPLICIT_SEC="true"],) AC_ARG_ENABLE(sec-none, [AS_HELP_STRING([--enable-sec-none],[Disable security authentication of connections])], [WANT_NOSEC="true";EXPLICIT_SEC="true"],) @@ -470,7 +467,6 @@ AC_DEFUN([CHOOSE_SEC],[ fi if test "x$HAVE_GCRYPT" == "xtrue"; then GCRYPT="true" - SECLMON="true" fi fi @@ -491,15 +487,6 @@ AC_DEFUN([CHOOSE_SEC],[ fi fi - if test "x$WANT_SECLMON" == "xtrue"; then - if test "x$HAVE_GCRYPT" == "xtrue"; then - SECLMON="true" - GCRYPT="true" - else - AC_MSG_ERROR([Could not find gcrypt for lmon authentication]) - fi - fi - if test "x$WANT_NOSEC" == "xtrue"; then ENABLE_NULL_ENCRYPTION="true" fi @@ -508,10 +495,10 @@ AC_DEFUN([CHOOSE_SEC],[ MUNGE_CFLAGS="" MUNGE_LIBS="" fi - if test "x$KEYFILE x$SECLMON" == "x x"; then + if test "x$KEYFILE" != "xtrue"; then GCRYPT_CFLAGS="" GCRYPT_LIBS="" - GCRYPT="false" + GCRYPT="false" fi AC_LANG_POP @@ -532,10 +519,6 @@ AC_DEFUN([CHOOSE_SEC],[ AC_MSG_NOTICE([Enabling keyfile for security authentication]) AC_DEFINE([KEYFILE], [1], [Use keyfile for authentication]) fi - if test "x$SECLMON" == "xtrue"; then - AC_MSG_NOTICE([Enabling LaunchMON key for security authentication]) - AC_DEFINE([SECLMON], [1], [Use LaunchMON for authentication"]) - fi if test "x$ENABLE_NULL_ENCRYPTION" == "xtrue"; then AC_MSG_NOTICE([Enabling NULL encryption]); AC_DEFINE([ENABLE_NULL_ENCRYPTION], [1], [Allow NULL encryption]) diff --git a/m4/lmon.m4 b/m4/lmon.m4 deleted file mode 100644 index dd158f93..00000000 --- a/m4/lmon.m4 +++ /dev/null @@ -1,90 +0,0 @@ -#Launchmon processing -AC_ARG_WITH(launchmon, - [AS_HELP_STRING([--with-launchmon=DIR],[Launchmon directory (must contain ./lib and ./include)])], - [LAUNCHMON_INC_DIR="${withval}/include"; - LAUNCHMON_LIB_DIR="${withval}/lib"; - LAUNCHMON_RMCOMM_DIR="${withval}/lib" - EXPLICIT_LMON=true],) -AC_ARG_WITH(launchmon-incdir, - [AS_HELP_STRING([--with-launchmon-incdir=DIR],[Launchmon include directory])], - [LAUNCHMON_INC_DIR="${withval}";EXPLICIT_LMON=true],) -AC_ARG_WITH(launchmon-libdir, - [AS_HELP_STRING([--with-launchmon-libdir=DIR],[Launchmon library directory])], - [LAUNCHMON_LIB_DIR="${withval}";EXPLICIT_LMON=true],) -AC_ARG_WITH(launchmon-rmcommdir, - [AS_HELP_STRING([--with-launchmon-rmcommdir=DIR],[RM communication library LaunchMON uses])], - [LAUNCHMON_RMCOMM_DIR="${withval}";EXPLICIT_LMON=true],) - -CPPFLAGS_HOLD=$CPPFLAGS -if test "x$LAUNCHMON_INC_DIR" != "x"; then - LAUNCHMON_INC=-I$LAUNCHMON_INC_DIR -fi -CPPFLAGS="$CPPFLAGS $LAUNCHMON_INC" -AC_CHECK_HEADER([lmon_api/lmon_fe.h], - [AC_MSG_NOTICE([Found launchmon headers])], - [if test "x$EXPLICIT_LMON" == "xtrue"; - then AC_MSG_ERROR([Could not find or build LaunchMON includes]) - else HAVE_LMON=false - fi]) -CPPFLAGS=$CPPFLAGS_HOLD - -if test "xHAVE_LMON" != "xfalse"; then - LDFLAGS_HOLD=$LDFLAGS - LIBS_HOLD=$LIBS - if test "x$LAUNCHMON_LIB_DIR" != "x"; then - LAUNCHMON_LIB=-L$LAUNCHMON_LIB_DIR - LAUNCHMON_BIN=$LAUNCHMON_LIB_DIR/../bin - fi - LDFLAGS="$LDFLAGS $LAUNCHMON_LIB" - - if test "x$LAUNCHMON_RMCOMM_DIR" != "x"; then - LAUNCHMON_RMCOMM="-Wl,-rpath=$LAUNCHMON_RMCOMM_DIR" - fi - - AC_CHECK_LIB(monfeapi, LMON_fe_init, - [AC_MSG_NOTICE([Found launchmon libraries]);HAVE_LMON=true], - [if test "x$EXPLICIT_LMON" == "xtrue"; - then AC_MSG_ERROR([Could not find or build LaunchMON libraries]) - else AC_MSG_WARN([Could not find or build LaunchMON libraries]); HAVE_LMON=false - fi]) -fi - -if test "xHAVE_LMON" != "xfalse"; then - AC_LANG_PUSH(C++) - AC_MSG_CHECKING([whether we can statically link launchmon]) - LAUNCHMON_STATIC_LIBS_TEST="$LAUNCHMON_LIB_DIR/libmonbeapi.a $LAUNCHMON_LIB_DIR/libcobo.a $LAUNCHMON_LIB_DIR/libgcrypt.a $LAUNCHMON_LIB_DIR/libgpg-error.a" - LIBS="$LIBS $LAUNCHMON_STATIC_LIBS_TEST" - AC_LINK_IFELSE([AC_LANG_PROGRAM([extern "C" { extern int LMON_be_init(); } ],[return LMON_be_init();])], - [LAUNCHMON_STATIC_LIBS=$LAUNCHMON_STATIC_LIBS_TEST] - AC_MSG_RESULT([yes]), - []) - if test "x$LAUNCHMON_STATIC_LIBS" == "x"; then - if test "x$HAVE_MUNGE" == "xtrue"; then - LIBS="$LIBS_HOLD $LAUNCHMON_STATIC_LIBS_TEST $MUNGE_STATIC_LIB" - AC_LINK_IFELSE([AC_LANG_PROGRAM([extern "C" { extern int LMON_be_init(); } ],[return LMON_be_init();])], - [LAUNCHMON_STATIC_LIBS="$LAUNCHMON_STATIC_LIBS_TEST $MUNGE_STATIC_LIB"] - AC_MSG_RESULT([yes]), - [AC_MSG_RESULT([no])]) - else - AC_MSG_RESULT([no]) - fi - fi - AC_LANG_POP - LDFLAGS=$LDFLAGS_HOLD - LIBS=$LIBS_HOLD -fi - -AC_SUBST(LAUNCHMON_STATIC_LIBS) -AC_SUBST(HAVE_LMON) - -AC_SUBST(LAUNCHMON_INC) -AC_SUBST(LAUNCHMON_LIB) -AC_SUBST(LAUNCHMON_RMCOMM) -AC_DEFINE_UNQUOTED([LAUNCHMON_BIN_DIR],"[$LAUNCHMON_BIN]",[The bin directory for launchmon]) - -AM_CONDITIONAL([LMON], [test "x$HAVE_LMON" == "xtrue"]) -AM_CONDITIONAL([LMON_DYNAMIC], [test "x$LAUNCHMON_STATIC_LIBS" == "x"]) - -if test "x$HAVE_LMON" == "xtrue"; then - AC_DEFINE([HAVE_LMON], [1], [Build with LaunchMON support]) -fi diff --git a/src/fe/Makefile.am b/src/fe/Makefile.am index e6f0c56f..c7d85a14 100644 --- a/src/fe/Makefile.am +++ b/src/fe/Makefile.am @@ -1,9 +1,6 @@ -if LMON -BUILD_LMON=launchmon -endif if BLD_FLUXPLUGIN BUILD_FLUX=flux endif -SUBDIRS = logging cobo comlib openmpi_intercept $(BUILD_LMON) $(BUILD_FLUX) hostbin startup +SUBDIRS = logging cobo comlib openmpi_intercept $(BUILD_FLUX) hostbin startup diff --git a/src/fe/configure.ac b/src/fe/configure.ac index 7ad2f3ff..38ff1714 100644 --- a/src/fe/configure.ac +++ b/src/fe/configure.ac @@ -9,7 +9,7 @@ AC_CONFIG_HEADERS([config.h]) AC_PROG_CC AM_PROG_CC_C_O AC_PROG_CXX -AC_CONFIG_FILES([logging/Makefile cobo/Makefile comlib/Makefile openmpi_intercept/Makefile launchmon/Makefile flux/Makefile startup/Makefile hostbin/Makefile Makefile]) +AC_CONFIG_FILES([logging/Makefile cobo/Makefile comlib/Makefile openmpi_intercept/Makefile flux/Makefile startup/Makefile hostbin/Makefile Makefile]) AC_PROG_LN_S LT_INIT @@ -21,8 +21,6 @@ m4_include([../../configure.common.ac]) CHOOSE_SEC CHOOSE_DEF_AUDIT -#Include LaunchMON -m4_include([../../m4/lmon.m4]) #Include RM Selection m4_include([../../m4/launcher.m4]) diff --git a/src/fe/launchmon/Makefile.am b/src/fe/launchmon/Makefile.am deleted file mode 100644 index 99be27fb..00000000 --- a/src/fe/launchmon/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -noinst_LTLIBRARIES = libfelmon.la - -libfelmon_la_SOURCES = spindle_fe_lmon.cc -libfelmon_la_CPPFLAGS = $(LAUNCHMON_INC) -I$(top_srcdir)/../logging -I$(top_srcdir)/../include -DBINDIR=\"$(pkglibexecdir)\" -DLIBEXECDIR=\"$(pkglibexecdir)\" -libfelmon_la_LIBADD = $(LAUNCHMON_LIB) $(LAUNCHMON_RMCOMM) -lmonfeapi - diff --git a/src/fe/launchmon/Makefile.in b/src/fe/launchmon/Makefile.in deleted file mode 100644 index fe4eee50..00000000 --- a/src/fe/launchmon/Makefile.in +++ /dev/null @@ -1,647 +0,0 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2018 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -am__is_gnu_make = { \ - if test -z '$(MAKELEVEL)'; then \ - false; \ - elif test -n '$(MAKE_HOST)'; then \ - true; \ - elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ - true; \ - else \ - false; \ - fi; \ -} -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ -subdir = launchmon -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ - $(top_srcdir)/../../m4/ltoptions.m4 \ - $(top_srcdir)/../../m4/ltsugar.m4 \ - $(top_srcdir)/../../m4/ltversion.m4 \ - $(top_srcdir)/../../m4/lt~obsolete.m4 \ - $(top_srcdir)/../../m4/pkg.m4 \ - $(top_srcdir)/../../configure.common.ac \ - $(top_srcdir)/../../m4/lmon.m4 \ - $(top_srcdir)/../../m4/launcher.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -LTLIBRARIES = $(noinst_LTLIBRARIES) -am__DEPENDENCIES_1 = -libfelmon_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) -am_libfelmon_la_OBJECTS = libfelmon_la-spindle_fe_lmon.lo -libfelmon_la_OBJECTS = $(am_libfelmon_la_OBJECTS) -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -am__v_lt_0 = --silent -am__v_lt_1 = -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/../../scripts/depcomp -am__maybe_remake_depfiles = depfiles -am__depfiles_remade = ./$(DEPDIR)/libfelmon_la-spindle_fe_lmon.Plo -am__mv = mv -f -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CXXFLAGS) $(CXXFLAGS) -AM_V_CXX = $(am__v_CXX_@AM_V@) -am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -am__v_CXX_0 = @echo " CXX " $@; -am__v_CXX_1 = -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -am__v_CXXLD_0 = @echo " CXXLD " $@; -am__v_CXXLD_1 = -SOURCES = $(libfelmon_la_SOURCES) -DIST_SOURCES = $(libfelmon_la_SOURCES) -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -# Read a list of newline-separated strings from the standard input, -# and print each of them once, without duplicates. Input order is -# *not* preserved. -am__uniquify_input = $(AWK) '\ - BEGIN { nonempty = 0; } \ - { items[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in items) print i; }; } \ -' -# Make sure the list of sources is unique. This is necessary because, -# e.g., the same source file might be shared among _SOURCES variables -# for different programs/libraries. -am__define_uniq_tagged_files = \ - list='$(am__tagged_files)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -am__DIST_COMMON = $(srcdir)/Makefile.in \ - $(top_srcdir)/../../scripts/depcomp -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AR_FLAGS = @AR_FLAGS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -FLUX_CORE_CFLAGS = @FLUX_CORE_CFLAGS@ -FLUX_CORE_LIBS = @FLUX_CORE_LIBS@ -FLUX_HOSTLIST_CFLAGS = @FLUX_HOSTLIST_CFLAGS@ -FLUX_HOSTLIST_LIBS = @FLUX_HOSTLIST_LIBS@ -GCRYPT_CFLAGS = @GCRYPT_CFLAGS@ -GCRYPT_LIBS = @GCRYPT_LIBS@ -GREP = @GREP@ -HAVE_LMON = @HAVE_LMON@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LAUNCHMON_INC = @LAUNCHMON_INC@ -LAUNCHMON_LIB = @LAUNCHMON_LIB@ -LAUNCHMON_RMCOMM = @LAUNCHMON_RMCOMM@ -LAUNCHMON_STATIC_LIBS = @LAUNCHMON_STATIC_LIBS@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -MUNGE_CFLAGS = @MUNGE_CFLAGS@ -MUNGE_DYN_LIB = @MUNGE_DYN_LIB@ -MUNGE_LIBS = @MUNGE_LIBS@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKGSYSCONF_DIR = @PKGSYSCONF_DIR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SPINDLEFE_LIB_VERSION = @SPINDLEFE_LIB_VERSION@ -SRUN_PATH = @SRUN_PATH@ -STATICFLAG = @STATICFLAG@ -STRIP = @STRIP@ -TESTRM = @TESTRM@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -fluxplugin_ldflags = @fluxplugin_ldflags@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -shell_plugindir = @shell_plugindir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -noinst_LTLIBRARIES = libfelmon.la -libfelmon_la_SOURCES = spindle_fe_lmon.cc -libfelmon_la_CPPFLAGS = $(LAUNCHMON_INC) -I$(top_srcdir)/../logging -I$(top_srcdir)/../include -DBINDIR=\"$(pkglibexecdir)\" -DLIBEXECDIR=\"$(pkglibexecdir)\" -libfelmon_la_LIBADD = $(LAUNCHMON_LIB) $(LAUNCHMON_RMCOMM) -lmonfeapi -all: all-am - -.SUFFIXES: -.SUFFIXES: .cc .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign launchmon/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign launchmon/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; \ - locs=`for p in $$list; do echo $$p; done | \ - sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ - sort -u`; \ - test -z "$$locs" || { \ - echo rm -f $${locs}; \ - rm -f $${locs}; \ - } - -libfelmon.la: $(libfelmon_la_OBJECTS) $(libfelmon_la_DEPENDENCIES) $(EXTRA_libfelmon_la_DEPENDENCIES) - $(AM_V_CXXLD)$(CXXLINK) $(libfelmon_la_OBJECTS) $(libfelmon_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfelmon_la-spindle_fe_lmon.Plo@am__quote@ # am--include-marker - -$(am__depfiles_remade): - @$(MKDIR_P) $(@D) - @echo '# dummy' >$@-t && $(am__mv) $@-t $@ - -am--depfiles: $(am__depfiles_remade) - -.cc.o: -@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - -.cc.obj: -@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ -@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cc.lo: -@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - -libfelmon_la-spindle_fe_lmon.lo: spindle_fe_lmon.cc -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfelmon_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libfelmon_la-spindle_fe_lmon.lo -MD -MP -MF $(DEPDIR)/libfelmon_la-spindle_fe_lmon.Tpo -c -o libfelmon_la-spindle_fe_lmon.lo `test -f 'spindle_fe_lmon.cc' || echo '$(srcdir)/'`spindle_fe_lmon.cc -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfelmon_la-spindle_fe_lmon.Tpo $(DEPDIR)/libfelmon_la-spindle_fe_lmon.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='spindle_fe_lmon.cc' object='libfelmon_la-spindle_fe_lmon.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfelmon_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libfelmon_la-spindle_fe_lmon.lo `test -f 'spindle_fe_lmon.cc' || echo '$(srcdir)/'`spindle_fe_lmon.cc - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(am__tagged_files) - $(am__define_uniq_tagged_files); mkid -fID $$unique -tags: tags-am -TAGS: tags - -tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: ctags-am - -CTAGS: ctags -ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -cscopelist: cscopelist-am - -cscopelist-am: $(am__tagged_files) - list='$(am__tagged_files)'; \ - case "$(srcdir)" in \ - [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ - *) sdir=$(subdir)/$(srcdir) ;; \ - esac; \ - for i in $$list; do \ - if test -f "$$i"; then \ - echo "$(subdir)/$$i"; \ - else \ - echo "$$sdir/$$i"; \ - fi; \ - done >> $(top_builddir)/cscope.files - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) distdir-am - -distdir-am: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LTLIBRARIES) -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ - mostlyclean-am - -distclean: distclean-am - -rm -f ./$(DEPDIR)/libfelmon_la-spindle_fe_lmon.Plo - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f ./$(DEPDIR)/libfelmon_la-spindle_fe_lmon.Plo - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ - clean-generic clean-libtool clean-noinstLTLIBRARIES \ - cscopelist-am ctags ctags-am distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-am uninstall uninstall-am - -.PRECIOUS: Makefile - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/src/fe/launchmon/spindle_fe_lmon.cc b/src/fe/launchmon/spindle_fe_lmon.cc deleted file mode 100644 index f18d4251..00000000 --- a/src/fe/launchmon/spindle_fe_lmon.cc +++ /dev/null @@ -1,309 +0,0 @@ -/* -This file is part of Spindle. For copyright information see the COPYRIGHT -file in the top level directory, or at -https://github.com/hpc/Spindle/blob/master/COPYRIGHT - -This program is free software; you can redistribute it and/or modify it under -the terms of the GNU Lesser General Public License (as published by the Free Software -Foundation) version 2.1 dated February 1999. This program is distributed in the -hope that it will be useful, but WITHOUT ANY WARRANTY; without even the IMPLIED -WARRANTY OF MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms -and conditions of the GNU Lesser General Public License for more details. You should -have received a copy of the GNU Lesser General Public License along with this -program; if not, write to the Free Software Foundation, Inc., 59 Temple -Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -#include -#include "../startup/launcher.h" - -#include "lmon_api/common.h" -#include "lmon_api/lmon_proctab.h" -#include "lmon_api/lmon_fe.h" - -#include "spindle_debug.h" -#include "config.h" -#include "spindle_launch.h" - -#include -#include -#include -#include -#include -#include -#include -#include "spindle_launch.h" - -using namespace std; - -#if !defined(LAUNCHMON_BIN_DIR) -#error Expected LAUNCHMON_BIN_DIR to be defined -#endif - -#define PUSH_ENV_DEFAULT_VAL false - - -static bool push_env = PUSH_ENV_DEFAULT_VAL; -extern char **environ; - - -class LMonLauncher : public Launcher -{ - friend Launcher *createLaunchmonLauncher(spindle_args_t *params, ConfigMap &config); -private: - static LMonLauncher *llauncher; - int aSession; - app_id_t appid; - int status; - bool initError; - - void initEnvironment(); - bool initLMon(); - LMonLauncher(spindle_args_t *params_, ConfigMap &config_); - static int pack_environ(void *udata, void *msgbuf, - int msgbufmax, int *msgbuflen); - static int packfebe_cb(void *udata, void *msgbuf, - int msgbufmax, int *msgbuflen); - static int onLaunchmonStatusChange_cb(int *pstatus); -protected: - virtual bool spawnDaemon(); -public: - virtual bool spawnJob(app_id_t id, int app_argc, char **app_argv); - virtual const char **getProcessTable(); - virtual const char *getDaemonArg(); - virtual bool getReturnCodes(bool &daemon_done, int &daemon_ret, - vector > &app_rets); - int onLaunchmonStatusChange(int *pstatus); -}; - -LMonLauncher *LMonLauncher::llauncher = NULL; - -Launcher *createLaunchmonLauncher(spindle_args_t *params, ConfigMap &config) -{ - LMonLauncher *l = new LMonLauncher(params, config); - if (l->initError) { - delete l; - return NULL; - } - LMonLauncher::llauncher = l; - return l; -} - -void LMonLauncher::initEnvironment() -{ - if (!strlen(LAUNCHMON_BIN_DIR)) - return; - - setenv("LMON_PREFIX", LAUNCHMON_BIN_DIR "/..", 0); - setenv("LMON_LAUNCHMON_ENGINE_PATH", LAUNCHMON_BIN_DIR "/launchmon", 0); - setenv("LMON_NEWLAUNCHMON_ENGINE_PATH", LAUNCHMON_BIN_DIR "/newlaunchmon", 0); -} - -static const char *pt_to_string(const MPIR_PROCDESC_EXT &pt) { - return pt.pd.host_name; -} - -static bool rank_lt(const MPIR_PROCDESC_EXT &a, const MPIR_PROCDESC_EXT &b) { - return a.mpirank < b.mpirank; -} - -struct str_lt { - bool operator()(const char *a, const char *b) const noexcept { return strcmp(a, b) < 0; } -}; - -const char **LMonLauncher::getProcessTable() -{ - /* Get the process table */ - lmon_rc_e rc; - unsigned int ptable_size, actual_size; - - rc = LMON_fe_getProctableSize(aSession, &ptable_size); - if (rc != LMON_OK) { - err_printf("LMON_fe_getProctableSize failed\n"); - return NULL; - } - MPIR_PROCDESC_EXT *proctab = (MPIR_PROCDESC_EXT *) malloc(sizeof(MPIR_PROCDESC_EXT) * ptable_size); - rc = LMON_fe_getProctable(aSession, proctab, &actual_size, ptable_size); - if (rc != LMON_OK) { - err_printf("LMON_fe_getProctable failed\n"); - return NULL; - } - - /* Transform the process table to a list of hosts. Pass through std::set to make hostnames unique */ - set host_set; - transform(proctab, proctab+ptable_size, inserter(host_set, host_set.begin()), pt_to_string); - size_t hosts_size = host_set.size(); - const char **hosts = static_cast(malloc((hosts_size+1) * sizeof(char *))); - copy(host_set.begin(), host_set.end(), hosts); - hosts[hosts_size] = NULL; - - /* Swap the hostname containing rank 0 to the front of the list so it'll be the leader */ - MPIR_PROCDESC_EXT *smallest_rank = std::min_element(proctab, proctab+ptable_size, rank_lt); - const char **smallest_host = find(hosts, hosts + hosts_size, smallest_rank->pd.host_name); - std::swap(*hosts, *smallest_host); - - free(proctab); - return hosts; -} - -const char *LMonLauncher::getDaemonArg() -{ - return "--spindle_lmon"; -} - -bool LMonLauncher::getReturnCodes(bool &daemon_done, int &daemon_ret, - vector > &app_rets) -{ - if (WIFKILLED(status) || WIFDETACHED(status)) { - daemon_done = true; - daemon_ret = 0; - app_rets.push_back(make_pair(appid, 0)); - } - return true; -} - -int LMonLauncher::onLaunchmonStatusChange_cb(int *pstatus) -{ - return llauncher->onLaunchmonStatusChange(pstatus); -} - -int LMonLauncher::onLaunchmonStatusChange(int *pstatus) { - assert(llauncher); - if (WIFKILLED(*pstatus) || WIFDETACHED(*pstatus)) { - llauncher->status = *pstatus; - llauncher->markFinished(); - } - return 0; -} - -int LMonLauncher::pack_environ(void *udata, void *msgbuf, - int msgbufmax, int *msgbuflen) -{ - size_t pos = 0; - char *buffer = (char *) msgbuf; - - for (char **cur_env = (char **) udata; *cur_env != NULL; cur_env++) { - char *env = *cur_env; - size_t len = strlen(env); - assert(pos + len + 1 < (size_t) msgbufmax); - - memcpy(buffer + pos, env, len); - pos += len; - - buffer[pos] = '\n'; - pos += 1; - } - if (pos > 0) - buffer[pos-1] = '\0'; - - *msgbuflen = (int) pos; - return 0; -} - -int LMonLauncher::packfebe_cb(void *udata, void *msgbuf, - int msgbufmax, int *msgbuflen) -{ - if (udata == (void *) environ) - return pack_environ(udata, msgbuf, msgbufmax, msgbuflen); - - spindle_args_t *args = (spindle_args_t *) udata; - unsigned int send_env = push_env ? 1 : 0; - - *msgbuflen = sizeof(unsigned int) * 3; - *msgbuflen += sizeof(unique_id_t); - assert(*msgbuflen < msgbufmax); - - char *buffer = (char *) msgbuf; - int pos = 0; - memcpy(buffer + pos, &args->port, sizeof(args->port)); - pos += sizeof(args->port); - memcpy(buffer + pos, &args->num_ports, sizeof(args->num_ports)); - pos += sizeof(args->num_ports); - memcpy(buffer + pos, &send_env, sizeof(send_env)); - pos += sizeof(send_env); - memcpy(buffer + pos, &args->unique_id, sizeof(args->unique_id)); - pos += sizeof(args->unique_id); - - assert(pos == *msgbuflen); - - return 0; -} - -LMonLauncher::LMonLauncher(spindle_args_t *params_, ConfigMap &config_) : - Launcher(params_, config_), - aSession(0), - appid(0), - status(0), - initError(false) -{ - initEnvironment(); - if (!initLMon()) - initError = true; -} - -bool LMonLauncher::initLMon() { - lmon_rc_e rc; - - rc = LMON_fe_init(LMON_VERSION); - if (rc != LMON_OK ) { - err_printf("[LMON FE] LMON_fe_init FAILED\n" ); - return false; - } - - rc = LMON_fe_createSession(&aSession); - if (rc != LMON_OK) { - err_printf("[LMON FE] LMON_fe_createFEBESession FAILED\n"); - return false; - } - - rc = LMON_fe_regStatusCB(aSession, onLaunchmonStatusChange_cb); - if (rc != LMON_OK) { - err_printf("[LMON FE] LMON_fe_regStatusCB FAILED\n"); - return false; - } - - rc = LMON_fe_regPackForFeToBe(aSession, packfebe_cb); - if (rc != LMON_OK) { - err_printf("[LMON FE] LMON_fe_regPackForFeToBe FAILED\n"); - return false; - } - return true; -} - -bool LMonLauncher::spawnDaemon() -{ - assert(daemon_argc > 0); - assert(daemon_argv); - return true; -} - -bool LMonLauncher::spawnJob(app_id_t id, int app_argc, char **app_argv) -{ - lmon_rc_e rc; - - rc = LMON_fe_launchAndSpawnDaemons(aSession, NULL, - app_argv[0], app_argv, - daemon_argv[0], daemon_argv+1, - NULL, NULL); - if (rc != LMON_OK) { - err_printf("[LMON FE] LMON_fe_launchAndSpawnDaemons FAILED\n"); - return false; - } - - rc = LMON_fe_sendUsrDataBe(aSession, params); - if (rc != LMON_OK) { - err_printf("[LMON FE] Error sending user data to backends\n"); - return false; - } - - if (push_env) { - rc = LMON_fe_sendUsrDataBe(aSession, environ); - if (rc != LMON_OK) { - err_printf("[LMON FE] Error sending environment data to backends\n"); - return false; - } - } - - appid = id; - return true; -} diff --git a/src/fe/startup/Makefile.am b/src/fe/startup/Makefile.am index 7f67da5e..860f04a8 100644 --- a/src/fe/startup/Makefile.am +++ b/src/fe/startup/Makefile.am @@ -32,7 +32,3 @@ spindle_CPPFLAGS += -I$(top_srcdir)/../flux spindle_SOURCES += launch_flux.cc endif -if LMON -spindle_LDADD += $(top_builddir)/launchmon/libfelmon.la -endif - diff --git a/src/fe/startup/spindle_fe_main.cc b/src/fe/startup/spindle_fe_main.cc index 530f269e..8ef98725 100644 --- a/src/fe/startup/spindle_fe_main.cc +++ b/src/fe/startup/spindle_fe_main.cc @@ -43,9 +43,6 @@ using namespace std; static void setupLogging(int argc, char **argv); static bool getNextTask(Launcher *launcher, spindle_args_t *params, vector &tasks, const ConfigMap &config); -#if defined(HAVE_LMON) -extern Launcher *createLaunchmonLauncher(spindle_args_t *params, ConfigMap &config_); -#endif extern Launcher *createSerialLauncher(spindle_args_t *params, ConfigMap &config_); extern Launcher *createHostbinLauncher(spindle_args_t *params, ConfigMap &config_); extern Launcher *createMPILauncher(spindle_args_t *params, ConfigMap &config_); @@ -63,14 +60,9 @@ Launcher *newLauncher(spindle_args_t *params, ConfigMap &config) return createSerialLauncher(params, config); } else if (params->startup_type == startup_lmon) { - debug_printf("Starting application with launchmon\n"); -#if defined(HAVE_LMON) - return createLaunchmonLauncher(params, config); -#else - fprintf(stderr, "Spindle Error: Spindle was not built with LaunchMON support\n"); - err_printf("HAVE_LMON not defined\n"); + fprintf(stderr, "Spindle Error: LaunchMON support has been removed\n"); + err_printf("LaunchMON startup no longer supported\n"); return NULL; -#endif } else if (params->startup_type == startup_hostbin) { debug_printf("Starting application with hostbin\n"); diff --git a/src/server/Makefile.am b/src/server/Makefile.am index ba233d68..16784c2a 100644 --- a/src/server/Makefile.am +++ b/src/server/Makefile.am @@ -1,5 +1 @@ -if LMON -BUILD_LMON=launchmon -endif - -SUBDIRS = logging biter cache cobo comlib auditserver $(BUILD_LMON) startup +SUBDIRS = logging biter cache cobo comlib auditserver startup diff --git a/src/server/configure.ac b/src/server/configure.ac index 46ccafae..a5529f96 100644 --- a/src/server/configure.ac +++ b/src/server/configure.ac @@ -9,7 +9,7 @@ AC_CONFIG_HEADERS([config.h]) AC_PROG_CC AM_PROG_CC_C_O AC_PROG_CXX -AC_CONFIG_FILES([logging/Makefile biter/Makefile cache/Makefile auditserver/Makefile cobo/Makefile comlib/Makefile launchmon/Makefile startup/Makefile Makefile]) +AC_CONFIG_FILES([logging/Makefile biter/Makefile cache/Makefile auditserver/Makefile cobo/Makefile comlib/Makefile startup/Makefile Makefile]) AC_PROG_LN_S LT_INIT @@ -21,62 +21,54 @@ m4_include([../../configure.common.ac]) CHOOSE_SEC -#Include LaunchMON -m4_include([../../m4/lmon.m4]) +#Check if we can static link libstdc++ and libgcc, which is desirable +# for bootstrapping purposes on spindle_be. +AC_LANG_PUSH(C++) +LDFLAGS_HOLD=$LDFLAGS +LDFLAGS+=-static-libgcc +AC_MSG_CHECKING([whether we can statically link libgcc]) +AC_LINK_IFELSE([AC_LANG_PROGRAM([])], + [STATIC_LIBGCC_OPT=-static-libgcc] + [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no])]) -#Check if we can static link libstdc++ and libgcc, which is desirable -# for bootstrapping purposes on spindle_be. We only do this if we -# can link everything statically: launchmon, libstdc++, libgcc. -# Otherwise we stick with dynamic linking. -if test "x$LAUNCHMON_STATIC_LIBS" != "x"; then - #Test whether we have a static libgcc option - AC_LANG_PUSH(C++) - LDFLAGS_HOLD=$LDFLAGS - LDFLAGS+=-static-libgcc - AC_MSG_CHECKING([whether we can statically link libgcc]) - AC_LINK_IFELSE([AC_LANG_PROGRAM([])], - [STATIC_LIBGCC_OPT=-static-libgcc] - [AC_MSG_RESULT([yes])], - [AC_MSG_RESULT([no])]) - - if test "x$STATIC_LIBGCC_OPT" != "x"; then - #Test whether we have a static libstdc++ - AC_MSG_CHECKING([whether we have a static libstdc++]) - STATIC_LIBSTDCXX_TEST=`$CXX -print-file-name=libstdc++.a` - if test -f $STATIC_LIBSTDCXX_TEST; then - STATIC_LIBSTDCXX=$STATIC_LIBSTDCXX_TEST - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - fi - - if test "x$STATIC_LIBSTDCXX" != "x"; then +if test "x$STATIC_LIBGCC_OPT" != "x"; then + #Test whether we have a static libstdc++ + AC_MSG_CHECKING([whether we have a static libstdc++]) + STATIC_LIBSTDCXX_TEST=`$CXX -print-file-name=libstdc++.a` + if test -f $STATIC_LIBSTDCXX_TEST; then + STATIC_LIBSTDCXX=$STATIC_LIBSTDCXX_TEST + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + + if test "x$STATIC_LIBSTDCXX" != "x"; then - AC_CHECK_PROG([LDD], [ldd], [ldd]) - if test "x$LDD" != "x"; then - #Test whether we can link with a static libstdc++ - rm -f libstdc++.a - $LN_S $STATIC_LIBSTDCXX - LDFLAGS="$LDFLAGS -L." - AC_LINK_IFELSE([AC_LANG_PROGRAM([])], - [STATIC_TEST_LIBS=`$LDD conftest$EXEEXT`]) - AC_MSG_CHECKING([whether we can force static linking of libstdc++]) - if [[ "$STATIC_TEST_LIBS" != *libstdc++* ]]; then - if [[ "$STATIC_TEST_LIBS" != *libgcc* ]]; then - LINK_LIBSTDCXX_STATIC=yes - AC_MSG_RESULT([yes]) - else - LINK_LIBSTDCXX_STATIC=no - AC_MSG_RESULT([no]) - fi + AC_CHECK_PROG([LDD], [ldd], [ldd]) + if test "x$LDD" != "x"; then + #Test whether we can link with a static libstdc++ + rm -f libstdc++.a + $LN_S $STATIC_LIBSTDCXX + LDFLAGS="$LDFLAGS -L." + AC_LINK_IFELSE([AC_LANG_PROGRAM([])], + [STATIC_TEST_LIBS=`$LDD conftest$EXEEXT`]) + AC_MSG_CHECKING([whether we can force static linking of libstdc++]) + if [[ "$STATIC_TEST_LIBS" != *libstdc++* ]]; then + if [[ "$STATIC_TEST_LIBS" != *libgcc* ]]; then + LINK_LIBSTDCXX_STATIC=yes + AC_MSG_RESULT([yes]) else - LINK_LIBSTDCXX_STATIC=no - AC_MSG_RESULT([no]) + LINK_LIBSTDCXX_STATIC=no + AC_MSG_RESULT([no]) fi - rm -f libstdc++.a - LDFLAGS=$LDFLAGS_HOLD - AC_LANG_POP + else + LINK_LIBSTDCXX_STATIC=no + AC_MSG_RESULT([no]) fi + rm -f libstdc++.a + LDFLAGS=$LDFLAGS_HOLD + AC_LANG_POP fi fi fi diff --git a/src/server/launchmon/Makefile.am b/src/server/launchmon/Makefile.am deleted file mode 100644 index beab734b..00000000 --- a/src/server/launchmon/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -noinst_LTLIBRARIES = libbelmon.la - -libbelmon_la_SOURCES = spindle_be_lmon.cc -libbelmon_la_CPPFLAGS = $(LAUNCHMON_INC) -I$(top_srcdir)/../logging -I$(top_srcdir)/../include diff --git a/src/server/launchmon/Makefile.in b/src/server/launchmon/Makefile.in deleted file mode 100644 index 49d5e37d..00000000 --- a/src/server/launchmon/Makefile.in +++ /dev/null @@ -1,645 +0,0 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2018 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -am__is_gnu_make = { \ - if test -z '$(MAKELEVEL)'; then \ - false; \ - elif test -n '$(MAKE_HOST)'; then \ - true; \ - elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ - true; \ - else \ - false; \ - fi; \ -} -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ -subdir = launchmon -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ - $(top_srcdir)/../../m4/ltoptions.m4 \ - $(top_srcdir)/../../m4/ltsugar.m4 \ - $(top_srcdir)/../../m4/ltversion.m4 \ - $(top_srcdir)/../../m4/lt~obsolete.m4 \ - $(top_srcdir)/../../m4/pkg.m4 \ - $(top_srcdir)/../../configure.common.ac \ - $(top_srcdir)/../../m4/lmon.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -LTLIBRARIES = $(noinst_LTLIBRARIES) -libbelmon_la_LIBADD = -am_libbelmon_la_OBJECTS = libbelmon_la-spindle_be_lmon.lo -libbelmon_la_OBJECTS = $(am_libbelmon_la_OBJECTS) -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -am__v_lt_0 = --silent -am__v_lt_1 = -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/../../scripts/depcomp -am__maybe_remake_depfiles = depfiles -am__depfiles_remade = ./$(DEPDIR)/libbelmon_la-spindle_be_lmon.Plo -am__mv = mv -f -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CXXFLAGS) $(CXXFLAGS) -AM_V_CXX = $(am__v_CXX_@AM_V@) -am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -am__v_CXX_0 = @echo " CXX " $@; -am__v_CXX_1 = -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -am__v_CXXLD_0 = @echo " CXXLD " $@; -am__v_CXXLD_1 = -SOURCES = $(libbelmon_la_SOURCES) -DIST_SOURCES = $(libbelmon_la_SOURCES) -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -# Read a list of newline-separated strings from the standard input, -# and print each of them once, without duplicates. Input order is -# *not* preserved. -am__uniquify_input = $(AWK) '\ - BEGIN { nonempty = 0; } \ - { items[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in items) print i; }; } \ -' -# Make sure the list of sources is unique. This is necessary because, -# e.g., the same source file might be shared among _SOURCES variables -# for different programs/libraries. -am__define_uniq_tagged_files = \ - list='$(am__tagged_files)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -am__DIST_COMMON = $(srcdir)/Makefile.in \ - $(top_srcdir)/../../scripts/depcomp -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AR_FLAGS = @AR_FLAGS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -FLUX_CORE_CFLAGS = @FLUX_CORE_CFLAGS@ -FLUX_CORE_LIBS = @FLUX_CORE_LIBS@ -FLUX_HOSTLIST_CFLAGS = @FLUX_HOSTLIST_CFLAGS@ -FLUX_HOSTLIST_LIBS = @FLUX_HOSTLIST_LIBS@ -GCRYPT_CFLAGS = @GCRYPT_CFLAGS@ -GCRYPT_LIBS = @GCRYPT_LIBS@ -GREP = @GREP@ -HAVE_LMON = @HAVE_LMON@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LAUNCHMON_INC = @LAUNCHMON_INC@ -LAUNCHMON_LIB = @LAUNCHMON_LIB@ -LAUNCHMON_RMCOMM = @LAUNCHMON_RMCOMM@ -LAUNCHMON_STATIC_LIBS = @LAUNCHMON_STATIC_LIBS@ -LD = @LD@ -LDD = @LDD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -MUNGE_CFLAGS = @MUNGE_CFLAGS@ -MUNGE_DYN_LIB = @MUNGE_DYN_LIB@ -MUNGE_LIBS = @MUNGE_LIBS@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SPINDLEBE_LIB_VERSION = @SPINDLEBE_LIB_VERSION@ -SRUN_PATH = @SRUN_PATH@ -STATICFLAG = @STATICFLAG@ -STATIC_LIBGCC_OPT = @STATIC_LIBGCC_OPT@ -STATIC_LIBSTDCXX = @STATIC_LIBSTDCXX@ -STRIP = @STRIP@ -TESTRM = @TESTRM@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -fluxplugin_ldflags = @fluxplugin_ldflags@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -shell_plugindir = @shell_plugindir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -noinst_LTLIBRARIES = libbelmon.la -libbelmon_la_SOURCES = spindle_be_lmon.cc -libbelmon_la_CPPFLAGS = $(LAUNCHMON_INC) -I$(top_srcdir)/../logging -I$(top_srcdir)/../include -all: all-am - -.SUFFIXES: -.SUFFIXES: .cc .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign launchmon/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign launchmon/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; \ - locs=`for p in $$list; do echo $$p; done | \ - sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ - sort -u`; \ - test -z "$$locs" || { \ - echo rm -f $${locs}; \ - rm -f $${locs}; \ - } - -libbelmon.la: $(libbelmon_la_OBJECTS) $(libbelmon_la_DEPENDENCIES) $(EXTRA_libbelmon_la_DEPENDENCIES) - $(AM_V_CXXLD)$(CXXLINK) $(libbelmon_la_OBJECTS) $(libbelmon_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libbelmon_la-spindle_be_lmon.Plo@am__quote@ # am--include-marker - -$(am__depfiles_remade): - @$(MKDIR_P) $(@D) - @echo '# dummy' >$@-t && $(am__mv) $@-t $@ - -am--depfiles: $(am__depfiles_remade) - -.cc.o: -@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - -.cc.obj: -@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ -@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cc.lo: -@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - -libbelmon_la-spindle_be_lmon.lo: spindle_be_lmon.cc -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbelmon_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libbelmon_la-spindle_be_lmon.lo -MD -MP -MF $(DEPDIR)/libbelmon_la-spindle_be_lmon.Tpo -c -o libbelmon_la-spindle_be_lmon.lo `test -f 'spindle_be_lmon.cc' || echo '$(srcdir)/'`spindle_be_lmon.cc -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libbelmon_la-spindle_be_lmon.Tpo $(DEPDIR)/libbelmon_la-spindle_be_lmon.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='spindle_be_lmon.cc' object='libbelmon_la-spindle_be_lmon.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbelmon_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libbelmon_la-spindle_be_lmon.lo `test -f 'spindle_be_lmon.cc' || echo '$(srcdir)/'`spindle_be_lmon.cc - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(am__tagged_files) - $(am__define_uniq_tagged_files); mkid -fID $$unique -tags: tags-am -TAGS: tags - -tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: ctags-am - -CTAGS: ctags -ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -cscopelist: cscopelist-am - -cscopelist-am: $(am__tagged_files) - list='$(am__tagged_files)'; \ - case "$(srcdir)" in \ - [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ - *) sdir=$(subdir)/$(srcdir) ;; \ - esac; \ - for i in $$list; do \ - if test -f "$$i"; then \ - echo "$(subdir)/$$i"; \ - else \ - echo "$$sdir/$$i"; \ - fi; \ - done >> $(top_builddir)/cscope.files - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) distdir-am - -distdir-am: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LTLIBRARIES) -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ - mostlyclean-am - -distclean: distclean-am - -rm -f ./$(DEPDIR)/libbelmon_la-spindle_be_lmon.Plo - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f ./$(DEPDIR)/libbelmon_la-spindle_be_lmon.Plo - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ - clean-generic clean-libtool clean-noinstLTLIBRARIES \ - cscopelist-am ctags ctags-am distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-am uninstall uninstall-am - -.PRECIOUS: Makefile - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/src/server/launchmon/spindle_be_lmon.cc b/src/server/launchmon/spindle_be_lmon.cc deleted file mode 100644 index 39e35b92..00000000 --- a/src/server/launchmon/spindle_be_lmon.cc +++ /dev/null @@ -1,249 +0,0 @@ -/* -This file is part of Spindle. For copyright information see the COPYRIGHT -file in the top level directory, or at -https://github.com/hpc/Spindle/blob/master/COPYRIGHT - -This program is free software; you can redistribute it and/or modify it under -the terms of the GNU Lesser General Public License (as published by the Free Software -Foundation) version 2.1 dated February 1999. This program is distributed in the -hope that it will be useful, but WITHOUT ANY WARRANTY; without even the IMPLIED -WARRANTY OF MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms -and conditions of the GNU Lesser General Public License for more details. You should -have received a copy of the GNU Lesser General Public License along with this -program; if not, write to the Free Software Foundation, Inc., 59 Temple -Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -#include "lmon_api/lmon_be.h" - -#include "spindle_launch.h" -#include "spindle_debug.h" -#include "config.h" - -#include -#include -#include -#include -#include - -static bool push_env; -static char *environ_str = NULL; - -static int unpackfebe_cb(void* udatabuf, - int udatabuflen, - void* udata) -{ - if (udata == (void *) &environ_str) { - environ_str = strdup((char *) udatabuf); - return 0; - } - - spindle_args_t *args = (spindle_args_t *) udata; - - char *buffer = (char *) udatabuf; - int pos = 0; - unsigned int send_env; - - memcpy(&args->port, buffer + pos, sizeof(args->port)); - pos += sizeof(args->port); - - memcpy(&args->num_ports, buffer + pos, sizeof(args->num_ports)); - pos += sizeof(args->num_ports); - - memcpy(&send_env, buffer + pos, sizeof(send_env)); - pos += sizeof(send_env); - - memcpy(&args->unique_id, buffer + pos, sizeof(args->unique_id)); - pos += sizeof(args->unique_id); - - assert(pos == udatabuflen); - - push_env = (send_env != 0); - - return 0; -} - -int releaseApplication(spindle_args_t *) { -#if defined(os_linux) - int rc=0; - MPIR_PROCDESC_EXT *proctab; - int proctab_size; - lmon_rc_e lrc; - int signum, i; - - signum = SIGCONT; - - debug_printf("Sending SIGCONTs to each process to release debugger stops\n"); - lrc = LMON_be_getMyProctabSize(&proctab_size); - if (lrc != LMON_OK) - { - err_printf("LMON_be_getMyProctabSize\n"); - LMON_be_finalize(); - return EXIT_FAILURE; - } - - proctab = (MPIR_PROCDESC_EXT *) malloc (proctab_size*sizeof(MPIR_PROCDESC_EXT)); - if ( proctab == NULL ) { - err_printf("Proctable malloc return null\n"); - LMON_be_finalize(); - return EXIT_FAILURE; - } - - lrc = LMON_be_getMyProctab(proctab, &proctab_size, proctab_size); - if (lrc != LMON_OK) { - err_printf("LMON_be_getMyProctab\n"); - LMON_be_finalize(); - return EXIT_FAILURE; - } - - /* Continue application tasks */ - for(i=0; i < proctab_size; i++) { - debug_printf3("[LMON BE] kill %d, %d\n", proctab[i].pd.pid, signum ); - kill(proctab[i].pd.pid, signum); - } - - for (i=0; i < proctab_size; i++) { - if (proctab[i].pd.executable_name) free(proctab[i].pd.executable_name); - if (proctab[i].pd.host_name) free(proctab[i].pd.host_name); - } - free (proctab); - - return(rc); -#else -#error Unknown OS -#endif -} - -void setenvFromLMON() -{ - assert(environ_str); - char *env; - - for (env = strtok(environ_str, "\n"); env != NULL; env = strtok(NULL, "\n")) { - char *equals = strchr(env, '='); - char *env_name = env; - char *env_value = equals+1; - *equals = '\0'; - setenv(env_name, env_value, 1); - *equals = '='; - } - - char *cwd = getenv("PWD"); - chdir(cwd); -} - -int startLaunchmonBE(int argc, char *argv[], int security_type) -{ - struct { - unsigned int port; - unsigned int num_ports; - unsigned int send_env; - unique_id_t unique_id; - } conn_info; - lmon_rc_e rc; - int result; - - /* Initialization of LMON */ - rc = LMON_be_init(LMON_VERSION, &argc, &argv); - if (rc != LMON_OK) { - err_printf("Failed LMON_be_init\n"); - return -1; - } - - /* Register pack/unpack functions to LMON */ - if (LMON_be_amIMaster() == LMON_YES) { - rc = LMON_be_regUnpackForFeToBe(unpackfebe_cb); - if (rc != LMON_OK) { - err_printf("Failed LMON_be_regUnpackForBeToFe\n"); - return -1; - } - } - - int rank, size; - LMON_be_getMyRank(&rank); - LMON_be_getSize(&size); - debug_printf("Launchmon rank %d/%d\n", rank, size); - - rc = LMON_be_handshake(NULL); - if (rc != LMON_OK) { - err_printf("Failed LMON_be_handhshake\n"); - LMON_be_finalize(); - return -1; - } - - rc = LMON_be_ready(NULL); - if (rc != LMON_OK) { - err_printf("Failed LMON_be_ready\n"); - LMON_be_finalize(); - return -1; - } - - /* Receive port and unique_id via lmon. args is not fully - filled in at this point */ - { - spindle_args_t args; - rc = LMON_be_recvUsrData(&args); - if (rc != LMON_OK) { - err_printf("Failed to receive usr data from FE\n"); - return -1; - } - if (LMON_be_amIMaster() == LMON_YES) { - conn_info.port = args.port; - conn_info.num_ports = args.num_ports; - conn_info.unique_id = args.unique_id; - conn_info.send_env = push_env ? 1 : 0; - } - } - - /* Broadcast port/uniqueid from master to all servers */ - rc = LMON_be_broadcast(&conn_info, sizeof(conn_info)); - if (rc != LMON_OK) { - err_printf("Failed to broadcast connection info\n"); - return -1; - } - push_env = (conn_info.send_env != 0); - - /* Broadcast environment to all nodes if necessary. */ - if (push_env) { - rc = LMON_be_recvUsrData(&environ_str); - if (rc != LMON_OK) { - err_printf("Failed to receive environ data from FE\n"); - return -1; - } - size_t environ_size = environ_str ? strlen(environ_str)+1 : 0; - rc = LMON_be_broadcast(&environ_size, sizeof(environ_size)); - if (rc != LMON_OK) { - err_printf("Failed to broadcast environ_size\n"); - return -1; - } - assert(environ_size); - - if (!environ_str) - environ_str = (char *) malloc(environ_size); - - rc = LMON_be_broadcast(environ_str, environ_size); - if (rc != LMON_OK) { - err_printf("Failed to broadcast environ\n"); - return -1; - } - - setenvFromLMON(); - free(environ_str); - environ_str = NULL; - } - - - result = spindleRunBE(conn_info.port, conn_info.num_ports, conn_info.unique_id, security_type, - releaseApplication); - if (result == -1) { - err_printf("Failed in call to spindleInitBE\n"); - return -1; - } - - rc = LMON_be_finalize(); - if (rc != LMON_OK) { - err_printf("Failed to finalize launchmon\n"); - return -1; - } - return 0; -} diff --git a/src/server/startup/Makefile.am b/src/server/startup/Makefile.am index ddffdb82..cac88f7e 100644 --- a/src/server/startup/Makefile.am +++ b/src/server/startup/Makefile.am @@ -33,11 +33,3 @@ CLEANFILES = ./libstdc++.a $(AM_V_GEN)$(LN_S) $(STATIC_LIBSTDCXX) $@ BUILT_SOURCES=./libstdc++.a endif - -if LMON -if LMON_DYNAMIC -spindle_be_LDADD += $(top_builddir)/launchmon/libbelmon.la $(LAUNCHMON_LIB) $(LAUNCHMON_RMCOMM) -lmonbeapi -lgcrypt -lpthread -else -spindle_be_LDADD += $(top_builddir)/launchmon/libbelmon.la $(LAUNCHMON_STATIC_LIBS) -endif -endif diff --git a/src/server/startup/spindle_be_main.cc b/src/server/startup/spindle_be_main.cc index 3ede3b03..5cd8c2ec 100644 --- a/src/server/startup/spindle_be_main.cc +++ b/src/server/startup/spindle_be_main.cc @@ -27,9 +27,6 @@ Place, Suite 330, Boston, MA 02111-1307 USA static void setupLogging(int argc, char **argv); static int parseCommandLine(int argc, char *argv[]); -#if defined(HAVE_LMON) -extern int startLaunchmonBE(int argc, char *argv[], int security_type); -#endif extern int startHostbinBE(unsigned int port, unsigned int num_ports, unique_id_t unique_id, int security_type); extern int startSerialBE(int argc, char *argv[], int security_type); extern int startMPILaunchBE(unsigned int port, unsigned int num_ports, unique_id_t unique_id, int security_type); @@ -72,11 +69,9 @@ int main(int argc, char *argv[]) switch (startup_type) { case lmon: -#if defined(HAVE_LMON) - result = startLaunchmonBE(argc, argv, security_type); -#else - assert(0); -#endif + fprintf(stderr, "Spindle Error: LaunchMON support has been removed\n"); + err_printf("LaunchMON startup no longer supported\n"); + exit(-1); break; case serial: result = startSerialBE(argc, argv, security_type); From 18b1b897bff9c54828eba65cee5f490aee9aa7b1 Mon Sep 17 00:00:00 2001 From: Barry Rountree Date: Fri, 31 Jul 2026 09:15:56 -0700 Subject: [PATCH 18/21] [prune-config] Changes post bootstrap.sh (launchmon) --- Makefile.in | 10 +- config.h.in | 6 - configure | 250 ------------------- doc/Makefile.in | 10 +- src/client/configure | 8 - src/fe/Makefile.in | 13 +- src/fe/cobo/Makefile.in | 6 - src/fe/comlib/Makefile.in | 6 - src/fe/config.h.in | 9 - src/fe/configure | 273 +------------------- src/fe/flux/Makefile.in | 6 - src/fe/hostbin/Makefile.in | 6 - src/fe/logging/Makefile.in | 6 - src/fe/openmpi_intercept/Makefile.in | 6 - src/fe/startup/Makefile.in | 13 +- src/flux/Makefile.in | 10 +- src/server/Makefile.in | 13 +- src/server/auditserver/Makefile.in | 7 +- src/server/biter/Makefile.in | 7 +- src/server/cache/Makefile.in | 7 +- src/server/cobo/Makefile.in | 7 +- src/server/comlib/Makefile.in | 7 +- src/server/config.h.in | 9 - src/server/configure | 359 ++++----------------------- src/server/logging/Makefile.in | 7 +- src/server/startup/Makefile.in | 20 +- src/slurm_plugin/Makefile.in | 10 +- testsuite/Makefile.in | 10 +- 28 files changed, 71 insertions(+), 1030 deletions(-) diff --git a/Makefile.in b/Makefile.in index 9e4b21b3..f053e86b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -97,9 +97,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.common.ac \ - $(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/lmon.m4 \ - $(top_srcdir)/m4/lx_find_mpi.m4 $(top_srcdir)/m4/runconf.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/lx_find_mpi.m4 \ + $(top_srcdir)/m4/runconf.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ @@ -264,16 +263,11 @@ FLUX_CORE_LIBS = @FLUX_CORE_LIBS@ FLUX_HOSTLIST_CFLAGS = @FLUX_HOSTLIST_CFLAGS@ FLUX_HOSTLIST_LIBS = @FLUX_HOSTLIST_LIBS@ GREP = @GREP@ -HAVE_LMON = @HAVE_LMON@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LAUNCHMON_INC = @LAUNCHMON_INC@ -LAUNCHMON_LIB = @LAUNCHMON_LIB@ -LAUNCHMON_RMCOMM = @LAUNCHMON_RMCOMM@ -LAUNCHMON_STATIC_LIBS = @LAUNCHMON_STATIC_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ diff --git a/config.h.in b/config.h.in index f79a6e51..fc09ca33 100644 --- a/config.h.in +++ b/config.h.in @@ -46,9 +46,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H -/* Build with LaunchMON support */ -#undef HAVE_LMON - /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H @@ -85,9 +82,6 @@ /* Number of bytes in keys for gcrypt */ #undef KEY_SIZE_BYTES -/* The bin directory for launchmon */ -#undef LAUNCHMON_BIN_DIR - /* Use libnuma for numa optimizations */ #undef LIBNUMA diff --git a/configure b/configure index 5afba27b..98894e27 100755 --- a/configure +++ b/configure @@ -658,15 +658,6 @@ MPICXX MPI_CLDFLAGS MPI_CFLAGS MPICC -LMON_DYNAMIC_FALSE -LMON_DYNAMIC_TRUE -LMON_FALSE -LMON_TRUE -LAUNCHMON_RMCOMM -LAUNCHMON_LIB -LAUNCHMON_INC -HAVE_LMON -LAUNCHMON_STATIC_LIBS STATICFLAG fluxplugin_ldflags shell_plugindir @@ -857,16 +848,11 @@ with_usage_logging enable_cleanup_process enable_sec_munge enable_sec_keydir -enable_sec_launchmon enable_sec_none enable_crash_dedup with_gcrypt_dir with_munge_dir enable_remap_pageone -with_launchmon -with_launchmon_incdir -with_launchmon_libdir -with_launchmon_rmcommdir enable_testsuite ' ac_precious_vars='build_alias @@ -1544,8 +1530,6 @@ Optional Features: --enable-sec-keydir=keydir Enable filesystem directory 'keydir' to propagate authentication key for connections - --enable-sec-launchmon Enable LaunchmMON to propagate authentication key - for connections --enable-sec-none Disable security authentication of connections --enable-crash-dedup Enable --crash-dedup by default (default: disabled) --enable-remap-pageone Controls mmap behavior when replacing executables. @@ -1594,14 +1578,6 @@ Optional Packages: File for writing usage logs --with-gcrypt-dir=DIR Look in DIR for gcrypt installation --with-munge-dir=DIR Look in DIR for munge installation - --with-launchmon=DIR Launchmon directory (must contain ./lib and - ./include) - --with-launchmon-incdir=DIR - Launchmon include directory - --with-launchmon-libdir=DIR - Launchmon library directory - --with-launchmon-rmcommdir=DIR - RM communication library LaunchMON uses Some influential environment variables: CC C compiler command @@ -17474,11 +17450,6 @@ if test "${enable_sec_keydir+set}" = set; then : enableval=$enable_sec_keydir; WANT_KEYFILE="true";SEC_KEYDIR=$enableval;EXPLICIT_SEC="true" fi -# Check whether --enable-sec-launchmon was given. -if test "${enable_sec_launchmon+set}" = set; then : - enableval=$enable_sec_launchmon; WANT_SECLMON="true";EXPLICIT_SEC="true" -fi - # Check whether --enable-sec-none was given. if test "${enable_sec_none+set}" = set; then : enableval=$enable_sec_none; WANT_NOSEC="true";EXPLICIT_SEC="true" @@ -17577,219 +17548,6 @@ fi -#Launchmon processing - -# Check whether --with-launchmon was given. -if test "${with_launchmon+set}" = set; then : - withval=$with_launchmon; LAUNCHMON_INC_DIR="${withval}/include"; - LAUNCHMON_LIB_DIR="${withval}/lib"; - LAUNCHMON_RMCOMM_DIR="${withval}/lib" - EXPLICIT_LMON=true -fi - - -# Check whether --with-launchmon-incdir was given. -if test "${with_launchmon_incdir+set}" = set; then : - withval=$with_launchmon_incdir; LAUNCHMON_INC_DIR="${withval}";EXPLICIT_LMON=true -fi - - -# Check whether --with-launchmon-libdir was given. -if test "${with_launchmon_libdir+set}" = set; then : - withval=$with_launchmon_libdir; LAUNCHMON_LIB_DIR="${withval}";EXPLICIT_LMON=true -fi - - -# Check whether --with-launchmon-rmcommdir was given. -if test "${with_launchmon_rmcommdir+set}" = set; then : - withval=$with_launchmon_rmcommdir; LAUNCHMON_RMCOMM_DIR="${withval}";EXPLICIT_LMON=true -fi - - -CPPFLAGS_HOLD=$CPPFLAGS -if test "x$LAUNCHMON_INC_DIR" != "x"; then - LAUNCHMON_INC=-I$LAUNCHMON_INC_DIR -fi -CPPFLAGS="$CPPFLAGS $LAUNCHMON_INC" -ac_fn_c_check_header_mongrel "$LINENO" "lmon_api/lmon_fe.h" "ac_cv_header_lmon_api_lmon_fe_h" "$ac_includes_default" -if test "x$ac_cv_header_lmon_api_lmon_fe_h" = xyes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: Found launchmon headers" >&5 -$as_echo "$as_me: Found launchmon headers" >&6;} -else - if test "x$EXPLICIT_LMON" == "xtrue"; - then as_fn_error $? "Could not find or build LaunchMON includes" "$LINENO" 5 - else HAVE_LMON=false - fi -fi - - -CPPFLAGS=$CPPFLAGS_HOLD - -if test "xHAVE_LMON" != "xfalse"; then - LDFLAGS_HOLD=$LDFLAGS - LIBS_HOLD=$LIBS - if test "x$LAUNCHMON_LIB_DIR" != "x"; then - LAUNCHMON_LIB=-L$LAUNCHMON_LIB_DIR - LAUNCHMON_BIN=$LAUNCHMON_LIB_DIR/../bin - fi - LDFLAGS="$LDFLAGS $LAUNCHMON_LIB" - - if test "x$LAUNCHMON_RMCOMM_DIR" != "x"; then - LAUNCHMON_RMCOMM="-Wl,-rpath=$LAUNCHMON_RMCOMM_DIR" - fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LMON_fe_init in -lmonfeapi" >&5 -$as_echo_n "checking for LMON_fe_init in -lmonfeapi... " >&6; } -if ${ac_cv_lib_monfeapi_LMON_fe_init+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lmonfeapi $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char LMON_fe_init (); -int -main () -{ -return LMON_fe_init (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_monfeapi_LMON_fe_init=yes -else - ac_cv_lib_monfeapi_LMON_fe_init=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_monfeapi_LMON_fe_init" >&5 -$as_echo "$ac_cv_lib_monfeapi_LMON_fe_init" >&6; } -if test "x$ac_cv_lib_monfeapi_LMON_fe_init" = xyes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: Found launchmon libraries" >&5 -$as_echo "$as_me: Found launchmon libraries" >&6;};HAVE_LMON=true -else - if test "x$EXPLICIT_LMON" == "xtrue"; - then as_fn_error $? "Could not find or build LaunchMON libraries" "$LINENO" 5 - else { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or build LaunchMON libraries" >&5 -$as_echo "$as_me: WARNING: Could not find or build LaunchMON libraries" >&2;}; HAVE_LMON=false - fi -fi - -fi - -if test "xHAVE_LMON" != "xfalse"; then - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can statically link launchmon" >&5 -$as_echo_n "checking whether we can statically link launchmon... " >&6; } - LAUNCHMON_STATIC_LIBS_TEST="$LAUNCHMON_LIB_DIR/libmonbeapi.a $LAUNCHMON_LIB_DIR/libcobo.a $LAUNCHMON_LIB_DIR/libgcrypt.a $LAUNCHMON_LIB_DIR/libgpg-error.a" - LIBS="$LIBS $LAUNCHMON_STATIC_LIBS_TEST" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -extern "C" { extern int LMON_be_init(); } -int -main () -{ -return LMON_be_init(); - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - LAUNCHMON_STATIC_LIBS=$LAUNCHMON_STATIC_LIBS_TEST - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test "x$LAUNCHMON_STATIC_LIBS" == "x"; then - if test "x$HAVE_MUNGE" == "xtrue"; then - LIBS="$LIBS_HOLD $LAUNCHMON_STATIC_LIBS_TEST $MUNGE_STATIC_LIB" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -extern "C" { extern int LMON_be_init(); } -int -main () -{ -return LMON_be_init(); - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - LAUNCHMON_STATIC_LIBS="$LAUNCHMON_STATIC_LIBS_TEST $MUNGE_STATIC_LIB" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - fi - fi - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - LDFLAGS=$LDFLAGS_HOLD - LIBS=$LIBS_HOLD -fi - - - - - - - - -cat >>confdefs.h <<_ACEOF -#define LAUNCHMON_BIN_DIR "$LAUNCHMON_BIN" -_ACEOF - - - if test "x$HAVE_LMON" == "xtrue"; then - LMON_TRUE= - LMON_FALSE='#' -else - LMON_TRUE='#' - LMON_FALSE= -fi - - if test "x$LAUNCHMON_STATIC_LIBS" == "x"; then - LMON_DYNAMIC_TRUE= - LMON_DYNAMIC_FALSE='#' -else - LMON_DYNAMIC_TRUE='#' - LMON_DYNAMIC_FALSE= -fi - - -if test "x$HAVE_LMON" == "xtrue"; then - -$as_echo "#define HAVE_LMON 1" >>confdefs.h - -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for thread local storage (TLS) class" >&5 $as_echo_n "checking for thread local storage (TLS) class... " >&6; } @@ -18910,14 +18668,6 @@ if test -z "${AARCH64_BLD_TRUE}" && test -z "${AARCH64_BLD_FALSE}"; then as_fn_error $? "conditional \"AARCH64_BLD\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${LMON_TRUE}" && test -z "${LMON_FALSE}"; then - as_fn_error $? "conditional \"LMON\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${LMON_DYNAMIC_TRUE}" && test -z "${LMON_DYNAMIC_FALSE}"; then - as_fn_error $? "conditional \"LMON_DYNAMIC\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${BLD_TESTSUITE_TRUE}" && test -z "${BLD_TESTSUITE_FALSE}"; then as_fn_error $? "conditional \"BLD_TESTSUITE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/doc/Makefile.in b/doc/Makefile.in index 78079922..6c03947d 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -94,9 +94,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.common.ac \ - $(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/lmon.m4 \ - $(top_srcdir)/m4/lx_find_mpi.m4 $(top_srcdir)/m4/runconf.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/lx_find_mpi.m4 \ + $(top_srcdir)/m4/runconf.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -202,16 +201,11 @@ FLUX_CORE_LIBS = @FLUX_CORE_LIBS@ FLUX_HOSTLIST_CFLAGS = @FLUX_HOSTLIST_CFLAGS@ FLUX_HOSTLIST_LIBS = @FLUX_HOSTLIST_LIBS@ GREP = @GREP@ -HAVE_LMON = @HAVE_LMON@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LAUNCHMON_INC = @LAUNCHMON_INC@ -LAUNCHMON_LIB = @LAUNCHMON_LIB@ -LAUNCHMON_RMCOMM = @LAUNCHMON_RMCOMM@ -LAUNCHMON_STATIC_LIBS = @LAUNCHMON_STATIC_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ diff --git a/src/client/configure b/src/client/configure index 965b6a7d..49e27c84 100755 --- a/src/client/configure +++ b/src/client/configure @@ -820,7 +820,6 @@ with_usage_logging enable_cleanup_process enable_sec_munge enable_sec_keydir -enable_sec_launchmon enable_sec_none enable_crash_dedup with_gcrypt_dir @@ -1488,8 +1487,6 @@ Optional Features: --enable-sec-keydir=keydir Enable filesystem directory 'keydir' to propagate authentication key for connections - --enable-sec-launchmon Enable LaunchmMON to propagate authentication key - for connections --enable-sec-none Disable security authentication of connections --enable-crash-dedup Enable --crash-dedup by default (default: disabled) --enable-remap-pageone Controls mmap behavior when replacing executables. @@ -13478,11 +13475,6 @@ if test "${enable_sec_keydir+set}" = set; then : enableval=$enable_sec_keydir; WANT_KEYFILE="true";SEC_KEYDIR=$enableval;EXPLICIT_SEC="true" fi -# Check whether --enable-sec-launchmon was given. -if test "${enable_sec_launchmon+set}" = set; then : - enableval=$enable_sec_launchmon; WANT_SECLMON="true";EXPLICIT_SEC="true" -fi - # Check whether --enable-sec-none was given. if test "${enable_sec_none+set}" = set; then : enableval=$enable_sec_none; WANT_NOSEC="true";EXPLICIT_SEC="true" diff --git a/src/fe/Makefile.in b/src/fe/Makefile.in index ac3869e2..bb528aae 100644 --- a/src/fe/Makefile.in +++ b/src/fe/Makefile.in @@ -97,7 +97,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ $(top_srcdir)/../../m4/pkg.m4 \ $(top_srcdir)/../../configure.common.ac \ - $(top_srcdir)/../../m4/lmon.m4 \ $(top_srcdir)/../../m4/launcher.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -165,8 +164,8 @@ am__define_uniq_tagged_files = \ ETAGS = etags CTAGS = ctags CSCOPE = cscope -DIST_SUBDIRS = logging cobo comlib openmpi_intercept launchmon flux \ - hostbin startup +DIST_SUBDIRS = logging cobo comlib openmpi_intercept flux hostbin \ + startup am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(top_srcdir)/../../scripts/ar-lib \ $(top_srcdir)/../../scripts/compile \ @@ -258,16 +257,11 @@ FLUX_HOSTLIST_LIBS = @FLUX_HOSTLIST_LIBS@ GCRYPT_CFLAGS = @GCRYPT_CFLAGS@ GCRYPT_LIBS = @GCRYPT_LIBS@ GREP = @GREP@ -HAVE_LMON = @HAVE_LMON@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LAUNCHMON_INC = @LAUNCHMON_INC@ -LAUNCHMON_LIB = @LAUNCHMON_LIB@ -LAUNCHMON_RMCOMM = @LAUNCHMON_RMCOMM@ -LAUNCHMON_STATIC_LIBS = @LAUNCHMON_STATIC_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ @@ -370,9 +364,8 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -@LMON_TRUE@BUILD_LMON = launchmon @BLD_FLUXPLUGIN_TRUE@BUILD_FLUX = flux -SUBDIRS = logging cobo comlib openmpi_intercept $(BUILD_LMON) $(BUILD_FLUX) hostbin startup +SUBDIRS = logging cobo comlib openmpi_intercept $(BUILD_FLUX) hostbin startup all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive diff --git a/src/fe/cobo/Makefile.in b/src/fe/cobo/Makefile.in index 6b9376fa..72cfd713 100644 --- a/src/fe/cobo/Makefile.in +++ b/src/fe/cobo/Makefile.in @@ -98,7 +98,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ $(top_srcdir)/../../m4/pkg.m4 \ $(top_srcdir)/../../configure.common.ac \ - $(top_srcdir)/../../m4/lmon.m4 \ $(top_srcdir)/../../m4/launcher.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -223,16 +222,11 @@ FLUX_HOSTLIST_LIBS = @FLUX_HOSTLIST_LIBS@ GCRYPT_CFLAGS = @GCRYPT_CFLAGS@ GCRYPT_LIBS = @GCRYPT_LIBS@ GREP = @GREP@ -HAVE_LMON = @HAVE_LMON@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LAUNCHMON_INC = @LAUNCHMON_INC@ -LAUNCHMON_LIB = @LAUNCHMON_LIB@ -LAUNCHMON_RMCOMM = @LAUNCHMON_RMCOMM@ -LAUNCHMON_STATIC_LIBS = @LAUNCHMON_STATIC_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ diff --git a/src/fe/comlib/Makefile.in b/src/fe/comlib/Makefile.in index 284a718b..fde7905f 100644 --- a/src/fe/comlib/Makefile.in +++ b/src/fe/comlib/Makefile.in @@ -98,7 +98,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ $(top_srcdir)/../../m4/pkg.m4 \ $(top_srcdir)/../../configure.common.ac \ - $(top_srcdir)/../../m4/lmon.m4 \ $(top_srcdir)/../../m4/launcher.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -219,16 +218,11 @@ FLUX_HOSTLIST_LIBS = @FLUX_HOSTLIST_LIBS@ GCRYPT_CFLAGS = @GCRYPT_CFLAGS@ GCRYPT_LIBS = @GCRYPT_LIBS@ GREP = @GREP@ -HAVE_LMON = @HAVE_LMON@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LAUNCHMON_INC = @LAUNCHMON_INC@ -LAUNCHMON_LIB = @LAUNCHMON_LIB@ -LAUNCHMON_RMCOMM = @LAUNCHMON_RMCOMM@ -LAUNCHMON_STATIC_LIBS = @LAUNCHMON_STATIC_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ diff --git a/src/fe/config.h.in b/src/fe/config.h.in index cf74d6c0..b416413f 100644 --- a/src/fe/config.h.in +++ b/src/fe/config.h.in @@ -69,9 +69,6 @@ /* Define to 1 if you have the `gcrypt' library (-lgcrypt). */ #undef HAVE_LIBGCRYPT -/* Build with LaunchMON support */ -#undef HAVE_LMON - /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H @@ -108,9 +105,6 @@ /* Number of bytes in keys for gcrypt */ #undef KEY_SIZE_BYTES -/* The bin directory for launchmon */ -#undef LAUNCHMON_BIN_DIR - /* Use libnuma for numa optimizations */ #undef LIBNUMA @@ -160,9 +154,6 @@ /* Default mode for rsh launch */ #undef RSHLAUNCH_ENABLED -/* Use LaunchMON for authentication" */ -#undef SECLMON - /* Directory to store key files in */ #undef SEC_KEYDIR diff --git a/src/fe/configure b/src/fe/configure index a1a76e86..8a486931 100755 --- a/src/fe/configure +++ b/src/fe/configure @@ -637,15 +637,6 @@ am__EXEEXT_TRUE LTLIBOBJS LIBOBJS SPINDLEFE_LIB_VERSION -LMON_DYNAMIC_FALSE -LMON_DYNAMIC_TRUE -LMON_FALSE -LMON_TRUE -LAUNCHMON_RMCOMM -LAUNCHMON_LIB -LAUNCHMON_INC -HAVE_LMON -LAUNCHMON_STATIC_LIBS MUNGE_DYN_LIB MUNGE_LIBS MUNGE_CFLAGS @@ -841,16 +832,11 @@ with_usage_logging enable_cleanup_process enable_sec_munge enable_sec_keydir -enable_sec_launchmon enable_sec_none enable_crash_dedup with_gcrypt_dir with_munge_dir enable_remap_pageone -with_launchmon -with_launchmon_incdir -with_launchmon_libdir -with_launchmon_rmcommdir enable_openmpi enable_wreck enable_lrun @@ -1521,8 +1507,6 @@ Optional Features: --enable-sec-keydir=keydir Enable filesystem directory 'keydir' to propagate authentication key for connections - --enable-sec-launchmon Enable LaunchmMON to propagate authentication key - for connections --enable-sec-none Disable security authentication of connections --enable-crash-dedup Enable --crash-dedup by default (default: disabled) --enable-remap-pageone Controls mmap behavior when replacing executables. @@ -1574,14 +1558,6 @@ Optional Packages: File for writing usage logs --with-gcrypt-dir=DIR Look in DIR for gcrypt installation --with-munge-dir=DIR Look in DIR for munge installation - --with-launchmon=DIR Launchmon directory (must contain ./lib and - ./include) - --with-launchmon-incdir=DIR - Launchmon include directory - --with-launchmon-libdir=DIR - Launchmon library directory - --with-launchmon-rmcommdir=DIR - RM communication library LaunchMON uses Some influential environment variables: CC C compiler command @@ -5596,7 +5572,7 @@ else fi -ac_config_files="$ac_config_files logging/Makefile cobo/Makefile comlib/Makefile openmpi_intercept/Makefile launchmon/Makefile flux/Makefile startup/Makefile hostbin/Makefile Makefile" +ac_config_files="$ac_config_files logging/Makefile cobo/Makefile comlib/Makefile openmpi_intercept/Makefile flux/Makefile startup/Makefile hostbin/Makefile Makefile" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 $as_echo_n "checking whether ln -s works... " >&6; } @@ -17328,11 +17304,6 @@ if test "${enable_sec_keydir+set}" = set; then : enableval=$enable_sec_keydir; WANT_KEYFILE="true";SEC_KEYDIR=$enableval;EXPLICIT_SEC="true" fi -# Check whether --enable-sec-launchmon was given. -if test "${enable_sec_launchmon+set}" = set; then : - enableval=$enable_sec_launchmon; WANT_SECLMON="true";EXPLICIT_SEC="true" -fi - # Check whether --enable-sec-none was given. if test "${enable_sec_none+set}" = set; then : enableval=$enable_sec_none; WANT_NOSEC="true";EXPLICIT_SEC="true" @@ -17536,7 +17507,6 @@ fi fi if test "x$HAVE_GCRYPT" == "xtrue"; then GCRYPT="true" - SECLMON="true" fi fi @@ -17557,15 +17527,6 @@ fi fi fi - if test "x$WANT_SECLMON" == "xtrue"; then - if test "x$HAVE_GCRYPT" == "xtrue"; then - SECLMON="true" - GCRYPT="true" - else - as_fn_error $? "Could not find gcrypt for lmon authentication" "$LINENO" 5 - fi - fi - if test "x$WANT_NOSEC" == "xtrue"; then ENABLE_NULL_ENCRYPTION="true" fi @@ -17574,7 +17535,7 @@ fi MUNGE_CFLAGS="" MUNGE_LIBS="" fi - if test "x$KEYFILE x$SECLMON" == "x x"; then + if test "x$KEYFILE" != "xtrue"; then GCRYPT_CFLAGS="" GCRYPT_LIBS="" GCRYPT="false" @@ -17614,13 +17575,6 @@ $as_echo "$as_me: Enabling keyfile for security authentication" >&6;} $as_echo "#define KEYFILE 1" >>confdefs.h - fi - if test "x$SECLMON" == "xtrue"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: Enabling LaunchMON key for security authentication" >&5 -$as_echo "$as_me: Enabling LaunchMON key for security authentication" >&6;} - -$as_echo "#define SECLMON 1" >>confdefs.h - fi if test "x$ENABLE_NULL_ENCRYPTION" == "xtrue"; then { $as_echo "$as_me:${as_lineno-$LINENO}: Enabling NULL encryption" >&5 @@ -17638,220 +17592,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -#Include LaunchMON -#Launchmon processing - -# Check whether --with-launchmon was given. -if test "${with_launchmon+set}" = set; then : - withval=$with_launchmon; LAUNCHMON_INC_DIR="${withval}/include"; - LAUNCHMON_LIB_DIR="${withval}/lib"; - LAUNCHMON_RMCOMM_DIR="${withval}/lib" - EXPLICIT_LMON=true -fi - - -# Check whether --with-launchmon-incdir was given. -if test "${with_launchmon_incdir+set}" = set; then : - withval=$with_launchmon_incdir; LAUNCHMON_INC_DIR="${withval}";EXPLICIT_LMON=true -fi - - -# Check whether --with-launchmon-libdir was given. -if test "${with_launchmon_libdir+set}" = set; then : - withval=$with_launchmon_libdir; LAUNCHMON_LIB_DIR="${withval}";EXPLICIT_LMON=true -fi - - -# Check whether --with-launchmon-rmcommdir was given. -if test "${with_launchmon_rmcommdir+set}" = set; then : - withval=$with_launchmon_rmcommdir; LAUNCHMON_RMCOMM_DIR="${withval}";EXPLICIT_LMON=true -fi - - -CPPFLAGS_HOLD=$CPPFLAGS -if test "x$LAUNCHMON_INC_DIR" != "x"; then - LAUNCHMON_INC=-I$LAUNCHMON_INC_DIR -fi -CPPFLAGS="$CPPFLAGS $LAUNCHMON_INC" -ac_fn_c_check_header_mongrel "$LINENO" "lmon_api/lmon_fe.h" "ac_cv_header_lmon_api_lmon_fe_h" "$ac_includes_default" -if test "x$ac_cv_header_lmon_api_lmon_fe_h" = xyes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: Found launchmon headers" >&5 -$as_echo "$as_me: Found launchmon headers" >&6;} -else - if test "x$EXPLICIT_LMON" == "xtrue"; - then as_fn_error $? "Could not find or build LaunchMON includes" "$LINENO" 5 - else HAVE_LMON=false - fi -fi - - -CPPFLAGS=$CPPFLAGS_HOLD - -if test "xHAVE_LMON" != "xfalse"; then - LDFLAGS_HOLD=$LDFLAGS - LIBS_HOLD=$LIBS - if test "x$LAUNCHMON_LIB_DIR" != "x"; then - LAUNCHMON_LIB=-L$LAUNCHMON_LIB_DIR - LAUNCHMON_BIN=$LAUNCHMON_LIB_DIR/../bin - fi - LDFLAGS="$LDFLAGS $LAUNCHMON_LIB" - - if test "x$LAUNCHMON_RMCOMM_DIR" != "x"; then - LAUNCHMON_RMCOMM="-Wl,-rpath=$LAUNCHMON_RMCOMM_DIR" - fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LMON_fe_init in -lmonfeapi" >&5 -$as_echo_n "checking for LMON_fe_init in -lmonfeapi... " >&6; } -if ${ac_cv_lib_monfeapi_LMON_fe_init+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lmonfeapi $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char LMON_fe_init (); -int -main () -{ -return LMON_fe_init (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_monfeapi_LMON_fe_init=yes -else - ac_cv_lib_monfeapi_LMON_fe_init=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_monfeapi_LMON_fe_init" >&5 -$as_echo "$ac_cv_lib_monfeapi_LMON_fe_init" >&6; } -if test "x$ac_cv_lib_monfeapi_LMON_fe_init" = xyes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: Found launchmon libraries" >&5 -$as_echo "$as_me: Found launchmon libraries" >&6;};HAVE_LMON=true -else - if test "x$EXPLICIT_LMON" == "xtrue"; - then as_fn_error $? "Could not find or build LaunchMON libraries" "$LINENO" 5 - else { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or build LaunchMON libraries" >&5 -$as_echo "$as_me: WARNING: Could not find or build LaunchMON libraries" >&2;}; HAVE_LMON=false - fi -fi - -fi - -if test "xHAVE_LMON" != "xfalse"; then - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can statically link launchmon" >&5 -$as_echo_n "checking whether we can statically link launchmon... " >&6; } - LAUNCHMON_STATIC_LIBS_TEST="$LAUNCHMON_LIB_DIR/libmonbeapi.a $LAUNCHMON_LIB_DIR/libcobo.a $LAUNCHMON_LIB_DIR/libgcrypt.a $LAUNCHMON_LIB_DIR/libgpg-error.a" - LIBS="$LIBS $LAUNCHMON_STATIC_LIBS_TEST" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -extern "C" { extern int LMON_be_init(); } -int -main () -{ -return LMON_be_init(); - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - LAUNCHMON_STATIC_LIBS=$LAUNCHMON_STATIC_LIBS_TEST - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test "x$LAUNCHMON_STATIC_LIBS" == "x"; then - if test "x$HAVE_MUNGE" == "xtrue"; then - LIBS="$LIBS_HOLD $LAUNCHMON_STATIC_LIBS_TEST $MUNGE_STATIC_LIB" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -extern "C" { extern int LMON_be_init(); } -int -main () -{ -return LMON_be_init(); - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - LAUNCHMON_STATIC_LIBS="$LAUNCHMON_STATIC_LIBS_TEST $MUNGE_STATIC_LIB" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - fi - fi - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - LDFLAGS=$LDFLAGS_HOLD - LIBS=$LIBS_HOLD -fi - - - - - - - - -cat >>confdefs.h <<_ACEOF -#define LAUNCHMON_BIN_DIR "$LAUNCHMON_BIN" -_ACEOF - - - if test "x$HAVE_LMON" == "xtrue"; then - LMON_TRUE= - LMON_FALSE='#' -else - LMON_TRUE='#' - LMON_FALSE= -fi - - if test "x$LAUNCHMON_STATIC_LIBS" == "x"; then - LMON_DYNAMIC_TRUE= - LMON_DYNAMIC_FALSE='#' -else - LMON_DYNAMIC_TRUE='#' - LMON_DYNAMIC_FALSE= -fi - - -if test "x$HAVE_LMON" == "xtrue"; then - -$as_echo "#define HAVE_LMON 1" >>confdefs.h - -fi - #Include RM Selection #MPI Implementations Support @@ -18128,14 +17868,6 @@ if test -z "${AARCH64_BLD_TRUE}" && test -z "${AARCH64_BLD_FALSE}"; then as_fn_error $? "conditional \"AARCH64_BLD\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${LMON_TRUE}" && test -z "${LMON_FALSE}"; then - as_fn_error $? "conditional \"LMON\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${LMON_DYNAMIC_TRUE}" && test -z "${LMON_DYNAMIC_FALSE}"; then - as_fn_error $? "conditional \"LMON_DYNAMIC\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 @@ -19109,7 +18841,6 @@ do "cobo/Makefile") CONFIG_FILES="$CONFIG_FILES cobo/Makefile" ;; "comlib/Makefile") CONFIG_FILES="$CONFIG_FILES comlib/Makefile" ;; "openmpi_intercept/Makefile") CONFIG_FILES="$CONFIG_FILES openmpi_intercept/Makefile" ;; - "launchmon/Makefile") CONFIG_FILES="$CONFIG_FILES launchmon/Makefile" ;; "flux/Makefile") CONFIG_FILES="$CONFIG_FILES flux/Makefile" ;; "startup/Makefile") CONFIG_FILES="$CONFIG_FILES startup/Makefile" ;; "hostbin/Makefile") CONFIG_FILES="$CONFIG_FILES hostbin/Makefile" ;; diff --git a/src/fe/flux/Makefile.in b/src/fe/flux/Makefile.in index 3bfc2dbc..e898ac47 100644 --- a/src/fe/flux/Makefile.in +++ b/src/fe/flux/Makefile.in @@ -98,7 +98,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ $(top_srcdir)/../../m4/pkg.m4 \ $(top_srcdir)/../../configure.common.ac \ - $(top_srcdir)/../../m4/lmon.m4 \ $(top_srcdir)/../../m4/launcher.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -226,16 +225,11 @@ FLUX_HOSTLIST_LIBS = @FLUX_HOSTLIST_LIBS@ GCRYPT_CFLAGS = @GCRYPT_CFLAGS@ GCRYPT_LIBS = @GCRYPT_LIBS@ GREP = @GREP@ -HAVE_LMON = @HAVE_LMON@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LAUNCHMON_INC = @LAUNCHMON_INC@ -LAUNCHMON_LIB = @LAUNCHMON_LIB@ -LAUNCHMON_RMCOMM = @LAUNCHMON_RMCOMM@ -LAUNCHMON_STATIC_LIBS = @LAUNCHMON_STATIC_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ diff --git a/src/fe/hostbin/Makefile.in b/src/fe/hostbin/Makefile.in index 1fbd7d77..b767b97f 100644 --- a/src/fe/hostbin/Makefile.in +++ b/src/fe/hostbin/Makefile.in @@ -98,7 +98,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ $(top_srcdir)/../../m4/pkg.m4 \ $(top_srcdir)/../../configure.common.ac \ - $(top_srcdir)/../../m4/lmon.m4 \ $(top_srcdir)/../../m4/launcher.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -216,16 +215,11 @@ FLUX_HOSTLIST_LIBS = @FLUX_HOSTLIST_LIBS@ GCRYPT_CFLAGS = @GCRYPT_CFLAGS@ GCRYPT_LIBS = @GCRYPT_LIBS@ GREP = @GREP@ -HAVE_LMON = @HAVE_LMON@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LAUNCHMON_INC = @LAUNCHMON_INC@ -LAUNCHMON_LIB = @LAUNCHMON_LIB@ -LAUNCHMON_RMCOMM = @LAUNCHMON_RMCOMM@ -LAUNCHMON_STATIC_LIBS = @LAUNCHMON_STATIC_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ diff --git a/src/fe/logging/Makefile.in b/src/fe/logging/Makefile.in index 5a071bed..d76f0430 100644 --- a/src/fe/logging/Makefile.in +++ b/src/fe/logging/Makefile.in @@ -100,7 +100,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ $(top_srcdir)/../../m4/pkg.m4 \ $(top_srcdir)/../../configure.common.ac \ - $(top_srcdir)/../../m4/lmon.m4 \ $(top_srcdir)/../../m4/launcher.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -250,16 +249,11 @@ FLUX_HOSTLIST_LIBS = @FLUX_HOSTLIST_LIBS@ GCRYPT_CFLAGS = @GCRYPT_CFLAGS@ GCRYPT_LIBS = @GCRYPT_LIBS@ GREP = @GREP@ -HAVE_LMON = @HAVE_LMON@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LAUNCHMON_INC = @LAUNCHMON_INC@ -LAUNCHMON_LIB = @LAUNCHMON_LIB@ -LAUNCHMON_RMCOMM = @LAUNCHMON_RMCOMM@ -LAUNCHMON_STATIC_LIBS = @LAUNCHMON_STATIC_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ diff --git a/src/fe/openmpi_intercept/Makefile.in b/src/fe/openmpi_intercept/Makefile.in index d2cd3e4d..0e76c036 100644 --- a/src/fe/openmpi_intercept/Makefile.in +++ b/src/fe/openmpi_intercept/Makefile.in @@ -98,7 +98,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ $(top_srcdir)/../../m4/pkg.m4 \ $(top_srcdir)/../../configure.common.ac \ - $(top_srcdir)/../../m4/lmon.m4 \ $(top_srcdir)/../../m4/launcher.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -271,16 +270,11 @@ FLUX_HOSTLIST_LIBS = @FLUX_HOSTLIST_LIBS@ GCRYPT_CFLAGS = @GCRYPT_CFLAGS@ GCRYPT_LIBS = @GCRYPT_LIBS@ GREP = @GREP@ -HAVE_LMON = @HAVE_LMON@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LAUNCHMON_INC = @LAUNCHMON_INC@ -LAUNCHMON_LIB = @LAUNCHMON_LIB@ -LAUNCHMON_RMCOMM = @LAUNCHMON_RMCOMM@ -LAUNCHMON_STATIC_LIBS = @LAUNCHMON_STATIC_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ diff --git a/src/fe/startup/Makefile.in b/src/fe/startup/Makefile.in index e933809a..5ed60431 100644 --- a/src/fe/startup/Makefile.in +++ b/src/fe/startup/Makefile.in @@ -95,7 +95,6 @@ bin_PROGRAMS = spindle$(EXEEXT) @BLD_FLUXPLUGIN_TRUE@am__append_1 = $(FLUX_CORE_LIBS) $(FLUX_HOSTLIST_LIBS) $(top_builddir)/flux/libfluxsessionfe.la @BLD_FLUXPLUGIN_TRUE@am__append_2 = -I$(top_srcdir)/../flux @BLD_FLUXPLUGIN_TRUE@am__append_3 = launch_flux.cc -@LMON_TRUE@am__append_4 = $(top_builddir)/launchmon/libfelmon.la subdir = startup ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ @@ -105,7 +104,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ $(top_srcdir)/../../m4/pkg.m4 \ $(top_srcdir)/../../configure.common.ac \ - $(top_srcdir)/../../m4/lmon.m4 \ $(top_srcdir)/../../m4/launcher.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -213,8 +211,7 @@ spindle_OBJECTS = $(am_spindle_OBJECTS) @BLD_FLUXPLUGIN_TRUE@ $(top_builddir)/flux/libfluxsessionfe.la spindle_DEPENDENCIES = $(am__DEPENDENCIES_2) \ $(top_builddir)/openmpi_intercept/libparseompi.la \ - $(top_builddir)/hostbin/libhostbin.la $(am__DEPENDENCIES_4) \ - $(am__append_4) + $(top_builddir)/hostbin/libhostbin.la $(am__DEPENDENCIES_4) spindle_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(spindle_LDFLAGS) $(LDFLAGS) -o $@ @@ -375,16 +372,11 @@ FLUX_HOSTLIST_LIBS = @FLUX_HOSTLIST_LIBS@ GCRYPT_CFLAGS = @GCRYPT_CFLAGS@ GCRYPT_LIBS = @GCRYPT_LIBS@ GREP = @GREP@ -HAVE_LMON = @HAVE_LMON@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LAUNCHMON_INC = @LAUNCHMON_INC@ -LAUNCHMON_LIB = @LAUNCHMON_LIB@ -LAUNCHMON_RMCOMM = @LAUNCHMON_RMCOMM@ -LAUNCHMON_STATIC_LIBS = @LAUNCHMON_STATIC_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ @@ -508,8 +500,7 @@ spindle_SOURCES = spindle_fe_main.cc spindle_fe_serial.cc \ $(CORE_SOURCES) $(am__append_3) spindle_LDADD = $(CORE_LDADD) \ $(top_builddir)/openmpi_intercept/libparseompi.la \ - $(top_builddir)/hostbin/libhostbin.la $(am__append_1) \ - $(am__append_4) + $(top_builddir)/hostbin/libhostbin.la $(am__append_1) @BLD_FLUXPLUGIN_TRUE@spindle_LDFLAGS = $(fluxplugin-ldflags) -Wl,--allow-multiple-definition all: all-am diff --git a/src/flux/Makefile.in b/src/flux/Makefile.in index e6733b24..11677e55 100644 --- a/src/flux/Makefile.in +++ b/src/flux/Makefile.in @@ -98,9 +98,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.common.ac \ - $(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/lmon.m4 \ - $(top_srcdir)/m4/lx_find_mpi.m4 $(top_srcdir)/m4/runconf.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/lx_find_mpi.m4 \ + $(top_srcdir)/m4/runconf.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -310,16 +309,11 @@ FLUX_CORE_LIBS = @FLUX_CORE_LIBS@ FLUX_HOSTLIST_CFLAGS = @FLUX_HOSTLIST_CFLAGS@ FLUX_HOSTLIST_LIBS = @FLUX_HOSTLIST_LIBS@ GREP = @GREP@ -HAVE_LMON = @HAVE_LMON@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LAUNCHMON_INC = @LAUNCHMON_INC@ -LAUNCHMON_LIB = @LAUNCHMON_LIB@ -LAUNCHMON_RMCOMM = @LAUNCHMON_RMCOMM@ -LAUNCHMON_STATIC_LIBS = @LAUNCHMON_STATIC_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ diff --git a/src/server/Makefile.in b/src/server/Makefile.in index 1537d17d..0c7637e3 100644 --- a/src/server/Makefile.in +++ b/src/server/Makefile.in @@ -97,7 +97,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ $(top_srcdir)/../../m4/pkg.m4 \ $(top_srcdir)/../../configure.common.ac \ - $(top_srcdir)/../../m4/lmon.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ @@ -164,8 +164,7 @@ am__define_uniq_tagged_files = \ ETAGS = etags CTAGS = ctags CSCOPE = cscope -DIST_SUBDIRS = logging biter cache cobo comlib auditserver launchmon \ - startup +DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(top_srcdir)/../../scripts/ar-lib \ $(top_srcdir)/../../scripts/compile \ @@ -257,16 +256,11 @@ FLUX_HOSTLIST_LIBS = @FLUX_HOSTLIST_LIBS@ GCRYPT_CFLAGS = @GCRYPT_CFLAGS@ GCRYPT_LIBS = @GCRYPT_LIBS@ GREP = @GREP@ -HAVE_LMON = @HAVE_LMON@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LAUNCHMON_INC = @LAUNCHMON_INC@ -LAUNCHMON_LIB = @LAUNCHMON_LIB@ -LAUNCHMON_RMCOMM = @LAUNCHMON_RMCOMM@ -LAUNCHMON_STATIC_LIBS = @LAUNCHMON_STATIC_LIBS@ LD = @LD@ LDD = @LDD@ LDFLAGS = @LDFLAGS@ @@ -371,8 +365,7 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -@LMON_TRUE@BUILD_LMON = launchmon -SUBDIRS = logging biter cache cobo comlib auditserver $(BUILD_LMON) startup +SUBDIRS = logging biter cache cobo comlib auditserver startup all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive diff --git a/src/server/auditserver/Makefile.in b/src/server/auditserver/Makefile.in index ebf13f9d..e3dc28ec 100644 --- a/src/server/auditserver/Makefile.in +++ b/src/server/auditserver/Makefile.in @@ -98,7 +98,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ $(top_srcdir)/../../m4/pkg.m4 \ $(top_srcdir)/../../configure.common.ac \ - $(top_srcdir)/../../m4/lmon.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -260,16 +260,11 @@ FLUX_HOSTLIST_LIBS = @FLUX_HOSTLIST_LIBS@ GCRYPT_CFLAGS = @GCRYPT_CFLAGS@ GCRYPT_LIBS = @GCRYPT_LIBS@ GREP = @GREP@ -HAVE_LMON = @HAVE_LMON@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LAUNCHMON_INC = @LAUNCHMON_INC@ -LAUNCHMON_LIB = @LAUNCHMON_LIB@ -LAUNCHMON_RMCOMM = @LAUNCHMON_RMCOMM@ -LAUNCHMON_STATIC_LIBS = @LAUNCHMON_STATIC_LIBS@ LD = @LD@ LDD = @LDD@ LDFLAGS = @LDFLAGS@ diff --git a/src/server/biter/Makefile.in b/src/server/biter/Makefile.in index 22d413d3..5017aae7 100644 --- a/src/server/biter/Makefile.in +++ b/src/server/biter/Makefile.in @@ -98,7 +98,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ $(top_srcdir)/../../m4/pkg.m4 \ $(top_srcdir)/../../configure.common.ac \ - $(top_srcdir)/../../m4/lmon.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -227,16 +227,11 @@ FLUX_HOSTLIST_LIBS = @FLUX_HOSTLIST_LIBS@ GCRYPT_CFLAGS = @GCRYPT_CFLAGS@ GCRYPT_LIBS = @GCRYPT_LIBS@ GREP = @GREP@ -HAVE_LMON = @HAVE_LMON@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LAUNCHMON_INC = @LAUNCHMON_INC@ -LAUNCHMON_LIB = @LAUNCHMON_LIB@ -LAUNCHMON_RMCOMM = @LAUNCHMON_RMCOMM@ -LAUNCHMON_STATIC_LIBS = @LAUNCHMON_STATIC_LIBS@ LD = @LD@ LDD = @LDD@ LDFLAGS = @LDFLAGS@ diff --git a/src/server/cache/Makefile.in b/src/server/cache/Makefile.in index 772dc1bd..a2877862 100644 --- a/src/server/cache/Makefile.in +++ b/src/server/cache/Makefile.in @@ -98,7 +98,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ $(top_srcdir)/../../m4/pkg.m4 \ $(top_srcdir)/../../configure.common.ac \ - $(top_srcdir)/../../m4/lmon.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -238,16 +238,11 @@ FLUX_HOSTLIST_LIBS = @FLUX_HOSTLIST_LIBS@ GCRYPT_CFLAGS = @GCRYPT_CFLAGS@ GCRYPT_LIBS = @GCRYPT_LIBS@ GREP = @GREP@ -HAVE_LMON = @HAVE_LMON@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LAUNCHMON_INC = @LAUNCHMON_INC@ -LAUNCHMON_LIB = @LAUNCHMON_LIB@ -LAUNCHMON_RMCOMM = @LAUNCHMON_RMCOMM@ -LAUNCHMON_STATIC_LIBS = @LAUNCHMON_STATIC_LIBS@ LD = @LD@ LDD = @LDD@ LDFLAGS = @LDFLAGS@ diff --git a/src/server/cobo/Makefile.in b/src/server/cobo/Makefile.in index 8541b749..bf3f0023 100644 --- a/src/server/cobo/Makefile.in +++ b/src/server/cobo/Makefile.in @@ -98,7 +98,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ $(top_srcdir)/../../m4/pkg.m4 \ $(top_srcdir)/../../configure.common.ac \ - $(top_srcdir)/../../m4/lmon.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -222,16 +222,11 @@ FLUX_HOSTLIST_LIBS = @FLUX_HOSTLIST_LIBS@ GCRYPT_CFLAGS = @GCRYPT_CFLAGS@ GCRYPT_LIBS = @GCRYPT_LIBS@ GREP = @GREP@ -HAVE_LMON = @HAVE_LMON@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LAUNCHMON_INC = @LAUNCHMON_INC@ -LAUNCHMON_LIB = @LAUNCHMON_LIB@ -LAUNCHMON_RMCOMM = @LAUNCHMON_RMCOMM@ -LAUNCHMON_STATIC_LIBS = @LAUNCHMON_STATIC_LIBS@ LD = @LD@ LDD = @LDD@ LDFLAGS = @LDFLAGS@ diff --git a/src/server/comlib/Makefile.in b/src/server/comlib/Makefile.in index e24f6495..8c11e7b9 100644 --- a/src/server/comlib/Makefile.in +++ b/src/server/comlib/Makefile.in @@ -98,7 +98,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ $(top_srcdir)/../../m4/pkg.m4 \ $(top_srcdir)/../../configure.common.ac \ - $(top_srcdir)/../../m4/lmon.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -219,16 +219,11 @@ FLUX_HOSTLIST_LIBS = @FLUX_HOSTLIST_LIBS@ GCRYPT_CFLAGS = @GCRYPT_CFLAGS@ GCRYPT_LIBS = @GCRYPT_LIBS@ GREP = @GREP@ -HAVE_LMON = @HAVE_LMON@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LAUNCHMON_INC = @LAUNCHMON_INC@ -LAUNCHMON_LIB = @LAUNCHMON_LIB@ -LAUNCHMON_RMCOMM = @LAUNCHMON_RMCOMM@ -LAUNCHMON_STATIC_LIBS = @LAUNCHMON_STATIC_LIBS@ LD = @LD@ LDD = @LDD@ LDFLAGS = @LDFLAGS@ diff --git a/src/server/config.h.in b/src/server/config.h.in index 5bc1f60f..f1670470 100644 --- a/src/server/config.h.in +++ b/src/server/config.h.in @@ -51,9 +51,6 @@ /* Define to 1 if you have the `gcrypt' library (-lgcrypt). */ #undef HAVE_LIBGCRYPT -/* Build with LaunchMON support */ -#undef HAVE_LMON - /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H @@ -90,9 +87,6 @@ /* Number of bytes in keys for gcrypt */ #undef KEY_SIZE_BYTES -/* The bin directory for launchmon */ -#undef LAUNCHMON_BIN_DIR - /* Use libnuma for numa optimizations */ #undef LIBNUMA @@ -142,9 +136,6 @@ /* Default mode for rsh launch */ #undef RSHLAUNCH_ENABLED -/* Use LaunchMON for authentication" */ -#undef SECLMON - /* Directory to store key files in */ #undef SEC_KEYDIR diff --git a/src/server/configure b/src/server/configure index e303faca..ceee52bb 100755 --- a/src/server/configure +++ b/src/server/configure @@ -643,15 +643,6 @@ LINK_LIBSTDCXX_STATIC_TRUE STATIC_LIBSTDCXX STATIC_LIBGCC_OPT LDD -LMON_DYNAMIC_FALSE -LMON_DYNAMIC_TRUE -LMON_FALSE -LMON_TRUE -LAUNCHMON_RMCOMM -LAUNCHMON_LIB -LAUNCHMON_INC -HAVE_LMON -LAUNCHMON_STATIC_LIBS MUNGE_DYN_LIB MUNGE_LIBS MUNGE_CFLAGS @@ -847,16 +838,11 @@ with_usage_logging enable_cleanup_process enable_sec_munge enable_sec_keydir -enable_sec_launchmon enable_sec_none enable_crash_dedup with_gcrypt_dir with_munge_dir enable_remap_pageone -with_launchmon -with_launchmon_incdir -with_launchmon_libdir -with_launchmon_rmcommdir ' ac_precious_vars='build_alias host_alias @@ -1523,8 +1509,6 @@ Optional Features: --enable-sec-keydir=keydir Enable filesystem directory 'keydir' to propagate authentication key for connections - --enable-sec-launchmon Enable LaunchmMON to propagate authentication key - for connections --enable-sec-none Disable security authentication of connections --enable-crash-dedup Enable --crash-dedup by default (default: disabled) --enable-remap-pageone Controls mmap behavior when replacing executables. @@ -1571,14 +1555,6 @@ Optional Packages: File for writing usage logs --with-gcrypt-dir=DIR Look in DIR for gcrypt installation --with-munge-dir=DIR Look in DIR for munge installation - --with-launchmon=DIR Launchmon directory (must contain ./lib and - ./include) - --with-launchmon-incdir=DIR - Launchmon include directory - --with-launchmon-libdir=DIR - Launchmon library directory - --with-launchmon-rmcommdir=DIR - RM communication library LaunchMON uses Some influential environment variables: CC C compiler command @@ -5593,7 +5569,7 @@ else fi -ac_config_files="$ac_config_files logging/Makefile biter/Makefile cache/Makefile auditserver/Makefile cobo/Makefile comlib/Makefile launchmon/Makefile startup/Makefile Makefile" +ac_config_files="$ac_config_files logging/Makefile biter/Makefile cache/Makefile auditserver/Makefile cobo/Makefile comlib/Makefile startup/Makefile Makefile" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 $as_echo_n "checking whether ln -s works... " >&6; } @@ -17325,11 +17301,6 @@ if test "${enable_sec_keydir+set}" = set; then : enableval=$enable_sec_keydir; WANT_KEYFILE="true";SEC_KEYDIR=$enableval;EXPLICIT_SEC="true" fi -# Check whether --enable-sec-launchmon was given. -if test "${enable_sec_launchmon+set}" = set; then : - enableval=$enable_sec_launchmon; WANT_SECLMON="true";EXPLICIT_SEC="true" -fi - # Check whether --enable-sec-none was given. if test "${enable_sec_none+set}" = set; then : enableval=$enable_sec_none; WANT_NOSEC="true";EXPLICIT_SEC="true" @@ -17534,7 +17505,6 @@ fi fi if test "x$HAVE_GCRYPT" == "xtrue"; then GCRYPT="true" - SECLMON="true" fi fi @@ -17555,15 +17525,6 @@ fi fi fi - if test "x$WANT_SECLMON" == "xtrue"; then - if test "x$HAVE_GCRYPT" == "xtrue"; then - SECLMON="true" - GCRYPT="true" - else - as_fn_error $? "Could not find gcrypt for lmon authentication" "$LINENO" 5 - fi - fi - if test "x$WANT_NOSEC" == "xtrue"; then ENABLE_NULL_ENCRYPTION="true" fi @@ -17572,7 +17533,7 @@ fi MUNGE_CFLAGS="" MUNGE_LIBS="" fi - if test "x$KEYFILE x$SECLMON" == "x x"; then + if test "x$KEYFILE" != "xtrue"; then GCRYPT_CFLAGS="" GCRYPT_LIBS="" GCRYPT="false" @@ -17612,13 +17573,6 @@ $as_echo "$as_me: Enabling keyfile for security authentication" >&6;} $as_echo "#define KEYFILE 1" >>confdefs.h - fi - if test "x$SECLMON" == "xtrue"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: Enabling LaunchMON key for security authentication" >&5 -$as_echo "$as_me: Enabling LaunchMON key for security authentication" >&6;} - -$as_echo "#define SECLMON 1" >>confdefs.h - fi if test "x$ENABLE_NULL_ENCRYPTION" == "xtrue"; then { $as_echo "$as_me:${as_lineno-$LINENO}: Enabling NULL encryption" >&5 @@ -17628,238 +17582,19 @@ $as_echo "#define ENABLE_NULL_ENCRYPTION 1" >>confdefs.h fi -#Include LaunchMON -#Launchmon processing - -# Check whether --with-launchmon was given. -if test "${with_launchmon+set}" = set; then : - withval=$with_launchmon; LAUNCHMON_INC_DIR="${withval}/include"; - LAUNCHMON_LIB_DIR="${withval}/lib"; - LAUNCHMON_RMCOMM_DIR="${withval}/lib" - EXPLICIT_LMON=true -fi - - -# Check whether --with-launchmon-incdir was given. -if test "${with_launchmon_incdir+set}" = set; then : - withval=$with_launchmon_incdir; LAUNCHMON_INC_DIR="${withval}";EXPLICIT_LMON=true -fi - - -# Check whether --with-launchmon-libdir was given. -if test "${with_launchmon_libdir+set}" = set; then : - withval=$with_launchmon_libdir; LAUNCHMON_LIB_DIR="${withval}";EXPLICIT_LMON=true -fi - - -# Check whether --with-launchmon-rmcommdir was given. -if test "${with_launchmon_rmcommdir+set}" = set; then : - withval=$with_launchmon_rmcommdir; LAUNCHMON_RMCOMM_DIR="${withval}";EXPLICIT_LMON=true -fi - - -CPPFLAGS_HOLD=$CPPFLAGS -if test "x$LAUNCHMON_INC_DIR" != "x"; then - LAUNCHMON_INC=-I$LAUNCHMON_INC_DIR -fi -CPPFLAGS="$CPPFLAGS $LAUNCHMON_INC" -ac_fn_c_check_header_mongrel "$LINENO" "lmon_api/lmon_fe.h" "ac_cv_header_lmon_api_lmon_fe_h" "$ac_includes_default" -if test "x$ac_cv_header_lmon_api_lmon_fe_h" = xyes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: Found launchmon headers" >&5 -$as_echo "$as_me: Found launchmon headers" >&6;} -else - if test "x$EXPLICIT_LMON" == "xtrue"; - then as_fn_error $? "Could not find or build LaunchMON includes" "$LINENO" 5 - else HAVE_LMON=false - fi -fi - - -CPPFLAGS=$CPPFLAGS_HOLD - -if test "xHAVE_LMON" != "xfalse"; then - LDFLAGS_HOLD=$LDFLAGS - LIBS_HOLD=$LIBS - if test "x$LAUNCHMON_LIB_DIR" != "x"; then - LAUNCHMON_LIB=-L$LAUNCHMON_LIB_DIR - LAUNCHMON_BIN=$LAUNCHMON_LIB_DIR/../bin - fi - LDFLAGS="$LDFLAGS $LAUNCHMON_LIB" - - if test "x$LAUNCHMON_RMCOMM_DIR" != "x"; then - LAUNCHMON_RMCOMM="-Wl,-rpath=$LAUNCHMON_RMCOMM_DIR" - fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LMON_fe_init in -lmonfeapi" >&5 -$as_echo_n "checking for LMON_fe_init in -lmonfeapi... " >&6; } -if ${ac_cv_lib_monfeapi_LMON_fe_init+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lmonfeapi $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char LMON_fe_init (); -int -main () -{ -return LMON_fe_init (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_monfeapi_LMON_fe_init=yes -else - ac_cv_lib_monfeapi_LMON_fe_init=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_monfeapi_LMON_fe_init" >&5 -$as_echo "$ac_cv_lib_monfeapi_LMON_fe_init" >&6; } -if test "x$ac_cv_lib_monfeapi_LMON_fe_init" = xyes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: Found launchmon libraries" >&5 -$as_echo "$as_me: Found launchmon libraries" >&6;};HAVE_LMON=true -else - if test "x$EXPLICIT_LMON" == "xtrue"; - then as_fn_error $? "Could not find or build LaunchMON libraries" "$LINENO" 5 - else { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or build LaunchMON libraries" >&5 -$as_echo "$as_me: WARNING: Could not find or build LaunchMON libraries" >&2;}; HAVE_LMON=false - fi -fi - -fi - -if test "xHAVE_LMON" != "xfalse"; then - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can statically link launchmon" >&5 -$as_echo_n "checking whether we can statically link launchmon... " >&6; } - LAUNCHMON_STATIC_LIBS_TEST="$LAUNCHMON_LIB_DIR/libmonbeapi.a $LAUNCHMON_LIB_DIR/libcobo.a $LAUNCHMON_LIB_DIR/libgcrypt.a $LAUNCHMON_LIB_DIR/libgpg-error.a" - LIBS="$LIBS $LAUNCHMON_STATIC_LIBS_TEST" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -extern "C" { extern int LMON_be_init(); } -int -main () -{ -return LMON_be_init(); - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - LAUNCHMON_STATIC_LIBS=$LAUNCHMON_STATIC_LIBS_TEST - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test "x$LAUNCHMON_STATIC_LIBS" == "x"; then - if test "x$HAVE_MUNGE" == "xtrue"; then - LIBS="$LIBS_HOLD $LAUNCHMON_STATIC_LIBS_TEST $MUNGE_STATIC_LIB" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -extern "C" { extern int LMON_be_init(); } -int -main () -{ -return LMON_be_init(); - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - LAUNCHMON_STATIC_LIBS="$LAUNCHMON_STATIC_LIBS_TEST $MUNGE_STATIC_LIB" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - fi - fi - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - LDFLAGS=$LDFLAGS_HOLD - LIBS=$LIBS_HOLD -fi - - - - - - - - -cat >>confdefs.h <<_ACEOF -#define LAUNCHMON_BIN_DIR "$LAUNCHMON_BIN" -_ACEOF - - - if test "x$HAVE_LMON" == "xtrue"; then - LMON_TRUE= - LMON_FALSE='#' -else - LMON_TRUE='#' - LMON_FALSE= -fi - - if test "x$LAUNCHMON_STATIC_LIBS" == "x"; then - LMON_DYNAMIC_TRUE= - LMON_DYNAMIC_FALSE='#' -else - LMON_DYNAMIC_TRUE='#' - LMON_DYNAMIC_FALSE= -fi - - -if test "x$HAVE_LMON" == "xtrue"; then - -$as_echo "#define HAVE_LMON 1" >>confdefs.h - -fi - - #Check if we can static link libstdc++ and libgcc, which is desirable -# for bootstrapping purposes on spindle_be. We only do this if we -# can link everything statically: launchmon, libstdc++, libgcc. -# Otherwise we stick with dynamic linking. -if test "x$LAUNCHMON_STATIC_LIBS" != "x"; then - #Test whether we have a static libgcc option - ac_ext=cpp +# for bootstrapping purposes on spindle_be. +ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - LDFLAGS_HOLD=$LDFLAGS - LDFLAGS+=-static-libgcc - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can statically link libgcc" >&5 +LDFLAGS_HOLD=$LDFLAGS +LDFLAGS+=-static-libgcc +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can statically link libgcc" >&5 $as_echo_n "checking whether we can statically link libgcc... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -17872,7 +17607,7 @@ main () _ACEOF if ac_fn_cxx_try_link "$LINENO"; then : STATIC_LIBGCC_OPT=-static-libgcc - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -17881,23 +17616,23 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - if test "x$STATIC_LIBGCC_OPT" != "x"; then - #Test whether we have a static libstdc++ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we have a static libstdc++" >&5 +if test "x$STATIC_LIBGCC_OPT" != "x"; then + #Test whether we have a static libstdc++ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we have a static libstdc++" >&5 $as_echo_n "checking whether we have a static libstdc++... " >&6; } - STATIC_LIBSTDCXX_TEST=`$CXX -print-file-name=libstdc++.a` - if test -f $STATIC_LIBSTDCXX_TEST; then - STATIC_LIBSTDCXX=$STATIC_LIBSTDCXX_TEST - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + STATIC_LIBSTDCXX_TEST=`$CXX -print-file-name=libstdc++.a` + if test -f $STATIC_LIBSTDCXX_TEST; then + STATIC_LIBSTDCXX=$STATIC_LIBSTDCXX_TEST + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - fi + fi - if test "x$STATIC_LIBSTDCXX" != "x"; then + if test "x$STATIC_LIBSTDCXX" != "x"; then - # Extract the first word of "ldd", so it can be a program name with args. + # Extract the first word of "ldd", so it can be a program name with args. set dummy ldd; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } @@ -17934,12 +17669,12 @@ $as_echo "no" >&6; } fi - if test "x$LDD" != "x"; then - #Test whether we can link with a static libstdc++ - rm -f libstdc++.a - $LN_S $STATIC_LIBSTDCXX - LDFLAGS="$LDFLAGS -L." - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + if test "x$LDD" != "x"; then + #Test whether we can link with a static libstdc++ + rm -f libstdc++.a + $LN_S $STATIC_LIBSTDCXX + LDFLAGS="$LDFLAGS -L." + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -17955,32 +17690,31 @@ if ac_fn_cxx_try_link "$LINENO"; then : fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can force static linking of libstdc++" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can force static linking of libstdc++" >&5 $as_echo_n "checking whether we can force static linking of libstdc++... " >&6; } - if [ "$STATIC_TEST_LIBS" != *libstdc++* ]; then - if [ "$STATIC_TEST_LIBS" != *libgcc* ]; then - LINK_LIBSTDCXX_STATIC=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + if [ "$STATIC_TEST_LIBS" != *libstdc++* ]; then + if [ "$STATIC_TEST_LIBS" != *libgcc* ]; then + LINK_LIBSTDCXX_STATIC=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - else - LINK_LIBSTDCXX_STATIC=no - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - fi else - LINK_LIBSTDCXX_STATIC=no - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + LINK_LIBSTDCXX_STATIC=no + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - rm -f libstdc++.a - LDFLAGS=$LDFLAGS_HOLD - ac_ext=c + else + LINK_LIBSTDCXX_STATIC=no + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + rm -f libstdc++.a + LDFLAGS=$LDFLAGS_HOLD + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - fi fi fi fi @@ -18184,14 +17918,6 @@ if test -z "${AARCH64_BLD_TRUE}" && test -z "${AARCH64_BLD_FALSE}"; then as_fn_error $? "conditional \"AARCH64_BLD\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${LMON_TRUE}" && test -z "${LMON_FALSE}"; then - as_fn_error $? "conditional \"LMON\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${LMON_DYNAMIC_TRUE}" && test -z "${LMON_DYNAMIC_FALSE}"; then - as_fn_error $? "conditional \"LMON_DYNAMIC\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${LINK_LIBSTDCXX_STATIC_TRUE}" && test -z "${LINK_LIBSTDCXX_STATIC_FALSE}"; then as_fn_error $? "conditional \"LINK_LIBSTDCXX_STATIC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -19175,7 +18901,6 @@ do "auditserver/Makefile") CONFIG_FILES="$CONFIG_FILES auditserver/Makefile" ;; "cobo/Makefile") CONFIG_FILES="$CONFIG_FILES cobo/Makefile" ;; "comlib/Makefile") CONFIG_FILES="$CONFIG_FILES comlib/Makefile" ;; - "launchmon/Makefile") CONFIG_FILES="$CONFIG_FILES launchmon/Makefile" ;; "startup/Makefile") CONFIG_FILES="$CONFIG_FILES startup/Makefile" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; diff --git a/src/server/logging/Makefile.in b/src/server/logging/Makefile.in index ff52f729..0b4acf1e 100644 --- a/src/server/logging/Makefile.in +++ b/src/server/logging/Makefile.in @@ -100,7 +100,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ $(top_srcdir)/../../m4/pkg.m4 \ $(top_srcdir)/../../configure.common.ac \ - $(top_srcdir)/../../m4/lmon.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -247,16 +247,11 @@ FLUX_HOSTLIST_LIBS = @FLUX_HOSTLIST_LIBS@ GCRYPT_CFLAGS = @GCRYPT_CFLAGS@ GCRYPT_LIBS = @GCRYPT_LIBS@ GREP = @GREP@ -HAVE_LMON = @HAVE_LMON@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LAUNCHMON_INC = @LAUNCHMON_INC@ -LAUNCHMON_LIB = @LAUNCHMON_LIB@ -LAUNCHMON_RMCOMM = @LAUNCHMON_RMCOMM@ -LAUNCHMON_STATIC_LIBS = @LAUNCHMON_STATIC_LIBS@ LD = @LD@ LDD = @LDD@ LDFLAGS = @LDFLAGS@ diff --git a/src/server/startup/Makefile.in b/src/server/startup/Makefile.in index a071a72c..730312fb 100644 --- a/src/server/startup/Makefile.in +++ b/src/server/startup/Makefile.in @@ -93,8 +93,6 @@ target_triplet = @target@ pkglibexec_PROGRAMS = spindle_be$(EXEEXT) @USE_NUMA_TRUE@am__append_1 = -lnuma @LINK_LIBSTDCXX_STATIC_TRUE@am__append_2 = $(STATIC_LIBGCC_OPT) -L. -@LMON_DYNAMIC_TRUE@@LMON_TRUE@am__append_3 = $(top_builddir)/launchmon/libbelmon.la $(LAUNCHMON_LIB) $(LAUNCHMON_RMCOMM) -lmonbeapi -lgcrypt -lpthread -@LMON_DYNAMIC_FALSE@@LMON_TRUE@am__append_4 = $(top_builddir)/launchmon/libbelmon.la $(LAUNCHMON_STATIC_LIBS) subdir = startup ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ @@ -104,7 +102,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ $(top_srcdir)/../../m4/pkg.m4 \ $(top_srcdir)/../../configure.common.ac \ - $(top_srcdir)/../../m4/lmon.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -190,13 +188,7 @@ am_spindle_be_OBJECTS = spindle_be-spindle_be_main.$(OBJEXT) \ $(top_builddir)/../utils/spindle_be-rshlaunch.$(OBJEXT) \ $(am__objects_4) spindle_be_OBJECTS = $(am_spindle_be_OBJECTS) -@LMON_DYNAMIC_TRUE@@LMON_TRUE@am__DEPENDENCIES_4 = $(top_builddir)/launchmon/libbelmon.la \ -@LMON_DYNAMIC_TRUE@@LMON_TRUE@ $(am__DEPENDENCIES_1) \ -@LMON_DYNAMIC_TRUE@@LMON_TRUE@ $(am__DEPENDENCIES_1) -@LMON_DYNAMIC_FALSE@@LMON_TRUE@am__DEPENDENCIES_5 = $(top_builddir)/launchmon/libbelmon.la \ -@LMON_DYNAMIC_FALSE@@LMON_TRUE@ $(am__DEPENDENCIES_1) -spindle_be_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) +spindle_be_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) spindle_be_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(spindle_be_LDFLAGS) $(LDFLAGS) -o $@ @@ -343,16 +335,11 @@ FLUX_HOSTLIST_LIBS = @FLUX_HOSTLIST_LIBS@ GCRYPT_CFLAGS = @GCRYPT_CFLAGS@ GCRYPT_LIBS = @GCRYPT_LIBS@ GREP = @GREP@ -HAVE_LMON = @HAVE_LMON@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LAUNCHMON_INC = @LAUNCHMON_INC@ -LAUNCHMON_LIB = @LAUNCHMON_LIB@ -LAUNCHMON_RMCOMM = @LAUNCHMON_RMCOMM@ -LAUNCHMON_STATIC_LIBS = @LAUNCHMON_STATIC_LIBS@ LD = @LD@ LDD = @LDD@ LDFLAGS = @LDFLAGS@ @@ -476,8 +463,7 @@ libspindlebe_static_la_LIBADD = $(libspindlebe_la_LIBADD) spindle_be_LDFLAGS = -static $(am__append_2) spindle_be_CPPFLAGS = $(CORE_CPPFLAGS) spindle_be_SOURCES = spindle_be_main.cc spindle_be_serial.cc spindle_be_hostbin.cc spindle_be_mpilaunch.cc $(top_srcdir)/../utils/rshlaunch.c $(CORE_SOURCES) -spindle_be_LDADD = $(CORE_LDADD) $(MUNGE_LIBS) $(am__append_3) \ - $(am__append_4) +spindle_be_LDADD = $(CORE_LDADD) $(MUNGE_LIBS) @LINK_LIBSTDCXX_STATIC_TRUE@CLEANFILES = ./libstdc++.a @LINK_LIBSTDCXX_STATIC_TRUE@BUILT_SOURCES = ./libstdc++.a all: $(BUILT_SOURCES) diff --git a/src/slurm_plugin/Makefile.in b/src/slurm_plugin/Makefile.in index a7fe188f..3a7496ee 100644 --- a/src/slurm_plugin/Makefile.in +++ b/src/slurm_plugin/Makefile.in @@ -95,9 +95,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.common.ac \ - $(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/lmon.m4 \ - $(top_srcdir)/m4/lx_find_mpi.m4 $(top_srcdir)/m4/runconf.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/lx_find_mpi.m4 \ + $(top_srcdir)/m4/runconf.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -264,16 +263,11 @@ FLUX_CORE_LIBS = @FLUX_CORE_LIBS@ FLUX_HOSTLIST_CFLAGS = @FLUX_HOSTLIST_CFLAGS@ FLUX_HOSTLIST_LIBS = @FLUX_HOSTLIST_LIBS@ GREP = @GREP@ -HAVE_LMON = @HAVE_LMON@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LAUNCHMON_INC = @LAUNCHMON_INC@ -LAUNCHMON_LIB = @LAUNCHMON_LIB@ -LAUNCHMON_RMCOMM = @LAUNCHMON_RMCOMM@ -LAUNCHMON_STATIC_LIBS = @LAUNCHMON_STATIC_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in index fb991f42..0222ff16 100644 --- a/testsuite/Makefile.in +++ b/testsuite/Makefile.in @@ -96,9 +96,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.common.ac \ - $(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/lmon.m4 \ - $(top_srcdir)/m4/lx_find_mpi.m4 $(top_srcdir)/m4/runconf.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/lx_find_mpi.m4 \ + $(top_srcdir)/m4/runconf.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -222,16 +221,11 @@ FLUX_CORE_LIBS = @FLUX_CORE_LIBS@ FLUX_HOSTLIST_CFLAGS = @FLUX_HOSTLIST_CFLAGS@ FLUX_HOSTLIST_LIBS = @FLUX_HOSTLIST_LIBS@ GREP = @GREP@ -HAVE_LMON = @HAVE_LMON@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LAUNCHMON_INC = @LAUNCHMON_INC@ -LAUNCHMON_LIB = @LAUNCHMON_LIB@ -LAUNCHMON_RMCOMM = @LAUNCHMON_RMCOMM@ -LAUNCHMON_STATIC_LIBS = @LAUNCHMON_STATIC_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ From 7ddb06658d60e24a02412b41024de479cb1f3523 Mon Sep 17 00:00:00 2001 From: Barry Rountree Date: Fri, 31 Jul 2026 17:33:46 -0700 Subject: [PATCH 19/21] [prune-config] Runtime-only: --enable-cleanup-process and --enable-crash-dedup are now runtime-only. Per Claude Code + Opus. --- configure.common.ac | 15 --------------- src/fe/configure.ac | 4 ---- src/fe/startup/config_mgr.cc | 8 -------- src/fe/startup/parseargs.cc | 5 ----- 4 files changed, 32 deletions(-) diff --git a/configure.common.ac b/configure.common.ac index 049917da..ffea35b6 100644 --- a/configure.common.ac +++ b/configure.common.ac @@ -294,11 +294,6 @@ if test "x$USAGE_LOGS" != "x"; then AC_DEFINE_UNQUOTED([USAGE_LOGGING_FILE],"[$USAGE_LOGS]",[The file for storing usage logs]) fi -#Dedicated cleanup process -AC_ARG_ENABLE(cleanup-process, - [AS_HELP_STRING([--enable-cleanup-process],[Default to using a dedicated process to clean relocated files])], - [CLEANUP_PROC="true"],) - if test "x$ENABLE_FLUX_PLUGIN" = "xtrue"; then # Check for whether to build Flux shell plugin PKG_CHECK_MODULES([FLUX_CORE], [flux-core > 0.40.0], [], [ENABLE_FLUX_PLUGIN=false]) @@ -349,16 +344,6 @@ AC_ARG_ENABLE(sec-none, [AS_HELP_STRING([--enable-sec-none],[Disable security authentication of connections])], [WANT_NOSEC="true";EXPLICIT_SEC="true"],) -AC_ARG_ENABLE([crash-dedup], - [AS_HELP_STRING([--enable-crash-dedup], - [Enable --crash-dedup by default (default: disabled)])], - [enable_crash_dedup=$enableval], - [enable_crash_dedup=no]) - -AS_IF([test "x$enable_crash_dedup" = xyes], - [AC_DEFINE([CRASH_DEDUP_ENABLED_BY_DEFAULT], [1], - [Enable --crash-dedup by default])]) - AC_ARG_WITH(gcrypt-dir, [AS_HELP_STRING([--with-gcrypt-dir=DIR],[Look in DIR for gcrypt installation])], [GCRYPT_CFLAGS="-I${withval}/include";GCRYPT_LIBS="-L${withval}/lib"],) diff --git a/src/fe/configure.ac b/src/fe/configure.ac index 38ff1714..5ebe26c0 100644 --- a/src/fe/configure.ac +++ b/src/fe/configure.ac @@ -30,9 +30,5 @@ CXXFLAGS="$CXXFLAGS -fvisibility=hidden" AC_SUBST([SPINDLEFE_LIB_VERSION],[`$srcdir/../../LIB_VERSION spindlefe`]) -if test "x$CLEANUP_PROC" == "xtrue"; then - AC_DEFINE([DEFAULT_CLEANUP_PROC],[1],[Default to using a dedicated process to clean data files]) -fi - AC_OUTPUT AC_SUBST(PKGSYSCONF_DIR) diff --git a/src/fe/startup/config_mgr.cc b/src/fe/startup/config_mgr.cc index 15d5bc57..53a0a382 100644 --- a/src/fe/startup/config_mgr.cc +++ b/src/fe/startup/config_mgr.cc @@ -116,11 +116,7 @@ using namespace std; #define DISABLE_LOGGING_STR "true" #endif -#if defined(DEFAULT_CLEANUP_PROC) -#define CLEANUP_PROC_STR "true" -#else #define CLEANUP_PROC_STR "false" -#endif #if defined(RSHLAUNCH_ENABLED) #define RSHLAUNCH_STR "true" @@ -134,11 +130,7 @@ using namespace std; #define RSHCMD_STR "" #endif -#if defined(CRASH_DEDUP_ENABLED_BY_DEFAULT) -#define DEFAULT_CRASH_DEDUP_STR "true" -#else #define DEFAULT_CRASH_DEDUP_STR "false" -#endif #if defined(PYTHON_INST_PREFIX) #define PYTHON_PREFIX_DEFAULT PYTHON_INST_PREFIX diff --git a/src/fe/startup/parseargs.cc b/src/fe/startup/parseargs.cc index e7a3326c..b9137703 100644 --- a/src/fe/startup/parseargs.cc +++ b/src/fe/startup/parseargs.cc @@ -49,13 +49,8 @@ using namespace std; #error No security model available #endif -#if defined(DEFAULT_CLEANUP_PROC) -#define DEFAULT_CLEAN_PROC_STR "yes" -#define DEFAULT_CLEAN_PROC_INT 1 -#else #define DEFAULT_CLEAN_PROC_STR "no" #define DEFAULT_CLEAN_PROC_INT 0 -#endif #define DEFAULT_PERSIST 0 From 401db736a43084254299f2e5c79ee5b917022b1c Mon Sep 17 00:00:00 2001 From: Barry Rountree Date: Fri, 31 Jul 2026 17:47:31 -0700 Subject: [PATCH 20/21] [prune-config] Runtime-only: python-prefix, numa, usage. --with-python-prefix=STR --with-numa-excludes --with-usage-logging=FILE are now runtime-only options. Per Claude Code + opus. --- configure.common.ac | 21 --------------------- src/fe/startup/config_mgr.cc | 12 ------------ src/fe/startup/parseargs.cc | 5 ----- src/fe/startup/spindle_fe.cc | 4 ---- 4 files changed, 42 deletions(-) diff --git a/configure.common.ac b/configure.common.ac index ffea35b6..af6838d8 100644 --- a/configure.common.ac +++ b/configure.common.ac @@ -246,22 +246,10 @@ AM_CONDITIONAL([AARCH64_BLD], [test "x$ARCH_BUILD" == "xaarch64"]) AC_DEFINE([os_linux],[1],[Define if we're compiling for a linux target]) -#Python prefix -AC_ARG_WITH(python-prefix, - [AS_HELP_STRING([--with-python-prefix=STR],[List of directories containing python installs])], - [PYTHON_INST_PREFIX=${withval}], - [PYTHON_INST_PREFIX=/usr/lib/python:/usr/lib64/python]) -AC_DEFINE_UNQUOTED([PYTHON_INST_PREFIX],"[$PYTHON_INST_PREFIX]",[Python installation prefixes]) - #NUMA configuration AC_ARG_ENABLE(numa, [AS_HELP_STRING([--enable-numa],[Use libnuma to enable numa optimizations])], [REQUIRE_NUMA="true"]) -AC_ARG_WITH(numa-excludes, - [AS_HELP_STRING([--with-numa-excludes],[Do not numa optimize files matching the given substrings])], - [NUMA_EXCLUDES_VAL=${withval}], - [NUMA_EXCLUDES_VAL=""]) - AC_MSG_CHECKING([whether we have libnuma]) ORIG_LIBS=$LIBS LIBS="$LIBS -lnuma" @@ -276,7 +264,6 @@ if test "x$REQUIRE_NUMA" == "xtrue"; then fi if test "x$HAVE_NUMA" == "xtrue"; then AC_DEFINE([LIBNUMA], [1], [Use libnuma for numa optimizations]) - AC_DEFINE_UNQUOTED([NUMA_EXCLUDES], "[$NUMA_EXCLUDES_VAL]", [Exclusions for numa optimization]) fi AC_MSG_CHECKING([wheter ld.so has the _dl_argv variable]) @@ -286,14 +273,6 @@ if test "x$HAVE_DL_ARGV" == "xtrue"; then AC_DEFINE([HAVE_DL_ARGV], [1], [ld.so exports the _dl_argv variable]) fi -#Usage logging -AC_ARG_WITH(usage-logging, - [AS_HELP_STRING([--with-usage-logging=FILE],[File for writing usage logs])], - [USAGE_LOGS=${withval}]) -if test "x$USAGE_LOGS" != "x"; then - AC_DEFINE_UNQUOTED([USAGE_LOGGING_FILE],"[$USAGE_LOGS]",[The file for storing usage logs]) -fi - if test "x$ENABLE_FLUX_PLUGIN" = "xtrue"; then # Check for whether to build Flux shell plugin PKG_CHECK_MODULES([FLUX_CORE], [flux-core > 0.40.0], [], [ENABLE_FLUX_PLUGIN=false]) diff --git a/src/fe/startup/config_mgr.cc b/src/fe/startup/config_mgr.cc index 53a0a382..56c8e88b 100644 --- a/src/fe/startup/config_mgr.cc +++ b/src/fe/startup/config_mgr.cc @@ -92,11 +92,7 @@ using namespace std; #define SECURITY_DEFAULT_STR "none" #endif -#if defined(LIBNUMA) && defined(NUMA_EXCLUDES) -#define NUMA_EXCLUDES_STR NUMA_EXCLUDES -#else #define NUMA_EXCLUDES_STR "" -#endif #define AUDITTYPE_STR "audit" @@ -110,11 +106,7 @@ using namespace std; #define HOSTBIN_PATH_STR "" #endif -#if defined(USAGE_LOGGING_FILE) -#define DISABLE_LOGGING_STR "false" -#else #define DISABLE_LOGGING_STR "true" -#endif #define CLEANUP_PROC_STR "false" @@ -132,11 +124,7 @@ using namespace std; #define DEFAULT_CRASH_DEDUP_STR "false" -#if defined(PYTHON_INST_PREFIX) -#define PYTHON_PREFIX_DEFAULT PYTHON_INST_PREFIX -#else #define PYTHON_PREFIX_DEFAULT "" -#endif #if BINARY_PATCH_LDSO == 1 #define DEFAULT_PATCH_LDSO "true" diff --git a/src/fe/startup/parseargs.cc b/src/fe/startup/parseargs.cc index b9137703..d150ea4d 100644 --- a/src/fe/startup/parseargs.cc +++ b/src/fe/startup/parseargs.cc @@ -75,13 +75,8 @@ using namespace std; #define DEFAULT_RSHMODE_STR "No" #endif -#if defined(USAGE_LOGGING_FILE) -#define DEFAULT_LOGGING_ENABLED true -static const int DISABLE_LOGGING_FLAGS = 0; -#else #define DEFAULT_LOGGING_ENABLED false static const int DISABLE_LOGGING_FLAGS = OPTION_HIDDEN; -#endif static ConfigMap argmap("[Command Line]"); static bool done = false; diff --git a/src/fe/startup/spindle_fe.cc b/src/fe/startup/spindle_fe.cc index f1daab9e..cde1af1f 100644 --- a/src/fe/startup/spindle_fe.cc +++ b/src/fe/startup/spindle_fe.cc @@ -34,11 +34,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA #include #include -#if defined(USAGE_LOGGING_FILE) -static const char *logging_file = USAGE_LOGGING_FILE; -#else static const char *logging_file = NULL; -#endif static const char spindle_bootstrap[] = LIBEXECDIR "/spindle_bootstrap"; static bool sendAndWaitForAlive(); From 7499d00931bed507af199e61940f91151d300ca2 Mon Sep 17 00:00:00 2001 From: Barry Rountree Date: Fri, 31 Jul 2026 17:48:56 -0700 Subject: [PATCH 21/21] [prune-config] Changes post bootstrap.sh --- config.h.in | 12 ------ configure | 80 --------------------------------------- src/client/config.h.in | 12 ------ src/client/configure | 80 --------------------------------------- src/fe/config.h.in | 15 -------- src/fe/configure | 86 ------------------------------------------ src/server/config.h.in | 12 ------ src/server/configure | 80 --------------------------------------- 8 files changed, 377 deletions(-) diff --git a/config.h.in b/config.h.in index fc09ca33..b2b8bb1a 100644 --- a/config.h.in +++ b/config.h.in @@ -18,9 +18,6 @@ /* Client/server communication uses pipes */ #undef COMM_PIPES -/* Enable --crash-dedup by default */ -#undef CRASH_DEDUP_ENABLED_BY_DEFAULT - /* Defined if GLIBC has an allocation bug */ #undef DTV_ALLOCATION_BUG @@ -92,9 +89,6 @@ /* Defined if GLIBC has locale TLS bug */ #undef NEWTHREAD_LOCALE_BUG -/* Exclusions for numa optimization */ -#undef NUMA_EXCLUDES - /* Number of ports for COBO to search for an open port */ #undef NUM_COBO_PORTS @@ -119,9 +113,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Python installation prefixes */ -#undef PYTHON_INST_PREFIX - /* RSH command */ #undef RSHLAUNCH_CMD @@ -150,9 +141,6 @@ /* If the compiler supports a TLS storage class, define it to that here */ #undef TLS -/* The file for storing usage logs */ -#undef USAGE_LOGGING_FILE - /* Version number of package */ #undef VERSION diff --git a/configure b/configure index 98894e27..d26a309a 100755 --- a/configure +++ b/configure @@ -841,15 +841,10 @@ with_hostbin with_rsh_launch with_rsh_cmd with_slurm_launch -with_python_prefix enable_numa -with_numa_excludes -with_usage_logging -enable_cleanup_process enable_sec_munge enable_sec_keydir enable_sec_none -enable_crash_dedup with_gcrypt_dir with_munge_dir enable_remap_pageone @@ -1523,15 +1518,11 @@ Optional Features: --enable-slurm-plugin Builds in support for running with SLURM via plugin --enable-flux-plugin Builds in support for running flux via a plugin --enable-numa Use libnuma to enable numa optimizations - --enable-cleanup-process - Default to using a dedicated process to clean - relocated files --enable-sec-munge Enable munge for connection authentication --enable-sec-keydir=keydir Enable filesystem directory 'keydir' to propagate authentication key for connections --enable-sec-none Disable security authentication of connections - --enable-crash-dedup Enable --crash-dedup by default (default: disabled) --enable-remap-pageone Controls mmap behavior when replacing executables. Should be false on older linux systems --enable-testsuite Chooses whether to build the Spindle testsuite. @@ -1570,12 +1561,6 @@ Optional Packages: --with-rsh-cmd=EXE Executable to use for rsh/ssh when running in rsh launch mode --with-slurm-launch Enable using slurm to launch spindle daemons - --with-python-prefix=STR - List of directories containing python installs - --with-numa-excludes Do not numa optimize files matching the given - substrings - --with-usage-logging=FILE - File for writing usage logs --with-gcrypt-dir=DIR Look in DIR for gcrypt installation --with-munge-dir=DIR Look in DIR for munge installation @@ -17081,36 +17066,12 @@ fi $as_echo "#define os_linux 1" >>confdefs.h -#Python prefix - -# Check whether --with-python-prefix was given. -if test "${with_python_prefix+set}" = set; then : - withval=$with_python_prefix; PYTHON_INST_PREFIX=${withval} -else - PYTHON_INST_PREFIX=/usr/lib/python:/usr/lib64/python -fi - - -cat >>confdefs.h <<_ACEOF -#define PYTHON_INST_PREFIX "$PYTHON_INST_PREFIX" -_ACEOF - - #NUMA configuration # Check whether --enable-numa was given. if test "${enable_numa+set}" = set; then : enableval=$enable_numa; REQUIRE_NUMA="true" fi - -# Check whether --with-numa-excludes was given. -if test "${with_numa_excludes+set}" = set; then : - withval=$with_numa_excludes; NUMA_EXCLUDES_VAL=${withval} -else - NUMA_EXCLUDES_VAL="" -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we have libnuma" >&5 $as_echo_n "checking whether we have libnuma... " >&6; } ORIG_LIBS=$LIBS @@ -17146,11 +17107,6 @@ if test "x$HAVE_NUMA" == "xtrue"; then $as_echo "#define LIBNUMA 1" >>confdefs.h - -cat >>confdefs.h <<_ACEOF -#define NUMA_EXCLUDES "$NUMA_EXCLUDES_VAL" -_ACEOF - fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking wheter ld.so has the _dl_argv variable" >&5 @@ -17181,28 +17137,6 @@ $as_echo "#define HAVE_DL_ARGV 1" >>confdefs.h fi -#Usage logging - -# Check whether --with-usage-logging was given. -if test "${with_usage_logging+set}" = set; then : - withval=$with_usage_logging; USAGE_LOGS=${withval} -fi - -if test "x$USAGE_LOGS" != "x"; then - -cat >>confdefs.h <<_ACEOF -#define USAGE_LOGGING_FILE "$USAGE_LOGS" -_ACEOF - -fi - -#Dedicated cleanup process -# Check whether --enable-cleanup-process was given. -if test "${enable_cleanup_process+set}" = set; then : - enableval=$enable_cleanup_process; CLEANUP_PROC="true" -fi - - if test "x$ENABLE_FLUX_PLUGIN" = "xtrue"; then # Check for whether to build Flux shell plugin @@ -17456,20 +17390,6 @@ if test "${enable_sec_none+set}" = set; then : fi -# Check whether --enable-crash-dedup was given. -if test "${enable_crash_dedup+set}" = set; then : - enableval=$enable_crash_dedup; enable_crash_dedup=$enableval -else - enable_crash_dedup=no -fi - - -if test "x$enable_crash_dedup" = xyes; then : - -$as_echo "#define CRASH_DEDUP_ENABLED_BY_DEFAULT 1" >>confdefs.h - -fi - # Check whether --with-gcrypt-dir was given. if test "${with_gcrypt_dir+set}" = set; then : diff --git a/src/client/config.h.in b/src/client/config.h.in index 112a7fc1..76d51d39 100644 --- a/src/client/config.h.in +++ b/src/client/config.h.in @@ -18,9 +18,6 @@ /* Client/server communication uses pipes */ #undef COMM_PIPES -/* Enable --crash-dedup by default */ -#undef CRASH_DEDUP_ENABLED_BY_DEFAULT - /* Defined if GLIBC has an allocation bug */ #undef DTV_ALLOCATION_BUG @@ -85,9 +82,6 @@ /* Defined if GLIBC has locale TLS bug */ #undef NEWTHREAD_LOCALE_BUG -/* Exclusions for numa optimization */ -#undef NUMA_EXCLUDES - /* Number of ports for COBO to search for an open port */ #undef NUM_COBO_PORTS @@ -112,9 +106,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Python installation prefixes */ -#undef PYTHON_INST_PREFIX - /* RSH command */ #undef RSHLAUNCH_CMD @@ -140,9 +131,6 @@ /* Default recource manager */ #undef TESTRM -/* The file for storing usage logs */ -#undef USAGE_LOGGING_FILE - /* Version number of package */ #undef VERSION diff --git a/src/client/configure b/src/client/configure index 49e27c84..f51e3f77 100755 --- a/src/client/configure +++ b/src/client/configure @@ -813,15 +813,10 @@ with_hostbin with_rsh_launch with_rsh_cmd with_slurm_launch -with_python_prefix enable_numa -with_numa_excludes -with_usage_logging -enable_cleanup_process enable_sec_munge enable_sec_keydir enable_sec_none -enable_crash_dedup with_gcrypt_dir with_munge_dir enable_remap_pageone @@ -1480,15 +1475,11 @@ Optional Features: --enable-slurm-plugin Builds in support for running with SLURM via plugin --enable-flux-plugin Builds in support for running flux via a plugin --enable-numa Use libnuma to enable numa optimizations - --enable-cleanup-process - Default to using a dedicated process to clean - relocated files --enable-sec-munge Enable munge for connection authentication --enable-sec-keydir=keydir Enable filesystem directory 'keydir' to propagate authentication key for connections --enable-sec-none Disable security authentication of connections - --enable-crash-dedup Enable --crash-dedup by default (default: disabled) --enable-remap-pageone Controls mmap behavior when replacing executables. Should be false on older linux systems @@ -1525,12 +1516,6 @@ Optional Packages: --with-rsh-cmd=EXE Executable to use for rsh/ssh when running in rsh launch mode --with-slurm-launch Enable using slurm to launch spindle daemons - --with-python-prefix=STR - List of directories containing python installs - --with-numa-excludes Do not numa optimize files matching the given - substrings - --with-usage-logging=FILE - File for writing usage logs --with-gcrypt-dir=DIR Look in DIR for gcrypt installation --with-munge-dir=DIR Look in DIR for munge installation @@ -12983,36 +12968,12 @@ fi $as_echo "#define os_linux 1" >>confdefs.h -#Python prefix - -# Check whether --with-python-prefix was given. -if test "${with_python_prefix+set}" = set; then : - withval=$with_python_prefix; PYTHON_INST_PREFIX=${withval} -else - PYTHON_INST_PREFIX=/usr/lib/python:/usr/lib64/python -fi - - -cat >>confdefs.h <<_ACEOF -#define PYTHON_INST_PREFIX "$PYTHON_INST_PREFIX" -_ACEOF - - #NUMA configuration # Check whether --enable-numa was given. if test "${enable_numa+set}" = set; then : enableval=$enable_numa; REQUIRE_NUMA="true" fi - -# Check whether --with-numa-excludes was given. -if test "${with_numa_excludes+set}" = set; then : - withval=$with_numa_excludes; NUMA_EXCLUDES_VAL=${withval} -else - NUMA_EXCLUDES_VAL="" -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we have libnuma" >&5 $as_echo_n "checking whether we have libnuma... " >&6; } ORIG_LIBS=$LIBS @@ -13048,11 +13009,6 @@ if test "x$HAVE_NUMA" == "xtrue"; then $as_echo "#define LIBNUMA 1" >>confdefs.h - -cat >>confdefs.h <<_ACEOF -#define NUMA_EXCLUDES "$NUMA_EXCLUDES_VAL" -_ACEOF - fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking wheter ld.so has the _dl_argv variable" >&5 @@ -13083,28 +13039,6 @@ $as_echo "#define HAVE_DL_ARGV 1" >>confdefs.h fi -#Usage logging - -# Check whether --with-usage-logging was given. -if test "${with_usage_logging+set}" = set; then : - withval=$with_usage_logging; USAGE_LOGS=${withval} -fi - -if test "x$USAGE_LOGS" != "x"; then - -cat >>confdefs.h <<_ACEOF -#define USAGE_LOGGING_FILE "$USAGE_LOGS" -_ACEOF - -fi - -#Dedicated cleanup process -# Check whether --enable-cleanup-process was given. -if test "${enable_cleanup_process+set}" = set; then : - enableval=$enable_cleanup_process; CLEANUP_PROC="true" -fi - - if test "x$ENABLE_FLUX_PLUGIN" = "xtrue"; then # Check for whether to build Flux shell plugin @@ -13481,20 +13415,6 @@ if test "${enable_sec_none+set}" = set; then : fi -# Check whether --enable-crash-dedup was given. -if test "${enable_crash_dedup+set}" = set; then : - enableval=$enable_crash_dedup; enable_crash_dedup=$enableval -else - enable_crash_dedup=no -fi - - -if test "x$enable_crash_dedup" = xyes; then : - -$as_echo "#define CRASH_DEDUP_ENABLED_BY_DEFAULT 1" >>confdefs.h - -fi - # Check whether --with-gcrypt-dir was given. if test "${with_gcrypt_dir+set}" = set; then : diff --git a/src/fe/config.h.in b/src/fe/config.h.in index b416413f..ca117fdc 100644 --- a/src/fe/config.h.in +++ b/src/fe/config.h.in @@ -18,12 +18,6 @@ /* Client/server communication uses pipes */ #undef COMM_PIPES -/* Enable --crash-dedup by default */ -#undef CRASH_DEDUP_ENABLED_BY_DEFAULT - -/* Default to using a dedicated process to clean data files */ -#undef DEFAULT_CLEANUP_PROC - /* Defined if GLIBC has an allocation bug */ #undef DTV_ALLOCATION_BUG @@ -118,9 +112,6 @@ /* Defined if GLIBC has locale TLS bug */ #undef NEWTHREAD_LOCALE_BUG -/* Exclusions for numa optimization */ -#undef NUMA_EXCLUDES - /* Number of ports for COBO to search for an open port */ #undef NUM_COBO_PORTS @@ -145,9 +136,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Python installation prefixes */ -#undef PYTHON_INST_PREFIX - /* RSH command */ #undef RSHLAUNCH_CMD @@ -176,9 +164,6 @@ /* Default recource manager */ #undef TESTRM -/* The file for storing usage logs */ -#undef USAGE_LOGGING_FILE - /* Version number of package */ #undef VERSION diff --git a/src/fe/configure b/src/fe/configure index 8a486931..9aaee3be 100755 --- a/src/fe/configure +++ b/src/fe/configure @@ -825,15 +825,10 @@ with_hostbin with_rsh_launch with_rsh_cmd with_slurm_launch -with_python_prefix enable_numa -with_numa_excludes -with_usage_logging -enable_cleanup_process enable_sec_munge enable_sec_keydir enable_sec_none -enable_crash_dedup with_gcrypt_dir with_munge_dir enable_remap_pageone @@ -1500,15 +1495,11 @@ Optional Features: --enable-slurm-plugin Builds in support for running with SLURM via plugin --enable-flux-plugin Builds in support for running flux via a plugin --enable-numa Use libnuma to enable numa optimizations - --enable-cleanup-process - Default to using a dedicated process to clean - relocated files --enable-sec-munge Enable munge for connection authentication --enable-sec-keydir=keydir Enable filesystem directory 'keydir' to propagate authentication key for connections --enable-sec-none Disable security authentication of connections - --enable-crash-dedup Enable --crash-dedup by default (default: disabled) --enable-remap-pageone Controls mmap behavior when replacing executables. Should be false on older linux systems --enable-slurm Enable support for the SLURM job launcher @@ -1550,12 +1541,6 @@ Optional Packages: --with-rsh-cmd=EXE Executable to use for rsh/ssh when running in rsh launch mode --with-slurm-launch Enable using slurm to launch spindle daemons - --with-python-prefix=STR - List of directories containing python installs - --with-numa-excludes Do not numa optimize files matching the given - substrings - --with-usage-logging=FILE - File for writing usage logs --with-gcrypt-dir=DIR Look in DIR for gcrypt installation --with-munge-dir=DIR Look in DIR for munge installation @@ -16812,36 +16797,12 @@ fi $as_echo "#define os_linux 1" >>confdefs.h -#Python prefix - -# Check whether --with-python-prefix was given. -if test "${with_python_prefix+set}" = set; then : - withval=$with_python_prefix; PYTHON_INST_PREFIX=${withval} -else - PYTHON_INST_PREFIX=/usr/lib/python:/usr/lib64/python -fi - - -cat >>confdefs.h <<_ACEOF -#define PYTHON_INST_PREFIX "$PYTHON_INST_PREFIX" -_ACEOF - - #NUMA configuration # Check whether --enable-numa was given. if test "${enable_numa+set}" = set; then : enableval=$enable_numa; REQUIRE_NUMA="true" fi - -# Check whether --with-numa-excludes was given. -if test "${with_numa_excludes+set}" = set; then : - withval=$with_numa_excludes; NUMA_EXCLUDES_VAL=${withval} -else - NUMA_EXCLUDES_VAL="" -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we have libnuma" >&5 $as_echo_n "checking whether we have libnuma... " >&6; } ORIG_LIBS=$LIBS @@ -16877,11 +16838,6 @@ if test "x$HAVE_NUMA" == "xtrue"; then $as_echo "#define LIBNUMA 1" >>confdefs.h - -cat >>confdefs.h <<_ACEOF -#define NUMA_EXCLUDES "$NUMA_EXCLUDES_VAL" -_ACEOF - fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking wheter ld.so has the _dl_argv variable" >&5 @@ -16912,28 +16868,6 @@ $as_echo "#define HAVE_DL_ARGV 1" >>confdefs.h fi -#Usage logging - -# Check whether --with-usage-logging was given. -if test "${with_usage_logging+set}" = set; then : - withval=$with_usage_logging; USAGE_LOGS=${withval} -fi - -if test "x$USAGE_LOGS" != "x"; then - -cat >>confdefs.h <<_ACEOF -#define USAGE_LOGGING_FILE "$USAGE_LOGS" -_ACEOF - -fi - -#Dedicated cleanup process -# Check whether --enable-cleanup-process was given. -if test "${enable_cleanup_process+set}" = set; then : - enableval=$enable_cleanup_process; CLEANUP_PROC="true" -fi - - if test "x$ENABLE_FLUX_PLUGIN" = "xtrue"; then # Check for whether to build Flux shell plugin @@ -17310,20 +17244,6 @@ if test "${enable_sec_none+set}" = set; then : fi -# Check whether --enable-crash-dedup was given. -if test "${enable_crash_dedup+set}" = set; then : - enableval=$enable_crash_dedup; enable_crash_dedup=$enableval -else - enable_crash_dedup=no -fi - - -if test "x$enable_crash_dedup" = xyes; then : - -$as_echo "#define CRASH_DEDUP_ENABLED_BY_DEFAULT 1" >>confdefs.h - -fi - # Check whether --with-gcrypt-dir was given. if test "${with_gcrypt_dir+set}" = set; then : @@ -17689,12 +17609,6 @@ CXXFLAGS="$CXXFLAGS -fvisibility=hidden" SPINDLEFE_LIB_VERSION=`$srcdir/../../LIB_VERSION spindlefe` -if test "x$CLEANUP_PROC" == "xtrue"; then - -$as_echo "#define DEFAULT_CLEANUP_PROC 1" >>confdefs.h - -fi - cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure diff --git a/src/server/config.h.in b/src/server/config.h.in index f1670470..751346f6 100644 --- a/src/server/config.h.in +++ b/src/server/config.h.in @@ -18,9 +18,6 @@ /* Client/server communication uses pipes */ #undef COMM_PIPES -/* Enable --crash-dedup by default */ -#undef CRASH_DEDUP_ENABLED_BY_DEFAULT - /* Defined if GLIBC has an allocation bug */ #undef DTV_ALLOCATION_BUG @@ -100,9 +97,6 @@ /* Defined if GLIBC has locale TLS bug */ #undef NEWTHREAD_LOCALE_BUG -/* Exclusions for numa optimization */ -#undef NUMA_EXCLUDES - /* Number of ports for COBO to search for an open port */ #undef NUM_COBO_PORTS @@ -127,9 +121,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Python installation prefixes */ -#undef PYTHON_INST_PREFIX - /* RSH command */ #undef RSHLAUNCH_CMD @@ -158,9 +149,6 @@ /* Default recource manager */ #undef TESTRM -/* The file for storing usage logs */ -#undef USAGE_LOGGING_FILE - /* Version number of package */ #undef VERSION diff --git a/src/server/configure b/src/server/configure index ceee52bb..9bcd5a64 100755 --- a/src/server/configure +++ b/src/server/configure @@ -831,15 +831,10 @@ with_hostbin with_rsh_launch with_rsh_cmd with_slurm_launch -with_python_prefix enable_numa -with_numa_excludes -with_usage_logging -enable_cleanup_process enable_sec_munge enable_sec_keydir enable_sec_none -enable_crash_dedup with_gcrypt_dir with_munge_dir enable_remap_pageone @@ -1502,15 +1497,11 @@ Optional Features: --enable-slurm-plugin Builds in support for running with SLURM via plugin --enable-flux-plugin Builds in support for running flux via a plugin --enable-numa Use libnuma to enable numa optimizations - --enable-cleanup-process - Default to using a dedicated process to clean - relocated files --enable-sec-munge Enable munge for connection authentication --enable-sec-keydir=keydir Enable filesystem directory 'keydir' to propagate authentication key for connections --enable-sec-none Disable security authentication of connections - --enable-crash-dedup Enable --crash-dedup by default (default: disabled) --enable-remap-pageone Controls mmap behavior when replacing executables. Should be false on older linux systems @@ -1547,12 +1538,6 @@ Optional Packages: --with-rsh-cmd=EXE Executable to use for rsh/ssh when running in rsh launch mode --with-slurm-launch Enable using slurm to launch spindle daemons - --with-python-prefix=STR - List of directories containing python installs - --with-numa-excludes Do not numa optimize files matching the given - substrings - --with-usage-logging=FILE - File for writing usage logs --with-gcrypt-dir=DIR Look in DIR for gcrypt installation --with-munge-dir=DIR Look in DIR for munge installation @@ -16809,36 +16794,12 @@ fi $as_echo "#define os_linux 1" >>confdefs.h -#Python prefix - -# Check whether --with-python-prefix was given. -if test "${with_python_prefix+set}" = set; then : - withval=$with_python_prefix; PYTHON_INST_PREFIX=${withval} -else - PYTHON_INST_PREFIX=/usr/lib/python:/usr/lib64/python -fi - - -cat >>confdefs.h <<_ACEOF -#define PYTHON_INST_PREFIX "$PYTHON_INST_PREFIX" -_ACEOF - - #NUMA configuration # Check whether --enable-numa was given. if test "${enable_numa+set}" = set; then : enableval=$enable_numa; REQUIRE_NUMA="true" fi - -# Check whether --with-numa-excludes was given. -if test "${with_numa_excludes+set}" = set; then : - withval=$with_numa_excludes; NUMA_EXCLUDES_VAL=${withval} -else - NUMA_EXCLUDES_VAL="" -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we have libnuma" >&5 $as_echo_n "checking whether we have libnuma... " >&6; } ORIG_LIBS=$LIBS @@ -16874,11 +16835,6 @@ if test "x$HAVE_NUMA" == "xtrue"; then $as_echo "#define LIBNUMA 1" >>confdefs.h - -cat >>confdefs.h <<_ACEOF -#define NUMA_EXCLUDES "$NUMA_EXCLUDES_VAL" -_ACEOF - fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking wheter ld.so has the _dl_argv variable" >&5 @@ -16909,28 +16865,6 @@ $as_echo "#define HAVE_DL_ARGV 1" >>confdefs.h fi -#Usage logging - -# Check whether --with-usage-logging was given. -if test "${with_usage_logging+set}" = set; then : - withval=$with_usage_logging; USAGE_LOGS=${withval} -fi - -if test "x$USAGE_LOGS" != "x"; then - -cat >>confdefs.h <<_ACEOF -#define USAGE_LOGGING_FILE "$USAGE_LOGS" -_ACEOF - -fi - -#Dedicated cleanup process -# Check whether --enable-cleanup-process was given. -if test "${enable_cleanup_process+set}" = set; then : - enableval=$enable_cleanup_process; CLEANUP_PROC="true" -fi - - if test "x$ENABLE_FLUX_PLUGIN" = "xtrue"; then # Check for whether to build Flux shell plugin @@ -17307,20 +17241,6 @@ if test "${enable_sec_none+set}" = set; then : fi -# Check whether --enable-crash-dedup was given. -if test "${enable_crash_dedup+set}" = set; then : - enableval=$enable_crash_dedup; enable_crash_dedup=$enableval -else - enable_crash_dedup=no -fi - - -if test "x$enable_crash_dedup" = xyes; then : - -$as_echo "#define CRASH_DEDUP_ENABLED_BY_DEFAULT 1" >>confdefs.h - -fi - # Check whether --with-gcrypt-dir was given. if test "${with_gcrypt_dir+set}" = set; then :