Changeset 58677f97 in OpenModelica

Timestamp:

2022-05-16T16:57:03+02:00 (2 years ago)

Author:

Philip Hannebohm <phannebohm@…>

Children:

dea6384f

Parents:

caa3fcca

Message:

[janitor] Refactor listPop in list.c

Location:

OMCompiler/SimulationRuntime/c

Files:

• simulation/solver/events.c (modified) (1 diff)
• simulation/solver/nonlinearValuesList.c (modified) (1 diff)
• simulation/solver/synchronous.c (modified) (2 diffs)
• util/list.c (modified) (2 diffs)
• util/list.h (modified) (2 diffs)

OMCompiler/SimulationRuntime/c/simulation/solver/events.c

@@ -355 +355 @@
   while(listLen(&tmpEventList) > 0)
   {
-    /* TODO do this directly w/o free-malloc */
     long event_id = *((long*)listFirstData(&tmpEventList));
-    listPopFront(&tmpEventList);
-    listPushFront(eventList, &event_id);
-
+    listPushFrontNodeNoCopy(eventList, listPopFrontNode(&tmpEventList));
     infoStreamPrint(LOG_ZEROCROSSINGS, 0, "Event id: %ld", event_id);
   }

OMCompiler/SimulationRuntime/c/simulation/solver/nonlinearValuesList.c

@@ -75 +75 @@
     {
       elem = (VALUE*) listFirstData(tmpList->valueList);
-      listPopFront(tmpList->valueList);
+      listRemoveFront(tmpList->valueList);
     }
     freeList(tmpList->valueList);

OMCompiler/SimulationRuntime/c/simulation/solver/synchronous.c

@@ -292 +292 @@
     type = nextTimer->type;
     activationTime = nextTimer->activationTime;
-    listPopFront(data->simulationInfo->intvlTimers);
+    listRemoveFront(data->simulationInfo->intvlTimers);
     switch(type)
     {
@@ -375 +375 @@
     type = nextTimer->type;
     activationTime = nextTimer->activationTime;
-    listPopFront(data->simulationInfo->intvlTimers);
+    listRemoveFront(data->simulationInfo->intvlTimers);
     switch(type)
     {

OMCompiler/SimulationRuntime/c/util/list.c

@@ -90 +90 @@
 }
 
+/**
+ * @brief Pushes node to the front of list
+ *
+ * @param list    Pointer to list
+ * @param node    Pointer to node (will not be copied)
+ */
+void listPushFrontNodeNoCopy(LIST *list, LIST_NODE *node)
+{
+  assertStreamPrint(NULL, 0 != list, "invalid list-pointer");
+  assertStreamPrint(NULL, 0 != node, "invalid list-node");
+
+  node->next = list->first;
+  ++(list->length);
+  list->first = node;
+  if(!list->last)
+    list->last = list->first;
+}
+
 void listPushBack(LIST *list, const void *data)
 {
@@ -151 +169 @@
 }
 
-void listPopFront(LIST *list)
-{
-  if(list)
+/**
+ * @brief Return first node and pop from list
+ *
+ * @param list    Pointer to list
+ * @return node   Pointer to node (must be freed by caller)
+ */
+LIST_NODE *listPopFrontNode(LIST *list)
+{
+  assertStreamPrint(NULL, 0 != list, "invalid list-pointer");
+  assertStreamPrint(NULL, 0 != list->first, "empty list");
+
+  LIST_NODE *node = list->first;
+  list->first = node->next;
+  //node->next = NULL;
+  --(list->length);
+  if(!list->first)
+    list->last = list->first;
+  return node;
+}
+
+/**
+ * @brief Remove and free first node from list
+ *
+ * @param list    Pointer to list
+ */
+void listRemoveFront(LIST *list)
+{
+  assertStreamPrint(NULL, 0 != list, "invalid list-pointer");
+  if(list->first)
   {
-    if(list->first)
-    {
-      LIST_NODE *tmpNode = list->first->next;
-      freeNode(list->first);
-
-      list->first = tmpNode;
-      --(list->length);
-      if(!list->first)
-        list->last = list->first;
-    }
+    LIST_NODE *tmpNode = list->first->next;
+    freeNode(list->first);
+
+    list->first = tmpNode;
+    --(list->length);
+    if(!list->first)
+      list->last = list->first;
   }
 }

OMCompiler/SimulationRuntime/c/util/list.h

@@ -61 +61 @@
 
   void listPushFront(LIST *list, const void *data);
+  void listPushFrontNodeNoCopy(LIST *list, LIST_NODE *node);
   void listPushBack(LIST *list, const void *data);
   void listInsert(LIST *list, LIST_NODE* prevNode, const void *data);
@@ -69 +70 @@
   void *listLastData(LIST *list);
 
-  void listPopFront(LIST *list);
+  LIST_NODE *listPopFrontNode(LIST *list);
+  void listRemoveFront(LIST *list);
 
   void listClear(LIST *list);