Code clean up

diff --git a/shm_utils/mon-umurmurd/CHANGES b/shm_utils/mon-umurmurd/CHANGES
index 8ba9821f321de455eb96c6015b362ffeee71afa8..93ead4acdcd56e980c5427ababfb49d7d45b4f69 100644 (file)
--- a/shm_utils/mon-umurmurd/CHANGES
+++ b/shm_utils/mon-umurmurd/CHANGES
@@ -1,5 +1,5 @@
 * Added more client data 99% of the useful client data shown\r
-* removed memcpys  (requested by fatbob)\r
+* rework Sharedmemory_update() to not use memcpy (requested by fatbob)\r
 \r
 \r
 * Using a more modern unix sharedmemory API. this requires linking with librt.so  (requested by fatbob)\r

diff --git a/shm_utils/mon-umurmurd/README.md b/shm_utils/mon-umurmurd/README.md
index eaaeb2b479afcded8802c8de0703b9aa9d0d5f3d..72473de74cf7f088d4d8c207a40b7c6f5e327a38 100644 (file)
--- a/shm_utils/mon-umurmurd/README.md
+++ b/shm_utils/mon-umurmurd/README.md
@@ -5,5 +5,3 @@ outputs server/client data to term useing the sharedmemory API added to umurmur
 \r
 make\r
 ./mon-umurmurd\r
-\r
-\r

diff --git a/src/sharedmemory.c b/src/sharedmemory.c
index 46cdc45340a22857dc06d0b104c921b394ef90b7..0421fe059fe59b56ca515cd4ed259b9cd4c438f1 100644 (file)
--- a/src/sharedmemory.c
+++ b/src/sharedmemory.c
@@ -7,33 +7,29 @@ void Sharedmemory_init(void)
   int bindport = getIntConf(BINDPORT);                //MJP BUG commandline option for address and port dont work this way going to have \r
   int server_max_clients = getIntConf(MAX_CLIENTS);   //to bring them across as prameters to Sharedmemory_init(void)\r
   int shmptr_size =  sizeof( shm_t  ) + (sizeof( shmclient_t ) * server_max_clients);\r
-  \r
-\r
 \r
   sprintf( shm_file_name, "umurmurd:%i", bindport );\r
+  Log_info("SHM_API: shm_fd=\"%s\"", shm_file_name  );\r
 \r
-  Log_info("SHM_FD: %s", shm_file_name  );\r
-\r
-shm_fd = shm_open( shm_file_name, O_CREAT | O_RDWR, 0666 );\r
-if(shm_fd == -1)\r
-{\r
-    fprintf(stderr, "Open failed:%s\n", strerror(errno)); //MJP BUG make this Log_ calls once I get this working\r
-    exit(1);\r
-}  \r
-\r
-if( ftruncate( shm_fd, shmptr_size ) == -1 )\r
-{\r
-    fprintf(stderr, "ftruncate : %s\n", strerror(errno));  //MJP BUG make this Log_ calls once I get this working\r
-    exit(1);\r
-}\r
+               shm_fd = shm_open( shm_file_name, O_CREAT | O_RDWR, 0666 );\r
+                               if(shm_fd == -1)\r
+                               {\r
+                               Log_fatal( "SHM_API: Open failed:%s\n", strerror(errno));\r
+                               exit(1);\r
+                               }  \r
 \r
-  shmptr = mmap(0, shmptr_size, PROT_READ | PROT_WRITE, MAP_SHARED, shm_fd, 0);\r
-  if (shmptr == (void *) -1) \r
-  {\r
-     fprintf(stderr, "mmap failed : %s\n", strerror(errno)); //MJP BUG make this Log_ calls once I get this working\r
-     exit(1);\r
-  } \r
+                               if( ftruncate( shm_fd, shmptr_size ) == -1 )\r
+                               {\r
+                               Log_fatal( "SHM_API: ftruncate : %s\n", strerror(errno));  \r
+                               exit(1);\r
+                               }\r
 \r
+                       shmptr = mmap(0, shmptr_size, PROT_READ | PROT_WRITE, MAP_SHARED, shm_fd, 0);\r
+                       if (shmptr == (void *) -1) \r
+                       {\r
+                               Log_fatal( "SHM_API: mmap failed : %s\n", strerror(errno));\r
+                               exit(1);\r
+                       } \r
 \r
   memset( shmptr, 0, shmptr_size );\r
                                        \r