Changeset 9912

Timestamp:

02/22/10 20:27:35 (3 years ago)

Author:

shereef

Message:

fixed data type code gen for unsigned and missing types

Location:

ossiedev/trunk/tools/WaveDev

Files:

• wavedev.cfg (modified) (2 diffs)
• wavedev/Makefile.am (modified) (1 diff)
• wavedev/cfg.py (modified) (1 diff)
• wavedev/datatypemap.py (added)
• wavedev/generate/templates/basic_ports/genStructure.py (modified) (6 diffs)
• wavedev/generate/templates/basic_ports/sampleMain.cpp (modified) (3 diffs)

ossiedev/trunk/tools/WaveDev/wavedev.cfg

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <owdconfiguration>
-    <version>Beta Version 0.7.2</version>
+    <version>Version 0.8.1</version>
     <relativepath></relativepath>
     <installpath>/sdr/</installpath>
@@ -8 +8 @@
     <ossieincludepath>/usr/local/include/ossie/</ossieincludepath>
     <homedir>/home/</homedir>
-    <sourcepreamble></sourcepreamble>
+    <sourcepreamble>/generate/generic_preamble</sourcepreamble>
     <licensefile></licensefile>
     <developer>OSSIE</developer>

ossiedev/trunk/tools/WaveDev/wavedev/Makefile.am

@@ -20 +20 @@
              uuidgen.py \
              wd.py \
-             chmod.py \
+                 chmod.py \
+                 datatypemap.py \
              __init__.py
 

ossiedev/trunk/tools/WaveDev/wavedev/cfg.py

@@ -210 +210 @@
     if frame_obj.sourcepreamble == None or not os.path.exists(frame_obj.sourcepreamble):
         #search for generate/generic_preamble in Wavedev/wavedev
-        frame_obj.sourcepreamble = __getPath('/generate/generic_preamble')
+        frame_obj.sourcepreamble = __getPath('/WaveDev/wavedev/generate/generic_preamble')
 
     # generate license file

ossiedev/trunk/tools/WaveDev/wavedev/generate/templates/basic_ports/genStructure.py

@@ -20 +20 @@
 
 import sys, os, shutil
+from WaveDev.wavedev.datatypemap import *
 from WaveDev.wavedev.cfg import LoadConfiguration
 from datetime import date
+
 try:
     from WaveDev.wavedev.errorMsg import *
@@ -753 +755 @@
     simpleCount = 0;
     for x in c.properties:
-        tmp_type = str(x.type)
+        tmp_type = getDatatype(str(x.type))
 
         if x.elementType == "Simple":
-            ts = " "*8 + "CORBA::" + tmp_type.capitalize() + " simple_" + str(simpleCount) + "_value;\n";
+            ts = " "*8 + "CORBA::" + tmp_type + " simple_" + str(simpleCount) + "_value;\n";
             output.write(ts)
             simpleCount += 1;
@@ -772 +774 @@
     simplesequenceCount = 0;
     for x in c.properties:
-        tmp_type = str(x.type)
+        tmp_type = getDatatype(str(x.type))
 
         if x.elementType == "SimpleSequence":
-            ts = " "*8 + "CORBA::" + tmp_type.capitalize() + "Seq *simplesequence_" + str(simplesequenceCount) + ";\n"
+            ts = " "*8 + "CORBA::" + tmp_type + "Seq *simplesequence_" + str(simplesequenceCount) + ";\n"
             output.write(ts)
             simplesequenceCount = simplesequenceCount + 1
@@ -1000 +1002 @@
     ts = " "*4 + 'std::cout << "props length : " << props.length() << std::endl;\n\n'
     ts = ts + " "*4 + "for ( int i = 0; i <props.length(); i++)\n"
-    ts = ts + " "*4 + "{\n"; output.write(ts)
+    ts = ts + " "*4 + "{\n"; 
+    output.write(ts)
     ts = " "*8 + 'std::cout << "Property id : " << props[i].id << std::endl;\n\n'
     output.write(ts)
@@ -1006 +1009 @@
     for p in c.properties:
 
-        ts = " "*8 + 'if (strcmp(props[i].id, "' + p.id + '") == 0)\n' + " "*8 + "{\n";output.write(ts)
+        ts = " "*8 + 'if (strcmp(props[i].id, "' + p.id + '") == 0)\n' + " "*8 + "{\n";
+        output.write(ts)
 
         if p.elementType == "Simple":
-            tmp_type = "unsupported_type";
-            if p.type == "short":
-                tmp_type = "Short";
-            elif p.type == "ushort":
-                tmp_type = "UShort";
-            elif p.type == "float":
-                tmp_type = "Float";
-            elif p.type == "double":
-                tmp_type = "Double";
-            elif p.type == "long":
-                tmp_type = "Long";
-            else:
-                print "ERROR: " + p.type + " is not supported in basic_ports/genStructure"
-                return
+            tmp_type = getDatatype(p.type)
+            if tmp_type == "":
+                print "ERROR: " + p.type + " is not supported in basic_ports/genStructure\n"
 
             ts = " "*12 + "CORBA::" + str(tmp_type) + " simple_temp;\n";
@@ -1039 +1032 @@
 
         elif p.elementType == "SimpleSequence":
