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

Changed forkbomb to only print one success message

Browse Source
This commit is contained in:
Scott Haseley 2016-03-11 14:56:01 -05:00
parent bfa901ed0b
commit 922370ebd4
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test161/commands/asst2.tc
View File

@ -21,13 +21,6 @@ templates:
- name: /testbin/forkbomb - name: /testbin/forkbomb
timesout: yes timesout: yes
timeout: 15.0 timeout: 15.0
output:
- text: "/testbin/forkbomb: SUCCESS"
- text: "/testbin/forkbomb: SUCCESS"
- text: "/testbin/forkbomb: SUCCESS"
- text: "/testbin/forkbomb: SUCCESS"
- text: "/testbin/forkbomb: SUCCESS"
- name: kmalloc - name: kmalloc
output: output:
- text: "kmalloc: out of memory" - text: "kmalloc: out of memory"

5
userland/testbin/forkbomb/forkbomb.c
View File

@ -65,13 +65,16 @@ main(void)
unsigned long start_time_ns, time_now_ns; unsigned long start_time_ns, time_now_ns;
__time(&start_time_s, &start_time_ns); __time(&start_time_s, &start_time_ns);
int parent_pid = getpid(); int parent_pid = getpid();
int did_print = 0;
while (1) { while (1) {
fork(); fork();
__time(&time_now_s, &time_now_ns); __time(&time_now_s, &time_now_ns);
// Only parent gets to print // Only parent gets to print
if(getpid() == parent_pid && if(getpid() == parent_pid &&
time_now_s - start_time_s > TEST_DURATION) { time_now_s - start_time_s > TEST_DURATION &&
!did_print) {
did_print = 1;
success(TEST161_SUCCESS, SECRET, "/testbin/forkbomb"); success(TEST161_SUCCESS, SECRET, "/testbin/forkbomb");
} }