anna
/
ocarina
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

core/idle: Add idle_cancel() function 

This function is used to cancel all idle tasks and free the memory
allocated for them.  This needs to be called when Ocarina is shutting
down to prevent a possible hang with the gtk idle callback continuing to
process tasks.

Fixes #30: Closing Ocarina should cancel idle tasks
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
This commit is contained in:
Anna Schumaker 2016-03-01 08:27:13 -05:00
parent b3592e40c0
commit 8c8ab2a9eb
4 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/idle.c
View File

@ -50,3 +50,13 @@ float idle_progress()
return 1.0;
return serviced / queued;
}
void idle_cancel()
{
struct idle_task *task;
while (!g_queue_is_empty(&idle_queue)) {
task = g_queue_pop_head(&idle_queue);
g_free(task);
}
}

11
gui/ocarina.cpp
View File

@ -2,6 +2,9 @@
* Copyright 2014 (c) Anna Schumaker.
*/
#include <core/core.h>
extern "C" {
#include <core/idle.h>
}
#include <gui/ocarina.h>
#include <gui/tabs.h>
@ -42,6 +45,11 @@ static void setup_share(const std::string &path)
ocarina_dir = ocarina_dir + "share/ocarina/";
}
static void on_window_removed(Gtk::Window *window)
{
idle_cancel();
}
int main(int argc, char **argv)
{
Gtk::Window *window;
@ -63,7 +71,8 @@ int main(int argc, char **argv)
window = window_init();
post_init_tabs();
ocarina_app->run(*window);
ocarina_app->signal_window_removed().connect(sigc::ptr_fun(on_window_removed));
ocarina_app->run(*window, argc, argv);
cleanup_tabs();
gst :: quit();
core :: deinit();

3
include/core/idle.h
View File

@ -27,4 +27,7 @@ bool idle_run_task();
/* Called to find the percentage of idle tasks that have been run. */
float idle_progress();
/* Called to cancel all idle tasks on the queue. */
void idle_cancel();
#endif /* OCARINA_CORE_IDLE_H */

7
tests/core/idle.c
View File

@ -36,6 +36,13 @@ static void test_idle_queue(unsigned int n)
test_equal(idle_run_task(), (bool)false);
test_equal(idle_progress(), (float)1.0);
for (unsigned int i = 0; i < n; i++)
idle_schedule(inc_cur, GINT_TO_POINTER(i));
test_equal(idle_progress(), (float)0.0);
idle_cancel();
test_equal(idle_progress(), (float)1.0);
}