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

IntrusivePtr: rename detach() to release()

Browse source 
Follow the C++ standard library conventions (here: `std::unique_ptr`).
This commit is contained in:
Max Kellermann 2020-02-19 05:37:34 +01:00
parent edb93d1733
commit 08128b244f
11 changed files with 29 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Expr.cc
View file

@ -2873,7 +2873,7 @@ void IndexExpr::Assign(Frame* f, Val* arg_v)
for ( auto idx = 0u; idx < v_vect->Size(); idx++, first++ )
v1_vect->Insert(first, v_vect->Lookup(idx)->Ref());
}
else if ( ! v1_vect->Assign(v2, v.detach()) )
else if ( ! v1_vect->Assign(v2, v.release()) )
{
v = v_extra;
@ -2895,7 +2895,7 @@ void IndexExpr::Assign(Frame* f, Val* arg_v)
}
case TYPE_TABLE:
if ( ! v1->AsTableVal()->Assign(v2, v.detach()) )
if ( ! v1->AsTableVal()->Assign(v2, v.release()) )
{
v = v_extra;

2
src/Frame.cc
View file

@ -485,7 +485,7 @@ std::pair<bool, Frame*> Frame::Unserialize(const broker::vector& data)
return std::make_pair(false, nullptr);
}
rf->frame[i] = val.detach();
rf->frame[i] = val.release();
}
return std::make_pair(true, rf);

6
src/IntrusivePtr.h
View file

@ -63,7 +63,7 @@ public:
setPtr(raw_ptr, add_ref);
}
IntrusivePtr(IntrusivePtr&& other) noexcept : ptr_(other.detach())
IntrusivePtr(IntrusivePtr&& other) noexcept : ptr_(other.release())
{
// nop
}
@ -74,7 +74,7 @@ public:
}
template <class U, class = std::enable_if_t<std::is_convertible_v<U*, T*>>>
IntrusivePtr(IntrusivePtr<U> other) noexcept : ptr_(other.detach())
IntrusivePtr(IntrusivePtr<U> other) noexcept : ptr_(other.release())
{
// nop
}
@ -95,7 +95,7 @@ public:
* intrusive pointer to @c nullptr.
* @returns the raw pointer without modifying the reference count.
*/
pointer detach() noexcept
pointer release() noexcept
{
auto result = ptr_;
if ( result )

2
src/Stmt.cc
View file

@ -226,7 +226,7 @@ static Val* print_log(val_list* vals)
}
record->Assign(0, new Val(current_time(), TYPE_TIME));
record->Assign(1, vec.detach());
record->Assign(1, vec.release());
log_mgr->Write(plval.get(), record.get());
return nullptr;
}

2
src/Val.cc
View file

@ -3273,7 +3273,7 @@ Val* cast_value_to_type(Val* v, BroType* t)
if ( ! dv )
return 0;
return static_cast<bro_broker::DataVal *>(dv)->castTo(t).detach();
return static_cast<bro_broker::DataVal *>(dv)->castTo(t).release();
}
return 0;

18
src/broker/Data.cc
View file

@ -252,14 +252,14 @@ struct val_converter {
if ( ! index_val )
return nullptr;
list_val->Append(index_val.detach());
list_val->Append(index_val.release());
}
rval->Assign(list_val.get(), nullptr);
}
return rval.detach();
return rval.release();
}
result_type operator()(broker::table& a)
@ -312,7 +312,7 @@ struct val_converter {
if ( ! index_val )
return nullptr;
list_val->Append(index_val.detach());
list_val->Append(index_val.release());
}
auto value_val = bro_broker::data_to_val(move(item.second),
@ -321,10 +321,10 @@ struct val_converter {
if ( ! value_val )
return nullptr;
rval->Assign(list_val.get(), value_val.detach());
rval->Assign(list_val.get(), value_val.release());
}
return rval.detach();
return rval.release();
}
result_type operator()(broker::vector& a)
@ -341,10 +341,10 @@ struct val_converter {
if ( ! item_val )
return nullptr;
rval->Assign(rval->Size(), item_val.detach());
rval->Assign(rval->Size(), item_val.release());
}
return rval.detach();
return rval.release();
}
else if ( type->Tag() == TYPE_FUNC )
{
@ -410,11 +410,11 @@ struct val_converter {
if ( ! item_val )
return nullptr;
rval->Assign(i, item_val.detach());
rval->Assign(i, item_val.release());
++idx;
}
return rval.detach();
return rval.release();
}
else if ( type->Tag() == TYPE_PATTERN )
{

4
src/broker/Manager.cc
View file

@ -998,7 +998,7 @@ void Manager::ProcessEvent(const broker::topic& topic, broker::zeek::Event ev)
auto val = data_to_val(std::move(args[i]), expected_type);
if ( val )
vl.push_back(val.detach());
vl.push_back(val.release());
else
{
auto expected_name = type_name(expected_type->Tag());
@ -1210,7 +1210,7 @@ bool Manager::ProcessIdentifierUpdate(broker::zeek::IdentifierUpdate iu)
return false;
}
id->SetVal(val.detach());
id->SetVal(val.release());
return true;
}

