Changeset 3743

Timestamp:

05/08/07 17:37:41 (6 years ago)

Author:

balister

Message:

changes to fit JTAP

Location:

platform/logService

Files:

• CosLwLogAdministrator.idl (modified) (1 diff)
• CosLwLogConsumer.idl (modified) (1 diff)
• CosLwLogProducer.idl (modified) (1 diff)
• CosLwLogService.idl (modified) (1 diff)
• CosLwLogStatus.idl (modified) (1 diff)
• LogAdministrator_impl.cpp (modified) (3 diffs)
• LogAdministrator_impl.h (modified) (3 diffs)
• LogConsumer_impl.cpp (modified) (6 diffs)
• LogConsumer_impl.h (modified) (3 diffs)
• LogProducer_impl.cpp (modified) (3 diffs)
• LogProducer_impl.h (modified) (3 diffs)
• LogStatus_impl.cpp (modified) (2 diffs)
• LogStatus_impl.h (modified) (3 diffs)
• Log_impl.h (modified) (1 diff)
• Makefile (modified) (1 diff)
• main.cpp (modified) (3 diffs)

platform/logService/CosLwLogAdministrator.idl

@@ -8 +8 @@
 #endif
 
-module CosLwLog {
+module LogService {
     interface LogAdministrator : LogStatus {
         void set_max_size(in unsigned long long size)

platform/logService/CosLwLogConsumer.idl

@@ -8 +8 @@
 #endif
 
-module CosLwLog {
+module LogService {
     interface LogConsumer : LogStatus {
         RecordId get_record_id_from_time (in LogTime fromTime);

platform/logService/CosLwLogProducer.idl

@@ -8 +8 @@
 #endif
 
-module CosLwLog {
+module LogService {
     interface LogProducer : LogStatus {
     oneway void write_records(

platform/logService/CosLwLogService.idl

@@ -10 +10 @@
 #endif
 
-module CosLwLog
+module LogService 
 {
     interface Log : LogAdministrator, LogConsumer, LogProducer {};

platform/logService/CosLwLogStatus.idl

@@ -6 +6 @@
 #endif
 
-module CosLwLog {
+module LogService {
 
 //#ifndef _PRE_3_0_COMPILER_

platform/logService/LogAdministrator_impl.cpp

@@ -1 +1 @@
 #include "LogAdministrator_impl.h"
 
-void LogAdministrator_impl::set_max_size(CORBA::ULongLong size)
-    throw (CosLwLog::InvalidParam)
+void LogAdministrator_impl::setMaxSize(CORBA::ULongLong size)
+    throw (LogService::InvalidParam)
 {
     //
@@ -10 +10 @@
     // Assume zero max_length logs are invalid
     //
+    // Bad assumption, JTAP tests for 0 length log.
+    //
 
-    if (size < 1) {
-        throw CosLwLog::InvalidParam("Log size must be greater than 0");
+    if (size < 0) {
+        throw LogService::InvalidParam("Log size cannot be negative");
     }
 
@@ -31 +33 @@
 }
 
-void LogAdministrator_impl::set_log_full_action(CosLwLog::LogFullAction action)
+void LogAdministrator_impl::setLogFullAction(LogService::LogFullAction action)
 {
     log_full_action = action;
 }
 
-void LogAdministrator_impl::set_administrative_state(
-    CosLwLog::AdministrativeState state)
+void LogAdministrator_impl::setAdministrativeState(
+    LogService::AdministrativeState state)
 {
     administrative_state = state;
     
-    if (administrative_state == CosLwLog::locked) {
+    if (administrative_state == LogService::locked) {
        availability_status.off_duty = true;
     }
-    else if (administrative_state == CosLwLog::unlocked && 
-             operational_state == CosLwLog::enabled) {
+    else if (administrative_state == LogService::unlocked && 
+             operational_state == LogService::enabled) {
         availability_status.off_duty = false;
     }
 }
 
-void LogAdministrator_impl::clear_log()
+void LogAdministrator_impl::clearLog()
 {
     //

platform/logService/LogAdministrator_impl.h

@@ -1 @@
-#include "CosLwLogAdministrator.h"
+#include "LogServiceAdministrator.h"
 
 #ifndef LOGSTATUS_IMPL_H
@@ -6 +6 @@
 #endif
 
-class LogAdministrator_impl : public virtual POA_CosLwLog::LogAdministrator,
+class LogAdministrator_impl : public virtual POA_LogService::LogAdministrator,
                               public virtual LogStatus_impl
 {
@@ -17 +17 @@
     ~LogAdministrator_impl();
 
-    void set_max_size(CORBA::ULongLong size)
-        throw (CosLwLog::InvalidParam);
-    void set_log_full_action(CosLwLog::LogFullAction action);
-    void set_administrative_state(CosLwLog::AdministrativeState state);
-    void clear_log();
+    void setMaxSize(CORBA::ULongLong size)
+        throw (LogService::InvalidParam);
+    void setLogFullAction(LogService::LogFullAction action);
+    void setAdministrativeState(LogService::AdministrativeState state);
+    void clearLog();
     void destroy();
 

platform/logService/LogConsumer_impl.cpp

@@ -1 +1 @@
 #include "LogConsumer_impl.h"
 
-CosLwLog::RecordId
-LogConsumer_impl::get_record_id_from_time(const CosLwLog::LogTime& fromTime)
+LogService::RecordId
+LogConsumer_impl::getRecordIdFromTime(const LogService::LogTime& fromTime)
 {
     //
@@ -11 +11 @@
 }
 
-CosLwLog::LogRecordSequence*
-LogConsumer_impl::retrieve_records(CosLwLog::RecordId& currentId, CORBA::ULong&
+LogService::LogRecordSequence*
+LogConsumer_impl::retrieveRecords(LogService::RecordId& currentId, CORBA::ULong&
     howMany)
 {
@@ -22 +22 @@
     // 
 
-    CosLwLog::LogRecordSequence* return_sequence;
+    LogService::LogRecordSequence* return_sequence;
 
     test_mutex->acquire();
 
-    return_sequence = new CosLwLog::LogRecordSequence(*log_record_sequence);
+    return_sequence = new LogService::LogRecordSequence(*log_record_sequence);
     return_sequence->length(log_record_size);
 
@@ -34 +34 @@
 }
 
-CosLwLog::LogRecordSequence* 
-LogConsumer_impl::retrieve_records_by_level(CosLwLog::RecordId& currentId,
-    CORBA::ULong& howMany, const CosLwLog::LogLevelSequence& valueList)
+LogService::LogRecordSequence* 
+LogConsumer_impl::retrieveRecordsByLevel(LogService::RecordId& currentId,
+    CORBA::ULong& howMany, const LogService::LogLevelSequence& valueList)
 {
     //
@@ -45 +45 @@
 }
 
-CosLwLog::LogRecordSequence* 
-LogConsumer_impl::retrieve_records_by_producer_id(CosLwLog::RecordId& currentId, 
-    CORBA::ULong& howMany, const CosLwLog::StringSeq& valueList)
+LogService::LogRecordSequence* 
+LogConsumer_impl::retrieveRecordsByProducerId(LogService::RecordId& currentId, 
+    CORBA::ULong& howMany, const LogService::StringSeq& valueList)
 {
     //
@@ -56 +56 @@
 }
 
-CosLwLog::LogRecordSequence* 
-LogConsumer_impl::retrieve_records_by_producer_name(CosLwLog::RecordId& currentId, 
-    CORBA::ULong& howMany, const CosLwLog::StringSeq& valueList)
+LogService::LogRecordSequence* 
+LogConsumer_impl::retrieveRecordsByProducerName(LogService::RecordId& currentId, 
+    CORBA::ULong& howMany, const LogService::StringSeq& valueList)
 {
     //

platform/logService/LogConsumer_impl.h

@@ -1 @@
-#include "CosLwLogConsumer.h"
+#include "LogServiceConsumer.h"
 
 #ifndef LOGSTATUS_IMPL_H
@@ -6 +6 @@
 #endif
 
-class LogConsumer_impl : public virtual POA_CosLwLog::LogConsumer,
+class LogConsumer_impl : public virtual POA_LogService::LogConsumer,
                          public virtual LogStatus_impl
 {
@@ -17 +17 @@
     ~LogConsumer_impl();
 
-    CosLwLog::RecordId get_record_id_from_time(const CosLwLog::LogTime&
+    LogService::RecordId getRecordIdFromTime(const LogService::LogTime&
         fromTime);
 
-    CosLwLog::LogRecordSequence* retrieve_records(CosLwLog::RecordId& currentId,
+    LogService::LogRecordSequence* retrieveRecords(LogService::RecordId& currentId,
         CORBA::ULong& howMany);
 
-    CosLwLog::LogRecordSequence* retrieve_records_by_level(CosLwLog::RecordId&
-        currentId, CORBA::ULong& howMany, const CosLwLog::LogLevelSequence&
+    LogService::LogRecordSequence* retrieveRecordsByLevel(LogService::RecordId&
+        currentId, CORBA::ULong& howMany, const LogService::LogLevelSequence&
         valueList);
 
-    CosLwLog::LogRecordSequence* retrieve_records_by_producer_id(
-        CosLwLog::RecordId& currentId, CORBA::ULong& howMany, const
-        CosLwLog::StringSeq& valueList);
+    LogService::LogRecordSequence* retrieveRecordsByProducer_id(
+        LogService::RecordId& currentId, CORBA::ULong& howMany, const
+        LogService::StringSeq& valueList);
 
-    CosLwLog::LogRecordSequence* retrieve_records_by_producer_name(
-        CosLwLog::RecordId& currentId, CORBA::ULong& howMany, const
-        CosLwLog::StringSeq& valueList);
+    LogService::LogRecordSequence* retrieveRecordsByProducerName(
+        LogService::RecordId& currentId, CORBA::ULong& howMany, const
+        LogService::StringSeq& valueList);
 };

platform/logService/LogProducer_impl.cpp

@@ -4 +4 @@
 
 void 
-LogProducer_impl::write_records(const CosLwLog::ProducerLogRecordSequence& 
+LogProducer_impl::write_records(const LogService::ProducerLogRecordSequence& 
     records)
 {
@@ -13 +13 @@
 
 void
-LogProducer_impl::write_record(const CosLwLog::ProducerLogRecord& record)
+LogProducer_impl::write_record(const LogService::ProducerLogRecord& record)
 {
     if (!availability_status.off_duty) {
@@ -24 +24 @@
         }
 
-        CosLwLog::LogTime time;
+        LogService::LogTime time;
         time.seconds = tv.tv_sec;
         time.nanoseconds = tv.tv_usec * 1000;
   
         // Assign unique 64bit id
-        CosLwLog::RecordId id = currentId++;
+        LogService::RecordId id = currentId++;
   
         // Create new log entry
-        CosLwLog::LogRecord newLogRecord;
+        LogService::LogRecord newLogRecord;
         newLogRecord.id = id;
         newLogRecord.time = time; 

platform/logService/LogProducer_impl.h

@@ -1 @@
-#include <CosLwLogProducer.h>
+#include <LogServiceProducer.h>
 
 #ifndef LOGSTATUS_IMPL_H
@@ -6 +6 @@
 #endif
 
-class LogProducer_impl : public virtual POA_CosLwLog::LogProducer, 
+class LogProducer_impl : public virtual POA_LogService::LogProducer, 
                          public virtual LogStatus_impl
 {
@@ -16 +16 @@
     ~LogProducer_impl();
 
-    void write_records(const CosLwLog::ProducerLogRecordSequence& records);
-    void write_record(const CosLwLog::ProducerLogRecord& record);
+    void write_records(const LogService::ProducerLogRecordSequence& records);
+    void write_record(const LogService::ProducerLogRecord& record);
 
 };

platform/logService/LogStatus_impl.cpp

@@ -16 +16 @@
     log_record_max_size = max_size;
 
-    log_record_sequence = new CosLwLog::LogRecordSequence();
+    log_record_sequence = new LogService::LogRecordSequence();
     log_record_sequence->length(max_size);
 
-    operational_state = CosLwLog::enabled;
-    administrative_state = CosLwLog::unlocked;
-    log_full_action = CosLwLog::HALT;
+    operational_state = LogService::enabled;
+    administrative_state = LogService::unlocked;
+    log_full_action = LogService::HALT;
 
     availability_status.off_duty = 0;
@@ -41 +41 @@
 }
 
-unsigned long long LogStatus_impl::get_max_size()
+unsigned long long LogStatus_impl::getMaxSize()
 {
-    return log_record_max_size;
+    unsigned long long returnSize = log_record_max_size;
+    return returnSize;
 }
 
-unsigned long long LogStatus_impl::get_current_size()
+unsigned long long LogStatus_impl::getCurrentSize()
 {
     return log_record_size;
 }
 
-unsigned long long LogStatus_impl::get_n_records()
+unsigned long long LogStatus_impl::getNumRecords()
 {
-    // Figure what this should do
-    return 0;
+    unsigned long long returnVal = log_record_size;
+    return returnVal;
 }
 
-CosLwLog::LogFullAction LogStatus_impl::get_log_full_action()
+LogService::LogFullAction LogStatus_impl::getLogFullAction()
 {
     return log_full_action;
 }
 
-CosLwLog::AvailabilityStatus LogStatus_impl::get_availability_status()
+LogService::AvailabilityStatus LogStatus_impl::getAvailabilityStatus()
 {
-    return availability_status;
+    std::cout << "In getAvailabilityStatus()" << std::endl;
+
+    LogService::AvailabilityStatus returnStatus = availability_status;
+    return returnStatus;
 }
 
-CosLwLog::AdministrativeState LogStatus_impl::get_administrative_state()
+LogService::AdministrativeState LogStatus_impl::getAdministrativeState()
 {
     return administrative_state;
 }
 
-CosLwLog::OperationalState LogStatus_impl::get_operational_state()
+LogService::OperationalState LogStatus_impl::getOperationalState()
 {
     return operational_state;

platform/logService/LogStatus_impl.h

@@ -1 @@
-#include "CosLwLogStatus.h"
+#include "LogServiceStatus.h"
 
 #define MAX_SIZE_DEFAULT 1000
 
-class LogStatus_impl : public virtual POA_CosLwLog::LogStatus
+class LogStatus_impl : public virtual POA_LogService::LogStatus
 {
 
@@ -11 +11 @@
     omni_mutex *test_mutex;
 
-    CosLwLog::LogRecordSequence* log_record_sequence;
-    CosLwLog::OperationalState operational_state;
-    CosLwLog::AdministrativeState administrative_state;
-    CosLwLog::LogFullAction log_full_action;
-    CosLwLog::AvailabilityStatus availability_status;
+    LogService::LogRecordSequence* log_record_sequence;
+    LogService::OperationalState operational_state;
+    LogService::AdministrativeState administrative_state;
+    LogService::LogFullAction log_full_action;
+    LogService::AvailabilityStatus availability_status;
 
     unsigned int log_record_max_size;
@@ -26 +26 @@
     ~LogStatus_impl();
 
-    unsigned long long get_max_size();
-    unsigned long long get_current_size();
-    unsigned long long get_n_records();
-    CosLwLog::LogFullAction get_log_full_action();
-    CosLwLog::AdministrativeState get_administrative_state();
-    CosLwLog::AvailabilityStatus get_availability_status();
-    CosLwLog::OperationalState get_operational_state();
+    unsigned long long getMaxSize();
+    unsigned long long getCurrentSize();
+    unsigned long long getNumRecords();
+    LogService::LogFullAction getLogFullAction();
+    LogService::AdministrativeState getAdministrativeState();
+    LogService::AvailabilityStatus getAvailabilityStatus();
+    LogService::OperationalState getOperationalState();
 
 };

platform/logService/Log_impl.h

@@ -3 +3 @@
 #include "LogConsumer_impl.h"
 
-#include "CosLwLogService.h"
+#include "LogService.h"
 
-struct Log_impl : public POA_CosLwLog::Log,
+struct Log_impl : public POA_LogService::Log,
                   public LogProducer_impl,
                   public LogAdministrator_impl,

platform/logService/Makefile

@@ -1 +1 @@
 CFLAGS = -Wall
-SOURCES = LogStatus_impl.cpp LogProducer_impl.cpp LogConsumer_impl.cpp LogAdministrator_impl.cpp Log_impl.cpp main.cpp CosLwLogStatusSK.cpp CosLwLogProducerSK.cpp CosLwLogConsumerSK.cpp CosLwLogAdministratorSK.cpp CosLwLogServiceSK.cpp
-LIBS = -lomniORB4 -lossieidl
+SOURCES = LogStatus_impl.cpp LogProducer_impl.cpp LogConsumer_impl.cpp LogAdministrator_impl.cpp Log_impl.cpp main.cpp LogServiceStatusSK.cpp LogServiceProducerSK.cpp LogServiceConsumerSK.cpp LogServiceAdministratorSK.cpp LogServiceSK.cpp cfSK.cpp
+LIBS = -lomniORB4 
 INCLUDE = -I.
 

platform/logService/main.cpp

@@ -1 +1 @@
 #include "Log_impl.h"
-#include "ossie/cf.h"
+#include "cf.h"
 
 #include <iostream>
@@ -24 +24 @@
     Log_impl* log_servant = new Log_impl(1000);
     PortableServer::ObjectId_var log_id = poa->activate_object(log_servant);
-    CosLwLog::Log_var log_var = log_servant->_this();
+    LogService::Log_ptr log_ptr = log_servant->_this();
 
     CosNaming::Name_var cosName = rootContext->to_name("DomainName1/Log");
-    rootContext->rebind(cosName, log_var);
+    rootContext->rebind(cosName, log_ptr);
 
     PortableServer::POAManager_var pman = poa->the_POAManager();
@@ -58 +58 @@
 
     std::cout << "Calling registerService on DeviceaManager" << std::endl;
-    deviceManager->registerService(log_var, "Log");
+    deviceManager->registerService(log_ptr, "Log");
+    std::cout << "Service registered" << std::endl;
+
+    std::cout << orb->object_to_string(log_ptr) << std::endl;
 
     //