Menu
▾
▴
[Emc-commit] rcslib/src/os_intf _timer.h,4.33,4.33.2.1 inetfile.hh,4.32,4.32.2.1 inifile.h,4.33,4.33.2.1 rcs_exit.hh,4.33,4.33.2.1 timer.hh,4.35,4.35.2.1
|
From: <wsh...@us...> - 2003-08-22 20:06:40
|
Update of /cvsroot/emc/rcslib/src/os_intf
In directory sc8-pr-cvs1:/tmp/cvs-serv3769/src/os_intf
Modified Files:
Tag: wps_multiplat_dev_branch
_timer.h inetfile.hh inifile.h rcs_exit.hh timer.hh
Log Message:
.
Index: _timer.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/os_intf/_timer.h,v
retrieving revision 4.33
retrieving revision 4.33.2.1
diff -C2 -d -r4.33 -r4.33.2.1
*** _timer.h 6 Sep 2001 14:32:55 -0000 4.33
--- _timer.h 22 Aug 2003 20:06:37 -0000 4.33.2.1
***************
*** 3,8 ****
#define _TIMER_H
- #include "rcs_defs.hh" /* RCS_EXPORT */
-
/* Useful time routines */
--- 3,6 ----
***************
*** 15,22 ****
/* number of seconds from standard epoch, to clock tick resolution */
! extern double RCS_EXPORT etime (void);
/* sleeps # of seconds, to clock tick resolution */
! extern void RCS_EXPORT esleep (double secs);
--- 13,20 ----
/* number of seconds from standard epoch, to clock tick resolution */
! extern double etime (void);
/* sleeps # of seconds, to clock tick resolution */
! extern void esleep (double secs);
Index: inetfile.hh
===================================================================
RCS file: /cvsroot/emc/rcslib/src/os_intf/inetfile.hh,v
retrieving revision 4.32
retrieving revision 4.32.2.1
diff -C2 -d -r4.32 -r4.32.2.1
*** inetfile.hh 6 May 2003 15:18:21 -0000 4.32
--- inetfile.hh 22 Aug 2003 20:06:37 -0000 4.32.2.1
***************
*** 4,8 ****
#define INETFILE_HH
- #include "rcs_defs.hh"
#ifdef __cplusplus
--- 4,7 ----
***************
*** 17,27 ****
#endif
! int RCS_EXPORT inet_file_init (const char *, char *, int debug);
! RCS_EXPORT int inet_file_exit ();
! RCS_EXPORT INET_FILE *inet_file_open (const char *url, char *);
! RCS_EXPORT int inet_file_close (INET_FILE *);
! RCS_EXPORT char *inet_file_gets (char *, int, INET_FILE *);
! RCS_EXPORT int inet_file_eof (INET_FILE *);
! int RCS_EXPORT inet_file_rewind (INET_FILE *);
--- 16,26 ----
#endif
! int inet_file_init (const char *, char *, int debug);
! int inet_file_exit ();
! INET_FILE *inet_file_open (const char *url, char *);
! int inet_file_close (INET_FILE *);
! char *inet_file_gets (char *, int, INET_FILE *);
! int inet_file_eof (INET_FILE *);
! int inet_file_rewind (INET_FILE *);
Index: inifile.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/os_intf/inifile.h,v
retrieving revision 4.33
retrieving revision 4.33.2.1
diff -C2 -d -r4.33 -r4.33.2.1
*** inifile.h 6 May 2003 15:18:21 -0000 4.33
--- inifile.h 22 Aug 2003 20:06:37 -0000 4.33.2.1
***************
*** 14,19 ****
*/
- #include "rcs_defs.hh"
-
#if (!defined(MSDOS) || defined(WIN32)) && !defined(linux)
#ifdef INIFILE_USE_INET_FILES
--- 14,17 ----
Index: rcs_exit.hh
===================================================================
RCS file: /cvsroot/emc/rcslib/src/os_intf/rcs_exit.hh,v
retrieving revision 4.33
retrieving revision 4.33.2.1
diff -C2 -d -r4.33 -r4.33.2.1
*** rcs_exit.hh 6 Sep 2001 14:32:55 -0000 4.33
--- rcs_exit.hh 22 Aug 2003 20:06:37 -0000 4.33.2.1
***************
*** 4,9 ****
#define RCS_EXIT_HH
- #include "rcs_defs.hh" // RCS_EXPORT
-
#ifdef __cplusplus
extern "C"
--- 4,7 ----
***************
*** 16,25 ****
// argument of a function.
#ifdef VXWORKS
! int RCS_EXPORT attach_rcs_exit_list (void *);
#else
! int RCS_EXPORT attach_rcs_exit_list (void (*fptr) (int));
#endif
! void RCS_EXPORT rcs_cleanup (int code);
! void RCS_EXPORT rcs_exit (int code);
#ifdef __cplusplus
--- 14,23 ----
// argument of a function.
#ifdef VXWORKS
! int attach_rcs_exit_list (void *);
#else
! int attach_rcs_exit_list (void (*fptr) (int));
#endif
! void rcs_cleanup (int code);
! void rcs_exit (int code);
#ifdef __cplusplus
Index: timer.hh
===================================================================
RCS file: /cvsroot/emc/rcslib/src/os_intf/timer.hh,v
retrieving revision 4.35
retrieving revision 4.35.2.1
diff -C2 -d -r4.35 -r4.35.2.1
*** timer.hh 30 Jan 2003 20:21:42 -0000 4.35
--- timer.hh 22 Aug 2003 20:06:37 -0000 4.35.2.1
***************
*** 2,22 ****
#ifndef TIMER_HH
#define TIMER_HH
- #include "rcs_defs.hh" /* RCS_EXPORT */
-
-
- extern "C"
- {
- #ifndef NO_STDIO
- #include <stdio.h> /* NULL */
- #endif
- }
extern "C"
{
/* number of seconds from standard epoch, to clock tick resolution */
! extern double RCS_EXPORT etime (void);
/* sleeps # of seconds, to clock tick resolution */
! extern void RCS_EXPORT esleep (double secs);
}
--- 2,13 ----
#ifndef TIMER_HH
#define TIMER_HH
extern "C"
{
/* number of seconds from standard epoch, to clock tick resolution */
! extern double etime (void);
/* sleeps # of seconds, to clock tick resolution */
! extern void esleep (double secs);
}
***************
*** 35,39 ****
/* prototype for user-defined timing function */
#ifndef sparcworks
! typedef int (*RCS_TIMERFUNC) (void *_arg = NULL);
#else
typedef int (*RCS_TIMERFUNC) (void *_arg);
--- 26,30 ----
/* prototype for user-defined timing function */
#ifndef sparcworks
! typedef int (*RCS_TIMERFUNC) (void *_arg = 0);
#else
typedef int (*RCS_TIMERFUNC) (void *_arg);
***************
*** 69,85 ****
obtain a time in system clock ticks from creation of the timer.
*/
! class RCS_EXPORT RCS_TIMER
{
public:
! /* Getting rid of this stuff which noone uses and makes porting more
! difficult */
RCS_TIMER (double timeout, RCS_TIMERFUNC function =
! (RCS_TIMERFUNC) NULL, void *arg = NULL);
! RCS_TIMER (char *process_name, char *timer_config_file);
! RCS_TIMER (double _timeout, char *process_name, char *timer_config_file);
/* timeout is wait interval, rounded up to clock tick resolution;
function is external time base, if provided */
! ~RCS_TIMER ();
int wait (); /* wait on synch; returns # of cycles missed */
double load (); /* returns % loading on timer, 0.0 means
--- 60,75 ----
obtain a time in system clock ticks from creation of the timer.
*/
! class RCS_TIMER
{
public:
!
RCS_TIMER (double timeout, RCS_TIMERFUNC function =
! (RCS_TIMERFUNC) 0, void *arg = 0);
! RCS_TIMER (char *process_name, char *timer_config_file);
! RCS_TIMER (double _timeout, char *process_name, char *timer_config_file);
/* timeout is wait interval, rounded up to clock tick resolution;
function is external time base, if provided */
! ~RCS_TIMER ();
int wait (); /* wait on synch; returns # of cycles missed */
double load (); /* returns % loading on timer, 0.0 means
|
