pnoltes commented on code in PR #583:
URL: https://github.com/apache/celix/pull/583#discussion_r1258645290
##########
libs/framework/src/framework.c:
##########
@@ -1408,32 +1412,151 @@ static inline bool
fw_removeTopEventFromQueue(celix_framework_t* fw) {
static inline void fw_handleEvents(celix_framework_t* framework) {
celixThreadMutex_lock(&framework->dispatcher.mutex);
int size = framework->dispatcher.eventQueueSize +
celix_arrayList_size(framework->dispatcher.dynamicEventQueue);
- if (size == 0 && framework->dispatcher.active) {
- celixThreadCondition_timedwaitRelative(&framework->dispatcher.cond,
&framework->dispatcher.mutex, 1, 0);
- }
- size = framework->dispatcher.eventQueueSize +
celix_arrayList_size(framework->dispatcher.dynamicEventQueue);
celixThreadMutex_unlock(&framework->dispatcher.mutex);
while (size > 0) {
celix_framework_event_t* topEvent = fw_topEventFromQueue(framework);
fw_handleEventRequest(framework, topEvent);
- bool dynamiclyAllocatedEvent = fw_removeTopEventFromQueue(framework);
+ bool dynamicallyAllocatedEvent = fw_removeTopEventFromQueue(framework);
if (topEvent->bndEntry != NULL) {
celix_framework_bundleEntry_decreaseUseCount(topEvent->bndEntry);
}
free(topEvent->serviceName);
- if (dynamiclyAllocatedEvent) {
+ if (dynamicallyAllocatedEvent) {
free(topEvent);
}
celixThreadMutex_lock(&framework->dispatcher.mutex);
size = framework->dispatcher.eventQueueSize +
celix_arrayList_size(framework->dispatcher.dynamicEventQueue);
- celixThreadCondition_broadcast(&framework->dispatcher.cond);
celixThreadMutex_unlock(&framework->dispatcher.mutex);
}
}
+/**
+ * @brief Process all scheduled events.
+ */
+static double celix_framework_processScheduledEvents(celix_framework_t* fw) {
+ struct timespec ts = celixThreadCondition_getTime();
Review Comment:
I kept a single set `scheduleTime` at the beginning of the
`celix_framework_processScheduledEvents` functions, but the nextDeadline is not
based on the `scheduleTime`.
As such if a deadline is reached right after the
`celix_framework_processScheduledEvents` returns, this will be picked up
directly in a new events processing loop.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscr...@celix.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
