UI/Model Parse - Switches

[clnl] / src / main / main.lisp

diff --git a/src/main/main.lisp b/src/main/main.lisp
index 2f32d3b8b408c74ef7a41fff3cc3eee1f3dfb2f2..4b845cff37d0b0a3b7f4b435a05a0e0b3d729ce2 100644 (file)
--- a/src/main/main.lisp
+++ b/src/main/main.lisp
@@ -57,6 +57,8 @@ DESCRIPTION:
    (*package* *model-package*))
   (eval netlogoed-lisp)))
 
+(defvar *commands-mutex* (sb-thread:make-mutex))
+
 (defun run-commands (cmds)
  "RUN-COMMANDS CMDS => RESULT
 
@@ -69,8 +71,11 @@ DESCRIPTION:
 
   RUN-COMMANDS will take NetLogo commands, put them through the various
   stages need to turn them into Common Lisp code, and run it."
- (clnl-nvm:with-stop-handler
-  (funcall *callback* cmds)))
+
+ ; This mutex is a necessary because we haven't yet moved to a job thread
+ (sb-thread:with-mutex (*commands-mutex*)
+  (clnl-nvm:with-stop-handler
+   (funcall *callback* cmds))))
 
 (defun run-reporter (reporter)
  "RUN-REPORTER REPORTER => RESULT
@@ -218,7 +223,8 @@ EXAMPLES:
          `((clnl-interface:initialize
             :dims ',(clnl-model:world-dimensions model)
             :view ',(clnl-model:view model)
-            :buttons ',(clnl-model:buttons model)))))))))
+            :buttons ',(clnl-model:buttons model)
+            :switches ',(clnl-model:switches model)))))))))
 
 (setf (documentation 'model->single-form-lisp 'function)
  "MODEL->SINGLE-FORM-LISP MODEL &key SEED INITIALIZE-INTERFACE NETLOGO-CALLBACK => FORM
@@ -273,7 +279,8 @@ DESCRIPTION:
          `((clnl-interface:initialize
             :dims ',(clnl-model:world-dimensions model)
             :view ',(clnl-model:view model)
-            :buttons ',(clnl-model:buttons model)))))
+            :buttons ',(clnl-model:buttons model)
+            :switches ',(clnl-model:switches model)))))
      ,@(when netlogo-callback-fn
         `((defun ,netlogo-callback-fn (,(intern "NETLOGO-CODE" *model-package*))
            ,(netlogo-callback-body prims))))))))