From 567e7bba26bb8fe485be6c2ddfaaf8ab77eb6141 Mon Sep 17 00:00:00 2001
From: looper3339 <736321739@qq.com>
Date: 星期一, 09 八月 2021 21:46:05 +0800
Subject: [PATCH] fjt fix req-rep error

---
 lib/libusgcommon.a               |    0 
 src/queue/lock_free_queue.h      |    9 --
 src/shm/mm.cpp                   |    1 
 src/shm/hashtable.h              |    4 -
 src/svsem.cpp                    |   13 +---
 lib/libusgcommon.so              |    0 
 src/socket/shm_socket.cpp        |   34 +++++------
 src/socket/shm_mod_socket.h      |    2 
 shm_util/shm_map.cpp             |    9 +-
 src/queue/shm_queue.h            |    4 -
 src/socket/bus_server_socket.cpp |   26 ++++++--
 test_socket/bus_test.cpp         |    3 
 src/shm/shm_mm.h                 |   10 +--
 src/CMakeLists.txt               |   14 ----
 src/socket/shm_mod_socket.cpp    |   10 ++-
 test_queue/test_queue.cpp        |    2 
 src/shm/hashtable.cpp            |   33 ++++++----
 17 files changed, 75 insertions(+), 99 deletions(-)

diff --git a/lib/libusgcommon.a b/lib/libusgcommon.a
index 4bc7434..9321dab 100644
--- a/lib/libusgcommon.a
+++ b/lib/libusgcommon.a
Binary files differ
diff --git a/lib/libusgcommon.so b/lib/libusgcommon.so
index 9471178..014326e 100644
--- a/lib/libusgcommon.so
+++ b/lib/libusgcommon.so
Binary files differ
diff --git a/shm_util/shm_map.cpp b/shm_util/shm_map.cpp
index d9dffa4..f8bc9dc 100644
--- a/shm_util/shm_map.cpp
+++ b/shm_util/shm_map.cpp
@@ -3,13 +3,13 @@
  */
 #include <assert.h>
 #include "net_mod_server_socket_wrapper.h"
-#include "net_mod_socket_wrapper.h"
-#include "bus_server_socket_wrapper.h"
+//#include "net_mod_socket_wrapper.h"
+//#include "bus_server_socket_wrapper.h"
 
 #include "shm_mm_wrapper.h"
 #include "usg_common.h"
 #include <getopt.h>
-#include "logger_factory.h"
+//#include "logger_factory.h"
 
 
 static void usage(const char *name) {
@@ -25,7 +25,6 @@
   	printf("%10d \t %10d\n", it->first, it->second.status);
     
   }
-
 }
 
 
@@ -51,4 +50,4 @@
 	
 
 
-}
\ No newline at end of file
+}
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 407ac67..9026d92 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -52,20 +52,6 @@
 
 target_link_libraries(shm_queue PUBLIC  ${EXTRA_LIBS} )
 
