Rename Instance::Transient to Instance::Permament.

[cycript.git] / Handler.mm

diff --git a/Handler.mm b/Handler.mm
index e7b2c3bcf5e3e16dae386d992bafd80730a49b8b..bbda7df1a1dcfae07e1eb4c45f53c817bbe79786 100644 (file)
--- a/Handler.mm
+++ b/Handler.mm
@@ -1,29 +1,31 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2013  Jay Freeman (saurik)
+ * Copyright (C) 2009-2014  Jay Freeman (saurik)
 */
 
-/* GNU General Public License, Version 3 {{{ */
+/* GNU Affero General Public License, Version 3 {{{ */
 /*
- * Cycript is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- *
- * Cycript is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
+ * GNU Affero General Public License for more details.
+
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 **/
 /* }}} */
 
 #include <Foundation/Foundation.h>
+#include <dlfcn.h>
 #include <pthread.h>
 #include <unistd.h>
 #include <sstream>
 
+#include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -57,7 +59,7 @@ struct CYExecute_ {
     CYExecute_ *execute(reinterpret_cast<CYExecute_ *>([value pointerValue]));
     const char *data(execute->data_);
     execute->data_ = NULL;
-    execute->data_ = CYExecute(execute->pool_, CYUTF8String(data));
+    execute->data_ = CYExecute(CYGetJSContext(), execute->pool_, CYUTF8String(data));
 }
 
 @end
@@ -100,36 +102,20 @@ struct CYClient :
                 return;
             data[size] = '\0';
 
-            CYStream stream(data, data + size);
-            CYDriver driver(stream);
-
-            cy::parser parser(driver);
-
-            const char *json;
-            if (parser.parse() != 0 || !driver.errors_.empty()) {
-                json = NULL;
-                size = _not(uint32_t);
-            } else {
-                NSAutoreleasePool *ar = [[NSAutoreleasePool alloc] init];
-
-                CYOptions options;
-                CYContext context(options);
-                driver.program_->Replace(context);
-                std::ostringstream str;
-                CYOutput out(str, options);
-                out << *driver.program_;
-                std::string code(str.str());
-                CYExecute_ execute = {pool, code.c_str()};
-                NSValue *value([NSValue valueWithPointer:&execute]);
-                if (dispatch)
-                    [client performSelectorOnMainThread:@selector(execute:) withObject:value waitUntilDone:YES];
-                else
-                    [client execute:value];
-                json = execute.data_;
-                size = json == NULL ? _not(uint32_t) : strlen(json);
-
-                [ar release];
-            }
+            NSAutoreleasePool *ar = [[NSAutoreleasePool alloc] init];
+
+            std::string code(data, size);
+            CYExecute_ execute = {pool, code.c_str()};
+            NSValue *value([NSValue valueWithPointer:&execute]);
+            if (dispatch)
+                [client performSelectorOnMainThread:@selector(execute:) withObject:value waitUntilDone:YES];
+            else
+                [client execute:value];
+
+            const char *json(execute.data_);
+            size = json == NULL ? _not(uint32_t) : strlen(json);
+
+            [ar release];
 
             if (!CYSendAll(socket_, &size, sizeof(size)))
                 return;
@@ -156,22 +142,45 @@ extern "C" void CYHandleClient(int socket) {
     _assert(pthread_create(&client->thread_, NULL, &OnClient, client) == 0);
 }
 
-extern "C" void CYHandleServer(pid_t pid) {
+static void CYHandleSocket(const char *path) {
+    int socket(_syscall(::socket(PF_UNIX, SOCK_STREAM, 0)));
+
+    struct sockaddr_un address;
+    memset(&address, 0, sizeof(address));
+    address.sun_family = AF_UNIX;
+    strcpy(address.sun_path, path);
+
+    _syscall(connect(socket, reinterpret_cast<sockaddr *>(&address), SUN_LEN(&address)));
+
     CYInitializeDynamic();
+    CYHandleClient(socket);
+}
 
-    int socket(_syscall(::socket(PF_UNIX, SOCK_STREAM, 0))); try {
-        struct sockaddr_un address;
-        memset(&address, 0, sizeof(address));
-        address.sun_family = AF_UNIX;
-        sprintf(address.sun_path, "/tmp/.s.cy.%u", pid);
-
-        _syscall(connect(socket, reinterpret_cast<sockaddr *>(&address), SUN_LEN(&address)));
-        CYHandleClient(socket);
-    } catch (const CYException &error) {
-        CYPool pool;
-        fprintf(stderr, "%s\n", error.PoolCString(pool));
+extern "C" void CYHandleServer(pid_t pid) { try {
+    char path[1024];
+    sprintf(path, "/tmp/.s.cy.%u", pid);
+    CYHandleSocket(path);
+} catch (const CYException &error) {
+    CYPool pool;
+    fprintf(stderr, "%s\n", error.PoolCString(pool));
+} }
+
+extern "C" char *MSmain0(int argc, char *argv[]) { try {
+    _assert(argc == 2);
+    CYHandleSocket(argv[1]);
+
+    static void *handle(NULL);
+    if (handle == NULL) {
+        Dl_info info;
+        _assert(dladdr(reinterpret_cast<void *>(&MSmain0), &info) != 0);
+        handle = dlopen(info.dli_fname, RTLD_NOLOAD);
     }
-}
+
+    return NULL;
+} catch (const CYException &error) {
+    CYPool pool;
+    return strdup(error.PoolCString(pool));
+} }
 
 struct CYServer {
     pthread_t thread_;