Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugene Tarassov2012-05-19 23:33:11 -0400
committerEugene Tarassov2012-05-19 23:33:11 -0400
commit960e69fb9fd9ddcffd7b503d99b4a66c4fe12550 (patch)
treede570e38120c3e0028168248e77e9bcd889cac9d
parent20965b7360787a02b501008927b3a3329c9005c7 (diff)
downloadorg.eclipse.tcf.agent-960e69fb9fd9ddcffd7b503d99b4a66c4fe12550.tar.gz
org.eclipse.tcf.agent-960e69fb9fd9ddcffd7b503d99b4a66c4fe12550.tar.xz
org.eclipse.tcf.agent-960e69fb9fd9ddcffd7b503d99b4a66c4fe12550.zip
TCF Agent: run control: a bit better safe events logic
-rw-r--r--agent/tcf/services/runctrl.c4
-rw-r--r--server/tcf/services/context-proxy.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/agent/tcf/services/runctrl.c b/agent/tcf/services/runctrl.c
index 3b12fd47..b8d0b23e 100644
--- a/agent/tcf/services/runctrl.c
+++ b/agent/tcf/services/runctrl.c
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2011 Wind River Systems, Inc. and others.
+ * Copyright (c) 2007, 2012 Wind River Systems, Inc. and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* and Eclipse Distribution License v1.0 which accompany this distribution.
@@ -1648,9 +1648,9 @@ static void run_safe_events(void * arg) {
ContextExtensionRC * ext = EXT(ctx);
l = l->next;
ext->pending_safe_event = 0;
- if (context_get_group(ctx, CONTEXT_GROUP_STOP) != grp) continue;
if (ctx->exited || ctx->exiting) continue;
if (ctx->stopped || !context_has_state(ctx)) continue;
+ if (!ext->safe_single_step && context_get_group(ctx, CONTEXT_GROUP_STOP) != grp) continue;
if (stop_all_timer_cnt >= STOP_ALL_MAX_CNT) {
trace(LOG_ALWAYS, "can't stop %s; error: timeout", ctx->id);
ctx->exiting = 1;
diff --git a/server/tcf/services/context-proxy.c b/server/tcf/services/context-proxy.c
index f75c6252..942957bf 100644
--- a/server/tcf/services/context-proxy.c
+++ b/server/tcf/services/context-proxy.c
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2010 Wind River Systems, Inc. and others.
+ * Copyright (c) 2007, 2012 Wind River Systems, Inc. and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* and Eclipse Distribution License v1.0 which accompany this distribution.

Back to the top