<!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>[23153] trunk/launchd/src/liblaunch.c</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/launchd/changeset/23153">23153</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2007-03-19 10:49:43 -0700 (Mon, 19 Mar 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unaligned access can slow down the machine.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunklaunchdsrcliblaunchc">trunk/launchd/src/liblaunch.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunklaunchdsrcliblaunchc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/liblaunch.c (23152 => 23153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/liblaunch.c 2007-03-16 14:24:14 UTC (rev 23152)
+++ trunk/launchd/src/liblaunch.c 2007-03-19 17:49:43 UTC (rev 23153)
</span><span class="lines">@@ -574,6 +574,8 @@
</span><span class="cx"> free(lh);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#define ROUND_TO_64BIT_WORD_SIZE(x) ((x + 7) & ~7)
+
</ins><span class="cx"> void
</span><span class="cx"> launch_data_pack(launch_data_t d, void **where, size_t *len, int **fd_where, size_t *fdcnt)
</span><span class="cx"> {
</span><span class="lines">@@ -613,13 +615,13 @@
</span><span class="cx"> o_in_w->string_len = host2big(d->string_len);
</span><span class="cx"> *where = realloc(*where, *len + strlen(d->string) + 1);
</span><span class="cx"> memcpy(*where + *len, d->string, strlen(d->string) + 1);
</span><del>- *len += strlen(d->string) + 1;
</del><ins>+ *len += ROUND_TO_64BIT_WORD_SIZE(strlen(d->string) + 1);
</ins><span class="cx"> break;
</span><span class="cx"> case LAUNCH_DATA_OPAQUE:
</span><span class="cx"> o_in_w->opaque_size = host2big(d->opaque_size);
</span><span class="cx"> *where = realloc(*where, *len + d->opaque_size);
</span><span class="cx"> memcpy(*where + *len, d->opaque, d->opaque_size);
</span><del>- *len += d->opaque_size;
</del><ins>+ *len += ROUND_TO_64BIT_WORD_SIZE(d->opaque_size);
</ins><span class="cx"> break;
</span><span class="cx"> case LAUNCH_DATA_DICTIONARY:
</span><span class="cx"> case LAUNCH_DATA_ARRAY:
</span><span class="lines">@@ -671,7 +673,7 @@
</span><span class="cx"> }
</span><span class="cx"> r->string = conn->recvbuf + *data_offset;
</span><span class="cx"> r->string_len = tmpcnt;
</span><del>- *data_offset += tmpcnt + 1;
</del><ins>+ *data_offset += ROUND_TO_64BIT_WORD_SIZE(tmpcnt + 1);
</ins><span class="cx"> break;
</span><span class="cx"> case LAUNCH_DATA_OPAQUE:
</span><span class="cx"> tmpcnt = big2host(r->opaque_size);
</span><span class="lines">@@ -681,7 +683,7 @@
</span><span class="cx"> }
</span><span class="cx"> r->opaque = conn->recvbuf + *data_offset;
</span><span class="cx"> r->opaque_size = tmpcnt;
</span><del>- *data_offset += tmpcnt;
</del><ins>+ *data_offset += ROUND_TO_64BIT_WORD_SIZE(tmpcnt);
</ins><span class="cx"> break;
</span><span class="cx"> case LAUNCH_DATA_FD:
</span><span class="cx"> if (r->fd != -1) {
</span></span></pre>
</div>
</div>
</body>
</html>