Blame

Date:
Message:
Fighting the good fight. Move libfmt, libutf into subdirectories of lib9. Add poll-based socket i/o to libthread, so that we can avoid using multiple procs when possible, thus removing dependence on crappy pthreads implementations. Convert samterm, acme to the single-proc libthread. Bring libcomplete, acme up-to-date w.r.t. Plan 9 distribution.
Actions:
History | Blob | Raw File
  1 fd04aace 2003-11-23 devnull #define NOPLAN9DEFINES

  2 fd04aace 2003-11-23 devnull #include <u.h>

  3 fd04aace 2003-11-23 devnull #include <libc.h>

  4 fd04aace 2003-11-23 devnull 

  5 b2cfc4e2 2003-09-30 devnull #include <signal.h>

  6 b2cfc4e2 2003-09-30 devnull #include <sys/types.h>

  7 912fba95 2003-11-24 devnull #include <sys/time.h>

  8 b2cfc4e2 2003-09-30 devnull #include <sys/resource.h>

  9 b2cfc4e2 2003-09-30 devnull #include <sys/wait.h>

 10 b2cfc4e2 2003-09-30 devnull 

 11 b2cfc4e2 2003-09-30 devnull static struct {

 12 b2cfc4e2 2003-09-30 devnull 	int sig;

 13 b2cfc4e2 2003-09-30 devnull 	char *str;

 14 b2cfc4e2 2003-09-30 devnull } tab[] = {

 15 b2cfc4e2 2003-09-30 devnull 	SIGHUP,		"hangup",

 16 b2cfc4e2 2003-09-30 devnull 	SIGINT,		"interrupt",

 17 b2cfc4e2 2003-09-30 devnull 	SIGQUIT,		"quit",

 18 b2cfc4e2 2003-09-30 devnull 	SIGILL,		"sys: trap: illegal instruction",

 19 b2cfc4e2 2003-09-30 devnull 	SIGTRAP,		"sys: trace trap",

 20 b2cfc4e2 2003-09-30 devnull 	SIGABRT,		"sys: abort",

 21 d2c4ee9e 2003-11-24 devnull #ifdef SIGEMT

 22 b2cfc4e2 2003-09-30 devnull 	SIGEMT,		"sys: emulate instruction executed",

 23 d2c4ee9e 2003-11-24 devnull #endif

 24 b2cfc4e2 2003-09-30 devnull 	SIGFPE,		"sys: fp: trap",

 25 b2cfc4e2 2003-09-30 devnull 	SIGKILL,		"sys: kill",

 26 b2cfc4e2 2003-09-30 devnull 	SIGBUS,		"sys: bus error",

 27 b2cfc4e2 2003-09-30 devnull 	SIGSEGV,		"sys: segmentation violation",

 28 b2cfc4e2 2003-09-30 devnull 	SIGALRM,		"alarm",

 29 b2cfc4e2 2003-09-30 devnull 	SIGTERM,		"kill",

 30 b2cfc4e2 2003-09-30 devnull 	SIGURG,		"sys: urgent condition on socket",

 31 b2cfc4e2 2003-09-30 devnull 	SIGSTOP,		"sys: stop",

 32 b2cfc4e2 2003-09-30 devnull 	SIGTSTP,		"sys: tstp",

 33 b2cfc4e2 2003-09-30 devnull 	SIGCONT,		"sys: cont",

 34 b2cfc4e2 2003-09-30 devnull 	SIGCHLD,		"sys: child",

 35 b2cfc4e2 2003-09-30 devnull 	SIGTTIN,		"sys: ttin",

 36 b2cfc4e2 2003-09-30 devnull 	SIGTTOU,		"sys: ttou",

 37 b2cfc4e2 2003-09-30 devnull 	SIGIO,		"sys: i/o possible on fd",

 38 b2cfc4e2 2003-09-30 devnull 	SIGXCPU,		"sys: cpu time limit exceeded",

 39 b2cfc4e2 2003-09-30 devnull 	SIGXFSZ,		"sys: file size limit exceeded",

 40 b2cfc4e2 2003-09-30 devnull 	SIGVTALRM,	"sys: virtual time alarm",

 41 b2cfc4e2 2003-09-30 devnull 	SIGPROF,		"sys: profiling timer alarm",

 42 b2cfc4e2 2003-09-30 devnull 	SIGWINCH,	"sys: window size change",

 43 1c253ceb 2003-11-23 devnull #ifdef SIGINFO

 44 b2cfc4e2 2003-09-30 devnull 	SIGINFO,		"sys: status request",

 45 1c253ceb 2003-11-23 devnull #endif

 46 b2cfc4e2 2003-09-30 devnull 	SIGUSR1,		"sys: usr1",

 47 b2cfc4e2 2003-09-30 devnull 	SIGUSR2,		"sys: usr2",

 48 32f69c36 2003-12-11 devnull 	SIGPIPE,		"sys: write on closed pipe",

 49 b2cfc4e2 2003-09-30 devnull };

 50 b2cfc4e2 2003-09-30 devnull 	

 51 fd04aace 2003-11-23 devnull char*

 52 b2cfc4e2 2003-09-30 devnull _p9sigstr(int sig, char *tmp)

 53 b2cfc4e2 2003-09-30 devnull {

 54 b2cfc4e2 2003-09-30 devnull 	int i;

 55 b2cfc4e2 2003-09-30 devnull 

 56 b2cfc4e2 2003-09-30 devnull 	for(i=0; i<nelem(tab); i++)

 57 b2cfc4e2 2003-09-30 devnull 		if(tab[i].sig == sig)

 58 b2cfc4e2 2003-09-30 devnull 			return tab[i].str;

 59 b2cfc4e2 2003-09-30 devnull 	sprint(tmp, "sys: signal %d", sig);

 60 b2cfc4e2 2003-09-30 devnull 	return tmp;

 61 b2cfc4e2 2003-09-30 devnull }

 62 b2cfc4e2 2003-09-30 devnull 

 63 fd04aace 2003-11-23 devnull int

 64 b2cfc4e2 2003-09-30 devnull _p9strsig(char *s)

 65 b2cfc4e2 2003-09-30 devnull {

 66 b2cfc4e2 2003-09-30 devnull 	int i;

 67 b2cfc4e2 2003-09-30 devnull 

 68 b2cfc4e2 2003-09-30 devnull 	for(i=0; i<nelem(tab); i++)

 69 b2cfc4e2 2003-09-30 devnull 		if(strcmp(s, tab[i].str) == 0)

 70 b2cfc4e2 2003-09-30 devnull 			return tab[i].sig;

 71 b2cfc4e2 2003-09-30 devnull 	return 0;

 72 b2cfc4e2 2003-09-30 devnull }

 73 b2cfc4e2 2003-09-30 devnull 

 74 5a8e63b2 2004-02-29 devnull static int

 75 5a8e63b2 2004-02-29 devnull _await(char *str, int n, int opt)

 76 b2cfc4e2 2003-09-30 devnull {

 77 b2cfc4e2 2003-09-30 devnull 	int pid, status, cd;

 78 b2cfc4e2 2003-09-30 devnull 	struct rusage ru;

 79 b2cfc4e2 2003-09-30 devnull 	char buf[128], tmp[64];

 80 b2cfc4e2 2003-09-30 devnull 	ulong u, s;

 81 b2cfc4e2 2003-09-30 devnull 

 82 b2cfc4e2 2003-09-30 devnull 	for(;;){

 83 5a8e63b2 2004-02-29 devnull 		pid = wait3(&status, opt, &ru);

 84 5a8e63b2 2004-02-29 devnull 		if(pid <= 0)

 85 b2cfc4e2 2003-09-30 devnull 			return -1;

 86 b2cfc4e2 2003-09-30 devnull 		u = ru.ru_utime.tv_sec*1000+((ru.ru_utime.tv_usec+500)/1000);

 87 b2cfc4e2 2003-09-30 devnull 		s = ru.ru_stime.tv_sec*1000+((ru.ru_stime.tv_usec+500)/1000);

 88 b2cfc4e2 2003-09-30 devnull 		if(WIFEXITED(status)){

 89 b2cfc4e2 2003-09-30 devnull 			status = WEXITSTATUS(status);

 90 b2cfc4e2 2003-09-30 devnull 			if(status)

 91 fd04aace 2003-11-23 devnull 				snprint(buf, sizeof buf, "%d %lud %lud %lud %d", pid, u, s, u+s, status);

 92 b2cfc4e2 2003-09-30 devnull 			else

 93 fd04aace 2003-11-23 devnull 				snprint(buf, sizeof buf, "%d %lud %lud %lud ''", pid, u, s, u+s, status);

 94 b2cfc4e2 2003-09-30 devnull 			strecpy(str, str+n, buf);

 95 b2cfc4e2 2003-09-30 devnull 			return strlen(str);

 96 b2cfc4e2 2003-09-30 devnull 		}

 97 b2cfc4e2 2003-09-30 devnull 		if(WIFSIGNALED(status)){

 98 b2cfc4e2 2003-09-30 devnull 			cd = WCOREDUMP(status);

 99 b2cfc4e2 2003-09-30 devnull 			USED(cd);

100 fd04aace 2003-11-23 devnull 			snprint(buf, sizeof buf, "%d %lud %lud %lud '%s'", pid, u, s, u+s, _p9sigstr(WTERMSIG(status), tmp));

101 b2cfc4e2 2003-09-30 devnull 			strecpy(str, str+n, buf);

102 b2cfc4e2 2003-09-30 devnull 			return strlen(str);

103 b2cfc4e2 2003-09-30 devnull 		}

104 b2cfc4e2 2003-09-30 devnull 	}

105 b2cfc4e2 2003-09-30 devnull }

106 5a8e63b2 2004-02-29 devnull 

107 5a8e63b2 2004-02-29 devnull int

108 5a8e63b2 2004-02-29 devnull await(char *str, int n)

109 5a8e63b2 2004-02-29 devnull {

110 5a8e63b2 2004-02-29 devnull 	return _await(str, n, 0);

111 5a8e63b2 2004-02-29 devnull }

112 5a8e63b2 2004-02-29 devnull 

113 5a8e63b2 2004-02-29 devnull int

114 5a8e63b2 2004-02-29 devnull awaitnohang(char *str, int n)

115 5a8e63b2 2004-02-29 devnull {

116 5a8e63b2 2004-02-29 devnull 	return _await(str, n, WNOHANG);

117 5a8e63b2 2004-02-29 devnull }

118 5a8e63b2 2004-02-29 devnull