Changeset 23153

Timestamp:

03/19/07 10:49:43 (21 months ago)

Author:

zarzycki@…

Message:

Unaligned access can slow down the machine.

Files:

• trunk/launchd/src/liblaunch.c (modified) (5 diffs)

trunk/launchd/src/liblaunch.c

@@ -575 +575 @@
 }
 
+#define ROUND_TO_64BIT_WORD_SIZE(x)     ((x + 7) & ~7)
+
 void
 launch_data_pack(launch_data_t d, void **where, size_t *len, int **fd_where, size_t *fdcnt)
@@ -614 +616 @@
                 *where = realloc(*where, *len + strlen(d->string) + 1);
                 memcpy(*where + *len, d->string, strlen(d->string) + 1);
-                *len += strlen(d->string) + 1;
+                *len += ROUND_TO_64BIT_WORD_SIZE(strlen(d->string) + 1);
                 break;
         case LAUNCH_DATA_OPAQUE:
@@ -620 +622 @@
                 *where = realloc(*where, *len + d->opaque_size);
                 memcpy(*where + *len, d->opaque, d->opaque_size);
-                *len += d->opaque_size;
+                *len += ROUND_TO_64BIT_WORD_SIZE(d->opaque_size);
                 break;
         case LAUNCH_DATA_DICTIONARY:
@@ -672 +674 @@
                 r->string = conn->recvbuf + *data_offset;
                 r->string_len = tmpcnt;
-                *data_offset += tmpcnt + 1;
+                *data_offset += ROUND_TO_64BIT_WORD_SIZE(tmpcnt + 1);
                 break;
         case LAUNCH_DATA_OPAQUE:
@@ -682 +684 @@
                 r->opaque = conn->recvbuf + *data_offset;
                 r->opaque_size = tmpcnt;
-                *data_offset += tmpcnt;
+                *data_offset += ROUND_TO_64BIT_WORD_SIZE(tmpcnt);
                 break;
         case LAUNCH_DATA_FD: