Added threading and the beginings of Object dispatch

Author: dpp

Classes/DetailViewController.m

@@ -8,6 +8,7 @@
 
 #import "DetailViewController.h"
 #import "RootViewController.h"
+#import "PerformOMatic.h"
 
 static void (*cb_viewDidLoad)(void*);
 
@@ -29,6 +30,13 @@ void setLispEval(DetailViewController *vc, void (*cb)(void *vc, const char *))
 	vc -> cb_lispEval = cb;
 }
 
+void dispatchFunc(void (*fp)(void*)) {
+	// dispatch_async_f(dispatch_get_main_queue(), NULL, fp);
+	id runner = [[PerformOMatic alloc] init];
+	[runner setFunc:fp];
+	[runner run];
+}
+
 @interface DetailViewController ()
 @property (nonatomic, retain) UIPopoverController *popoverController;
 - (void)configureView;

Classes/PerformOMatic.h

@@ -0,0 +1,22 @@
+//
+//  PerformOMatic.h
+//  Lisp
+//
+//  Created by David Pollak on 6/17/11.
+//  Copyright 2011 lift Web Framework. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+
+@interface PerformOMatic : NSObject {
+	void (*whatToDo)(void *);
+	
+}
+
+- (void)setFunc:(void *)func;
+- (void)run;
+- (void)reallyDoIt:(id)ignore;
+@end
+
+extern void releaseMe(void *);

Classes/PerformOMatic.m

@@ -0,0 +1,27 @@
+//
+//  PerformOMatic.m
+//  Lisp
+//
+//  Created by David Pollak on 6/17/11.
+//  Copyright 2011 lift Web Framework. All rights reserved.
+//
+
+#import "PerformOMatic.h"
+
+
+@implementation PerformOMatic
+- (void)run {
+	[self performSelectorOnMainThread:@selector(reallyDoIt:) withObject:self waitUntilDone:TRUE];
+}
+
+- (void)reallyDoIt:(id)ignore {
+	whatToDo(NULL);
+	releaseMe(whatToDo);
+	[self dealloc];
+}
+
+- (void)setFunc:(void *)func {
+	whatToDo = func;
+}
+
+@end

DetailView.xib

@@ -45,7 +45,7 @@
 					<object class="IBUIToolbar" id="410698538">
 						<reference key="NSNextResponder" ref="647120888"/>
 						<int key="NSvFlags">290</int>
-						<string key="NSFrameSize">{768, 44}</string>
+						<string key="NSFrameSize">{1024, 44}</string>
 						<reference key="NSSuperview" ref="647120888"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -127,13 +127,16 @@
 						</object>
 					</object>
 				</object>
-				<string key="NSFrameSize">{768, 1004}</string>
+				<string key="NSFrameSize">{1024, 748}</string>
 				<reference key="NSSuperview"/>
 				<reference key="IBUIBackgroundColor" ref="33107367"/>
 				<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics">
 					<int key="IBUIStatusBarStyle">2</int>
 				</object>
+				<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
+					<int key="interfaceOrientation">3</int>
+				</object>
 				<string key="targetRuntimeIdentifier">IBIPadFramework</string>
 			</object>
 		</object>
@@ -272,7 +275,7 @@
 					<object class="NSAffineTransform">
 						<bytes key="NSTransformStruct">P4AAAL+AAABDngAAxG/AAA</bytes>
 					</object>
-					<string>{{897, 532}, {768, 1024}}</string>
+					<string>{{769, 660}, {1024, 768}}</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				</object>
 			</object>

Lisp.xcodeproj/dpp.mode1v3

@@ -17,6 +17,7 @@
 		2892E4100DC94CBA00A64D0F /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2892E40F0DC94CBA00A64D0F /* CoreGraphics.framework */; };
 		28AD73600D9D9599002E5188 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28AD735F0D9D9599002E5188 /* MainWindow.xib */; };
 		DE23F94C139EDDD10030BDEB /* libLisp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DE23F94B139EDDD10030BDEB /* libLisp.a */; };
+		DEAB8A8913AC117200A67CC3 /* PerformOMatic.m in Sources */ = {isa = PBXBuildFile; fileRef = DEAB8A8813AC117200A67CC3 /* PerformOMatic.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -46,6 +47,8 @@
 		29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		8D1107310486CEB800E47090 /* Lisp-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Lisp-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = "<group>"; };
 		DE23F94B139EDDD10030BDEB /* libLisp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libLisp.a; path = dist/build/Lisp/libLisp.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		DEAB8A8713AC117200A67CC3 /* PerformOMatic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PerformOMatic.h; sourceTree = "<group>"; };
+		DEAB8A8813AC117200A67CC3 /* PerformOMatic.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PerformOMatic.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -72,6 +75,8 @@
 				28042008108E984D000629CD /* RootViewController.m */,
 				28042009108E984D000629CD /* DetailViewController.h */,
 				2804200A108E984D000629CD /* DetailViewController.m */,
+				DEAB8A8713AC117200A67CC3 /* PerformOMatic.h */,
+				DEAB8A8813AC117200A67CC3 /* PerformOMatic.m */,
 			);
 			path = Classes;
 			sourceTree = "<group>";
