<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[23056] trunk/launchd/src/launchd_core_logic.c</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/launchd/changeset/23056">23056</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2007-02-11 21:08:01 -0800 (Sun, 11 Feb 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>kqueue dispatch clean up.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunklaunchdsrclaunchd_core_logicc">trunk/launchd/src/launchd_core_logic.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunklaunchdsrclaunchd_core_logicc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd_core_logic.c (23055 => 23056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_core_logic.c 2007-02-10 16:52:04 UTC (rev 23055)
+++ trunk/launchd/src/launchd_core_logic.c 2007-02-12 05:08:01 UTC (rev 23056)
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> static void socketgroup_delete(job_t j, struct socketgroup *sg);
</span><span class="cx"> static void socketgroup_watch(job_t j, struct socketgroup *sg);
</span><span class="cx"> static void socketgroup_ignore(job_t j, struct socketgroup *sg);
</span><del>-static void socketgroup_callback(job_t j, struct kevent *kev);
</del><ins>+static void socketgroup_callback(job_t j);
</ins><span class="cx"> static void socketgroup_setup(launch_data_t obj, const char *key, void *context);
</span><span class="cx">
</span><span class="cx"> struct calendarinterval {
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> static bool calendarinterval_new_from_obj(job_t j, launch_data_t obj);
</span><span class="cx"> static void calendarinterval_delete(job_t j, struct calendarinterval *ci);
</span><span class="cx"> static void calendarinterval_setalarm(job_t j, struct calendarinterval *ci);
</span><del>-static void calendarinterval_callback(job_t j, struct kevent *kev);
</del><ins>+static void calendarinterval_callback(job_t j, void *ident);
</ins><span class="cx">
</span><span class="cx"> struct envitem {
</span><span class="cx"> SLIST_ENTRY(envitem) sle;
</span><span class="lines">@@ -303,6 +303,9 @@
</span><span class="cx"> static void job_force_sampletool(job_t j);
</span><span class="cx"> static void job_reparent_hack(job_t j, const char *where);
</span><span class="cx"> static void job_callback(void *obj, struct kevent *kev);
</span><ins>+static void job_callback_proc(job_t j, int fflags);
+static void job_callback_timer(job_t j, void *ident);
+static void job_callback_read(job_t j, int ident);
</ins><span class="cx"> static launch_data_t job_export2(job_t j, bool subjobs);
</span><span class="cx"> static job_t job_new_spawn(job_t j, const char *label, const char *path, const char *workingdir, const char *const *argv, const char *const *env, mode_t *u_mask, bool w4d);
</span><span class="cx"> static job_t job_new_via_mach_init(job_t j, const char *cmd, uid_t uid, bool ond);
</span><span class="lines">@@ -1774,47 +1777,60 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void
</span><ins>+job_callback_proc(job_t j, int fflags)
+{
+ if (fflags & NOTE_EXEC) {
+ job_log(j, LOG_DEBUG, "Called execve()");
+ }
+
+ if (fflags & NOTE_EXIT) {
+ job_reap(j);
+ job_dispatch(j, false);
+ }
+}
+
+void
+job_callback_timer(job_t j, void *ident)
+{
+ if (j == ident || &j->start_interval == ident) {
+ job_dispatch(j, true);
+ } else if (&j->exit_timeout == ident) {
+ job_force_sampletool(j);
+ job_log(j, LOG_WARNING, "Exit timeout elapsed (%u seconds). Killing.", j->exit_timeout);
+ job_kill(j);
+ } else {
+ calendarinterval_callback(j, ident);
+ }
+}
+
+void
+job_callback_read(job_t j, int ident)
+{
+ if (ident == j->log_redirect_fd) {
+ job_log_stdouterr(j);
+ } else {
+ socketgroup_callback(j);
+ }
+}
+
+void
</ins><span class="cx"> job_callback(void *obj, struct kevent *kev)
</span><span class="cx"> {
</span><span class="cx"> job_t j = obj;
</span><span class="cx">
</span><span class="cx"> switch (kev->filter) {
</span><span class="cx"> case EVFILT_PROC:
</span><del>- if (kev->fflags & NOTE_EXEC) {
- job_log(j, LOG_DEBUG, "Called execve()");
- }
- if (kev->fflags & NOTE_EXIT) {
- job_reap(j);
- job_dispatch(j, false);
- }
- break;
</del><ins>+ return job_callback_proc(j, kev->fflags);
</ins><span class="cx"> case EVFILT_TIMER:
</span><del>- if ((uintptr_t)j == kev->ident || (uintptr_t)&j->start_interval == kev->ident) {
- job_dispatch(j, true);
- } else if ((uintptr_t)&j->exit_timeout == kev->ident) {
- job_force_sampletool(j);
- job_log(j, LOG_WARNING, "Exit timeout elapsed (%u seconds). Killing.", j->exit_timeout);
- job_kill(j);
- } else {
- calendarinterval_callback(j, kev);
- }
- break;
</del><ins>+ return job_callback_timer(j, (void *)kev->ident);
</ins><span class="cx"> case EVFILT_VNODE:
</span><del>- semaphoreitem_callback(j, kev);
- break;
</del><ins>+ return semaphoreitem_callback(j, kev);
</ins><span class="cx"> case EVFILT_READ:
</span><del>- if (kev->ident == (uintptr_t)j->log_redirect_fd) {
- job_log_stdouterr(j);
- } else {
- socketgroup_callback(j, kev);
- }
- break;
</del><ins>+ return job_callback_read(j, kev->ident);
</ins><span class="cx"> case EVFILT_MACHPORT:
</span><del>- job_dispatch(j, true);
- break;
</del><ins>+ return (void)job_dispatch(j, true);
</ins><span class="cx"> default:
</span><del>- job_assumes(j, false);
- break;
</del><ins>+ return (void)job_assumes(j, false);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2607,12 +2623,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void
</span><del>-calendarinterval_callback(job_t j, struct kevent *kev)
</del><ins>+calendarinterval_callback(job_t j, void *ident)
</ins><span class="cx"> {
</span><span class="cx"> struct calendarinterval *ci;
</span><span class="cx">
</span><span class="cx"> SLIST_FOREACH(ci, &j->cal_intervals, sle) {
</span><del>- if ((uintptr_t)ci == kev->ident) {
</del><ins>+ if (ci == ident) {
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2704,7 +2720,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void
</span><del>-socketgroup_callback(job_t j, struct kevent *kev)
</del><ins>+socketgroup_callback(job_t j)
</ins><span class="cx"> {
</span><span class="cx"> job_dispatch(j, true);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>