gint waiting;
} ObPingTarget;
-static GHashTable *ping_targets = NULL;
static GHashTable *ping_ids = NULL;
static guint32 ping_next_id = 1;
static void ping_send(ObPingTarget *t);
static void ping_end(ObClient *client, gpointer data);
static gboolean ping_timeout(gpointer data);
+static gboolean find_client(gpointer key, gpointer value, gpointer client);
void ping_startup(gboolean reconfigure)
{
if (reconfigure) return;
- ping_targets = g_hash_table_new(g_direct_hash, g_int_equal);
- ping_ids = g_hash_table_new(g_direct_hash, g_int_equal);
+ ping_ids = g_hash_table_new(g_int_hash, g_int_equal);
/* listen for clients to disappear */
client_add_destroy_notify(ping_end, NULL);
{
if (reconfigure) return;
- g_hash_table_unref(ping_targets);
g_hash_table_unref(ping_ids);
+ ping_ids = NULL;
client_remove_destroy_notify(ping_end);
}
{
ObPingTarget *t;
- g_assert(client->ping == TRUE);
+ /* make sure we're not already pinging the client */
+ g_assert(g_hash_table_find(ping_ids, find_client, client) == NULL);
- /* make sure we're not already pinging it */
- g_assert(g_hash_table_lookup(ping_targets, &client) == NULL);
+ g_assert(client->ping == TRUE);
t = g_new0(ObPingTarget, 1);
t->client = client;
t->h = h;
- g_hash_table_insert(ping_targets, &t->client, t);
-
ob_main_loop_timeout_add(ob_main_loop, PING_TIMEOUT, ping_timeout,
t, g_direct_equal, NULL);
/* act like we just timed out immediately, to start the pinging process
- now instead of after the first delay */
+ now instead of after the first delay. this makes sure the client
+ ends up in the ping_ids hash table now. */
ping_timeout(t);
+
+ /* make sure we can remove the client later */
+ g_assert(g_hash_table_find(ping_ids, find_client, client) != NULL);
}
void ping_stop(struct _ObClient *c)
ObPingTarget *t;
if ((t = g_hash_table_lookup(ping_ids, &id))) {
- /*g_print("-PONG: '%s' (id %u)\n", t->client->title, t->id);*/
+ /*ob_debug("-PONG: '%s' (id %u)\n", t->client->title, t->id);*/
if (t->waiting > PING_TIMEOUT_WARN) {
/* we had notified that they weren't responding, so now we
need to notify that they are again */
ob_debug("Got PONG with id %u but not waiting for one\n", id);
}
+static gboolean find_client(gpointer key, gpointer value, gpointer client)
+{
+ ObPingTarget *t = value;
+ return t->client == client;
+}
+
static void ping_send(ObPingTarget *t)
{
/* t->id is 0 when it hasn't been assigned an id ever yet.
g_hash_table_insert(ping_ids, &t->id, t);
}
- /*g_print("+PING: '%s' (id %u)\n", t->client->title, t->id);*/
+ /*ob_debug("+PING: '%s' (id %u)\n", t->client->title, t->id);*/
PROP_MSG_TO(t->client->window, t->client->window, wm_protocols,
prop_atoms.net_wm_ping, t->id, t->client->window, 0, 0,
NoEventMask);
{
ObPingTarget *t;
- t = g_hash_table_lookup(ping_targets, &client);
- g_assert(t);
+ if ((t = g_hash_table_find(ping_ids, find_client, client))) {
+ g_hash_table_remove(ping_ids, &t->id);
- g_hash_table_remove(ping_targets, &t->client);
- g_hash_table_remove(ping_ids, &t->id);
+ ob_main_loop_timeout_remove_data(ob_main_loop, ping_timeout, t, FALSE);
- ob_main_loop_timeout_remove_data(ob_main_loop, ping_timeout, t, FALSE);
-
- g_free(t);
+ g_free(t);
+ }
}