Add: parallel-execute

Author: codybartfast

src/eceval.c

@@ -16,6 +16,7 @@
 
 #define AREA "ECEVAL"
 
+static obj parallel_eval(obj actions, obj env);
 static obj parallel_execute(obj actions, obj env);
 
 // ln 182
@@ -136,8 +137,10 @@ static obj ecevalgoto(struct core *cr, bool yield)
 		goto ev_cons_stream;
 	if (is_time(cr->expr))
 		goto ev_timed;
+	if (is_parallel_eval(cr->expr))
+		goto ev_parallel_eval;
 	if (is_parallel_execute(cr->expr))
-		goto ev_concurrent_execute;
+		goto ev_parallel_execute;
 	if (is_ecapply(cr->expr))
 		goto ev_apply;
 	if (is_application(cr->expr))
@@ -394,8 +397,16 @@ static obj ecevalgoto(struct core *cr, bool yield)
 	goto go_cont;
 
 // new
-ev_concurrent_execute:
-	return parallel_execute(cdr(cr->expr), cr->env);
+ev_parallel_eval:
+	cr->val = parallel_eval(cdr(cr->expr), cr->env);
+	go_obj = cr->cont;
+	goto go_obj;
+
+ev_parallel_execute:
+	cr->val = parallel_execute(cdr(cr->expr), cr->env);
+	go_obj = cr->cont;
+	goto go_obj;
+
 // new
 ev_apply:
 	save(cr->cont, cr);
@@ -437,6 +448,7 @@ static obj ecevalgoto(struct core *cr, bool yield)
 	}
 	go_obj = cr->cont;
 go_obj:
+// printf("obj: %s\n", to_string(go_obj));
 	if (is_eq(go_obj, ev_return_caller))
 		return cr->val;
 	if (is_eq(go_obj, ev_appl_accum_last_arg))
@@ -477,15 +489,26 @@ obj eceval(obj expression, obj _environment)
 	return ecevalgoto(cr, false);
 }
 
-static int rand_below(int n)
+static obj parallel_execute(obj procs, obj env)
+{
+	obj actions = emptylst;
+
+	for (; is_pair(procs); procs = cdr(procs)) {
+		actions = cons(list1(car(procs)), actions);
+	}
+	return parallel_eval(actions, env);
+}
+
+static int rand_clicks(int n)
 {
-	return plat_rand() % n;
+	Integer r = plat_rand();
+	return ((r % 16) > 11) ? (r % n) + 1 : 0;
 }
 
-static obj parallel_execute(obj actions, obj env)
+static obj parallel_eval(obj actions, obj env)
 {
-	static bool running[NCORE];
-	static int free = 0;
+	bool running[NCORE];
+	int free = 0;
 	int i, j, runcount;
 
 	while (is_pair(actions)) {
@@ -512,9 +535,10 @@ static obj parallel_execute(obj actions, obj env)
 			if (!running[i]) {
 				continue;
 			}
-			int clicks = rand_below(32);
+			int clicks = rand_clicks(2);
 			for (j = 0; j < clicks; j++) {
-				if (!is_yielded(ecevalgoto(getcore(i), true))) {
+				obj r = ecevalgoto(getcore(i), true);
+				if (!is_yielded(r)) {
 					running[i] = false;
 					runcount--;
 					break;

src/mceval.c

@@ -615,7 +615,14 @@ obj quasi_to_combination(obj exp)
 	return quasi_dat(cadr(exp));
 }
 
+// new - parallel
+
 bool is_parallel_execute(obj exp)
 {
 	return is_tagged_list(exp, parallel_execute_s);
 }
+
+bool is_parallel_eval(obj exp)
+{
+	return is_tagged_list(exp, parallel_eval_s);
+}

src/mceval.h

@@ -71,5 +71,6 @@ bool is_quasiquote(obj exp);
 obj quasi_to_combination(obj exp);
 
 bool is_parallel_execute(obj exp);
+bool is_parallel_eval(obj exp);
 
 #endif

src/obj.c

@@ -258,6 +258,7 @@ SYMBOL_VAR(letrec)
 const obj letstar = SYMBOL("let*");
 const obj memo_proc = SYMBOL("memo-proc");
 const obj or_s = SYMBOL("or");
+const obj parallel_eval_s = SYMBOL("parallel-eval");
 const obj parallel_execute_s = SYMBOL("parallel-execute");
 SYMBOL_VAR(quasiquote)
 SYMBOL_VAR(quote)

src/obj.h

@@ -140,6 +140,7 @@ extern const obj letrec;
 extern const obj letstar;
 extern const obj memo_proc;
 extern const obj or_s;
+extern const obj parallel_eval_s;
 extern const obj parallel_execute_s;
 extern const obj quasiquote;
 extern const obj quote;

test/run

@@ -4,8 +4,8 @@ test_dir=$(dirname "${BASH_SOURCE[0]}")
 export bin_dir=$test_dir/../bin
 source_dir=$test_dir/code
 
-# file=scratch.sicp
-file=ch5/ex5.50/ex5.50-cbf.sicp
+file=scratch.sicp
+# file=ch5/ex5.50/ex5.50-cbf.sicp
 
 echo running: $file
 $bin_dir/sicp $source_dir/$file