mmo-ref/polserver
1
0
Fork 0
mirror of https://github.com/polserver/polserver synced 2026-08-13 08:23:08 -04:00
Code Issues Projects Releases Packages Wiki Activity

Funcrefs do not detect pid change (#889)

Browse source 
* test for sending a function to the same program

* store executor pid inside funcrefs and classes

* docs
This commit is contained in:
turleypol 2026-05-31 11:45:35 +02:00 • committed by GitHub
parent 59edaae664
commit 7ff9d877a8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 78 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

10
pol-core/bscript/bclassinstance.cpp
View file

@ -11,10 +11,11 @@
namespace Pol::Bscript
{
BClassInstance::BClassInstance( ref_ptr<EScriptProgram> program, int index,
std::weak_ptr<ValueStackCont> globals )
std::weak_ptr<ValueStackCont> globals, unsigned int pid )
: BStruct( OTClassInstance ),
prog_( std::move( program ) ),
index_( index ),
pid_( pid ),
globals( std::move( globals ) )
{
passert( index_ < prog_->class_descriptors.size() );
@ -24,13 +25,14 @@ BClassInstance::BClassInstance( const BClassInstance& B ) : BStruct( B, OTClassI
{
prog_ = B.prog_;
index_ = B.index_;
pid_ = B.pid_;
globals = B.globals;
}
size_t BClassInstance::sizeEstimate() const
{
return base::sizeEstimate() + Clib::memsize( constructors_called ) +
sizeof( ref_ptr<EScriptProgram> ) + sizeof( unsigned int ) +
sizeof( ref_ptr<EScriptProgram> ) + 2 * sizeof( unsigned int ) +
sizeof( std::weak_ptr<ValueStackCont> );
}
@ -61,7 +63,7 @@ BFunctionRef* BClassInstance::makeMethod( const char* method_name )
if ( method_itr == methods.end() )
return nullptr;
return new BFunctionRef( prog_, method_itr->second.function_reference_index, globals,
return new BFunctionRef( prog_, pid_, method_itr->second.function_reference_index, globals,
ValueStackCont{} );
}
@ -184,7 +186,7 @@ BObjectRef BClassInstance::get_member_id( const int id )
const auto funcref_index =
prog_->class_descriptors.at( index_ ).constructor_function_reference_index;
return BObjectRef( new BFunctionRef( prog_, funcref_index, globals, ValueStackCont{} ) );
return BObjectRef( new BFunctionRef( prog_, pid_, funcref_index, globals, ValueStackCont{} ) );
}
return base::get_member_id( id );