Experimental Physics and
Industrial Control System

Till Straumann <[email protected]> · Mon, 09 Feb 2009 13:51:36 -0800

Vanilla 3.14.10 still doesn't initialize the time-related
variables correctly when run-time loading an EPICS application.

The attached patch below should fix this.

HTH
-- Till

Index: src/libCom/osi/os/RTEMS/osdTime.cpp
===================================================================
RCS file: /afs/slac/g/lcls/cvs/epics/base/3.14.10/src/libCom/osi/os/RTEMS/osdTime.cpp,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 osdTime.cpp
*** src/libCom/osi/os/RTEMS/osdTime.cpp	11 Jan 2009 02:33:42 -0000	1.1.1.1
--- src/libCom/osi/os/RTEMS/osdTime.cpp	6 Feb 2009 23:35:37 -0000
***************
*** 27,32 ****
--- 27,33 ----

  extern rtems_interval rtemsTicksPerSecond;
  int rtems_bsdnet_get_ntp(int, int(*)(), struct timespec *);
+ extern int rtems_bsdnet_ticks_per_second;
  static int ntpSocket = -1;

  void osdTimeRegister(void)
***************
*** 116,132 ****
   * explicitly calls osdTimeRegister() at the appropriate time.
   * However if we are loaded dynamically we *do* register our
   * standard time providers at static constructor time; in this
!  * case the tick rate will have been set already.
   */
  static int staticTimeRegister(void)
  {
-     if (rtemsTicksPerSecond != 0)
-         osdTimeRegister();
- 
      rtems_clock_get (RTEMS_CLOCK_GET_TICKS_PER_SECOND, &rtemsTicksPerSecond);
      rtemsTicksPerSecond_double = rtemsTicksPerSecond;
      rtemsTicksPerTwoSeconds_double = rtemsTicksPerSecond_double * 2.0;

      return 1;
  }
  static int done = staticTimeRegister();
--- 117,133 ----
   * explicitly calls osdTimeRegister() at the appropriate time.
   * However if we are loaded dynamically we *do* register our
   * standard time providers at static constructor time; in this
!  * case the bsdnet tick rate will have been set already.
   */
  static int staticTimeRegister(void)
  {
      rtems_clock_get (RTEMS_CLOCK_GET_TICKS_PER_SECOND, &rtemsTicksPerSecond);
      rtemsTicksPerSecond_double = rtemsTicksPerSecond;
      rtemsTicksPerTwoSeconds_double = rtemsTicksPerSecond_double * 2.0;

+     if (rtems_bsdnet_ticks_per_second != 0)
+         osdTimeRegister();
+ 
      return 1;
  }
  static int done = staticTimeRegister();

Experimental Physics and Industrial Control System

Experimental Physics and
Industrial Control System