operations: improve OperationCallerInterface::isSend() for master-sla…

…ve calls

This is a combination of 3 commits.

The first commit's message is:
operations: assert if the caller is not set and improve isSend

isSend now only returns true if the thread differs, not just the EE.
So that it also does not send in case of a master-slave call.

Signed-off-by: Peter Soetens <peter@intermodalics.eu>

This is the 2nd commit message:

operations: fixup isSend() logic to also work if no caller is known.

Signed-off-by: Peter Soetens <peter@intermodalics.eu>

This is the 3rd commit message:

operations: improved isSend implementation that does not need caller

As suggested by @meyerj, we can use isSelf() instead of comparing threads.

Signed-off-by: Peter Soetens <peter@intermodalics.eu>

rtt/base/OperationCallerInterface.cpp

@@ -31,6 +31,14 @@ bool OperationCallerInterface::setThread(ExecutionThread et, ExecutionEngine* ex
     return true;
 }
 
+bool OperationCallerInterface::isSend()
+{
+    if ( met == ClientThread ) return false;
+    // OwnThread case:
+    if ( myengine->getActivity()->thread()->isSelf() ) return false;
+    return true; // all other OwnThread cases
+}
+
 ExecutionEngine* OperationCallerInterface::getMessageProcessor() const 
 { 
     ExecutionEngine* ret = (met == OwnThread ? myengine : GlobalEngine::Instance()); 

rtt/base/OperationCallerInterface.hpp

@@ -75,8 +75,10 @@ namespace RTT
 
             /**
              * Helpful function to tell us if this operations is to be sent or not.
+	     * Sending is only required if the operation is OwnThread *and* in a
+	     * different thread than the caller.
              */
-            bool isSend() { return met == OwnThread && myengine != caller; }
+            bool isSend();
 
             ExecutionEngine* getMessageProcessor() const;
 

rtt/internal/LocalOperationCaller.hpp

@@ -285,6 +285,7 @@ namespace RTT
                 if (!this->caller) {
                     log(Error) << "You're using call() an OwnThread operation or collect() on a sent operation without setting a caller in the OperationCaller. This often causes deadlocks." <<endlog();
                     log(Error) << "Use this->engine() in a component or GlobalEngine::Instance() in a non-component function. Returning a CollectFailure." <<endlog();
+                    assert( false && "You forgot to use setCaller(). See Orocos LOG messages for explanation.");
                     return false;
                 }
                 return true;