Merge branch 'master' of git.minix3.org:minix

This commit is contained in:
Tomas Hruby 2012-10-11 09:47:24 +00:00
commit 420dfe1145
7 changed files with 10 additions and 10 deletions

View file

@ -2,10 +2,10 @@ all: requestor grantor 1fifo 2fifo
chmod +x down run chmod +x down run
requestor: requestor.c inc.h requestor: requestor.c inc.h
cc -o $@ $< -lsys cc -static -o $@ $< -lsys -lminlib -lcompat_minix
grantor: grantor.c inc.h grantor: grantor.c inc.h
cc -o $@ $< -lsys cc -static -o $@ $< -lsys -lminlib -lcompat_minix
1fifo 2fifo: 1fifo 2fifo:
mkfifo $@ mkfifo $@

0
test/safecopy/down Normal file → Executable file
View file

0
test/safecopy/run Normal file → Executable file
View file

View file

@ -2,10 +2,10 @@ all: requestor grantor 1fifo 2fifo
chmod +x down run chmod +x down run
requestor: requestor.c inc.h requestor: requestor.c inc.h
cc -o $@ $< -lsys cc -static -o $@ $< -lsys -lminlib -lcompat_minix
grantor: grantor.c inc.h grantor: grantor.c inc.h
cc -o $@ $< -lsys cc -static -o $@ $< -lsys -lminlib -lcompat_minix
1fifo 2fifo: 1fifo 2fifo:
mkfifo $@ mkfifo $@

0
test/safemap/down Normal file → Executable file
View file

View file

@ -48,14 +48,14 @@ int main(int argc, char **argv)
/* Test MAP. */ /* Test MAP. */
FIFO_WAIT(fid_get); FIFO_WAIT(fid_get);
r = sys_safemap(ep_granter, gid, 0, (long)buf, size, D, 1); r = sys_safemap(ep_granter, gid, 0, (long)buf, size, 1);
if(r != OK) { if(r != OK) {
printf("REQUESTOR: error in sys_safemap: %d\n", r); printf("REQUESTOR: error in sys_safemap: %d\n", r);
return 1; return 1;
} }
CHECK_TEST("REQUESTOR", buf[0], BUF_START_GRANTOR, "MAP"); CHECK_TEST("REQUESTOR", buf[0], BUF_START_GRANTOR, "MAP");
buf[0] = BUF_START_REQUESTOR; buf[0] = BUF_START_REQUESTOR;
r = sys_safeunmap(D, (long)buf); r = sys_safeunmap((long)buf);
if(r != OK) { if(r != OK) {
printf("REQUESTOR: error in sys_safeunmap: %d\n", r); printf("REQUESTOR: error in sys_safeunmap: %d\n", r);
return 1; return 1;
@ -65,7 +65,7 @@ int main(int argc, char **argv)
/* Test UNMAP. */ /* Test UNMAP. */
FIFO_WAIT(fid_get); FIFO_WAIT(fid_get);
CHECK_TEST("REQUESTOR", buf[0], BUF_START_REQUESTOR, "UNMAP"); CHECK_TEST("REQUESTOR", buf[0], BUF_START_REQUESTOR, "UNMAP");
r = sys_safemap(ep_granter, gid, 0, (long)buf, size, D, 1); r = sys_safemap(ep_granter, gid, 0, (long)buf, size, 1);
if(r != 0) { if(r != 0) {
printf("REQUESTOR: error in sys_safemap: %d\n", r); printf("REQUESTOR: error in sys_safemap: %d\n", r);
return 1; return 1;
@ -80,7 +80,7 @@ int main(int argc, char **argv)
/* Test SMAP_COW. */ /* Test SMAP_COW. */
FIFO_WAIT(fid_get); FIFO_WAIT(fid_get);
r = sys_safemap(ep_granter, gid, 0, (long)buf, size, D, 1); r = sys_safemap(ep_granter, gid, 0, (long)buf, size, 1);
if(r != OK) { if(r != OK) {
printf("REQUESTOR: error in sys_safemap: %d\n", r); printf("REQUESTOR: error in sys_safemap: %d\n", r);
return 1; return 1;
@ -114,7 +114,7 @@ int main(int argc, char **argv)
/* Test COW_SMAP. */ /* Test COW_SMAP. */
FIFO_WAIT(fid_get); FIFO_WAIT(fid_get);
buf[0] = BUF_START_REQUESTOR; buf[0] = BUF_START_REQUESTOR;
r = sys_safemap(ep_granter, gid, 0, (long)buf, size, D, 1); r = sys_safemap(ep_granter, gid, 0, (long)buf, size, 1);
if(r != OK) { if(r != OK) {
printf("REQUESTOR: error in sys_safemap: %d\n", r); printf("REQUESTOR: error in sys_safemap: %d\n", r);
return 1; return 1;
@ -131,7 +131,7 @@ int main(int argc, char **argv)
printf("REQUESTOR: error in sys_safecopyto: %d\n", r); printf("REQUESTOR: error in sys_safecopyto: %d\n", r);
return 1; return 1;
} }
r = sys_safemap(ep_granter, gid, 0, (long)buf, size, D, 1); r = sys_safemap(ep_granter, gid, 0, (long)buf, size, 1);
if(r != OK) { if(r != OK) {
printf("REQUESTOR: error in sys_safemap: %d\n", r); printf("REQUESTOR: error in sys_safemap: %d\n", r);
return 1; return 1;

0
test/safemap/run Normal file → Executable file
View file