Merge pull request #277 from Jafaral/fix-gc-accept

runtime: avoid deadlock when doing blocking accept()
uniconproject · Feb 10, 2022 · 405b280 · 405b280
2 parents ea95fb6 + d8a7ad0
commit 405b280
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/runtime/fxposix.ri b/src/runtime/fxposix.ri
@@ -2321,8 +2321,11 @@ void post_if_ready(dptr ldp, dptr f, fd_set *fdsp)
        */
       if (status & Fs_Listen) {
 	 fromlen = sizeof(from);
-	 if ((fd = accept(fd, (struct sockaddr *)&from, &fromlen)) < 0)
-	    return;
+	 DEC_NARTHREADS;
+	 fd = accept(fd, (struct sockaddr *)&from, &fromlen);
+	 INC_NARTHREADS_CONTROLLED;
+	 if (fd < 0)
+	   return;
 	 BlkD(*f,File)->fd.fd = fd;
 	 BlkLoc(*f)->File.status = Fs_Socket | Fs_Read | Fs_Write;
 	 }