From da226b3cfa80d97fbaf8d8a8c7dc5286b6779baf Mon Sep 17 00:00:00 2001
From: Adrien Bourmault <neox@os-k.eu>
Date: Fri, 20 Aug 2021 15:19:08 +0200
Subject: [PATCH] Server /etc parameters embryon, clean shutdown (&signals),
 model storage dir

---
 Makefile          |  12 ++++++++++--
 debian/Manifest   |  10 ----------
 include/base.h    |  11 +++++++++++
 include/model.h   |   2 +-
 src/cmds.c        |   6 +++---
 src/localworker.c |   1 +
 src/main.c        |  47 +++++++++++++++++++++++++++++++++++++---------
 src/model.c       |   5 +++--
 src/tests/xml     | Bin 17080 -> 17128 bytes
 src/tests/xml.c   |   6 +++---
 10 files changed, 70 insertions(+), 30 deletions(-)
 delete mode 100644 debian/Manifest

diff --git a/Makefile b/Makefile
index b0f0f92..6d48a60 100644
--- a/Makefile
+++ b/Makefile
@@ -87,11 +87,19 @@ all: dependencies $(BINDIR)/gem-graph-server $(BINDIR)/gem-graph-ctl
 tests: $(TESTS)
 
 # ---- Build debian package -------------------------------------------------- #
-$(BINDIR)/gem-graph-server.deb: all
+$(BINDIR)/gem-graph-server.deb: all 	$(DEBDIR)/control \
+					$(DEBDIR)/conffiles \
+					$(DEBDIR)/etc/server.conf \
+					$(DEBDIR)/copyright
 	mkdir -p gem-graph-server/usr/bin
+	mkdir -p gem-graph-server/var/lib/gem-graph-server/models
+	mkdir -p gem-graph-server/var/lib/gem-graph-server/users
+	mkdir -p gem-graph-server/etc/gem-graph-server
 	mkdir -p gem-graph-server/usr/share/doc/gem-graph-server
 	mkdir -p gem-graph-server/DEBIAN
-	cp $(DEBDIR)/Manifest gem-graph-server/DEBIAN/control
+	cp $(DEBDIR)/control gem-graph-server/DEBIAN/control
+	cp $(DEBDIR)/conffiles gem-graph-server/DEBIAN/conffiles
+	cp $(DEBDIR)/etc/* gem-graph-server/etc/gem-graph-server
 	cp $(BINDIR)/gem-graph-server gem-graph-server/usr/bin
 	cp $(BINDIR)/gem-graph-ctl gem-graph-server/usr/bin
 	cp $(DEBDIR)/copyright \
diff --git a/debian/Manifest b/debian/Manifest
deleted file mode 100644
index d7fcae4..0000000
--- a/debian/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-Package: gem-graph-server
-Version: 0.0.1
-Section: custom
-Priority: optional
-Depends: libxml2
-Architecture: amd64
-Essential: no
-Installed-Size: 1049
-Maintainer: The Gem-graph Project
-Description: The gem-graph computation server
diff --git a/include/base.h b/include/base.h
index 97ea250..417687f 100644
--- a/include/base.h
+++ b/include/base.h
@@ -168,3 +168,14 @@ struct {
     Scheduler_t *scheduler;
     Supervisor_t *supervisor;
 } typedef Model_t;
+
+/* -------------------------------------------------------------------------- */
+
+//
+// Parameters
+//
+struct {
+    char *configDir;
+    char *modelDir;
+    char *userDir;
+} typedef Parameters_t;
diff --git a/include/model.h b/include/model.h
index 49a3c02..a42fd6f 100644
--- a/include/model.h
+++ b/include/model.h
@@ -23,7 +23,7 @@
     #include "../include/base.h"
 #endif
 
-void ModelSystemInit(void);
+void ModelSystemInit(Parameters_t *parameters);
 
 void ModelSystemDestroy(void);
 
diff --git a/src/cmds.c b/src/cmds.c
index b2d82cd..bb76061 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -179,12 +179,12 @@ CmdModelEnd:
 
 char *CmdShutdown(char *buf, char **argv, Server_t *args)
 {
-    ModelShutdown();
-    strcat(buf, "All model shutted down\n");
-
     args->pleaseStop = true;
     strcat(buf, "Server stopping\n");
 
+    ModelShutdown();
+    strcat(buf, "All model shutted down\n");
+
     return buf;
 }
 
diff --git a/src/localworker.c b/src/localworker.c
index 1931a2d..958bba6 100644
--- a/src/localworker.c
+++ b/src/localworker.c
@@ -48,6 +48,7 @@ static void *workerMain(void *worker)
     printLog("Worker #%lu online\n", args->id);
 
     int size = args->globalDrawingSpace->size;
