Changeset 92:1f3700099632 in finroc_plugins_data_ports


Ignore:
Timestamp:
05.02.2015 21:13:57 (4 years ago)
Author:
Max Reichardt <mreichardt@…>
Branch:
default
Parents:
89:8f0126072587 (diff), 91:76d9b2487b32 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Phase:
public
Message:

Merged with 14.08

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • common/tPublishOperation.h

    r89 r92  
    9797    { 
    9898      PrintWarning(port, "is not ready. Ignoring publishing request."); 
     99      this->CheckRecycle(); 
    99100      return; 
    100101    } 
  • common/tPublishOperation.h

    r91 r92  
    9696    if (!(port.IsReady() || BROWSER_PUBLISH)) 
    9797    { 
    98       FINROC_LOG_PRINT(WARNING, "Port is not ready. Ignoring publishing request."); 
     98      PrintWarning(port, "is not ready. Ignoring publishing request."); 
    9999      this->CheckRecycle(); 
    100100      return; 
     
    192192private: 
    193193 
     194  /*! 
     195   * Put to separate method as it expands to quite a lot of code that does not need to be inlined 
     196   * 
     197   * \param port Port to print message for 
     198   * \param warning Message to print 
     199   */ 
     200  __attribute__((noinline)) 
     201  void PrintWarning(TPort& port, const char* warning) 
     202  { 
     203    FINROC_LOG_PRINT_STATIC(WARNING, "Port '", port.GetQualifiedName(), "' ", warning); 
     204  } 
     205 
    194206}; 
    195207 
  • optimized/tCheapCopyPort.h

    r80 r92  
    485485        assert((used_locks < cADD_LOCKS) && "Too many locks in this publishing operation"); 
    486486        published_buffer->ReleaseLocks<tUnusedManagerPointer::deleter_type, tCheaplyCopiedBufferManager>(cADD_LOCKS - used_locks); 
     487        published_buffer = NULL; 
    487488      } 
    488489    } 
     
    577578        tUnusedBufferRecycler recycler; 
    578579        recycler(published_buffer); 
     580        published_buffer = NULL; 
    579581      } 
    580582    } 
  • optimized/tCheapCopyPort.h

    r91 r92  
    172172  virtual ~tCheapCopyPort(); 
    173173 
    174   /*! 
    175    * Set current value to default value 
    176    */ 
    177   void ApplyDefaultValue(); 
     174  virtual void ApplyDefaultValue() override; 
    178175 
    179176  /*! 
     
    386383  } 
    387384 
    388   virtual void NotifyDisconnect(); // TODO: why is this virtual? 
    389  
    390385//  /*! 
    391386//   * Publish data 
Note: See TracChangeset for help on using the changeset viewer.