fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 12:28:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

platform/tests: make timeout_ms argument for nmtstp_wait_for_signal() signed

Browse source 
Having an unsigned "guint timeout_ms" argument is very inconvenient, because

    nmtstp_wait_for_signal (NM_PLATFORM_GET (), end_time - now_time);

might easily be negative. In such a case, the correct behavior
is to wait not at all.
This commit is contained in:
Thomas Haller 2017-05-31 10:09:10 +02:00
parent af9c474844
commit 07751b444b
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/platform/tests/test-common.c
View file

@ -372,7 +372,7 @@ _wait_for_signal_timeout (gpointer user_data)
} }
guint guint
nmtstp_wait_for_signal (NMPlatform *platform, guint timeout_ms) nmtstp_wait_for_signal (NMPlatform *platform, gint64 timeout_ms)
{ {
WaitForSignalData data = { 0 }; WaitForSignalData data = { 0 };
gulong id_link, id_ip4_address, id_ip6_address, id_ip4_route, id_ip6_route; gulong id_link, id_ip4_address, id_ip6_address, id_ip4_route, id_ip6_route;
@ -387,7 +387,18 @@ nmtstp_wait_for_signal (NMPlatform *platform, guint timeout_ms)
id_ip4_route = g_signal_connect (platform, NM_PLATFORM_SIGNAL_IP4_ROUTE_CHANGED, G_CALLBACK (_wait_for_signal_cb), &data); id_ip4_route = g_signal_connect (platform, NM_PLATFORM_SIGNAL_IP4_ROUTE_CHANGED, G_CALLBACK (_wait_for_signal_cb), &data);
id_ip6_route = g_signal_connect (platform, NM_PLATFORM_SIGNAL_IP6_ROUTE_CHANGED, G_CALLBACK (_wait_for_signal_cb), &data); id_ip6_route = g_signal_connect (platform, NM_PLATFORM_SIGNAL_IP6_ROUTE_CHANGED, G_CALLBACK (_wait_for_signal_cb), &data);
data.id = g_timeout_add (timeout_ms, _wait_for_signal_timeout, &data); /* if timeout_ms is negative, it means the wait-time already expired.
* Maybe, we should do nothing and return right away, without even
* processing events from platform. However, that inconsistency (of not
* processing events from mainloop) is inconvenient.
*
* It's better that on the return of nmtstp_wait_for_signal(), we always
* have no events pending. So, a negative timeout is treated the same as
* a zero timeout: we check whether there are any events pending in platform,
* and quite the mainloop immediately afterwards. But we always check. */
data.id = g_timeout_add (CLAMP (timeout_ms, 0, G_MAXUINT32),
_wait_for_signal_timeout, &data);
g_main_loop_run (data.loop); g_main_loop_run (data.loop);
@ -416,14 +427,14 @@ nmtstp_wait_for_signal_until (NMPlatform *platform, gint64 until_ms)
if (until_ms < now) if (until_ms < now)
return 0; return 0;
signal_counts = nmtstp_wait_for_signal (platform, MAX (0, until_ms - now)); signal_counts = nmtstp_wait_for_signal (platform, until_ms - now);
if (signal_counts) if (signal_counts)
return signal_counts; return signal_counts;
} }
} }
const NMPlatformLink * const NMPlatformLink *
nmtstp_wait_for_link (NMPlatform *platform, const char *ifname, NMLinkType expected_link_type, guint timeout_ms) nmtstp_wait_for_link (NMPlatform *platform, const char *ifname, NMLinkType expected_link_type, gint64 timeout_ms)
{ {
return nmtstp_wait_for_link_until (platform, ifname, expected_link_type, nm_utils_get_monotonic_timestamp_ms () + timeout_ms); return nmtstp_wait_for_link_until (platform, ifname, expected_link_type, nm_utils_get_monotonic_timestamp_ms () + timeout_ms);
} }
@ -447,7 +458,7 @@ nmtstp_wait_for_link_until (NMPlatform *platform, const char *ifname, NMLinkType
if (until_ms < now) if (until_ms < now)
return NULL; return NULL;
nmtstp_wait_for_signal (platform, MAX (0, until_ms - now)); nmtstp_wait_for_signal (platform, until_ms - now);
} }
} }

4
src/platform/tests/test-common.h
View file

@ -93,9 +93,9 @@ int nmtstp_run_command (const char *format, ...) _nm_printf (1, 2);
/*****************************************************************************/ /*****************************************************************************/
guint nmtstp_wait_for_signal (NMPlatform *platform, guint timeout_ms); guint nmtstp_wait_for_signal (NMPlatform *platform, gint64 timeout_ms);
guint nmtstp_wait_for_signal_until (NMPlatform *platform, gint64 until_ms); guint nmtstp_wait_for_signal_until (NMPlatform *platform, gint64 until_ms);
const NMPlatformLink *nmtstp_wait_for_link (NMPlatform *platform, const char *ifname, NMLinkType expected_link_type, guint timeout_ms); const NMPlatformLink *nmtstp_wait_for_link (NMPlatform *platform, const char *ifname, NMLinkType expected_link_type, gint64 timeout_ms);
const NMPlatformLink *nmtstp_wait_for_link_until (NMPlatform *platform, const char *ifname, NMLinkType expected_link_type, gint64 until_ms); const NMPlatformLink *nmtstp_wait_for_link_until (NMPlatform *platform, const char *ifname, NMLinkType expected_link_type, gint64 until_ms);
#define nmtstp_assert_wait_for_signal(platform, timeout_ms) \ #define nmtstp_assert_wait_for_signal(platform, timeout_ms) \