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

Comparing cf.schmorp.de/server/lib/cf.pm (file contents):
Revision 1.411 by root, Fri Feb 1 15:54:07 2008 UTC vs.
Revision 1.426 by root, Thu Apr 24 04:40:31 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
… …
339 360
340 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
341} 362}
342 363
343sub freeze_mainloop { 364sub freeze_mainloop {
344 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
345 366
346 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
347 $TICK_WATCHER->start;
348 };
349 $TICK_WATCHER->stop;
350 $guard
351} 368}
352 369
353=item cf::periodic $interval, $cb 370=item cf::periodic $interval, $cb
354 371
355Like 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
… …
410 } 427 }
411 } 428 }
412}; 429};
413 430
414sub get_slot($;$$) { 431sub get_slot($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main;
433
415 my ($time, $pri, $name) = @_; 434 my ($time, $pri, $name) = @_;
416 435
417 $time = $TICK * .6 if $time > $TICK * .6; 436 $time = $TICK * .6 if $time > $TICK * .6;
418 my $sig = new Coro::Signal; 437 my $sig = new Coro::Signal;
419 438
… …
456 # this is the main coro, too bad, we have to block 475 # this is the main coro, too bad, we have to block
457 # till the operation succeeds, freezing the server :/ 476 # till the operation succeeds, freezing the server :/
458 477
459 LOG llevError, Carp::longmess "sync job";#d# 478 LOG llevError, Carp::longmess "sync job";#d#
460 479
461 # TODO: use suspend/resume instead
462 # (but this is cancel-safe)
463 my $freeze_guard = freeze_mainloop; 480 my $freeze_guard = freeze_mainloop;
464 481
465 my $busy = 1; 482 my $busy = 1;
466 my @res; 483 my @res;
467 484
… …
478 } else { 495 } else {
479 EV::loop EV::LOOP_ONESHOT; 496 EV::loop EV::LOOP_ONESHOT;
480 } 497 }
481 } 498 }
482 499
483 $time = EV::time - $time; 500 my $time = EV::time - $time;
484 501
485 LOG llevError | logBacktrace, Carp::longmess "long sync job"
486 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
487
488 $tick_start += $time; # do not account sync jobs to server load 502 $TICK_START += $time; # do not account sync jobs to server load
489 503
490 wantarray ? @res : $res[0] 504 wantarray ? @res : $res[0]
491 } else { 505 } else {
492 # we are in another coroutine, how wonderful, everything just works 506 # we are in another coroutine, how wonderful, everything just works
493 507
… …
535 reset_signals; 549 reset_signals;
536 &$cb 550 &$cb
537 }, @args; 551 }, @args;
538 552
539 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
540} 581}
541 582
542=item $value = cf::db_get $family => $key 583=item $value = cf::db_get $family => $key
543 584
544Returns a single value from the environment database. 585Returns a single value from the environment database.
… …
1434 1475
1435 return if $pl->{deny_save}; 1476 return if $pl->{deny_save};
1436 1477
1437 aio_mkdir playerdir $pl, 0770; 1478 aio_mkdir playerdir $pl, 0770;
1438 $pl->{last_save} = $cf::RUNTIME; 1479 $pl->{last_save} = $cf::RUNTIME;
1480
1481 cf::get_slot 0.01;
1439 1482
1440 $pl->save_pl ($path); 1483 $pl->save_pl ($path);
1441 cf::cede_to_tick; 1484 cf::cede_to_tick;
1442} 1485}
1443 1486
… …
1736our $MAX_RESET = 3600; 1779our $MAX_RESET = 3600;
1737our $DEFAULT_RESET = 3000; 1780our $DEFAULT_RESET = 3000;
1738 1781
1739sub generate_random_map { 1782sub generate_random_map {
1740 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
1741 # mit "rum" bekleckern, nicht 1787 # mit "rum" bekleckern, nicht
1742 $self->_create_random_map ( 1788 $self->_create_random_map (
1743 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1744 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1745 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1867 1913
1868# the temporary/swap location 1914# the temporary/swap location
1869sub save_path { 1915sub save_path {
1870 my ($self) = @_; 1916 my ($self) = @_;
1871 1917
1872 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1918 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1873 "$TMPDIR/$path.map" 1919 "$TMPDIR/$path.map"
1874} 1920}
1875 1921
1876# the unique path, undef == no special unique path 1922# the unique path, undef == no special unique path
1877sub uniq_path { 1923sub uniq_path {
1878 my ($self) = @_; 1924 my ($self) = @_;
1879 1925
1880 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1881 "$UNIQUEDIR/$path" 1927 "$UNIQUEDIR/$path"
1882} 1928}
1883 1929
1884# and all this just because we cannot iterate over 1930# and all this just because we cannot iterate over
1885# all maps in C++... 1931# all maps in C++...
… …
2071 } 2117 }
2072 2118
2073 $self->{last_save} = $cf::RUNTIME; 2119 $self->{last_save} = $cf::RUNTIME;
2074 $self->last_access ($cf::RUNTIME); 2120 $self->last_access ($cf::RUNTIME);
2075 2121
2076 $self->in_memory (cf::MAP_IN_MEMORY); 2122 $self->in_memory (cf::MAP_ACTIVE);
2077 } 2123 }
2078 2124
2079 $self->post_load; 2125 $self->post_load;
2080} 2126}
2081 2127
… …
2139 my ($path, $origin, $load) = @_; 2185 my ($path, $origin, $load) = @_;
2140 2186
2141 $path = normalise $path, $origin && $origin->{path}; 2187 $path = normalise $path, $origin && $origin->{path};
2142 2188
2143 if (my $map = $cf::MAP{$path}) { 2189 if (my $map = $cf::MAP{$path}) {
2144 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2190 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2145 } 2191 }
2146 2192
2147 $MAP_PREFETCH{$path} |= $load; 2193 $MAP_PREFETCH{$path} |= $load;
2148 2194
2149 $MAP_PREFETCHER ||= cf::async { 2195 $MAP_PREFETCHER ||= cf::async {
… …
2186 cf::async { 2232 cf::async {
2187 $Coro::current->{desc} = "map player save"; 2233 $Coro::current->{desc} = "map player save";
2188 $_->contr->save for $self->players; 2234 $_->contr->save for $self->players;
2189 }; 2235 };
2190 2236
2237 cf::get_slot 0.02;
2238
2191 if ($uniq) { 2239 if ($uniq) {
2192 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2240 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2193 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2241 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2194 } else { 2242 } else {
2195 $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);
… …
2203 $self->save; 2251 $self->save;
2204 2252
2205 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2253 my $lock = cf::lock_acquire "map_data:$self->{path}";
2206 2254
2207 return if $self->players; 2255 return if $self->players;
2208 return if $self->in_memory != cf::MAP_IN_MEMORY; 2256 return if $self->in_memory != cf::MAP_ACTIVE;
2209 return if $self->{deny_save}; 2257 return if $self->{deny_save};
2210 2258
2211 $self->in_memory (cf::MAP_SWAPPED); 2259 $self->in_memory (cf::MAP_SWAPPED);
2212 2260
2213 $self->deactivate; 2261 $self->deactivate;
… …
2331 2379
2332sub unique_maps() { 2380sub unique_maps() {
2333 [ 2381 [
2334 map { 2382 map {
2335 utf8::decode $_; 2383 utf8::decode $_;
2336 /\.map$/ 2384 s/\.map$//; # TODO future compatibility hack
2385 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2386 ? ()
2337 ? normalise $_ 2387 : normalise $_
2338 : ()
2339 } @{ aio_readdir $UNIQUEDIR or [] } 2388 } @{ aio_readdir $UNIQUEDIR or [] }
2340 ] 2389 ]
2341} 2390}
2342 2391
2343package cf;
2344
2345=back 2392=back
2346 2393
2347=head3 cf::object 2394=head3 cf::object
2348 2395
2349=cut 2396=cut
… …
2352 2399
2353=over 4 2400=over 4
2354 2401
2355=item $ob->inv_recursive 2402=item $ob->inv_recursive
2356 2403
2357Returns 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.
2358 2406
2359=cut 2407=cut
2360 2408
2361sub inv_recursive_; 2409sub inv_recursive_;
2362sub inv_recursive_ { 2410sub inv_recursive_ {
… …
2367 inv_recursive_ inv $_[0] 2415 inv_recursive_ inv $_[0]
2368} 2416}
2369 2417
2370=item $ref = $ob->ref 2418=item $ref = $ob->ref
2371 2419
2372creates 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.
2373 2421
2374=item $ob = cf::object::deref ($refstring) 2422=item $ob = cf::object::deref ($refstring)
2375 2423
2376returns 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,
2377even if the object actually exists. May block. 2425even if the object actually exists. May block.
… …
2651 $rmp->{origin_y} = $exit->y; 2699 $rmp->{origin_y} = $exit->y;
2652 } 2700 }
2653 2701
2654 $rmp->{random_seed} ||= $exit->random_seed; 2702 $rmp->{random_seed} ||= $exit->random_seed;
2655 2703
2656 my $data = cf::encode_json $rmp; 2704 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2657 my $md5 = Digest::MD5::md5_hex $data; 2705 my $md5 = Digest::MD5::md5_hex $data;
2658 my $meta = "$RANDOMDIR/$md5.meta"; 2706 my $meta = "$RANDOMDIR/$md5.meta";
2659 2707
2660 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2661 aio_write $fh, 0, (length $data), $data, 0; 2709 aio_write $fh, 0, (length $data), $data, 0;
… …
2784 id => "infobox", 2832 id => "infobox",
2785 title => "Map Info", 2833 title => "Map Info",
2786 reply => undef, 2834 reply => undef,
2787 tooltip => "Information related to the maps", 2835 tooltip => "Information related to the maps",
2788 }, 2836 },
2837 "c/party" => {
2838 id => "party",
2839 title => "Party",
2840 reply => "gsay ",
2841 tooltip => "Messages and chat related to your party",
2842 },
2789); 2843);
2790 2844
2791sub cf::client::send_msg { 2845sub cf::client::send_msg {
2792 my ($self, $channel, $msg, $color, @extra) = @_; 2846 my ($self, $channel, $msg, $color, @extra) = @_;
2793 2847
… …
3030 3084
3031The following functions and methods are available within a safe environment: 3085The following functions and methods are available within a safe environment:
3032 3086
3033 cf::object 3087 cf::object
3034 contr pay_amount pay_player map x y force_find force_add destroy 3088 contr pay_amount pay_player map x y force_find force_add destroy
3035 insert remove name archname title slaying race decrease_ob_nr 3089 insert remove name archname title slaying race decrease split
3036 3090
3037 cf::object::player 3091 cf::object::player
3038 player 3092 player
3039 3093
3040 cf::player 3094 cf::player
… …
3046=cut 3100=cut
3047 3101
3048for ( 3102for (
3049 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3103 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3050 insert remove inv name archname title slaying race 3104 insert remove inv name archname title slaying race
3051 decrease_ob_nr destroy)], 3105 decrease split destroy)],
3052 ["cf::object::player" => qw(player)], 3106 ["cf::object::player" => qw(player)],
3053 ["cf::player" => qw(peaceful)], 3107 ["cf::player" => qw(peaceful)],
3054 ["cf::map" => qw(trigger)], 3108 ["cf::map" => qw(trigger)],
3055) { 3109) {
3056 no strict 'refs'; 3110 no strict 'refs';
… …
3264 while (my ($k, $v) = each %$want) { 3318 while (my ($k, $v) = each %$want) {
3265 $ns->fx_want ($k, $v); 3319 $ns->fx_want ($k, $v);
3266 } 3320 }
3267}; 3321};
3268 3322
3323sub load_resource_file($) {
3324 my $guard = lock_acquire "load_resource_file";
3325
3326 my $status = load_resource_file_ $_[0];
3327 get_slot 0.1, 100;
3328 cf::arch::commit_load;
3329
3330 $status
3331}
3332
3269sub reload_regions { 3333sub reload_regions {
3270 # HACK to clear player env face cache, we need some signal framework 3334 # HACK to clear player env face cache, we need some signal framework
3271 # for this (global event?) 3335 # for this (global event?)
3272 %ext::player_env::MUSIC_FACE_CACHE = (); 3336 %ext::player_env::MUSIC_FACE_CACHE = ();
3273 3337
… …
3286} 3350}
3287 3351
3288sub reload_archetypes { 3352sub reload_archetypes {
3289 load_resource_file "$DATADIR/archetypes" 3353 load_resource_file "$DATADIR/archetypes"
3290 or die "unable to load archetypes\n"; 3354 or die "unable to load archetypes\n";
3291 #d# NEED to laod twice to resolve forward references
3292 # this really needs to be done in an extra post-pass
3293 # (which needs to be synchronous, so solve it differently)
3294 load_resource_file "$DATADIR/archetypes"
3295 or die "unable to load archetypes\n";
3296} 3355}
3297 3356
3298sub reload_treasures { 3357sub reload_treasures {
3299 load_resource_file "$DATADIR/treasures" 3358 load_resource_file "$DATADIR/treasures"
3300 or die "unable to load treasurelists\n"; 3359 or die "unable to load treasurelists\n";
3301} 3360}
3302 3361
3303sub reload_resources { 3362sub reload_resources {
3304 warn "reloading resource files...\n"; 3363 warn "reloading resource files...\n";
3305 3364
3365 reload_facedata;
3366 reload_archetypes;
3306 reload_regions; 3367 reload_regions;
3307 reload_facedata;
3308 #reload_archetypes;#d#
3309 reload_archetypes;
3310 reload_treasures; 3368 reload_treasures;
3311 3369
3312 warn "finished reloading resource files\n"; 3370 warn "finished reloading resource files\n";
3313} 3371}
3314 3372
3315sub init { 3373sub init {
3374 my $guard = freeze_mainloop;
3375
3316 reload_resources; 3376 reload_resources;
3317} 3377}
3318 3378
3319sub reload_config { 3379sub reload_config {
3320 open my $fh, "<:utf8", "$CONFDIR/config" 3380 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3345 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3405 $Coro::current->{desc} = "IDLE BUG HANDLER";
3346 EV::loop EV::LOOP_ONESHOT; 3406 EV::loop EV::LOOP_ONESHOT;
3347 })->prio (Coro::PRIO_MAX); 3407 })->prio (Coro::PRIO_MAX);
3348 }; 3408 };
3349 3409
3410 {
3411 my $guard = freeze_mainloop;
3350 reload_config; 3412 reload_config;
3351 db_init; 3413 db_init;
3352 load_extensions; 3414 load_extensions;
3353 3415
3354 $TICK_WATCHER->start;
3355 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3417 evthread_start IO::AIO::poll_fileno;
3418 }
3419
3356 EV::loop; 3420 EV::loop;
3357} 3421}
3358 3422
3359############################################################################# 3423#############################################################################
3360# initialisation and cleanup 3424# initialisation and cleanup
… …
3367 cf::cleanup "SIG$signal"; 3431 cf::cleanup "SIG$signal";
3368 }; 3432 };
3369 } 3433 }
3370} 3434}
3371 3435
3372sub write_runtime { 3436sub write_runtime_sync {
3373 my $runtime = "$LOCALDIR/runtime"; 3437 my $runtime = "$LOCALDIR/runtime";
3374 3438
3375 # first touch the runtime file to show we are still running: 3439 # first touch the runtime file to show we are still running:
3376 # the fsync below can take a very very long time. 3440 # the fsync below can take a very very long time.
3377 3441
… …
3403 and return; 3467 and return;
3404 3468
3405 warn "runtime file written.\n"; 3469 warn "runtime file written.\n";
3406 3470
3407 1 3471 1
3472}
3473
3474our $uuid_lock;
3475our $uuid_skip;
3476
3477sub write_uuid_sync($) {
3478 $uuid_skip ||= $_[0];
3479
3480 return if $uuid_lock;
3481 local $uuid_lock = 1;
3482
3483 my $uuid = "$LOCALDIR/uuid";
3484
3485 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3486 or return;
3487
3488 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3489 $uuid_skip = 0;
3490
3491 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3492 and return;
3493
3494 # always fsync - this file is important
3495 aio_fsync $fh
3496 and return;
3497
3498 close $fh
3499 or return;
3500
3501 aio_rename "$uuid~", $uuid
3502 and return;
3503
3504 warn "uuid file written ($value).\n";
3505
3506 1
3507
3508}
3509
3510sub write_uuid($$) {
3511 my ($skip, $sync) = @_;
3512
3513 $sync ? write_uuid_sync $skip
3514 : async { write_uuid_sync $skip };
3408} 3515}
3409 3516
3410sub emergency_save() { 3517sub emergency_save() {
3411 my $freeze_guard = cf::freeze_mainloop; 3518 my $freeze_guard = cf::freeze_mainloop;
3412 3519
… …
3434 warn "end emergency map save\n"; 3541 warn "end emergency map save\n";
3435 3542
3436 warn "begin emergency database checkpoint\n"; 3543 warn "begin emergency database checkpoint\n";
3437 BDB::db_env_txn_checkpoint $DB_ENV; 3544 BDB::db_env_txn_checkpoint $DB_ENV;
3438 warn "end emergency database checkpoint\n"; 3545 warn "end emergency database checkpoint\n";
3546
3547 warn "begin write uuid\n";
3548 write_uuid_sync 1;
3549 warn "end write uuid\n";
3439 }; 3550 };
3440 3551
3441 warn "leave emergency perl save\n"; 3552 warn "leave emergency perl save\n";
3442} 3553}
3443 3554
… …
3458 warn "reloading..."; 3569 warn "reloading...";
3459 3570
3460 warn "entering sync_job"; 3571 warn "entering sync_job";
3461 3572
3462 cf::sync_job { 3573 cf::sync_job {
3463 cf::write_runtime; # external watchdog should not bark 3574 cf::write_runtime_sync; # external watchdog should not bark
3464 cf::emergency_save; 3575 cf::emergency_save;
3465 cf::write_runtime; # external watchdog should not bark 3576 cf::write_runtime_sync; # external watchdog should not bark
3466 3577
3467 warn "syncing database to disk"; 3578 warn "syncing database to disk";
3468 BDB::db_env_txn_checkpoint $DB_ENV; 3579 BDB::db_env_txn_checkpoint $DB_ENV;
3469 3580
3470 # if anything goes wrong in here, we should simply crash as we already saved 3581 # if anything goes wrong in here, we should simply crash as we already saved
… …
3595 3706
3596our @WAIT_FOR_TICK; 3707our @WAIT_FOR_TICK;
3597our @WAIT_FOR_TICK_BEGIN; 3708our @WAIT_FOR_TICK_BEGIN;
3598 3709
3599sub wait_for_tick { 3710sub wait_for_tick {
3600 return unless $TICK_WATCHER->is_active;
3601 return if $Coro::current == $Coro::main; 3711 return if tick_inhibit || $Coro::current == $Coro::main;
3602 3712
3603 my $signal = new Coro::Signal; 3713 my $signal = new Coro::Signal;
3604 push @WAIT_FOR_TICK, $signal; 3714 push @WAIT_FOR_TICK, $signal;
3605 $signal->wait; 3715 $signal->wait;
3606} 3716}
3607 3717
3608sub wait_for_tick_begin { 3718sub wait_for_tick_begin {
3609 return unless $TICK_WATCHER->is_active;
3610 return if $Coro::current == $Coro::main; 3719 return if tick_inhibit || $Coro::current == $Coro::main;
3611 3720
3612 my $signal = new Coro::Signal; 3721 my $signal = new Coro::Signal;
3613 push @WAIT_FOR_TICK_BEGIN, $signal; 3722 push @WAIT_FOR_TICK_BEGIN, $signal;
3614 $signal->wait; 3723 $signal->wait;
3615} 3724}
3616 3725
3617$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3726sub tick {
3618 if ($Coro::current != $Coro::main) { 3727 if ($Coro::current != $Coro::main) {
3619 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3728 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3620 unless ++$bug_warning > 10; 3729 unless ++$bug_warning > 10;
3621 return; 3730 return;
3622 } 3731 }
3623 3732
3624 $NOW = $tick_start = EV::now;
3625
3626 cf::server_tick; # one server iteration 3733 cf::server_tick; # one server iteration
3627
3628 $RUNTIME += $TICK;
3629 $NEXT_TICK = $_[0]->at;
3630 3734
3631 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3735 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3632 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3736 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3633 Coro::async_pool { 3737 Coro::async_pool {
3634 $Coro::current->{desc} = "runtime saver"; 3738 $Coro::current->{desc} = "runtime saver";
3635 write_runtime 3739 write_runtime_sync
3636 or warn "ERROR: unable to write runtime file: $!"; 3740 or warn "ERROR: unable to write runtime file: $!";
3637 }; 3741 };
3638 } 3742 }
3639 3743
3640 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3744 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3642 } 3746 }
3643 while (my $sig = shift @WAIT_FOR_TICK) { 3747 while (my $sig = shift @WAIT_FOR_TICK) {
3644 $sig->send; 3748 $sig->send;
3645 } 3749 }
3646 3750
3647 $LOAD = ($NOW - $tick_start) / $TICK; 3751 $LOAD = ($NOW - $TICK_START) / $TICK;
3648 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3752 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3649 3753
3650 _post_tick; 3754 if (0) {
3651}; 3755 if ($NEXT_TICK) {
3652$TICK_WATCHER->priority (EV::MAXPRI); 3756 my $jitter = $TICK_START - $NEXT_TICK;
3757 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3758 warn "jitter $JITTER\n";#d#
3759 }
3760 }
3761}
3653 3762
3654{ 3763{
3655 # configure BDB 3764 # configure BDB
3656 3765
3657 BDB::min_parallel 8; 3766 BDB::min_parallel 8;

Diff Legend

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