BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Revert "Add an active object step time budget #6721"

Browse Source 
This reverts commit 9c669016d1578a5c62f932c6ccb7a2b4b1e21f0a.
See #6907
This commit is contained in:
Lars Hofhansl 2018-01-12 23:47:39 -08:00
parent 7e50529867
commit fad263dec9
7 changed files with 38 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/settingtypes.txt
View File

@ -1088,9 +1088,6 @@ active_block_mgmt_interval (Active Block Management interval) float 2.0
# Length of time between ABM execution cycles
abm_interval (Active Block Modifier interval) float 1.0
# Length of time between active object step cycles
active_object_interval (Active Object interval) float 0.1
# Length of time between NodeTimer execution cycles
nodetimer_interval (NodeTimer interval) float 0.2

1
src/defaultsettings.cpp
View File

@ -346,7 +346,6 @@ void set_default_settings(Settings *settings)
settings->setDefault("dedicated_server_step", "0.09");
settings->setDefault("active_block_mgmt_interval", "2.0");
settings->setDefault("abm_interval", "1.0");
settings->setDefault("active_object_interval", "0.1");
settings->setDefault("nodetimer_interval", "0.2");
settings->setDefault("ignore_world_load_errors", "false");
settings->setDefault("remote_media", "");

1
src/environment.cpp
View File

@ -36,7 +36,6 @@ Environment::Environment(IGameDef *gamedef):
m_cache_enable_shaders = g_settings->getBool("enable_shaders");
m_cache_active_block_mgmt_interval = g_settings->getFloat("active_block_mgmt_interval");
m_cache_abm_interval = g_settings->getFloat("abm_interval");
m_cache_ao_interval = g_settings->getFloat("active_object_interval");
m_cache_nodetimer_interval = g_settings->getFloat("nodetimer_interval");
m_time_of_day = g_settings->getU32("world_start_time");

1
src/environment.h
View File

@ -136,7 +136,6 @@ protected:
bool m_cache_enable_shaders;
float m_cache_active_block_mgmt_interval;
float m_cache_abm_interval;
float m_cache_ao_interval;
float m_cache_nodetimer_interval;
IGameDef *m_gamedef;

75
src/serverenvironment.cpp
View File

