r325: Avoid unnecessary wakeups

[nbd.git] / nbd-server.c

diff --git a/nbd-server.c b/nbd-server.c
index c027557..1606d5d 100644 (file)
--- a/nbd-server.c
+++ b/nbd-server.c
@@ -762,7 +762,7 @@ void sigterm_handler(int s) {
                unlink(pidfname);
        }
 
-       exit(0);
+       exit(EXIT_SUCCESS);
 }
 
 /**
@@ -1393,7 +1393,6 @@ int serveloop(GArray* servers) {
        int sock;
        fd_set mset;
        fd_set rset;
-       struct timeval tv;
 
        /* 
         * Set up the master fd_set. The set of descriptors we need
@@ -1415,9 +1414,7 @@ int serveloop(GArray* servers) {
                pid_t *pid;
 
                memcpy(&rset, &mset, sizeof(fd_set));
-               tv.tv_sec=0;
-               tv.tv_usec=500;
-               if(select(max+1, &rset, NULL, NULL, &tv)>0) {
+               if(select(max+1, &rset, NULL, NULL, NULL)>0) {
                        DEBUG("accept, ");
                        for(i=0;i<servers->len;i++) {
                                serve=&(g_array_index(servers, SERVER, i));
@@ -1451,7 +1448,7 @@ int serveloop(GArray* servers) {
                                        /* child */
                                        g_hash_table_destroy(children);
                                        for(i=0;i<servers->len;i++) {
-                                               serve=g_array_index(servers, SERVER*, i);
+                                               serve=&g_array_index(servers, SERVER, i);
                                                close(serve->socket);
                                        }
                                        /* FALSE does not free the
@@ -1571,9 +1568,9 @@ void daemonize(SERVER* serve) {
        }
        if(!*pidftemplate) {
                if(serve) {
-                       strncpy(pidftemplate, "/var/run/server.%d.pid", 255);
+                       strncpy(pidftemplate, "/var/run/nbd-server.%d.pid", 255);
                } else {
-                       strncpy(pidftemplate, "/var/run/server.pid", 255);
+                       strncpy(pidftemplate, "/var/run/nbd-server.pid", 255);
                }
        }
        snprintf(pidfname, 255, pidftemplate, serve ? serve->port : 0);
@@ -1643,7 +1640,7 @@ int main(int argc, char *argv[]) {
 
        if (sizeof( struct nbd_request )!=28) {
                fprintf(stderr,"Bad size of structure. Alignment problems?\n");
-               exit(-1) ;
+               exit(EXIT_FAILURE) ;
        }
 
        memset(pidftemplate, '\0', 256);