Merge pull request #48 from snowblind/sharedmemory
authorMartin Johansson <martin@fatbob.nu>
Sun, 7 Dec 2014 20:01:03 +0000 (21:01 +0100)
committerMartin Johansson <martin@fatbob.nu>
Sun, 7 Dec 2014 20:01:03 +0000 (21:01 +0100)
Sharedmemory API

1  2 
src/server.c

diff --combined src/server.c
index 836621a860bcbc77f8f35b4fa392aa3463bad1cb,74a736d32fa2add70186d254cf0327aceea8ef05..4b90734c60a386b4fc63a037b47a9ef02437bea2
@@@ -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;
                /* 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));
                        if (pollfds[nofServerSocks + i].revents & POLLOUT)
                                Client_write_fd(pollfds[nofServerSocks + i].fd);
                }
+ #ifdef USE_SHAREDMEMORY_API    
+     Sharedmemory_update();
+ #endif    
        }
  }