IOIO: refactoring so there's only one looper

Author: chrisws

ioio/main.cpp

@@ -16,11 +16,11 @@
 #include <pthread.h>
 #include "robin-hood-hashing/src/include/robin_hood.h"
 
-struct IOClass;
+struct IOTask;
 
 JNIEnv *env;
 JavaVM *jvm;
-IOClass *ioioClass;
+IOTask *ioioTask;
 int nextId = 1;
 
 #define CLASS_ANALOGINPUT "net/sourceforge/smallbasic/ioio/AnalogInputImpl"
@@ -30,12 +30,12 @@ int nextId = 1;
 #define CLASS_PWMOUTPUT "net/sourceforge/smallbasic/ioio/PwmOutputImpl"
 #define CLASS_CAPSENSE "net/sourceforge/smallbasic/ioio/CapsenseImpl"
 #define CLASS_IOIO "net/sourceforge/smallbasic/ioio/IOIOImpl"
-#define CLASS_IOCLASS_ID 1
+#define CLASS_IOTASK_ID 1
 
-struct IOClass {
-  IOClass(): _clazz(nullptr), _instance(nullptr) {}
+struct IOTask {
+  IOTask(): _clazz(nullptr), _instance(nullptr) {}
 
-  virtual ~IOClass() {
+  virtual ~IOTask() {
     _clazz = nullptr;
     _instance = nullptr;
   }
@@ -200,18 +200,18 @@ struct IOClass {
   jobject _instance;
 };
 
-robin_hood::unordered_map<int, IOClass> _classMap;
+robin_hood::unordered_map<int, IOTask> _ioTaskMap;
 
 static int get_io_class_id(var_s *map, var_s *retval) {
   int result = -1;
   if (is_map(map)) {
     int id = map->v.m.id;
-    if (id != -1 && _classMap.find(id) != _classMap.end()) {
+    if (id != -1 && _ioTaskMap.find(id) != _ioTaskMap.end()) {
       result = id;
     }
   }
   if (result == -1) {
-    error(retval, "IOClass not found");
+    error(retval, "IOTask not found");
   }
   return result;
 }
@@ -225,6 +225,9 @@ FUNC_SIG lib_func[] = {
   {1, 2, "OPENDIGITALOUTPUT", cmd_opendigitaloutput},
   {1, 2, "OPENPULSEINPUT", cmd_openpulseinput},
   {1, 2, "OPENPWMOUTPUT", cmd_openpwmoutput},
+};
+
+FUNC_SIG lib_proc[] = {
   {0, 0, "BEGINBATCH", cmd_beginbatch},
   {0, 0, "DISCONNECT", cmd_disconnect},
   {0, 0, "ENDBATCH", cmd_endbatch},
@@ -235,8 +238,6 @@ FUNC_SIG lib_func[] = {
   {0, 0, "WAITFORDISCONNECT", cmd_waitfordisconnect},
 };
 
-FUNC_SIG lib_proc[] = {};
-
 SBLIB_API int sblib_proc_count() {
   return (sizeof(lib_proc) / sizeof(lib_proc[0]));
 }
@@ -263,9 +264,9 @@ int sblib_init(const char *sourceFile) {
     fprintf(stderr, "Failed to create JVM\n");
   }
 
-  ioioClass = new IOClass();
-  if (!ioioClass || !ioioClass->create(CLASS_IOIO)) {
-    fprintf(stderr, "Failed to IOIOClass\n");
+  ioioTask = new IOTask();
+  if (!ioioTask || !ioioTask->create(CLASS_IOIO)) {
+    fprintf(stderr, "Failed to IOIOTask\n");
     result = 0;
   }
   return result;
@@ -274,23 +275,23 @@ int sblib_init(const char *sourceFile) {
 SBLIB_API void sblib_free(int cls_id, int id) {
   if (id != -1) {
     switch (cls_id) {
-    case CLASS_IOCLASS_ID:
-      if (id != -1 && _classMap.find(id) != _classMap.end()) {
-        _classMap.at(id).invokeVoidVoid("close", nullptr);
-        _classMap.erase(id);
+    case CLASS_IOTASK_ID:
+      if (id != -1 && _ioTaskMap.find(id) != _ioTaskMap.end()) {
+        _ioTaskMap.at(id).invokeVoidVoid("close", nullptr);
+        _ioTaskMap.erase(id);
       }
       break;
     }
   }
 }
 
 void sblib_close(void) {
-  if (ioioClass) {
-    delete ioioClass;
+  if (ioioTask) {
+    delete ioioTask;
   }
-  if (!_classMap.empty()) {
-    fprintf(stderr, "IOClass leak detected\n");
-    _classMap.clear();
+  if (!_ioTaskMap.empty()) {
+    fprintf(stderr, "IOTask leak detected\n");
+    _ioTaskMap.clear();
   }
   jvm->DetachCurrentThread();
   // calling this hangs

ioio/mkapi.bas

@@ -65,11 +65,11 @@ sub generate_command(objName, method)
   endif
 
   if (method.rtn == "void") then
-    print "      result = _classMap.at(id)." + invoke + "(\"" + method.name + "\"" + argument + ", retval);"
+    print "      result = _ioTaskMap.at(id)." + invoke + "(\"" + method.name + "\"" + argument + ", retval);"
   else if (method.rtn == "boolean" || method.rtn == "int") then
-    print "      result = _classMap.at(id)." + invoke + "(\"" + method.name + "\"" + argument + ", retval);"
+    print "      result = _ioTaskMap.at(id)." + invoke + "(\"" + method.name + "\"" + argument + ", retval);"
   else if (method.rtn == "float") then
-    print "      result = _classMap.at(id)." + invoke + "(\"" + method.name + "\"" + argument + ", retval);"
+    print "      result = _ioTaskMap.at(id)." + invoke + "(\"" + method.name + "\"" + argument + ", retval);"
   endif
   print "    }"
   print "  }"
@@ -84,7 +84,7 @@ sub generate_ioio_command(name)
   print "  if (argc != 0) {"
   print "    error(retval, \"" + name + "\", 0);"
   print "  } else {"
-  print "    result = ioioClass->invokeVoidVoid(\"" + name + "\", retval);"
+  print "    result = ioioTask->invokeVoidVoid(\"" + name + "\", retval);"
   print "  }"
   print "  return result;"
   print "}"
@@ -106,14 +106,14 @@ sub generate_open_function(byref obj)
   print "  int result;"
   print "  int pin = get_param_int(argc, params, 0, 0);"
   print "  int id = ++nextId;"
-  print "  IOClass &instance = _classMap[id];"
+  print "  IOTask &instance = _ioTaskMap[id];"
   print "  if (instance.create(CLASS_" + upper(obj.name) + ") &&"
   print "      instance.open(pin, retval)) {"
-  print "    map_init_id(retval, id, CLASS_IOCLASS_ID);"
+  print "    map_init_id(retval, id, CLASS_IOTASK_ID);"
   print "    create_" + lower(obj.name) + "(retval);"
   print "    result = 1;"
   print "  } else {"
-  print "    _classMap.erase(id);"
+  print "    _ioTaskMap.erase(id);"
   print "    error(retval, \"open" + obj.name + "() failed\");"
   print "    result = 0;"
   print "  }"

ioio/samples/led.bas

@@ -4,7 +4,7 @@ out = ioio.openDigitalOutput(0, 1)
 
 print "wait for connect"
 ioio.waitForConnect()
-print "ready"
+print "ready!!!"
 
 value = false
 for i = 0 to 5