diff options
| -rw-r--r-- | apl9.h | 4 | ||||
| -rw-r--r-- | concurrency.c | 14 | ||||
| -rw-r--r-- | quadnames.c | 29 |
3 files changed, 23 insertions, 24 deletions
@@ -353,8 +353,8 @@ int spawnthread(Function, Array *, Array *, Array *); ThreadData *getthreaddata(void); void messagesend(Array *, int); Array *messagerecv(Function, int); -Array *runningtasks(void); -Array *taskproperty(vlong, vlong); +Array *runningthreads(void); +Array *threadproperty(vlong, vlong); int stackused(void); int hasstack(int); void checkstack(void); diff --git a/concurrency.c b/concurrency.c index f35f329..28cea35 100644 --- a/concurrency.c +++ b/concurrency.c @@ -244,19 +244,19 @@ newthreaddata(Array *name) } Array * -runningtasks(void) +runningthreads(void) { lock(&threadlock); - Array *tasks = allocarray(AtypeInt, 1, nthreads); - tasks->shape[0] = nthreads; + Array *t = allocarray(AtypeInt, 1, nthreads); + t->shape[0] = nthreads; for(int i = 0; i < nthreads; i++) - tasks->intdata[i] = threads[i]->id; + t->intdata[i] = threads[i]->id; unlock(&threadlock); - return tasks; + return t; } Array * -taskproperty(vlong t, vlong p) +threadproperty(vlong t, vlong p) { ThreadData *td = nil; Array *res = nil; @@ -290,7 +290,7 @@ taskproperty(vlong t, vlong p) break; default: unlock(&threadlock); - throwerror(L"Invalid task property", EDomain); + throwerror(L"Invalid thread property", EDomain); break; } diff --git a/quadnames.c b/quadnames.c index 0727d3e..3340ac6 100644 --- a/quadnames.c +++ b/quadnames.c @@ -32,8 +32,8 @@ Array *quadinfo(Array *); Array *quadproto(Array *); Array *quaducs(Array *); Array *quaddl(Array *); -Array *quadtasks1(Array *); -Array *quadtasks2(Array *, Array *); +Array *quadthreads1(Array *); +Array *quadthreads2(Array *, Array *); static Rune *quadquotebuf = nil; static Array *session = nil; @@ -57,7 +57,7 @@ QuadnameDef quadnames[] = { {L"⎕PROTO", FunctionTag, nil, nil, quadproto, nil}, {L"⎕UCS", FunctionTag, nil, nil, quaducs, nil}, {L"⎕DL", FunctionTag, nil, nil, quaddl, nil}, - {L"⎕TASKS", FunctionTag, nil, nil, quadtasks1, quadtasks2}, + {L"⎕THREADS", FunctionTag, nil, nil, quadthreads1, quadthreads2}, {nil, 0, nil, nil, nil, nil} /* MUST BE LAST */ }; @@ -467,29 +467,28 @@ quaddl(Array *a) return fnSame(a); } -/* ⎕TASKS */ +/* ⎕THREADS */ Array * -quadtasks1(Array *properties) +quadthreads1(Array *properties) { - Array *threadids = runningtasks(); - Array *res = rundfn(L"⍺ ⎕TASKS ⍵", nil, nil, threadids, properties); + Array *threadids = runningthreads(); + Array *res = quadthreads2(threadids, properties); freearray(threadids); return res; } -/* ⎕TASKS */ Array * -quadtasks2(Array *task, Array *property) +quadthreads2(Array *thread, Array *property) { - if(GetType(task) != AtypeInt || GetType(property) != AtypeInt) + if(GetType(thread) != AtypeInt || GetType(property) != AtypeInt) throwerror(nil, EDomain); - if(GetRank(task) > 1 || GetRank(property) > 1) + if(GetRank(thread) > 1 || GetRank(property) > 1) throwerror(nil, ERank); - if(GetRank(task) > 0 || GetRank(property) > 0) - return rundfn(L"⍺ ⎕TASKS⌾ ⍵", nil, nil, task, property); + if(GetRank(thread) > 0 || GetRank(property) > 0) + return rundfn(L"⍺ ⎕THREADS⌾ ⍵", nil, nil, thread, property); - /* Get task with ID task, and property based on number in property */ - return taskproperty(task->intdata[0], property->intdata[0]); + /* Get thread with ID thread, and property based on number in property */ + return threadproperty(thread->intdata[0], property->intdata[0]); } |