use msleep to block instead of PV

Author: HawxChen

assignment02/part1/hc_sr04-test.c

@@ -5,17 +5,18 @@
 #include<errno.h>
 #include<fcntl.h>
 #include<stdlib.h>
-#include<sys/ioctl.h>
 #include"hc_sr04_user.h"
-#include"hw_setting.h"
 int func(char(*pin)[5][2], char*(*pin_str)[5]) {
  printf("%d, %s\n", pin[1][3][0], pin_str[1][3]); 
  return 0;
 }
-typedef struct pdata {
- int fd; char*name;
- hcsr_set set;
-} pdata;
+void* readfunc(void* datain) {
+ int i = 0;
+ pdata* data = (pdata*) datain;
+ read(data->fd, &i, sizeof(int)); PRINT(data->name, data->fd);
+ printf("READ UNBLOCKED\n");
+ return NULL;
+}
 void* pfunction(void* datain) {
  int i = 0;
  pdata* data = (pdata*) datain;
@@ -74,8 +75,9 @@ int main(int argc, char*argv[]) {
  ret = ioctl(fdB, SETMODE, &Bset, 0);
  if(0 != ret)
  perror("SETMODE");
- read(fdB, &i, sizeof(int)); PRINT("HCSR_2", fdB);
- sleep(1);
+ Bdata.fd = fdB; Bdata.name = "HCSR_2";
+ pthread_create((pthread_t*)&i, NULL, readfunc, &Bdata); 
+ //sleep(1);
 
  i = 1; //start thread
  write(fdB, &i, sizeof(int)); PRINT("HCSR_2", fdB);

assignment02/part1/hc_sr04.c

@@ -173,15 +173,6 @@ static irqreturn_t echo_recv_isr(int irq, void *data) {
  printk(KERN_ALERT "echo_recv_isr: %d CM, newest idx:%d, from %s, mode:%d \n",distance, hcsr->cirb.newest, hcsr->hc_sr04->name, hcsr->kconfig.set.working_mode.mode);
  spin_unlock(&(hcsr->cirb.cir_buf_lock));
 
- spin_lock(&(hcsr->kconfig.kconfig_lock));
- if(ONE_SHOT == hcsr->kconfig.set.working_mode.mode) {
- spin_unlock(&(hcsr->kconfig.kconfig_lock));
- } else {
- spin_unlock(&(hcsr->kconfig.kconfig_lock));
- wake_up_all(&(hcsr->wq));
- }
-
-
 RETURNED:
  spin_lock(&(hcsr->ongoing_lock));
  hcsr->ongoing = STOPPING;
@@ -351,10 +342,18 @@ static ssize_t hc_sr04_read(struct file *file, char *buf, size_t count, loff_t *
  } else {
  spin_unlock(&(hcsr->cirb.cir_buf_lock));
 
+RECHECK_BUF:
+ spin_lock(&(hcsr->cirb.cir_buf_lock));
  printk("read Blocked:%s \n", hcsr->hc_sr04->name);
- wait_event_interruptible((hcsr->wq),BUFF_IN);
+ if(-1 == hcsr->cirb.newest) {
+ spin_unlock(&(hcsr->cirb.cir_buf_lock));
+ msleep(10);
+ goto RECHECK_BUF;
+ }
+ spin_unlock(&(hcsr->cirb.cir_buf_lock));
 
  spin_lock(&(hcsr->cirb.cir_buf_lock));
+ printk(KERN_ALERT "read unBlocked-idx:%d,%d\n", hcsr->cirb.newest, (hcsr->cirb.buf.data[hcsr->cirb.newest]));
  ret = copy_to_user(buf, &(hcsr->cirb.buf.data[hcsr->cirb.newest]), sizeof(int));
  spin_unlock(&(hcsr->cirb.cir_buf_lock));
  if(ret) return -EAGAIN;
@@ -447,7 +446,6 @@ static void dereg_misc(struct miscdevice* md) {
 static void init_hcsr_struct(hcsr_struct* hcsr, struct miscdevice* md, char(*pins)[5][2], char*(*pin_str)[5]) {
  /*!!!!!*/
  //CHECK!!! INIT
- init_waitqueue_head(&(hcsr->wq));
  hcsr->kthread = NULL;
  hcsr->hc_sr04 = md;
  hcsr->irq_done = IRQ_NOT_DONE;
@@ -457,7 +455,12 @@ static void init_hcsr_struct(hcsr_struct* hcsr, struct miscdevice* md, char(*pin
 // hcsr->kconfig.set.mode = -1; 
  hcsr->cirb.newest = -1;
  hcsr->pin_str = pin_str;
+#ifdef __EXTENNTION__
+ hcsr->pv.cnt = 0;
+ sema_init(&(hcsr->pv.block_sem),0);
+ spin_lock_init(&(hcsr->pv.cnt_lock));
  spin_lock_init(&(hcsr->irq_done_lock));
+#endif
  spin_lock_init(&(hcsr->ongoing_lock));
  spin_lock_init(&(hcsr->cirb.cir_buf_lock));
  spin_lock_init(&(hcsr->kconfig.kconfig_lock));

assignment02/part1/hc_sr04_kernel.h

@@ -4,6 +4,7 @@
 #include "hc_sr04_common.h"
 #include "hw_setting.h"
 #include <linux/spinlock.h>
+#include <linux/semaphore.h>
 #include <linux/wait.h>
 #define BUFF_IN (0x00000001)
 #define COUNT_MAX (3)
@@ -15,6 +16,13 @@
 #define IRQ_DONE (1)
 #define IRQ_NOT_DONE (0)
 
+#ifdef __EXTENNTION__
+typedef struct PV{
+ long cnt;
+ spinlock_t cnt_lock;
+ struct semaphore block_sem;
+} PV;
+#endif
 
 typedef struct cir_buf {
  int newest;
@@ -31,8 +39,10 @@ typedef struct hcsr_struct {
  struct miscdevice* hc_sr04;
  int irq_done;
  int echo_isr_number;
- wait_queue_head_t wq;
  ktime_t kstart;
+#ifdef __EXTENNTION__
+ PV pv;
+#endif
  struct task_struct* kthread;
  spinlock_t kthread_lock;
  spinlock_t irq_done_lock;
@@ -54,6 +64,29 @@ static int __init hc_sr04_init(void);
 static void __exit hc_sr04_exit(void);
 
 static irqreturn_t echo_recv_isr(int irq, void *data);
+#ifdef __EXTENNTION__
+int P(PV* pv) {
+
+ spin_lock(&(pv->cnt_lock));
+ cnt--;
+ spin_unlock(&(pv->cnt_lock));
+
+ if(0 > cnt) {
+ down(&(pv->block_sem));
+ }
+}
+
+int V(PV* pv) {
+ spin_lock(&(pv->cnt_lock));
+ while(0 > cnt) {
+ cnt++;
+ up(&(pv->block_sem));
+ }
+ cnt++;
+ spin_unlock(&(pv->cnt_lock));
+}
+#endif 
+
 int set_ISR(struct hcsr_struct* hcsr) {
  //For Echo ISR
  int ret = 0;
@@ -168,7 +201,7 @@ int setEcho (struct hcsr_struct* hcsr, int pin) {
  }
 
  if(HC_GPIO_MUX0 == m || HC_GPIO_MUX1 == m) {
- gpio_set_value(all_pins[i][m][PIN_INDEX], all_pins[i][m][VAL_INDEX]);
+ gpio_direction_output(all_pins[i][m][PIN_INDEX], all_pins[i][m][VAL_INDEX]);
  } 
  else if(HC_GPIO_PULL == m) {
  gpio_direction_output(all_pins[i][m][PIN_INDEX], PULL_DOWN);

assignment02/part1/hc_sr04_user.h

@@ -1,11 +1,18 @@
 #ifndef _HC_SR04_USR_H_
 #define _HC_SR04_USR_H_
 #include"hc_sr04_common.h"
+#include"hw_setting.h"
 #include <unistd.h>
+#include<sys/ioctl.h>
 #define __HC_DEBUG_USER__
 #ifdef __HC_DEBUG_USER__
 #define PRINT(name, fd) do {int TMP; read((fd), &TMP,sizeof(int)); printf("%s's distance: %d-\n", name, TMP);}while(0);
 #else
 #define PRINT(name, fd)
 #endif
+typedef struct pdata {
+ int fd; char*name;
+ int get_i;
+ hcsr_set set;
+} pdata;
 #endif