|
From: <jmk...@us...> - 2003-08-11 04:58:42
|
Update of /cvsroot/emc/rtapi/examples/semaphore
In directory sc8-pr-cvs1:/tmp/cvs-serv13330/examples/semaphore
Modified Files:
master.c slave.c
Log Message:
added error recovery and cleanup to rtai_rtapi
Index: master.c
===================================================================
RCS file: /cvsroot/emc/rtapi/examples/semaphore/master.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** master.c 10 Aug 2003 23:52:35 -0000 1.7
--- master.c 11 Aug 2003 04:58:39 -0000 1.8
***************
*** 37,45 ****
int master_prio;
! /*
! if (0 != rtapi_app_init()) {
return -1;
}
- */
/* create the semaphore */
--- 37,43 ----
int master_prio;
! if (rtapi_init() != RTAPI_SUCCESS ) {
return -1;
}
/* create the semaphore */
***************
*** 52,56 ****
/* set the base timer period */
retval = rtapi_clock_set_period(TIMER_PERIOD_NSEC);
! if ( retval != RTAPI_SUCCESS ) {
rtapi_print( "sem master init: rtapi_clock_set_period returned %d\n", retval );
return -1;
--- 50,54 ----
/* set the base timer period */
retval = rtapi_clock_set_period(TIMER_PERIOD_NSEC);
! if ( retval < RTAPI_SUCCESS ) {
rtapi_print( "sem master init: rtapi_clock_set_period returned %d\n", retval );
return -1;
***************
*** 72,76 ****
0, master_prio,
MASTER_STACKSIZE,
! MASTER_PERIOD_NSEC, NOW,
RTAPI_NO_FP );
if ( retval != RTAPI_SUCCESS ) {
--- 70,74 ----
0, master_prio,
MASTER_STACKSIZE,
! MASTER_PERIOD_NSEC, RTAPI_NOW,
RTAPI_NO_FP );
if ( retval != RTAPI_SUCCESS ) {
***************
*** 89,92 ****
--- 87,91 ----
int retval;
+ /* TESTING - intentionally fail to remove the task and the semaphore
retval = rtapi_task_stop( master_task );
if ( retval != RTAPI_SUCCESS ) {
***************
*** 104,111 ****
rtapi_print("sem master exit: rtapi_sem_delete returned %d\n", retval );
return;
! }
rtapi_print("sem master exit: master count is %d\n", master_count);
! rtapi_app_return();
}
--- 103,110 ----
rtapi_print("sem master exit: rtapi_sem_delete returned %d\n", retval );
return;
! }*/
rtapi_print("sem master exit: master count is %d\n", master_count);
! rtapi_exit();
}
Index: slave.c
===================================================================
RCS file: /cvsroot/emc/rtapi/examples/semaphore/slave.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** slave.c 10 Aug 2003 23:52:35 -0000 1.5
--- slave.c 11 Aug 2003 04:58:39 -0000 1.6
***************
*** 33,37 ****
int slave_prio;
! if (0 != rtapi_app_init()) {
return -1;
}
--- 33,37 ----
int slave_prio;
! if (rtapi_init() != RTAPI_SUCCESS ) {
return -1;
}
***************
*** 51,55 ****
0, slave_prio,
SLAVE_STACKSIZE,
! 0 /* not periodic */, NOW,
RTAPI_NO_FP );
if ( retval != RTAPI_SUCCESS ) {
--- 51,55 ----
0, slave_prio,
SLAVE_STACKSIZE,
! 0 /* not periodic */, RTAPI_NOW,
RTAPI_NO_FP );
if ( retval != RTAPI_SUCCESS ) {
***************
*** 81,84 ****
rtapi_print("sem slave exit: slave count is %d\n", slave_count);
! rtapi_app_return();
}
--- 81,84 ----
rtapi_print("sem slave exit: slave count is %d\n", slave_count);
! rtapi_exit();
}
|