@@ -210,6 +215,7 @@
 				1D3623260D0F684500981E51 /* LispAppDelegate.m in Sources */,
 				2804200B108E984D000629CD /* RootViewController.m in Sources */,
 				2804200C108E984D000629CD /* DetailViewController.m in Sources */,
+				DEAB8A8913AC117200A67CC3 /* PerformOMatic.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

Lisp.xcodeproj/dpp.pbxuser

@@ -6,14 +6,15 @@ import Monad
 import Control.Monad.Error
 import IO hiding (try)
 import Data.IORef
-
-
+import System.Random
+import Control.Concurrent
 import Foreign.C.Types
 import Foreign.C.String
 import Foreign.Ptr
 import Network
 import System.IO
 import Data.IORef
+import System.IO.Unsafe
 
 foreign import ccall safe "openWindow" openWindow
          :: IO CInt
@@ -28,6 +29,27 @@ foreign import ccall safe "setLispEval" setLispEval :: ViewController -> FunPtr
 
 foreign import ccall safe "addToResult" addToResult :: ViewController -> CString -> IO ()
 
+data ObjCId_struct
+type ObjCId = Ptr ObjCId_struct
+
+data ObjCSEL_struct
+type ObjCSEL = Ptr ObjCSEL_struct
+
+foreign import ccall safe "objc_msgSend" objc_msgSend :: ObjCId -> ObjCSEL -> IO ObjCId
+foreign import ccall safe "objc_msgSend" objc_msgSendInt :: ObjCId -> ObjCSEL -> Int -> IO ObjCId
+foreign import ccall safe "sel_registerName" sel_registerName :: CString -> IO ObjCSEL
+foreign import ccall safe "objc_lookUpClass" objc_lookUpClass :: CString -> IO ObjCId
+
+
+makeAString :: IO ObjCId
+makeAString = do
+    strCls <- withCString "NSString" objc_lookUpClass 
+    allocName <- withCString "alloc" sel_registerName
+    alloced <- objc_msgSend strCls allocName
+    hPutStrLn stderr "Alloced it"
+    initName <- withCString "init" sel_registerName 
+    objc_msgSend alloced initName
+
 openLogger :: IO Handle
 openLogger = return stderr
 
@@ -36,7 +58,42 @@ type ViewDidLoad = ViewController -> IO ()
 foreign import ccall safe "wrapper" mkViewDidLoad :: ViewDidLoad -> IO (FunPtr ViewDidLoad)
 foreign import ccall safe "setViewDidLoad" setViewDidLoad :: FunPtr ViewDidLoad -> IO ()
 
-          
+foreign import ccall safe "dispatchFunc" dispatchFunc :: FunPtr StrVoid -> IO ()
+
+type StrVoid = CString -> IO ()
+foreign import ccall safe "wrapper" mkStrCB :: StrVoid -> IO (FunPtr StrVoid)
+
+foreign export ccall releaseMe :: FunPtr a -> IO ()
+releaseMe :: FunPtr a -> IO ()
+releaseMe ptr = freeHaskellFunPtr ptr
+
+myThread :: IO ()
+myThread = do 
+          str <- makeAString
+          log <- openLogger
+          rSalt <- getStdRandom (randomR (1,1000000))
+          threadDelay $ 1000000 + rSalt
+          runOnMain $ appendStr $ "\nHello dude " ++ show rSalt
+          myThread
+    
+runOnMain :: IO () -> IO ()
+runOnMain todo = do
+                  func <- funky
+                  dispatchFunc func
+  where funky =  mkStrCB $ \v -> do
+                                   todo
+                                   --func <- funky
+                                   --freeHaskellFunPtr func
+
+viewController :: IORef (Maybe ViewController) 
+viewController = unsafePerformIO $ newIORef Nothing
+
+appendStr :: String -> IO ()
+appendStr str = do
+                vcm <- readIORef viewController
+                case vcm of
+                   Just vc -> withCString str $ \cstr -> addToResult vc cstr
+                   _ -> return ()
 main :: IO ()
 main = do
      log <- openLogger
@@ -46,10 +103,12 @@ main = do
 
      -- execute a line of List and call the callback with the result
      runALine <- wrapFuncInvoke $ \vc line -> do
+                                              writeIORef viewController $ Just vc
                                               toEval <- peekCString line
                                               res <- evalString env toEval
-                                              back <- withCString res $ \back -> addToResult vc back
-                                              return ()
+                                              appendStr res
+
+     forkOS myThread
 
      -- the initial callback that sets up the rest
      vdl <- mkViewDidLoad $ \vc -> do
@@ -368,7 +427,7 @@ nullEnv = newIORef []
 
 type IOThrowsError = ErrorT LispError IO
 
--- liftThrows :: ThrowsError a -> IOThrowsError a
+liftThrows :: ThrowsError a -> IOThrowsError a
 liftThrows (Left err) = throwError err
 liftThrows (Right val) = return val