PR-1129: Enforce masked state.

Daniel Stodden · Daniel Stodden · commit 5e8dec2a774b · 2011-02-15T01:37:45.000-08:00
Masking timeout events only skips timeval calculation, but doesn't
prevent them from anyway as they expired. Enforce masked state right
around the callback. For timeouts, this means the event will keep
ticking at the interval given.

Signed-off-by: Daniel Stodden &lt;daniel.stodden@citrix.com&gt;
diff --git a/drivers/scheduler.c b/drivers/scheduler.c
@@ -200,7 +200,8 @@ scheduler_event_callback(event_t *event, char mode)
 		event->deadline = now.tv_sec + event->timeout;
 	}
 
-	event->cb(event->id, mode, event->private);
+	if (!event->masked)
+		event->cb(event->id, mode, event->private);
 }
 
 static int

Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,8 @@ scheduler_event_callback(event_t *event, char mode)`
`200`	`200`	`event->deadline = now.tv_sec + event->timeout;`
`201`	`201`	`}`
`202`	`202`
`203`		`- event->cb(event->id, mode, event->private);`
	`203`	`+ if (!event->masked)`
	`204`	`+ event->cb(event->id, mode, event->private);`
`204`	`205`	`}`
`205`	`206`
`206`	`207`	`static int`