+
     /* In each cell: the West (left) site is 0, the East (right) site is 1 */
     for (int orig=0; orig < size; orig++){
         int nxt1 = (orig + 1) % size,
diff --git a/src/main.c b/src/main.c
index 3762f50..e1972a2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -23,37 +23,66 @@
 #include "../include/server.h"
 #include "../include/model.h"
 
+static Server_t *server;
 
+void SigIntTermHandler(int signum)
+{
+    server->pleaseStop = true;
+    printLog("Server stopping\n");
+
+    ModelShutdown();
+    printLog("All model shutted down\n");
+}
+
+
+// TODO parse args to discover :
+//      - config files directory
+//      - models & users directories
 int main(int argc, char **argv)
 {
     time_t t;
-    Server_t *server0;
     int returnValue = 0;
 
+    // Get parameters TODO from args
+    Parameters_t *parameters = (Parameters_t*) calloc(sizeof(Parameters_t), 1);
+
+    parameters->configDir = (char*) malloc(strlen("../debian/etc"));
+    strcpy(parameters->configDir, "../debian/etc");
+
+    parameters->modelDir = (char*) malloc(strlen("../debian/var/models"));
+    strcpy(parameters->modelDir, "../debian/etc");
+
+    parameters->userDir = (char*) malloc(strlen("../debian/var/users"));
+    strcpy(parameters->userDir, "../debian/etc");
+
     // Go!
     printLog("Starting gem-graph-server...\n");
 
+    // Register new interrupt handler
+    signal(SIGINT, SigIntTermHandler);
+    signal(SIGTERM, SigIntTermHandler);
+
     // Initializing random generator
     t = time(&t);
     srand((unsigned) t);
 
-    server0 = (Server_t*) calloc(1, sizeof(Server_t));
+    server = (Server_t*) calloc(1, sizeof(Server_t));
 
     // Initializing model system
-    ModelSystemInit();
+    ModelSystemInit(parameters);
 
     // Launching server
-    ServerInit(server0);
+    ServerInit(server);
 
     // Waiting for termination
-    ServerWait(server0);
+    ServerWait(server);
 
     // Exiting
-    returnValue |= server0->returnValue;
-    ServerDestroy(server0);
+    returnValue |= server->returnValue;
+    ServerDestroy(server);
     ModelSystemDestroy();
-    free(server0);
-    server0 = NULL;
+    free(server);
+    server = NULL;
 
     return returnValue;
 }
diff --git a/src/model.c b/src/model.c
index 2685dc5..8f093d5 100644
--- a/src/model.c
+++ b/src/model.c
@@ -182,15 +182,16 @@ void ModelShutdown(void)
     }
 }
 
-void ModelSystemInit(void)
+void ModelSystemInit(Parameters_t *parameters)
 {
     loadedModel = (Model_t**) calloc(1, sizeof(Model_t*));
 
-    // XXX read known models from files
     knownModel = (Model_t**) calloc(1, sizeof(Model_t*));
 
     knownModelSize = 0;
     loadedModelSize = 0;
+
+    printLog("Model system initiated with folder : %s\n", parameters->modelDir);
 }
 
 void ModelSystemDestroy(void)
