Merge pull request #306 from lf-lang/pqueue-refactoring

Priority queue refactoring
lf-lang · Nov 25, 2023 · 53c0bf7 · 53c0bf7
2 parents 1d710c6 + f0e41ce
commit 53c0bf7
Show file tree

Hide file tree

Showing 11 changed files with 1,075 additions and 628 deletions.
diff --git a/core/federated/RTI/CMakeLists.txt b/core/federated/RTI/CMakeLists.txt
@@ -69,6 +69,8 @@ add_executable(
     ${CoreLib}/utils/util.c
     ${CoreLib}/tag.c
     ${CoreLib}/federated/net_util.c
+    ${CoreLib}/utils/pqueue_base.c
+    ${CoreLib}/utils/pqueue_tag.c
     ${CoreLib}/utils/pqueue.c
     message_record/message_record.c
 )

diff --git a/core/tag.c b/core/tag.c
@@ -168,9 +168,6 @@ instant_t lf_time_logical(void *env) {
     return ((environment_t *) env)->current_tag.time;
 }
 
-/**
- * Return the elapsed logical time in nanoseconds since the start of execution.
- */
 interval_t lf_time_logical_elapsed(void *env) {
     return lf_time_logical(env) - start_time;
 }

diff --git a/core/utils/CMakeLists.txt b/core/utils/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(UTIL_SOURCES vector.c pqueue.c util.c semaphore.c)
+set(UTIL_SOURCES vector.c pqueue_base.c pqueue_tag.c pqueue.c util.c semaphore.c)
 
 list(APPEND INFO_SOURCES ${UTIL_SOURCES})