More EINTR checking

Grzegorz Jabłoński
1 parent 7fac6064
Showing 1 changed file with 11 additions and 3 deletions
epoll4.c
@@ -116,11 +116,18 @@ void server_run() {
   socklen = sizeof(cli_addr);
   for (;;) {
-    nfds = epoll_wait(epfd, events, MAX_EVENTS, -1);
+    do {
+      nfds = epoll_wait(epfd, events, MAX_EVENTS, -1);
+    } while (nfds == -1 && errno == EINTR);
+
     for (i = 0; i < nfds; i++) {
       if (events[i].data.fd == listen_sock) {
         /* handle new connection */
-        conn_sock = accept(listen_sock, (struct sockaddr *)&cli_addr, &socklen);
+
+        do {
+          conn_sock =
+              accept(listen_sock, (struct sockaddr *)&cli_addr, &socklen);
+        } while (conn_sock == -1 && errno == EINTR);
         inet_ntop(AF_INET, (char *)&(cli_addr.sin_addr), buf, sizeof(buf));
         printf("[+] connected with %s:%d\n", buf, ntohs(cli_addr.sin_port));
@@ -142,7 +149,8 @@ void server_run() {
             printf("[+] data: %s\n", buf);
             n = 0;
             while (n != strlen(buf)) {
-              int rv = send(events[i].data.fd, buf + n, strlen(buf) - n, MSG_NOSIGNAL);
+              int rv = send(events[i].data.fd, buf + n, strlen(buf) - n,
+                            MSG_NOSIGNAL);
               if (rv == -1 && (errno == EAGAIN || errno == EWOULDBLOCK))
                 continue; // FIXME: busy waiting - should wait using epoll
               if (rv == -1)