Changeset 3988

Show
Ignore:
Timestamp:
05/28/07 17:17:05 (6 years ago)
Author:
balister
Message:

Changes for new directory structure and new xml parsers.

Location:
components/Interpolator/trunk/Interpolator
Files:
4 modified

Legend:

Unmodified
Added
Removed

  • components/Interpolator/trunk/Interpolator/Interpolator.cpp

    r3426 r3988  
    11/**************************************************************************** 
    22 
    3 Copyright 2006 Virginia Polytechnic Institute and State University 
     3Copyright 2006, 2007 Virginia Polytechnic Institute and State University 
    44 
    55This file is part of the OSSIE Interpolator. 
    … …  
    6767CORBA::Object_ptr Interpolator_i::getPort( const char* portName) throw (CORBA::SystemException, CF::PortSupplier::UnknownPort) 
    6868{ 
     69    DEBUG(4, Interpolator, "Interpolator getPort() called with: " << portName); 
    6970 
    7071    CORBA::Object_var p; 
    … …  
    178179 
    179180        if (len != old_len || M_factor != old_M) { 
    180             DEBUG(1, Interpolator, "data len or M changed.") 
     181            DEBUG(4, Interpolator, "data len or M changed."); 
    181182            I_out.length(len * M_factor); 
    182183            Q_out.length(len * M_factor); 
    183184            old_len = len; 
    184185            old_M = M_factor; 
     186            DEBUG(4, Interpolator, "New data len: " << len << " M: " << M); 
    185187        } 
    186188 
    187189        for (unsigned int i = 0; i < len; i++) { 
    188190 
     191            DEBUG(8, Interpolator, "About to filter data."); 
    189192            i_filter->do_work(true, (*I_in)[i], I_out[out_idx]); 
    190193            q_filter->do_work(true, (*Q_in)[i], Q_out[out_idx]); 
    191  
    192             out_data->write_data(I_out[out_idx]); 
     194            DEBUG(8, Interpolator, "Done filtering data."); 
     195 
     196//          out_data->write_data(I_out[out_idx]); 
    193197 
    194198            out_idx++; 
    … …  
    199203                q_filter->do_work(true, 0, Q_out[out_idx]); 
    200204 
    201                 out_data->write_data(I_out[out_idx]); 
     205//              out_data->write_data(I_out[out_idx]); 
    202206 
    203207                out_idx++; 
    … …  
    205209        } 
    206210        dataIn->bufferEmptied(); 
     211        DEBUG(5, Interpolator, "Interpolator about to send data."); 
    207212        dataOut->pushPacket(I_out, Q_out); 
     213        DEBUG(5, Interpolator, "Interpolator data sent."); 
    208214    } 
    209215} 

  • components/Interpolator/trunk/Interpolator/Interpolator.spd.xml

    r3426 r3988  
    1111    </author> 
    1212    <propertyfile type="PRF"> 
    13         <localfile name="xml/Interpolator/Interpolator.prf.xml"/> 
     13        <localfile name="Interpolator.prf.xml"/> 
    1414    </propertyfile> 
    1515    <descriptor> 
    16         <localfile name="xml/Interpolator/Interpolator.scd.xml"/> 
     16        <localfile name="Interpolator.scd.xml"/> 
    1717    </descriptor> 
    1818    <implementation id="DCE:e1a41b54-21c5-11db-9618-000f1fd5acd7" aepcompliance="aep_compliant"> 
    1919        <description>Default Description</description>  
    2020        <code type="Executable"> 
    21             <localfile name="bin/Interpolator"/> 
     21            <localfile name="/bin/Interpolator"/> 
    2222        </code> 
    2323        <processor name="x86"/> 

  • components/Interpolator/trunk/Interpolator/Makefile.am

    r3426 r3988  
    33 
    44ossieName = Interpolator 
    5 bin_PROGRAMS = Interpolator 
     5dombindir = $(prefix)/dom/bin 
     6dombin_PROGRAMS = Interpolator 
    67 
    7 xmldir = $(prefix)/xml/$(ossieName) 
     8xmldir = $(prefix)/dom/xml/$(ossieName) 
    89dist_xml_DATA = Interpolator.prf.xml Interpolator.scd.xml \ 
    910Interpolator.spd.xml  

  • components/Interpolator/trunk/Interpolator/main.cpp

    r3426 r3988  
    11/**************************************************************************** 
    22 
    3 Copyright 2006 Virginia Polytechnic Institute and State University 
     3Copyright 2006, 2007 Virginia Polytechnic Institute and State University 
    44 
    55This file is part of the OSSIE Interpolator. 
    … …  
    3434 
    3535{ 
    36     struct sched_param prio; 
    37  
    38     prio.sched_priority = 5; 
    39  
    40     int rc = sched_setscheduler(0, SCHED_RR, &prio); 
    41  
    4236    ossieDebugLevel = 3; 
    4337 
    44     if (rc < 0) 
    45         std::cerr << "Failed to set RR scheduler for USRP device." << std::endl; 
    4638    ossieSupport::ORB *orb = new ossieSupport::ORB; 
    4739    omni_mutex component_running_mutex; 
    4840    omni_condition *component_running = new omni_condition(&component_running_mutex); 
    4941 
    50     if (argc != 3) { 
    51         std::cout << argv[0] << " <id> <usage name> " << std::endl; 
    52         exit (-1); 
    53     } 
    54  
    55     char *uuid = argv[1]; 
    56     char *label = argv[2]; 
    57  
    58     DEBUG(1, Interpolator, "Identifier - " << uuid << "  Label - " << label) 
     42    ossieSupport::ossieComponent interpolator(orb, argc, argv); 
    5943 
    6044    Interpolator_i* interpolator_servant; 
    … …  
    6347    // Create the interpolator component servant and object reference 
    6448 
    65     interpolator_servant = new Interpolator_i(uuid, component_running); 
     49    interpolator_servant = new Interpolator_i(interpolator.getUuid(), component_running); 
    6650    interpolator_var = interpolator_servant->_this(); 
    6751 
    68     orb->bind_object_to_name((CORBA::Object_ptr) interpolator_var, label); 
     52    interpolator.bind(interpolator_var); 
    6953 
    7054    // This bit is ORB specific 
    … …  
    7458 
    7559    component_running->wait(); 
    76     orb->unbind_name(label); 
     60    interpolator.unbind(); 
    7761    orb->orb->shutdown(0); 
    7862