From 37f63959c6bb358a27df4472c56ecd9815b172d7 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@schedmd.com>
Date: Tue, 15 Jul 2014 10:36:40 -0700
Subject: [PATCH] Move xcgroup stuff to slurmd/common instead of src/common
since it is only used in the slurmd and slurmstepd.
---
src/common/Makefile.am | 2 -
src/common/Makefile.in | 53 +++++++++----------
.../cgroup/jobacct_gather_cgroup.h | 4 +-
.../proctrack/cgroup/proctrack_cgroup.c | 5 +-
src/plugins/task/cgroup/task_cgroup.c | 9 ++--
src/plugins/task/cgroup/task_cgroup.h | 3 ++
src/plugins/task/cgroup/task_cgroup_cpuset.c | 3 +-
src/plugins/task/cgroup/task_cgroup_cpuset.h | 2 +-
src/plugins/task/cgroup/task_cgroup_devices.c | 3 --
src/plugins/task/cgroup/task_cgroup_devices.h | 2 +-
src/plugins/task/cgroup/task_cgroup_memory.c | 2 -
src/plugins/task/cgroup/task_cgroup_memory.h | 2 +-
src/slurmd/common/Makefile.am | 5 +-
src/slurmd/common/Makefile.in | 9 +++-
src/slurmd/common/slurmd_cgroup.c | 4 +-
src/slurmd/common/slurmd_cgroup.h | 2 -
src/{ => slurmd}/common/xcgroup.c | 0
src/{ => slurmd}/common/xcgroup.h | 0
src/{ => slurmd}/common/xcgroup_read_config.c | 0
src/{ => slurmd}/common/xcgroup_read_config.h | 0
20 files changed, 55 insertions(+), 55 deletions(-)
rename src/{ => slurmd}/common/xcgroup.c (100%)
rename src/{ => slurmd}/common/xcgroup.h (100%)
rename src/{ => slurmd}/common/xcgroup_read_config.c (100%)
rename src/{ => slurmd}/common/xcgroup_read_config.h (100%)
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 660c4a0d2d4..c09758208e5 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -31,8 +31,6 @@ noinst_LTLIBRARIES = \
libspank.la
libcommon_la_SOURCES = \
- xcgroup_read_config.c xcgroup_read_config.h \
- xcgroup.c xcgroup.h \
cpu_frequency.c cpu_frequency.h \
assoc_mgr.c assoc_mgr.h \
xmalloc.c xmalloc.h \
diff --git a/src/common/Makefile.in b/src/common/Makefile.in
index e3b5f759b5e..2a20ca8a6db 100644
--- a/src/common/Makefile.in
+++ b/src/common/Makefile.in
@@ -145,23 +145,22 @@ CONFIG_CLEAN_VPATH_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
am__DEPENDENCIES_1 =
libcommon_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am__libcommon_la_SOURCES_DIST = xcgroup_read_config.c \
- xcgroup_read_config.h xcgroup.c xcgroup.h cpu_frequency.c \
- cpu_frequency.h assoc_mgr.c assoc_mgr.h xmalloc.c xmalloc.h \
- xassert.c xassert.h xstring.c xstring.h xsignal.c xsignal.h \
- strnatcmp.c strnatcmp.h forward.c forward.h strlcpy.c \
- strlcpy.h list.c list.h xtree.c xtree.h xhash.c xhash.h net.c \
- net.h log.c log.h cbuf.c cbuf.h safeopen.c safeopen.h \
- bitstring.c bitstring.h mpi.c mpi.h pack.c pack.h \
- parse_config.c parse_config.h parse_spec.c parse_spec.h \
- plugin.c plugin.h plugrack.c plugrack.h print_fields.c \
- print_fields.h read_config.c read_config.h node_select.c \
- node_select.h env.c env.h fd.c fd.h slurm_cred.h slurm_cred.c \
- slurm_errno.c slurm_ext_sensors.c slurm_ext_sensors.h \
- slurm_priority.c slurm_priority.h slurm_protocol_api.c \
- slurm_protocol_api.h slurm_protocol_pack.c \
- slurm_protocol_pack.h slurm_protocol_util.c \
- slurm_protocol_util.h slurm_protocol_socket_implementation.c \
+am__libcommon_la_SOURCES_DIST = cpu_frequency.c cpu_frequency.h \
+ assoc_mgr.c assoc_mgr.h xmalloc.c xmalloc.h xassert.c \
+ xassert.h xstring.c xstring.h xsignal.c xsignal.h strnatcmp.c \
+ strnatcmp.h forward.c forward.h strlcpy.c strlcpy.h list.c \
+ list.h xtree.c xtree.h xhash.c xhash.h net.c net.h log.c log.h \
+ cbuf.c cbuf.h safeopen.c safeopen.h bitstring.c bitstring.h \
+ mpi.c mpi.h pack.c pack.h parse_config.c parse_config.h \
+ parse_spec.c parse_spec.h plugin.c plugin.h plugrack.c \
+ plugrack.h print_fields.c print_fields.h read_config.c \
+ read_config.h node_select.c node_select.h env.c env.h fd.c \
+ fd.h slurm_cred.h slurm_cred.c slurm_errno.c \
+ slurm_ext_sensors.c slurm_ext_sensors.h slurm_priority.c \
+ slurm_priority.h slurm_protocol_api.c slurm_protocol_api.h \
+ slurm_protocol_pack.c slurm_protocol_pack.h \
+ slurm_protocol_util.c slurm_protocol_util.h \
+ slurm_protocol_socket_implementation.c \
slurm_protocol_socket_common.h slurm_protocol_common.h \
slurm_protocol_interface.h slurm_protocol_defs.c \
slurm_protocol_defs.h slurm_rlimits_info.h \
@@ -189,14 +188,14 @@ am__libcommon_la_SOURCES_DIST = xcgroup_read_config.c \
proc_args.c proc_args.h slurm_strcasestr.c slurm_strcasestr.h \
node_conf.h node_conf.c gres.h gres.c
@HAVE_UNSETENV_FALSE@am__objects_1 = unsetenv.lo
-am_libcommon_la_OBJECTS = xcgroup_read_config.lo xcgroup.lo \
- cpu_frequency.lo assoc_mgr.lo xmalloc.lo xassert.lo xstring.lo \
- xsignal.lo strnatcmp.lo forward.lo strlcpy.lo list.lo xtree.lo \
- xhash.lo net.lo log.lo cbuf.lo safeopen.lo bitstring.lo mpi.lo \
- pack.lo parse_config.lo parse_spec.lo plugin.lo plugrack.lo \
- print_fields.lo read_config.lo node_select.lo env.lo fd.lo \
- slurm_cred.lo slurm_errno.lo slurm_ext_sensors.lo \
- slurm_priority.lo slurm_protocol_api.lo slurm_protocol_pack.lo \
+am_libcommon_la_OBJECTS = cpu_frequency.lo assoc_mgr.lo xmalloc.lo \
+ xassert.lo xstring.lo xsignal.lo strnatcmp.lo forward.lo \
+ strlcpy.lo list.lo xtree.lo xhash.lo net.lo log.lo cbuf.lo \
+ safeopen.lo bitstring.lo mpi.lo pack.lo parse_config.lo \
+ parse_spec.lo plugin.lo plugrack.lo print_fields.lo \
+ read_config.lo node_select.lo env.lo fd.lo slurm_cred.lo \
+ slurm_errno.lo slurm_ext_sensors.lo slurm_priority.lo \
+ slurm_protocol_api.lo slurm_protocol_pack.lo \
slurm_protocol_util.lo slurm_protocol_socket_implementation.lo \
slurm_protocol_defs.lo slurm_rlimits_info.lo slurmdb_defs.lo \
slurmdb_pack.lo slurmdbd_defs.lo working_cluster.lo uid.lo \
@@ -559,8 +558,6 @@ noinst_LTLIBRARIES = \
libspank.la
libcommon_la_SOURCES = \
- xcgroup_read_config.c xcgroup_read_config.h \
- xcgroup.c xcgroup.h \
cpu_frequency.c cpu_frequency.h \
assoc_mgr.c assoc_mgr.h \
xmalloc.c xmalloc.h \
@@ -835,8 +832,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/working_cluster.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/write_labelled_message.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xassert.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcgroup.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcgroup_read_config.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xhash.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmalloc.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsignal.Plo@am__quote@
diff --git a/src/plugins/jobacct_gather/cgroup/jobacct_gather_cgroup.h b/src/plugins/jobacct_gather/cgroup/jobacct_gather_cgroup.h
index a945805e6b4..2245f013267 100644
--- a/src/plugins/jobacct_gather/cgroup/jobacct_gather_cgroup.h
+++ b/src/plugins/jobacct_gather/cgroup/jobacct_gather_cgroup.h
@@ -39,9 +39,9 @@
* Copyright (C) 2002 The Regents of the University of California.
\*****************************************************************************/
-#include "src/common/xcgroup.h"
#include "src/common/slurm_jobacct_gather.h"
-#include "src/common/xcgroup_read_config.h"
+#include "src/slurmd/common/xcgroup.h"
+#include "src/slurmd/common/xcgroup_read_config.h"
extern xcgroup_t task_memory_cg;
extern xcgroup_t task_cpuacct_cg;
diff --git a/src/plugins/proctrack/cgroup/proctrack_cgroup.c b/src/plugins/proctrack/cgroup/proctrack_cgroup.c
index a5a63b1a2e5..9add9ab27db 100644
--- a/src/plugins/proctrack/cgroup/proctrack_cgroup.c
+++ b/src/plugins/proctrack/cgroup/proctrack_cgroup.c
@@ -61,8 +61,9 @@
#include "src/slurmd/slurmstepd/slurmstepd_job.h"
-#include "src/common/xcgroup_read_config.h"
-#include "src/common/xcgroup.h"
+#include "src/slurmd/common/xcgroup_read_config.h"
+#include "src/slurmd/common/xcgroup.h"
+
#include "src/common/xstring.h"
#include <sys/types.h>
diff --git a/src/plugins/task/cgroup/task_cgroup.c b/src/plugins/task/cgroup/task_cgroup.c
index bf52f5a3458..49d5fd75a54 100644
--- a/src/plugins/task/cgroup/task_cgroup.c
+++ b/src/plugins/task/cgroup/task_cgroup.c
@@ -44,11 +44,14 @@
#include "slurm/slurm_errno.h"
#include "src/common/slurm_xlator.h"
+#include "src/common/xstring.h"
+
#include "src/slurmd/slurmstepd/slurmstepd_job.h"
+
#include "src/slurmd/slurmd/slurmd.h"
-#include "src/common/xcgroup.h"
-#include "src/common/xstring.h"
-#include "src/common/xcgroup_read_config.h"
+
+#include "src/slurmd/common/xcgroup.h"
+#include "src/slurmd/common/xcgroup_read_config.h"
#include "task_cgroup.h"
#include "task_cgroup_cpuset.h"
diff --git a/src/plugins/task/cgroup/task_cgroup.h b/src/plugins/task/cgroup/task_cgroup.h
index 850e2ca1973..29cbad7798b 100644
--- a/src/plugins/task/cgroup/task_cgroup.h
+++ b/src/plugins/task/cgroup/task_cgroup.h
@@ -41,6 +41,9 @@
#ifndef _TASK_CGROUP_H_
#define _TASK_CGROUP_H_
+#include "src/slurmd/common/xcgroup_read_config.h"
+#include "src/slurmd/common/xcgroup.h"
+
extern char* task_cgroup_create_slurm_cg (xcgroup_ns_t* ns);
#endif
diff --git a/src/plugins/task/cgroup/task_cgroup_cpuset.c b/src/plugins/task/cgroup/task_cgroup_cpuset.c
index 82a15d2ffd5..5cbb07abf1b 100644
--- a/src/plugins/task/cgroup/task_cgroup_cpuset.c
+++ b/src/plugins/task/cgroup/task_cgroup_cpuset.c
@@ -50,13 +50,12 @@
#include "slurm/slurm.h"
#include "src/slurmd/slurmstepd/slurmstepd_job.h"
#include "src/slurmd/slurmd/slurmd.h"
+
#include "src/common/cpu_frequency.h"
#include "src/common/slurm_resource_info.h"
#include "src/common/bitstring.h"
#include "src/common/proc_args.h"
#include "src/common/xstring.h"
-#include "src/common/xcgroup_read_config.h"
-#include "src/common/xcgroup.h"
#include "task_cgroup.h"
diff --git a/src/plugins/task/cgroup/task_cgroup_cpuset.h b/src/plugins/task/cgroup/task_cgroup_cpuset.h
index fa40fac1b25..371be3c60e6 100644
--- a/src/plugins/task/cgroup/task_cgroup_cpuset.h
+++ b/src/plugins/task/cgroup/task_cgroup_cpuset.h
@@ -41,7 +41,7 @@
#ifndef _TASK_CGROUP_CPUSET_H_
#define _TASK_CGROUP_CPUSET_H_
-#include "src/common/xcgroup_read_config.h"
+#include "src/slurmd/common/xcgroup_read_config.h"
/* initialize cpuset subsystem of task/cgroup */
extern int task_cgroup_cpuset_init(slurm_cgroup_conf_t *slurm_cgroup_conf);
diff --git a/src/plugins/task/cgroup/task_cgroup_devices.c b/src/plugins/task/cgroup/task_cgroup_devices.c
index 732169384f4..9b95216d2d1 100644
--- a/src/plugins/task/cgroup/task_cgroup_devices.c
+++ b/src/plugins/task/cgroup/task_cgroup_devices.c
@@ -49,9 +49,6 @@
#include "src/slurmd/slurmd/slurmd.h"
#include "src/common/xstring.h"
-#include "src/common/xcgroup_read_config.h"
-#include "src/common/xcgroup.h"
-
#include "src/common/gres.h"
#include "src/common/list.h"
diff --git a/src/plugins/task/cgroup/task_cgroup_devices.h b/src/plugins/task/cgroup/task_cgroup_devices.h
index b27fba3c83c..a8a2aa19499 100644
--- a/src/plugins/task/cgroup/task_cgroup_devices.h
+++ b/src/plugins/task/cgroup/task_cgroup_devices.h
@@ -41,7 +41,7 @@
#ifndef _TASK_CGROUP_DEVICES_H_
#define _TASK_CGROUP_DEVICES_H_
-#include "src/common/xcgroup_read_config.h"
+#include "src/slurmd/common/xcgroup_read_config.h"
/* initialize devices subsystem of task/cgroup */
extern int task_cgroup_devices_init(slurm_cgroup_conf_t *slurm_cgroup_conf);
diff --git a/src/plugins/task/cgroup/task_cgroup_memory.c b/src/plugins/task/cgroup/task_cgroup_memory.c
index 9fda39c4e6e..9c0dd61a806 100644
--- a/src/plugins/task/cgroup/task_cgroup_memory.c
+++ b/src/plugins/task/cgroup/task_cgroup_memory.c
@@ -47,8 +47,6 @@
#include "src/slurmd/slurmd/slurmd.h"
#include "src/common/xstring.h"
-#include "src/common/xcgroup_read_config.h"
-#include "src/common/xcgroup.h"
#include "task_cgroup.h"
diff --git a/src/plugins/task/cgroup/task_cgroup_memory.h b/src/plugins/task/cgroup/task_cgroup_memory.h
index 75a04b56cfd..4a876f310e6 100644
--- a/src/plugins/task/cgroup/task_cgroup_memory.h
+++ b/src/plugins/task/cgroup/task_cgroup_memory.h
@@ -41,7 +41,7 @@
#ifndef _TASK_CGROUP_MEMORY_H_
#define _TASK_CGROUP_MEMORY_H_
-#include "src/common/xcgroup_read_config.h"
+#include "src/slurmd/common/xcgroup_read_config.h"
/* initialize memory subsystem of task/cgroup */
extern int task_cgroup_memory_init(slurm_cgroup_conf_t *slurm_cgroup_conf);
diff --git a/src/slurmd/common/Makefile.am b/src/slurmd/common/Makefile.am
index 11784fd872f..e0e7ffd9ba3 100644
--- a/src/slurmd/common/Makefile.am
+++ b/src/slurmd/common/Makefile.am
@@ -21,7 +21,10 @@ libslurmd_common_la_SOURCES = \
task_plugin.c task_plugin.h \
set_oomadj.c set_oomadj.h \
reverse_tree.h \
- xcpuinfo.c xcpuinfo.h
+ xcpuinfo.c xcpuinfo.h \
+ xcgroup_read_config.c xcgroup_read_config.h \
+ xcgroup.c xcgroup.h
+
libslurmd_common_la_LDFLAGS = $(HWLOC_LDFLAGS) $(HWLOC_LIBS)
diff --git a/src/slurmd/common/Makefile.in b/src/slurmd/common/Makefile.in
index 10ba55ad952..2218aec58e4 100644
--- a/src/slurmd/common/Makefile.in
+++ b/src/slurmd/common/Makefile.in
@@ -138,7 +138,8 @@ libslurmd_common_la_LIBADD =
am_libslurmd_common_la_OBJECTS = core_spec_plugin.lo \
job_container_plugin.lo proctrack.lo setproctitle.lo \
slurmd_cgroup.lo slurmstepd_init.lo run_script.lo \
- task_plugin.lo set_oomadj.lo xcpuinfo.lo
+ task_plugin.lo set_oomadj.lo xcpuinfo.lo \
+ xcgroup_read_config.lo xcgroup.lo
libslurmd_common_la_OBJECTS = $(am_libslurmd_common_la_OBJECTS)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -474,7 +475,9 @@ libslurmd_common_la_SOURCES = \
task_plugin.c task_plugin.h \
set_oomadj.c set_oomadj.h \
reverse_tree.h \
- xcpuinfo.c xcpuinfo.h
+ xcpuinfo.c xcpuinfo.h \
+ xcgroup_read_config.c xcgroup_read_config.h \
+ xcgroup.c xcgroup.h
libslurmd_common_la_LDFLAGS = $(HWLOC_LDFLAGS) $(HWLOC_LIBS)
@@ -562,6 +565,8 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slurmd_cgroup.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slurmstepd_init.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/task_plugin.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcgroup.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcgroup_read_config.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcpuinfo.Plo@am__quote@
.c.o:
diff --git a/src/slurmd/common/slurmd_cgroup.c b/src/slurmd/common/slurmd_cgroup.c
index 90f692f405a..384d068b5a6 100644
--- a/src/slurmd/common/slurmd_cgroup.c
+++ b/src/slurmd/common/slurmd_cgroup.c
@@ -51,8 +51,8 @@
#include "src/common/bitstring.h"
#include "src/common/slurm_resource_info.h"
#include "src/common/xstring.h"
-#include "src/common/xcgroup_read_config.h"
-#include "src/common/xcgroup.h"
+#include "src/slurmd/common/xcgroup_read_config.h"
+#include "src/slurmd/common/xcgroup.h"
#include "src/slurmd/common/slurmd_cgroup.h"
#include "src/slurmd/slurmd/slurmd.h"
#include "src/slurmd/slurmstepd/slurmstepd_job.h"
diff --git a/src/slurmd/common/slurmd_cgroup.h b/src/slurmd/common/slurmd_cgroup.h
index e579229f6ba..9d83003328c 100644
--- a/src/slurmd/common/slurmd_cgroup.h
+++ b/src/slurmd/common/slurmd_cgroup.h
@@ -42,8 +42,6 @@
# include "config.h"
#endif
-#include "src/common/xcgroup_read_config.h"
-
/* Initialize slurmd system cpuset cgroup */
extern int init_system_cpuset_cgroup(void);
diff --git a/src/common/xcgroup.c b/src/slurmd/common/xcgroup.c
similarity index 100%
rename from src/common/xcgroup.c
rename to src/slurmd/common/xcgroup.c
diff --git a/src/common/xcgroup.h b/src/slurmd/common/xcgroup.h
similarity index 100%
rename from src/common/xcgroup.h
rename to src/slurmd/common/xcgroup.h
diff --git a/src/common/xcgroup_read_config.c b/src/slurmd/common/xcgroup_read_config.c
similarity index 100%
rename from src/common/xcgroup_read_config.c
rename to src/slurmd/common/xcgroup_read_config.c
diff --git a/src/common/xcgroup_read_config.h b/src/slurmd/common/xcgroup_read_config.h
similarity index 100%
rename from src/common/xcgroup_read_config.h
rename to src/slurmd/common/xcgroup_read_config.h
--
GitLab