[Emc-commit] rtapi/examples/fifo fifotask.c,1.12,1.13

[<jmk...@us...>]

Update of /cvsroot/emc/rtapi/examples/fifo
In directory sc8-pr-cvs1:/tmp/cvs-serv13330/examples/fifo

Modified Files:
	fifotask.c 
Log Message:
added error recovery and cleanup to rtai_rtapi

Index: fifotask.c
===================================================================
RCS file: /cvsroot/emc/rtapi/examples/fifo/fifotask.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** fifotask.c	10 Aug 2003 23:52:35 -0000	1.12
--- fifotask.c	11 Aug 2003 04:58:39 -0000	1.13
***************
*** 40,44 ****
      total += len + 4;
      buffer[4 + n] = (char) '\0';
!     rtapi_print_msg(2, "fifotask: total %d, wrote '%s',\n", total, buffer);
      count++;
      len++;
--- 40,44 ----
      total += len + 4;
      buffer[4 + n] = (char) '\0';
!     rtapi_print_msg(2, "fifotask: total %d, wrote '%s'\n", total, buffer);
      count++;
      len++;
***************
*** 58,61 ****
--- 58,65 ----
    int fifo_prio;
  
+   if (rtapi_init() != RTAPI_SUCCESS ) {
+     return -1;
+   }
+ 
    /* allocate and initialize the fifo */
    retval = rtapi_fifo_new(FIFO_KEY, FIFO_SIZE, &fifo);
***************
*** 88,92 ****
    retval = rtapi_task_start(fifo_task, fifo_code,
  			    0, fifo_prio,
! 			    FIFO_STACKSIZE, FIFO_PERIOD_NSEC, NOW,
  			    RTAPI_NO_FP);
    if (retval != RTAPI_SUCCESS) {
--- 92,96 ----
    retval = rtapi_task_start(fifo_task, fifo_code,
  			    0, fifo_prio,
! 			    FIFO_STACKSIZE, FIFO_PERIOD_NSEC, RTAPI_NOW,
  			    RTAPI_NO_FP);
    if (retval != RTAPI_SUCCESS) {
***************
*** 122,133 ****
      rtapi_print("fifotask exit: rtapi_task_delete failed with %d\n", retval);
    }
! 
    retval = rtapi_fifo_delete(fifo);
    if (retval != RTAPI_SUCCESS) {
      rtapi_print("fifotask exit: rtapi_fifo_delete failed with %d\n", retval);
!   }
  
    rtapi_print("fifotask exit: done\n");
  
!   rtapi_app_return();
  }
--- 126,137 ----
      rtapi_print("fifotask exit: rtapi_task_delete failed with %d\n", retval);
    }
! /* TESTING - Intentionally fail to delete fifo
    retval = rtapi_fifo_delete(fifo);
    if (retval != RTAPI_SUCCESS) {
      rtapi_print("fifotask exit: rtapi_fifo_delete failed with %d\n", retval);
!   } */
  
    rtapi_print("fifotask exit: done\n");
  
!   rtapi_exit();
  }