Changeset 2251

Timestamp:

11/21/06 19:27:55 (7 years ago)

Author:

balister

Message:

Improve File input component.

Location:

components/FileInput/trunk/FileInput

Files:

• FileInput.cpp (modified) (9 diffs)
• FileInput.h (modified) (4 diffs)
• FileInput.prf.xml (modified) (1 diff)
• FileInput.scd.xml (modified) (1 diff)
• configure.ac (modified) (1 diff)
• main.cpp (modified) (4 diffs)

components/FileInput/trunk/FileInput/FileInput.cpp

@@ -26 +26 @@
 #include <fstream>
 
+#include <math.h>
+
+#ifdef HAVE_ERRNO_H
+#include <errno.h>
+#endif
+
 #include <omnithread.h>
 
@@ -32 +38 @@
 #include "ossie/Resource_impl.h"
 
-FileInput_i::FileInput_i(const char *uuid, omni_condition *condition) : Resource_impl(uuid), component_running(condition), num_blocks(-1), file_repeat(1), inter_packet_time(0.0)
+                                FileInput_i::FileInput_i(const char *uuid, omni_condition *condition) : Resource_impl(uuid), component_running(condition), thread_started(false), num_blocks(-1), file_repeat(1)
 {
     dataOut = new standardInterfaces_i::complexShort_u("DataOut");
@@ -47 +53 @@
     if (!CORBA::is_nil(p))
         return p._retn();
+
+    if (strcmp(portName, "Resource") == 0)
+        return CORBA::Object::_duplicate(myObjectRef);
 
     /*exception*/
@@ -59 +68 @@
     processing_thread = new omni_thread(do_run_data_send, (void *) this);
     processing_thread->start();
+
+    thread_started = true;
 }
 
@@ -64 +75 @@
 {  
     std::cout << "stop called on FileInput" << std::endl;
+
+    thread_started = false;
 }
 
@@ -98 +111 @@
         // num_blocks, unsigned long 
         else if (strcmp(props[i].id, "DCE:019fd89f-589f-4714-8d33-57f108d7d004") == 0) {
-            CORBA::ULong val;
+            CORBA::Long val;
             props[i].value >>= val;
 
@@ -111 +124 @@
             omni_mutex_lock l(accessPrivateData);
             file_repeat = val;
+            std::cout << "File repeat = " << file_repeat << std::endl;
         }
         // inter_packet_time, float
@@ -118 +132 @@
 
             omni_mutex_lock l(accessPrivateData);
-            inter_packet_time = val;
+            packetDelay.tv_sec = (time_t) floor(val);
+            packetDelay.tv_nsec = ((long) (val - floor(val))) * 10^9;
         }
     }
@@ -127 +142 @@
     std::cout << "FileInput process_data thread started" << std::endl;
 
-    // read in file size by parsing entire file
-    int i, k, file_size(0), num_loops(1);
-
-    float I, Q;
-
-    std::fstream file;
-    file.open("inputdata.txt", std::ios::in);
-    file.setf(std::ios_base::scientific);
+    // read data from file
+    unsigned int file_size(0);
+
+    struct timespec delayTime(packetDelay);
+
+    std::ifstream fin(fileName.c_str());
 
     // TODO: check if file exists!
+
+    PortTypes::ShortSequence I, Q;
 
     while ( true )
     {
-        file >> i;
-        file >> k;
-
-        if ( file.eof() )
+        short d, q;
+
+        fin >> d >> q;
+
+        if ( fin.eof() )
             break;
 
-        std::cout << "input file: " << i << "    " << k << std::endl;
+        std::cout << "input file: " << d << "    " << q << std::endl;
+        I.length(file_size + 1);
+        Q.length(file_size + 1);
+        I[file_size] = d;
+        Q[file_size] = q;
         file_size++;
     }
-    file.close();
-    std::cout << "File has " << file_size << " I/Q pairs" << std::endl;
-
+    fin.close();
+    std::cout << "File contained " << file_size << " I/Q pairs" << std::endl;
+
+    // prepare output sequences
     PortTypes::ShortSequence I_out, Q_out;
