This is an automated email from the ASF dual-hosted git repository. pnoltes pushed a commit to branch feature/scheduled_event_on_event_thread in repository https://gitbox.apache.org/repos/asf/celix.git
commit 006e8e170732796b1d66af6dc8b90d223ada24e2 Author: Pepijn Noltes <[email protected]> AuthorDate: Sun Jun 18 18:56:02 2023 +0200 Remove commented out code in pstm --- .../src/pubsub_topology_manager.c | 27 ---------------------- .../src/pubsub_topology_manager.h | 6 ----- 2 files changed, 33 deletions(-) diff --git a/bundles/pubsub/pubsub_topology_manager/src/pubsub_topology_manager.c b/bundles/pubsub/pubsub_topology_manager/src/pubsub_topology_manager.c index c33a4817..adb259f7 100644 --- a/bundles/pubsub/pubsub_topology_manager/src/pubsub_topology_manager.c +++ b/bundles/pubsub/pubsub_topology_manager/src/pubsub_topology_manager.c @@ -1116,32 +1116,6 @@ static void pstm_psaHandlingEvent(void* data) { pstm_findPsaForEndpoints(manager); //trying to find psa and possible set for endpoints with no psa } -//static void *pstm_psaHandlingThread(void *data) { -// pubsub_topology_manager_t *manager = data; -// -// celixThreadMutex_lock(&manager->psaHandling.mutex); -// bool running = manager->psaHandling.running; -// celixThreadMutex_unlock(&manager->psaHandling.mutex); -// -// while (running) { -// //first teardown -> also if rematch is needed -// pstm_teardownTopicSenders(manager); -// pstm_teardownTopicReceivers(manager); -// -// //then see if any topic sender/receiver are needed -// pstm_setupTopicSenders(manager); -// pstm_setupTopicReceivers(manager); -// -// pstm_findPsaForEndpoints(manager); //trying to find psa and possible set for endpoints with no psa -// -// celixThreadMutex_lock(&manager->psaHandling.mutex); -// celixThreadCondition_timedwaitRelative(&manager->psaHandling.cond, &manager->psaHandling.mutex, manager->handlingThreadSleepTime / 1000, (manager->handlingThreadSleepTime % 1000) * 1000000); -// running = manager->psaHandling.running; -// celixThreadMutex_unlock(&manager->psaHandling.mutex); -// } -// return NULL; -//} - void pubsub_topologyManager_addMetricsService(void * handle, void *svc, const celix_properties_t *props) { pubsub_topology_manager_t *manager = handle; long svcId = celix_properties_getAsLong(props, OSGI_FRAMEWORK_SERVICE_ID, -1L); @@ -1158,7 +1132,6 @@ void pubsub_topologyManager_removeMetricsService(void * handle, void *svc, const celixThreadMutex_unlock(&manager->psaMetrics.mutex); } - static celix_status_t pubsub_topologyManager_topology(pubsub_topology_manager_t *manager, const char *commandLine __attribute__((unused)), FILE *os, FILE *errorStream __attribute__((unused))) { fprintf(os, "\n"); diff --git a/bundles/pubsub/pubsub_topology_manager/src/pubsub_topology_manager.h b/bundles/pubsub/pubsub_topology_manager/src/pubsub_topology_manager.h index f89353e9..e573fa57 100644 --- a/bundles/pubsub/pubsub_topology_manager/src/pubsub_topology_manager.h +++ b/bundles/pubsub/pubsub_topology_manager/src/pubsub_topology_manager.h @@ -67,12 +67,6 @@ typedef struct pubsub_topology_manager { hash_map_t *map; //key = svcId, value = pubsub_admin_metrics_service_t* } psaMetrics; -// struct { -// celix_thread_t thread; -// celix_thread_mutex_t mutex; //protect running and condition -// celix_thread_cond_t cond; -// bool running; -// } psaHandling; long scheduledEventId; celix_log_helper_t *loghelper;
