<!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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { 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>[23602] trunk/launchd/src</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/launchd/changeset/23602">23602</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2008-04-21 14:41:09 -0700 (Mon, 21 Apr 2008)</dd>
</dl>
<h3>Log Message</h3>
<pre><rdar://problem/5836108> Need launchd 'trykill' SPI</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunklaunchdsrclaunchd_core_logicc">trunk/launchd/src/launchd_core_logic.c</a></li>
<li><a href="#trunklaunchdsrcliblaunch_privateh">trunk/launchd/src/liblaunch_private.h</a></li>
<li><a href="#trunklaunchdsrclibvprocc">trunk/launchd/src/libvproc.c</a></li>
<li><a href="#trunklaunchdsrclibvproc_privateh">trunk/launchd/src/libvproc_private.h</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 (23601 => 23602)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_core_logic.c 2008-04-21 20:33:29 UTC (rev 23601)
+++ trunk/launchd/src/launchd_core_logic.c 2008-04-21 21:41:09 UTC (rev 23602)
</span><span class="lines">@@ -701,6 +701,24 @@
</span><span class="cx"> launch_data_dict_insert(r, tmp, LAUNCH_JOBKEY_PROGRAMARGUMENTS);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (j->kill_via_shmem && (tmp = launch_data_new_bool(true))) {
+ uint32_t tmp_cnt = -1;
+
+ launch_data_dict_insert(r, tmp, LAUNCH_JOBKEY_ENABLETRANSACTIONS);
+
+ if (j->shmem) {
+ tmp_cnt = j->shmem->vp_shmem_transaction_cnt;
+ }
+
+ if (j->sent_kill_via_shmem) {
+ tmp_cnt++;
+ }
+
+ if ((tmp = launch_data_new_integer(tmp_cnt))) {
+ launch_data_dict_insert(r, tmp, LAUNCH_JOBKEY_TRANSACTIONCOUNT);
+ }
+ }
+
</ins><span class="cx"> if (j->session_create && (tmp = launch_data_new_bool(true))) {
</span><span class="cx"> launch_data_dict_insert(r, tmp, LAUNCH_JOBKEY_SESSIONCREATE);
</span><span class="cx"> }
</span><span class="lines">@@ -5708,6 +5726,25 @@
</span><span class="cx"> } else {
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><ins>+ } else if (sig == VPROC_MAGIC_TRYKILL_SIGNAL) {
+ if (!j->kill_via_shmem) {
+ return BOOTSTRAP_NOT_PRIVILEGED;
+ }
+
+ if (!j->shmem) {
+ j->sent_kill_via_shmem = true;
+ job_assumes(j, runtime_kill(otherj->p, SIGKILL) != -1);
+ return 0;
+ }
+
+ if (__sync_bool_compare_and_swap(&j->shmem->vp_shmem_transaction_cnt, 0, -1)) {
+ j->shmem->vp_shmem_flags |= VPROC_SHMEM_EXITING;
+ j->sent_kill_via_shmem = true;
+ job_assumes(j, runtime_kill(otherj->p, SIGKILL) != -1);
+ return 0;
+ }
+
+ return BOOTSTRAP_NOT_PRIVILEGED;
</ins><span class="cx"> } else if (otherj->p) {
</span><span class="cx"> job_assumes(j, runtime_kill(otherj->p, sig) != -1);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunklaunchdsrcliblaunch_privateh"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/liblaunch_private.h (23601 => 23602)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/liblaunch_private.h 2008-04-21 20:33:29 UTC (rev 23601)
+++ trunk/launchd/src/liblaunch_private.h 2008-04-21 21:41:09 UTC (rev 23602)
</span><span class="lines">@@ -46,6 +46,7 @@
</span><span class="cx"> #define LAUNCH_KEY_BATCHCONTROL "BatchControl"
</span><span class="cx"> #define LAUNCH_KEY_BATCHQUERY "BatchQuery"
</span><span class="cx">
</span><ins>+#define LAUNCH_JOBKEY_TRANSACTIONCOUNT "TransactionCount"
</ins><span class="cx"> #define LAUNCH_JOBKEY_QUARANTINEDATA "QuarantineData"
</span><span class="cx"> #define LAUNCH_JOBKEY_SANDBOXPROFILE "SandboxProfile"
</span><span class="cx"> #define LAUNCH_JOBKEY_SANDBOXFLAGS "SandboxFlags"
</span></span></pre></div>
<a id="trunklaunchdsrclibvprocc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/libvproc.c (23601 => 23602)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/libvproc.c 2008-04-21 20:33:29 UTC (rev 23601)
+++ trunk/launchd/src/libvproc.c 2008-04-21 21:41:09 UTC (rev 23602)
</span><span class="lines">@@ -132,17 +132,12 @@
</span><span class="cx"> void
</span><span class="cx"> _vproc_transaction_try_exit(int status)
</span><span class="cx"> {
</span><del>- typeof(vproc_shmem->vp_shmem_transaction_cnt) newval;
-
</del><span class="cx"> if (unlikely(vproc_shmem == NULL)) {
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- vproc_shmem->vp_shmem_flags |= VPROC_SHMEM_EXITING;
-
- newval = __sync_sub_and_fetch(&vproc_shmem->vp_shmem_transaction_cnt, 1);
-
- if (newval < 0) {
</del><ins>+ if (__sync_bool_compare_and_swap(&vproc_shmem->vp_shmem_transaction_cnt, 0, -1)) {
+ vproc_shmem->vp_shmem_flags |= VPROC_SHMEM_EXITING;
</ins><span class="cx"> _exit(status);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunklaunchdsrclibvproc_privateh"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/libvproc_private.h (23601 => 23602)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/libvproc_private.h 2008-04-21 20:33:29 UTC (rev 23601)
+++ trunk/launchd/src/libvproc_private.h 2008-04-21 21:41:09 UTC (rev 23602)
</span><span class="lines">@@ -31,8 +31,10 @@
</span><span class="cx">
</span><span class="cx"> #pragma GCC visibility push(default)
</span><span class="cx">
</span><del>-/* DO NOT use this. This is a hack for launchctl */
-#define VPROC_MAGIC_UNLOAD_SIGNAL 0x4141504C
</del><ins>+/* DO NOT use this. This is a hack for 'launchctl' */
+#define VPROC_MAGIC_UNLOAD_SIGNAL 0x4141504C
+/* DO NOT use this. This is a hack for 'loginwindow' */
+#define VPROC_MAGIC_TRYKILL_SIGNAL 0x6161706C
</ins><span class="cx">
</span><span class="cx"> typedef enum {
</span><span class="cx"> VPROC_GSK_LAST_EXIT_STATUS = 1,
</span></span></pre>
</div>
</div>
</body>
</html>