NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

libcamera: object: Use activate() in invokeMethod()

Browse source 
The Object::invokeMethod() implementation duplicates pack creation code
from BoundMemberMethod::activate(). Call activate() instead of
activatePack() to share code.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
This commit is contained in:
Laurent Pinchart 2020-01-04 05:52:00 +02:00
parent d82b8778ed
commit a915a65fab
2 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
include/libcamera/bound_method.h
View file

@ -37,10 +37,11 @@ public:
Object *object() const { return object_; } Object *object() const { return object_; }
ConnectionType connectionType() const { return connectionType_; } ConnectionType connectionType() const { return connectionType_; }
void activatePack(void *pack, bool deleteMethod);
virtual void invokePack(void *pack) = 0; virtual void invokePack(void *pack) = 0;
protected: protected:
void activatePack(void *pack, bool deleteMethod);
void *obj_; void *obj_;
Object *object_; Object *object_;
ConnectionType connectionType_; ConnectionType connectionType_;
@ -88,7 +89,7 @@ public:
invokePack(pack, typename generator<sizeof...(Args)>::type()); invokePack(pack, typename generator<sizeof...(Args)>::type());
} }
virtual void activate(Args... args) = 0; virtual void activate(Args... args, bool deleteMethod = false) = 0;
virtual void invoke(Args... args) = 0; virtual void invoke(Args... args) = 0;
}; };
@ -106,10 +107,10 @@ public:
bool match(void (T::*func)(Args...)) const { return func == func_; } bool match(void (T::*func)(Args...)) const { return func == func_; }
void activate(Args... args) void activate(Args... args, bool deleteMethod = false)
{ {
if (this->object_) if (this->object_)
BoundMethodBase::activatePack(new PackType{ args... }, false); BoundMethodBase::activatePack(new PackType{ args... }, deleteMethod);
else else
(static_cast<T *>(this->obj_)->*func_)(args...); (static_cast<T *>(this->obj_)->*func_)(args...);
} }
@ -135,7 +136,11 @@ public:
bool match(void (*func)(Args...)) const { return func == func_; } bool match(void (*func)(Args...)) const { return func == func_; }
void activate(Args... args) { (*func_)(args...); } void activate(Args... args, bool deleteMethod = false)
{
(*func_)(args...);
}
void invoke(Args...) {} void invoke(Args...) {}
private: private:

7
include/libcamera/object.h
View file

@ -35,11 +35,8 @@ public:
Args... args) Args... args)
{ {
T *obj = static_cast<T *>(this); T *obj = static_cast<T *>(this);
BoundMethodBase *method = auto *method = new BoundMemberMethod<T, FuncArgs...>(obj, this, func, type);
new BoundMemberMethod<T, FuncArgs...>(obj, this, func, type); method->activate(args..., true);
void *pack = new typename BoundMemberMethod<T, FuncArgs...>::PackType{ args... };
method->activatePack(pack, true);
} }
Thread *thread() const { return thread_; } Thread *thread() const { return thread_; }