Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-04 23:58:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Make ClosureFrame safe & cleanup

Browse source 
TODO: make anonymous-funcs associated with tables capture closures,
implement copy constructor for Frame, & other cleanup.
This commit is contained in:
Zeke Medley 2019-06-26 15:05:57 -07:00
parent 670816ad48
commit 8ed18ca194
10 changed files with 150 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/Func.h
View file

@ -20,7 +20,7 @@ class Frame;
class ID;
class CallExpr;
struct CloneState;
// struct CloneState;
class Func : public BroObj {
public:
@ -64,7 +64,7 @@ public:
void Describe(ODesc* d) const override = 0;
virtual void DescribeDebug(ODesc* d, const val_list* args) const;
virtual Val* DoClone();
virtual Func* DoClone();
virtual TraversalCode Traverse(TraversalCallback* cb) const;
@ -74,6 +74,8 @@ public:
protected:
Func();
// Copies this functions state into other.
void CopyStateInto(Func* other) const;
// Helper function for handling result of plugin hook.
std::pair<bool, Val*> HandlePluginResult(std::pair<bool, Val*> plugin_result, val_list* args, function_flavor flavor) const;
@ -100,9 +102,7 @@ public:
void AddBody(Stmt* new_body, id_list* new_inits, int new_frame_size,
int priority) override;
void fsets();
Val* DoClone() override;
Func* DoClone() override;
int FrameSize() const { return frame_size; }
@ -115,9 +115,6 @@ protected:
int frame_size;
private:
// Shifts the offsets of each id in "idl" by "shift".
static void ShiftOffsets(int shift, std::shared_ptr<id_list> idl);
// Makes a deep copy of the input frame and captures it.
void SetClosureFrame(Frame* f);
@ -129,6 +126,7 @@ private:
std::shared_ptr<id_list> outer_ids = nullptr;
// The frame the Func was initialized in. This is not guaranteed to be
// initialized and should be handled with care.
// A BroFunc Unrefs its closure on deletion.
Frame* closure = nullptr;
};