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.409 by root, Mon Jan 14 11:41:48 2008 UTC vs.
Revision 1.423 by root, Sun Apr 20 00:44:13 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;
… …
69our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
71our %RESOURCE; 92our %RESOURCE;
72 93
73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
74our $TICK_WATCHER;
75our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
77our $NEXT_TICK; 97our $NEXT_TICK;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
79 99
… …
96# 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 ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 118
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
102 123
103binmode STDOUT; 124binmode STDOUT;
104binmode STDERR; 125binmode STDERR;
105 126
106# read virtual server time, if available 127# read virtual server time, if available
… …
192 LOG llevError, $msg; 213 LOG llevError, $msg;
193 }; 214 };
194} 215}
195 216
196$Coro::State::DIEHOOK = sub { 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
197 warn Carp::longmess $_[0]; 226 warn Carp::longmess $_[0];
198 Coro::terminate; 227 Coro::terminate
199}; 228};
229
230$SIG{__DIE__} = sub { }; #d#?
200 231
201@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
202@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
203@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
204@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
329 360
330 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
331} 362}
332 363
333sub freeze_mainloop { 364sub freeze_mainloop {
334 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
335 366
336 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
337 $TICK_WATCHER->start;
338 };
339 $TICK_WATCHER->stop;
340 $guard
341} 368}
342 369
343=item cf::periodic $interval, $cb 370=item cf::periodic $interval, $cb
344 371
345Like 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
… …
400 } 427 }
401 } 428 }
402}; 429};
403 430
404sub get_slot($;$$) { 431sub get_slot($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main;
433
405 my ($time, $pri, $name) = @_; 434 my ($time, $pri, $name) = @_;
406 435
407 $time = $TICK * .6 if $time > $TICK * .6; 436 $time = $TICK * .6 if $time > $TICK * .6;
408 my $sig = new Coro::Signal; 437 my $sig = new Coro::Signal;
409 438
… …
446 # this is the main coro, too bad, we have to block 475 # this is the main coro, too bad, we have to block
447 # till the operation succeeds, freezing the server :/ 476 # till the operation succeeds, freezing the server :/
448 477
449 LOG llevError, Carp::longmess "sync job";#d# 478 LOG llevError, Carp::longmess "sync job";#d#
450 479
451 # TODO: use suspend/resume instead
452 # (but this is cancel-safe)
453 my $freeze_guard = freeze_mainloop; 480 my $freeze_guard = freeze_mainloop;
454 481
455 my $busy = 1; 482 my $busy = 1;
456 my @res; 483 my @res;
457 484
… …
468 } else { 495 } else {
469 EV::loop EV::LOOP_ONESHOT; 496 EV::loop EV::LOOP_ONESHOT;
470 } 497 }
471 } 498 }
472 499
473 $time = EV::time - $time; 500 my $time = EV::time - $time;
474 501
475 LOG llevError | logBacktrace, Carp::longmess "long sync job"
476 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
477
478 $tick_start += $time; # do not account sync jobs to server load 502 $TICK_START += $time; # do not account sync jobs to server load
479 503
480 wantarray ? @res : $res[0] 504 wantarray ? @res : $res[0]
481 } else { 505 } else {
482 # we are in another coroutine, how wonderful, everything just works 506 # we are in another coroutine, how wonderful, everything just works
483 507
… …
525 reset_signals; 549 reset_signals;
526 &$cb 550 &$cb
527 }, @args; 551 }, @args;
528 552
529 wantarray ? @res : $res[-1] 553 wantarray ? @res : $res[-1]
554}
555
556=item $coin = coin_from_name $name
557
558=cut
559
560our %coin_alias = (
561 "silver" => "silvercoin",
562 "silvercoin" => "silvercoin",
563 "silvercoins" => "silvercoin",
564 "gold" => "goldcoin",
565 "goldcoin" => "goldcoin",
566 "goldcoins" => "goldcoin",
567 "platinum" => "platinacoin",
568 "platinumcoin" => "platinacoin",
569 "platinumcoins" => "platinacoin",
570 "platina" => "platinacoin",
571 "platinacoin" => "platinacoin",
572 "platinacoins" => "platinacoin",
573 "royalty" => "royalty",
574 "royalties" => "royalty",
575);
576
577sub coin_from_name($) {
578 $coin_alias{$_[0]}
579 ? cf::arch::find $coin_alias{$_[0]}
580 : undef
530} 581}
531 582
532=item $value = cf::db_get $family => $key 583=item $value = cf::db_get $family => $key
533 584
534Returns a single value from the environment database. 585Returns a single value from the environment database.
… …
1306 my $msg = $@ ? "$v->{path}: $@\n" 1357 my $msg = $@ ? "$v->{path}: $@\n"
1307 : "$v->{base}: extension inactive.\n"; 1358 : "$v->{base}: extension inactive.\n";
1308 1359
1309 if (exists $v->{meta}{mandatory}) { 1360 if (exists $v->{meta}{mandatory}) {
1310 warn $msg; 1361 warn $msg;
1311 warn "mandatory extension failed to load, exiting.\n"; 1362 cf::cleanup "mandatory extension failed to load, exiting.";
1312 exit 1;
1313 } 1363 }
1314 1364
1315 warn $msg; 1365 warn $msg;
1316 } 1366 }
1317 1367
… …
1425 1475
1426 return if $pl->{deny_save}; 1476 return if $pl->{deny_save};
1427 1477
1428 aio_mkdir playerdir $pl, 0770; 1478 aio_mkdir playerdir $pl, 0770;
1429 $pl->{last_save} = $cf::RUNTIME; 1479 $pl->{last_save} = $cf::RUNTIME;
1480
1481 cf::get_slot 0.01;
1430 1482
1431 $pl->save_pl ($path); 1483 $pl->save_pl ($path);
1432 cf::cede_to_tick; 1484 cf::cede_to_tick;
1433} 1485}
1434 1486
… …
1727our $MAX_RESET = 3600; 1779our $MAX_RESET = 3600;
1728our $DEFAULT_RESET = 3000; 1780our $DEFAULT_RESET = 3000;
1729 1781
1730sub generate_random_map { 1782sub generate_random_map {
1731 my ($self, $rmp) = @_; 1783 my ($self, $rmp) = @_;
1784
1785 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1786
1732 # mit "rum" bekleckern, nicht 1787 # mit "rum" bekleckern, nicht
1733 $self->_create_random_map ( 1788 $self->_create_random_map (
1734 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1735 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1736 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1858 1913
1859# the temporary/swap location 1914# the temporary/swap location
1860sub save_path { 1915sub save_path {
1861 my ($self) = @_; 1916 my ($self) = @_;
1862 1917
1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1918 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1864 "$TMPDIR/$path.map" 1919 "$TMPDIR/$path.map"
1865} 1920}
1866 1921
1867# the unique path, undef == no special unique path 1922# the unique path, undef == no special unique path
1868sub uniq_path { 1923sub uniq_path {
1869 my ($self) = @_; 1924 my ($self) = @_;
1870 1925
1871 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1872 "$UNIQUEDIR/$path" 1927 "$UNIQUEDIR/$path"
1873} 1928}
1874 1929
1875# and all this just because we cannot iterate over 1930# and all this just because we cannot iterate over
1876# all maps in C++... 1931# all maps in C++...
… …
2062 } 2117 }
2063 2118
2064 $self->{last_save} = $cf::RUNTIME; 2119 $self->{last_save} = $cf::RUNTIME;
2065 $self->last_access ($cf::RUNTIME); 2120 $self->last_access ($cf::RUNTIME);
2066 2121
2067 $self->in_memory (cf::MAP_IN_MEMORY); 2122 $self->in_memory (cf::MAP_ACTIVE);
2068 } 2123 }
2069 2124
2070 $self->post_load; 2125 $self->post_load;
2071} 2126}
2072 2127
… …
2130 my ($path, $origin, $load) = @_; 2185 my ($path, $origin, $load) = @_;
2131 2186
2132 $path = normalise $path, $origin && $origin->{path}; 2187 $path = normalise $path, $origin && $origin->{path};
2133 2188
2134 if (my $map = $cf::MAP{$path}) { 2189 if (my $map = $cf::MAP{$path}) {
2135 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2190 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2136 } 2191 }
2137 2192
2138 $MAP_PREFETCH{$path} |= $load; 2193 $MAP_PREFETCH{$path} |= $load;
2139 2194
2140 $MAP_PREFETCHER ||= cf::async { 2195 $MAP_PREFETCHER ||= cf::async {
… …
2177 cf::async { 2232 cf::async {
2178 $Coro::current->{desc} = "map player save"; 2233 $Coro::current->{desc} = "map player save";
2179 $_->contr->save for $self->players; 2234 $_->contr->save for $self->players;
2180 }; 2235 };
2181 2236
2237 cf::get_slot 0.02;
2238
2182 if ($uniq) { 2239 if ($uniq) {
2183 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2240 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2184 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2241 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2185 } else { 2242 } else {
2186 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2243 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2194 $self->save; 2251 $self->save;
2195 2252
2196 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2253 my $lock = cf::lock_acquire "map_data:$self->{path}";
2197 2254
2198 return if $self->players; 2255 return if $self->players;
2199 return if $self->in_memory != cf::MAP_IN_MEMORY; 2256 return if $self->in_memory != cf::MAP_ACTIVE;
2200 return if $self->{deny_save}; 2257 return if $self->{deny_save};
2201 2258
2202 $self->in_memory (cf::MAP_SWAPPED); 2259 $self->in_memory (cf::MAP_SWAPPED);
2203 2260
2204 $self->deactivate; 2261 $self->deactivate;
… …
2322 2379
2323sub unique_maps() { 2380sub unique_maps() {
2324 [ 2381 [
2325 map { 2382 map {
2326 utf8::decode $_; 2383 utf8::decode $_;
2327 /\.map$/ 2384 s/\.map$//; # TODO future compatibility hack
2385 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2386 ? ()
2328 ? normalise $_ 2387 : normalise $_
2329 : ()
2330 } @{ aio_readdir $UNIQUEDIR or [] } 2388 } @{ aio_readdir $UNIQUEDIR or [] }
2331 ] 2389 ]
2332} 2390}
2333 2391
2334package cf;
2335
2336=back 2392=back
2337 2393
2338=head3 cf::object 2394=head3 cf::object
2339 2395
2340=cut 2396=cut
… …
2343 2399
2344=over 4 2400=over 4
2345 2401
2346=item $ob->inv_recursive 2402=item $ob->inv_recursive
2347 2403
2348Returns the inventory of the object _and_ their inventories, recursively. 2404Returns the inventory of the object I<and> their inventories, recursively,
2405but I<not> the object itself.
2349 2406
2350=cut 2407=cut
2351 2408
2352sub inv_recursive_; 2409sub inv_recursive_;
2353sub inv_recursive_ { 2410sub inv_recursive_ {
… …
2358 inv_recursive_ inv $_[0] 2415 inv_recursive_ inv $_[0]
2359} 2416}
2360 2417
2361=item $ref = $ob->ref 2418=item $ref = $ob->ref
2362 2419
2363creates and returns a persistent reference to an objetc that can be stored as a string. 2420Creates and returns a persistent reference to an object that can be stored as a string.
2364 2421
2365=item $ob = cf::object::deref ($refstring) 2422=item $ob = cf::object::deref ($refstring)
2366 2423
2367returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2424returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2368even if the object actually exists. May block. 2425even if the object actually exists. May block.
… …
2642 $rmp->{origin_y} = $exit->y; 2699 $rmp->{origin_y} = $exit->y;
2643 } 2700 }
2644 2701
2645 $rmp->{random_seed} ||= $exit->random_seed; 2702 $rmp->{random_seed} ||= $exit->random_seed;
2646 2703
2647 my $data = cf::encode_json $rmp; 2704 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2648 my $md5 = Digest::MD5::md5_hex $data; 2705 my $md5 = Digest::MD5::md5_hex $data;
2649 my $meta = "$RANDOMDIR/$md5.meta"; 2706 my $meta = "$RANDOMDIR/$md5.meta";
2650 2707
2651 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2652 aio_write $fh, 0, (length $data), $data, 0; 2709 aio_write $fh, 0, (length $data), $data, 0;
… …
3255 while (my ($k, $v) = each %$want) { 3312 while (my ($k, $v) = each %$want) {
3256 $ns->fx_want ($k, $v); 3313 $ns->fx_want ($k, $v);
3257 } 3314 }
3258}; 3315};
3259 3316
3317sub load_resource_file($) {
3318 my $status = load_resource_file_ $_[0];
3319 get_slot 0.1, 100;
3320 cf::arch::commit_load;
3321 $status
3322}
3323
3260sub reload_regions { 3324sub reload_regions {
3261 # HACK to clear player env face cache, we need some signal framework 3325 # HACK to clear player env face cache, we need some signal framework
3262 # for this (global event?) 3326 # for this (global event?)
3263 %ext::player_env::MUSIC_FACE_CACHE = (); 3327 %ext::player_env::MUSIC_FACE_CACHE = ();
3264 3328
… …
3277} 3341}
3278 3342
3279sub reload_archetypes { 3343sub reload_archetypes {
3280 load_resource_file "$DATADIR/archetypes" 3344 load_resource_file "$DATADIR/archetypes"
3281 or die "unable to load archetypes\n"; 3345 or die "unable to load archetypes\n";
3282 #d# NEED to laod twice to resolve forward references
3283 # this really needs to be done in an extra post-pass
3284 # (which needs to be synchronous, so solve it differently)
3285 load_resource_file "$DATADIR/archetypes"
3286 or die "unable to load archetypes\n";
3287} 3346}
3288 3347
3289sub reload_treasures { 3348sub reload_treasures {
3290 load_resource_file "$DATADIR/treasures" 3349 load_resource_file "$DATADIR/treasures"
3291 or die "unable to load treasurelists\n"; 3350 or die "unable to load treasurelists\n";
3292} 3351}
3293 3352
3294sub reload_resources { 3353sub reload_resources {
3295 warn "reloading resource files...\n"; 3354 warn "reloading resource files...\n";
3296 3355
3356 reload_facedata;
3357 reload_archetypes;
3297 reload_regions; 3358 reload_regions;
3298 reload_facedata;
3299 #reload_archetypes;#d#
3300 reload_archetypes;
3301 reload_treasures; 3359 reload_treasures;
3302 3360
3303 warn "finished reloading resource files\n"; 3361 warn "finished reloading resource files\n";
3304} 3362}
3305 3363
3306sub init { 3364sub init {
3365 my $guard = freeze_mainloop;
3366
3307 reload_resources; 3367 reload_resources;
3308} 3368}
3309 3369
3310sub reload_config { 3370sub reload_config {
3311 open my $fh, "<:utf8", "$CONFDIR/config" 3371 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3336 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3396 $Coro::current->{desc} = "IDLE BUG HANDLER";
3337 EV::loop EV::LOOP_ONESHOT; 3397 EV::loop EV::LOOP_ONESHOT;
3338 })->prio (Coro::PRIO_MAX); 3398 })->prio (Coro::PRIO_MAX);
3339 }; 3399 };
3340 3400
3401 {
3402 my $guard = freeze_mainloop;
3341 reload_config; 3403 reload_config;
3342 db_init; 3404 db_init;
3343 load_extensions; 3405 load_extensions;
3344 3406
3345 $TICK_WATCHER->start;
3346 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3407 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3408 evthread_start IO::AIO::poll_fileno;
3409 }
3410
3347 EV::loop; 3411 EV::loop;
3348} 3412}
3349 3413
3350############################################################################# 3414#############################################################################
3351# initialisation and cleanup 3415# initialisation and cleanup
… …
3358 cf::cleanup "SIG$signal"; 3422 cf::cleanup "SIG$signal";
3359 }; 3423 };
3360 } 3424 }
3361} 3425}
3362 3426
3363sub write_runtime { 3427sub write_runtime_sync {
3364 my $runtime = "$LOCALDIR/runtime"; 3428 my $runtime = "$LOCALDIR/runtime";
3365 3429
3366 # first touch the runtime file to show we are still running: 3430 # first touch the runtime file to show we are still running:
3367 # the fsync below can take a very very long time. 3431 # the fsync below can take a very very long time.
3368 3432
… …
3394 and return; 3458 and return;
3395 3459
3396 warn "runtime file written.\n"; 3460 warn "runtime file written.\n";
3397 3461
3398 1 3462 1
3463}
3464
3465our $uuid_lock;
3466our $uuid_skip;
3467
3468sub write_uuid_sync($) {
3469 $uuid_skip ||= $_[0];
3470
3471 return if $uuid_lock;
3472 local $uuid_lock = 1;
3473
3474 my $uuid = "$LOCALDIR/uuid";
3475
3476 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3477 or return;
3478
3479 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3480 $uuid_skip = 0;
3481
3482 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3483 and return;
3484
3485 # always fsync - this file is important
3486 aio_fsync $fh
3487 and return;
3488
3489 close $fh
3490 or return;
3491
3492 aio_rename "$uuid~", $uuid
3493 and return;
3494
3495 warn "uuid file written ($value).\n";
3496
3497 1
3498
3499}
3500
3501sub write_uuid($$) {
3502 my ($skip, $sync) = @_;
3503
3504 $sync ? write_uuid_sync $skip
3505 : async { write_uuid_sync $skip };
3399} 3506}
3400 3507
3401sub emergency_save() { 3508sub emergency_save() {
3402 my $freeze_guard = cf::freeze_mainloop; 3509 my $freeze_guard = cf::freeze_mainloop;
3403 3510
… …
3425 warn "end emergency map save\n"; 3532 warn "end emergency map save\n";
3426 3533
3427 warn "begin emergency database checkpoint\n"; 3534 warn "begin emergency database checkpoint\n";
3428 BDB::db_env_txn_checkpoint $DB_ENV; 3535 BDB::db_env_txn_checkpoint $DB_ENV;
3429 warn "end emergency database checkpoint\n"; 3536 warn "end emergency database checkpoint\n";
3537
3538 warn "begin write uuid\n";
3539 write_uuid_sync 1;
3540 warn "end write uuid\n";
3430 }; 3541 };
3431 3542
3432 warn "leave emergency perl save\n"; 3543 warn "leave emergency perl save\n";
3433} 3544}
3434 3545
… …
3449 warn "reloading..."; 3560 warn "reloading...";
3450 3561
3451 warn "entering sync_job"; 3562 warn "entering sync_job";
3452 3563
3453 cf::sync_job { 3564 cf::sync_job {
3454 cf::write_runtime; # external watchdog should not bark 3565 cf::write_runtime_sync; # external watchdog should not bark
3455 cf::emergency_save; 3566 cf::emergency_save;
3456 cf::write_runtime; # external watchdog should not bark 3567 cf::write_runtime_sync; # external watchdog should not bark
3457 3568
3458 warn "syncing database to disk"; 3569 warn "syncing database to disk";
3459 BDB::db_env_txn_checkpoint $DB_ENV; 3570 BDB::db_env_txn_checkpoint $DB_ENV;
3460 3571
3461 # if anything goes wrong in here, we should simply crash as we already saved 3572 # if anything goes wrong in here, we should simply crash as we already saved
… …
3548 warn "leaving sync_job"; 3659 warn "leaving sync_job";
3549 3660
3550 1 3661 1
3551 } or do { 3662 } or do {
3552 warn $@; 3663 warn $@;
3553 warn "error while reloading, exiting."; 3664 cf::cleanup "error while reloading, exiting.";
3554 exit 1;
3555 }; 3665 };
3556 3666
3557 warn "reloaded"; 3667 warn "reloaded";
3558}; 3668};
3559 3669
… …
3587 3697
3588our @WAIT_FOR_TICK; 3698our @WAIT_FOR_TICK;
3589our @WAIT_FOR_TICK_BEGIN; 3699our @WAIT_FOR_TICK_BEGIN;
3590 3700
3591sub wait_for_tick { 3701sub wait_for_tick {
3592 return unless $TICK_WATCHER->is_active;
3593 return if $Coro::current == $Coro::main; 3702 return if tick_inhibit || $Coro::current == $Coro::main;
3594 3703
3595 my $signal = new Coro::Signal; 3704 my $signal = new Coro::Signal;
3596 push @WAIT_FOR_TICK, $signal; 3705 push @WAIT_FOR_TICK, $signal;
3597 $signal->wait; 3706 $signal->wait;
3598} 3707}
3599 3708
3600sub wait_for_tick_begin { 3709sub wait_for_tick_begin {
3601 return unless $TICK_WATCHER->is_active;
3602 return if $Coro::current == $Coro::main; 3710 return if tick_inhibit || $Coro::current == $Coro::main;
3603 3711
3604 my $signal = new Coro::Signal; 3712 my $signal = new Coro::Signal;
3605 push @WAIT_FOR_TICK_BEGIN, $signal; 3713 push @WAIT_FOR_TICK_BEGIN, $signal;
3606 $signal->wait; 3714 $signal->wait;
3607} 3715}
3608 3716
3609$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3717sub tick {
3610 if ($Coro::current != $Coro::main) { 3718 if ($Coro::current != $Coro::main) {
3611 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3719 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3612 unless ++$bug_warning > 10; 3720 unless ++$bug_warning > 10;
3613 return; 3721 return;
3614 } 3722 }
3615 3723
3616 $NOW = $tick_start = EV::now;
3617
3618 cf::server_tick; # one server iteration 3724 cf::server_tick; # one server iteration
3619
3620 $RUNTIME += $TICK;
3621 $NEXT_TICK = $_[0]->at;
3622 3725
3623 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3726 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3624 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3727 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3625 Coro::async_pool { 3728 Coro::async_pool {
3626 $Coro::current->{desc} = "runtime saver"; 3729 $Coro::current->{desc} = "runtime saver";
3627 write_runtime 3730 write_runtime_sync
3628 or warn "ERROR: unable to write runtime file: $!"; 3731 or warn "ERROR: unable to write runtime file: $!";
3629 }; 3732 };
3630 } 3733 }
3631 3734
3632 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3735 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3634 } 3737 }
3635 while (my $sig = shift @WAIT_FOR_TICK) { 3738 while (my $sig = shift @WAIT_FOR_TICK) {
3636 $sig->send; 3739 $sig->send;
3637 } 3740 }
3638 3741
3639 $LOAD = ($NOW - $tick_start) / $TICK; 3742 $LOAD = ($NOW - $TICK_START) / $TICK;
3640 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3743 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3641 3744
3642 _post_tick; 3745 if (0) {
3643}; 3746 if ($NEXT_TICK) {
3644$TICK_WATCHER->priority (EV::MAXPRI); 3747 my $jitter = $TICK_START - $NEXT_TICK;
3748 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3749 warn "jitter $JITTER\n";#d#
3750 }
3751 }
3752}
3645 3753
3646{ 3754{
3647 # configure BDB 3755 # configure BDB
3648 3756
3649 BDB::min_parallel 8; 3757 BDB::min_parallel 8;

Diff Legend

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