- introduced <controller> actions function for listing actions

- introduced <controller> reconnect function

devser.c

@@ -2,6 +2,7 @@
 #include <math.h>
 #include "ascon.h"
 #include "devser.h"
+#include "dynstring.h"
 
 typedef struct DevAction {
   struct DevAction *next;
@@ -11,6 +12,7 @@ typedef struct DevAction {
   DevKillActionData *kill;
   double interval; /* -1 for a queued action */
   double timeDue; /* 0 for a queued action */
+  DevInfoFunc *infoFunc;
 } DevAction;
 
 struct DevSer {
@@ -207,11 +209,8 @@ void DevDebugMode(DevSer * devser, int steps)
   devser->steps = steps;
 }
 
-void DevKill(DevSer * devser)
+static void DevReset(DevSer * devser)
 {
-  if (devser->ascon) {
-    AsconKill(devser->ascon);
-  }
   DevFreeActionList(devser->actions);
   DevFreeActionList(devser->toKill);
   if (devser->killCurrent) {
@@ -221,17 +220,34 @@ void DevKill(DevSer * devser)
     devser->killCurrent = 0;
     free(devser->current);
   }
+}
+
+void DevKill(DevSer * devser)
+{
+  if (devser->ascon) {
+    AsconKill(devser->ascon);
+  }
+  DevReset(devser);
   TaskRemove(pServ->pTasker, DevQueueTask, devser);
   free(devser);
 }
 
 void DevDisconnect(DevSer * devser)
 {
+  DevReset(devser);
   if (devser->ascon) {
     AsconDisconnect(devser->ascon);
   }
 }
 
+void DevReconnect(DevSer * devser, char *hostport)
+{
+  DevReset(devser);
+  if (devser->ascon) {
+    AsconReconnect(devser->ascon, hostport);
+  }
+}
+
 int DevUnschedule(DevSer * devser, void *callData,
                   DevActionHandler * hdl, DevActionMatch * matchFunc)
 {
@@ -264,7 +280,7 @@ int DevUnschedule(DevSer * devser, void *callData,
 int DevSchedule(DevSer * devser, void *actionData,
                 DevPrio prio, double interval,
                 DevActionHandler * hdl, DevActionMatch * matchFunc,
-                DevKillActionData * killFunc)
+                DevKillActionData * killFunc, DevInfoFunc * infoFunc)
 {
   DevAction *action;
   DevAction *foundAction = NULL;
@@ -272,6 +288,7 @@ int DevSchedule(DevSer * devser, void *actionData,
   DevAction **ptr2insertPos = NULL;
   int ret;
 
+  assert(killFunc == NULL || actionData != NULL);
   if (prio <= NullPRIO) {
     prio = NullPRIO + 1;
   }
@@ -293,10 +310,10 @@ int DevSchedule(DevSer * devser, void *actionData,
         && matchFunc(actionData, action->data)) {
       if (prio == action->prio && interval < 0) {
         /* do not move an action with equal prio */
-    	if(killFunc != NULL && actionData != NULL){
-    		killFunc(actionData);
-    	}
-        return 0;
+        if (killFunc) {
+          killFunc(actionData);
+        }
+        return 0; /* not queued */
       }
       /* remove action from list */
       *ptr2prev = action->next;
@@ -320,6 +337,7 @@ int DevSchedule(DevSer * devser, void *actionData,
     action->data = actionData;
     action->hdl = hdl;
     action->kill = killFunc;
+    action->infoFunc = infoFunc;
     action->timeDue = 0;
     ret = 1;
   }
@@ -348,9 +366,10 @@ int DevSchedule(DevSer * devser, void *actionData,
 
 int DevQueue(DevSer * devser, void *actionData, DevPrio prio,
              DevActionHandler * hdl, DevActionMatch * matchFunc,
-             DevKillActionData * killFunc)
+             DevKillActionData * killFunc, DevInfoFunc *infoFunc)
 {
-  return DevSchedule(devser, actionData, prio, -1.0, hdl, matchFunc, killFunc);
+  return DevSchedule(devser, actionData, prio, -1.0, hdl
+                     , matchFunc, killFunc, infoFunc);
 }
 
 int DevRemoveAction(DevSer * devser, void *actionData)
@@ -359,7 +378,6 @@ int DevRemoveAction(DevSer * devser, void *actionData)
   DevAction *action = NULL; 
   int cnt = 0;
   
-  
   /* Remove current action, if matched. If a reply is pending, the next
      action will get the reply. But as in the inital state no reply is
      expected, this should not harm. */
@@ -403,3 +421,35 @@ int DevIsPending(DevSer * devser, void *callData,
   return 0;
 }
 
+char * DevList(DevSer * devser) {
+  DevAction * action;
+  pDynString result, info;
+  char text[80];
+  char *str;
+
+  result = CreateDynString(63,64); 
+  for (action = devser->actions; action != NULL; action = action->next) {
+    if (action->interval < 0) {
+      snprintf(text, sizeof text, "%-8s queued ", DevPrio2Text(action->prio));
+    } else {
+      snprintf(text, sizeof text, "%-8s %8.3g %14.3f ",
+        DevPrio2Text(action->prio), action->interval, action->timeDue);
+    }
+    DynStringConcat(result, text);
+    if (action == devser->current) {
+      DynStringConcat(result, "ACTIVE ");
+    }
+    if (action->infoFunc) {
+      str = action->infoFunc(action->data);
+      DynStringConcat(result, str);
+      free(str);
+    } else {
+      snprintf(text, sizeof text, "%8.8x", (unsigned int)action->data);
+      DynStringConcat(result, text);
+    }
+    DynStringConcat(result, "\n");
+  }
+  str = strdup(GetCharArray(result));
+  DeleteDynString(result);
+  return str;
+}