<!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>[23059] trunk/launchd/src</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/launchd/changeset/23059">23059</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2007-02-13 17:42:50 -0800 (Tue, 13 Feb 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>More logging.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunklaunchdsrclaunchd_core_logicc">trunk/launchd/src/launchd_core_logic.c</a></li>
<li><a href="#trunklaunchdsrclaunchd_runtimec">trunk/launchd/src/launchd_runtime.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 (23058 => 23059)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_core_logic.c 2007-02-13 21:39:11 UTC (rev 23058)
+++ trunk/launchd/src/launchd_core_logic.c 2007-02-14 01:42:50 UTC (rev 23059)
</span><span class="lines">@@ -362,6 +362,8 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ job_log(j, LOG_DEBUG, "Ignoring...");
+
</ins><span class="cx"> j->currently_ignored = true;
</span><span class="cx">
</span><span class="cx"> SLIST_FOREACH(sg, &j->sockets, sle) {
</span><span class="lines">@@ -388,6 +390,8 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ job_log(j, LOG_DEBUG, "Watching...");
+
</ins><span class="cx"> j->currently_ignored = false;
</span><span class="cx">
</span><span class="cx"> SLIST_FOREACH(sg, &j->sockets, sle) {
</span><span class="lines">@@ -1735,11 +1739,17 @@
</span><span class="cx"> if (job_useless(j)) {
</span><span class="cx"> job_remove(j);
</span><span class="cx"> return NULL;
</span><del>- } else if (kickstart || job_keepalive(j)) {
</del><ins>+ } else if (kickstart) {
+ job_log(j, LOG_DEBUG, "Kick-starting.");
</ins><span class="cx"> job_start(j);
</span><ins>+ } else if (job_keepalive(j)) {
+ job_log(j, LOG_DEBUG, "Keeping alive...");
+ job_start(j);
</ins><span class="cx"> } else {
</span><span class="cx"> job_watch(j);
</span><span class="cx"> }
</span><ins>+ } else {
+ job_log(j, LOG_DEBUG, "Tried to dispatch an already active job.");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return j;
</span><span class="lines">@@ -1824,6 +1834,9 @@
</span><span class="cx"> {
</span><span class="cx"> job_t j = obj;
</span><span class="cx">
</span><ins>+ job_log(j, LOG_DEBUG, "kev.ident = 0x%lx kev.filter = 0x%x kev->flags = 0x%x kev.fflags = 0x%x kev.data = 0x%lx kev.udata = %p",
+ kev->ident, kev->filter, kev->flags, kev->fflags, kev->data, kev->udata);
+
</ins><span class="cx"> switch (kev->filter) {
</span><span class="cx"> case EVFILT_PROC:
</span><span class="cx"> return job_callback_proc(j, kev->fflags);
</span><span class="lines">@@ -2900,8 +2913,9 @@
</span><span class="cx"> SLIST_FOREACH(ms, &j->machservices, sle) {
</span><span class="cx"> statusCnt = MACH_PORT_RECEIVE_STATUS_COUNT;
</span><span class="cx"> if (mach_port_get_attributes(mach_task_self(), ms->port, MACH_PORT_RECEIVE_STATUS,
</span><del>- (mach_port_info_t)&status, &statusCnt) != KERN_SUCCESS)
</del><ins>+ (mach_port_info_t)&status, &statusCnt) != KERN_SUCCESS) {
</ins><span class="cx"> continue;
</span><ins>+ }
</ins><span class="cx"> if (status.mps_msgcount) {
</span><span class="cx"> job_log(j, LOG_DEBUG, "KeepAlive check: job restarted due to %d queued Mach messages on service: %s",
</span><span class="cx"> status.mps_msgcount, ms->name);
</span></span></pre></div>
<a id="trunklaunchdsrclaunchd_runtimec"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd_runtime.c (23058 => 23059)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_runtime.c 2007-02-13 21:39:11 UTC (rev 23058)
+++ trunk/launchd/src/launchd_runtime.c 2007-02-14 01:42:50 UTC (rev 23059)
</span><span class="lines">@@ -165,7 +165,9 @@
</span><span class="cx"> }
</span><span class="cx"> if (status.mps_msgcount) {
</span><span class="cx"> EV_SET(&kev, members[i], EVFILT_MACHPORT, 0, 0, 0, jobmgr_find_by_service_port(root_jobmgr, members[i]));
</span><del>- (*((kq_callback *)kev.udata))(kev.udata, &kev);
</del><ins>+ if (launchd_assumes(kev.udata != NULL)) {
+ (*((kq_callback *)kev.udata))(kev.udata, &kev);
+ }
</ins><span class="cx"> /* the callback may have tainted our ability to continue this for loop */
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>