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.410 by root, Tue Jan 15 12:02:24 2008 UTC vs.
Revision 1.425 by root, Mon Apr 21 06:35:26 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.
… …
1316 my $msg = $@ ? "$v->{path}: $@\n" 1357 my $msg = $@ ? "$v->{path}: $@\n"
1317 : "$v->{base}: extension inactive.\n"; 1358 : "$v->{base}: extension inactive.\n";
1318 1359
1319 if (exists $v->{meta}{mandatory}) { 1360 if (exists $v->{meta}{mandatory}) {
1320 warn $msg; 1361 warn $msg;
1321 warn "mandatory extension failed to load, exiting.\n"; 1362 cf::cleanup "mandatory extension failed to load, exiting.";
1322 exit 1;
1323 } 1363 }
1324 1364
1325 warn $msg; 1365 warn $msg;
1326 } 1366 }
1327 1367
… …
1435 1475
1436 return if $pl->{deny_save}; 1476 return if $pl->{deny_save};
1437 1477
1438 aio_mkdir playerdir $pl, 0770; 1478 aio_mkdir playerdir $pl, 0770;
1439 $pl->{last_save} = $cf::RUNTIME; 1479 $pl->{last_save} = $cf::RUNTIME;
1480
1481 cf::get_slot 0.01;
1440 1482
1441 $pl->save_pl ($path); 1483 $pl->save_pl ($path);
1442 cf::cede_to_tick; 1484 cf::cede_to_tick;
1443} 1485}
1444 1486
… …
1737our $MAX_RESET = 3600; 1779our $MAX_RESET = 3600;
1738our $DEFAULT_RESET = 3000; 1780our $DEFAULT_RESET = 3000;
1739 1781
1740sub generate_random_map { 1782sub generate_random_map {
1741 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
1742 # mit "rum" bekleckern, nicht 1787 # mit "rum" bekleckern, nicht
1743 $self->_create_random_map ( 1788 $self->_create_random_map (
1744 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1745 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1746 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1868 1913
1869# the temporary/swap location 1914# the temporary/swap location
1870sub save_path { 1915sub save_path {
1871 my ($self) = @_; 1916 my ($self) = @_;
1872 1917
1873 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1918 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1874 "$TMPDIR/$path.map" 1919 "$TMPDIR/$path.map"
1875} 1920}
1876 1921
1877# the unique path, undef == no special unique path 1922# the unique path, undef == no special unique path
1878sub uniq_path { 1923sub uniq_path {
1879 my ($self) = @_; 1924 my ($self) = @_;
1880 1925
1881 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1882 "$UNIQUEDIR/$path" 1927 "$UNIQUEDIR/$path"
1883} 1928}
1884 1929
1885# and all this just because we cannot iterate over 1930# and all this just because we cannot iterate over
1886# all maps in C++... 1931# all maps in C++...
… …
2072 } 2117 }
2073 2118
2074 $self->{last_save} = $cf::RUNTIME; 2119 $self->{last_save} = $cf::RUNTIME;
2075 $self->last_access ($cf::RUNTIME); 2120 $self->last_access ($cf::RUNTIME);
2076 2121
2077 $self->in_memory (cf::MAP_IN_MEMORY); 2122 $self->in_memory (cf::MAP_ACTIVE);
2078 } 2123 }
2079 2124
2080 $self->post_load; 2125 $self->post_load;
2081} 2126}
2082 2127
… …
2140 my ($path, $origin, $load) = @_; 2185 my ($path, $origin, $load) = @_;
2141 2186
2142 $path = normalise $path, $origin && $origin->{path}; 2187 $path = normalise $path, $origin && $origin->{path};
2143 2188
2144 if (my $map = $cf::MAP{$path}) { 2189 if (my $map = $cf::MAP{$path}) {
2145 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2190 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2146 } 2191 }
2147 2192
2148 $MAP_PREFETCH{$path} |= $load; 2193 $MAP_PREFETCH{$path} |= $load;
2149 2194
2150 $MAP_PREFETCHER ||= cf::async { 2195 $MAP_PREFETCHER ||= cf::async {
… …
2187 cf::async { 2232 cf::async {
2188 $Coro::current->{desc} = "map player save"; 2233 $Coro::current->{desc} = "map player save";
2189 $_->contr->save for $self->players; 2234 $_->contr->save for $self->players;
2190 }; 2235 };
2191 2236
2237 cf::get_slot 0.02;
2238
2192 if ($uniq) { 2239 if ($uniq) {
2193 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2240 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2194 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2241 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2195 } else { 2242 } else {
2196 $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);
… …
2204 $self->save; 2251 $self->save;
2205 2252
2206 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2253 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2254
2208 return if $self->players; 2255 return if $self->players;
2209 return if $self->in_memory != cf::MAP_IN_MEMORY; 2256 return if $self->in_memory != cf::MAP_ACTIVE;
2210 return if $self->{deny_save}; 2257 return if $self->{deny_save};
2211 2258
2212 $self->in_memory (cf::MAP_SWAPPED); 2259 $self->in_memory (cf::MAP_SWAPPED);
2213 2260
2214 $self->deactivate; 2261 $self->deactivate;
… …
2332 2379
2333sub unique_maps() { 2380sub unique_maps() {
2334 [ 2381 [
2335 map { 2382 map {
2336 utf8::decode $_; 2383 utf8::decode $_;
2337 /\.map$/ 2384 s/\.map$//; # TODO future compatibility hack
2385 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2386 ? ()
2338 ? normalise $_ 2387 : normalise $_
2339 : ()
2340 } @{ aio_readdir $UNIQUEDIR or [] } 2388 } @{ aio_readdir $UNIQUEDIR or [] }
2341 ] 2389 ]
2342} 2390}
2343 2391
2344package cf;
2345
2346=back 2392=back
2347 2393
2348=head3 cf::object 2394=head3 cf::object
2349 2395
2350=cut 2396=cut
… …
2353 2399
2354=over 4 2400=over 4
2355 2401
2356=item $ob->inv_recursive 2402=item $ob->inv_recursive
2357 2403
2358Returns 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.
2359 2406
2360=cut 2407=cut
2361 2408
2362sub inv_recursive_; 2409sub inv_recursive_;
2363sub inv_recursive_ { 2410sub inv_recursive_ {
… …
2368 inv_recursive_ inv $_[0] 2415 inv_recursive_ inv $_[0]
2369} 2416}
2370 2417
2371=item $ref = $ob->ref 2418=item $ref = $ob->ref
2372 2419
2373creates 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.
2374 2421
2375=item $ob = cf::object::deref ($refstring) 2422=item $ob = cf::object::deref ($refstring)
2376 2423
2377returns 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,
2378even if the object actually exists. May block. 2425even if the object actually exists. May block.
… …
2652 $rmp->{origin_y} = $exit->y; 2699 $rmp->{origin_y} = $exit->y;
2653 } 2700 }
2654 2701
2655 $rmp->{random_seed} ||= $exit->random_seed; 2702 $rmp->{random_seed} ||= $exit->random_seed;
2656 2703
2657 my $data = cf::encode_json $rmp; 2704 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2658 my $md5 = Digest::MD5::md5_hex $data; 2705 my $md5 = Digest::MD5::md5_hex $data;
2659 my $meta = "$RANDOMDIR/$md5.meta"; 2706 my $meta = "$RANDOMDIR/$md5.meta";
2660 2707
2661 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2662 aio_write $fh, 0, (length $data), $data, 0; 2709 aio_write $fh, 0, (length $data), $data, 0;
… …
3031 3078
3032The following functions and methods are available within a safe environment: 3079The following functions and methods are available within a safe environment:
3033 3080
3034 cf::object 3081 cf::object
3035 contr pay_amount pay_player map x y force_find force_add destroy 3082 contr pay_amount pay_player map x y force_find force_add destroy
3036 insert remove name archname title slaying race decrease_ob_nr 3083 insert remove name archname title slaying race decrease split
3037 3084
3038 cf::object::player 3085 cf::object::player
3039 player 3086 player
3040 3087
3041 cf::player 3088 cf::player
… …
3047=cut 3094=cut
3048 3095
3049for ( 3096for (
3050 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3097 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3051 insert remove inv name archname title slaying race 3098 insert remove inv name archname title slaying race
3052 decrease_ob_nr destroy)], 3099 decrease split destroy)],
3053 ["cf::object::player" => qw(player)], 3100 ["cf::object::player" => qw(player)],
3054 ["cf::player" => qw(peaceful)], 3101 ["cf::player" => qw(peaceful)],
3055 ["cf::map" => qw(trigger)], 3102 ["cf::map" => qw(trigger)],
3056) { 3103) {
3057 no strict 'refs'; 3104 no strict 'refs';
… …
3265 while (my ($k, $v) = each %$want) { 3312 while (my ($k, $v) = each %$want) {
3266 $ns->fx_want ($k, $v); 3313 $ns->fx_want ($k, $v);
3267 } 3314 }
3268}; 3315};
3269 3316
3317sub load_resource_file($) {
3318 my $guard = lock_acquire "load_resource_file";
3319
3320 my $status = load_resource_file_ $_[0];
3321 get_slot 0.1, 100;
3322 cf::arch::commit_load;
3323
3324 $status
3325}
3326
3270sub reload_regions { 3327sub reload_regions {
3271 # HACK to clear player env face cache, we need some signal framework 3328 # HACK to clear player env face cache, we need some signal framework
3272 # for this (global event?) 3329 # for this (global event?)
3273 %ext::player_env::MUSIC_FACE_CACHE = (); 3330 %ext::player_env::MUSIC_FACE_CACHE = ();
3274 3331
… …
3287} 3344}
3288 3345
3289sub reload_archetypes { 3346sub reload_archetypes {
3290 load_resource_file "$DATADIR/archetypes" 3347 load_resource_file "$DATADIR/archetypes"
3291 or die "unable to load archetypes\n"; 3348 or die "unable to load archetypes\n";
3292 #d# NEED to laod twice to resolve forward references
3293 # this really needs to be done in an extra post-pass
3294 # (which needs to be synchronous, so solve it differently)
3295 load_resource_file "$DATADIR/archetypes"
3296 or die "unable to load archetypes\n";
3297} 3349}
3298 3350
3299sub reload_treasures { 3351sub reload_treasures {
3300 load_resource_file "$DATADIR/treasures" 3352 load_resource_file "$DATADIR/treasures"
3301 or die "unable to load treasurelists\n"; 3353 or die "unable to load treasurelists\n";
3302} 3354}
3303 3355
3304sub reload_resources { 3356sub reload_resources {
3305 warn "reloading resource files...\n"; 3357 warn "reloading resource files...\n";
3306 3358
3359 reload_facedata;
3360 reload_archetypes;
3307 reload_regions; 3361 reload_regions;
3308 reload_facedata;
3309 #reload_archetypes;#d#
3310 reload_archetypes;
3311 reload_treasures; 3362 reload_treasures;
3312 3363
3313 warn "finished reloading resource files\n"; 3364 warn "finished reloading resource files\n";
3314} 3365}
3315 3366
3316sub init { 3367sub init {
3368 my $guard = freeze_mainloop;
3369
3317 reload_resources; 3370 reload_resources;
3318} 3371}
3319 3372
3320sub reload_config { 3373sub reload_config {
3321 open my $fh, "<:utf8", "$CONFDIR/config" 3374 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3346 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3399 $Coro::current->{desc} = "IDLE BUG HANDLER";
3347 EV::loop EV::LOOP_ONESHOT; 3400 EV::loop EV::LOOP_ONESHOT;
3348 })->prio (Coro::PRIO_MAX); 3401 })->prio (Coro::PRIO_MAX);
3349 }; 3402 };
3350 3403
3404 {
3405 my $guard = freeze_mainloop;
3351 reload_config; 3406 reload_config;
3352 db_init; 3407 db_init;
3353 load_extensions; 3408 load_extensions;
3354 3409
3355 $TICK_WATCHER->start;
3356 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3410 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3411 evthread_start IO::AIO::poll_fileno;
3412 }
3413
3357 EV::loop; 3414 EV::loop;
3358} 3415}
3359 3416
3360############################################################################# 3417#############################################################################
3361# initialisation and cleanup 3418# initialisation and cleanup
… …
3368 cf::cleanup "SIG$signal"; 3425 cf::cleanup "SIG$signal";
3369 }; 3426 };
3370 } 3427 }
3371} 3428}
3372 3429
3373sub write_runtime { 3430sub write_runtime_sync {
3374 my $runtime = "$LOCALDIR/runtime"; 3431 my $runtime = "$LOCALDIR/runtime";
3375 3432
3376 # first touch the runtime file to show we are still running: 3433 # first touch the runtime file to show we are still running:
3377 # the fsync below can take a very very long time. 3434 # the fsync below can take a very very long time.
3378 3435
… …
3404 and return; 3461 and return;
3405 3462
3406 warn "runtime file written.\n"; 3463 warn "runtime file written.\n";
3407 3464
3408 1 3465 1
3466}
3467
3468our $uuid_lock;
3469our $uuid_skip;
3470
3471sub write_uuid_sync($) {
3472 $uuid_skip ||= $_[0];
3473
3474 return if $uuid_lock;
3475 local $uuid_lock = 1;
3476
3477 my $uuid = "$LOCALDIR/uuid";
3478
3479 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3480 or return;
3481
3482 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3483 $uuid_skip = 0;
3484
3485 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3486 and return;
3487
3488 # always fsync - this file is important
3489 aio_fsync $fh
3490 and return;
3491
3492 close $fh
3493 or return;
3494
3495 aio_rename "$uuid~", $uuid
3496 and return;
3497
3498 warn "uuid file written ($value).\n";
3499
3500 1
3501
3502}
3503
3504sub write_uuid($$) {
3505 my ($skip, $sync) = @_;
3506
3507 $sync ? write_uuid_sync $skip
3508 : async { write_uuid_sync $skip };
3409} 3509}
3410 3510
3411sub emergency_save() { 3511sub emergency_save() {
3412 my $freeze_guard = cf::freeze_mainloop; 3512 my $freeze_guard = cf::freeze_mainloop;
3413 3513
… …
3435 warn "end emergency map save\n"; 3535 warn "end emergency map save\n";
3436 3536
3437 warn "begin emergency database checkpoint\n"; 3537 warn "begin emergency database checkpoint\n";
3438 BDB::db_env_txn_checkpoint $DB_ENV; 3538 BDB::db_env_txn_checkpoint $DB_ENV;
3439 warn "end emergency database checkpoint\n"; 3539 warn "end emergency database checkpoint\n";
3540
3541 warn "begin write uuid\n";
3542 write_uuid_sync 1;
3543 warn "end write uuid\n";
3440 }; 3544 };
3441 3545
3442 warn "leave emergency perl save\n"; 3546 warn "leave emergency perl save\n";
3443} 3547}
3444 3548
… …
3459 warn "reloading..."; 3563 warn "reloading...";
3460 3564
3461 warn "entering sync_job"; 3565 warn "entering sync_job";
3462 3566
3463 cf::sync_job { 3567 cf::sync_job {
3464 cf::write_runtime; # external watchdog should not bark 3568 cf::write_runtime_sync; # external watchdog should not bark
3465 cf::emergency_save; 3569 cf::emergency_save;
3466 cf::write_runtime; # external watchdog should not bark 3570 cf::write_runtime_sync; # external watchdog should not bark
3467 3571
3468 warn "syncing database to disk"; 3572 warn "syncing database to disk";
3469 BDB::db_env_txn_checkpoint $DB_ENV; 3573 BDB::db_env_txn_checkpoint $DB_ENV;
3470 3574
3471 # if anything goes wrong in here, we should simply crash as we already saved 3575 # if anything goes wrong in here, we should simply crash as we already saved
… …
3558 warn "leaving sync_job"; 3662 warn "leaving sync_job";
3559 3663
3560 1 3664 1
3561 } or do { 3665 } or do {
3562 warn $@; 3666 warn $@;
3563 warn "error while reloading, exiting."; 3667 cf::cleanup "error while reloading, exiting.";
3564 exit 1;
3565 }; 3668 };
3566 3669
3567 warn "reloaded"; 3670 warn "reloaded";
3568}; 3671};
3569 3672
… …
3597 3700
3598our @WAIT_FOR_TICK; 3701our @WAIT_FOR_TICK;
3599our @WAIT_FOR_TICK_BEGIN; 3702our @WAIT_FOR_TICK_BEGIN;
3600 3703
3601sub wait_for_tick { 3704sub wait_for_tick {
3602 return unless $TICK_WATCHER->is_active;
3603 return if $Coro::current == $Coro::main; 3705 return if tick_inhibit || $Coro::current == $Coro::main;
3604 3706
3605 my $signal = new Coro::Signal; 3707 my $signal = new Coro::Signal;
3606 push @WAIT_FOR_TICK, $signal; 3708 push @WAIT_FOR_TICK, $signal;
3607 $signal->wait; 3709 $signal->wait;
3608} 3710}
3609 3711
3610sub wait_for_tick_begin { 3712sub wait_for_tick_begin {
3611 return unless $TICK_WATCHER->is_active;
3612 return if $Coro::current == $Coro::main; 3713 return if tick_inhibit || $Coro::current == $Coro::main;
3613 3714
3614 my $signal = new Coro::Signal; 3715 my $signal = new Coro::Signal;
3615 push @WAIT_FOR_TICK_BEGIN, $signal; 3716 push @WAIT_FOR_TICK_BEGIN, $signal;
3616 $signal->wait; 3717 $signal->wait;
3617} 3718}
3618 3719
3619$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3720sub tick {
3620 if ($Coro::current != $Coro::main) { 3721 if ($Coro::current != $Coro::main) {
3621 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3722 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3622 unless ++$bug_warning > 10; 3723 unless ++$bug_warning > 10;
3623 return; 3724 return;
3624 } 3725 }
3625 3726
3626 $NOW = $tick_start = EV::now;
3627
3628 cf::server_tick; # one server iteration 3727 cf::server_tick; # one server iteration
3629
3630 $RUNTIME += $TICK;
3631 $NEXT_TICK = $_[0]->at;
3632 3728
3633 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3729 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3634 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3730 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3635 Coro::async_pool { 3731 Coro::async_pool {
3636 $Coro::current->{desc} = "runtime saver"; 3732 $Coro::current->{desc} = "runtime saver";
3637 write_runtime 3733 write_runtime_sync
3638 or warn "ERROR: unable to write runtime file: $!"; 3734 or warn "ERROR: unable to write runtime file: $!";
3639 }; 3735 };
3640 } 3736 }
3641 3737
3642 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3738 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3644 } 3740 }
3645 while (my $sig = shift @WAIT_FOR_TICK) { 3741 while (my $sig = shift @WAIT_FOR_TICK) {
3646 $sig->send; 3742 $sig->send;
3647 } 3743 }
3648 3744
3649 $LOAD = ($NOW - $tick_start) / $TICK; 3745 $LOAD = ($NOW - $TICK_START) / $TICK;
3650 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3746 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3651 3747
3652 _post_tick; 3748 if (0) {
3653}; 3749 if ($NEXT_TICK) {
3654$TICK_WATCHER->priority (EV::MAXPRI); 3750 my $jitter = $TICK_START - $NEXT_TICK;
3751 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3752 warn "jitter $JITTER\n";#d#
3753 }
3754 }
3755}
3655 3756
3656{ 3757{
3657 # configure BDB 3758 # configure BDB
3658 3759
3659 BDB::min_parallel 8; 3760 BDB::min_parallel 8;

Diff Legend

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