Updated LinuxTimer component name

Author: timcanham

Svc/LinuxTimer/CMakeLists.txt

@@ -11,28 +11,28 @@ restrict_platforms(Linux Darwin)
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
 	set(SOURCE_FILES
 		"${CMAKE_CURRENT_LIST_DIR}/LinuxTimer.fpp"
-		"${CMAKE_CURRENT_LIST_DIR}/LinuxTimerComponentImplTaskDelay.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/LinuxTimerComponentImplCommon.cpp"
+		"${CMAKE_CURRENT_LIST_DIR}/LinuxTimerTaskDelay.cpp"
+		"${CMAKE_CURRENT_LIST_DIR}/LinuxTimerCommon.cpp"
 	)
 elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
 	set(SOURCE_FILES
 		"${CMAKE_CURRENT_LIST_DIR}/LinuxTimer.fpp"
-		"${CMAKE_CURRENT_LIST_DIR}/LinuxTimerComponentImplTimerFd.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/LinuxTimerComponentImplCommon.cpp"
+		"${CMAKE_CURRENT_LIST_DIR}/LinuxTimerFd.cpp"
+		"${CMAKE_CURRENT_LIST_DIR}/LinuxTimerCommon.cpp"
 	)
 else()
 	set(SOURCE_FILES
 		"${CMAKE_CURRENT_LIST_DIR}/LinuxTimer.fpp"
-		"${CMAKE_CURRENT_LIST_DIR}/LinuxTimerComponentImplCommon.cpp"
+		"${CMAKE_CURRENT_LIST_DIR}/LinuxTimerCommon.cpp"
 	)
 endif()
 
 register_fprime_module()
 
-set(UT_SOURCE_FILES
-	"${CMAKE_CURRENT_LIST_DIR}/LinuxTimer.fpp"
-  "${CMAKE_CURRENT_LIST_DIR}/test/ut/LinuxTimerTester.cpp"
-  "${CMAKE_CURRENT_LIST_DIR}/test/ut/main.cpp"
-)
+# set(UT_SOURCE_FILES
+# 	"${CMAKE_CURRENT_LIST_DIR}/LinuxTimer.fpp"
+#   "${CMAKE_CURRENT_LIST_DIR}/test/ut/LinuxTimerTester.cpp"
+#   "${CMAKE_CURRENT_LIST_DIR}/test/ut/main.cpp"
+# )
 
-register_fprime_ut()
+# register_fprime_ut()

Svc/LinuxTimer/LinuxTimer.hpp

@@ -1,17 +1,60 @@
 // ======================================================================
-// LinuxTimer.hpp
-// Standardization header for LinuxTimer
+// \title  LinuxTimerImpl.hpp
+// \author tim
+// \brief  hpp file for LinuxTimer component implementation class
+//
+// \copyright
+// Copyright 2009-2015, by the California Institute of Technology.
+// ALL RIGHTS RESERVED.  United States Government Sponsorship
+// acknowledged.
+//
 // ======================================================================
 
-#ifndef Svc_LinuxTimer_HPP
-#define Svc_LinuxTimer_HPP
+#ifndef LinuxTimer_HPP
+#define LinuxTimer_HPP
 
-#include "Svc/LinuxTimer/LinuxTimerComponentImpl.hpp"
+#include "Os/Mutex.hpp"
+#include "Svc/LinuxTimer/LinuxTimerComponentAc.hpp"
 
 namespace Svc {
 
-  using LinuxTimer = LinuxTimerComponentImpl;
+  class LinuxTimer final :
+    public LinuxTimerComponentBase
+  {
 
-}
+    public:
+
+      // ----------------------------------------------------------------------
+      // Construction, initialization, and destruction
+      // ----------------------------------------------------------------------
+
+      //! Construct object LinuxTimer
+      //!
+      LinuxTimer(
+          const char *const compName /*!< The component name*/
+      );
+
+      //! Destroy object LinuxTimer
+      //!
+      ~LinuxTimer();
+
+      //! Start timer
+      void startTimer(FwSizeType interval); //!< interval in milliseconds
+
+      //! Quit timer
+      void quit();
+
+    PRIVATE:
+
+      Os::Mutex m_mutex; //!< mutex for quit flag
+
+      volatile bool m_quit; //!< flag to quit
+
+      Os::RawTime m_rawTime; //!< timestamp to pass to CycleOut port calls
+
+
+    };
+
+} // end namespace Svc
 
 #endif

Svc/LinuxTimer/LinuxTimerComponentImplCommon.cpp renamed to Svc/LinuxTimer/LinuxTimerCommon.cpp

@@ -11,7 +11,7 @@
 // ======================================================================
 
 
-#include <Svc/LinuxTimer/LinuxTimerComponentImpl.hpp>
+#include <Svc/LinuxTimer/LinuxTimer.hpp>
 #include <Fw/FPrimeBasicTypes.hpp>
 
 namespace Svc {
@@ -20,22 +20,22 @@ namespace Svc {
   // Construction, initialization, and destruction
   // ----------------------------------------------------------------------
 
-  LinuxTimerComponentImpl ::
-    LinuxTimerComponentImpl(
+  LinuxTimer ::
+    LinuxTimer(
         const char *const compName
     ) : LinuxTimerComponentBase(compName),
         m_quit(false)
   {
 
   }
 
-  LinuxTimerComponentImpl ::
-    ~LinuxTimerComponentImpl()
+  LinuxTimer ::
+    ~LinuxTimer()
   {
 
   }
 
-  void LinuxTimerComponentImpl::quit() {
+  void LinuxTimer::quit() {
       this->m_mutex.lock();
       this->m_quit = true;
       this->m_mutex.unLock();

Svc/LinuxTimer/LinuxTimerComponentImpl.hpp

@@ -11,7 +11,7 @@
 // ======================================================================
 
 #include <Fw/Logger/Logger.hpp>
-#include <Svc/LinuxTimer/LinuxTimerComponentImpl.hpp>
+#include <Svc/LinuxTimer/LinuxTimer.hpp>
 #include <Fw/FPrimeBasicTypes.hpp>
 #include <sys/timerfd.h>
 #include <unistd.h>
@@ -20,7 +20,7 @@
 
 namespace Svc {
 
-  void LinuxTimerComponentImpl::startTimer(FwSizeType interval) {
+  void LinuxTimer::startTimer(FwSizeType interval) {
       int fd;
       struct itimerspec itval;
 

Svc/LinuxTimer/LinuxTimerComponentImplTimerFd.cpp renamed to Svc/LinuxTimer/LinuxTimerFd.cpp

@@ -11,13 +11,13 @@
 // ======================================================================
 
 
-#include <Svc/LinuxTimer/LinuxTimerComponentImpl.hpp>
+#include <Svc/LinuxTimer/LinuxTimer.hpp>
 #include <Fw/FPrimeBasicTypes.hpp>
 #include <Os/Task.hpp>
 
 namespace Svc {
 
-  void LinuxTimerComponentImpl::startTimer(FwSizeType interval) {
+  void LinuxTimer::startTimer(FwSizeType interval) {
       FW_ASSERT(std::numeric_limits<U32>::max()/1000 >= interval); // Overflow
       while (true) {
           Os::Task::delay(Fw::TimeInterval(static_cast<U32>(interval/1000), static_cast<U32>((interval % 1000) * 1000)));