d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor cleanup before converting to ATF testcases

Browse Source 
- Remove blank (tab-only) lines.
- Fix -Wunused warnings.
- Bump up to WARNS= 6
This commit is contained in:
Enji Cooper 2015-03-31 06:50:28 +00:00
parent 76cbe329d6
commit b5d45f0794
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=280894
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/regression/aio/kqueue/lio/Makefile
View File

@ -3,4 +3,6 @@
PROG= lio_kqueue
MAN=
WARNS?= 6
.include <bsd.prog.mk>

37
tools/regression/aio/kqueue/lio/lio_kqueue.c
View File

@ -37,13 +37,15 @@
* http://www.ambrisko.com/doug/listio_kqueue/listio_kqueue.patch
*/
#include <aio.h>
#include <fcntl.h>
#include <stdio.h>
#include <errno.h>
#include <sys/types.h>
#include <sys/event.h>
#include <sys/time.h>
#include <aio.h>
#include <fcntl.h>
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#define PATH_TEMPLATE "/tmp/aio.XXXXXXXXXX"
@ -52,9 +54,10 @@
#define MAX LIO_MAX * 16
#define MAX_RUNS 300
int
main(int argc, char *argv[]){
int fd;
struct aiocb *iocb[MAX], *kq_iocb;
struct aiocb *iocb[MAX];
struct aiocb **lio[LIO_MAX], **lio_element, **kq_lio;
int i, result, run, error, j, k;
char buffer[32768];
@ -65,7 +68,7 @@ main(int argc, char *argv[]){
time_t time1, time2;
char *file, pathname[sizeof(PATH_TEMPLATE)-1];
int tmp_file = 0, failed = 0;
if (kq < 0) {
perror("No kqeueue\n");
exit(1);
@ -89,7 +92,7 @@ main(int argc, char *argv[]){
#ifdef DEBUG
printf("Hello kq %d fd %d\n", kq, fd);
#endif
for (run = 0; run < MAX_RUNS; run++){
#ifdef DEBUG
printf("Run %d\n", run);
@ -137,13 +140,13 @@ main(int argc, char *argv[]){
printf("write %d is at %p\n", j, lio[j]);
#endif
}
for(i = 0; i < LIO_MAX; i++) {
for(j = LIO_MAX - 1; j >=0; j--) {
if (lio[j])
break;
}
for(;;) {
bzero(&ke, sizeof(ke));
bzero(&kq_returned, sizeof(ke));
@ -169,18 +172,18 @@ main(int argc, char *argv[]){
kq_returned.udata,
lio[j]);
#endif
if(kq_lio)
break;
#ifdef DEBUG
printf("Try again\n");
#endif
}
}
#ifdef DEBUG
printf("lio %p\n", lio);
#endif
for (j = 0; j < LIO_MAX; j++) {
if (lio[j] == kq_lio) {
break;
@ -201,12 +204,12 @@ main(int argc, char *argv[]){
printf("PASS: run %d, operation %d result %d \n", run, LIO_MAX - i -1, result);
}
for(k = 0; k < MAX / LIO_MAX; k++){
result = aio_return(kq_lio[k]);
result = aio_return(kq_lio[k]);
#ifdef DEBUG
printf("Return Resulto for %d %d is %d\n", j, k, result);
#endif
if (result != sizeof(buffer)) {
printf("FAIL: run %d, operation %d sub-opt %d result %d (errno=%d) should be %d\n",
printf("FAIL: run %d, operation %d sub-opt %d result %d (errno=%d) should be %zu\n",
run, LIO_MAX - i -1, k, result, errno, sizeof(buffer));
} else {
printf("PASS: run %d, operation %d sub-opt %d result %d\n",
@ -216,13 +219,13 @@ main(int argc, char *argv[]){
#ifdef DEBUG
printf("\n");
#endif
for(k = 0; k < MAX / LIO_MAX; k++) {
free(lio[j][k]);
}
free(lio[j]);
lio[j] = NULL;
}
}
}
#ifdef DEBUG
printf("Done\n");