ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.405 by root, Mon Dec 17 08:03:22 2007 UTC vs.
Revision 1.419 by root, Sun Apr 13 01:34:09 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use EV 1.86; 30use EV 3.2;
10use Opcode; 31use Opcode;
11use Safe; 32use Safe;
12use Safe::Hole; 33use Safe::Hole;
13use Storable (); 34use Storable ();
14 35
15use Coro 4.32 (); 36use Coro 4.50 ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::EV; 39use Coro::EV;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
… …
27use JSON::XS 2.01 (); 48use JSON::XS 2.01 ();
28use BDB (); 49use BDB ();
29use Data::Dumper; 50use Data::Dumper;
30use Digest::MD5; 51use Digest::MD5;
31use Fcntl; 52use Fcntl;
32use YAML::Syck (); 53use YAML ();
33use IO::AIO 2.51 (); 54use IO::AIO 2.51 ();
34use Time::HiRes; 55use Time::HiRes;
35use Compress::LZF; 56use Compress::LZF;
36use Digest::MD5 (); 57use Digest::MD5 ();
37 58
38# configure various modules to our taste 59# configure various modules to our taste
39# 60#
40$Storable::canonical = 1; # reduce rsync transfers 61$Storable::canonical = 1; # reduce rsync transfers
41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
43
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46 64
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 66
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 68
… …
72our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
74our %RESOURCE; 92our %RESOURCE;
75 93
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 97our $NEXT_TICK;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
82 99
… …
99# used to convert map paths into valid unix filenames by replacing / by ∕ 116# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 118
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
105 123
106binmode STDOUT; 124binmode STDOUT;
107binmode STDERR; 125binmode STDERR;
108 126
109# read virtual server time, if available 127# read virtual server time, if available
… …
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 212
195 LOG llevError, $msg; 213 LOG llevError, $msg;
196 }; 214 };
197} 215}
216
217$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "=="
219
220 if ($Coro::current == $Coro::main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d#
223 }#d#
224
225 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate
228};
229
230$SIG{__DIE__} = sub { }; #d#?
198 231
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
327 360
328 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
329} 362}
330 363
331sub freeze_mainloop { 364sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
333 366
334 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
335 $TICK_WATCHER->start;
336 };
337 $TICK_WATCHER->stop;
338 $guard
339} 368}
340 369
341=item cf::periodic $interval, $cb 370=item cf::periodic $interval, $cb
342 371
343Like EV::periodic, but randomly selects a starting point so that the actions 372Like EV::periodic, but randomly selects a starting point so that the actions
… …
444 # this is the main coro, too bad, we have to block 473 # this is the main coro, too bad, we have to block
445 # till the operation succeeds, freezing the server :/ 474 # till the operation succeeds, freezing the server :/
446 475
447 LOG llevError, Carp::longmess "sync job";#d# 476 LOG llevError, Carp::longmess "sync job";#d#
448 477
449 # TODO: use suspend/resume instead
450 # (but this is cancel-safe)
451 my $freeze_guard = freeze_mainloop; 478 my $freeze_guard = freeze_mainloop;
452 479
453 my $busy = 1; 480 my $busy = 1;
454 my @res; 481 my @res;
455 482
… …
466 } else { 493 } else {
467 EV::loop EV::LOOP_ONESHOT; 494 EV::loop EV::LOOP_ONESHOT;
468 } 495 }
469 } 496 }
470 497
471 $time = EV::time - $time; 498 my $time = EV::time - $time;
472 499
473 LOG llevError | logBacktrace, Carp::longmess "long sync job"
474 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
475
476 $tick_start += $time; # do not account sync jobs to server load 500 $TICK_START += $time; # do not account sync jobs to server load
477 501
478 wantarray ? @res : $res[0] 502 wantarray ? @res : $res[0]
479 } else { 503 } else {
480 # we are in another coroutine, how wonderful, everything just works 504 # we are in another coroutine, how wonderful, everything just works
481 505
… …
523 reset_signals; 547 reset_signals;
524 &$cb 548 &$cb
525 }, @args; 549 }, @args;
526 550
527 wantarray ? @res : $res[-1] 551 wantarray ? @res : $res[-1]
552}
553
554=item $coin = coin_from_name $name
555
556=cut
557
558our %coin_alias = (
559 "silver" => "silvercoin",
560 "silvercoin" => "silvercoin",
561 "silvercoins" => "silvercoin",
562 "gold" => "goldcoin",
563 "goldcoin" => "goldcoin",
564 "goldcoins" => "goldcoin",
565 "platinum" => "platinacoin",
566 "platinumcoin" => "platinacoin",
567 "platinumcoins" => "platinacoin",
568 "platina" => "platinacoin",
569 "platinacoin" => "platinacoin",
570 "platinacoins" => "platinacoin",
571 "royalty" => "royalty",
572 "royalties" => "royalty",
573);
574
575sub coin_from_name($) {
576 $coin_alias{$_[0]}
577 ? cf::arch::find $coin_alias{$_[0]}
578 : undef
528} 579}
529 580
530=item $value = cf::db_get $family => $key 581=item $value = cf::db_get $family => $key
531 582
532Returns a single value from the environment database. 583Returns a single value from the environment database.
… …
969 } 1020 }
970 1021
971 0 1022 0
972} 1023}
973 1024
974=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1025=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
975 1026
976=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
977 1028
978Generate an object-specific event with the given arguments. 1029Generate an object-specific event with the given arguments.
979 1030
… …
1304 my $msg = $@ ? "$v->{path}: $@\n" 1355 my $msg = $@ ? "$v->{path}: $@\n"
1305 : "$v->{base}: extension inactive.\n"; 1356 : "$v->{base}: extension inactive.\n";
1306 1357
1307 if (exists $v->{meta}{mandatory}) { 1358 if (exists $v->{meta}{mandatory}) {
1308 warn $msg; 1359 warn $msg;
1309 warn "mandatory extension failed to load, exiting.\n"; 1360 cf::cleanup "mandatory extension failed to load, exiting.";
1310 exit 1;
1311 } 1361 }
1312 1362
1313 warn $msg; 1363 warn $msg;
1314 } 1364 }
1315 1365
… …
1725our $MAX_RESET = 3600; 1775our $MAX_RESET = 3600;
1726our $DEFAULT_RESET = 3000; 1776our $DEFAULT_RESET = 3000;
1727 1777
1728sub generate_random_map { 1778sub generate_random_map {
1729 my ($self, $rmp) = @_; 1779 my ($self, $rmp) = @_;
1780
1781 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1782
1730 # mit "rum" bekleckern, nicht 1783 # mit "rum" bekleckern, nicht
1731 $self->_create_random_map ( 1784 $self->_create_random_map (
1732 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1785 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1733 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1786 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1734 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1787 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1856 1909
1857# the temporary/swap location 1910# the temporary/swap location
1858sub save_path { 1911sub save_path {
1859 my ($self) = @_; 1912 my ($self) = @_;
1860 1913
1861 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1914 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1862 "$TMPDIR/$path.map" 1915 "$TMPDIR/$path.map"
1863} 1916}
1864 1917
1865# the unique path, undef == no special unique path 1918# the unique path, undef == no special unique path
1866sub uniq_path { 1919sub uniq_path {
1867 my ($self) = @_; 1920 my ($self) = @_;
1868 1921
1869 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1922 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1870 "$UNIQUEDIR/$path" 1923 "$UNIQUEDIR/$path"
1871} 1924}
1872 1925
1873# and all this just because we cannot iterate over 1926# and all this just because we cannot iterate over
1874# all maps in C++... 1927# all maps in C++...
… …
2320 2373
2321sub unique_maps() { 2374sub unique_maps() {
2322 [ 2375 [
2323 map { 2376 map {
2324 utf8::decode $_; 2377 utf8::decode $_;
2325 /\.map$/ 2378 s/\.map$//; # TODO future compatibility hack
2379 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2380 ? ()
2326 ? normalise $_ 2381 : normalise $_
2327 : ()
2328 } @{ aio_readdir $UNIQUEDIR or [] } 2382 } @{ aio_readdir $UNIQUEDIR or [] }
2329 ] 2383 ]
2330} 2384}
2331 2385
2332package cf;
2333
2334=back 2386=back
2335 2387
2336=head3 cf::object 2388=head3 cf::object
2337 2389
2338=cut 2390=cut
… …
2341 2393
2342=over 4 2394=over 4
2343 2395
2344=item $ob->inv_recursive 2396=item $ob->inv_recursive
2345 2397
2346Returns the inventory of the object _and_ their inventories, recursively. 2398Returns the inventory of the object I<and> their inventories, recursively,
2399but I<not> the object itself.
2347 2400
2348=cut 2401=cut
2349 2402
2350sub inv_recursive_; 2403sub inv_recursive_;
2351sub inv_recursive_ { 2404sub inv_recursive_ {
… …
2356 inv_recursive_ inv $_[0] 2409 inv_recursive_ inv $_[0]
2357} 2410}
2358 2411
2359=item $ref = $ob->ref 2412=item $ref = $ob->ref
2360 2413
2361creates and returns a persistent reference to an objetc that can be stored as a string. 2414Creates and returns a persistent reference to an object that can be stored as a string.
2362 2415
2363=item $ob = cf::object::deref ($refstring) 2416=item $ob = cf::object::deref ($refstring)
2364 2417
2365returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2418returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2366even if the object actually exists. May block. 2419even if the object actually exists. May block.
… …
3218 $RESOURCE{$name} = $info; 3271 $RESOURCE{$name} = $info;
3219 } 3272 }
3220 3273
3221 cf::cede_to_tick; 3274 cf::cede_to_tick;
3222 } 3275 }
3223
3224 if (my $soundconf = delete $res->{"res/sound.conf"}) {
3225 $soundconf = $enc->decode (delete $soundconf->{data});
3226
3227 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3228 my $sound = $soundconf->{compat}[$_]
3229 or next;
3230
3231 my $face = cf::face::find "sound/$sound->[1]";
3232 cf::sound::set $sound->[0] => $face;
3233 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3234 }
3235
3236 while (my ($k, $v) = each %{$soundconf->{event}}) {
3237 my $face = cf::face::find "sound/$v";
3238 cf::sound::set $k => $face;
3239 }
3240 }
3241 } 3276 }
3277
3278 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3242 3279
3243 1 3280 1
3244} 3281}
3282
3283cf::global->attach (on_resource_update => sub {
3284 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3285 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3286
3287 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3288 my $sound = $soundconf->{compat}[$_]
3289 or next;
3290
3291 my $face = cf::face::find "sound/$sound->[1]";
3292 cf::sound::set $sound->[0] => $face;
3293 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3294 }
3295
3296 while (my ($k, $v) = each %{$soundconf->{event}}) {
3297 my $face = cf::face::find "sound/$v";
3298 cf::sound::set $k => $face;
3299 }
3300 }
3301});
3245 3302
3246register_exticmd fx_want => sub { 3303register_exticmd fx_want => sub {
3247 my ($ns, $want) = @_; 3304 my ($ns, $want) = @_;
3248 3305
3249 while (my ($k, $v) = each %$want) { 3306 while (my ($k, $v) = each %$want) {
… …
3304sub reload_config { 3361sub reload_config {
3305 open my $fh, "<:utf8", "$CONFDIR/config" 3362 open my $fh, "<:utf8", "$CONFDIR/config"
3306 or return; 3363 or return;
3307 3364
3308 local $/; 3365 local $/;
3309 *CFG = YAML::Syck::Load <$fh>; 3366 *CFG = YAML::Load <$fh>;
3310 3367
3311 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3368 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3312 3369
3313 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3370 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3314 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3371 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3334 3391
3335 reload_config; 3392 reload_config;
3336 db_init; 3393 db_init;
3337 load_extensions; 3394 load_extensions;
3338 3395
3339 $TICK_WATCHER->start;
3340 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3396 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3397 evthread_start IO::AIO::poll_fileno;
3341 EV::loop; 3398 EV::loop;
3342} 3399}
3343 3400
3344############################################################################# 3401#############################################################################
3345# initialisation and cleanup 3402# initialisation and cleanup
… …
3352 cf::cleanup "SIG$signal"; 3409 cf::cleanup "SIG$signal";
3353 }; 3410 };
3354 } 3411 }
3355} 3412}
3356 3413
3357sub write_runtime { 3414sub write_runtime_sync {
3358 my $runtime = "$LOCALDIR/runtime"; 3415 my $runtime = "$LOCALDIR/runtime";
3359 3416
3360 # first touch the runtime file to show we are still running: 3417 # first touch the runtime file to show we are still running:
3361 # the fsync below can take a very very long time. 3418 # the fsync below can take a very very long time.
3362 3419
… …
3388 and return; 3445 and return;
3389 3446
3390 warn "runtime file written.\n"; 3447 warn "runtime file written.\n";
3391 3448
3392 1 3449 1
3450}
3451
3452our $uuid_lock;
3453our $uuid_skip;
3454
3455sub write_uuid_sync($) {
3456 $uuid_skip ||= $_[0];
3457
3458 return if $uuid_lock;
3459 local $uuid_lock = 1;
3460
3461 my $uuid = "$LOCALDIR/uuid";
3462
3463 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3464 or return;
3465
3466 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3467 $uuid_skip = 0;
3468
3469 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3470 and return;
3471
3472 # always fsync - this file is important
3473 aio_fsync $fh
3474 and return;
3475
3476 close $fh
3477 or return;
3478
3479 aio_rename "$uuid~", $uuid
3480 and return;
3481
3482 warn "uuid file written ($value).\n";
3483
3484 1
3485
3486}
3487
3488sub write_uuid($$) {
3489 my ($skip, $sync) = @_;
3490
3491 $sync ? write_uuid_sync $skip
3492 : async { write_uuid_sync $skip };
3393} 3493}
3394 3494
3395sub emergency_save() { 3495sub emergency_save() {
3396 my $freeze_guard = cf::freeze_mainloop; 3496 my $freeze_guard = cf::freeze_mainloop;
3397 3497
… …
3419 warn "end emergency map save\n"; 3519 warn "end emergency map save\n";
3420 3520
3421 warn "begin emergency database checkpoint\n"; 3521 warn "begin emergency database checkpoint\n";
3422 BDB::db_env_txn_checkpoint $DB_ENV; 3522 BDB::db_env_txn_checkpoint $DB_ENV;
3423 warn "end emergency database checkpoint\n"; 3523 warn "end emergency database checkpoint\n";
3524
3525 warn "begin write uuid\n";
3526 write_uuid_sync 1;
3527 warn "end write uuid\n";
3424 }; 3528 };
3425 3529
3426 warn "leave emergency perl save\n"; 3530 warn "leave emergency perl save\n";
3427} 3531}
3428 3532
… …
3443 warn "reloading..."; 3547 warn "reloading...";
3444 3548
3445 warn "entering sync_job"; 3549 warn "entering sync_job";
3446 3550
3447 cf::sync_job { 3551 cf::sync_job {
3448 cf::write_runtime; # external watchdog should not bark 3552 cf::write_runtime_sync; # external watchdog should not bark
3449 cf::emergency_save; 3553 cf::emergency_save;
3450 cf::write_runtime; # external watchdog should not bark 3554 cf::write_runtime_sync; # external watchdog should not bark
3451 3555
3452 warn "syncing database to disk"; 3556 warn "syncing database to disk";
3453 BDB::db_env_txn_checkpoint $DB_ENV; 3557 BDB::db_env_txn_checkpoint $DB_ENV;
3454 3558
3455 # if anything goes wrong in here, we should simply crash as we already saved 3559 # if anything goes wrong in here, we should simply crash as we already saved
… …
3542 warn "leaving sync_job"; 3646 warn "leaving sync_job";
3543 3647
3544 1 3648 1
3545 } or do { 3649 } or do {
3546 warn $@; 3650 warn $@;
3547 warn "error while reloading, exiting."; 3651 cf::cleanup "error while reloading, exiting.";
3548 exit 1;
3549 }; 3652 };
3550 3653
3551 warn "reloaded"; 3654 warn "reloaded";
3552}; 3655};
3553 3656
… …
3556sub reload_perl() { 3659sub reload_perl() {
3557 # doing reload synchronously and two reloads happen back-to-back, 3660 # doing reload synchronously and two reloads happen back-to-back,
3558 # coro crashes during coro_state_free->destroy here. 3661 # coro crashes during coro_state_free->destroy here.
3559 3662
3560 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3663 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3664 do_reload_perl;
3561 undef $RELOAD_WATCHER; 3665 undef $RELOAD_WATCHER;
3562 do_reload_perl;
3563 }; 3666 };
3564} 3667}
3565 3668
3566register_command "reload" => sub { 3669register_command "reload" => sub {
3567 my ($who, $arg) = @_; 3670 my ($who, $arg) = @_;
… …
3581 3684
3582our @WAIT_FOR_TICK; 3685our @WAIT_FOR_TICK;
3583our @WAIT_FOR_TICK_BEGIN; 3686our @WAIT_FOR_TICK_BEGIN;
3584 3687
3585sub wait_for_tick { 3688sub wait_for_tick {
3586 return unless $TICK_WATCHER->is_active; 3689 return if tick_inhibit;
3587 return if $Coro::current == $Coro::main; 3690 return if $Coro::current == $Coro::main;
3588 3691
3589 my $signal = new Coro::Signal; 3692 my $signal = new Coro::Signal;
3590 push @WAIT_FOR_TICK, $signal; 3693 push @WAIT_FOR_TICK, $signal;
3591 $signal->wait; 3694 $signal->wait;
3592} 3695}
3593 3696
3594sub wait_for_tick_begin { 3697sub wait_for_tick_begin {
3595 return unless $TICK_WATCHER->is_active; 3698 return if tick_inhibit;
3596 return if $Coro::current == $Coro::main; 3699 return if $Coro::current == $Coro::main;
3597 3700
3598 my $signal = new Coro::Signal; 3701 my $signal = new Coro::Signal;
3599 push @WAIT_FOR_TICK_BEGIN, $signal; 3702 push @WAIT_FOR_TICK_BEGIN, $signal;
3600 $signal->wait; 3703 $signal->wait;
3601} 3704}
3602 3705
3603$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3706sub tick {
3604 if ($Coro::current != $Coro::main) { 3707 if ($Coro::current != $Coro::main) {
3605 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3708 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3606 unless ++$bug_warning > 10; 3709 unless ++$bug_warning > 10;
3607 return; 3710 return;
3608 } 3711 }
3609 3712
3610 $NOW = $tick_start = EV::now;
3611
3612 cf::server_tick; # one server iteration 3713 cf::server_tick; # one server iteration
3613
3614 $RUNTIME += $TICK;
3615 $NEXT_TICK = $_[0]->at;
3616 3714
3617 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3715 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3618 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3716 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3619 Coro::async_pool { 3717 Coro::async_pool {
3620 $Coro::current->{desc} = "runtime saver"; 3718 $Coro::current->{desc} = "runtime saver";
3621 write_runtime 3719 write_runtime_sync
3622 or warn "ERROR: unable to write runtime file: $!"; 3720 or warn "ERROR: unable to write runtime file: $!";
3623 }; 3721 };
3624 } 3722 }
3625 3723
3626 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3724 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3628 } 3726 }
3629 while (my $sig = shift @WAIT_FOR_TICK) { 3727 while (my $sig = shift @WAIT_FOR_TICK) {
3630 $sig->send; 3728 $sig->send;
3631 } 3729 }
3632 3730
3633 $LOAD = ($NOW - $tick_start) / $TICK; 3731 $LOAD = ($NOW - $TICK_START) / $TICK;
3634 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3732 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3635 3733
3636 _post_tick; 3734 if (0) {
3637}; 3735 if ($NEXT_TICK) {
3638$TICK_WATCHER->priority (EV::MAXPRI); 3736 my $jitter = $TICK_START - $NEXT_TICK;
3737 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3738 warn "jitter $JITTER\n";#d#
3739 }
3740 }
3741}
3639 3742
3640{ 3743{
3641 # configure BDB 3744 # configure BDB
3642 3745
3643 BDB::min_parallel 8; 3746 BDB::min_parallel 8;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines