luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-26 15:36:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

performance: Fix signedness of ints throughout

Browse Source 
The tests were using a lot of signed `int`s when actually the values
being handled were always non-negative. Use `unsigned int` consistently
throughout.

Take the opportunity to move declarations of loop iterator variables
into the loops.

This introduces no functional changes.

Signed-off-by: Philip Withnall <pwithnall@gnome.org>

Helps: #3405
This commit is contained in:
Philip Withnall 2024-06-28 14:41:48 +01:00
parent 6129f6f244
commit b7153f5072
No known key found for this signature in database
GPG Key ID: DCDF5885B1F3ED73
1 changed files with 50 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
gobject/tests/performance/performance.c
View File

@ -505,7 +505,7 @@ complex_object_init (ComplexObject *complex_object)
struct ConstructionTest { struct ConstructionTest {
GObject **objects; GObject **objects;
int n_objects; unsigned int n_objects;
GType type; GType type;
}; };
@ -526,7 +526,7 @@ test_construction_init (PerformanceTest *test,
double count_factor) double count_factor)
{ {
struct ConstructionTest *data = _data; struct ConstructionTest *data = _data;
int n; unsigned int n;
n = NUM_OBJECT_TO_CONSTRUCT * count_factor; n = NUM_OBJECT_TO_CONSTRUCT * count_factor;
if (data->n_objects != n) if (data->n_objects != n)
@ -543,10 +543,10 @@ test_construction_run (PerformanceTest *test,
struct ConstructionTest *data = _data; struct ConstructionTest *data = _data;
GObject **objects = data->objects; GObject **objects = data->objects;
GType type = data->type; GType type = data->type;
int i, n_objects; unsigned int n_objects;
n_objects = data->n_objects; n_objects = data->n_objects;
for (i = 0; i < n_objects; i++) for (unsigned int i = 0; i < n_objects; i++)
objects[i] = g_object_new (type, NULL); objects[i] = g_object_new (type, NULL);
} }
@ -556,10 +556,10 @@ test_construction_run1 (PerformanceTest *test,
{ {
struct ConstructionTest *data = _data; struct ConstructionTest *data = _data;
GObject **objects = data->objects; GObject **objects = data->objects;
int i, n_objects; unsigned int n_objects;
n_objects = data->n_objects; n_objects = data->n_objects;
for (i = 0; i < n_objects; i++) for (unsigned int i = 0; i < n_objects; i++)
objects[i] = (GObject *) g_slice_new0 (SimpleObject); objects[i] = (GObject *) g_slice_new0 (SimpleObject);
} }
@ -570,10 +570,10 @@ test_complex_construction_run (PerformanceTest *test,
struct ConstructionTest *data = _data; struct ConstructionTest *data = _data;
GObject **objects = data->objects; GObject **objects = data->objects;
GType type = data->type; GType type = data->type;
int i, n_objects; unsigned int n_objects;
n_objects = data->n_objects; n_objects = data->n_objects;
for (i = 0; i < n_objects; i++) for (unsigned int i = 0; i < n_objects; i++)
objects[i] = g_object_new (type, "val1", 5, "val2", "thousand", NULL); objects[i] = g_object_new (type, "val1", 5, "val2", "thousand", NULL);
} }
@ -584,10 +584,10 @@ test_complex_construction_run1 (PerformanceTest *test,
struct ConstructionTest *data = _data; struct ConstructionTest *data = _data;
GObject **objects = data->objects; GObject **objects = data->objects;
GType type = data->type; GType type = data->type;
int i, n_objects; unsigned int n_objects;
n_objects = data->n_objects; n_objects = data->n_objects;
for (i = 0; i < n_objects; i++) for (unsigned int i = 0; i < n_objects; i++)
{ {
ComplexObject *object; ComplexObject *object;
object = (ComplexObject *)g_object_new (type, NULL); object = (ComplexObject *)g_object_new (type, NULL);
@ -604,10 +604,10 @@ test_complex_construction_run2 (PerformanceTest *test,
struct ConstructionTest *data = _data; struct ConstructionTest *data = _data;
GObject **objects = data->objects; GObject **objects = data->objects;
GType type = data->type; GType type = data->type;
int i, n_objects; unsigned int n_objects;
n_objects = data->n_objects; n_objects = data->n_objects;
for (i = 0; i < n_objects; i++) for (unsigned int i = 0; i < n_objects; i++)
{ {
objects[i] = g_object_new (type, NULL); objects[i] = g_object_new (type, NULL);
} }
@ -618,9 +618,8 @@ test_construction_finish (PerformanceTest *test,
gpointer _data) gpointer _data)
{ {
struct ConstructionTest *data = _data; struct ConstructionTest *data = _data;
int i;
for (i = 0; i < data->n_objects; i++) for (unsigned int i = 0; i < data->n_objects; i++)
g_object_unref (data->objects[i]); g_object_unref (data->objects[i]);
} }
@ -629,9 +628,8 @@ test_construction_finish1 (PerformanceTest *test,
gpointer _data) gpointer _data)
{ {
struct ConstructionTest *data = _data; struct ConstructionTest *data = _data;
int i;
for (i = 0; i < data->n_objects; i++) for (unsigned int i = 0; i < data->n_objects; i++)
g_slice_free (SimpleObject, (SimpleObject *)data->objects[i]); g_slice_free (SimpleObject, (SimpleObject *)data->objects[i]);
} }
@ -650,7 +648,7 @@ test_finalization_init (PerformanceTest *test,
double count_factor) double count_factor)
{ {
struct ConstructionTest *data = _data; struct ConstructionTest *data = _data;
int n; unsigned int n;
n = NUM_OBJECT_TO_CONSTRUCT * count_factor; n = NUM_OBJECT_TO_CONSTRUCT * count_factor;
if (data->n_objects != n) if (data->n_objects != n)
@ -659,7 +657,7 @@ test_finalization_init (PerformanceTest *test,
data->objects = g_renew (GObject *, data->objects, n); data->objects = g_renew (GObject *, data->objects, n);
} }
for (int i = 0; i < data->n_objects; i++) for (unsigned int i = 0; i < data->n_objects; i++)
{ {
data->objects[i] = g_object_new (data->type, NULL); data->objects[i] = g_object_new (data->type, NULL);
} }
@ -671,10 +669,10 @@ test_finalization_run (PerformanceTest *test,
{ {
struct ConstructionTest *data = _data; struct ConstructionTest *data = _data;
GObject **objects = data->objects; GObject **objects = data->objects;
int i, n_objects; unsigned int n_objects;
n_objects = data->n_objects; n_objects = data->n_objects;
for (i = 0; i < n_objects; i++) for (unsigned int i = 0; i < n_objects; i++)
{ {
g_object_unref (objects[i]); g_object_unref (objects[i]);
} }
@ -716,7 +714,7 @@ test_finalization_print_result (PerformanceTest *test,
struct TypeCheckTest { struct TypeCheckTest {
GObject *object; GObject *object;
int n_checks; unsigned int n_checks;
}; };
static gpointer static gpointer
@ -753,7 +751,6 @@ test_type_check_run (PerformanceTest *test,
struct TypeCheckTest *data = _data; struct TypeCheckTest *data = _data;
GObject *object = data->object; GObject *object = data->object;
GType type, types[5]; GType type, types[5];
int i, j;
types[0] = test_iface1_get_type (); types[0] = test_iface1_get_type ();
types[1] = test_iface2_get_type (); types[1] = test_iface2_get_type ();
@ -761,10 +758,10 @@ test_type_check_run (PerformanceTest *test,
types[3] = test_iface4_get_type (); types[3] = test_iface4_get_type ();
types[4] = test_iface5_get_type (); types[4] = test_iface5_get_type ();
for (i = 0; i < data->n_checks; i++) for (unsigned int i = 0; i < data->n_checks; i++)
{ {
type = types[i%5]; type = types[i%5];
for (j = 0; j < 1000; j++) for (unsigned int j = 0; j < 1000; j++)
{ {
my_type_check_instance_is_a ((GTypeInstance *)object, my_type_check_instance_is_a ((GTypeInstance *)object,
type); type);
@ -806,8 +803,8 @@ test_type_check_teardown (PerformanceTest *test,
struct EmissionTest { struct EmissionTest {
GObject *object; GObject *object;
int n_checks; unsigned int n_checks;
int signal_id; unsigned int signal_id;
}; };
static void static void
@ -816,9 +813,8 @@ test_emission_run (PerformanceTest *test,
{ {
struct EmissionTest *data = _data; struct EmissionTest *data = _data;
GObject *object = data->object; GObject *object = data->object;
int i;
for (i = 0; i < data->n_checks; i++) for (unsigned int i = 0; i < data->n_checks; i++)
g_signal_emit (object, data->signal_id, 0); g_signal_emit (object, data->signal_id, 0);
} }
@ -828,9 +824,8 @@ test_emission_run_args (PerformanceTest *test,
{ {
struct EmissionTest *data = _data; struct EmissionTest *data = _data;
GObject *object = data->object; GObject *object = data->object;
int i;
for (i = 0; i < data->n_checks; i++) for (unsigned int i = 0; i < data->n_checks; i++)
g_signal_emit (object, data->signal_id, 0, 0, NULL); g_signal_emit (object, data->signal_id, 0, 0, NULL);
} }
@ -845,7 +840,7 @@ test_emission_unhandled_setup (PerformanceTest *test)
data = g_new0 (struct EmissionTest, 1); data = g_new0 (struct EmissionTest, 1);
data->object = g_object_new (COMPLEX_TYPE_OBJECT, NULL); data->object = g_object_new (COMPLEX_TYPE_OBJECT, NULL);
data->signal_id = complex_signals[GPOINTER_TO_INT (test->extra_data)]; data->signal_id = complex_signals[GPOINTER_TO_UINT (test->extra_data)];
return data; return data;
} }
@ -902,7 +897,7 @@ test_emission_handled_setup (PerformanceTest *test)
data = g_new0 (struct EmissionTest, 1); data = g_new0 (struct EmissionTest, 1);
data->object = g_object_new (COMPLEX_TYPE_OBJECT, NULL); data->object = g_object_new (COMPLEX_TYPE_OBJECT, NULL);
data->signal_id = complex_signals[GPOINTER_TO_INT (test->extra_data)]; data->signal_id = complex_signals[GPOINTER_TO_UINT (test->extra_data)];
g_signal_connect (data->object, "signal", g_signal_connect (data->object, "signal",
G_CALLBACK (test_emission_handled_handler), G_CALLBACK (test_emission_handled_handler),
NULL); NULL);
@ -967,7 +962,7 @@ test_emission_handled_teardown (PerformanceTest *test,
struct NotifyTest { struct NotifyTest {
GObject *object; GObject *object;
unsigned n_checks; unsigned int n_checks;
}; };
static void static void
@ -977,7 +972,7 @@ test_notify_run (PerformanceTest *test,
struct NotifyTest *data = _data; struct NotifyTest *data = _data;
GObject *object = data->object; GObject *object = data->object;
for (unsigned i = 0; i < data->n_checks; i++) for (unsigned int i = 0; i < data->n_checks; i++)
g_object_notify (object, "val1"); g_object_notify (object, "val1");
} }
@ -988,7 +983,7 @@ test_notify_by_pspec_run (PerformanceTest *test,
struct NotifyTest *data = _data; struct NotifyTest *data = _data;
GObject *object = data->object; GObject *object = data->object;
for (unsigned i = 0; i < data->n_checks; i++) for (unsigned int i = 0; i < data->n_checks; i++)
g_object_notify_by_pspec (object, pspecs[PROP_VAL1]); g_object_notify_by_pspec (object, pspecs[PROP_VAL1]);
} }
@ -1117,7 +1112,7 @@ test_notify_handled_teardown (PerformanceTest *test,
struct SetTest { struct SetTest {
GObject *object; GObject *object;
unsigned n_checks; unsigned int n_checks;
}; };
static void static void
@ -1127,7 +1122,7 @@ test_set_run (PerformanceTest *test,
struct SetTest *data = _data; struct SetTest *data = _data;
GObject *object = data->object; GObject *object = data->object;
for (unsigned i = 0; i < data->n_checks; i++) for (unsigned int i = 0; i < data->n_checks; i++)
g_object_set (object, "val1", i, NULL); g_object_set (object, "val1", i, NULL);
} }
@ -1194,7 +1189,7 @@ test_set_teardown (PerformanceTest *test,
struct GetTest { struct GetTest {
GObject *object; GObject *object;
unsigned n_checks; unsigned int n_checks;
}; };
static void static void
@ -1205,7 +1200,7 @@ test_get_run (PerformanceTest *test,
GObject *object = data->object; GObject *object = data->object;
int val; int val;
for (unsigned i = 0; i < data->n_checks; i++) for (unsigned int i = 0; i < data->n_checks; i++)
g_object_get (object, "val1", &val, NULL); g_object_get (object, "val1", &val, NULL);
} }
@ -1272,7 +1267,7 @@ test_get_teardown (PerformanceTest *test,
struct RefcountTest { struct RefcountTest {
GObject *object; GObject *object;
int n_checks; unsigned int n_checks;
gboolean is_toggle_ref; gboolean is_toggle_ref;
}; };
@ -1317,9 +1312,8 @@ test_refcount_run (PerformanceTest *test,
{ {
struct RefcountTest *data = _data; struct RefcountTest *data = _data;
GObject *object = data->object; GObject *object = data->object;
int i;
for (i = 0; i < data->n_checks; i++) for (unsigned int i = 0; i < data->n_checks; i++)
{ {
g_object_ref (object); g_object_ref (object);
g_object_ref (object); g_object_ref (object);
@ -1341,9 +1335,8 @@ test_refcount_1_run (PerformanceTest *test,
{ {
struct RefcountTest *data = _data; struct RefcountTest *data = _data;
GObject *object = data->object; GObject *object = data->object;
int i;
for (i = 0; i < data->n_checks; i++) for (unsigned int i = 0; i < data->n_checks; i++)
{ {
g_object_ref (object); g_object_ref (object);
g_object_unref (object); g_object_unref (object);
@ -1457,7 +1450,7 @@ static PerformanceTest tests[] = {
}, },
{ {
"emit-unhandled", "emit-unhandled",
GINT_TO_POINTER (COMPLEX_SIGNAL), GUINT_TO_POINTER (COMPLEX_SIGNAL),
test_emission_unhandled_setup, test_emission_unhandled_setup,
test_emission_unhandled_init, test_emission_unhandled_init,
test_emission_run, test_emission_run,
@ -1467,7 +1460,7 @@ static PerformanceTest tests[] = {
}, },
{ {
"emit-unhandled-empty", "emit-unhandled-empty",
GINT_TO_POINTER (COMPLEX_SIGNAL_EMPTY), GUINT_TO_POINTER (COMPLEX_SIGNAL_EMPTY),
test_emission_unhandled_setup, test_emission_unhandled_setup,
test_emission_unhandled_init, test_emission_unhandled_init,
test_emission_run, test_emission_run,
@ -1477,7 +1470,7 @@ static PerformanceTest tests[] = {
}, },
{ {
"emit-unhandled-generic", "emit-unhandled-generic",
GINT_TO_POINTER (COMPLEX_SIGNAL_GENERIC), GUINT_TO_POINTER (COMPLEX_SIGNAL_GENERIC),
test_emission_unhandled_setup, test_emission_unhandled_setup,
test_emission_unhandled_init, test_emission_unhandled_init,
test_emission_run, test_emission_run,
@ -1487,7 +1480,7 @@ static PerformanceTest tests[] = {
}, },
{ {
"emit-unhandled-generic-empty", "emit-unhandled-generic-empty",
GINT_TO_POINTER (COMPLEX_SIGNAL_GENERIC_EMPTY), GUINT_TO_POINTER (COMPLEX_SIGNAL_GENERIC_EMPTY),
test_emission_unhandled_setup, test_emission_unhandled_setup,
test_emission_unhandled_init, test_emission_unhandled_init,
test_emission_run, test_emission_run,
@ -1497,7 +1490,7 @@ static PerformanceTest tests[] = {
}, },
{ {
"emit-unhandled-args", "emit-unhandled-args",
GINT_TO_POINTER (COMPLEX_SIGNAL_ARGS), GUINT_TO_POINTER (COMPLEX_SIGNAL_ARGS),
test_emission_unhandled_setup, test_emission_unhandled_setup,
test_emission_unhandled_init, test_emission_unhandled_init,
test_emission_run_args, test_emission_run_args,
@ -1507,7 +1500,7 @@ static PerformanceTest tests[] = {
}, },
{ {
"emit-handled", "emit-handled",
GINT_TO_POINTER (COMPLEX_SIGNAL), GUINT_TO_POINTER (COMPLEX_SIGNAL),
test_emission_handled_setup, test_emission_handled_setup,
test_emission_handled_init, test_emission_handled_init,
test_emission_run, test_emission_run,
@ -1517,7 +1510,7 @@ static PerformanceTest tests[] = {
}, },
{ {
"emit-handled-empty", "emit-handled-empty",
GINT_TO_POINTER (COMPLEX_SIGNAL_EMPTY), GUINT_TO_POINTER (COMPLEX_SIGNAL_EMPTY),
test_emission_handled_setup, test_emission_handled_setup,
test_emission_handled_init, test_emission_handled_init,
test_emission_run, test_emission_run,
@ -1527,7 +1520,7 @@ static PerformanceTest tests[] = {
}, },
{ {
"emit-handled-generic", "emit-handled-generic",
GINT_TO_POINTER (COMPLEX_SIGNAL_GENERIC), GUINT_TO_POINTER (COMPLEX_SIGNAL_GENERIC),
test_emission_handled_setup, test_emission_handled_setup,
test_emission_handled_init, test_emission_handled_init,
test_emission_run, test_emission_run,
@ -1537,7 +1530,7 @@ static PerformanceTest tests[] = {
}, },
{ {
"emit-handled-generic-empty", "emit-handled-generic-empty",
GINT_TO_POINTER (COMPLEX_SIGNAL_GENERIC_EMPTY), GUINT_TO_POINTER (COMPLEX_SIGNAL_GENERIC_EMPTY),
test_emission_handled_setup, test_emission_handled_setup,
test_emission_handled_init, test_emission_handled_init,
test_emission_run, test_emission_run,
@ -1547,7 +1540,7 @@ static PerformanceTest tests[] = {
}, },
{ {
"emit-handled-args", "emit-handled-args",
GINT_TO_POINTER (COMPLEX_SIGNAL_ARGS), GUINT_TO_POINTER (COMPLEX_SIGNAL_ARGS),
test_emission_handled_setup, test_emission_handled_setup,
test_emission_handled_init, test_emission_handled_init,
test_emission_run_args, test_emission_run_args,
@ -1650,8 +1643,7 @@ static PerformanceTest tests[] = {
static PerformanceTest * static PerformanceTest *
find_test (const char *name) find_test (const char *name)
{ {
gsize i; for (size_t i = 0; i < G_N_ELEMENTS (tests); i++)
for (i = 0; i < G_N_ELEMENTS (tests); i++)
{ {
if (strcmp (tests[i].name, name) == 0) if (strcmp (tests[i].name, name) == 0)
return &tests[i]; return &tests[i];
@ -1666,7 +1658,6 @@ main (int argc,
GOptionContext *context; GOptionContext *context;
GError *error = NULL; GError *error = NULL;
const char *str; const char *str;
int i;
if ((str = g_getenv ("GLIB_PERFORMANCE_FACTOR")) && str[0]) if ((str = g_getenv ("GLIB_PERFORMANCE_FACTOR")) && str[0])
{ {
@ -1691,7 +1682,7 @@ main (int argc,
if (argc > 1) if (argc > 1)
{ {
for (i = 1; i < argc; i++) for (int i = 1; i < argc; i++)
{ {
test = find_test (argv[i]); test = find_test (argv[i]);
if (test) if (test)
@ -1700,8 +1691,7 @@ main (int argc,
} }
else else
{ {
gsize k; for (size_t k = 0; k < G_N_ELEMENTS (tests); k++)
for (k = 0; k < G_N_ELEMENTS (tests); k++)
run_test (&tests[k]); run_test (&tests[k]);
} }