-
-# generate md5
-if (BUILD_SHARED_LIBS)
-  add_custom_command(
-    OUTPUT ${PROJECT_BINARY_DIR}/lib/libshm_queue.so.md5
-    COMMAND md5sum  ${PROJECT_BINARY_DIR}/lib/libshm_queue.so >  ${PROJECT_BINARY_DIR}/lib/libshm_queue.so.md5
-    DEPENDS ${PROJECT_BINARY_DIR}/lib/libshm_queue.so
-    COMMENT "Generate libshm_queue.so.md5"
-    VERBATIM
-    )
-    
- add_custom_target("genmd5" ALL DEPENDS ${PROJECT_BINARY_DIR}/lib/libshm_queue.so.md5)
-endif()
-
 # install rules
 install(TARGETS shm_queue  DESTINATION lib)
 install(FILES 
diff --git a/src/queue/lock_free_queue.h b/src/queue/lock_free_queue.h
index f74f4bc..f536208 100644
--- a/src/queue/lock_free_queue.h
+++ b/src/queue/lock_free_queue.h
@@ -177,7 +177,6 @@
   typename Allocator,
   template<typename T, typename AT> class Q_TYPE>
 LockFreeQueue<ELEM_T, Allocator, Q_TYPE>::LockFreeQueue(size_t qsize): m_qImpl(qsize) {
-  // std::cout << "LockFreeQueue init reference=" << reference << std::endl;
   if (sem_init(&slots, 1, qsize) == -1)
     err_exit(errno, "LockFreeQueue sem_init");
   if (sem_init(&items, 1, 0) == -1)
@@ -212,7 +211,6 @@
   typename Allocator,
   template<typename T, typename AT> class Q_TYPE>
 LockFreeQueue<ELEM_T, Allocator, Q_TYPE>::~LockFreeQueue() {
-  // LoggerFactory::getLogger()->debug("LockFreeQueue desctroy");
   if (sem_destroy(&slots) == -1) {
     err_exit(errno, "LockFreeQueue sem_destroy");
   }
@@ -251,7 +249,6 @@
   typename Allocator,
   template<typename T, typename AT> class Q_TYPE>
 int LockFreeQueue<ELEM_T, Allocator, Q_TYPE>::push(const ELEM_T &a_data, const struct timespec *timeout, int flag) {
-  // LoggerFactory::getLogger()->debug("==================LockFreeQueue push before\n");
   // sigset_t mask_all, pre;
   // sigfillset(&mask_all);
 
@@ -275,7 +272,6 @@
   if (m_qImpl.push(a_data)) {
     psem_post(&items);
     // sigprocmask(SIG_SETMASK, &pre, NULL);
-    // LoggerFactory::getLogger()->debug("==================LockFreeQueue push after\n");
     return 0;
   }
 
@@ -288,7 +284,6 @@
   typename Allocator,
   template<typename T, typename AT> class Q_TYPE>
 int LockFreeQueue<ELEM_T, Allocator, Q_TYPE>::pop(ELEM_T &a_data, const struct timespec *timeout, int flag) {
-  // LoggerFactory::getLogger()->debug("==================LockFreeQueue pop before....");
 
   // sigset_t mask_all, pre;
   // sigfillset(&mask_all);
@@ -300,8 +295,7 @@
       goto LABEL_FAILTURE;
     }
   } else if ((flag & BUS_TIMEOUT_FLAG) == BUS_TIMEOUT_FLAG && timeout != NULL) {
-    // LoggerFactory::getLogger()->debug("==================LockFreeQueue pop before. flag=%d ,  %d\n", flag, timeout->tv_sec);
-    if (psem_timedwait(&items, timeout) == -1) {
+   if (psem_timedwait(&items, timeout) == -1) {
       goto LABEL_FAILTURE;
     }
   } else {
@@ -313,7 +307,6 @@
   if (m_qImpl.pop(a_data)) {
     psem_post(&slots);
     // sigprocmask(SIG_SETMASK, &pre, NULL);
-    // LoggerFactory::getLogger()->debug("==================LockFreeQueue pop after\n");
     return 0;
   }
 
diff --git a/src/queue/shm_queue.h b/src/queue/shm_queue.h
index 0921af3..74b9b33 100644
--- a/src/queue/shm_queue.h
+++ b/src/queue/shm_queue.h
@@ -87,19 +87,15 @@
 template <typename ELEM_T>
 bool SHMQueue<ELEM_T>::bind(int key, bool force)  {
 
-
-  hashtable_lock(hashtable);
   void *tmp_ptr = hashtable_get(hashtable, key);
   if (tmp_ptr == NULL || tmp_ptr == (void *)1 || force) {
     queue = new LockFreeQueue<ELEM_T, SHM_Allocator>(mqsize);
     hashtable_put(hashtable, key, (void *)queue);
     mkey = key;
     owner = true;
-    hashtable_unlock(hashtable);
     return true;
   }
   
-  hashtable_unlock(hashtable);
   return  false;
 }
 
diff --git a/src/shm/hashtable.cpp b/src/shm/hashtable.cpp
index e435172..c4a81fc 100755
--- a/src/shm/hashtable.cpp
+++ b/src/shm/hashtable.cpp
@@ -138,13 +138,32 @@
 }
 
 void *hashtable_get(hashtable_t *hashtable, int key) {
+  int rv;
+
+  if((rv = svsem_wait(hashtable->mutex)) != 0) {
+    LoggerFactory::getLogger()->error(errno, "hashtable_get\n");
+  }
   void * res = _hashtable_get(hashtable, key);
+
+  if((rv = svsem_post(hashtable->mutex)) != 0) {
+    LoggerFactory::getLogger()->error(errno, "hashtable_get\n");
+  }
   return res;
 }
 
 void hashtable_put(hashtable_t *hashtable, int key, void *value) {
+  int rv;
+
+  if((rv = svsem_wait(hashtable->mutex)) != 0) {
+    LoggerFactory::getLogger()->error(errno, "hashtable_put\n");
+  }
   _hashtable_put(hashtable, key, value); 
   hashtable->queueCount++;
+
+  if((rv = svsem_post(hashtable->mutex)) != 0) {
+    LoggerFactory::getLogger()->error(errno, "hashtable_put\n");
+  }
+
 }
 
 bool hashtable_check_put(hashtable_t *hashtable, int key, void *value, bool overwrite) {
@@ -249,17 +268,6 @@
   return keyset;
 }
 
-
-
-int hashtable_lock(hashtable_t *hashtable) {
-  return svsem_wait(hashtable->mutex);
-}
-
-int hashtable_unlock(hashtable_t *hashtable) {
-  return svsem_post(hashtable->mutex);
-}
-
-
 void hashtable_removeall(hashtable_t *hashtable)
 {
   tailq_entry_t *item;
@@ -294,7 +302,6 @@
 {
 
   return key % MAPSIZE;
-  /*printf("hashfun = %ld\n", code);*/
 }
 
 /**
@@ -317,4 +324,4 @@
     }
     printf("\n");
   }
-}
\ No newline at end of file
+}
diff --git a/src/shm/hashtable.h b/src/shm/hashtable.h
index 90043c3..6c3cd27 100755
--- a/src/shm/hashtable.h
+++ b/src/shm/hashtable.h
@@ -33,10 +33,6 @@
 
 void *hashtable_remove(hashtable_t *hashtable, int key);
 void hashtable_removeall(hashtable_t *hashtable);
-
-int hashtable_lock(hashtable_t *hashtable);
-int hashtable_unlock(hashtable_t *hashtable);
-
 int hashtable_get_queue_count(hashtable_t *hashtable) ;
 /** 
  * 閬嶅巻hash_table
diff --git a/src/shm/mm.cpp b/src/shm/mm.cpp
index 3cdd3a2..f23fa08 100644
--- a/src/shm/mm.cpp
+++ b/src/shm/mm.cpp
@@ -113,7 +113,6 @@
 
   newsize = ALIGN(size +  (SIZE_T_SIZE << 1) +  (PTR_SIZE << 1) );
 
-    //fprintf(stderr, "mm_malloc : size=%u\n", size);
   /* Search the free list for a fit */
   SemUtil::dec(mutex);
   if ((ptr = find_fit(newsize)) != NULL)
diff --git a/src/shm/shm_mm.h b/src/shm/shm_mm.h
index 18c5370..5339d8a 100644
--- a/src/shm/shm_mm.h
+++ b/src/shm/shm_mm.h
@@ -30,16 +30,14 @@
 
 template <typename T>
 T* shm_mm_attach(int key) {
-	void *ptr;
-	// T* tptr;
-	hashtable_t *hashtable = mm_get_hashtable();
+  void *ptr;
+  // T* tptr;
+  hashtable_t *hashtable = mm_get_hashtable();
   ptr = hashtable_get(hashtable, key);
-// printf("shm_mm_malloc_by_key  malloc before %d, %p\n", key, ptr);
   if(ptr == NULL || ptr == (void *)1 ) {
     ptr = mm_malloc(sizeof(T));
     hashtable_put(hashtable, key, ptr);
     new(ptr) T;
-// printf("shm_mm_malloc_by_key  use new %d, %p\n", key, ptr);
   }
   return (T*)ptr; 
 }
@@ -51,4 +49,4 @@
 
 int shm_mm_alloc_key();
 
-#endif 
\ No newline at end of file
+#endif 
diff --git a/src/socket/bus_server_socket.cpp b/src/socket/bus_server_socket.cpp
index 657941b..7a45696 100644
--- a/src/socket/bus_server_socket.cpp
+++ b/src/socket/bus_server_socket.cpp
@@ -39,7 +39,6 @@
 				subscripter_set = map_iter->second;
 				if(subscripter_set != NULL && (set_iter = subscripter_set->find(key) ) != subscripter_set->end()) {
 					subscripter_set->erase(set_iter);
-// printf("remove_subscripter %s, %d\n", map_iter->first, key);
 					count++;
 				}
 			}
@@ -201,7 +200,6 @@
 		subscripter_set = map_iter->second;
 		for(set_iter = subscripter_set->begin(); set_iter != subscripter_set->end(); set_iter++) {
 			send_key = *set_iter;
-// logger->debug("_proxy_pub send before %d \n", send_key);
 			rv = shm_sendto(shm_socket, buf, size, send_key, &timeout, BUS_TIMEOUT_FLAG);
 			if(rv == 0) {
 				continue;
@@ -232,26 +230,28 @@
 	char resp_buf[128];
 	bus_head_t head;
 
+  int rv;
+  char send_buf[512] = { 0x00 };
+
 	const char *topic_delim = ",";
-// logger.debug("_run_proxy_ server receive before\n");
+
 	while(shm_recvfrom(shm_socket, (void **)&buf, &size, &key) == 0) {
-// logger.debug("_run_proxy_ server recvfrom %d after: %s \n", key, buf);
 		head = ShmModSocket::decode_bus_head(buf);
 		topics = buf + BUS_HEAD_SIZE;
 		action = head.action;
-// logger.debug("_run_proxy_ : %s\n", action);
+
 		if(strcmp(action, "sub") == 0) {
 			// 璁㈤槄鏀寔澶氫富棰樿闃�
 			topic = strtok(topics, topic_delim);
-// logger.debug("_run_proxy_ topic = %s\n", topic);
 		  while(topic) {
+
        _proxy_sub(trim(topic, 0), key);
         topic =  strtok(NULL, topic_delim);
 		  }
 
 		} 
 		else if(strcmp(action, "desub") == 0) {
-// logger.debug("desub topic=%s,%s,%d\n", topics, trim(topics, 0), strcmp(trim(topics, 0), ""));
+
 			if(strcmp(trim(topics, 0), "") == 0) {
 				// 鍙栨秷鎵�鏈夎闃�
 				_proxy_desub_all(key);
@@ -259,6 +259,7 @@
 			 
 				topic = strtok(topics, topic_delim);
 			  while(topic) {
+
 	       _proxy_desub(trim(topic, 0), key);
 	        topic =  strtok(NULL, topic_delim);
 			  }
@@ -270,7 +271,16 @@
 			_proxy_pub(topics, content, head.content_size, key);
 
 		}  
-		else if(strcmp(action, "stop") == 0) {
+		else if (strncmp(buf, "request", strlen("request")) == 0) {
+      sprintf(send_buf, "%4d", key);
+      strncpy(send_buf + 4, buf, (sizeof(send_buf) - 4) >= (strlen(buf) + 1) ? strlen(buf) : (sizeof(send_buf) - 4));
+      
+      rv = shm_sendto(shm_socket, send_buf, strlen(send_buf) + 1, key);
+      if(rv != 0) {
+        logger->error( "BusServerSocket::_run_proxy_ : requst answer fail!\n");
+      }
+    }
+    else if(strcmp(action, "stop") == 0) {
 			logger->info( "Stopping Bus...");			
 			free(buf);
 			break;
diff --git a/src/socket/shm_mod_socket.cpp b/src/socket/shm_mod_socket.cpp
index 466d0b5..abd9477 100644
--- a/src/socket/shm_mod_socket.cpp
+++ b/src/socket/shm_mod_socket.cpp
@@ -10,7 +10,6 @@
 }
 
 ShmModSocket::~ShmModSocket() {
-  // logger->debug("Close ShmModSocket...\n");
 	struct timespec timeout = {1, 0};
 	if(bus_set != NULL) {
 		for(auto bus_iter = bus_set->begin(); bus_iter != bus_set->end(); bus_iter++) {
@@ -216,6 +215,7 @@
   int buf_size;
   char *buf;
   int  max_buf_size;
+  void *buf_ptr;
   if((buf = (char *) malloc(MAXBUF)) == NULL) {
     LoggerFactory::getLogger()->error(errno, "ShmModSocket::get_bus_sendbuf malloc");
     exit(1);
@@ -234,13 +234,15 @@
     }
   }
 
-  memcpy(buf, ShmModSocket::encode_bus_head(request_head), BUS_HEAD_SIZE);
+  buf_ptr = ShmModSocket::encode_bus_head(request_head);
+  memcpy(buf, buf_ptr, BUS_HEAD_SIZE);
   if(topic_size != 0 ) 
     memcpy(buf + BUS_HEAD_SIZE, topic_buf, topic_size);
   if(content_size != 0)
  	 memcpy(buf + BUS_HEAD_SIZE + topic_size, content_buf, content_size);
  
   *retbuf = buf;
+  free(buf_ptr);
   return buf_size;
 }
 
@@ -259,7 +261,7 @@
   tmp_ptr += sizeof(head.action);
   PUT(tmp_ptr, htonl(head.topic_size));
 
-  tmp_ptr += 4;
+  tmp_ptr += sizeof(head.topic_size);
   PUT(tmp_ptr, htonl(head.content_size));
   
   return headbs;
@@ -274,7 +276,7 @@
   tmp_ptr += sizeof(head.action);
   head.topic_size = ntohl(GET(tmp_ptr));
 
-  tmp_ptr += 4;
+  tmp_ptr += sizeof(head.topic_size);
   head.content_size = ntohl(GET(tmp_ptr));
  
   return head;
diff --git a/src/socket/shm_mod_socket.h b/src/socket/shm_mod_socket.h
index 0c65f52..9890aef 100644
--- a/src/socket/shm_mod_socket.h
+++ b/src/socket/shm_mod_socket.h
@@ -11,7 +11,7 @@
 #include <set>
 #include "socket_def.h"
 
-#define BUS_HEAD_SIZE (64 + 2 * sizeof(uint32_t))
+#define BUS_HEAD_SIZE sizeof(bus_head_t)
 class BusServerSocket;
 
 struct bus_head_t
diff --git a/src/socket/shm_socket.cpp b/src/socket/shm_socket.cpp
index 8025564..918aef6 100644
--- a/src/socket/shm_socket.cpp
+++ b/src/socket/shm_socket.cpp
@@ -41,21 +41,16 @@
 static LockFreeQueue<shm_packet_t> * shm_socket_bind_queue(int key, bool force) {
   hashtable_t *hashtable = mm_get_hashtable();
   LockFreeQueue<shm_packet_t> *queue;
-  hashtable_lock(hashtable);
   void *tmp_ptr = hashtable_get(hashtable, key);
-
 
   if (tmp_ptr == NULL || tmp_ptr == (void *)1  ) {
     queue = new LockFreeQueue<shm_packet_t>(32);
     hashtable_put(hashtable, key, (void *)queue);
-    hashtable_unlock(hashtable);
     return queue;
   } else if(force) {
-    hashtable_unlock(hashtable);
     return (LockFreeQueue<shm_packet_t> *) tmp_ptr;
   }
   
-  hashtable_unlock(hashtable);
   return NULL;
 }
 
@@ -67,7 +62,6 @@
   hashtable_t *hashtable = mm_get_hashtable();
   void *tmp_ptr = hashtable_get(hashtable, key);
   if (tmp_ptr == NULL || tmp_ptr == (void *)1) {
-    //logger->error("shm_socket._remote_queue_attach锛歝onnet at key %d  failed!", key);
     return NULL;
   }
 
@@ -126,7 +120,6 @@
   // }
 
 
-  // printf("====sockt->queue addr = %p\n", sockt->queue);
 
   if(sockt->queue != NULL) {
     sockt->queue->close();
@@ -243,7 +236,7 @@
   shm_packet_t sendpak = {0};
   sendpak.key = sockt->key;
   sendpak.size = sendsize;
-  memcpy(sendpak.uuid, recvpak.uuid, sizeof sendpak.uuid);
+  memcpy(sendpak.uuid, recvpak.uuid, sizeof(sendpak.uuid));
   if(sendbuf !=NULL && sendsize > 0) {
     sendpak.buf = mm_malloc(sendsize);
     memcpy(sendpak.buf, sendbuf, sendsize);
@@ -273,11 +266,14 @@
    
   } 
 
-
- if(buf != NULL && recvpak.buf != NULL) {
-    void *_buf = malloc(recvpak.size);
-    memcpy(_buf, recvpak.buf, recvpak.size);
-    *buf = _buf; 
+  if(recvpak.buf != NULL) {
+    if (buf == NULL) {
+      logger->warn("!!!Alert: buf should be not NULL!\n"); 
+    } else {
+      void *_buf = malloc(recvpak.size);
+      memcpy(_buf, recvpak.buf, recvpak.size);
+      *buf = _buf; 
+    }
   }
  
   if(size != NULL)
@@ -381,7 +377,7 @@
 logger->debug("send uuid:%s, recv uuid: %s", uuid.c_str(), recvpak.uuid);
     if(strlen(recvpak.uuid) == 0) {
       continue;
-    } else if (strncmp(uuid.c_str(), recvpak.uuid, sizeof recvpak.uuid) == 0) {
+    } else if (strncmp(uuid.c_str(), recvpak.uuid, sizeof(recvpak.uuid)) == 0) {
       // 鍙戦�佷笌鎺ュ彈鐨刄UID鍖归厤鎴愬姛
       goto LABLE_SUC;
     } else {
@@ -415,6 +411,8 @@
   
  
   int rv = 0, tryn = 16;
+  static int Counter_suc = 0;
+  static int Counter_fail = 0;
   shm_packet_t sendpak;
   shm_packet_t recvpak;
   std::map<int, shm_packet_t>::iterator recvbufIter;
@@ -431,7 +429,6 @@
   if (tmp_socket == NULL)
   {
     /* If first call from this thread, allocate buffer for thread, and save its location */
-    logger->debug("%lu create threadlocal socket\n", (long)pthread_self() );
     tmp_socket = shm_socket_open(SHM_SOCKET_DGRAM);
 
     rv =  pthread_setspecific(_localthread_socket_key_, tmp_socket);
@@ -458,7 +455,6 @@
     recvbufIter = tmp_socket->recvbuf2.find(key);
     if(recvbufIter != tmp_socket->recvbuf2.end()) {
       // 鍦ㄧ紦瀛橀噷鏌ュ埌浜唊ey鍖归厤鎴愬姛鐨�
- // logger->info("get from recvbuf: %d", key);
       recvpak = recvbufIter->second;
       tmp_socket->recvbuf2.erase(recvbufIter);
       goto LABLE_SUC;
@@ -471,7 +467,7 @@
       return rv;
     } 
 
-   if (key == recvpak.key) {
+    if (key == recvpak.key) {
       // 鍙戦�佷笌鎺ュ彈鐨刄UID鍖归厤鎴愬姛
       goto LABLE_SUC;
     } else {
@@ -485,7 +481,8 @@
   return EBUS_RECVFROM_WRONG_END;
  
 LABLE_SUC:
- if(recv_buf != NULL) {
+  sockt->key = tmp_socket->key;
+  if(recv_buf != NULL) {
     void *_buf = malloc(recvpak.size);
     memcpy(_buf, recvpak.buf, recvpak.size);
     *recv_buf = _buf; 
@@ -494,7 +491,6 @@
  
   if(recv_size != NULL)
     *recv_size = recvpak.size;
-
   
   return 0;
 }
diff --git a/src/svsem.cpp b/src/svsem.cpp
index 27c88a8..26bde2c 100644
--- a/src/svsem.cpp
+++ b/src/svsem.cpp
@@ -1,7 +1,6 @@
 #include "svsem.h"
 
 int svsem_get(key_t key, unsigned int value) {
-// printf("==================svsem_get===============================\n");
   int semid, perms;
 
   perms = S_IRUSR | S_IWUSR;
@@ -12,7 +11,6 @@
     union semun arg;
     struct sembuf sop;
 
-    //logger.info("%ld: created semaphore\n", (long)getpid());
 
     arg.val = 0; /* So initialize it to 0 */
     if (semctl(semid, 0, SETVAL, arg) == -1)
@@ -21,8 +19,7 @@
     arg.val = 1;
     if (semctl(semid, 1, SETVAL, arg) == -1)
       err_exit(errno, "semctl 2");
-    //logger.info("%ld: initialized semaphore\n", (long)getpid());
-
+    
     /* Perform a "no-op" semaphore operation - changes sem_otime
        so other processes can see we've initialized the set. */
 
@@ -31,7 +28,6 @@
     sop.sem_flg = 0;
     if (semop(semid, &sop, 1) == -1)
       err_exit(errno, "semop");
-    //logger.info("%ld: completed dummy semop()\n", (long)getpid());
 
   } else { /* We didn't create the semaphore set */
 
@@ -48,12 +44,10 @@
       if (semid == -1)
         err_exit(errno, "semget 2");
 
-     // logger.info("%ld: got semaphore key\n", (long)getpid());
       /* Wait until another process has called semop() */
 
       arg.buf = &ds;
       for (j = 0; j < MAX_TRIES; j++) {
-        //logger.info("Try %d\n", j);
         if (semctl(semid, 0, IPC_STAT, arg) == -1)
           err_exit(errno, "semctl 2");
 
@@ -82,7 +76,8 @@
 
   while (semop(semid, &sops, 1) == -1)
     if (errno != EINTR) {
-      // err_msg(errno, "svsem_dec");
+      err_msg(errno, "svsem_dec");
+      
       return -1;
     }
 
@@ -266,4 +261,4 @@
 
 
 
- 
\ No newline at end of file
+ 
diff --git a/test_queue/test_queue.cpp b/test_queue/test_queue.cpp
index 6ddf1b8..26e303c 100644
--- a/test_queue/test_queue.cpp
+++ b/test_queue/test_queue.cpp
@@ -125,4 +125,4 @@
 
 	mm_destroy();
 	return 0;
-}
\ No newline at end of file
+}
diff --git a/test_socket/bus_test.cpp b/test_socket/bus_test.cpp
index 8d630b6..d2ead68 100644
--- a/test_socket/bus_test.cpp
+++ b/test_socket/bus_test.cpp
@@ -63,7 +63,6 @@
   char content[512];
   long i = 0;
 
-
   pthread_create(&tid, NULL, run_recv, (void *)sk);
 
   while (true) {
@@ -136,4 +135,4 @@
 
   
   return 0;
-}
\ No newline at end of file
+}

--
Gitblit v1.8.0