Attachment #399232 for bug #539608




removed from mainloop more than once
--
lib/services/services.c       | 3 +++
lib/services/services_linux.c | 1 +
2 files changed, 4 insertions(+)
++ b/lib/services/services.c


    if (op->opaque->repeat_timer) {
        g_source_remove(op->opaque->repeat_timer);
        op->opaque->repeat_timer = 0;
    }
    if (op->opaque->stderr_gsource) {
        mainloop_del_fd(op->opaque->stderr_gsource);

    } else {
        if (op->opaque->repeat_timer) {
            g_source_remove(op->opaque->repeat_timer);
            op->opaque->repeat_timer = 0;
        }
        recurring_action_timer(op);
        return TRUE;

        if (dup->pid != 0) {
            if (op->opaque->repeat_timer) {
                g_source_remove(op->opaque->repeat_timer);
                op->opaque->repeat_timer = 0;
            }
            recurring_action_timer(dup);
        }
++ b/lib/services/services_linux.c

    op->stdout_data = NULL;
    free(op->stderr_data);
    op->stderr_data = NULL;
    op->opaque->repeat_timer = 0;

    services_action_async(op, NULL);
    return FALSE;

Return to bug 539608

Line Link Here

(-)file_not_specified_in_diff (-3 / +6 lines)
	removed from mainloop more than once		removed from mainloop more than once
1	--
2	lib/services/services.c \| 3 +++	1	lib/services/services.c \| 3 +++
3	lib/services/services_linux.c \| 1 +	2	lib/services/services_linux.c \| 1 +
4	2 files changed, 4 insertions(+)	3	2 files changed, 4 insertions(+)
5	-- a/lib/services/services.c	4	++ b/lib/services/services.c
Lines 313-318 services_action_free(svc_action_t * op) Link Here
313		313
314	if (op->opaque->repeat_timer) {	314	if (op->opaque->repeat_timer) {
315	g_source_remove(op->opaque->repeat_timer);	315	g_source_remove(op->opaque->repeat_timer);
		316	op->opaque->repeat_timer = 0;
316	}	317	}
317	if (op->opaque->stderr_gsource) {	318	if (op->opaque->stderr_gsource) {
318	mainloop_del_fd(op->opaque->stderr_gsource);	319	mainloop_del_fd(op->opaque->stderr_gsource);
Lines 425-430 services_action_kick(const char *name, c Link Here
425	} else {	426	} else {
426	if (op->opaque->repeat_timer) {	427	if (op->opaque->repeat_timer) {
427	g_source_remove(op->opaque->repeat_timer);	428	g_source_remove(op->opaque->repeat_timer);
		429	op->opaque->repeat_timer = 0;
428	}	430	}
429	recurring_action_timer(op);	431	recurring_action_timer(op);
430	return TRUE;	432	return TRUE;
Lines 459-464 handle_duplicate_recurring(svc_action_t Link Here
459	if (dup->pid != 0) {	461	if (dup->pid != 0) {
460	if (op->opaque->repeat_timer) {	462	if (op->opaque->repeat_timer) {
461	g_source_remove(op->opaque->repeat_timer);	463	g_source_remove(op->opaque->repeat_timer);
		464	op->opaque->repeat_timer = 0;
462	}	465	}
463	recurring_action_timer(dup);	466	recurring_action_timer(dup);
464	}	467	}
465	-- a/lib/services/services_linux.c	468	++ b/lib/services/services_linux.c
Lines 226-231 recurring_action_timer(gpointer data) Link Here
226	op->stdout_data = NULL;	226	op->stdout_data = NULL;
227	free(op->stderr_data);	227	free(op->stderr_data);
228	op->stderr_data = NULL;	228	op->stderr_data = NULL;
		229	op->opaque->repeat_timer = 0;
229		230
230	services_action_async(op, NULL);	231	services_action_async(op, NULL);
231	return FALSE;	232	return FALSE;