Changeset 3512

Timestamp:

04/27/07 17:25:14 (6 years ago)

Author:

ttsou

Message:

some sync stuff

Location:

platform/logService

Files:

• LogAdministrator_impl.cpp (modified) (1 diff)
• LogConsumer_impl.cpp (modified) (4 diffs)
• LogProducer_impl.cpp (modified) (1 diff)
• LogStatus_impl.cpp (modified) (1 diff)
• LogStatus_impl.h (modified) (2 diffs)

platform/logService/LogAdministrator_impl.cpp

@@ -14 +14 @@
 void LogAdministrator_impl::set_max_size(CORBA::ULongLong size)
 {
-    // Not true maximum
-    log_record_sequence->maximum(size);
+    // Needs defining 
+    return; 
 }
 

platform/logService/LogConsumer_impl.cpp

@@ -23 +23 @@
     // Return pointer is callers responsibilty to deallocate
     CosLwLog::LogRecordSequence* return_sequence;
+
+    // Good enough solution until log sequences get extrememly large
+    test_mutex->acquire();
     return_sequence = new CosLwLog::LogRecordSequence(*log_record_sequence);
+    test_mutex->release();
+
     return return_sequence;
 
@@ -32 +37 @@
     CORBA::ULong& howMany, const CosLwLog::LogLevelSequence& valueList)
 {
-    CosLwLog::LogRecordSequence* return_sequence;
-    return_sequence = new CosLwLog::LogRecordSequence(*log_record_sequence);
-    return return_sequence;
+    return LogConsumer_impl::retrieve_records(currentId, howMany);
 }
 
@@ -41 +44 @@
     CORBA::ULong& howMany, const CosLwLog::StringSeq& valueList)
 {
-    CosLwLog::LogRecordSequence* return_sequence;
-    return_sequence = new CosLwLog::LogRecordSequence(*log_record_sequence);
-    return return_sequence;
+    return LogConsumer_impl::retrieve_records(currentId, howMany);
 }
 
@@ -50 +51 @@
     CORBA::ULong& howMany, const CosLwLog::StringSeq& valueList)
 {
-    CosLwLog::LogRecordSequence* return_sequence;
-    return_sequence = new CosLwLog::LogRecordSequence(*log_record_sequence);
-    return return_sequence;
+    return LogConsumer_impl::retrieve_records(currentId, howMany);
 }
 

platform/logService/LogProducer_impl.cpp

@@ -46 +46 @@
 
     // Add entry to sequence
+    test_mutex->acquire();
     int indx = log_record_sequence->length();
     (*log_record_sequence)[indx] = newLogRecord;
+    test_mutex->release();
 }
 

platform/logService/LogStatus_impl.cpp

@@ -1 +1 @@
 #include "LogStatus_impl.h"
+
+#include <iostream>
 
 LogStatus_impl::LogStatus_impl()
 {
     // Lock this stuff later
+
+    test_mutex = new omni_mutex();
+
     log_record_sequence = new CosLwLog::LogRecordSequence(1000);
 

platform/logService/LogStatus_impl.h

@@ -4 +4 @@
 {
 
+private:
+
 protected:
+    omni_mutex *test_mutex;
+
     CosLwLog::LogRecordSequence* log_record_sequence;
     CosLwLog::OperationalState operational_state;
@@ -10 +14 @@
     CosLwLog::LogFullAction log_full_action;
     CosLwLog::AvailabilityStatus availability_status;
-
-/*
-    CosLwLog::OperationalState operationalState();
-    void operationalState(CosLwLog::OperationalState);
-
-    CosLwLog::AdministrativeState administrativeState();
-    void administrativeState(CosLwLog::AdministrativeState);
-
-    CosLwLog::LogFullAction logFullAction();
-    void logFullACtion(CosLwLog::LogFullAction);
-
-    CosLwLog::AvailabilityStatus ;
-    void availabilityStatus(CosLwLog::AvailabilityStatus);
-*/
 
 public: