update

wangzhengquan

2020-07-17 c1f1446058dbedd9be9b9561e6ba435e0cd15bbc

 queue/socket.c

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


void print_msg(char *head, shm_msg_t& msg) {
   err_msg(0, "%s: port=%d, type=%d\n", head, msg.port, msg.type);
   //err_msg(0, "%s: port=%d, type=%d\n", head, msg.port, msg.type);
}

void * _server_run_msg_rev(void* _socket);
@@ -37,29 +37,37 @@
}


int shm_close_socket(shm_socket_t *socket) {
int _shm_close_socket(shm_socket_t *socket, bool notifyRemote) {
   //给对方发送一个关闭连接的消息
   struct timespec timeout = {1, 0};
   shm_msg_t close_msg;

   close_msg.port = socket->port;
   close_msg.size = 0;
   close_msg.type=SHM_SOCKET_CLOSE;
   if(socket->remoteQueue != NULL) {
   if(notifyRemote && socket->remoteQueue != NULL) {
      socket->remoteQueue->push_timeout(close_msg, &timeout);
   }
   


   if(socket->queue != NULL)
   if(socket->queue != NULL) {
      delete socket->queue;
   if(socket->remoteQueue != NULL)
      socket->queue = NULL;
   }

   if(socket->remoteQueue != NULL) {
      delete socket->remoteQueue;
      socket->remoteQueue = NULL;
   }

   if(socket->messageQueue != NULL)
   if(socket->messageQueue != NULL) {
      delete socket->messageQueue;
      socket->messageQueue = NULL;
   }

   if(socket->acceptQueue != NULL)
   if(socket->acceptQueue != NULL) {
      delete socket->acceptQueue;
      socket->acceptQueue = NULL;
   }

   if(socket->clientSocketMap != NULL) {
      shm_socket_t *client_socket;
@@ -68,7 +76,9 @@

         client_socket->remoteQueue->push_timeout(close_msg, &timeout);
         delete client_socket->remoteQueue;
         client_socket->remoteQueue=NULL;
         delete client_socket->messageQueue;
         client_socket->messageQueue=NULL;
         socket->clientSocketMap->erase(iter);
         free((void *)client_socket);
      }
@@ -78,13 +88,16 @@

   if(socket->dispatch_thread != 0)
      pthread_cancel(socket->dispatch_thread);


    
   free(socket);
   return 0;

}

int shm_close_socket(shm_socket_t *socket) {
   return _shm_close_socket(socket, true);
}



int shm_bind(shm_socket_t * socket, int port) {
@@ -119,12 +132,19 @@
   shm_socket_t *client_socket;
   auto iter = socket->clientSocketMap->find(port);
   if( iter !=  socket->clientSocketMap->end() ) {
      client_socket= iter->second;
      delete client_socket->remoteQueue;
      delete client_socket->messageQueue;
      // client_socket= iter->second;
      // if(client_socket->remoteQueue != NULL) {
      //    delete client_socket->remoteQueue;
      //    client_socket->remoteQueue = NULL;
      // }
      // if(client_socket->messageQueue != NULL) {
      //    delete client_socket->messageQueue;
      //    client_socket->messageQueue = NULL;
      // }
		
      socket->clientSocketMap->erase(iter);
   }
   free((void *)client_socket);
   //free((void *)client_socket);

}

@@ -138,8 +158,9 @@
   shm_msg_t src;
   shm_socket_t *client_socket;
   std::map<int, shm_socket_t* >::iterator iter;

    while(socket->queue->pop(src)) {
print_msg("=====_server_run_msg_rev:", src);

       switch (src.type) {
         case SHM_SOCKET_OPEN : 
            socket->acceptQueue->push_timeout(src, &timeout);
@@ -148,12 +169,14 @@
            _server_close_conn_to_client(socket, src.port);
            break;
         case SHM_COMMON_MSG :
err_msg(0, "===_server_run_msg_rev 1");				

            iter = socket->clientSocketMap->find(src.port);
   print_msg("_server_run_msg_rev find before", src);
            if( iter !=  socket->clientSocketMap->end()) {
               client_socket= iter->second;
err_msg(0, "===_server_run_msg_rev client_socket->messageQueue=%p", client_socket->messageQueue);	
   print_msg("_server_run_msg_rev push before", src);
               client_socket->messageQueue->push_timeout(src, &timeout);
   print_msg("_server_run_msg_rev push after", src);
            }
            
            break;
@@ -169,6 +192,10 @@



/**
 * 接受客户端建立新连接的请求
 *
*/

shm_socket_t* shm_accept(shm_socket_t* socket) {
   hashtable_t *hashtable = mm_get_hashtable();
@@ -178,7 +205,7 @@

   if (socket->acceptQueue->pop(src) ) {

print_msg("===accept:", src);
// print_msg("===accept:", src);
      client_port = src.port;
      client_socket = (shm_socket_t *)malloc(sizeof(shm_socket_t));
      client_socket->port = socket->port;
@@ -190,10 +217,29 @@

      socket->clientSocketMap->insert({client_port, client_socket});

      return client_socket;
      /*
         * shm_accept 用户执行的方法 与_server_run_msg_rev在两个不同的限制工作,accept要保证在客户的发送消息之前完成资源的准备工作，以避免出现竞态问题
      */
      //发送open_reply
      struct timespec timeout = {1, 0};
      shm_msg_t msg;
      msg.port = socket->port;
      msg.size = 0;
      msg.type = SHM_SOCKET_OPEN_REPLY;

      if (client_socket->remoteQueue->push_timeout(msg, &timeout) )
      {
         return client_socket;
      } else {
         err_msg(0, "shm_accept: 发送open_reply失败");
         return NULL;
      }

		
   } else {
      err_exit(errno, "shm_accept");
   }
   return NULL;
   
}

@@ -213,35 +259,38 @@
   }

   socket->queue = new SHMQueue<shm_msg_t>(socket->port, 16);
   socket->remoteQueue = new SHMQueue<shm_msg_t>(port, 0);
   socket->remoteQueue = _attach_remote_queue(port);
   socket->messageQueue = new LockFreeQueue<shm_msg_t, DM_Allocator>(16); 
	

   //发送open请求
   struct timespec timeout = {1, 0};
   shm_msg_t msg;
   msg.port = socket->port;
   msg.size = 0;
   msg.type=SHM_SOCKET_OPEN;
   socket->remoteQueue->push_timeout(msg, &timeout);

   shm_msg_t open_msg;
   open_msg.port = socket->port;
   open_msg.size = 0;
   open_msg.type=SHM_SOCKET_OPEN;
   socket->remoteQueue->push_timeout(open_msg, &timeout);
   //接受open reply
   if(socket->queue->pop(msg)) {
      // 在这里server端已经准备好接受客户端发送请求了
      if(msg.type == SHM_SOCKET_OPEN_REPLY) {

   pthread_create(&(socket->dispatch_thread), NULL, _client_run_msg_rev , (void *)socket);
         pthread_create(&(socket->dispatch_thread), NULL, _client_run_msg_rev , (void *)socket);
      } else {
         err_exit(0, "shm_connect: 不匹配的应答信息!");
      }
		
   } else {
      err_exit(0, "connect failted!");
   }
	
   return 0;
}

void _client_close_conn_to_server(shm_socket_t* socket) {
   if(socket->queue != NULL)
      delete socket->queue;
   if(socket->remoteQueue != NULL)
      delete socket->remoteQueue;

   if(socket->messageQueue != NULL)
      delete socket->messageQueue;

   if(socket->acceptQueue != NULL)
      delete socket->acceptQueue;

   if(socket->dispatch_thread != 0)
      pthread_cancel(socket->dispatch_thread);

	 
   _shm_close_socket(socket, false);
}


@@ -284,23 +333,42 @@
   dest.buf = mm_malloc(size);
   memcpy(dest.buf, buf, size);

   socket->remoteQueue->push(dest);
   return 0;
   // struct timeval time;
   // gettimeofday(&time, NULL);
//err_msg(0, "%d %d=======>push befor %d", time.tv_sec, time.tv_usec, socket->port);
   if(socket->remoteQueue->push(dest)) {

      //gettimeofday(&time, NULL);
//err_msg(0, "%d %d=======>push after %d", time.tv_sec, time.tv_usec, socket->port);
      return 0;
   } else {
      err_msg(errno, "connection has been closed!");
      return -1;
   }
	
	
}

int shm_recv(shm_socket_t* socket, void **buf, int *size) {
   shm_msg_t src;
err_msg(0, "====shm_recv socket ==%p", socket);
   bool rv = socket->messageQueue->pop(src);
   if (rv) {

//    struct timeval time;
//    gettimeofday(&time, NULL);
// err_msg(0, "%d %d=======>pop befor %d", time.tv_sec, time.tv_usec, socket->port);
   if (socket->messageQueue->pop(src)) {
// gettimeofday(&time, NULL);
// err_msg(0, "%d %d=======>pop after %d", time.tv_sec, time.tv_usec, socket->port);
      void * _buf = malloc(src.size);
      memcpy(_buf, src.buf, src.size);
      *buf = _buf;
      *size = src.size;
      mm_free(src.buf);
      return 0;
   } else {
      return -1;
   }
   
   return 0;
	
   
}