dbus/dbus dbus-marshal-basic.c, 1.4, 1.5 dbus-marshal-recursive.c,
1.18, 1.19 dbus-string.c, 1.58, 1.59
Havoc Pennington
hp at freedesktop.org
Fri Dec 31 18:35:11 PST 2004
Update of /cvs/dbus/dbus/dbus
In directory gabe:/tmp/cvs-serv24971
Modified Files:
dbus-marshal-basic.c dbus-marshal-recursive.c dbus-string.c
Log Message:
add int64 to test suites, fix minor bug where marshaling assumed that DBusOctets8 was aligned when passed in as a function argument
Index: dbus-marshal-basic.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-marshal-basic.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- dbus-marshal-basic.c 30 Dec 2004 22:34:17 -0000 1.4
+++ dbus-marshal-basic.c 1 Jan 2005 02:35:09 -0000 1.5
@@ -195,6 +195,20 @@
}
static void
+swap_8_octets (DBusOctets8 *value,
+ int byte_order)
+{
+ if (byte_order != DBUS_COMPILER_BYTE_ORDER)
+ {
+#ifdef DBUS_HAVE_INT64
+ value->u = DBUS_UINT64_SWAP_LE_BE (value->u);
+#else
+ swap_bytes ((unsigned char *)value, 8);
+#endif
+ }
+}
+
+static void
pack_8_octets (DBusOctets8 value,
int byte_order,
unsigned char *data)
@@ -208,8 +222,7 @@
*((dbus_uint64_t*)(data)) = DBUS_UINT64_TO_BE (value.u);
#else
memcpy (data, &value, 8);
- if (byte_order != DBUS_COMPILER_BYTE_ORDER)
- swap_bytes ((unsigned char *)data, 8);
+ swap_8_octets ((DBusOctets8*)data, byte_order);
#endif
}
@@ -483,10 +496,9 @@
DBusOctets8 value)
{
_dbus_assert (sizeof (value) == 8);
-
- if (byte_order != DBUS_COMPILER_BYTE_ORDER)
- pack_8_octets (value, byte_order, (unsigned char*) &value); /* pack into self, swapping as we go */
+ swap_8_octets (&value, byte_order);
+
return _dbus_string_insert_8_aligned (str, insert_at,
(const unsigned char *)&value);
}
Index: dbus-marshal-recursive.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-marshal-recursive.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- dbus-marshal-recursive.c 1 Jan 2005 02:03:50 -0000 1.18
+++ dbus-marshal-recursive.c 1 Jan 2005 02:35:09 -0000 1.19
@@ -1434,6 +1434,14 @@
DataBlock *block,
DBusTypeReader *reader,
int seed);
+static dbus_bool_t int64_write_value (TestTypeNode *node,
+ DataBlock *block,
+ DBusTypeWriter *writer,
+ int seed);
+static dbus_bool_t int64_read_value (TestTypeNode *node,
+ DataBlock *block,
+ DBusTypeReader *reader,
+ int seed);
static dbus_bool_t struct_1_write_value (TestTypeNode *node,
DataBlock *block,
DBusTypeWriter *writer,
@@ -1504,6 +1512,26 @@
NULL
};
+static const TestTypeNodeClass int64_class = {
+ DBUS_TYPE_INT64,
+ sizeof (TestTypeNode),
+ NULL,
+ NULL,
+ int64_write_value,
+ int64_read_value,
+ NULL
+};
+
+static const TestTypeNodeClass uint64_class = {
+ DBUS_TYPE_UINT64,
+ sizeof (TestTypeNode),
+ NULL,
+ NULL,
+ int64_write_value, /* recycle from int64 */
+ int64_read_value, /* recycle from int64 */
+ NULL
+};
+
static const TestTypeNodeClass struct_1_class = {
DBUS_TYPE_STRUCT,
sizeof (TestTypeNodeContainer),
@@ -1557,7 +1585,9 @@
static const TestTypeNodeClass* const
basic_nodes[] = {
&int32_class,
- &uint32_class
+ &uint32_class,
+ &int64_class,
+ &uint64_class
};
#define N_BASICS (_DBUS_N_ELEMENTS (basic_nodes))
@@ -1736,9 +1766,17 @@
nid.n_nodes = n_nodes;
nid.byte_order = byte_order;
+ /* FIXME put the OOM testing back once we debug everything and are willing to
+ * wait for it to run ;-)
+ */
+#if 0
_dbus_test_oom_handling ("running test node",
run_test_nodes_iteration,
&nid);
+#else
+ if (!run_test_nodes_iteration (&nid))
+ _dbus_assert_not_reached ("no memory");
+#endif
data_block_free (&block);
}
@@ -2216,6 +2254,64 @@
return TRUE;
}
+#ifdef DBUS_HAVE_INT64
+static dbus_int64_t
+int64_from_seed (int seed)
+{
+ dbus_int32_t v32;
+ dbus_int64_t v;
+
+ v32 = int32_from_seed (seed);
+
+ v = (((dbus_int64_t)v32) << 32) | (~v32);
+
+ return v;
+}
+#endif
+
+static dbus_bool_t
+int64_write_value (TestTypeNode *node,
+ DataBlock *block,
+ DBusTypeWriter *writer,
+ int seed)
+{
+#ifdef DBUS_HAVE_INT64
+ /* also used for uint64 */
+ dbus_int64_t v;
+
+ v = int64_from_seed (seed);
+
+ return _dbus_type_writer_write_basic (writer,
+ node->klass->typecode,
+ &v);
+#else
+ return TRUE;
+#endif
+}
+
+static dbus_bool_t
+int64_read_value (TestTypeNode *node,
+ DataBlock *block,
+ DBusTypeReader *reader,
+ int seed)
+{
+#ifdef DBUS_HAVE_INT64
+ /* also used for uint64 */
+ dbus_int64_t v;
+
+ check_expected_type (reader, node->klass->typecode);
+
+ _dbus_type_reader_read_basic (reader,
+ (dbus_int64_t*) &v);
+
+ _dbus_assert (v == int64_from_seed (seed));
+
+ return TRUE;
+#else
+ return TRUE;
+#endif
+}
+
static dbus_bool_t
struct_N_write_value (TestTypeNode *node,
DataBlock *block,
Index: dbus-string.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-string.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- dbus-string.c 31 Dec 2004 21:01:56 -0000 1.58
+++ dbus-string.c 1 Jan 2005 02:35:09 -0000 1.59
@@ -1148,6 +1148,8 @@
if (!align_insert_point_then_open_gap (str, &insert_at, 8, 8))
return FALSE;
+ _dbus_assert (_DBUS_ALIGN_VALUE (insert_at, 8) == (unsigned) insert_at);
+
ASSIGN_8_OCTETS (real->str + insert_at, octets);
return TRUE;
More information about the dbus-commit
mailing list