From b3dc53dab25456b43c10e200a423fa5410099c7b Mon Sep 17 00:00:00 2001 From: christian mueller Date: Tue, 11 Sep 2012 18:21:13 +0200 Subject: * [GAM-91] make CAmSerializer calls with references safer, no working Signed-off-by: christian mueller Signed-off-by: christian mueller --- include/shared/CAmSerializer.h | 303 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 293 insertions(+), 10 deletions(-) diff --git a/include/shared/CAmSerializer.h b/include/shared/CAmSerializer.h index 5a1cde5..98257d0 100644 --- a/include/shared/CAmSerializer.h +++ b/include/shared/CAmSerializer.h @@ -130,6 +130,58 @@ private: mFunction(function), // mArgument(argument), // mArgument1(argument1) + { }; + + bool call(int* pipe) + { + (void) pipe; + (*mInstance.*mFunction)(mArgument, mArgument1); + return (true); + }; + }; + + /** + * delegate template for two arguments + */ + template class CAmTwoArgDelegateFirstRef: public CAmDelegate + { + private: + TClass* mInstance; + void (TClass::*mFunction)(Targ& argument, Targ1 argument1); + Targ mArgument; + Targ1 mArgument1; + + public: + CAmTwoArgDelegateFirstRef(TClass* instance, void (TClass::*function)(Targ& argument, Targ1 argument1), Targ& argument, Targ1 argument1) : + mInstance(instance), // + mFunction(function), // + mArgument(argument), // + mArgument1(argument1) + { }; + + bool call(int* pipe) + { + (void) pipe; + (*mInstance.*mFunction)(mArgument, mArgument1); + return (true); + }; + }; + + + template class CAmTwoArgDelegateSecondRef: public CAmDelegate + { + private: + TClass* mInstance; + void (TClass::*mFunction)(Targ argument, Targ1& argument1); + Targ mArgument; + Targ1 mArgument1; + + public: + CAmTwoArgDelegateSecondRef(TClass* instance, void (TClass::*function)(Targ argument, Targ1& argument1), Targ argument, Targ1& argument1) : + mInstance(instance), // + mFunction(function), // + mArgument(argument), // + mArgument1(argument1) {}; bool call(int* pipe) @@ -140,6 +192,33 @@ private: }; }; + /** + * delegate template for two arguments + */ + template class CAmTwoArgDelegateAllRef: public CAmDelegate + { + private: + TClass* mInstance; + void (TClass::*mFunction)(Targ& argument, Targ1& argument1); + Targ mArgument; + Targ1 mArgument1; + + public: + CAmTwoArgDelegateAllRef(TClass* instance, void (TClass::*function)(Targ& argument, Targ1& argument1), Targ& argument, Targ1& argument1) : + mInstance(instance), // + mFunction(function), // + mArgument(argument), // + mArgument1(argument1) + { }; + + bool call(int* pipe) + { + (void) pipe; + (*mInstance.*mFunction)(mArgument, mArgument1); + return (true); + }; + }; + /** * delegate template for three arguments @@ -173,6 +252,209 @@ private: ; }; + /** + * delegate template for three arguments + */ + template class CAmThreeArgDelegateFirstRef: public CAmDelegate + { + private: + TClass* mInstance; + void (TClass::*mFunction)(Targ& argument, Targ1 argument1, Targ2 argument2); + Targ mArgument; + Targ1 mArgument1; + Targ2 mArgument2; + + public: + CAmThreeArgDelegateFirstRef(TClass* instance, void (TClass::*function)(Targ& argument, Targ1 argument1, Targ2 argument2), Targ& argument, Targ1 argument1, Targ2 argument2) : + mInstance(instance), // + mFunction(function), // + mArgument(argument), // + mArgument1(argument1), // + mArgument2(argument2) + {}; + + bool call(int* pipe) + { + (void) pipe; + (*mInstance.*mFunction)(mArgument, mArgument1, mArgument2); + return (true); + }; + }; + + /** + * delegate template for three arguments + */ + template class CAmThreeArgDelegateSecondRef: public CAmDelegate + { + private: + TClass* mInstance; + void (TClass::*mFunction)(Targ argument, Targ1& argument1, Targ2 argument2); + Targ mArgument; + Targ1 mArgument1; + Targ2 mArgument2; + + public: + CAmThreeArgDelegateSecondRef(TClass* instance, void (TClass::*function)(Targ argument, Targ1& argument1, Targ2 argument2), Targ argument, Targ1& argument1, Targ2 argument2) : + mInstance(instance), // + mFunction(function), // + mArgument(argument), // + mArgument1(argument1), // + mArgument2(argument2) + {}; + + bool call(int* pipe) + { + (void) pipe; + (*mInstance.*mFunction)(mArgument, mArgument1, mArgument2); + return (true); + }; + }; + + /** + * delegate template for three arguments + */ + template class CAmThreeArgDelegateThirdRef: public CAmDelegate + { + private: + TClass* mInstance; + void (TClass::*mFunction)(Targ argument, Targ1 argument1, Targ2& argument2); + Targ mArgument; + Targ1 mArgument1; + Targ2 mArgument2; + + public: + CAmThreeArgDelegateThirdRef(TClass* instance, void (TClass::*function)(Targ argument, Targ1 argument1, Targ2& argument2), Targ argument, Targ1 argument1, Targ2& argument2) : + mInstance(instance), // + mFunction(function), // + mArgument(argument), // + mArgument1(argument1), // + mArgument2(argument2) + {}; + + bool call(int* pipe) + { + (void) pipe; + (*mInstance.*mFunction)(mArgument, mArgument1, mArgument2); + return (true); + }; + }; + + /** + * delegate template for three arguments + */ + template class CAmThreeArgDelegateFirstSecondRef: public CAmDelegate + { + private: + TClass* mInstance; + void (TClass::*mFunction)(Targ& argument, Targ1& argument1, Targ2 argument2); + Targ mArgument; + Targ1 mArgument1; + Targ2 mArgument2; + + public: + CAmThreeArgDelegateFirstSecondRef(TClass* instance, void (TClass::*function)(Targ& argument, Targ1& argument1, Targ2 argument2), Targ& argument, Targ1& argument1, Targ2 argument2) : + mInstance(instance), // + mFunction(function), // + mArgument(argument), // + mArgument1(argument1), // + mArgument2(argument2) + {}; + + bool call(int* pipe) + { + (void) pipe; + (*mInstance.*mFunction)(mArgument, mArgument1, mArgument2); + return (true); + }; + }; + + /** + * delegate template for three arguments + */ + template class CAmThreeArgDelegateFirstThirdRef: public CAmDelegate + { + private: + TClass* mInstance; + void (TClass::*mFunction)(Targ& argument, Targ1 argument1, Targ2& argument2); + Targ mArgument; + Targ1 mArgument1; + Targ2 mArgument2; + + public: + CAmThreeArgDelegateFirstThirdRef(TClass* instance, void (TClass::*function)(Targ& argument, Targ1 argument1, Targ2& argument2), Targ& argument, Targ1 argument1, Targ2& argument2) : + mInstance(instance), // + mFunction(function), // + mArgument(argument), // + mArgument1(argument1), // + mArgument2(argument2) + {}; + + bool call(int* pipe) + { + (void) pipe; + (*mInstance.*mFunction)(mArgument, mArgument1, mArgument2); + return (true); + }; + }; + + /** + * delegate template for three arguments + */ + template class CAmThreeArgDelegateSecondThirdRef: public CAmDelegate + { + private: + TClass* mInstance; + void (TClass::*mFunction)(Targ argument, Targ1& argument1, Targ2& argument2); + Targ mArgument; + Targ1 mArgument1; + Targ2 mArgument2; + + public: + CAmThreeArgDelegateSecondThirdRef(TClass* instance, void (TClass::*function)(Targ argument, Targ1& argument1, Targ2& argument2), Targ argument, Targ1& argument1, Targ2& argument2) : + mInstance(instance), // + mFunction(function), // + mArgument(argument), // + mArgument1(argument1), // + mArgument2(argument2) + {}; + + bool call(int* pipe) + { + (void) pipe; + (*mInstance.*mFunction)(mArgument, mArgument1, mArgument2); + return (true); + }; + }; + + /** + * delegate template for three arguments + */ + template class CAmThreeArgDelegateAllRef: public CAmDelegate + { + private: + TClass* mInstance; + void (TClass::*mFunction)(Targ& argument, Targ1& argument1, Targ2& argument2); + Targ mArgument; + Targ1 mArgument1; + Targ2 mArgument2; + + public: + CAmThreeArgDelegateAllRef(TClass* instance, void (TClass::*function)(Targ& argument, Targ1& argument1, Targ2& argument2), Targ& argument, Targ1& argument1, Targ2& argument2) : + mInstance(instance), // + mFunction(function), // + mArgument(argument), // + mArgument1(argument1), // + mArgument2(argument2) + {}; + + bool call(int* pipe) + { + (void) pipe; + (*mInstance.*mFunction)(mArgument, mArgument1, mArgument2); + return (true); + }; + }; + /** * delegate template for four arguments */ @@ -590,6 +872,7 @@ private: throw std::runtime_error("could not write to pipe !"); } } + int mPipe[2]; //!< the pipe int mReturnPipe[2]; //!< pipe handling returns std::deque mListDelegatePoiters; //!< intermediate queue to store the pipe results @@ -705,7 +988,7 @@ public: template void asyncCall(TClass1* instance, void (TClass1::*function)(Targ& argument, Targ1 argument1), Targ& argument, Targ1 argument1) { - CAmDelegagePtr p(new CAmTwoArgDelegate(instance, function, argument, argument1)); + CAmDelegagePtr p(new CAmTwoArgDelegateFirstRef(instance, function, argument, argument1)); send(p); } @@ -723,7 +1006,7 @@ public: void asyncCall(TClass1* instance, void (TClass1::*function)(Targ argument, Targ1& argument1), Targ argument, Targ1& argument1) { logInfo("took ref"); - CAmDelegagePtr p(new CAmTwoArgDelegate(instance, function, argument, argument1)); + CAmDelegagePtr p(new CAmTwoArgDelegateSecondRef(instance, function, argument, argument1)); send(p); } @@ -740,7 +1023,7 @@ public: template void asyncCall(TClass1* instance, void (TClass1::*function)(Targ& argument, Targ1& argument1), Targ& argument, Targ1& argument1) { - CAmDelegagePtr p(new CAmTwoArgDelegate(instance, function, argument, argument1)); + CAmDelegagePtr p(new CAmTwoArgDelegateAllRef(instance, function, argument, argument1)); send(p); } @@ -760,7 +1043,7 @@ public: template void asyncCall(TClass1* instance, void (TClass1::*function)(Targ& argument, Targ1 argument1, Targ2 argument2), Targ& argument, Targ1 argument1, Targ2 argument2) { - CAmDelegagePtr p(new CAmThreeArgDelegate(instance, function, argument, argument1, argument2)); + CAmDelegagePtr p(new CAmThreeArgDelegateFirstRef(instance, function, argument, argument1, argument2)); send(p); } @@ -771,7 +1054,7 @@ public: template void asyncCall(TClass1* instance, void (TClass1::*function)(Targ argument, Targ1& argument1, Targ2 argument2), Targ argument, Targ1& argument1, Targ2 argument2) { - CAmDelegagePtr p(new CAmThreeArgDelegate(instance, function, argument, argument1, argument2)); + CAmDelegagePtr p(new CAmThreeArgDelegateSecondRef(instance, function, argument, argument1, argument2)); send(p); } @@ -781,7 +1064,7 @@ public: template void asyncCall(TClass1* instance, void (TClass1::*function)(Targ argument, Targ1 argument1, Targ2& argument2), Targ argument, Targ1 argument1, Targ2& argument2) { - CAmDelegagePtr p(new CAmThreeArgDelegate(instance, function, argument, argument1, argument2)); + CAmDelegagePtr p(new CAmThreeArgDelegateThirdRef(instance, function, argument, argument1, argument2)); send(p); } @@ -791,7 +1074,7 @@ public: template void asyncCall(TClass1* instance, void (TClass1::*function)(Targ argument, Targ1& argument1, Targ2& argument2), Targ argument, Targ1& argument1, Targ2& argument2) { - CAmDelegagePtr p(new CAmThreeArgDelegate(instance, function, argument, argument1, argument2)); + CAmDelegagePtr p(new CAmThreeArgDelegateSecondThirdRef(instance, function, argument, argument1, argument2)); send(p); } @@ -801,7 +1084,7 @@ public: template void asyncCall(TClass1* instance, void (TClass1::*function)(Targ& argument, Targ1& argument1, Targ2& argument2), Targ& argument, Targ1& argument1, Targ2& argument2) { - CAmDelegagePtr p(new CAmThreeArgDelegate(instance, function, argument, argument1, argument2)); + CAmDelegagePtr p(new CAmThreeArgDelegateAllRef(instance, function, argument, argument1, argument2)); send(p); } @@ -811,7 +1094,7 @@ public: template void asyncCall(TClass1* instance, void (TClass1::*function)(Targ& argument, Targ1& argument1, Targ2 argument2), Targ& argument, Targ1& argument1, Targ2 argument2) { - CAmDelegagePtr p(new CAmThreeArgDelegate(instance, function, argument, argument1, argument2)); + CAmDelegagePtr p(new CAmThreeArgDelegateFirstSecondRef(instance, function, argument, argument1, argument2)); send(p); } @@ -821,7 +1104,7 @@ public: template void asyncCall(TClass1* instance, void (TClass1::*function)(Targ& argument, Targ1 argument1, Targ2& argument2), Targ& argument, Targ1 argument1, Targ2& argument2) { - CAmDelegagePtr p(new CAmThreeArgDelegate(instance, function, argument, argument1, argument2)); + CAmDelegagePtr p(new CAmThreeArgDelegateFirstThirdRef(instance, function, argument, argument1, argument2)); send(p); } -- cgit v1.2.1