<!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>[23054] 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/23054">23054</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2007-02-09 19:25:34 -0800 (Fri, 09 Feb 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>Misc</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 (23053 => 23054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_core_logic.c 2007-02-09 22:51:16 UTC (rev 23053)
+++ trunk/launchd/src/launchd_core_logic.c 2007-02-10 03:25:34 UTC (rev 23054)
</span><span class="lines">@@ -201,7 +201,6 @@
</span><span class="cx"> char *jm_stdout;
</span><span class="cx"> char *jm_stderr;
</span><span class="cx"> unsigned int global_on_demand_cnt;
</span><del>- unsigned int would_have_sigkilled;
</del><span class="cx"> unsigned int transfer_bstrap:1, sent_stop_to_hopeful_jobs:1, shutting_down:1;
</span><span class="cx"> char name[0];
</span><span class="cx"> };
</span><span class="lines">@@ -1771,14 +1770,7 @@
</span><span class="cx"> void
</span><span class="cx"> job_kill(job_t j)
</span><span class="cx"> {
</span><del>- if (debug_shutdown_hangs) {
- j->mgr->would_have_sigkilled++;
- if (j->mgr->would_have_sigkilled >= total_children) {
- job_assumes(j, host_reboot(mach_host_self(), HOST_REBOOT_DEBUGGER) == 0);
- }
- } else {
- job_assumes(j, kill(j->p, SIGKILL) != -1);
- }
</del><ins>+ job_assumes(j, kill(j->p, SIGKILL) != -1);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void
</span><span class="lines">@@ -1788,8 +1780,13 @@
</span><span class="cx">
</span><span class="cx"> switch (kev->filter) {
</span><span class="cx"> case EVFILT_PROC:
</span><del>- job_reap(j);
- job_dispatch(j, false);
</del><ins>+ if (kev->fflags & NOTE_EXEC) {
+ job_log(j, LOG_DEBUG, "Called execve()");
+ }
+ if (kev->fflags & NOTE_EXIT) {
+ job_reap(j);
+ job_dispatch(j, false);
+ }
</ins><span class="cx"> break;
</span><span class="cx"> case EVFILT_TIMER:
</span><span class="cx"> if ((uintptr_t)j == kev->ident || (uintptr_t)&j->start_interval == kev->ident) {
</span><span class="lines">@@ -1925,7 +1922,7 @@
</span><span class="cx"> job_assumes(j, close(spair[1]) == 0);
</span><span class="cx"> ipc_open(_fd(spair[0]), j);
</span><span class="cx"> }
</span><del>- if (kevent_mod(c, EVFILT_PROC, EV_ADD, NOTE_EXIT, 0, &j->kqjob_callback) == -1) {
</del><ins>+ if (kevent_mod(c, EVFILT_PROC, EV_ADD, NOTE_EXEC|NOTE_EXIT, 0, &j->kqjob_callback) == -1) {
</ins><span class="cx"> job_log_error(j, LOG_ERR, "kevent()");
</span><span class="cx"> job_reap(j);
</span><span class="cx"> } else {
</span><span class="lines">@@ -3501,13 +3498,8 @@
</span><span class="cx"> void
</span><span class="cx"> machservice_delete(struct machservice *ms)
</span><span class="cx"> {
</span><del>- if (ms->recv) {
- if (ms->isActive) {
- /* FIXME we should cancel the notification */
- job_log(ms->job, LOG_DEBUG, "Mach service deleted while we didn't own the receive right: %s", ms->name);
- } else {
- job_assumes(ms->job, launchd_mport_close_recv(ms->port) == KERN_SUCCESS);
- }
</del><ins>+ if (ms->recv && job_assumes(ms->job, !ms->isActive)) {
+ job_assumes(ms->job, launchd_mport_close_recv(ms->port) == KERN_SUCCESS);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> job_assumes(ms->job, launchd_mport_deallocate(ms->port) == KERN_SUCCESS);
</span></span></pre>
</div>
</div>
</body>
</html>