Move slurm code to its own directory

diff --git a/src/Makefile.am b/src/Makefile.am
index c7ce4cdfec0dde827929e1be36e8fe1f27774023..359fa168f4151fb56a6e006294384e01cb18ac87 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -74,9 +74,6 @@ fort_SOURCES += clients.c clients.h
 fort_SOURCES += common.c common.h
 fort_SOURCES += json_parser.c json_parser.h
 fort_SOURCES += notify.c notify.h
-fort_SOURCES += slurm_db.c slurm_db.h
-fort_SOURCES += slurm_loader.c slurm_loader.h
-fort_SOURCES += slurm_parser.c slurm_parser.h
 fort_SOURCES += updates_daemon.c updates_daemon.h
 
 fort_SOURCES += rtr/err_pdu.c rtr/err_pdu.h
@@ -93,6 +90,10 @@ fort_SOURCES += rtr/db/roa_table.c rtr/db/roa_table.h
 fort_SOURCES += rtr/db/roa.c rtr/db/roa.h
 fort_SOURCES += rtr/db/vrps.c rtr/db/vrps.h
 
+fort_SOURCES += slurm/slurm_db.c slurm/slurm_db.h
+fort_SOURCES += slurm/slurm_loader.c slurm/slurm_loader.h
+fort_SOURCES += slurm/slurm_parser.c slurm/slurm_parser.h
+
 fort_CFLAGS  = -Wall
 # Feel free to temporarily remove this one if you're not using gcc 7.3.0.
 #fort_CFLAGS += $(GCC_WARNS)

diff --git a/src/main.c b/src/main.c
index 2051f16d49af3761b3a89ed3cc9c45297476392f..59c9c3a31abc8e0688cf36c3bd32fe886577b23d 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -4,11 +4,11 @@
 #include "debug.h"
 #include "extension.h"
 #include "nid.h"
-#include "slurm_loader.h"
 #include "thread_var.h"
 #include "rsync/rsync.h"
 #include "rtr/rtr.h"
 #include "rtr/db/vrps.h"
+#include "slurm/slurm_loader.h"
 
 static int
 start_rtr_server(void)

diff --git a/src/slurm_db.c b/src/slurm/slurm_db.c
similarity index 100%
rename from src/slurm_db.c
rename to src/slurm/slurm_db.c

diff --git a/src/slurm_db.h b/src/slurm/slurm_db.h
similarity index 83%
rename from src/slurm_db.h
rename to src/slurm/slurm_db.h
index 2e090a56dd833bed9b4952e3521b5dd0f3b61d3c..d35a1f4cb74a68dee5c43669036fbbb8201754e6 100644 (file)
--- a/src/slurm_db.h
+++ b/src/slurm/slurm_db.h
@@ -1,7 +1,7 @@
-#ifndef SRC_SLURM_DB_H_
-#define SRC_SLURM_DB_H_
+#ifndef SRC_SLURM_SLURM_DB_H_
+#define SRC_SLURM_SLURM_DB_H_
 
-#include "slurm_parser.h"
+#include "slurm/slurm_parser.h"
 
 struct slurm_prefix_list {
        struct slurm_prefix *list;
@@ -29,4 +29,4 @@ int slurm_db_add_bgpsec_assertion(struct slurm_bgpsec *);
 
 void slurm_db_cleanup(void);
 
-#endif /* SRC_SLURM_DB_H_ */
+#endif /* SRC_SLURM_SLURM_DB_H_ */

diff --git a/src/slurm_loader.c b/src/slurm/slurm_loader.c
similarity index 97%
rename from src/slurm_loader.c
rename to src/slurm/slurm_loader.c
index add42e59b5dfccf1bcd024af8fb9030f6993429c..148c5e7a0ffdcd126ad86eb49e0c2c62c96b34a2 100644 (file)
--- a/src/slurm_loader.c
+++ b/src/slurm/slurm_loader.c
@@ -7,8 +7,8 @@
 
 #include "log.h"
 #include "config.h"
-#include "slurm_db.h"
-#include "slurm_parser.h"
+#include "slurm/slurm_db.h"
+#include "slurm/slurm_parser.h"
 
 #define SLURM_FILE_EXTENSION   ".slurm"
 

diff --git a/src/slurm/slurm_loader.h b/src/slurm/slurm_loader.h
new file mode 100644 (file)
index 0000000..da80bc6
--- /dev/null
+++ b/src/slurm/slurm_loader.h
@@ -0,0 +1,7 @@
+#ifndef SRC_SLURM_SLURM_LOADER_H_
+#define SRC_SLURM_SLURM_LOADER_H_
+
+int slurm_load(void);
+void slurm_cleanup(void);
+
+#endif /* SRC_SLURM_SLURM_LOADER_H_ */

diff --git a/src/slurm_parser.c b/src/slurm/slurm_parser.c
similarity index 99%
rename from src/slurm_parser.c
rename to src/slurm/slurm_parser.c
index d879ece5735e69d391020f8ef46b7babde7560c2..2b79aad2e1e5ead88493a2d28e72757c4d111036 100644 (file)
--- a/src/slurm_parser.c
+++ b/src/slurm/slurm_parser.c
@@ -10,7 +10,7 @@
 #include "log.h"
 #include "address.h"
 #include "json_parser.h"
-#include "slurm_db.h"
+#include "slurm/slurm_db.h"
 
 /* JSON members */
 #define SLURM_VERSION                  "slurmVersion"

diff --git a/src/slurm_parser.h b/src/slurm/slurm_parser.h
similarity index 87%
rename from src/slurm_parser.h
rename to src/slurm/slurm_parser.h
index 86bc73c448f3c10a40fc24943f9d799305c3fb68..221f8a8ba0511005ab091830e504b7a4d1aa17d5 100644 (file)
--- a/src/slurm_parser.h
+++ b/src/slurm/slurm_parser.h
@@ -1,5 +1,5 @@
-#ifndef SRC_SLURM_PARSER_H_
-#define SRC_SLURM_PARSER_H_
+#ifndef SRC_SLURM_SLURM_PARSER_H_
+#define SRC_SLURM_SLURM_PARSER_H_
 
 #include <netinet/in.h>
 
@@ -41,4 +41,4 @@ struct slurm_bgpsec {
 int slurm_parse(char const *);
 
 
-#endif /* SRC_SLURM_PARSER_H_ */
+#endif /* SRC_SLURM_SLURM_PARSER_H_ */

diff --git a/src/slurm_loader.h b/src/slurm_loader.h
deleted file mode 100644 (file)
index fdef9ca..0000000
--- a/src/slurm_loader.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef SRC_SLURM_LOADER_H_
-#define SRC_SLURM_LOADER_H_
-
-int slurm_load(void);
-void slurm_cleanup(void);
-
-#endif /* SRC_SLURM_LOADER_H_ */