minhtrannhat/os161
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert sy6 changes

Browse Source
This commit is contained in:
Yihong Chen 2016-02-10 20:28:14 -05:00
parent c1216b66b3
commit bfb353c211
3 changed files with 0 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
kern/include/test.h
View File

@ -59,7 +59,6 @@ int threadtest2(int, char **);
int threadtest3(int, char **); int threadtest3(int, char **);
int semtest(int, char **); int semtest(int, char **);
int locktest(int, char **); int locktest(int, char **);
int locktest2(int, char **);
int cvtest(int, char **); int cvtest(int, char **);
int cvtest2(int, char **); int cvtest2(int, char **);
int rwtest(int, char **); int rwtest(int, char **);

2
kern/main/menu.c
View File

@ -480,7 +480,6 @@ static const char *testmenu[] = {
"[sy3] CV test (1) ", "[sy3] CV test (1) ",
"[sy4] CV test #2 (1) ", "[sy4] CV test #2 (1) ",
"[sy5] RW lock test (1) ", "[sy5] RW lock test (1) ",
"[sy6] Lock test #2 (1) ",
#if OPT_SYNCHPROBS #if OPT_SYNCHPROBS
"[sp1] Whalemating test (1) ", "[sp1] Whalemating test (1) ",
"[sp2] Stoplight test (1) ", "[sp2] Stoplight test (1) ",
@ -615,7 +614,6 @@ static struct {
{ "sy3", cvtest }, { "sy3", cvtest },
{ "sy4", cvtest2 }, { "sy4", cvtest2 },
{ "sy5", rwtest }, { "sy5", rwtest },
{ "sy6", locktest2 },
#if OPT_SYNCHPROBS #if OPT_SYNCHPROBS
{ "sp1", whalemating }, { "sp1", whalemating },
{ "sp2", stoplight }, { "sp2", stoplight },

49
kern/test/synchtest.c
View File

@ -228,26 +228,6 @@ locktestthread(void *junk, unsigned long num)
V(donesem); V(donesem);
} }
static
void
locktestthread2(void *junk, unsigned long num)
{
int i;
(void)junk;
(void)num;
for (i=0; i<NLOCKLOOPS; i++) {
lock_acquire(testlock);
if (!lock_do_i_hold(testlock)) {
test_status = FAIL;
}
random_yielder(4);
lock_release(testlock);
}
V(donesem);
}
int int
locktest(int nargs, char **args) locktest(int nargs, char **args)
@ -277,35 +257,6 @@ locktest(int nargs, char **args)
return 0; return 0;
} }
int
locktest2(int nargs, char **args)
{
int i, result;
(void)nargs;
(void)args;
inititems();
test_status = SUCCESS;
kprintf_n("Starting lock test 2...\n");
for (i=0; i<NTHREADS; i++) {
result = thread_fork("synchtest", NULL, locktestthread2, NULL, i);
if (result) {
panic("locktest: thread_fork failed: %s\n", strerror(result));
}
}
for (i=0; i<NTHREADS; i++) {
P(donesem);
}
kprintf_n("Lock test 2 done.\n");
success(test_status, SECRET, "sy2");
lock_release(testlock);
return 0;
}
static static
void void
cvtestthread(void *junk, unsigned long num) cvtestthread(void *junk, unsigned long num)