@ -279,13 +279,13 @@ void LBMManager::applyLBMs(ServerEnvironment *env, MapBlock *block, u32 stamp)
void fillRadiusBlock(v3s16 p0, s16 r, std::set<v3s16> &list)
{
const s16 r2 = r * r;
v3s16 p;
for (p.X = p0.X - r; p.X <= p0.X + r; p.X++)
for (p.Y = p0.Y - r; p.Y <= p0.Y + r; p.Y++)
for (p.Z = p0.Z - r; p.Z <= p0.Z + r; p.Z++) {
for(p.X=p0.X-r; p.X<=p0.X+r; p.X++)
for(p.Y=p0.Y-r; p.Y<=p0.Y+r; p.Y++)
for(p.Z=p0.Z-r; p.Z<=p0.Z+r; p.Z++)
{
// limit to a sphere
if (p.getDistanceFromSQ(p0) <= r2) {
if (p.getDistanceFrom(p0) <= r) {
// Set in list
list.insert(p);
}
@ -364,7 +364,10 @@ void ActiveBlockList::update(std::vector<PlayerSAO*> &active_players,
/*
Update m_list
*/
m_list = newlist;
m_list.clear();
for (v3s16 p : newlist) {
m_list.insert(p);
}
}
/*
@ -1218,16 +1221,14 @@ void ServerEnvironment::step(float dtime)
}
}
// placeholder for the "real" time passed
float elapsed_time;
/*
Mess around in active blocks
*/
if (m_active_blocks_nodemetadata_interval.step(dtime, m_cache_nodetimer_interval,
&elapsed_time)) {
if (m_active_blocks_nodemetadata_interval.step(dtime, m_cache_nodetimer_interval)) {
ScopeProfiler sp(g_profiler, "SEnv: mess in act. blocks avg per interval", SPT_AVG);
float dtime = m_cache_nodetimer_interval;
for (const v3s16 &p: m_active_blocks.m_list) {
MapBlock *block = m_map->getBlockNoCreateNoEx(p);
if (!block)
@ -1245,7 +1246,7 @@ void ServerEnvironment::step(float dtime)
MOD_REASON_BLOCK_EXPIRED);
// Run node timers
std::vector<NodeTimer> elapsed_timers = block->m_node_timers.step(elapsed_time);
std::vector<NodeTimer> elapsed_timers = block->m_node_timers.step(dtime);
if (!elapsed_timers.empty()) {
MapNode n;
v3s16 p2;
@ -1261,14 +1262,18 @@ void ServerEnvironment::step(float dtime)
}
}
if (m_active_block_modifier_interval.step(dtime,
m_cache_abm_interval * m_active_block_interval_overload_skip, &elapsed_time))
if (m_active_block_modifier_interval.step(dtime, m_cache_abm_interval))
do { // breakable
if (m_active_block_interval_overload_skip > 0) {
ScopeProfiler sp(g_profiler, "SEnv: ABM overload skips");
m_active_block_interval_overload_skip--;
break;
}
ScopeProfiler sp(g_profiler, "SEnv: modify in blocks avg per interval", SPT_AVG);
TimeTaker timer("modify in active blocks per interval");
// Initialize handling of ActiveBlockModifiers
ABMHandler abmhandler(m_abms, elapsed_time, this, true);
ABMHandler abmhandler(m_abms, m_cache_abm_interval, this, true);
for (const v3s16 &p : m_active_blocks.m_abm_list) {
MapBlock *block = m_map->getBlockNoCreateNoEx(p);
@ -1282,16 +1287,13 @@ void ServerEnvironment::step(float dtime)
abmhandler.apply(block);
}
const u32 time_ms = timer.stop(true);
// allow up to 10% of the budget interval
const u32 max_time_ms = m_cache_abm_interval * 1000.0f * 0.1f;
u32 time_ms = timer.stop(true);
u32 max_time_ms = 200;
if (time_ms > max_time_ms) {
warningstream << "active block modifiers took "
<< time_ms << "ms (longer than "
<< max_time_ms << "ms)" << std::endl;
m_active_block_interval_overload_skip = ((float)time_ms / max_time_ms);
} else {
m_active_block_interval_overload_skip = 1.0f;
warningstream<<"active block modifiers took "
<<time_ms<<"ms (longer than "
<<max_time_ms<<"ms)"<<std::endl;
m_active_block_interval_overload_skip = (time_ms / max_time_ms) + 1;
}
}while(0);
@ -1303,17 +1305,15 @@ void ServerEnvironment::step(float dtime)
/*
Step active objects
*/
if (m_active_object_interval.step(dtime,
m_cache_ao_interval * m_active_object_interval_overload_skip, &elapsed_time)) {
{
ScopeProfiler sp(g_profiler, "SEnv: step act. objs avg", SPT_AVG);
TimeTaker timer("Step active objects");
//TimeTaker timer("Step active objects");
g_profiler->avg("SEnv: num of objects", m_active_objects.size());
// This helps the objects to send data at the same time
bool send_recommended = false;
m_send_recommended_timer += elapsed_time;
m_send_recommended_timer += dtime;
if(m_send_recommended_timer > getSendRecommendedInterval())
{
m_send_recommended_timer -= getSendRecommendedInterval();
@ -1326,28 +1326,13 @@ void ServerEnvironment::step(float dtime)
continue;
// Step object
obj->step(elapsed_time, send_recommended);
obj->step(dtime, send_recommended);
// Read messages from object
while (!obj->m_messages_out.empty()) {
m_active_object_messages.push(obj->m_messages_out.front());
obj->m_messages_out.pop();
}
}
// calculate a simple moving average
m_avg_ao_time = m_avg_ao_time * 0.9f + timer.stop(true) * 0.1f;
// allow up to 20% of the budget interval
const float max_time_ms = m_cache_ao_interval * 1000.0f * 0.2f;
if (m_avg_ao_time > max_time_ms) {
warningstream << "active objects took "
<< m_avg_ao_time << "ms (longer than "
<< max_time_ms << "ms)" << std::endl;
// skip a few steps
m_active_object_interval_overload_skip = m_avg_ao_time / max_time_ms;
} else {
m_active_object_interval_overload_skip = 1.0f;
}
}
/*

5
src/serverenvironment.h
View File

@ -429,11 +429,8 @@ private:
ActiveBlockList m_active_blocks;
IntervalLimiter m_active_blocks_management_interval;
IntervalLimiter m_active_block_modifier_interval;
IntervalLimiter m_active_object_interval;
IntervalLimiter m_active_blocks_nodemetadata_interval;
float m_active_block_interval_overload_skip = 1.0f;
float m_active_object_interval_overload_skip = 1.0f;
float m_avg_ao_time = 0.0f;
int m_active_block_interval_overload_skip = 0;
// Time from the beginning of the game in seconds.
// Incremented in step().
u32 m_game_time = 0;

10
src/util/numeric.h
View File

@ -230,7 +230,7 @@ inline u32 calc_parity(u32 v)
u64 murmur_hash_64_ua(const void *key, int len, unsigned int seed);
bool isBlockInSight(v3s16 blockpos_b, v3f camera_pos, v3f camera_dir,
f32 camera_fov, f32 range, f32 *distance_ptr = NULL);
f32 camera_fov, f32 range, f32 *distance_ptr=NULL);
s16 adjustDist(s16 dist, float zoom_fov);
@ -302,24 +302,18 @@ public:
return value:
true: action should be skipped
false: action should be done
if passed, the elapsed time since this method last returned true
is written to elapsed_ptr
*/
bool step(float dtime, float wanted_interval, float *elapsed_ptr = NULL)
bool step(float dtime, float wanted_interval)
{
m_accumulator += dtime;
if (elapsed_ptr)
*elapsed_ptr = m_accumulator - m_last_accumulator;
if (m_accumulator < wanted_interval)
return false;
m_accumulator -= wanted_interval;
m_last_accumulator = m_accumulator;
return true;
}
private:
float m_accumulator = 0.0f;
float m_last_accumulator = 0.0f;
};