diff --git a/src/tests/xml b/src/tests/xml
index 04cd32f658a22bee170d4b3b5382a48e984f900b..b0826726346e8356badc37d0491a90faf21a9e8a 100755
GIT binary patch
delta 2161
zcmZ8ieQZ-z6u-A!w?6mPw{E;WS!gRIII(?e$5w}QZ3lC2VVW&C96_WrvQ+Vd$r?0h
z*uthRbD`rXjD!$inFgZ7*?$%=GGii|2%*ss;2(xT^A->{KvNRndG7m|i}&T-bI&=y
z^SkGsckg|Z15_EHsd9eGL9`at1xbule$J)xbS*V<S>k*-y5a+#N?esi*Q%fywUnVv
zLLdE*KjhYZ^AbeM>C*eHnai2O>;71uH?ev8WV|u>a^Z8JSiIgsL{ofoSrqMKy@lC|
z@Xc&J|3=;Ip$dpu%IN{<v<eWnR)K6Shm<u=Ps5zGiH<Wn{Q}x@1nw{f@kAuO(4BM4
zn(WyDyltDEScnxL3-s9**PKHLTdf=4>7kZlf}ZO*W{u)=1*K69l6>@44$~obAY&66
zkMJ6ZOow%8*9D0i_IUJvc0<1u(d}%7h2YB-M5C~pSy|xaU~{ejALkY<%Pz3y>)~48
z8`TvXiXs@#-5b#ArW=WDcp1N$9dorVuotA;@^;zxIgarsBtjAlI<sBHw(Kz&bNJTn
z#E+?#J@gZDx7f9o5P3M<jX-(W_8Jp)*`6|a$aWF^^1xINr%o5UdXa;CZ%D+)G<?k}
zSj<<f{n9|%)#)yc&;<5|J%}Sosa@U^?m`ri2Y>G=kcYy*p`!ROB_)B~54L--iw{+-
zlZP5-<)NrU9<He^V(7C<*F#kum`Zx#JikOdtGtA&fvS=R5xwXAS&}>ne2K8TmHFmv
z0bD~p%WUwwQ%iB`Z`l^a)KB5oQyNVgoS_oOGk-ECn;i|89%wvS<j#^L<N3#@^As=O
z+0S?$FsKo>`x+`U<2q5+SVkYB7-tfFSWG{XoiNB)J<O!K7}>-EvQKe*<3*%qMCG`u
z?2T21#;UW`pk1QTCY|z7dv=AM$VE2Y>-zdwFe{U>lrv_kPeGgW@q9ayOkxs58Havn
zWnGuQ*wxQ;qJ72K3oXOp;wK1+ZD=067;A4H{5$r1Z18@&JnSQAUf)vrK;CoHt~k?I
zoQn$fx$SwK$)3bpZ|?w?`(R!FU#j{Ea+S`i>NhC8C|^Oz&8h0IDBnYQ7v-7Ts#=QQ
z#(PIqSEB5PIrnlp38F``DYsNL1<!hx(pKp92p%7D?7$cjD{_2bSyPy6d9xr7k3j|F
z!?zcXdt7u3e!^aX8BddqAUjQaO4Iq3=HWIEGuscWozsPOMX})(pnezig2%swjzS-f
zRXFO8&?&g)ckvgD(`X*>EbvkU(`}Pni0+oI@}HS^i@_U*ja6sS=LrbV8dzkt6GR6D
zn#I1%`UtrIeSs$W6-=O3L~s`LdEs6_qKAMFmRU=P0<qv;+5wrMKzp$-gNMN&orOTP
zAi9mK$(W3IaA3i!H4dHC0{sZyt(NE!I9}aE%V7@3Pl9KqG=GDeQMaIT<pD7fHFaH%
zVu{?OoOA$R(-hd`)U6u~P#b!AOF1zwMKg9QUN0q<V&a9t8c8(&J1Y$LP9rJ-nHoVf
zFFW%p+mBv{HY2SS#8lMe)a97w6-fdDwLW;Jwj^*JEhV_xDI>SdM!;ReK5kS;+cfA?
zAyzBUrEnDc2n0fcxQS(p4DM1r6a%%kO~VXm{TM^iueJVXW=Y3Gzfi|^{QE?kTACZy
zYzg{<{+e{KuF;Zy=V>>k2{^b~;zx6IE>o&NtDSIjbp^;_2VDYUSmGwxJ&z6dL^#A{
z4J`{J;n4hEGxyvSTn_K1DVVT2p|Cz5cGmOoW4!}L>#I1k&Qp-74{=^&HD2H&O}LLX
zMkMaPzx7BY#3^oVTB4*gh``My#w4yIsvA3?Ef(U;kCT9rSOk}piAA_nm5!JNu>lbw
QUAqb!8$xsoj5I9&7rX>9s{jB1

delta 2012
zcmY*ZeQZ-z6u-A!N1tqK-`er07TWR=oVdQWtduET+d1s3VlpC=#rUx$Lm_^G8@h&t
zF3WUHGud_|LW~K+kfAPSrpBPCp&|0|4+&9BAu2<o>4+jjOeztd=e~E}g7@X!-#zF2
z&bjy8k5d|=M~CR>VsY9|v=-NatQ)JJ6gn2@QpeZ@Sy)n`3rj$xvJf}vQXEn!4RdKf
z4A3{kDX(suM{t>rIbVD>P5Up5{q)ZImXlA6zUx`x{p2GknO3Z*LN>*}l6lbq)|;5F
z8vk=!&%V%fJ?DmmX)%nN7el8x07uN7^i$|EOW>^t(1UDbnMCq3WI2QbI1-7AbV9b`
z5CkmSEhb_nW|*+t6+VqNmZ%s1ncPMjLCYl^vqtedkH|NI^xnB$z?G1zFlUiAjEWkG
z%tUpx>Ok7Kz9asBy&)H4x}GIh1&>rpE-g)6NlLd_t<Ya7!S2ecmF3&CcW@?y&bTgE
z5USzp%DparKAKwLR;F8+4?6SKar+?}g1o)q;XynfwXQ}c<c7`DN{BKN?L$EsvFv2f
zRPL!$a+Y8HI37CQBd9YrPlg3O!4df>jUR4-)uOxgOU|^aGtX!N4PquLB9HXS?aE+u
z7qW<w{iUZ$$wjZAP-;+BwX_Ypla^V?i4pe}CAZ<4l8f7wk??~xjD4!K>t9tJI^G+A
zAH}7%lQ^{-4M*8>N+D3ix;=+R&zxw-xXR#fUM1UK!Wbpy*ouxy7UK=}Un9Li%xD=-
zs$>hFFGuIE*d4=YXYpQ@ni!Q$jc!YDJo`H{a>e(zv^ZsqQ`X~LY|!J_Se&gq&<8Bg
z9OH7o^EjS8tOqLdr1l|+P11)p+*&^_>P;RD*EYYXG>dikwpdvx*De+Mxc4&fI2O@P
zSnF6y?}c{9-3#4l(f8zi7<SY**gPb$W#dTHa}Obj$5Pqv678w%Uy03$>_6?wNP`{K
zk8Z5Lg<EDVEze(ZEUJPwlYQK4m7d$$_v%YKy9vkpyenT}mkw;+15G`DsOnoN+(7&S
zvErJlb|cOrev7zmPE~Ipet2C~owzL(f2wLDVmDm&uA=)v@X40qRaMPE)VG`lpvx!u
zs?m23`jAA8{dLm=)s?1n)dGA@ZdC2Y|9Lpz^U%HU8TO~)f-h;A!C5HY==T=Z8_&>q
zcI+rvV-K4(Lp~4G@1aic`Jbj47{KvOnDEEw5xDI4h|~NH8qcQ)q8!8JZjwDT4LjsZ
z`0(}C0bPMpt_&}IhL)k3EFft}1SN<E7nuc8gdIVNPD3`B#FBJQ8&3r5%r@c#8j|T0
z1Va)nV_yePh0?SQ3ZXhPD^qi!q-(~gI(!Pe@mP9lh#fYqkz7W$+(;rgpjhIz!N3}s
zj>5-ll9=n?I9?C+jq-c}Huyil_QtpI`p~e1^SZ)Gx&^wzlFKMk25&Q#iCPm|@mN^K
zTnb?cUJKiWLEKioq|TvNTioF5coD&lt9coGYbBheX>G&m8ZzzBtxt0D&lsZ?Gup=s
zrgjC;b`>r+O0*UV=<A0~5y|xsTLsJAsk<6y`nbmF(fV=5q!U_yjA`<j$Tu|K-PCHz
zPu}mNnC6-FvS=Kffj2>{aDY4N7SpVVVl&VUsi+L=qIMXL281HF7NHQ0%wHGd+8hC)
zd5<-t`Qt+gHcK$sED8tt86Jc}a|Dhy+rb(O2u_}b6B4l`-hymQ7N)$q?-Ueb5uwbb
za-PPMY~`thEEt>I1_OzRU{wB2C?sO+AX{R>a6k`Igj5SM*qy+37P2i7+{i-9s{a5J
CarT@5

diff --git a/src/tests/xml.c b/src/tests/xml.c
index bcba914..6c5eb80 100644
--- a/src/tests/xml.c
+++ b/src/tests/xml.c
@@ -8,8 +8,8 @@ void parseStory (xmlDocPtr doc, xmlNodePtr cur)
 {
     cur = cur->xmlChildrenNode;
     while (cur != NULL) {
-        if ((!xmlStrcmp(cur->name, (const xmlChar *)"keyword"))) {
-            printf("keyword: %s\n", xmlNodeListGetString(doc, cur->xmlChildrenNode, 1));
+        if ((!xmlStrcmp(cur->name, (const xmlChar *)"authors"))) {
+            printf("%s\n", xmlNodeListGetString(doc, cur->xmlChildrenNode, 1));
         }
             cur = cur->next;
         }
@@ -41,7 +41,7 @@ static void parseDoc(char *docname)
     cur = cur->xmlChildrenNode;
     while (cur != NULL) {
         if ((!xmlStrcmp(cur->name, (const xmlChar *)"storyinfo"))){
-            parseStory (doc, cur);
+            parseStory(doc, cur);
         }
         cur = cur->next;
     }