Skip to content

Commit bfbf33a

Browse files
committed
add print in testing program
1 parent d18aa0f commit bfbf33a

File tree

2 files changed

+23
-16
lines changed

2 files changed

+23
-16
lines changed

assignment02/part1/hc_sr04-test.c

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ int func(char(*pin)[5][2], char*(*pin_str)[5]) {
1313
return 0;
1414
}
1515
typedef struct pdata {
16-
int fd;
16+
int fd; char*name;
1717
hcsr_set set;
1818
} pdata;
1919
void* pfunction(void* datain) {
@@ -22,16 +22,16 @@ void* pfunction(void* datain) {
2222
printf("mode:%d, freq:%u\n", data->set.working_mode.mode, data->set.working_mode.freq);
2323
ioctl(data->fd, SETMODE,(int)&(data->set.working_mode), 0);
2424
i = 1;
25-
read(data->fd, &i, sizeof(int));
25+
read(data->fd, &i, sizeof(int)); PRINT(data->name, data->fd);
2626
sleep(1);
2727

2828

2929
i = 1;//ONE_SHOT: clear data, PEORIDIC: start thread
30-
write(data->fd, &i, sizeof(int));
30+
write(data->fd, &i, sizeof(int)); PRINT(data->name, data->fd);
3131
sleep(1);
3232

3333
i = 0;
34-
write(data->fd, &i, sizeof(int));
34+
write(data->fd, &i, sizeof(int)); PRINT(data->name, data->fd);
3535
return NULL;
3636
}
3737

@@ -62,26 +62,26 @@ int main(int argc, char*argv[]) {
6262
perror("IOCTL");
6363

6464
i = 0;
65-
write(fdA, &i, sizeof(int));
66-
write(fdA, &i, sizeof(int));
65+
write(fdA, &i, sizeof(int)); PRINT("HCSR_1", fdA);
66+
write(fdA, &i, sizeof(int)); PRINT("HCSR_1", fdA);
6767
i = 1; //clear
68-
write(fdA, &i, sizeof(int));
68+
write(fdA, &i, sizeof(int)); PRINT("HCSR_1", fdA);
6969

70-
read(fdA, &i, sizeof(int));
71-
read(fdA, &i, sizeof(int));
70+
read(fdA, &i, sizeof(int)); PRINT("HCSR_1", fdA);
71+
read(fdA, &i, sizeof(int)); PRINT("HCSR_1", fdA);
7272

7373
//B
7474
ret = ioctl(fdB, SETMODE, &Bset, 0);
7575
if(0 != ret)
7676
perror("SETMODE");
77-
read(fdB, &i, sizeof(int));
77+
read(fdB, &i, sizeof(int)); PRINT("HCSR_2", fdB);
7878
sleep(1);
7979

8080
i = 1; //start thread
81-
write(fdB, &i, sizeof(int));
81+
write(fdB, &i, sizeof(int)); PRINT("HCSR_2", fdB);
8282
sleep(1);
8383
i = 0; //stop thread
84-
write(fdB, &i, sizeof(int));
84+
write(fdB, &i, sizeof(int)); PRINT("HCSR_2", fdB);
8585

8686

8787
Bset.mode = 0;
@@ -91,16 +91,16 @@ int main(int argc, char*argv[]) {
9191
i = 0;
9292

9393
i = 1; //clear fdA
94-
write(fdA, &i, sizeof(int));
94+
write(fdA, &i, sizeof(int)); PRINT("HCSR_1", fdA);
9595

9696
i = 1; //clear fdB
97-
write(fdB, &i, sizeof(int));
97+
write(fdB, &i, sizeof(int)); PRINT("HCSR_2", fdB);
9898

9999
//For multi-thread test
100-
Adata.fd = fdA;
100+
Adata.fd = fdA; Adata.name = "HCSR_1";
101101
Adata.set.working_mode.mode = 1;
102102
Adata.set.working_mode.freq = 7;
103-
Bdata.fd = fdB;
103+
Bdata.fd = fdB; Bdata.name = "HCSR_2";
104104
Bdata.set.working_mode.mode = 0;
105105
Bdata.set.working_mode.freq = 7;
106106
pthread_t tA, tB;

assignment02/part1/hc_sr04_user.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11
#ifndef _HC_SR04_USR_H_
22
#define _HC_SR04_USR_H_
33
#include"hc_sr04_common.h"
4+
#include <unistd.h>
5+
#define __HC_DEBUG_USER__
6+
#ifdef __HC_DEBUG_USER__
7+
#define PRINT(name, fd) do {int TMP; read((fd), &TMP,sizeof(int)); printf("%s's distance: %d-\n", name, TMP);}while(0);
8+
#else
9+
#define PRINT(name, fd)
10+
#endif
411
#endif

0 commit comments

Comments
 (0)