git.ucc.asn.au
/
matches
/
MCTX3420.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git
[matches/MCTX3420.git]
/
server
/
main.c
diff --git
a/server/main.c
b/server/main.c
index
ec21a25
..
c032eb1
100644
(file)
--- a/
server/main.c
+++ b/
server/main.c
@@
-1,14
+1,17
@@
/**
* @file main.c
/**
* @file main.c
- * @
purpose
main and its helper functions, signal handling and cleanup functions
+ * @
brief
main and its helper functions, signal handling and cleanup functions
*/
// --- Custom headers --- //
#include "common.h"
#include "options.h"
#include "sensor.h"
*/
// --- Custom headers --- //
#include "common.h"
#include "options.h"
#include "sensor.h"
+#include "actuator.h"
+#include "control.h"
// --- Standard headers --- //
// --- Standard headers --- //
+#include <syslog.h> // for system logging
#include <signal.h> // for signal handling
// --- Variable definitions --- //
#include <signal.h> // for signal handling
// --- Variable definitions --- //
@@
-41,7
+44,7
@@
void SignalHandler(int signal)
// At the moment just always exit.
// Call `exit` so that Cleanup will be called to... clean up.
Log(LOGWARN, "Got signal %d (%s). Exiting.", signal, strsignal(signal));
// At the moment just always exit.
// Call `exit` so that Cleanup will be called to... clean up.
Log(LOGWARN, "Got signal %d (%s). Exiting.", signal, strsignal(signal));
- Thread_QuitProgram(false);
+
//exit(signal);
}
//exit(signal);
}
@@
-66,6
+69,9
@@
int main(int argc, char ** argv)
{
ParseArguments(argc, argv);
{
ParseArguments(argc, argv);
+ //Open the system log
+ openlog("mctxserv", LOG_PID | LOG_PERROR, LOG_USER);
+ Log(LOGINFO, "Server started");
// signal handler
//TODO: Make this work
/*
// signal handler
//TODO: Make this work
/*
@@
-75,15
+81,22
@@
int main(int argc, char ** argv)
signal(signals[i], SignalHandler);
}
*/
signal(signals[i], SignalHandler);
}
*/
- Sensor_Spawn();
+ Sensor_Init();
+ Actuator_Init();
+ //Sensor_StartAll("test");
+ //Actuator_StartAll("test");
+ const char *ret;
+ if ((ret = Control_SetMode(CONTROL_START, "test")) != NULL)
+ Fatal("Control_SetMode failed with '%s'", ret);
// run request thread in the main thread
FCGI_RequestLoop(NULL);
// run request thread in the main thread
FCGI_RequestLoop(NULL);
- // Join the dark side, Luke
- // *cough*
- // Join the sensor threads
- Sensor_Join();
+ if ((ret = Control_SetMode(CONTROL_STOP, "test")) != NULL)
+ Fatal("Control_SetMode failed with '%s'", ret);
+ //Sensor_StopAll();
+ //Actuator_StopAll();
+
Cleanup();
return 0;
}
Cleanup();
return 0;
}
UCC
git Repository :: git.ucc.asn.au