Changeset 23251

Timestamp:

05/10/07 14:36:14 (19 months ago)

Author:

zarzycki@…

Message:

socketgroup_watch() and socketgroup_ignore() are basically the same, with slightly different args.

Files:

• trunk/launchd/src/launchd_core_logic.c (modified) (3 diffs)

trunk/launchd/src/launchd_core_logic.c

@@ -3046 +3046 @@
 }
 
-void
-socketgroup_ignore(job_t j, struct socketgroup *sg)
-{
-        char buf[10000];
-        unsigned int i, buf_off = 0;
-
-        if (sg->junkfds) {
-                return;
-        }
-
-        for (i = 0; i < sg->fd_cnt; i++)
-                buf_off += snprintf(buf + buf_off, sizeof(buf) - buf_off, " %d", sg->fds[i]);
-
-        job_log(j, LOG_DEBUG, "Ignoring Sockets:%s", buf);
-
-        for (i = 0; i < sg->fd_cnt; i++) {
-                job_assumes(j, kevent_mod(sg->fds[i], EVFILT_READ, EV_DELETE, 0, 0, NULL) != -1);
-        }
-}
-
-void
-socketgroup_watch(job_t j, struct socketgroup *sg)
+static void
+socketgroup_kevent_mod(job_t j, struct socketgroup *sg, bool do_add)
 {
         struct kevent kev[sg->fd_cnt];
@@ -3077 +3057 @@
         }
 
-        for (i = 0; i < sg->fd_cnt; i++)
+        for (i = 0; i < sg->fd_cnt; i++) {
+                EV_SET(&kev[i], sg->fds[i], EVFILT_READ, do_add ? EV_ADD : EV_DELETE, 0, 0, j);
                 buf_off += snprintf(buf + buf_off, sizeof(buf) - buf_off, " %d", sg->fds[i]);
-
-        job_log(j, LOG_DEBUG, "Watching sockets:%s", buf);
-
-        for (i = 0; i < sg->fd_cnt; i++) {
-                EV_SET(&kev[i], sg->fds[i], EVFILT_READ, EV_ADD, 0, 0, j);
-        }
+        }
+
+        job_log(j, LOG_DEBUG, "%s Sockets:%s", do_add ? "Watching" : "Ignoring", buf);
 
         job_assumes(j, kevent_bulk_mod(kev, sg->fd_cnt) != -1);
@@ -3093 +3071 @@
                 job_assumes(j, kev[i].data == 0);
         }
+}
+
+void
+socketgroup_ignore(job_t j, struct socketgroup *sg)
+{
+        socketgroup_kevent_mod(j, sg, false);
+}
+
+void
+socketgroup_watch(job_t j, struct socketgroup *sg)
+{
+        socketgroup_kevent_mod(j, sg, true);
 }