<!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>[23635] trunk/launchd/src/launchd_runtime.c</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/launchd/changeset/23635">23635</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2008-05-22 09:05:37 -0700 (Thu, 22 May 2008)</dd>
</dl>
<h3>Log Message</h3>
<pre><rdar://problem/5954860> launchd crashed, bringing down my session</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunklaunchdsrclaunchd_runtimec">trunk/launchd/src/launchd_runtime.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunklaunchdsrclaunchd_runtimec"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd_runtime.c (23634 => 23635)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_runtime.c 2008-05-22 00:29:57 UTC (rev 23634)
+++ trunk/launchd/src/launchd_runtime.c 2008-05-22 16:05:37 UTC (rev 23635)
</span><span class="lines">@@ -602,33 +602,35 @@
</span><span class="cx"> x_handle_kqueue(mach_port_t junk __attribute__((unused)), integer_t fd)
</span><span class="cx"> {
</span><span class="cx"> struct timespec ts = { 0, 0 };
</span><del>- struct kevent kev[BULK_KEV_MAX];
</del><ins>+ struct kevent *kevi, kev[BULK_KEV_MAX];
</ins><span class="cx"> int i;
</span><span class="cx">
</span><span class="cx"> bulk_kev = kev;
</span><span class="cx">
</span><span class="cx"> if (launchd_assumes((bulk_kev_cnt = kevent(fd, NULL, 0, kev, BULK_KEV_MAX, &ts)) != -1)) {
</span><del>-#if 0
- Dl_info dli;
-
- if (launchd_assumes(malloc_size(kev.udata) || dladdr(kev.udata, &dli))) {
-#endif
</del><span class="cx"> for (i = 0; i < bulk_kev_cnt; i++) {
</span><span class="cx"> log_kevent_struct(LOG_DEBUG, kev, i);
</span><span class="cx"> }
</span><span class="cx"> for (i = 0; i < bulk_kev_cnt; i++) {
</span><span class="cx"> bulk_kev_i = i;
</span><del>- if (kev[i].filter) {
- runtime_ktrace(RTKT_LAUNCHD_BSD_KEVENT|DBG_FUNC_START, kev[i].ident, kev[i].filter, kev[i].fflags);
- (*((kq_callback *)kev[i].udata))(kev[i].udata, &kev[i]);
</del><ins>+ kevi = &kev[i];
+
+ if (kevi->filter) {
+#if 1
+ Dl_info dli;
+
+ if (launchd_assumes(malloc_size(kevi->udata) || dladdr(kevi->udata, &dli))) {
+#endif
+ runtime_ktrace(RTKT_LAUNCHD_BSD_KEVENT|DBG_FUNC_START, kevi->ident, kevi->filter, kevi->fflags);
+ (*((kq_callback *)kevi->udata))(kevi->udata, kevi);
</ins><span class="cx"> runtime_ktrace0(RTKT_LAUNCHD_BSD_KEVENT|DBG_FUNC_END);
</span><ins>+#if 1
+ } else {
+ log_kevent_struct(LOG_EMERG, kevi, 0);
+ }
+#endif
</ins><span class="cx"> }
</span><span class="cx"> }
</span><del>-#if 0
- } else {
- log_kevent_struct(LOG_ERR, &kev, 0);
- }
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bulk_kev = NULL;
</span></span></pre>
</div>
</div>
</body>
</html>