-            tmp_type = "unsupported_type";
-            if p.type == "short":
-                tmp_type = "Short";
-            elif p.type == "ushort":
-                tmp_type = "UShort";
-            elif p.type == "float":
-                tmp_type = "Float";
-            elif p.type == "double":
-                tmp_type = "Double";
-            else:
-                print "ERROR: " + p.type + " is not supported in basic_ports/genStructure"
-                return
+            tmp_type = getDatatype(p.type)
+            if tmp_type == "":
+                print "ERROR: " + p.type + " is not supported in basic_ports/genStructure\n"
 
             ts = " "*12 + "props[i].value >>= simplesequence_" + str(simplesequenceCount) + ";\n";

ossiedev/trunk/tools/WaveDev/wavedev/generate/templates/basic_ports/sampleMain.cpp

@@ -1 +1 @@
 #include <iostream>
 #include "ossie/ossieSupport.h"
+#include "ossie/debug.h"
 
 #include "__IncludeFile__.h"
 
+using namespace std;
+using namespace standardInterfaces;  // For standard OSSIE interface classes
 
 int main(int argc, char* argv[])
+{
+    ossieDebugLevel = 0;
 
-{
-    ossieSupport::ORB *orb = new ossieSupport::ORB;
+    if ( argc < 7 ) {
+        cout << argv[0] << " NAMING_CONTEXT_IOR <string> NAME_BINDING <string> COMPONENT_IDENTIFIER <string> " << endl;
+        exit(EXIT_FAILURE);
+    }
+
+    int i = 0;
+    char *uuid = NULL;
+    char *label = NULL;
+    char *ior = NULL;
+
+    while ( i < argc ) {
+        if ( strcmp("NAMING_CONTEXT_IOR", argv[i]) == 0 ) ior = argv[i+1];
+        if ( strcmp("NAME_BINDING", argv[i]) == 0 ) label = argv[i+1];
+        if ( strcmp("COMPONENT_IDENTIFIER", argv[i]) == 0 ) uuid = argv[i+1];
+        ++i;
+    }
+
+    if ( uuid == NULL ) {
+        cout << "ERROR: " << argv[0] << " missing COMPONENT_IDENTIFIER argument" << endl;
+        exit(EXIT_FAILURE);
+    }
+
+    if ( label == NULL ) {
+        cout << "ERROR: " << argv[0] << " missing NAME_BINDING argument" << endl;
+        exit(EXIT_FAILURE);
+    }
+
+    if ( ior == NULL ) {
+        cout << "ERROR: " << argv[0] << " missing NAMING_CONTEXT_IOR argument" << endl;
+        exit(EXIT_FAILURE);
+    }
+
+    cout << argv[0] << " NAMING_CONTEXT_IOR " << ior << " NAME_BINDING " << label << " COMPONENT_IDENTIFIER " << uuid << endl;
+
+    ossieSupport::ORB::orb = CORBA::ORB_init( argc, argv );
+
+    try {
+        CORBA::Object_ptr _ncobj = ossieSupport::ORB::orb->string_to_object(ior);
+        ossieSupport::ORB::inc = CosNaming::NamingContext::_narrow(_ncobj);
+        CORBA::release(_ncobj);
+    } catch ( ... ) {
+        cout << "ERROR: " << argv[0] << " Failed to narrow NamingContext from IOR" << endl;
+        exit(EXIT_FAILURE);
+    }
+
+    try {
+        CORBA::Object_ptr _poaobj = ossieSupport::ORB::orb->resolve_initial_references("RootPOA");
+        ossieSupport::ORB::poa = PortableServer::POA::_narrow(_poaobj);
+        ossieSupport::ORB::pman = ossieSupport::ORB::poa->the_POAManager();
+        ossieSupport::ORB::pman->activate();
+    } catch ( ... ) {
+        cout << "ERROR: " << argv[0] << " Failed to initialize POA" << endl;
+        exit(EXIT_FAILURE);
+    }
+
     omni_mutex component_running_mutex;
     omni_condition *component_running = new omni_condition(&component_running_mutex);
-
-    if (argc != 3) {
-        std::cout << argv[0] << " <id> <usage name> " << std::endl;
-        exit (-1);
-    }
-
-    char *uuid = argv[1];
-    char *label = argv[2];
-
-    std::cout << "Identifier - " << uuid << "  Label - " << label << std::endl;
 
     __Class_name__* __CLASS_VAR___servant;
@@ -31 +79 @@
     __CLASS_VAR_ACE___servant->activate();
 
-    orb->bind_object_to_name((CORBA::Object_ptr) __CLASS_VAR___var, label);
+    CosNaming::Name_var _bindingname = omni::omniURI::stringToName(label);
+    try {
+        ossieSupport::ORB::inc->rebind(_bindingname, (CORBA::Object_ptr) txdemo_var);
+    } catch ( ... ) {
+        cout << "ERROR: " << argv[0] << " Failed to rebind reference to NameService" << endl;
+        exit(EXIT_FAILURE);
+    }
 
     // This bit is ORB specific
@@ -39 +93 @@
 
     component_running->wait();
-    orb->unbind_name(label);
-    orb->orb->shutdown(0);
+    ossieSupport::ORB::inc->unbind(_bindingname);
+    ossieSupport::ORB::orb->destroy();
 
+    return 0;
 }
+