Minor performance fixes which ultimately didn't help SPI

Author: chrisws

include/javaproxy.h

@@ -16,8 +16,6 @@ JNIEnv *g_env;
 JavaVM *g_jvm;
 jobject g_activity;
 
-#define ARRAY_SIZE 254
-
 #if defined(ANDROID_MODULE)
   #define attachCurrentThread() g_jvm->AttachCurrentThread(&g_env, nullptr)
   #define detachCurrentThread() g_jvm->DetachCurrentThread()
@@ -73,7 +71,8 @@ struct JavaProxy {
   JavaProxy():
     _clazz(nullptr),
     _instance(nullptr),
-    _array(nullptr) {
+    _array(nullptr),
+    _arraySize(0) {
   }
 
   virtual ~JavaProxy() {
@@ -286,23 +285,28 @@ struct JavaProxy {
   }
 
   // populate the java byte array with the contents of the basic array
-  int populateByteArray(int argc, slib_par_t *params, int offset) {
+  int populateByteArray(int argc, slib_par_t *params, int offset, int arraySize) {
     int result;
+    if (_array && _arraySize < arraySize) {
+      g_env->DeleteLocalRef(_array);
+      _array = nullptr;
+    }
     if (!_array) {
-      _array = g_env->NewByteArray(ARRAY_SIZE);
+      _array = g_env->NewByteArray(arraySize);
+      _arraySize = arraySize;
     }
     jbyte *elements = g_env->GetByteArrayElements(_array, nullptr);
     if ((argc - offset) == 1 && is_param_array(argc, params, offset)) {
       // argument is an array (assume of ints)
       var_s *array = params[offset].var_p;
       int size = v_asize(array);
-      for (int i = 0; i < size && i < ARRAY_SIZE; i++) {
+      for (int i = 0; i < size && i < arraySize; i++) {
         var_s *elem = v_elem(array, i);
         elements[i] = v_is_type(elem, V_INT) ? elem->v.i : elem->v.n;
       }
       result = size;
     } else {
-      for (int i = offset, j = 0; i < argc && i < ARRAY_SIZE; i++, j++) {
+      for (int i = offset, j = 0; i < argc && i < arraySize; i++, j++) {
         elements[j] = get_param_int(argc, params, i, 0);
       }
       result = argc - offset;
@@ -316,6 +320,7 @@ struct JavaProxy {
   jclass _clazz;
   jobject _instance;
   jbyteArray _array;
+  int _arraySize;
 };
 
 #if defined(ANDROID_MODULE)

ioio/ioio/src/main/java/ioio/smallbasic/IOIOImpl.java

@@ -61,11 +61,6 @@ public void sync() {
 
   public void waitForConnect(int latency) {
     IOUtil.setError(null);
-    if (latency < 0) {
-      IOUtil.setHardReset(true);
-    } else {
-      TimerUtil.setLatency(latency);
-    }
     IOService.getInstance().start();
     handleError();
     lock.invoke(IOIO::waitForConnect);

ioio/ioio/src/main/java/ioio/smallbasic/IOService.java

@@ -86,7 +86,6 @@ private void registerPin(int pin) throws IOException {
 
   public class IOServiceLooper implements IOIOLooper {
     private IOIO ioio;
-    private long lastAccessMillis;
 
     @Override
     public void disconnected() {
@@ -106,7 +105,7 @@ public void incompatible(IOIO ioio) {
 
     @Override
     public void loop() throws ConnectionLostException, InterruptedException {
-      lastAccessMillis = TimerUtil.tick(lastAccessMillis);
+      Thread.sleep(0, 5);
       for (IOTask next: ioTasks) {
         try {
           next.loop();
@@ -120,7 +119,6 @@ public void loop() throws ConnectionLostException, InterruptedException {
     @Override
     public void setup(IOIO ioio) {
       this.ioio = ioio;
-      this.lastAccessMillis = System.currentTimeMillis();
       for (IOTask next: ioTasks) {
         try {
           next.setup(ioio);

ioio/ioio/src/main/java/ioio/smallbasic/SpiMasterImpl.java

@@ -9,7 +9,7 @@
 
 public class SpiMasterImpl extends IOTask {
   private static final String TAG = "SpiMasterImpl";
-  private static final int SPI_WRITE_MAX = 63;
+  private static final int SPI_WRITE_MAX = 62;
   private final byte[] BATCH = new byte[SPI_WRITE_MAX];
   private final IOLock<SpiMaster> lock = new IOLock<>();
   private SpiMaster spiMaster = null;
@@ -57,16 +57,16 @@ public long readWrite(int readLen, final byte[] write, int writeLen) {
   public void write(final byte[] write, int writeLen) {
     handleError();
     lock.invoke((i) -> {
-      if (writeLen < SPI_WRITE_MAX) {
-        spiMaster.writeRead(write, writeLen, writeLen, null, 0);
-      } else {
+      if (writeLen > SPI_WRITE_MAX) {
         int srcPos = 0;
         while (srcPos < writeLen) {
-          int batchLen = Math.min(writeLen - srcPos, SPI_WRITE_MAX);
+          int batchLen = Math.min(writeLen - srcPos, 2);
           System.arraycopy(write, srcPos, BATCH, 0, batchLen);
-          spiMaster.writeRead(BATCH, batchLen, batchLen, null, 0);
-          srcPos += SPI_WRITE_MAX;
+          spiMaster.writeReadAsync(0, BATCH, batchLen, batchLen, null, 0);
+          srcPos += batchLen;
         }
+      } else {
+        spiMaster.writeRead(write, writeLen, writeLen, null, 0);
       }
     });
   }
@@ -79,7 +79,7 @@ void loop() throws ConnectionLostException, InterruptedException {
   @Override
   void setup(IOIO ioio) throws ConnectionLostException {
     Log.i(TAG, "setup entered: miso:" + miso + " mosi:" + mosi + " clk:" + clk + " cs:" + slaveSelect);
-    spiMaster = ioio.openSpiMaster(miso, mosi, clk, slaveSelect, SpiMaster.Rate.RATE_1M);
+    spiMaster = ioio.openSpiMaster(miso, mosi, clk, slaveSelect, SpiMaster.Rate.RATE_4M);
   }
 
   private void pinError(String name) {

ioio/ioio/src/main/java/ioio/smallbasic/TimerUtil.java

@@ -33,7 +33,7 @@ public boolean canClose() {
   @Override
   synchronized public void disconnect() {
     abort = true;
-    if (serialPort != null) {
+    if (serialPort != null && inputStream != null) {
       try {
         inputStream.close();
       } catch (IOException e) {

ioio/ioio/src/main/java/ioio/smallbasic/pc/SerialPortIOIOConnection.java

@@ -25,8 +25,8 @@
 #define CLASS_SPIMASTER "ioio/smallbasic/SpiMasterImpl"
 #define CLASS_IOIO "ioio/smallbasic/IOIOImpl"
 #define CLASS_IOTASK_ID 1
-#define SPI_WRITE_MAX 63
-#define TWI_WRITE_MAX ARRAY_SIZE
+#define SPI_WRITE_MAX 62
+#define TWI_WRITE_MAX 255
 
 struct IOTask : JavaProxy {
   IOTask() : JavaProxy() {
@@ -47,7 +47,7 @@ struct IOTask : JavaProxy {
   // int readWrite(bytes, byte[] write) {
   int invokeSpiReadWrite(int argc, slib_par_t *arg, var_s *retval) {
     int result = 0;
-    int writeLen = populateByteArray(argc, arg, 1);
+    int writeLen = populateByteArray(argc, arg, 1, SPI_WRITE_MAX);
     if (writeLen > SPI_WRITE_MAX) {
       error(retval, "write array", 1, SPI_WRITE_MAX);
     } else if (_instance != nullptr) {
@@ -67,12 +67,17 @@ struct IOTask : JavaProxy {
     return result;
   }
 
-  // int write(byte[] write) {
+  // int write(byte[] write, int length) {
   int invokeSpiWrite(int argc, slib_par_t *arg, var_s *retval) {
     int result = 0;
-    int writeLen = populateByteArray(argc, arg, 0);
-    if (writeLen > ARRAY_SIZE) {
-      error(retval, "write array", 1, ARRAY_SIZE);
+    int maxSize = SPI_WRITE_MAX;
+    if (is_param_array(argc, arg, 0)) {
+      // allow an entire LCD to be updated within one IOIOLooper.loop() call
+      maxSize = v_asize(arg[0].var_p);
+    }
+    int writeLen = populateByteArray(argc, arg, 0, maxSize);
+    if (writeLen > maxSize) {
+      error(retval, "write array", 1, maxSize);
     } else if (_instance != nullptr) {
       attachCurrentThread();
       jmethodID method = g_env->GetMethodID(_clazz, "write", "([BI)V");
@@ -90,7 +95,7 @@ struct IOTask : JavaProxy {
   // int readWrite(int address, byte[] write) {
   int invokeTwiReadWrite(int argc, slib_par_t *arg, var_s *retval) {
     int result = 0;
-    int writeLen = populateByteArray(argc, arg, 2);
+    int writeLen = populateByteArray(argc, arg, 2, TWI_WRITE_MAX);
     if (writeLen > TWI_WRITE_MAX) {
       error(retval, "write array", 1, TWI_WRITE_MAX);
     } else if (_instance != nullptr) {
@@ -114,7 +119,7 @@ struct IOTask : JavaProxy {
   // int write(int address, byte[] write) {
   int invokeTwiWrite(int argc, slib_par_t *arg, var_s *retval) {
     int result = 0;
-    int writeLen = populateByteArray(argc, arg, 1);
+    int writeLen = populateByteArray(argc, arg, 1, TWI_WRITE_MAX);
     if (writeLen > TWI_WRITE_MAX) {
       error(retval, "write array", 1, TWI_WRITE_MAX);
     } else if (_instance != nullptr) {
@@ -155,7 +160,7 @@ static int cmd_twimaster_readwrite(var_s *self, int argc, slib_par_t *arg, var_s
   int result = 0;
   auto readBytes = get_param_int(argc, arg, 1, 0);
   if (argc < 2) {
-    error(retval, "TwiMaster.readWrite(address, read-bytes, [data]", 2, ARRAY_SIZE);
+    error(retval, "TwiMaster.readWrite(address, read-bytes, [data]", 2, TWI_WRITE_MAX);
   } else if (readBytes < 1 || readBytes > 8) {
     error(retval, "read-bytes value out of range. Expected a number between 1 and 8");
   } else {
@@ -170,7 +175,7 @@ static int cmd_twimaster_readwrite(var_s *self, int argc, slib_par_t *arg, var_s
 static int cmd_twimaster_write(var_s *self, int argc, slib_par_t *arg, var_s *retval) {
   int result = 0;
   if (argc < 2) {
-    error(retval, "TwiMaster.write", 2, ARRAY_SIZE);
+    error(retval, "TwiMaster.write", 2, TWI_WRITE_MAX);
   } else {
     int id = get_io_class_id(self, retval);
     if (id != -1) {
@@ -184,7 +189,7 @@ static int cmd_spimaster_readwrite(var_s *self, int argc, slib_par_t *arg, var_s
   int result = 0;
   auto readBytes = get_param_int(argc, arg, 0, 0);
   if (argc < 2) {
-    error(retval, "SpiMaster.readWrite(read-bytes, [data]", 2, ARRAY_SIZE);
+    error(retval, "SpiMaster.readWrite(read-bytes, [data]", 2, SPI_WRITE_MAX);
   } else if (readBytes < 1 || readBytes > 8) {
     error(retval, "read-bytes value out of range. Expected a number between 1 and 8");
   } else {
@@ -199,7 +204,7 @@ static int cmd_spimaster_readwrite(var_s *self, int argc, slib_par_t *arg, var_s
 static int cmd_spimaster_write(var_s *self, int argc, slib_par_t *arg, var_s *retval) {
   int result = 0;
   if (argc < 1) {
-    error(retval, "SpiMaster.write", 1, ARRAY_SIZE);
+    error(retval, "SpiMaster.write", 1, SPI_WRITE_MAX);
   } else {
     int id = get_io_class_id(self, retval);
     if (id != -1) {