Replace the svnversion mechanism with git describe.

[cycript.git] / Handler.mm

diff --git a/Handler.mm b/Handler.mm
index 016f0c8bc1aeebde97ae18728534800041cc5754..008d42639927605f4442b024f6333545dabad5dc 100644 (file)
--- a/Handler.mm
+++ b/Handler.mm
@@ -1,43 +1,26 @@
-/* Cycript - Inlining/Optimizing JavaScript Compiler
- * Copyright (C) 2009  Jay Freeman (saurik)
+/* Cycript - Optimizing JavaScript Compiler/Runtime
+ * Copyright (C) 2009-2010  Jay Freeman (saurik)

 */
 
 */
 

-/* Modified BSD License {{{ */
+/* GNU Lesser General Public License, Version 3 {{{ */

 /*
 /*

- *        Redistribution and use in source and binary
- * forms, with or without modification, are permitted
- * provided that the following conditions are met:
+ * Cycript is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.

  *
  *

- * 1. Redistributions of source code must retain the
- *    above copyright notice, this list of conditions
- *    and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the
- *    above copyright notice, this list of conditions
- *    and the following disclaimer in the documentation
- *    and/or other materials provided with the
- *    distribution.
- * 3. The name of the author may not be used to endorse
- *    or promote products derived from this software
- *    without specific prior written permission.
+ * Cycript 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 Lesser General Public
+ * License for more details.

  *
  *

- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
+**/

 /* }}} */
 
 #include "cycript.hpp"
 /* }}} */
 
 #include "cycript.hpp"

+#include "JavaScript.hpp"

 
 #include "Pooling.hpp"
 #include "Parser.hpp"
 
 #include "Pooling.hpp"
 #include "Parser.hpp"


@@ -49,6 +32,11 @@
 #include <unistd.h>
 #include <sstream>
 
 #include <unistd.h>
 #include <sstream>
 

+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <sys/un.h>
+

 struct CYExecute_ {
     apr_pool_t *pool_;
     const char * volatile data_;
 struct CYExecute_ {
     apr_pool_t *pool_;
     const char * volatile data_;


@@ -68,7 +56,7 @@ struct CYExecute_ {
     CYExecute_ *execute(reinterpret_cast<CYExecute_ *>([value pointerValue]));
     const char *data(execute->data_);
     execute->data_ = NULL;
     CYExecute_ *execute(reinterpret_cast<CYExecute_ *>([value pointerValue]));
     const char *data(execute->data_);
     execute->data_ = NULL;

-    execute->data_ = CYExecute(execute->pool_, data);
+    execute->data_ = CYExecute(execute->pool_, CYUTF8String(data));

 }
 
 @end
 }
 
 @end


@@ -93,18 +81,25 @@ struct CYClient :
 
         CYClient_ *client = [[[CYClient_ alloc] init] autorelease];
 
 
         CYClient_ *client = [[[CYClient_ alloc] init] autorelease];
 

+        bool dispatch;
+        if (CFStringRef mode = CFRunLoopCopyCurrentMode(CFRunLoopGetMain())) {
+            dispatch = true;
+            CFRelease(mode);
+        } else
+            dispatch = false;
+

         for (;;) {
             size_t size;
             if (!CYRecvAll(socket_, &size, sizeof(size)))
                 return;
 
         for (;;) {
             size_t size;
             if (!CYRecvAll(socket_, &size, sizeof(size)))
                 return;
 

-            CYPool pool;
+            CYLocalPool pool;

             char *data(new(pool) char[size + 1]);
             if (!CYRecvAll(socket_, data, size))
                 return;
             data[size] = '\0';
 
             char *data(new(pool) char[size + 1]);
             if (!CYRecvAll(socket_, data, size))
                 return;
             data[size] = '\0';
 

-            CYDriver driver("");
+            CYDriver driver;

             cy::parser parser(driver);
 
             driver.data_ = data;
             cy::parser parser(driver);
 
             driver.data_ = data;


@@ -115,16 +110,25 @@ struct CYClient :
                 json = NULL;
                 size = _not(size_t);
             } else {
                 json = NULL;
                 size = _not(size_t);
             } else {

-                CYContext context(driver.pool_);
+                NSAutoreleasePool *ar = [[NSAutoreleasePool alloc] init];
+
+                CYOptions options;
+                CYContext context(options);

                 driver.program_->Replace(context);
                 std::ostringstream str;
                 driver.program_->Replace(context);
                 std::ostringstream str;

-                CYOutput out(str);
+                CYOutput out(str, options);

                 out << *driver.program_;
                 std::string code(str.str());
                 CYExecute_ execute = {pool, code.c_str()};
                 out << *driver.program_;
                 std::string code(str.str());
                 CYExecute_ execute = {pool, code.c_str()};

-                [client performSelectorOnMainThread:@selector(execute:) withObject:[NSValue valueWithPointer:&execute] waitUntilDone:YES];
+                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(size_t) : strlen(json);
                 json = execute.data_;
                 size = json == NULL ? _not(size_t) : strlen(json);

+
+                [ar release];

             }
 
             if (!CYSendAll(socket_, &size, sizeof(size)))
             }
 
             if (!CYSendAll(socket_, &size, sizeof(size)))


@@ -151,3 +155,24 @@ extern "C" void CYHandleClient(apr_pool_t *pool, int socket) {
     _aprcall(apr_threadattr_create(&attr, client->pool_));
     _aprcall(apr_thread_create(&client->thread_, attr, &OnClient, client, client->pool_));
 }
     _aprcall(apr_threadattr_create(&attr, client->pool_));
     _aprcall(apr_thread_create(&client->thread_, attr, &OnClient, client, client->pool_));
 }

+
+extern "C" void CYHandleServer(pid_t pid) {
+    CYInitializeDynamic();
+
+    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)));
+
+        apr_pool_t *pool;
+        apr_pool_create(&pool, NULL);
+
+        CYHandleClient(pool, socket);
+    } catch (const CYException &error) {
+        CYPool pool;
+        fprintf(stderr, "%s\n", error.PoolCString(pool));
+    }
+}