mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-11-10 19:36:18 +01:00
e13c646465
Commit f975858e86
removed the NULL check in g_cancellable_cancel() by
accident which makes it crash when called with NULL.
Add the check back and add a test so this doesn't happen again.
Fixes #1710
235 lines
6.2 KiB
C
235 lines
6.2 KiB
C
/* GIO - GLib Input, Output and Streaming Library
|
|
*
|
|
* Copyright (C) 2011 Collabora Ltd.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General
|
|
* Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
|
|
*
|
|
* Author: Stef Walter <stefw@collabora.co.uk>
|
|
*/
|
|
|
|
#include <locale.h>
|
|
|
|
#include <gio/gio.h>
|
|
|
|
/* How long to wait in ms for each iteration */
|
|
#define WAIT_ITERATION (10)
|
|
|
|
static gint num_async_operations = 0;
|
|
|
|
typedef struct
|
|
{
|
|
guint iterations_requested;
|
|
guint iterations_done;
|
|
} MockOperationData;
|
|
|
|
static void
|
|
mock_operation_free (gpointer user_data)
|
|
{
|
|
MockOperationData *data = user_data;
|
|
g_free (data);
|
|
}
|
|
|
|
static void
|
|
mock_operation_thread (GTask *task,
|
|
gpointer source_object,
|
|
gpointer task_data,
|
|
GCancellable *cancellable)
|
|
{
|
|
MockOperationData *data = task_data;
|
|
guint i;
|
|
|
|
for (i = 0; i < data->iterations_requested; i++)
|
|
{
|
|
if (g_cancellable_is_cancelled (cancellable))
|
|
break;
|
|
if (g_test_verbose ())
|
|
g_printerr ("THRD: %u iteration %u\n", data->iterations_requested, i);
|
|
g_usleep (WAIT_ITERATION * 1000);
|
|
}
|
|
|
|
if (g_test_verbose ())
|
|
g_printerr ("THRD: %u stopped at %u\n", data->iterations_requested, i);
|
|
data->iterations_done = i;
|
|
|
|
g_task_return_boolean (task, TRUE);
|
|
}
|
|
|
|
static gboolean
|
|
mock_operation_timeout (gpointer user_data)
|
|
{
|
|
GTask *task;
|
|
MockOperationData *data;
|
|
gboolean done = FALSE;
|
|
|
|
task = G_TASK (user_data);
|
|
data = g_task_get_task_data (task);
|
|
|
|
if (data->iterations_done >= data->iterations_requested)
|
|
done = TRUE;
|
|
|
|
if (g_cancellable_is_cancelled (g_task_get_cancellable (task)))
|
|
done = TRUE;
|
|
|
|
if (done)
|
|
{
|
|
if (g_test_verbose ())
|
|
g_printerr ("LOOP: %u stopped at %u\n", data->iterations_requested,\
|
|
data->iterations_done);
|
|
g_task_return_boolean (task, TRUE);
|
|
return FALSE; /* don't call timeout again */
|
|
}
|
|
else
|
|
{
|
|
data->iterations_done++;
|
|
if (g_test_verbose ())
|
|
g_printerr ("LOOP: %u iteration %u\n", data->iterations_requested,
|
|
data->iterations_done);
|
|
return TRUE; /* call timeout */
|
|
}
|
|
}
|
|
|
|
static void
|
|
mock_operation_async (guint wait_iterations,
|
|
gboolean run_in_thread,
|
|
GCancellable *cancellable,
|
|
GAsyncReadyCallback callback,
|
|
gpointer user_data)
|
|
{
|
|
GTask *task;
|
|
MockOperationData *data;
|
|
|
|
task = g_task_new (NULL, cancellable, callback, user_data);
|
|
data = g_new0 (MockOperationData, 1);
|
|
data->iterations_requested = wait_iterations;
|
|
g_task_set_task_data (task, data, mock_operation_free);
|
|
|
|
if (run_in_thread)
|
|
{
|
|
g_task_run_in_thread (task, mock_operation_thread);
|
|
if (g_test_verbose ())
|
|
g_printerr ("THRD: %d started\n", wait_iterations);
|
|
}
|
|
else
|
|
{
|
|
g_timeout_add_full (G_PRIORITY_DEFAULT, WAIT_ITERATION, mock_operation_timeout,
|
|
g_object_ref (task), g_object_unref);
|
|
if (g_test_verbose ())
|
|
g_printerr ("LOOP: %d started\n", wait_iterations);
|
|
}
|
|
|
|
g_object_unref (task);
|
|
}
|
|
|
|
static guint
|
|
mock_operation_finish (GAsyncResult *result,
|
|
GError **error)
|
|
{
|
|
MockOperationData *data;
|
|
GTask *task;
|
|
|
|
g_assert (g_task_is_valid (result, NULL));
|
|
|
|
/* This test expects the return value to be iterations_done even
|
|
* when an error is set.
|
|
*/
|
|
task = G_TASK (result);
|
|
data = g_task_get_task_data (task);
|
|
|
|
g_task_propagate_boolean (task, error);
|
|
return data->iterations_done;
|
|
}
|
|
|
|
GMainLoop *loop;
|
|
|
|
static void
|
|
on_mock_operation_ready (GObject *source,
|
|
GAsyncResult *result,
|
|
gpointer user_data)
|
|
{
|
|
guint iterations_requested;
|
|
guint iterations_done;
|
|
GError *error = NULL;
|
|
|
|
iterations_requested = GPOINTER_TO_UINT (user_data);
|
|
iterations_done = mock_operation_finish (result, &error);
|
|
|
|
g_assert_error (error, G_IO_ERROR, G_IO_ERROR_CANCELLED);
|
|
g_error_free (error);
|
|
|
|
g_assert_cmpint (iterations_requested, >, iterations_done);
|
|
num_async_operations--;
|
|
|
|
if (!num_async_operations)
|
|
g_main_loop_quit (loop);
|
|
}
|
|
|
|
static gboolean
|
|
on_main_loop_timeout_quit (gpointer user_data)
|
|
{
|
|
GMainLoop *loop = user_data;
|
|
g_main_loop_quit (loop);
|
|
return FALSE;
|
|
}
|
|
|
|
static void
|
|
test_cancel_multiple_concurrent (void)
|
|
{
|
|
GCancellable *cancellable;
|
|
guint i, iterations;
|
|
|
|
cancellable = g_cancellable_new ();
|
|
loop = g_main_loop_new (NULL, FALSE);
|
|
|
|
for (i = 0; i < 45; i++)
|
|
{
|
|
iterations = i + 10;
|
|
mock_operation_async (iterations, g_random_boolean (), cancellable,
|
|
on_mock_operation_ready, GUINT_TO_POINTER (iterations));
|
|
num_async_operations++;
|
|
}
|
|
|
|
/* Wait for two iterations, to give threads a chance to start up */
|
|
g_timeout_add (WAIT_ITERATION * 2, on_main_loop_timeout_quit, loop);
|
|
g_main_loop_run (loop);
|
|
g_assert_cmpint (num_async_operations, ==, 45);
|
|
if (g_test_verbose ())
|
|
g_printerr ("CANCEL: %d operations\n", num_async_operations);
|
|
g_cancellable_cancel (cancellable);
|
|
g_assert (g_cancellable_is_cancelled (cancellable));
|
|
|
|
/* Wait for all operations to be cancelled */
|
|
g_main_loop_run (loop);
|
|
g_assert_cmpint (num_async_operations, ==, 0);
|
|
|
|
g_object_unref (cancellable);
|
|
g_main_loop_unref (loop);
|
|
}
|
|
|
|
static void
|
|
test_cancel_null (void)
|
|
{
|
|
g_cancellable_cancel (NULL);
|
|
}
|
|
|
|
int
|
|
main (int argc, char *argv[])
|
|
{
|
|
g_test_init (&argc, &argv, NULL);
|
|
|
|
g_test_add_func ("/cancellable/multiple-concurrent", test_cancel_multiple_concurrent);
|
|
g_test_add_func ("/cancellable/null", test_cancel_null);
|
|
|
|
return g_test_run ();
|
|
}
|