-    I_out.length(file_size);
-    Q_out.length(file_size);
-
-    k=0;
-    while( true )
+    
+    std::cout << "Ouput sequence length = " << file_size * file_repeat << std::endl;
+
+    I_out.length(file_size * file_repeat);
+    Q_out.length(file_size * file_repeat);
+
+
+    for (unsigned int i = 0; i < file_repeat; ++i) {
+        for (unsigned int j = 0; j < file_size; ++j) {
+            I_out[i * file_size + j] = I[j];
+            Q_out[i * file_size + j] = Q[j];
+        }
+    }
+
+    std::cout << "About to send data." << std::endl;
+
+    // send output sequences num_block times
+    int k(num_blocks);
+    while( thread_started )
     {
-        // std::cout << "Reading data stream from file..." << std::endl;
-
-        file.open("inputdata.txt", std::ios::in);
-    file.setf(std::ios_base::scientific);
-        if ( !file )
-        {
-            std::cout << "ERROR! could not open file!" << std::endl;
-            break;
-        }
-
-        i = 0;
-        while( i<file_size )
-        {
-            file >> I;
-            file >> Q;
-            (I_out)[i] = (short) I;
-            (Q_out)[i] = (short) Q;
-            i++;
-        }
-        
-        file.close();
-        //std::cout << "FileInput pushing " << i << " samples" << std::endl;
         dataOut->pushPacket(I_out, Q_out);
         
-        k++;
-        if (k == num_loops)
-            break;
-    }
-}
-
-    
+        if (k > 0)
+            if (--k == 0)
+                break;
+
+        bool done;
+        struct timespec rem;
+        while (!done) {
+            int ret = nanosleep(&delayTime, &rem);
+
+            if (ret == EINTR)
+                delayTime = rem;
+            else
+                done = true;
+        }
+    }
+
+    processing_thread->exit();
+
+}
+
+    

components/FileInput/trunk/FileInput/FileInput.h

@@ -25 +25 @@
 #define FILEINPUT_IMPL_H
 
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_TIME_H
+#include <time.h>
+#endif
+
 #include "ossie/cf.h"
 
@@ -43 +49 @@
         FileInput_i(const char *uuid, omni_condition *sem);
 
+        void post_constructor(CF::Resource_ptr ref) { myObjectRef = ref; };
         static void do_run_data_send(void *data) { ((FileInput_i *)data)->run_data_send(); };
 
@@ -62 +69 @@
         void run_data_send();
 
+        CF::Resource_var myObjectRef;
+
         omni_condition *component_running;  //for component shutdown
         omni_thread *processing_thread;     //for component writer function
         omni_mutex accessPrivateData;           // for access to private data
+
+        bool thread_started;
 
         // Values from properties
@@ -70 +81 @@
         unsigned long num_blocks;
         unsigned long file_repeat;
-        float inter_packet_time;
+        struct timespec packetDelay;
         
         //list components provides and uses ports
         standardInterfaces_i::complexShort_u *dataOut;
-        
+
 };
 #endif

components/FileInput/trunk/FileInput/FileInput.prf.xml

@@ -9 +9 @@
         <kind kindtype="configure"/>
     </simple>
-    <simple type="ulong" id="DCE:019fd89f-589f-4714-8d33-57f108d7d004" name="num_blocks" mode="readonly">
+    <simple type="long" id="DCE:019fd89f-589f-4714-8d33-57f108d7d004" name="num_blocks" mode="readonly">
         <description>Number of blocks of data to send.  Enter a negative number for infinite looping.</description> 
         <value>-1</value> 
         <kind kindtype="configure"/>
     </simple>
-    <simple type="short" id="DCE:23882924-7988-11db-9fc2-00123f573a7f" name="file_repeat" mode="readonly">
+    <simple type="ulong" id="DCE:23882924-7988-11db-9fc2-00123f573a7f" name="file_repeat" mode="readonly">
         <description>Number of times to repeat the file contents per output packet.</description> 
         <value>1</value> 

components/FileInput/trunk/FileInput/FileInput.scd.xml

@@ -14 +14 @@
         <supportsinterface supportsname="TestableObject" repid="IDL:CF/TestableObject:1.0"/>
         <ports>
+            <provides providesname="Resource" repid="IDL:CF/Resource:1.0">
+                <porttype type="data"/>
+            </provides>
             <uses usesname="DataOut" repid="IDL:standardInterfaces/complexShort:1.0">
                 <porttype type="data"/>

components/FileInput/trunk/FileInput/configure.ac

@@ -9 +9 @@
 
 AC_HEADER_SYS_WAIT
+AC_CHECK_HEADERS(time.h)
+AC_CHECK_HEADERS(errno.h)
 
 AC_FUNC_FORK

components/FileInput/trunk/FileInput/main.cpp

@@ -26 +26 @@
 #include "FileInput.h"
 
-using namespace std;
-using namespace standardInterfaces;  // For standard OSSIE interface classes
-
-
 int main(int argc, char* argv[])
 
@@ -38 +34 @@
 
     if (argc != 3) {
-        cout << argv[0] << " <id> <usage name> " << endl;
+        std::cout << argv[0] << " <id> <usage name> " << std::endl;
         exit (-1);
     }
@@ -45 +41 @@
     char *label = argv[2];
 
-    cout << "Identifier - " << uuid << "  Label - " << label << endl;
+    std::cout << "Identifier - " << uuid << "  Label - " << label << std::endl;
 
     FileInput_i* fileinput_servant;
@@ -54 +50 @@
     fileinput_servant = new FileInput_i(uuid, component_running);
     fileinput_var = fileinput_servant->_this();
+    fileinput_servant->post_constructor(fileinput_var);
 
     orb->bind_object_to_name((CORBA::Object_ptr) fileinput_var, label);