* Centralized all shared memory handling in shmget.c.

* Disentangled telemetry structure and shared memory handling.

diff --git a/Makefile b/Makefile
index e49e4c63531c84c767104069f2f0bd07997f4abd..c630435358e35a479a7678f32afe198179f29758 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -23,12 +23,14 @@ else
   LIB_NAME_OPTION=-soname
 endif
 
+PLUGIN_SRC := telemetry.cpp shmget.c
+
 .PHONY: all clean
 
 all: telehttpd telelogger telemetry.so
 
-telemetry.so: telemetry.cpp $(SDK_HEADERS)
-       g++ -o $@ -fPIC -Wall --shared -Wl,$(LIB_NAME_OPTION),$@ $(SDK_INCLUDES) telemetry.cpp
+telemetry.so: $(PLUGIN_SRC) $(SDK_HEADERS)
+       g++ -o $@ -fPIC -Wall --shared -Wl,$(LIB_NAME_OPTION),$@ $(SDK_INCLUDES) $(PLUGIN_SRC)
 
 telehttpd: telehttpd.o shmget.o net.o fserv.o
        $(CC) $(LDFLAGS) -o $@ -pthread $^

diff --git a/shmget.c b/shmget.c
index c604be16eb34023e0d2893c830c94c24b301cfac..5700c2d77a4a915154b86899421395da92226d21 100644 (file)
--- a/shmget.c
+++ b/shmget.c
@@ -15,21 +15,44 @@
 #include "shmget.h"
 #include "log.h"
 
-struct telemetry_state_t *telemetry;
 
