Menu
▾
▴
[Emc-commit] rtapi/examples/semaphore Makefile,1.4,1.5 master.c,1.8,1.9 slave.c,1.6,1.7
|
From: <jmk...@us...> - 2003-08-13 05:55:10
|
Update of /cvsroot/emc/rtapi/examples/semaphore
In directory sc8-pr-cvs1:/tmp/cvs-serv29419/examples/semaphore
Modified Files:
Makefile master.c slave.c
Log Message:
major changes to tasks API. Task IDs are now ints, not pointers. More changes on the way. RTAI builds and examples work. RTLinux and sim will be updated once rtai is done.
Index: Makefile
===================================================================
RCS file: /cvsroot/emc/rtapi/examples/semaphore/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile 10 Aug 2003 21:13:04 -0000 1.4
--- Makefile 13 Aug 2003 05:55:07 -0000 1.5
***************
*** 43,46 ****
--- 43,50 ----
# DO NOT DELETE
+ /home/John/emcdev/rtapi/rtlib/master.o: /home/John/emcdev/rtapi/include/rtapi.h
+ /home/John/emcdev/rtapi/rtlib/master.o: /home/John/emcdev/rtapi/include/rtapi_app.h
/home/John/emcdev/rtapi/rtlib/master.o: common.h
+ /home/John/emcdev/rtapi/rtlib/slave.o: /home/John/emcdev/rtapi/include/rtapi.h
+ /home/John/emcdev/rtapi/rtlib/slave.o: /home/John/emcdev/rtapi/include/rtapi_app.h
/home/John/emcdev/rtapi/rtlib/slave.o: common.h
Index: master.c
===================================================================
RCS file: /cvsroot/emc/rtapi/examples/semaphore/master.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** master.c 11 Aug 2003 04:58:39 -0000 1.8
--- master.c 13 Aug 2003 05:55:07 -0000 1.9
***************
*** 12,16 ****
rtapi_sem_handle master_sem; /* the global semaphore */
! rtapi_task_handle master_task; /* the task structure */
static unsigned int master_count = 0;
enum { TIMER_PERIOD_NSEC = 10000000 }; /* timer period, in nanoseconds */
--- 12,16 ----
rtapi_sem_handle master_sem; /* the global semaphore */
! static int master_task; /* the task ID */
static unsigned int master_count = 0;
enum { TIMER_PERIOD_NSEC = 10000000 }; /* timer period, in nanoseconds */
***************
*** 60,75 ****
/* create the master task */
! retval = rtapi_task_new( &master_task );
! if ( retval != RTAPI_SUCCESS ) {
! rtapi_print( "sem master init: rtapi_task_new returned %d\n", retval );
return -1;
}
/* start the master task */
! retval = rtapi_task_start( master_task, master_code,
! 0, master_prio,
! MASTER_STACKSIZE,
! MASTER_PERIOD_NSEC, RTAPI_NOW,
! RTAPI_NO_FP );
if ( retval != RTAPI_SUCCESS ) {
rtapi_print("sem master init: rtapi_task_start returned %d\n", retval );
--- 60,72 ----
/* create the master task */
! master_task = rtapi_task_new(master_code, 0 /* arg */, master_prio,
! MASTER_STACKSIZE, RTAPI_NO_FP );
! if ( master_task < 0 ) {
! rtapi_print( "sem master init: rtapi_task_new returned %d\n", master_task );
return -1;
}
/* start the master task */
! retval = rtapi_task_start( master_task, MASTER_PERIOD_NSEC, RTAPI_NOW );
if ( retval != RTAPI_SUCCESS ) {
rtapi_print("sem master init: rtapi_task_start returned %d\n", retval );
***************
*** 87,92 ****
int retval;
! /* TESTING - intentionally fail to remove the task and the semaphore
! retval = rtapi_task_stop( master_task );
if ( retval != RTAPI_SUCCESS ) {
rtapi_print("sem master exit: rtapi_task_stop returned %d\n", retval );
--- 84,89 ----
int retval;
! /* TESTING - intentionally fail to remove the task and the semaphore */
! retval = rtapi_task_pause( master_task );
if ( retval != RTAPI_SUCCESS ) {
rtapi_print("sem master exit: rtapi_task_stop returned %d\n", retval );
***************
*** 103,107 ****
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);
--- 100,104 ----
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);
Index: slave.c
===================================================================
RCS file: /cvsroot/emc/rtapi/examples/semaphore/slave.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** slave.c 11 Aug 2003 04:58:39 -0000 1.6
--- slave.c 13 Aug 2003 05:55:07 -0000 1.7
***************
*** 11,15 ****
#include "common.h" /* master_sem */
! static rtapi_task_handle slave_task; /* the task structure */
static unsigned int slave_count = 0;
enum { SLAVE_STACKSIZE = 1024 }; /* how big the stack is */
--- 11,15 ----
#include "common.h" /* master_sem */
! static int slave_task; /* the task ID */
static unsigned int slave_count = 0;
enum { SLAVE_STACKSIZE = 1024 }; /* how big the stack is */
***************
*** 41,56 ****
/* create the slave task */
! retval = rtapi_task_new( &slave_task );
! if ( retval != RTAPI_SUCCESS ) {
! rtapi_print( "sem slave init: rtapi_task_new returned %d\n", retval );
return -1;
}
/* start the slave task */
! retval = rtapi_task_start( slave_task, slave_code,
! 0, slave_prio,
! SLAVE_STACKSIZE,
! 0 /* not periodic */, RTAPI_NOW,
! RTAPI_NO_FP );
if ( retval != RTAPI_SUCCESS ) {
rtapi_print("sem slave init: rtapi_task_start returned %d\n", retval );
--- 41,53 ----
/* create the slave task */
! slave_task = rtapi_task_new(slave_code, 0 /* arg */, slave_prio,
! SLAVE_STACKSIZE, RTAPI_NO_FP );
! if ( slave_task < 0 ) {
! rtapi_print( "sem slave init: rtapi_task_new returned %d\n", slave_task );
return -1;
}
/* start the slave task */
! retval = rtapi_task_resume(slave_task);
if ( retval != RTAPI_SUCCESS ) {
rtapi_print("sem slave init: rtapi_task_start returned %d\n", retval );
***************
*** 68,72 ****
int retval;
! retval = rtapi_task_stop( slave_task );
if ( retval != RTAPI_SUCCESS ) {
rtapi_print("sem slave exit: rtapi_task_stop returned %d\n", retval );
--- 65,69 ----
int retval;
! retval = rtapi_task_pause( slave_task );
if ( retval != RTAPI_SUCCESS ) {
rtapi_print("sem slave exit: rtapi_task_stop returned %d\n", retval );
|