2
src/probabilistic/Topk.cc
View file

@ -514,7 +514,7 @@ bool TopkVal::DoUnserialize(const broker::data& data)
Element* e = new Element();
e->epsilon = *epsilon;
e->value = val.detach();
e->value = val.release();
e->parent = b;
b->elements.insert(b->elements.end(), e);

10
src/supervisor/Supervisor.cc
View file

@ -1152,7 +1152,7 @@ IntrusivePtr<RecordVal> Supervisor::NodeConfig::ToRecord() const
if ( ep.interface )
val->Assign(ept->FieldOffset("interface"), new StringVal(*ep.interface));
cluster_val->Assign(key.get(), val.detach());
cluster_val->Assign(key.get(), val.release());
}
return rval;
@ -1163,7 +1163,7 @@ IntrusivePtr<RecordVal> Supervisor::Node::ToRecord() const
auto rt = BifType::Record::Supervisor::NodeStatus;
auto rval = make_intrusive<RecordVal>(rt);
rval->Assign(rt->FieldOffset("node"), config.ToRecord().detach());
rval->Assign(rt->FieldOffset("node"), config.ToRecord().release());
if ( pid )
rval->Assign(rt->FieldOffset("pid"), val_mgr->GetInt(pid));
@ -1230,7 +1230,7 @@ bool Supervisor::SupervisedNode::InitCluster() const
val->Assign(cluster_node_type->FieldOffset("manager"),
new StringVal(*manager_name));
cluster_nodes->Assign(key.get(), val.detach());
cluster_nodes->Assign(key.get(), val.release());
}
cluster_manager_is_logger_id->SetVal(val_mgr->GetBool(! has_logger));
@ -1329,7 +1329,7 @@ RecordVal* Supervisor::Status(std::string_view node_name)
const auto& node = n.second;
auto key = make_intrusive<StringVal>(name);
auto val = node.ToRecord();
node_table_val->Assign(key.get(), val.detach());
node_table_val->Assign(key.get(), val.release());
}
}
else
@ -1343,7 +1343,7 @@ RecordVal* Supervisor::Status(std::string_view node_name)
const auto& node = it->second;
auto key = make_intrusive<StringVal>(name);
auto val = node.ToRecord();
node_table_val->Assign(key.get(), val.detach());
node_table_val->Assign(key.get(), val.release());
}
return rval;

4
src/supervisor/supervisor.bif
View file

@ -87,11 +87,11 @@ function Supervisor::__node%(%): Supervisor::NodeConfig
auto rt = BifType::Record::Supervisor::NodeConfig;
auto rval = make_intrusive<RecordVal>(rt);
rval->Assign(rt->FieldOffset("name"), new StringVal("<invalid>"));
return rval.detach();
return rval.release();
}
auto rval = zeek::Supervisor::ThisNode()->config.ToRecord();
return rval.detach();
return rval.release();
%}
function Supervisor::__is_supervisor%(%): bool

4
src/zeek.bif
View file

@ -1868,7 +1868,7 @@ function zeek_args%(%): string_vec
for ( auto i = 0; i < bro_argc; ++i )
rval->Assign(rval->Size(), new StringVal(bro_argv[i]));
return rval.detach();
return rval.release();
%}
## Checks whether Zeek reads traffic from one or more network interfaces (as
@ -1912,7 +1912,7 @@ function packet_source%(%): PacketSource
r->Assign(3, val_mgr->GetCount(ps->Netmask()));
}
return r.detach();
return r.release();
%}
## Generates a table of the size of all global variables. The table index is