[Emc-commit] rtapi/examples/shmem shmemtask.c,1.6,1.7

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

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

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

Index: shmemtask.c
===================================================================
RCS file: /cvsroot/emc/rtapi/examples/shmem/shmemtask.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shmemtask.c	10 Aug 2003 23:52:35 -0000	1.6
--- shmemtask.c	11 Aug 2003 04:58:39 -0000	1.7
***************
*** 36,44 ****
    int shmem_prio;
  
!   /*
!   if (0 != rtapi_init()) {
      return -1;
    }
-   */
  
    /* allocate and initialize the shared memory structure */
--- 36,42 ----
    int shmem_prio;
  
!   if (rtapi_init() != RTAPI_SUCCESS ) {
      return -1;
    }
  
    /* allocate and initialize the shared memory structure */
***************
*** 58,62 ****
    /* set the base timer period */
    retval = rtapi_clock_set_period(SHMEM_PERIOD_NSEC);
!   if ( retval != RTAPI_SUCCESS ) {
      rtapi_print( "shmemtask init: rtapi_clock_set_period returned %d\n", retval );
      return -1;
--- 56,60 ----
    /* set the base timer period */
    retval = rtapi_clock_set_period(SHMEM_PERIOD_NSEC);
!   if ( retval < RTAPI_SUCCESS ) {
      rtapi_print( "shmemtask init: rtapi_clock_set_period returned %d\n", retval );
      return -1;
***************
*** 77,81 ****
                               0, shmem_prio,
                               SHMEM_STACKSIZE,
!                              SHMEM_PERIOD_NSEC, NOW,
  			     RTAPI_NO_FP );
    if ( retval != RTAPI_SUCCESS ) {
--- 75,79 ----
                               0, shmem_prio,
                               SHMEM_STACKSIZE,
!                              SHMEM_PERIOD_NSEC, RTAPI_NOW,
  			     RTAPI_NO_FP );
    if ( retval != RTAPI_SUCCESS ) {
***************
*** 108,118 ****
      return;
    }
! 
    retval = rtapi_shmem_delete( shmem_mem );
    if ( retval != RTAPI_SUCCESS ) {
      rtapi_print("shmemtask exit: rtapi_shmem_delete returned %d\n", retval );
      return;
!   }
! 
!   rtapi_app_return();
  }
--- 106,116 ----
      return;
    }
! /* TESTING - intentionally skip the shmem_delete
    retval = rtapi_shmem_delete( shmem_mem );
    if ( retval != RTAPI_SUCCESS ) {
      rtapi_print("shmemtask exit: rtapi_shmem_delete returned %d\n", retval );
      return;
!   }*/
!   /* Clean up and exit */
!   rtapi_exit();
  }