Description:
[grader] better test case for timeout, changed where check_mem_usage is called to reduce inefficiency
git-svn-id: http://theory.cpe.ku.ac.th/grader/judge/trunk/scripts@167 6386c4cd-e34a-4fa8-8920-d93eb39b512e
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
r43:b03203ec084a - - 2 files changed: 24 inserted, 10 deleted
@@ -420,21 +420,17 | |||
|
420 | 420 | int stat; |
|
421 | 421 | pid_t p; |
|
422 | 422 | |
|
423 | 423 | if (timer_tick) |
|
424 | 424 | { |
|
425 | 425 | check_timeout(); |
|
426 | + check_memory_usage(); | |
|
426 | 427 | timer_tick = 0; |
|
427 | 428 | } |
|
428 | 429 | p = wait4(box_pid, &stat, WUNTRACED, &rus); |
|
429 | 430 | |
|
430 | - if(!WIFEXITED(stat)) { | |
|
431 | - // printf("CHECKING\n"); | |
|
432 | - check_memory_usage(); | |
|
433 | - } | |
|
434 | - | |
|
435 | 431 | if (p < 0) |
|
436 | 432 | { |
|
437 | 433 | if (errno == EINTR) |
|
438 | 434 | continue; |
|
439 | 435 | die("wait4: %m"); |
|
440 | 436 | } |
@@ -446,15 +442,15 | |||
|
446 | 442 | int wall; |
|
447 | 443 | wall = time(NULL) - start_time; |
|
448 | 444 | timeradd(&rus.ru_utime, &rus.ru_stime, &total); |
|
449 | 445 | |
|
450 | 446 | box_pid = 0; |
|
451 | 447 | if (WEXITSTATUS(stat)) |
|
452 | - fprintf(stderr,"Exited with error status %d.", WEXITSTATUS(stat)); | |
|
448 | + fprintf(stderr,"Exited with error status %d.\n", WEXITSTATUS(stat)); | |
|
453 | 449 | else if ((use_wall_clock ? wall : total.tv_sec) > timeout) |
|
454 | - fprintf(stderr,"Time limit exceeded."); | |
|
450 | + fprintf(stderr,"Time limit exceeded.\n"); | |
|
455 | 451 | else |
|
456 | 452 | // report OK and statistics |
|
457 | 453 | fprintf(stderr,"OK\n"); |
|
458 | 454 | |
|
459 | 455 | fprintf(stderr,"%dr%.4lfu%.4lfs%dm\n", |
|
460 | 456 | wall, |
@@ -473,13 +469,13 | |||
|
473 | 469 | */ |
|
474 | 470 | exit(0); |
|
475 | 471 | } |
|
476 | 472 | if (WIFSIGNALED(stat)) |
|
477 | 473 | { |
|
478 | 474 | box_pid = 0; |
|
479 | - fprintf(stderr,"Caught fatal signal %d.", WTERMSIG(stat)); | |
|
475 | + fprintf(stderr,"Caught fatal signal %d.\n", WTERMSIG(stat)); | |
|
480 | 476 | |
|
481 | 477 | struct timeval total; |
|
482 | 478 | int wall; |
|
483 | 479 | wall = time(NULL) - start_time; |
|
484 | 480 | timeradd(&rus.ru_utime, &rus.ru_stime, &total); |
|
485 | 481 | fprintf(stderr,"%dr%.4lfu%.4lfs%dm\n", |
@@ -1,23 +1,41 | |||
|
1 | 1 | #include <stdio.h> |
|
2 | 2 | #include <stdlib.h> |
|
3 | 3 | #include <unistd.h> |
|
4 | + #include <sys/time.h> | |
|
5 | + #include <time.h> | |
|
6 | + #include <sys/resource.h> | |
|
4 | 7 | |
|
5 | 8 | int main() |
|
6 | 9 | { |
|
7 | 10 | int a,b; |
|
8 | 11 | |
|
9 | 12 | int c=0; |
|
10 | 13 | |
|
11 | 14 | scanf("%d %d",&a,&b); |
|
12 | 15 | printf("%d\n",a+b); |
|
13 | 16 | |
|
14 | - sleep(1); | |
|
17 | + struct rusage ru; | |
|
15 | 18 | |
|
16 | - c = 0; | |
|
19 | + while(1) { | |
|
20 | + c++; | |
|
21 | + b+=c; | |
|
17 | 22 | while(c<1000000000) { |
|
18 | 23 | c++; |
|
19 | 24 | b+=c; |
|
20 | 25 | } |
|
26 | + getrusage(RUSAGE_SELF,&ru); | |
|
27 | + if((ru.ru_utime.tv_sec + ru.ru_stime.tv_sec)>=1) | |
|
28 | + break; | |
|
29 | + } | |
|
30 | + printf("%d\n",b); | |
|
31 | + c=0; | |
|
32 | + while(c<100000000) { | |
|
33 | + c++; | |
|
34 | + b+=c; | |
|
35 | + } | |
|
36 | + if(b==10) | |
|
37 | + printf("hello\n"); | |
|
38 | + | |
|
21 | 39 | exit(0); |
|
22 | 40 | } |
|
23 | 41 |
You need to be logged in to leave comments.
Login now