- some utility functions

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@10459 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: lochel

SimulationRuntime/c/math-support/delay.c

@@ -34,6 +34,7 @@
 #include "delay.h"
 #include "simulation_runtime.h"
 #include "ringbuffer.h"
+#include "error.h"
 
 #include <assert.h>
 #include <stdio.h>
@@ -71,16 +72,16 @@ void initDelay(double startTime)
     assert(delayStructure);
 
     for(i=0; i<numDelayExpressionIndex; i++)
-    {
-        delayStructure[i] = (RINGBUFFER*)malloc(sizeof(RINGBUFFER));
-        allocRingBuffer(delayStructure[i], 1024, sizeof(t_TimeAndValue));
-    }
+        delayStructure[i] = allocRingBuffer(1024, sizeof(t_TimeAndValue));
 
+    DEBUG_INFO(DF_SOLVER, "initDelay called with startTime = %f\n", startTime);
+
+    /*
     if(sim_verbose >= LOG_SOLVER)
     {
         fprintf(stdout, "initDelay called with startTime = %f\n", startTime);
         fflush(NULL);
-    }
+    }*/
 }
 
 void deinitDelay()
@@ -102,15 +103,15 @@ void deinitDelay()
  *  the buffer in 'delayStruct' is not empty
  *  'time' is smaller than the last entry in 'delayStruct'
  */
