valib/c_bhomebus.git

			@@ -74,6 +74,7 @@
			socket->recvQueue->push(entry);
			// shm_free(recvbuf);
			}

			free(_socket);
			shm_close_socket(client_socket);
			return NULL;
			@@ -84,6 +85,7 @@
			shm_socket_t *client_socket;
			pthread_t tid;
			while(socket->shm_socket->status == SHM_CONN_LISTEN) {
			//接受客户端的连接请求
			client_socket = shm_accept(socket->shm_socket);

			mod_socket_t arg = (mod_socket_t )malloc(sizeof(mod_socket_t));
			@@ -152,38 +154,37 @@
			int mod_recv(void * _socket, void *buf, int size) {
			mod_socket_t * socket = (mod_socket_t *) _socket;
			mod_entry_t entry;
			int rv;

			if(socket->is_server ) {
			switch(socket->mod) {
			case REQ_REP:
			logger.debug("REQ_REP mod_recv before");
			logger.debug("REQ_REP mod_recv before");
			SemUtil::dec(socket->slots);
			rv = socket->recvQueue->pop(entry);
			socket->recvQueue->pop(entry);
			*buf = entry.buf;
			*size = entry.size;
			socket->client_socket = entry.client_socket;
			SemUtil::inc(socket->items);

			logger.debug("REQ_REP mod_recv after");
			break;
			case PUB_SUB:
			rv = 0;
			break;

			case SURVEY:
			default:
			rv = socket->recvQueue->pop(entry);
			socket->recvQueue->pop(entry);
			*buf = entry.buf;
			*size = entry.size;
			}

			return rv;
			}

			return 0;
			}
			else {
			logger.debug("mod_recv before");
			rv = shm_recv(socket->shm_socket, buf, size);
			shm_recv(socket->shm_socket, buf, size);
			logger.debug("mod_recv after");
			return rv;
			return 0;
			}

			return -1;

			@@ -112,10 +112,10 @@
			socket->queue = new SHMQueue<shm_msg_t>(socket->port, 16);
			socket->acceptQueue = new LockFreeQueue<shm_msg_t, DM_Allocator>(16);
			socket->clientSocketMap = new std::map<int, shm_socket_t* >;

			socket->status = SHM_CONN_LISTEN;
			pthread_create(&(socket->dispatch_thread), NULL, _server_run_msg_rev , (void *)socket);

			socket->status = SHM_CONN_LISTEN;

			return 0;
			}

			@@ -7,7 +7,7 @@

			static Logger getLogger() {
			//ERROR ALL
			static Logger logger(Logger::ALL);
			static Logger logger(Logger::ERROR);
			return logger;
			}
			};