Merge pull request #39 from mtl2034/master

Fix performance issues and prepare 1.0.1-rc3

Author: Damian Kowalewski

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT(parse-embedded, 1.0.1-rc2, damiank@fb.com)
+AC_INIT(parse-embedded, 1.0.1-rc3, damiank@fb.com)
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_SRCDIR(common/simplejson.c)
 AC_CONFIG_SRCDIR(unix/src/parse.c)
@@ -21,6 +21,18 @@ AC_CHECK_HEADERS(curl/curl.h)
 AC_CHECK_LIB(uuid, uuid_generate_random)
 AC_CHECK_HEADERS(uuid/uuid.h)
 
+AC_CACHE_CHECK([whether getopt has optreset support],
+        ac_cv_have_getopt_optreset, [
+            AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+#include <getopt.h>
+            ]], [[ extern int optreset; optreset = 0; ]])],[ ac_cv_have_getopt_optreset="yes" ],[ ac_cv_have_getopt_optreset="no" 
+        ])
+])
+
+if test "x$ac_cv_have_getopt_optreset" = "xyes" ; then
+        AC_DEFINE(HAVE_OPTRESET, 1, [Define if optreset exists])
+fi
+
 AC_ARG_ENABLE([yun],
 [  --enable-yun    Enable Arduino Yun support],
 [case "${enableval}" in

openwrt/parse-embedded/Makefile

@@ -10,7 +10,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=parse-embedded
-PKG_VERSION:=1.0.1-rc2
+PKG_VERSION:=1.0.1-rc3
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-sdks-$(PKG_VERSION).tar.gz

unix/yun/client.c

@@ -20,7 +20,6 @@
  */
 
 #include "client.h"
-#include <openssl/err.h>
 
 int tcp_connect(const char *host, int port)
 {
@@ -41,7 +40,6 @@ int tcp_connect(const char *host, int port)
     if(connect(sock,(struct sockaddr *)&addr, sizeof(addr))<0) {
         return -1;
     }
-
     return sock;
 }
 
@@ -70,18 +68,36 @@ int tcp_write(int sock, char* data) {
 }
 
 int tcp_read(int sock, char* data, int size, int timeout_sec) {
+    struct timeval tv;
+    fd_set receive;
     int n_recv = 0;
     int n_tmp = 0;
-    struct timeval tv;
-    tv.tv_sec = timeout_sec; // timeout
-    tv.tv_usec = 0;
-    setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, (char *)&tv,sizeof(struct timeval));
-    while(n_recv < size && (n_tmp = recv(sock, data+n_recv, size-n_recv, 0)) > 0){
-        if (n_tmp <= 0){
-            //fprintf(stdout, "i:nothing to read\n");
-            break;
+    int bracketCount = 0;
+    int readCount = 0;
+    while(n_recv < size && readCount++ < timeout_sec * 10) {
+        FD_ZERO(&receive);
+        FD_SET(sock, &receive);
+        tv.tv_sec = 0;
+        tv.tv_usec = 100000;
+        if(select(sock + 1, &receive, NULL, NULL, &tv) > 0) {
+            if(FD_ISSET(sock, &receive)) {
+                // need to put select to timeout asap
+                n_tmp = recv(sock, data+n_recv, size-n_recv, 0);
+                if (n_tmp == -1) {
+                    n_tmp = 0;
+                }
+                // Analyze the data to get the object asap.
+                int i;
+                for(i = 0; i < n_tmp; i ++) {
+                    if (data[n_recv + i] == '{') bracketCount++;
+                    if (data[n_recv + i] == '}') bracketCount--;
+                }
+                n_recv += n_tmp;
+                if (n_recv > 0 && bracketCount == 0) {
+                    break;
+                }
+            }
         }
-        n_recv += n_tmp;
     }
     data[n_recv] = '\0';
     return n_recv;

unix/yun/parse_request.c

@@ -179,8 +179,12 @@ int main(int argc , char **argv) {
   }
 
   // process post init options
+#if defined(HAVE_OPTRESET)
   optreset = 1;
   optind = 1;
+#else
+  optind = 0;
+#endif
 
   while((c=getopt(argc,argv,":a:k:x:y:v:e:d:p:ish"))!=-1){
     switch(c){

unix/yun/yun.c

@@ -29,52 +29,55 @@
 #include "utils.h"
 #include "yun.h"
 
-char g_cAppID[APPLICATION_ID_MAX_LEN + 1];
-char g_cClientKey[CLIENT_KEY_MAX_LEN + 1];
-char g_cInstallationID[INSTALLATION_ID_MAX_LEN + 1];
-char g_cSessionToken[SESSION_TOKEN_MAX_LEN + 1];
+char g_cAppID[APPLICATION_ID_MAX_LEN + 1] = {0};
+char g_cClientKey[CLIENT_KEY_MAX_LEN + 1] = {0};
+char g_cInstallationID[INSTALLATION_ID_MAX_LEN + 1] ={0};
+char g_cSessionToken[SESSION_TOKEN_MAX_LEN + 1] = {0};
 
 int yunReadProvisioningInfo() {
   int socketHandle = -1;
   char buf[128];
   char value[64];
-  memset(value, 0, 64);
-  if ((socketHandle = tcp_connect("127.0.0.1", 5700)) > 0) {
+  if ((socketHandle = tcp_connect("localhost", 5700)) > 0) {
     // read appId
-    memset(buf, 0, 128);
+    memset(buf, 0, sizeof(buf));
+    memset(value, 0, sizeof(value));
     tcp_write(socketHandle, "{\"command\": \"get\", \"key\": \"appId\"}\n");
-    if (tcp_read(socketHandle, buf, 128, 2)) {
-      getValueFromJSON(buf, "value", value, 64);
+    if (tcp_read(socketHandle, buf, sizeof(buf) - 1, 2)) {
+      getValueFromJSON(buf, "value", value, sizeof(value));
       if(strcmp("null", value) != 0) {
         strncpy(g_cAppID, value, sizeof(g_cAppID));
       }
     }
 
     // read clientKey
-    memset(buf, 0, 128);
+    memset(buf, 0, sizeof(buf));
+    memset(value, 0, sizeof(value));
     tcp_write(socketHandle, "{\"command\": \"get\", \"key\": \"clientKey\"}\n");
-    if (tcp_read(socketHandle, buf, 128, 2)) {
-      getValueFromJSON(buf, "value", value, 64);
+    if (tcp_read(socketHandle, buf, sizeof(buf) - 1, 2)) {
+      getValueFromJSON(buf, "value", value, sizeof(value));
       if(strcmp("null", value) != 0) {
         strncpy(g_cClientKey, value, sizeof(g_cClientKey));
       }
     }
 
     // read installationId
-    memset(buf, 0, 128);
+    memset(buf, 0, sizeof(buf));
+    memset(value, 0, sizeof(value));
     tcp_write(socketHandle, "{\"command\": \"get\", \"key\": \"installationId\"}\n");
-    if (tcp_read(socketHandle, buf, 128, 2)) {
-      getValueFromJSON(buf, "value", value, 64);
+    if (tcp_read(socketHandle, buf, sizeof(buf) - 1, 2)) {
+      getValueFromJSON(buf, "value", value, sizeof(value));
       if(strcmp("null", value) != 0) {
         strncpy(g_cInstallationID, value, sizeof(g_cInstallationID));
       }
     }
 
     // read sessionToken
-    memset(buf, 0, 128);
+    memset(buf, 0, sizeof(buf));
+    memset(value, 0, sizeof(value));
     tcp_write(socketHandle, "{\"command\": \"get\", \"key\": \"sessionToken\"}\n");
-    if (tcp_read(socketHandle, buf, 128, 2)) {
-      getValueFromJSON(buf, "value", value, 64);
+    if (tcp_read(socketHandle, buf, sizeof(buf) - 1, 2)) {
+      getValueFromJSON(buf, "value", value, sizeof(value));
       if(strcmp("null", value) != 0) {
         strncpy(g_cSessionToken, value, sizeof(g_cSessionToken));
       }

yun/libraries/Parse/examples/setup/Setup.ino

@@ -1,6 +1,6 @@
 #include <Bridge.h>
 
-String revision = "1.0.1-rc2-1_ar71xx";
+String revision = "1.0.1-rc3-1_ar71xx";
 String location = "https://raw.githubusercontent.com/ParsePlatform/parse-embedded-sdks/master/yun/linux_package/";
 
 void downloadPackage(String file) {

yun/linux_package/parse-embedded-yun_1.0.1-rc3-1_ar71xx.ipk

@@ -4,28 +4,28 @@ YUN_PWD=arduino #YUN's PASSWORD, default is arduino
 
 # scp parse_push and parse_request to Yun
 expect -c "
-spawn scp linux_package/parse-embedded_1.0.1-rc2-1_ar71xx.ipk root@$YUN_IP_ADDRESS:/root/
+spawn scp linux_package/parse-embedded_1.0.1-rc3-1_ar71xx.ipk root@$YUN_IP_ADDRESS:/root/
 expect *password:
 send $YUN_PWD\n
 interact
 "
 
 expect -c "
-spawn scp linux_package/parse-embedded-yun_1.0.1-rc2-1_ar71xx.ipk root@$YUN_IP_ADDRESS:/root/
+spawn scp linux_package/parse-embedded-yun_1.0.1-rc3-1_ar71xx.ipk root@$YUN_IP_ADDRESS:/root/
 expect *password:
 send $YUN_PWD\n
 interact
 "
 
 expect -c "
-spawn ssh root@$YUN_IP_ADDRESS ''/bin/opkg install /root/parse-embedded_1.0.1-rc2-1_ar71xx.ipk''
+spawn ssh root@$YUN_IP_ADDRESS ''/bin/opkg install /root/parse-embedded_1.0.1-rc3-1_ar71xx.ipk''
 expect *password:
 send $YUN_PWD\n
 interact
 "
 
 expect -c "
-spawn ssh root@$YUN_IP_ADDRESS ''/bin/opkg install /root/parse-embedded-yun_1.0.1-rc2-1_ar71xx.ipk''
+spawn ssh root@$YUN_IP_ADDRESS ''/bin/opkg install /root/parse-embedded-yun_1.0.1-rc3-1_ar71xx.ipk''
 expect *password:
 send $YUN_PWD\n
 interact