-static int findTime(double time, RINGBUFFER delayStruct)
+static int findTime(double time, RINGBUFFER *delayStruct)
 {
     int start = 0;
-    int end = ringBufferLength(&delayStruct);
+    int end = ringBufferLength(delayStruct);
     double t;
     do
     {
         int i = (start + end) / 2;
-        t = ((t_TimeAndValue*)getRingData(&delayStruct, i))->time;
+        t = ((t_TimeAndValue*)getRingData(delayStruct, i))->time;
         if(t > time)
             end = i;
         else
@@ -215,7 +216,7 @@ double delayImpl(int exprNumber, double exprValue, double time, double delayTime
         }
         else
         {
-            i = findTime(timeStamp, *delayStruct);
+            i = findTime(timeStamp, delayStruct);
             assert(i < length);
             time0 = ((t_TimeAndValue*)getRingData(delayStruct, i))->time;
             value0 = ((t_TimeAndValue*)getRingData(delayStruct, i))->value;

SimulationRuntime/c/math-support/ringbuffer.c

@@ -1,95 +1,108 @@
 /*
-  *This file is part of OpenModelica.
- *
-  *Copyright (c) 1998-2008, Linköpings University,
-  *Department of Computer and Information Science,
-  *SE-58183 Linköping, Sweden.
- *
-  *All rights reserved.
- *
-  *THIS PROGRAM IS PROVIDED UNDER THE TERMS OF THIS OSMC PUBLIC
-  *LICENSE (OSMC-PL). ANY USE, REPRODUCTION OR DISTRIBUTION OF
-  *THIS PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THE OSMC
-  *PUBLIC LICENSE.
- *
-  *The OpenModelica software and the Open Source Modelica
-  *Consortium (OSMC) Public License (OSMC-PL) are obtained
-  *from Linköpings University, either from the above address,
-  *from the URL: http://www.ida.liu.se/projects/OpenModelica
-  *and in the OpenModelica distribution.
- *
-  *This program is distributed  WITHOUT ANY WARRANTY; without
-  *even the implied warranty of  MERCHANTABILITY or FITNESS
-  *FOR A PARTICULAR PURPOSE, EXCEPT AS EXPRESSLY SET FORTH
-  *IN THE BY RECIPIENT SELECTED SUBSIDIARY LICENSE CONDITIONS
-  *OF OSMC-PL.
- *
-  *See the full OSMC Public License conditions for more details.
- *
- */
+* This file is part of OpenModelica.
+*
+* Copyright (c) 1998-2008, Linköpings University,
+* Department of Computer and Information Science,
+* SE-58183 Linköping, Sweden.
+*
+* All rights reserved.
+*
+* THIS PROGRAM IS PROVIDED UNDER THE TERMS OF THIS OSMC PUBLIC
+* LICENSE (OSMC-PL). ANY USE, REPRODUCTION OR DISTRIBUTION OF
+* THIS PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THE OSMC
+* PUBLIC LICENSE.
+*
+* The OpenModelica software and the Open Source Modelica
+* Consortium (OSMC) Public License (OSMC-PL) are obtained
+* from Linköpings University, either from the above address,
+* from the URL: http://www.ida.liu.se/projects/OpenModelica
+* and in the OpenModelica distribution.
+*
+* This program is distributed  WITHOUT ANY WARRANTY; without
+* even the implied warranty of  MERCHANTABILITY or FITNESS
+* FOR A PARTICULAR PURPOSE, EXCEPT AS EXPRESSLY SET FORTH
+* IN THE BY RECIPIENT SELECTED SUBSIDIARY LICENSE CONDITIONS
+* OF OSMC-PL.
+*
+* See the full OSMC Public License conditions for more details.
+*
+*/
 
 #include "ringbuffer.h"
 
 #include <assert.h>
 #include <stdlib.h>
 #include <memory.h>
 
-void allocRingBuffer(RINGBUFFER *rb, int sz, int item_size)
+struct RINGBUFFER
 {
-	rb->first_element = 0;
-	rb->num_element = 0;
-	rb->buf_size = sz > 0 ? sz : 1;
-	rb->item_size = item_size;
-	rb->buffer = calloc(rb->buf_size, rb->item_size);
-	assert(rb->buffer);
+  void *buffer;       /* buffer itself */
+  int itemSize;       /* size of one item in bytes */
+  int firstElement;   /* position of first element in buffer */
+  int nElements;      /* number of elements in buffer */
+  int bufferSize;     /* number of elements which could be stored in buffer */
+};
+
+RINGBUFFER *allocRingBuffer(int bufferSize, int itemSize)
+{
+  RINGBUFFER *rb = (RINGBUFFER*)malloc(sizeof(RINGBUFFER));
+
+  rb->firstElement = 0;
+  rb->nElements = 0;
+  rb->bufferSize = bufferSize > 0 ? bufferSize : 1;
+  rb->itemSize = itemSize;
+  rb->buffer = calloc(rb->bufferSize, rb->itemSize);
+  ASSERT(rb->buffer, "out of memory");
 }
 
 void freeRingBuffer(RINGBUFFER *rb)
 {
-	free(rb->buffer);
-  rb = NULL;
+  free(rb->buffer);
+  free(rb);
 }
 
-void *getRingData(RINGBUFFER *rb, int nIndex)
+void *getRingData(RINGBUFFER *rb, int i)
 {
-	assert(nIndex < rb->num_element);
-	assert(0 <= nIndex);
-	return ((char*)rb->buffer)+(((rb->first_element+nIndex)%rb->buf_size)*rb->item_size);
+  ASSERT(i < rb->nElements, "index out of range");
+  ASSERT(-rb->nElements < i, "index out of range");
+  return ((char*)rb->buffer)+(((rb->firstElement+i)%rb->bufferSize)*rb->itemSize);
 }
 
 void expandRingBuffer(RINGBUFFER *rb)
 {
-	int i;
-	void *temp = calloc(2*rb->buf_size, rb->item_size);
-	assert(temp);
+  int i;
 
-	for(i=0; i<rb->num_element; i++)
-		memcpy(((char*)temp)+(i*rb->item_size), getRingData(rb, i), rb->item_size);
+  void *temp = calloc(2*rb->bufferSize, rb->itemSize);
+  ASSERT(temp, "out of memory");
 
-	free(rb->buffer);
-	rb->buffer = temp;
-	rb->buf_size *= 2;
-	rb->first_element = 0;
+  for(i=0; i<rb->nElements; i++)
+    memcpy(((char*)temp)+(i*rb->itemSize), getRingData(rb, i), rb->itemSize);
+
+  free(rb->buffer);
+  rb->buffer = temp;
+  rb->bufferSize *= 2;
+  rb->firstElement = 0;
 }
 
 void appendRingData(RINGBUFFER *rb, void *value)
 {
-	if(rb->buf_size < rb->num_element+1)
-		expandRingBuffer(rb);
-	
-	memcpy(((char*)rb->buffer)+(((rb->first_element+rb->num_element)%rb->buf_size)*rb->item_size), value, rb->item_size);
-	++rb->num_element;
+  if(rb->bufferSize < rb->nElements+1)
+    expandRingBuffer(rb);
+
+  memcpy(((char*)rb->buffer)+(((rb->firstElement+rb->nElements)%rb->bufferSize)*rb->itemSize), value, rb->itemSize);
+  ++rb->nElements;
 }
 
 void dequeueNFirstRingDatas(RINGBUFFER *rb, int n)
 {
-	assert(n <= rb->num_element);
-	assert(0 <= n);
-	rb->first_element = (rb->first_element+n)%rb->buf_size;
-	rb->num_element -= n;
+  ASSERT(n <= rb->nElements, "index out of range");
+  ASSERT(0 <= n, "index out of range)");
+
+  rb->firstElement = (rb->firstElement+n)%rb->bufferSize;
+  rb->nElements -= n;
 }
 
 int ringBufferLength(RINGBUFFER *rb)
 {
-	return rb->num_element;
+  return rb->nElements;
 }

SimulationRuntime/c/math-support/ringbuffer.h

@@ -1,64 +1,58 @@
 /*
-  *This file is part of OpenModelica.
+ * This file is part of OpenModelica.
  *
-  *Copyright (c) 1998-2008, Linköpings University,
-  *Department of Computer and Information Science,
-  *SE-58183 Linköping, Sweden.
+ * Copyright (c) 1998-2008, Linköpings University,
+ * Department of Computer and Information Science,
+ * SE-58183 Linköping, Sweden.
  *
-  *All rights reserved.
+ * All rights reserved.
  *
-  *THIS PROGRAM IS PROVIDED UNDER THE TERMS OF THIS OSMC PUBLIC
-  *LICENSE (OSMC-PL). ANY USE, REPRODUCTION OR DISTRIBUTION OF
-  *THIS PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THE OSMC
-  *PUBLIC LICENSE.
+ * THIS PROGRAM IS PROVIDED UNDER THE TERMS OF THIS OSMC PUBLIC
+ * LICENSE (OSMC-PL). ANY USE, REPRODUCTION OR DISTRIBUTION OF
+ * THIS PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THE OSMC
+ * PUBLIC LICENSE.
  *
-  *The OpenModelica software and the Open Source Modelica
-  *Consortium (OSMC) Public License (OSMC-PL) are obtained
-  *from Linköpings University, either from the above address,
-  *from the URL: http://www.ida.liu.se/projects/OpenModelica
-  *and in the OpenModelica distribution.
+ * The OpenModelica software and the Open Source Modelica
+ * Consortium (OSMC) Public License (OSMC-PL) are obtained
+ * from Linköpings University, either from the above address,
+ * from the URL: http://www.ida.liu.se/projects/OpenModelica
+ * and in the OpenModelica distribution.
  *
-  *This program is distributed  WITHOUT ANY WARRANTY; without
-  *even the implied warranty of  MERCHANTABILITY or FITNESS
-  *FOR A PARTICULAR PURPOSE, EXCEPT AS EXPRESSLY SET FORTH
-  *IN THE BY RECIPIENT SELECTED SUBSIDIARY LICENSE CONDITIONS
-  *OF OSMC-PL.
+ * This program is distributed  WITHOUT ANY WARRANTY; without
+ * even the implied warranty of  MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE, EXCEPT AS EXPRESSLY SET FORTH
+ * IN THE BY RECIPIENT SELECTED SUBSIDIARY LICENSE CONDITIONS
+ * OF OSMC-PL.
  *
-  *See the full OSMC Public License conditions for more details.
+ * See the full OSMC Public License conditions for more details.
  *
  */
 
 #ifndef RINGBUFFER_H
 #define RINGBUFFER_H
 
 /*
-  *This is an expanding ring buffer.
-  *When it gets full, it doubles in size.
-  *It's basically a queue which has get(ix) instead of get_first()/delete_first().
+ * This is an expanding ring buffer.
+ * When it gets full, it doubles in size.
+ * It's basically a queue which has get(ix) instead of get_first()/delete_first().
  */
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-typedef struct RINGBUFFER
-{
-	void *buffer;
-	int item_size;
-	int first_element;
-	int num_element;
-	int buf_size;
-}RINGBUFFER;
+  struct RINGBUFFER;
+  typedef struct RINGBUFFER RINGBUFFER;
 
-void allocRingBuffer(RINGBUFFER *rb, int sz, int item_size);
-void freeRingBuffer(RINGBUFFER *rb);
+  RINGBUFFER *allocRingBuffer(int bufferSize, int itemSize);
+  void freeRingBuffer(RINGBUFFER *rb);
 
-void *getRingData(RINGBUFFER *rb, int nIndex);
+  void *getRingData(RINGBUFFER *rb, int nIndex);
 
-void appendRingData(RINGBUFFER *rb, void *value);
-void dequeueNFirstRingDatas(RINGBUFFER *rb, int n);
+  void appendRingData(RINGBUFFER *rb, void *value);
+  void dequeueNFirstRingDatas(RINGBUFFER *rb, int n);
 
-int ringBufferLength(RINGBUFFER *rb);
+  int ringBufferLength(RINGBUFFER *rb);
 
 #ifdef __cplusplus
 }

SimulationRuntime/c/simulation/simulation_runtime.cpp

@@ -479,6 +479,7 @@ int verboseLevel(int argc, char**argv) {
   }
   if (flags->find("LOG_SOLVER", 0) != string::npos) {
     res |= LOG_SOLVER;
+    globalDebugFlags |= DF_SOLVER;
   }
   if (flags->find("LOG_EVENTS", 0) != string::npos) {
     res |= LOG_EVENTS;
@@ -1117,6 +1118,10 @@ int _main_SimulationRuntime(int argc, char**argv, _X_DATA *data)
   int retVal = -1;
   if(!setjmp(globalJmpbuf) ) 
   { 
+    /*MSG("info", stdout, "test");
+      DEBUG_INFO(1, "test der DEBUG_INFO %d, %s, %f", 42, "hello world", 0.123f);
+      THROW("ENDE");*/
+
       if (initRuntimeAndSimulation(argc, argv, data)) //initRuntimeAndSimulation returns 1 if an error occurs
         return 1;
       /* sighandler_t oldhandler = different type on all platforms... */