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

Merging in 2.0.2.

Browse Source
This commit is contained in:
Geoffrey Challen
2017-01-09 22:37:50 -05:00
parent a0406ec181
commit 50cf3276e7
118 changed files with 1350 additions and 3158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
userland/testbin/bigfork/bigfork.c
View File

@@ -44,8 +44,6 @@
#include <string.h>
#include <unistd.h>
#include <err.h>
#include <test/test.h>
#include <test161/test161.h>
#define BRANCHES 6
@@ -56,8 +54,6 @@
*/
#define DIM 64
#define PROGRESS_INTERVAL 25000
static int m1[DIM*DIM], m2[DIM*DIM], m3[DIM*DIM], m4[DIM*DIM];
static const int right[BRANCHES] = {
536763422,
@@ -80,9 +76,7 @@ init(void)
for (j=0; j<DIM; j++) {
m1[i*DIM+j] = random() % 11 - 5;
}
TEST161_LPROGRESS(0);
}
nprintf("\n");
}
static
@@ -102,15 +96,12 @@ static
void
mul(int *x, const int *a, const int *b)
{
unsigned i, j, k, tot;
unsigned i, j, k;
tot = 0;
for (i=0; i<DIM; i++) {
for (j=0; j<DIM; j++) {
x[i*DIM+j] = 0;
for (k=0; k<DIM; k++) {
TEST161_LPROGRESS_N(tot, PROGRESS_INTERVAL);
tot++;
x[i*DIM+j] += a[i*DIM+k] * b[k*DIM+j];
}
}
@@ -186,15 +177,11 @@ dowait(pid_t pid)
exit(failures);
}
else {
// If the child crashes or waitpid returns -1, we don't know how many errors
// resulted (if any), but it's an error if we can't tell.
if (waitpid(pid, &status, 0) < 0) {
warn("waitpid(%d)", pid);
failures += 1;
}
else if (WIFSIGNALED(status)) {
warnx("pid %d: signal %d", pid, WTERMSIG(status));
failures += 1;
}
else if (WEXITSTATUS(status) > 0) {
failures += WEXITSTATUS(status);
@@ -209,6 +196,7 @@ dotest(void)
unsigned i, me;
pid_t pids[BRANCHES];
int t;
char msg[128];
me = 0;
for (i=0; i<BRANCHES; i++) {
@@ -219,28 +207,26 @@ dotest(void)
grind();
t = trace();
if (t == right[i]) {
lsay("\nStage %u #%u done: %d\n", i, me, trace());
snprintf(msg, sizeof(msg),
"Stage %u #%u done: %d\n", i, me, trace());
}
else {
lsay("Stage %u #%u FAILED: got %d, expected %d\n",
snprintf(msg, sizeof(msg),
"Stage %u #%u FAILED: got %d, expected %d\n",
i, me, t, right[i]);
success(TEST161_FAIL, SECRET, "/testbin/bigfork");
failures++;
}
TEST161_LPROGRESS(0);
(void)write(STDOUT_FILENO, msg, strlen(msg));
}
for (i=BRANCHES; i-- > 0; ) {
dowait(pids[i]);
}
if (failures > 0) {
tprintf("%u failures.\n", failures);
success(TEST161_FAIL, SECRET, "/testbin/bigfork");
printf("%u failures.\n", failures);
}
else {
tprintf("Done.\n");
success(TEST161_SUCCESS, SECRET, "/testbin/bigfork");
printf("Done.\n");
}
}