-int init_shm(void) {
+static void *init_shm_(int key, size_t size, int fl1, int fl2)
+{
     int shmid;
+    void *shmhnd;
 
-    shmid = shmget(SHM_KEY, sizeof *telemetry,  0);
+    shmid = shmget(key, size, fl1);
     if ( 0 > shmid ) {
         EPRINT( "shmget failed\n" );
-        return -1;
+        return NULL;
+    }
+    shmhnd = shmat(shmid, NULL, fl2);
+    if ( (void *)-1 == shmhnd ) {
+        EPRINT( "shmat failed\n" );
+        return NULL;
     }
-    telemetry = shmat(shmid, NULL, SHM_RDONLY);
-    if ((void *)-1 == telemetry) {
+    return shmhnd;
+}
+
+void *init_shmput(int key, size_t size)
+{
+    return init_shm_( key, size, IPC_CREAT | IPC_EXCL | 0600, 0 );
+}
+
+void *init_shmget(int key, size_t size) {
+    return init_shm_( key, size, 0, SHM_RDONLY );
+}
+
+int release_shm(int key, void *p)
+{
+    int shmid;
+
+    shmid = shmget(key, 0,  0);
+    if ( 0 > shmid ) {
         EPRINT( "shmget failed\n" );
-        shmdt(telemetry);
-        return -2;
+        return -1;
     }
+    shmdt( p );
+    shmctl( shmid, IPC_RMID, NULL );
     return 0;
 }

diff --git a/shmget.h b/shmget.h
index 4082785c40818c59d1563ab5713fb7190b564d27..445b1721af55d7ee0f751dd93f83929e568bc49a 100644 (file)
--- a/shmget.h
+++ b/shmget.h
@@ -1,11 +1,16 @@
 #ifndef SHMGET_H_
 #define SHMGET_H_
 
-#include "telemetry.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-extern struct telemetry_state_t *telemetry;
+extern void *init_shmput( int key, size_t size );
+extern void *init_shmget( int key, size_t size );
+extern int release_shm( int key, void *p );
 
-extern int init_shm(void);
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* SHMGET_H_ */
-

diff --git a/telehttpd.c b/telehttpd.c
index 6b496c7e0a08051b2a820dd1c29a4d97b50bfc86..4c095cf0b1bbc68e3dcc9b9707f31f12c11146ed 100644 (file)
--- a/telehttpd.c
+++ b/telehttpd.c
@@ -18,7 +18,9 @@
 #include "net.h"
 #include "log.h"
 #include "shmget.h"
+#include "telemetry.h"
 
+static struct telemetry_state_t *telemetry;
 
 struct {
     int port;
@@ -282,7 +284,7 @@ int main(int argc, char *argv[]) {
     if ( 0 != config( argc, argv ) )
         exit( EXIT_FAILURE);
 
-    if ( 0 != init_shm() )
+    if ( NULL == ( telemetry = init_shmget( TELE_SHM_KEY, sizeof *telemetry ) ) )
         exit( EXIT_FAILURE);
 
     if ( 0 != serve_http() )

diff --git a/telelogger.c b/telelogger.c
index bd0d561b0e7fc1b7d15034eb652e3f828bc2e7f5..9544418879a804252d2e4be4c0ba3c07608a01f6 100644 (file)
--- a/telelogger.c
+++ b/telelogger.c
@@ -7,6 +7,10 @@
 #include <unistd.h>
 
 #include "shmget.h"
+#include "telemetry.h"
+
+static struct telemetry_state_t *telemetry;
+
 
 static const char *s2hms( int s ) {
     static char buf[50];
@@ -66,7 +70,7 @@ static int log_console(void) {
 }
 
 int main(int argc, char *argv[]) {
-    if ( 0 != init_shm() )
+    if ( NULL == ( telemetry = init_shmget( TELE_SHM_KEY, sizeof *telemetry ) ) )
         exit( EXIT_FAILURE);
     if ( 0 != log_console() )
         exit( EXIT_FAILURE);

diff --git a/telemetry.cpp b/telemetry.cpp
index bb8cbedaca04a5e2aa73529fba863de35be1b057..c9ffae70a49da68884a6a15e0b29db830451a6a5 100644 (file)
--- a/telemetry.cpp
+++ b/telemetry.cpp
@@ -30,49 +30,43 @@
 
 #include <unistd.h>
 #include <signal.h>
-#include <sys/ipc.h>
-#include <sys/shm.h>
 
 #define UNUSED(x)
 
-/**
- * @brief Last timestamp we received.
- */
-scs_timestamp_t last_timestamp = static_cast<scs_timestamp_t>(-1);
-
 /**
  * @brief Combined telemetry data and shared memory management.
  */
 
 #include "telemetry.h"
-struct telemetry_state_t *telemetry;
+#include "shmget.h"
 
-static int shmid = -1;
+static struct telemetry_state_t *telemetry = NULL;
 
 static bool init_shm(void)
 {
-    if ( 0 < shmid )
-        return true;
-    shmid = shmget(SHM_KEY, sizeof *telemetry,  IPC_CREAT | IPC_EXCL | 0600);
-    if ( 0 > shmid )
-        return false;
-    void *shmhnd;
-    if ( (void *)-1 == (shmhnd = shmat(shmid, NULL, 0)) )
-        return false;
-    telemetry = static_cast<struct telemetry_state_t *>(shmhnd);
-    memset(telemetry, 0, sizeof *telemetry);
-    return true;
+    if ( NULL == telemetry ) {
+        void *p;
+        p = init_shmput( TELE_SHM_KEY, sizeof *telemetry );
+        telemetry = static_cast<struct telemetry_state_t *>(p);
+    }
+    assert( NULL != telemetry );
+    return NULL != telemetry;
 }
 
-static void release_shm(void)
+static void drop_shm(void)
 {
-    if ( 0 < shmid) {
-        shmdt(telemetry);
-        shmctl(shmid, IPC_RMID, NULL);
-        shmid = -1;
+    if ( NULL != telemetry ) {
+        release_shm( TELE_SHM_KEY, telemetry );
+        telemetry = NULL;
     }
 }
 
+/**
+ * @brief Last timestamp we received.
+ */
+scs_timestamp_t last_timestamp = static_cast<scs_timestamp_t>(-1);
+
+
 /**
  * @brief Function writting message to the game internal log.
  */
@@ -431,7 +425,7 @@ SCSAPI_VOID scs_telemetry_shutdown(void)
     // Any cleanup needed. The registrations will be removed automatically
     // so there is no need to do that manually.
 
-    release_shm();
+    drop_shm();
 }
 
 // Cleanup
@@ -444,7 +438,7 @@ BOOL APIENTRY DllMain(
 )
 {
     if (reason_for_call == DLL_PROCESS_DETACH) {
-        release_shm();
+        drop_shm();
     }
     return TRUE;
 }
@@ -453,6 +447,6 @@ BOOL APIENTRY DllMain(
 #ifdef __linux__
 void __attribute__ ((destructor)) unload(void)
 {
-    release_shm();
+    drop_shm();
 }
 #endif

diff --git a/telemetry.h b/telemetry.h
index 7048c4759f3777c7140b191d8232091646eac943..f359ca85ce31518d4502063229e92fc5d97c6ffb 100644 (file)
--- a/telemetry.h
+++ b/telemetry.h
@@ -1,7 +1,7 @@
 #ifndef TELEMETRY_H_
 #define TELEMETRY_H_
 
-#define SHM_KEY 0xecc11
+#define TELE_SHM_KEY 0xecc11
 
 struct telemetry_state_t {
     char game_id[10];