itlib9p: Remove postmountsrv (#505) - plan9port - [fork] Plan 9 from user space Err mx1.adamsgaard.dk 70 hgit clone git://src.adamsgaard.dk/plan9port URL:git://src.adamsgaard.dk/plan9port mx1.adamsgaard.dk 70 1Log /src/plan9port/log.gph mx1.adamsgaard.dk 70 1Files /src/plan9port/files.gph mx1.adamsgaard.dk 70 1Refs /src/plan9port/refs.gph mx1.adamsgaard.dk 70 1README /src/plan9port/file/README.md.gph mx1.adamsgaard.dk 70 1LICENSE /src/plan9port/file/LICENSE.gph mx1.adamsgaard.dk 70 i--- Err mx1.adamsgaard.dk 70 1commit 385a6d5877258cee0cac6151e6359c9206006b01 /src/plan9port/commit/385a6d5877258cee0cac6151e6359c9206006b01.gph mx1.adamsgaard.dk 70 1parent aa01c23be63787550e64bc1a0f3a8d267cad1fa4 /src/plan9port/commit/aa01c23be63787550e64bc1a0f3a8d267cad1fa4.gph mx1.adamsgaard.dk 70 hAuthor: Ben Huntsman URL:mailto:bhuntsman@mail2.cu-portland.edu mx1.adamsgaard.dk 70 iDate: Sun, 8 Aug 2021 11:03:02 -0700 Err mx1.adamsgaard.dk 70 i Err mx1.adamsgaard.dk 70 ilib9p: Remove postmountsrv (#505) Err mx1.adamsgaard.dk 70 i Err mx1.adamsgaard.dk 70 iDiffstat: Err mx1.adamsgaard.dk 70 i M include/9p.h | 1 - Err mx1.adamsgaard.dk 70 i M man/lookman.index | 1 - Err mx1.adamsgaard.dk 70 i M man/man3/9p.3 | 14 +++----------- Err mx1.adamsgaard.dk 70 i M man/man3/INDEX | 1 - Err mx1.adamsgaard.dk 70 i D src/lib9p/_post.c | 77 ------------------------------- Err mx1.adamsgaard.dk 70 i D src/lib9p/post.c | 23 ----------------------- Err mx1.adamsgaard.dk 70 i D src/lib9p/post.h | 13 ------------- Err mx1.adamsgaard.dk 70 i Err mx1.adamsgaard.dk 70 i7 files changed, 3 insertions(+), 127 deletions(-) Err mx1.adamsgaard.dk 70 i--- Err mx1.adamsgaard.dk 70 1diff --git a/include/9p.h b/include/9p.h /src/plan9port/file/include/9p.h.gph mx1.adamsgaard.dk 70 it@@ -219,7 +219,6 @@ struct Srv { Err mx1.adamsgaard.dk 70 i }; Err mx1.adamsgaard.dk 70 i Err mx1.adamsgaard.dk 70 i void srv(Srv*); Err mx1.adamsgaard.dk 70 i-void postmountsrv(Srv*, char*, char*, int); Err mx1.adamsgaard.dk 70 i int postfd(char*, int); Err mx1.adamsgaard.dk 70 i extern int chatty9p; Err mx1.adamsgaard.dk 70 i void respond(Req*, char*); Err mx1.adamsgaard.dk 70 1diff --git a/man/lookman.index b/man/lookman.index /src/plan9port/file/man/lookman.index.gph mx1.adamsgaard.dk 70 it@@ -19153,7 +19153,6 @@ posted /usr/local/plan9/man/man4/plumber.4 Err mx1.adamsgaard.dk 70 i posted /usr/local/plan9/man/man9/0intro.9p Err mx1.adamsgaard.dk 70 i postfd /usr/local/plan9/man/man3/9p.3 Err mx1.adamsgaard.dk 70 i postmark /usr/local/plan9/man/man1/bundle.1 Err mx1.adamsgaard.dk 70 i-postmountsrv /usr/local/plan9/man/man3/9p.3 Err mx1.adamsgaard.dk 70 i postnote /usr/local/plan9/man/man3/notify.3 Err mx1.adamsgaard.dk 70 i postnote /usr/local/plan9/man/man3/postnote.3 Err mx1.adamsgaard.dk 70 i postnote /usr/local/plan9/man/man3/rfork.3 Err mx1.adamsgaard.dk 70 1diff --git a/man/man3/9p.3 b/man/man3/9p.3 /src/plan9port/file/man/man3/9p.3.gph mx1.adamsgaard.dk 70 it@@ -6,7 +6,6 @@ emalloc9p, Err mx1.adamsgaard.dk 70 i erealloc9p, Err mx1.adamsgaard.dk 70 i estrdup9p, Err mx1.adamsgaard.dk 70 i postfd, Err mx1.adamsgaard.dk 70 i-postmountsrv, Err mx1.adamsgaard.dk 70 i readbuf, Err mx1.adamsgaard.dk 70 i readstr, Err mx1.adamsgaard.dk 70 i respond, Err mx1.adamsgaard.dk 70 it@@ -61,7 +60,6 @@ typedef struct Srv { Err mx1.adamsgaard.dk 70 i .ft L Err mx1.adamsgaard.dk 70 i .ta \w'\fLvoid* 'u Err mx1.adamsgaard.dk 70 i int srv(Srv *s) Err mx1.adamsgaard.dk 70 i-void postmountsrv(Srv *s, char *name, char *mtpt, int flag) Err mx1.adamsgaard.dk 70 i void threadpostmountsrv(Srv *s, char *name, char *mtpt, int flag) Err mx1.adamsgaard.dk 70 i int postfd(char *srvname, int fd) Err mx1.adamsgaard.dk 70 i void respond(Req *r, char *error) Err mx1.adamsgaard.dk 70 it@@ -96,8 +94,6 @@ and Err mx1.adamsgaard.dk 70 i writing the responses to Err mx1.adamsgaard.dk 70 i .BR s->outfd . Err mx1.adamsgaard.dk 70 i (Typically, Err mx1.adamsgaard.dk 70 i-.I postmountsrv Err mx1.adamsgaard.dk 70 i-or Err mx1.adamsgaard.dk 70 i .I threadpostmountsrv Err mx1.adamsgaard.dk 70 i initializes the Err mx1.adamsgaard.dk 70 i .B infd Err mx1.adamsgaard.dk 70 it@@ -148,12 +144,10 @@ but abort the program if they run out of memory. Err mx1.adamsgaard.dk 70 i If alternate behavior is desired, clients can link against Err mx1.adamsgaard.dk 70 i alternate implementations of these functions. Err mx1.adamsgaard.dk 70 i .PP Err mx1.adamsgaard.dk 70 i-.I Postmountsrv Err mx1.adamsgaard.dk 70 i-and Err mx1.adamsgaard.dk 70 i .I threadpostmountsrv Err mx1.adamsgaard.dk 70 i-are wrappers that create a separate process in which to run Err mx1.adamsgaard.dk 70 i+is a wrapper that creates a separate process in which to run Err mx1.adamsgaard.dk 70 i .IR srv . Err mx1.adamsgaard.dk 70 i-They do the following: Err mx1.adamsgaard.dk 70 i+It does the following: Err mx1.adamsgaard.dk 70 i .IP Err mx1.adamsgaard.dk 70 i If Err mx1.adamsgaard.dk 70 i .IB s -> nopipe Err mx1.adamsgaard.dk 70 it@@ -296,9 +290,7 @@ the service functions. Err mx1.adamsgaard.dk 70 i The service loop provided by Err mx1.adamsgaard.dk 70 i .I srv Err mx1.adamsgaard.dk 70 i (and indirectly by Err mx1.adamsgaard.dk 70 i-.I postmountsrv Err mx1.adamsgaard.dk 70 i-and Err mx1.adamsgaard.dk 70 i-.IR threadpostmountsrv ) Err mx1.adamsgaard.dk 70 i+.I threadpostmountsrv ) Err mx1.adamsgaard.dk 70 i is single-threaded. Err mx1.adamsgaard.dk 70 i If it is expected that some requests might Err mx1.adamsgaard.dk 70 i block, arranging for alternate processes Err mx1.adamsgaard.dk 70 1diff --git a/man/man3/INDEX b/man/man3/INDEX /src/plan9port/file/man/man3/INDEX.gph mx1.adamsgaard.dk 70 it@@ -50,7 +50,6 @@ emalloc9p 9p.3 Err mx1.adamsgaard.dk 70 i erealloc9p 9p.3 Err mx1.adamsgaard.dk 70 i estrdup9p 9p.3 Err mx1.adamsgaard.dk 70 i postfd 9p.3 Err mx1.adamsgaard.dk 70 i-postmountsrv 9p.3 Err mx1.adamsgaard.dk 70 i readbuf 9p.3 Err mx1.adamsgaard.dk 70 i readstr 9p.3 Err mx1.adamsgaard.dk 70 i respond 9p.3 Err mx1.adamsgaard.dk 70 1diff --git a/src/lib9p/_post.c b/src/lib9p/_post.c /src/plan9port/file/src/lib9p/_post.c.gph mx1.adamsgaard.dk 70 it@@ -1,77 +0,0 @@ Err mx1.adamsgaard.dk 70 i-#include Err mx1.adamsgaard.dk 70 i-#include Err mx1.adamsgaard.dk 70 i-#include Err mx1.adamsgaard.dk 70 i-#include Err mx1.adamsgaard.dk 70 i-#include <9p.h> Err mx1.adamsgaard.dk 70 i-#include "post.h" Err mx1.adamsgaard.dk 70 i- Err mx1.adamsgaard.dk 70 i-Postcrud* Err mx1.adamsgaard.dk 70 i-_post1(Srv *s, char *name, char *mtpt, int flag) Err mx1.adamsgaard.dk 70 i-{ Err mx1.adamsgaard.dk 70 i- Postcrud *p; Err mx1.adamsgaard.dk 70 i- Err mx1.adamsgaard.dk 70 i- p = emalloc9p(sizeof *p); Err mx1.adamsgaard.dk 70 i- if(!s->nopipe){ Err mx1.adamsgaard.dk 70 i- if(pipe(p->fd) < 0) Err mx1.adamsgaard.dk 70 i- sysfatal("pipe: %r"); Err mx1.adamsgaard.dk 70 i- s->infd = s->outfd = p->fd[1]; Err mx1.adamsgaard.dk 70 i- s->srvfd = p->fd[0]; Err mx1.adamsgaard.dk 70 i- } Err mx1.adamsgaard.dk 70 i- if(name) Err mx1.adamsgaard.dk 70 i- if(postfd(name, s->srvfd) < 0) Err mx1.adamsgaard.dk 70 i- sysfatal("postfd %s: %r", name); Err mx1.adamsgaard.dk 70 i- p->s = s; Err mx1.adamsgaard.dk 70 i- p->mtpt = mtpt; Err mx1.adamsgaard.dk 70 i- p->flag = flag; Err mx1.adamsgaard.dk 70 i- return p; Err mx1.adamsgaard.dk 70 i-} Err mx1.adamsgaard.dk 70 i- Err mx1.adamsgaard.dk 70 i-void Err mx1.adamsgaard.dk 70 i-_post2(void *v) Err mx1.adamsgaard.dk 70 i-{ Err mx1.adamsgaard.dk 70 i- Srv *s; Err mx1.adamsgaard.dk 70 i- Err mx1.adamsgaard.dk 70 i- s = v; Err mx1.adamsgaard.dk 70 i- if(!s->leavefdsopen){ Err mx1.adamsgaard.dk 70 i- rfork(RFNOTEG); Err mx1.adamsgaard.dk 70 i- rendezvous((ulong)s, 0); Err mx1.adamsgaard.dk 70 i- close(s->srvfd); Err mx1.adamsgaard.dk 70 i- } Err mx1.adamsgaard.dk 70 i- srv(s); Err mx1.adamsgaard.dk 70 i-} Err mx1.adamsgaard.dk 70 i- Err mx1.adamsgaard.dk 70 i-void Err mx1.adamsgaard.dk 70 i-_post3(Postcrud *p) Err mx1.adamsgaard.dk 70 i-{ Err mx1.adamsgaard.dk 70 i- /* Err mx1.adamsgaard.dk 70 i- * Normally the server is posting as the last thing it does Err mx1.adamsgaard.dk 70 i- * before exiting, so the correct thing to do is drop into Err mx1.adamsgaard.dk 70 i- * a different fd space and close the 9P server half of the Err mx1.adamsgaard.dk 70 i- * pipe before trying to mount the kernel half. This way, Err mx1.adamsgaard.dk 70 i- * if the file server dies, we don't have a ref to the 9P server Err mx1.adamsgaard.dk 70 i- * half of the pipe. Then killing the other procs will drop Err mx1.adamsgaard.dk 70 i- * all the refs on the 9P server half, and the mount will fail. Err mx1.adamsgaard.dk 70 i- * Otherwise the mount hangs forever. Err mx1.adamsgaard.dk 70 i- * Err mx1.adamsgaard.dk 70 i- * Libthread in general and acme win in particular make Err mx1.adamsgaard.dk 70 i- * it hard to make this fd bookkeeping work out properly, Err mx1.adamsgaard.dk 70 i- * so leaveinfdopen is a flag that win sets to opt out of this Err mx1.adamsgaard.dk 70 i- * safety net. Err mx1.adamsgaard.dk 70 i- */ Err mx1.adamsgaard.dk 70 i- if(!p->s->leavefdsopen){ Err mx1.adamsgaard.dk 70 i- rfork(RFFDG); Err mx1.adamsgaard.dk 70 i- rendezvous((ulong)p->s, 0); Err mx1.adamsgaard.dk 70 i- close(p->s->infd); Err mx1.adamsgaard.dk 70 i- if(p->s->infd != p->s->outfd) Err mx1.adamsgaard.dk 70 i- close(p->s->outfd); Err mx1.adamsgaard.dk 70 i- } Err mx1.adamsgaard.dk 70 i- Err mx1.adamsgaard.dk 70 i-#if 0 Err mx1.adamsgaard.dk 70 i- if(p->mtpt){ Err mx1.adamsgaard.dk 70 i- if(amount(p->s->srvfd, p->mtpt, p->flag, "") == -1) Err mx1.adamsgaard.dk 70 i- sysfatal("mount %s: %r", p->mtpt); Err mx1.adamsgaard.dk 70 i- }else Err mx1.adamsgaard.dk 70 i-#endif Err mx1.adamsgaard.dk 70 i- close(p->s->srvfd); Err mx1.adamsgaard.dk 70 i- free(p); Err mx1.adamsgaard.dk 70 i-} Err mx1.adamsgaard.dk 70 1diff --git a/src/lib9p/post.c b/src/lib9p/post.c /src/plan9port/file/src/lib9p/post.c.gph mx1.adamsgaard.dk 70 it@@ -1,23 +0,0 @@ Err mx1.adamsgaard.dk 70 i-#include Err mx1.adamsgaard.dk 70 i-#include Err mx1.adamsgaard.dk 70 i-#include Err mx1.adamsgaard.dk 70 i-#include Err mx1.adamsgaard.dk 70 i-#include <9p.h> Err mx1.adamsgaard.dk 70 i-#include "post.h" Err mx1.adamsgaard.dk 70 i- Err mx1.adamsgaard.dk 70 i-void Err mx1.adamsgaard.dk 70 i-postmountsrv(Srv *s, char *name, char *mtpt, int flag) Err mx1.adamsgaard.dk 70 i-{ Err mx1.adamsgaard.dk 70 i- Postcrud *p; Err mx1.adamsgaard.dk 70 i- Err mx1.adamsgaard.dk 70 i- p = _post1(s, name, mtpt, flag); Err mx1.adamsgaard.dk 70 i- switch(rfork(RFPROC|RFNOTEG|RFNAMEG|RFMEM)){ Err mx1.adamsgaard.dk 70 i- case -1: Err mx1.adamsgaard.dk 70 i- sysfatal("rfork: %r"); Err mx1.adamsgaard.dk 70 i- case 0: Err mx1.adamsgaard.dk 70 i- _post2(s); Err mx1.adamsgaard.dk 70 i- exits(nil); Err mx1.adamsgaard.dk 70 i- default: Err mx1.adamsgaard.dk 70 i- _post3(p); Err mx1.adamsgaard.dk 70 i- } Err mx1.adamsgaard.dk 70 i-} Err mx1.adamsgaard.dk 70 1diff --git a/src/lib9p/post.h b/src/lib9p/post.h /src/plan9port/file/src/lib9p/post.h.gph mx1.adamsgaard.dk 70 it@@ -1,13 +0,0 @@ Err mx1.adamsgaard.dk 70 i-typedef struct Postcrud Postcrud; Err mx1.adamsgaard.dk 70 i-struct Postcrud Err mx1.adamsgaard.dk 70 i-{ Err mx1.adamsgaard.dk 70 i- int fd[2]; Err mx1.adamsgaard.dk 70 i- Srv *s; Err mx1.adamsgaard.dk 70 i- char *name; Err mx1.adamsgaard.dk 70 i- char *mtpt; Err mx1.adamsgaard.dk 70 i- int flag; Err mx1.adamsgaard.dk 70 i-}; Err mx1.adamsgaard.dk 70 i- Err mx1.adamsgaard.dk 70 i-Postcrud *_post1(Srv*, char*, char*, int); Err mx1.adamsgaard.dk 70 i-void _post2(void*); Err mx1.adamsgaard.dk 70 i-void _post3(Postcrud*); Err mx1.adamsgaard.dk 70 .