From: Martin Johansson <martin@fatbob.nu>
Date: Sun, 7 Dec 2014 20:01:03 +0000 (+0100)
Subject: Merge pull request #48 from snowblind/sharedmemory
X-Git-Url: http://git.code-monkey.de/?a=commitdiff_plain;h=0382e6436faf446f1f39860cdb59159ccd4b3356;hp=-c;p=umurmur.git

Merge pull request #48 from snowblind/sharedmemory

Sharedmemory API
---

0382e6436faf446f1f39860cdb59159ccd4b3356
diff --combined src/server.c
index 836621a,74a736d..4b90734
--- a/src/server.c
+++ b/src/server.c
@@@ -141,6 -141,10 +141,10 @@@ void Server_runLoop(struct pollfd* poll
  	while (!shutdown_server) {
  		struct sockaddr_storage remote;
  		int i;
+ 		
+ #ifdef USE_SHAREDMEMORY_API
+     Sharedmemory_alivetick();
+ #endif
  
  		for(i = 0; i < nofServerSocks; i++) {
  			pollfds[i].revents = 0;
@@@ -171,8 -175,8 +175,8 @@@
  		/* Check for new connection */
  		for (i = 0; i < nofServerSocks / 2; i++) {
  			if (pollfds[i].revents) {
 -				static int tcpfd;
 -				static uint32_t addrlen = sizeof(struct sockaddr_storage);
 +				int tcpfd;
 +				uint32_t addrlen = sizeof(struct sockaddr_storage);
  				tcpfd = accept(pollfds[i].fd, (struct sockaddr *)&remote, &addrlen);
  				fcntl(tcpfd, F_SETFL, O_NONBLOCK);
  				setsockopt(tcpfd, IPPROTO_TCP, TCP_NODELAY, (char *) &on, sizeof(int));
@@@ -194,6 -198,9 +198,9 @@@
  			if (pollfds[nofServerSocks + i].revents & POLLOUT)
  				Client_write_fd(pollfds[nofServerSocks + i].fd);
  		}
+ #ifdef USE_SHAREDMEMORY_API    
+     Sharedmemory_update();
+ #endif    
  	}
  }