ref: 0c8f9f3968acc8b277f5aea3ac3c568fde1a3631
parent: 09411555a2a9a5600efeec449722ea362d1de25e
author: Benjamin Purcell <bpurcell@backstopsolutions.com>
date: Thu Aug 4 10:36:40 EDT 2016
Use concurrent C extension
--- a/fifo.c
+++ /dev/null
@@ -1,63 +1,0 @@
-#include <u.h>
-#include <libc.h>
-#include "rat.h"
-#include "fifo.h"
-
-Fifo*
-mkfifo(void)
-{- Fifo *q;
-
- q = malloc(sizeof(*q));
- q->front = nil;
- return q;
-}
-
-int
-isempty(Fifo *q)
-{- return q->front == nil;
-}
-
-void
-frontinsert(Fifo *q, Rat val)
-{- Node *n;
-
- n = malloc(sizeof(*n));
- if(q->front == nil)
- q->rear = &n->link;
- n->val = val;
- n->link = q->front;
- q->front = n;
- return;
-}
-
-void
-insert(Fifo *q, Rat val)
-{- Node *n;
-
- n = malloc(sizeof(*n));
- n->val = val;
- n->link = nil;
- if(q->front == nil)
- q->front = n;
- else
- *q->rear = n;
- q->rear = &n->link;
- return;
-}
-
-Rat
-delete(Fifo *q)
-{- Rat r;
- Node *n;
-
- n = q->front;
- r = n->val;
- q->front = n->link;
- free(n);
- return r;
-}
--- a/fifo.h
+++ /dev/null
@@ -1,19 +1,0 @@
-typedef struct Node Node;
-typedef struct Fifo Fifo;
-
-struct Node
-{- Node *link;
- Rat val;
-};
-
-struct Fifo
-{- Node *front;
- Node **rear;
-};
-
-Fifo *mkfifo(void);
-void insert(Fifo*, Rat);
-void frontinsert(Fifo*, Rat);
-Rat delete(Fifo*);
--- a/mkfile
+++ b/mkfile
@@ -1,8 +1,8 @@
</$objtype/mkfile
TARG= squint
-OFILES= squint.$O fifo.$O rat.$O
-HFILES= fifo.h rat.h
+OFILES= squint.$O queue.$O rat.$O
+HFILES= queue.h rat.h
BIN= .
</sys/src/cmd/mkone
--- /dev/null
+++ b/queue.c
@@ -1,0 +1,69 @@
+#include <u.h>
+#include <libc.h>
+#include "rat.h"
+#include "queue.h"
+
+Queue*
+mkqueue(void)
+{+ Queue *q;
+
+ q = malloc(sizeof(*q));
+ queueset(q);
+ return q;
+}
+
+void
+queueset(Queue *q)
+{+ q->front = nil;
+ q->rear = &q->front;
+}
+
+int
+isempty(Queue *q)
+{+ return q->front == nil;
+}
+
+void
+frontinsert(Queue *q, Rat val)
+{+ Node *n;
+
+ n = malloc(sizeof(*n));
+ if(q->front == nil)
+ q->rear = &n->link;
+ n->val = val;
+ n->link = q->front;
+ q->front = n;
+ return;
+}
+
+void
+insert(Queue *q, Rat val)
+{+ Node *n;
+
+ n = malloc(sizeof(*n));
+ n->val = val;
+ n->link = nil;
+ *q->rear = n;
+ q->rear = &n->link;
+ return;
+}
+
+Rat
+delete(Queue *q)
+{+ Rat r;
+ Node *n;
+
+ n = q->front;
+ r = n->val;
+ q->front = n->link;
+ free(n);
+ if(q->front == nil)
+ q->rear = &q->front;
+ return r;
+}
--- /dev/null
+++ b/queue.h
@@ -1,0 +1,20 @@
+typedef struct Node Node;
+typedef struct Queue Queue;
+
+struct Node
+{+ Node *link;
+ Rat val;
+};
+
+struct Queue
+{+ Node *front;
+ Node **rear;
+};
+
+Queue *mkqueue(void);
+void queueset(Queue*);
+void insert(Queue*, Rat);
+void frontinsert(Queue*, Rat);
+Rat delete(Queue*);
--- a/rat.c
+++ b/rat.c
@@ -7,7 +7,7 @@
{vlong t;
- while(b != 0){+ while(b != 0) {t = b;
b = a % b;
a = t;
@@ -22,10 +22,10 @@
vlong g;
g = gcd(n, d);
- if(d > 0){+ if(d > 0) {r.num = n/g;
r.den = d/g;
- }else{+ } else {r.num = -n/g;
r.den = -d/g;
}
@@ -40,7 +40,7 @@
t = a.num;
a.num = a.den;
a.den = t;
- if(a.den < 0){+ if(a.den < 0) {a.num = -a.num;
a.den = -a.den;
}
--- a/rat.h
+++ b/rat.h
@@ -1,4 +1,5 @@
-typedef struct Rat Rat;
+typedef struct Rat Rat;
+
struct Rat
{vlong num;
@@ -7,11 +8,11 @@
#pragma varargck type "R" Rat
-Rat ratmk(vlong, vlong);
-Rat ratrecip(Rat);
-Rat ratneg(Rat);
-Rat ratadd(Rat, Rat);
-Rat ratsub(Rat, Rat);
-Rat ratmul(Rat, Rat);
-Rat ratpow(Rat, int);
-void ratfmtinstall(void);
+Rat ratmk(vlong, vlong);
+Rat ratrecip(Rat);
+Rat ratneg(Rat);
+Rat ratadd(Rat, Rat);
+Rat ratsub(Rat, Rat);
+Rat ratmul(Rat, Rat);
+Rat ratpow(Rat, int);
+void ratfmtinstall(void);
--- a/readme.md
+++ b/readme.md
@@ -3,7 +3,7 @@
This code is a translation of the code in
[Squinting at Power Series](http://swtch.com/~rsc/thread/squint.pdf)
-into C using libthread.
+into C using the concurrent extensions to KenCC.
There are a few differences:
@@ -11,14 +11,14 @@
two threads each with a queue data structure.
* The paper uses queues of threads to multiply two series. This code
maintains two queues of values in one thread.
-* The code for power series reversion is based on the simpler formula
+* The implementation of power series reversion is based on the simpler formula
given in McIlroy's later paper [Power Series, Power
Serious](http://www.cs.dartmouth.edu/~doug/pearl.ps.gz).
-* Newsqueak is presumably garbage collected. In this implementation
-each power series has an extra channel `ps->close` which is
+* Newsqueak is garbage collected. This implementation instead
+gives each power series a channel `ps->close` which is
used to signal to the thread providing the values for the series to
-free all its data structures and exit. The handling needed for that
-channel likely doubles the size of the code.
+free all its data structures and exit.
-I have implementations of the original method of handling
-multiplication and splitting, email me if you are interested.
+I had implementations of the original method of handling
+multiplication and splitting, email me if you are interested I might
+be able to find them.
--- a/squint.c
+++ b/squint.c
@@ -2,32 +2,30 @@
#include <libc.h>
#include <thread.h>
#include "rat.h"
-#include "fifo.h"
+#include "queue.h"
-int debug;
-int threadcount;
-
enum
{- TMAX = 1000,
- STK = 2048
+ STK = 8192
};
typedef struct Ps Ps;
struct Ps
{- Channel *close;
- Channel *req;
- Channel *dat;
+ char @close;
+ char @req;
+ Rat @dat;
};
+int debug;
+int threadcount;
+
Rat
getr(Ps *f)
{- Rat r;
-
- send(f->req, nil);
- recv(f->dat, &r);
+ Rat r;
+ f->req @= 0;
+ r = @f->dat;
return r;
}
@@ -37,9 +35,9 @@
Ps *d;
d = malloc(sizeof(*d));
- d->close = chancreate(1, 0);
- d->req = chancreate(1, 0);
- d->dat = chancreate(sizeof(Rat), nel);
+ chanset(d->close, 0);
+ chanset(d->req, 0);
+ chanset(d->dat, nel);
return d;
}
@@ -52,129 +50,69 @@
free(d);
}
+
static void
-_split(void *a)
+_split(Ps *f, Ps *s, Rat @qchan, char @close)
{- void **argv;
- Ps *f, *s;
- Channel *qchan, *close;
- Fifo q;
- Rat r;
- enum{- REQ,
- QCHAN,
- CLOSE,
- NALT
- };
- Alt alts[NALT+1];
+ Queue q;
+ Rat r;
- argv = a;
- f = argv[0];
- s = argv[1];
- qchan = argv[2];
- close = argv[3];
-
- alts[REQ].c = s->req;
- alts[REQ].v = nil;
- alts[REQ].op = CHANRCV;
- alts[QCHAN].c = qchan;
- alts[QCHAN].v = &r;
- alts[QCHAN].op = CHANRCV;
- alts[CLOSE].c = s->close;
- alts[CLOSE].v = nil;
- alts[CLOSE].op = CHANRCV;
- alts[NALT].op = CHANEND;
-
- q.front = nil;
- for(;;){- switch(alt(alts)){- case REQ:
- if(q.front == nil){- r = getr(f);
- send(qchan, &r);
- send(s->dat, &r);
- }else{- r = delete(&q);
- send(s->dat, &r);
+ queueset(&q);
+ for(;;) switch @{+ alt @s->req:
+ if(q.front == nil) {+ r = getr(f);
+ qchan @= r;
+ s->dat @= r;
+ } else
+ s->dat @= delete(&q);
+ break;
+ alt r = @qchan:
+ insert(&q, r);
+ break;
+ alt @s->close:
+ while(q.front != nil)
+ delete(&q);
+ psfree(s);
+ if(chanclosing(qchan) == -1) {+ if(close != nil) {+ close @= 0;
+ chanfree(close);
}
- break;
- case QCHAN:
- insert(&q, r);
- break;
- case CLOSE:
- while(q.front != nil)
- delete(&q);
- psfree(s);
- if(chanclosing(qchan) == -1){- if(close != nil){- send(close, nil);
- chanfree(close);
- }
- chanclose(qchan);
- }else{- chanfree(qchan);
- send(f->close, nil);
- }
- if(debug) threadcount--;
- threadexits(0);
+ chanclose(qchan);
+ } else {+ chanfree(qchan);
+ f->close @= 0;
}
+ if(debug) threadcount--;
+ threadexits(0);
}
}
void
-split(Ps *f, Ps *s[2], Channel *splitclose)
+split(Ps *f, Ps *s[2], char @splitclose)
{- void *argv[2][4];
- Channel *q;
- int i;
+ Rat @q;
+ int i;
- q = chancreate(sizeof(Rat), 0);
- for(i = 0; i < 2; i++){+ chanset(q, 0);
+ for(i = 0; i < 2; i++) {s[i] = psmk(0);
- argv[i][0] = f;
- argv[i][1] = s[i];
- argv[i][2] = q;
- argv[i][3] = splitclose;
- threadcreate(_split, argv[i], STK);
+ cothread(_split(f, s[i], q, splitclose), STK);
if(debug) threadcount++;
- yield();
}
}
static void
-_mkconst(void *a)
+_mkconst(Rat c, Ps *o)
{- void **argv;
- Ps *o;
- Rat c;
- enum{- REQ,
- CLOSE,
- NALT
- };
- Alt alts[NALT+1];
-
- argv = a;
- c = *(Rat*)argv[0];
- o = argv[1];
-
- alts[REQ].c = o->req;
- alts[REQ].v = nil;
- alts[REQ].op = CHANRCV;
- alts[CLOSE].c = o->close;
- alts[CLOSE].v = nil;
- alts[CLOSE].op = CHANRCV;
- alts[NALT].op = CHANEND;
-
- for(;;){- switch(alt(alts)){- case REQ:
- send(o->dat, &c);
- break;
- case CLOSE:
- if(debug) threadcount--;
- threadexits(0);
- }
+ for(;;) switch @{+ alt @o->req:
+ o->dat @= c;
+ break;
+ alt @o->close:
+ if(debug) threadcount--;
+ threadexits(0);
}
}
@@ -181,71 +119,38 @@
Ps*
mkconst(Rat c)
{- void *argv[2];
- Ps *o;
+ Ps *o;
o = psmk(0);
- argv[0] = &c;
- argv[1] = o;
- threadcreate(_mkconst, argv, STK);
+ cothread(_mkconst(c, o), STK);
if(debug) threadcount++;
- yield();
return o;
}
Ps*
-binop(void (*oper)(void*), Ps *f, Ps *g)
+binop(void (*oper)(Ps*, Ps*, Ps*), Ps *f, Ps *g)
{- Ps *argv[3], *o;
+ Ps *o;
o = psmk(0);
- argv[0] = f;
- argv[1] = g;
- argv[2] = o;
- threadcreate(oper, argv, STK);
+ cothread(oper(f, g, o), STK);
if(debug) threadcount++;
- yield();
return o;
}
static void
-_psadd(void *a)
+_psadd(Ps *f, Ps *g, Ps *s)
{- Ps **argv, *f, *g, *s;
- Rat r;
- enum{- REQ,
- CLOSE,
- NALT
- };
- Alt alts[NALT+1];
-
- argv = a;
- f = argv[0];
- g = argv[1];
- s = argv[2];
-
- alts[REQ].c = s->req;
- alts[REQ].v = nil;
- alts[REQ].op = CHANRCV;
- alts[CLOSE].c = s->close;
- alts[CLOSE].v = nil;
- alts[CLOSE].op = CHANRCV;
- alts[NALT].op = CHANEND;
-
- for(;;){- switch(alt(alts)){- case REQ:
- r = ratadd(getr(f), getr(g));
- send(s->dat, &r);
- break;
- case CLOSE:
- psfree(s);
- send(f->close, nil);
- send(g->close, nil);
- if(debug) threadcount--;
- threadexits(0);
- }
+ for(;;) switch @{+ alt @s->req:
+ s->dat @= ratadd(getr(f), getr(g));
+ break;
+ alt @s->close:
+ psfree(s);
+ f->close @= 0;
+ g->close @= 0;
+ if(debug) threadcount--;
+ threadexits(0);
}
}
@@ -256,41 +161,21 @@
}
static void
-_psderiv(void *a)
+_psderiv(Ps *f, Ps *d)
{- Ps **argv, *f, *d;
- Rat t, r;
- int i;
- enum{- REQ,
- CLOSE,
- NALT
- };
- Alt alts[NALT+1];
+ Rat r;
+ int i;
- argv = a;
- f = argv[0];
- d = argv[1];
-
- alts[REQ].c = d->req;
- alts[REQ].v = nil;
- alts[REQ].op = CHANRCV;
- alts[CLOSE].c = d->close;
- alts[CLOSE].v = nil;
- alts[CLOSE].op = CHANRCV;
- alts[NALT].op = CHANEND;
-
getr(f);
- for(i = 1;; i++){- switch(alt(alts)){- case REQ:
+ for(i = 1;; i++) {+ switch @{+ alt @d->req:
r = getr(f);
- t = ratmk(i * r.num, r.den);
- send(d->dat, &t);
+ d->dat @= ratmk(i * r.num, r.den);
break;
- case CLOSE:
+ alt @d->close:
psfree(d);
- send(f->close, nil);
+ f->close @= 0;
if(debug) threadcount--;
threadexits(0);
}
@@ -300,13 +185,11 @@
Ps*
psderiv(Ps *f)
{- Ps *argv[2], *d = psmk(0);
+ Ps *d;
- argv[0] = f;
- argv[1] = d;
- threadcreate(_psderiv, argv, STK);
+ d = psmk(0);
+ cothread(_psderiv(f, d), STK);
if(debug) threadcount++;
- yield();
return d;
}
@@ -322,51 +205,29 @@
}
static void
-_psinteg(void *a)
+_psinteg(Ps *f, Rat c, Ps *i)
{- void **argv = a;
- Ps *f, *i;
- Rat c, out;
- int j;
- enum{- REQ,
- CLOSE,
- NALT
- };
- Alt alts[NALT+1];
+ int j;
- f = argv[0];
- c = *(Rat*)argv[1];
- i = argv[2];
-
- alts[REQ].c = i->req;
- alts[REQ].v = nil;
- alts[REQ].op = CHANRCV;
- alts[CLOSE].c = i->close;
- alts[CLOSE].v = nil;
- alts[CLOSE].op = CHANRCV;
- alts[NALT].op = CHANEND;
-
- switch(alt(alts)){- case REQ:
- send(i->dat, &c);
+ switch @{+ alt @i->req:
+ i->dat @= c;
break;
- case CLOSE:
+ alt @i->close:
goto End;
}
- for(j = 1;; j++){- switch(alt(alts)){- case REQ:
- out = ratmul(getr(f), ratmk(1, j));
- send(i->dat, &out);
+ for(j = 1;; j++) {+ switch @{+ alt @i->req:
+ i->dat @= ratmul(getr(f), ratmk(1, j));
break;
- case CLOSE:
+ alt @i->close:
goto End;
}
}
End:
psfree(i);
- send(f->close, nil);
+ f->close @= 0;
if(debug) threadcount--;
threadexits(0);
}
@@ -375,55 +236,26 @@
Ps*
psinteg(Ps *ps, Rat c)
{- void *argv[3];
- Ps *i = psmk(0);
+ Ps *i;
- argv[0] = ps;
- argv[1] = &c;
- argv[2] = i;
- threadcreate(_psinteg, argv, STK);
+ i = psmk(0);
+ cothread(_psinteg(ps, c, i), STK);
if(debug) threadcount++;
- yield();
return i;
}
static void
-_pscmul(void *a)
+_pscmul(Ps *f, Rat c, Ps *o)
{- void **argv = a;
- Ps *f, *o;
- Rat c, p;
- enum{- REQ,
- CLOSE,
- NALT
- };
- Alt alts[NALT+1];
-
- f = argv[0];
- c = *(Rat*)argv[1];
- o = argv[2];
-
- alts[REQ].c = o->req;
- alts[REQ].v = nil;
- alts[REQ].op = CHANRCV;
- alts[CLOSE].c = o->close;
- alts[CLOSE].v = nil;
- alts[CLOSE].op = CHANRCV;
- alts[NALT].op = CHANEND;
-
- for(;;){- switch(alt(alts)){- case REQ:
- p = ratmul(c, getr(f));
- send(o->dat, &p);
- break;
- case CLOSE:
- psfree(o);
- send(f->close, nil);
- if(debug) threadcount--;
- threadexits(0);
- }
+ for(;;) switch @{+ alt @o->req:
+ o->dat @= ratmul(c, getr(f));
+ break;
+ alt @o->close:
+ psfree(o);
+ f->close @= 0;
+ if(debug) threadcount--;
+ threadexits(0);
}
}
@@ -430,72 +262,47 @@
Ps*
pscmul(Rat c, Ps* f)
{- void *argv[3];
- Ps *o = psmk(0);
+ Ps *o;
- argv[0] = f;
- argv[1] = &c;
- argv[2] = o;
- threadcreate(_pscmul, argv, STK);
+ o = psmk(0);
+ cothread(_pscmul(f, c, o), STK);
if(debug) threadcount++;
- yield();
return o;
}
static void
-_psmul(void *a)
+_psmul(Ps *f, Ps *g, Ps *p)
{- Ps **argv, *f, *g, *p;
- Fifo fq, gq;
- Node *fnode, *gnode;
- Rat sum;
- enum{- REQ,
- CLOSE,
- NALT
- };
- Alt alts[NALT+1];
+ Queue fq, gq;
+ Node *fnode, *gnode;
+ Rat sum;
- argv = a;
- f = argv[0];
- g = argv[1];
- p = argv[2];
-
- alts[REQ].c = p->req;
- alts[REQ].v = nil;
- alts[REQ].op = CHANRCV;
- alts[CLOSE].c = p->close;
- alts[CLOSE].v = nil;
- alts[CLOSE].op = CHANRCV;
- alts[NALT].op = CHANEND;
-
- fq.front = gq.front = nil;
- for(;;){- switch(alt(alts)){- case REQ:
- insert(&fq, getr(f));
- frontinsert(&gq, getr(g));
- fnode = fq.front;
- gnode = gq.front;
- sum = ratmk(0, 1);
- while(fnode != nil){- sum = ratadd(sum, ratmul(fnode->val, gnode->val));
- fnode = fnode->link;
- gnode = gnode->link;
- }
- send(p->dat, &sum);
- break;
- case CLOSE:
- psfree(p);
- while(fq.front != nil)
- delete(&fq);
- while(gq.front != nil)
- delete(&gq);
- send(f->close, nil);
- send(g->close, nil);
- if(debug) threadcount--;
- threadexits(0);
+ queueset(&fq);
+ queueset(&gq);
+ for(;;) switch @{+ alt @p->req:
+ insert(&fq, getr(f));
+ frontinsert(&gq, getr(g));
+ fnode = fq.front;
+ gnode = gq.front;
+ sum = ratmk(0, 1);
+ while(fnode != nil) {+ sum = ratadd(sum, ratmul(fnode->val, gnode->val));
+ fnode = fnode->link;
+ gnode = gnode->link;
}
+ p->dat @= sum;
+ break;
+ alt @p->close:
+ psfree(p);
+ while(fq.front != nil)
+ delete(&fq);
+ while(gq.front != nil)
+ delete(&gq);
+ f->close @= 0;
+ g->close @= 0;
+ if(debug) threadcount--;
+ threadexits(0);
}
}
@@ -506,57 +313,32 @@
}
static void
-_psrecip(void *a)
+_psrecip(Ps *f, Ps *r, Ps *rr, char @close)
{- void **argv;
- Ps *f, *r, *rr, *recip;
- Channel *close;
- Rat g;
- enum{- REQ,
- CLOSE,
- NALT
- };
- Alt alts[NALT+1];
+ Ps *recip;
+ Rat g;
- argv = a;
- f = argv[0];
- r = argv[1];
- rr = argv[2];
- close = argv[3];
-
- alts[REQ].c = r->req;
- alts[REQ].v = nil;
- alts[REQ].op = CHANRCV;
- alts[CLOSE].c = close;
- alts[CLOSE].v = nil;
- alts[CLOSE].op = CHANRCV;
- alts[NALT].op = CHANEND;
-
- switch(alt(alts)){- case REQ:
+ switch @{+ alt @r->req:
g = ratrecip(getr(f));
- send(r->dat, &g);
+ r->dat @= g;
break;
- case CLOSE:
- send(rr->close, nil);
- send(f->close, nil);
+ alt @close:
+ rr->close @= 0;
+ f->close @= 0;
goto End;
}
recip = pscmul(ratneg(g), psmul(f, rr));
- for(;;){- switch(alt(alts)){- case REQ:
- g = getr(recip);
- send(r->dat, &g);
- break;
- case CLOSE:
- send(recip->close, nil);
- goto End;
- }
+ for(;;) switch @{+ alt @r->req:
+ r->dat @= getr(recip);
+ break;
+ alt @close:
+ recip->close @= 0;
+ goto End;
}
End:
- recv(r->close, nil);
+ @r->close;
psfree(r);
if(debug) threadcount--;
threadexits(0);
@@ -565,72 +347,46 @@
Ps*
psrecip(Ps *f)
{- void *argv[4];
- Ps *rr[2], *r = psmk(0);
- Channel *close = chancreate(1, 0);
+ Ps *rr[2], *r;
+ char @close;
+ r = psmk(0);
+ chanset(close, 0);
+
split(r, rr, close);
- argv[0] = f;
- argv[1] = r;
- argv[2] = rr[0];
- argv[3] = close;
- threadcreate(_psrecip, argv, STK);
+ cothread(_psrecip(f, r, rr[0], close), STK);
if(debug) threadcount++;
- yield();
return rr[1];
}
static void
-_psmsubst(void *a)
+_psmsubst(Ps *f, Rat c, int deg, Ps *m)
{- void **argv;
- Ps *f, *m;
- Rat c, zero, r;
- int deg, i, j;
- enum{- REQ,
- CLOSE,
- NALT
- };
- Alt alts[NALT+1];
+ Rat zero;
+ int i, j;
- argv = a;
- f = argv[0];
- c = *(Rat*)argv[1];
- deg = *(int*)argv[2];
- m = argv[3];
-
- alts[REQ].c = m->req;
- alts[REQ].v = nil;
- alts[REQ].op = CHANRCV;
- alts[CLOSE].c = m->close;
- alts[CLOSE].v = nil;
- alts[CLOSE].op = CHANRCV;
- alts[NALT].op = CHANEND;
-
zero = ratmk(0, 1);
- for(i = 0;; i++){- switch(alt(alts)){- case REQ:
- r = ratmul(getr(f), ratpow(c, i));
- send(m->dat, &r);
+ for(i = 0;; i++) {+ switch @{+ alt @m->req:
+ m->dat @= ratmul(getr(f), ratpow(c, i));
for(j = 0; j < deg - 1; j++){- switch(alt(alts)){- case REQ:
- send(m->dat, &zero);
+ switch @{+ alt @m->req:
+ m->dat @= zero;
break;
- case CLOSE:
+ alt @m->close:
goto End;
}
}
break;
- case CLOSE:
+ alt @m->close:
goto End;
}
}
End:
psfree(m);
- send(f->close, nil);
+ f->close @= 0;
if(debug) threadcount--;
threadexits(0);
}
@@ -638,17 +394,11 @@
Ps*
psmsubst(Ps *f, Rat c, int deg)
{- void *argv[4];
- Ps *m;
+ Ps *m;
m = psmk(0);
- argv[0] = f;
- argv[1] = &c;
- argv[2] = °
- argv[3] = m;
- threadcreate(_psmsubst, argv, STK);
+ cothread(_psmsubst(f, c, deg, m), STK);
if(debug) threadcount++;
- yield();
return m;
}
@@ -655,39 +405,18 @@
Ps *pssubst(Ps*, Ps*);
static void
-_pssubst(void *a)
+_pssubst(Ps *f, Ps *g, Ps *o)
{- Ps **argv, *gg[2], *f, *g, *o, *subst;
- Rat r;
- enum{- REQ,
- CLOSE,
- NALT
- };
- Alt alts[NALT+1];
+ Ps *gg[2], *subst;
- argv = a;
- f = argv[0];
- g = argv[1];
- o = argv[2];
-
- alts[REQ].c = o->req;
- alts[REQ].v = nil;
- alts[REQ].op = CHANRCV;
- alts[CLOSE].c = o->close;
- alts[CLOSE].v = nil;
- alts[CLOSE].op = CHANRCV;
- alts[NALT].op = CHANEND;
-
- switch(alt(alts)){- case REQ:
- r = getr(f);
- send(o->dat, &r);
+ switch @{+ alt @o->req:
+ o->dat @= getr(f);
break;
- case CLOSE:
+ alt @o->close:
psfree(o);
- send(f->close, nil);
- send(g->close, nil);
+ f->close @= 0;
+ g->close @= 0;
if(debug) threadcount--;
threadexits(0);
}
@@ -694,18 +423,15 @@
split(g, gg, nil);
getr(gg[0]);
subst = psmul(gg[0], pssubst(f, gg[1]));
- for(;;){- switch(alt(alts)){- case REQ:
- r = getr(subst);
- send(o->dat, &r);
- break;
- case CLOSE:
- psfree(o);
- send(subst->close, nil);
- if(debug) threadcount--;
- threadexits(0);
- }
+ for(;;) switch @{+ alt @o->req:
+ o->dat @= getr(subst);
+ break;
+ alt @o->close:
+ psfree(o);
+ subst->close @= 0;
+ if(debug) threadcount--;
+ threadexits(0);
}
}
@@ -716,58 +442,33 @@
}
static void
-_psrev(void *a)
+_psrev(Ps *f, Ps *r, Ps *rr, char @close)
{- void **argv;
- Ps *f, *r, *rr, *rever;
- Channel *close;
- Rat g;
- enum{- REQ,
- CLOSE,
- NALT
- };
- Alt alts[NALT+1];
+ Ps *rever;
+ Rat g;
- argv = a;
- f = argv[0];
- r = argv[1];
- rr = argv[2];
- close = argv[3];
-
- alts[REQ].c = r->req;
- alts[REQ].v = nil;
- alts[REQ].op = CHANRCV;
- alts[CLOSE].c = close;
- alts[CLOSE].v = nil;
- alts[CLOSE].op = CHANRCV;
- alts[NALT].op = CHANEND;
-
g = ratmk(0, 1);
- switch(alt(alts)){- case REQ:
- send(r->dat, &g);
+ switch @{+ alt @r->req:
+ r->dat @= g;
break;
- case CLOSE:
- send(rr->close, nil);
- send(f->close, nil);
+ alt @close:
+ rr->close @= 0;
+ f->close @= 0;
goto End;
}
getr(f);
rever = psrecip(pssubst(f, rr));
- for(;;){- switch(alt(alts)){- case REQ:
- g = getr(rever);
- send(r->dat, &g);
- break;
- case CLOSE:
- send(rever->close, nil);
- goto End;
- }
+ for(;;) switch @{+ alt @r->req:
+ r->dat @= getr(rever);
+ break;
+ alt @close:
+ rever->close @= 0;
+ goto End;
}
End:
- recv(r->close, nil);
+ @r->close;
psfree(r);
if(debug) threadcount--;
threadexits(0);
@@ -776,28 +477,24 @@
Ps*
psrev(Ps *f)
{- void *argv[4];
- Ps *rr[2], *r;
- Channel *close = chancreate(1,0);
+ Ps *rr[2], *r;
+ char @close;
+ chanset(close, 0);
r = psmk(0);
split(r, rr, close);
- argv[0] = f;
- argv[1] = r;
- argv[2] = rr[0];
- argv[3] = close;
- threadcreate(_psrev, argv, STK);
+ cothread(_psrev(f, r, rr[0], close), STK);
if(debug) threadcount++;
- yield();
return rr[1];
}
void
-threadmain(int argc, char *argv[])
+threadmain(int, char **)
{Ps *ps1, *ps2, *pssum, *ints, *tanx, *pspair[2];
Rat one, zero;
+ debug = 1;
ratfmtinstall();
zero = ratmk(0, 1);
@@ -804,6 +501,7 @@
one = ratmk(1, 1);
ps1 = mkconst(one);
+ print("1/1-x\n"); print("1 1 1 1 1 1 1 1 1 1\n");psprint(ps1, 10);
print("\n");@@ -810,6 +508,7 @@
ps2 = mkconst(one);
pssum = psadd(ps1, ps2);
+ print("1/1-x + 1/1-x\n"); print("2 2 2 2 2 2 2 2 2 2\n");psprint(pssum, 10);
print("\n");@@ -817,6 +516,7 @@
ps1 = mkconst(one);
ints = psderiv(ps1);
+ print("d/dx(1/1-x)\n"); print("1 2 3 4 5 6 7 8 9 10\n");psprint(ints, 10);
print("\n");@@ -824,6 +524,7 @@
ps1 = mkconst(one);
ps2 = psinteg(ps1, one);
+ print("integral of 1/1-x\n"); print("1 1 1/2 1/3 1/4 1/5 1/6 1/7 1/8 1/9\n");psprint(ps2, 10);
print("\n");@@ -832,6 +533,7 @@
ps1 = mkconst(one);
ints = psderiv(ps1);
split(ints, pspair, nil);
+ print("d/dx(1/1-x) split into two streams\n"); print("1 2 3 4 5 6 7 8 9 10\n"); print("1 2 3 4 5 6 7 8 9 10\n");psprint(pspair[0], 10);
@@ -842,6 +544,7 @@
ps1 = mkconst(one);
ps2 = pscmul(ratmk(2, 1), ps1);
+ print("2*(1/1-x)\n"); print("2 2 2 2 2 2 2 2 2 2\n");psprint(ps2, 10);
print("\n");@@ -850,6 +553,7 @@
ps1 = mkconst(one);
split(ps1, pspair, nil);
ps2 = psmul(pspair[0], pspair[1]);
+ print("1/1-x split into two streams and then multiplied\n"); print("1 2 3 4 5 6 7 8 9 10\n");psprint(ps2, 10);
print("\n");@@ -857,6 +561,7 @@
ps1 = mkconst(one);
ps2 = psrecip(ps1);
+ print("1/(1/1-x)\n"); print("1 -1 0 0 0 0 0 0 0 0\n");psprint(ps2, 10);
print("\n");@@ -864,10 +569,9 @@
ps1 = mkconst(one);
tanx = psrev(psinteg(psmsubst(ps1, ratmk(-1, 1), 2), zero));
+ print("tan(x)\n"); print("0 1 0 1/3 0 2/15 0 17/315 0 62/2835 0 1382/155925\n");psprint(tanx, 12);
- print("\n");send(tanx->close, nil);
-
threadexitsall(0);
}