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.407 by root, Sun Jan 13 09:53:53 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;
… …
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
… …
195 LOG llevError, $msg; 213 LOG llevError, $msg;
196 }; 214 };
197} 215}
198 216
199$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
200 warn Carp::longmess $_[0]; 226 warn Carp::longmess $_[0];
201 Coro::terminate; 227 Coro::terminate
202}; 228};
229
230$SIG{__DIE__} = sub { }; #d#?
203 231
204@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
205@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
206@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
207@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
332 360
333 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
334} 362}
335 363
336sub freeze_mainloop { 364sub freeze_mainloop {
337 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
338 366
339 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
340 $TICK_WATCHER->start;
341 };
342 $TICK_WATCHER->stop;
343 $guard
344} 368}
345 369
346=item cf::periodic $interval, $cb 370=item cf::periodic $interval, $cb
347 371
348Like 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
… …
403 } 427 }
404 } 428 }
405}; 429};
406 430
407sub get_slot($;$$) { 431sub get_slot($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main;
433
408 my ($time, $pri, $name) = @_; 434 my ($time, $pri, $name) = @_;
409 435
410 $time = $TICK * .6 if $time > $TICK * .6; 436 $time = $TICK * .6 if $time > $TICK * .6;
411 my $sig = new Coro::Signal; 437 my $sig = new Coro::Signal;
412 438
… …
449 # this is the main coro, too bad, we have to block 475 # this is the main coro, too bad, we have to block
450 # till the operation succeeds, freezing the server :/ 476 # till the operation succeeds, freezing the server :/
451 477
452 LOG llevError, Carp::longmess "sync job";#d# 478 LOG llevError, Carp::longmess "sync job";#d#
453 479
454 # TODO: use suspend/resume instead
455 # (but this is cancel-safe)
456 my $freeze_guard = freeze_mainloop; 480 my $freeze_guard = freeze_mainloop;
457 481
458 my $busy = 1; 482 my $busy = 1;
459 my @res; 483 my @res;
460 484
… …
471 } else { 495 } else {
472 EV::loop EV::LOOP_ONESHOT; 496 EV::loop EV::LOOP_ONESHOT;
473 } 497 }
474 } 498 }
475 499
476 $time = EV::time - $time; 500 my $time = EV::time - $time;
477 501
478 LOG llevError | logBacktrace, Carp::longmess "long sync job"
479 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
480
481 $tick_start += $time; # do not account sync jobs to server load 502 $TICK_START += $time; # do not account sync jobs to server load
482 503
483 wantarray ? @res : $res[0] 504 wantarray ? @res : $res[0]
484 } else { 505 } else {
485 # we are in another coroutine, how wonderful, everything just works 506 # we are in another coroutine, how wonderful, everything just works
486 507
… …
528 reset_signals; 549 reset_signals;
529 &$cb 550 &$cb
530 }, @args; 551 }, @args;
531 552
532 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
533} 581}
534 582
535=item $value = cf::db_get $family => $key 583=item $value = cf::db_get $family => $key
536 584
537Returns a single value from the environment database. 585Returns a single value from the environment database.
… …
1309 my $msg = $@ ? "$v->{path}: $@\n" 1357 my $msg = $@ ? "$v->{path}: $@\n"
1310 : "$v->{base}: extension inactive.\n"; 1358 : "$v->{base}: extension inactive.\n";
1311 1359
1312 if (exists $v->{meta}{mandatory}) { 1360 if (exists $v->{meta}{mandatory}) {
1313 warn $msg; 1361 warn $msg;
1314 warn "mandatory extension failed to load, exiting.\n"; 1362 cf::cleanup "mandatory extension failed to load, exiting.";
1315 exit 1;
1316 } 1363 }
1317 1364
1318 warn $msg; 1365 warn $msg;
1319 } 1366 }
1320 1367
… …
1428 1475
1429 return if $pl->{deny_save}; 1476 return if $pl->{deny_save};
1430 1477
1431 aio_mkdir playerdir $pl, 0770; 1478 aio_mkdir playerdir $pl, 0770;
1432 $pl->{last_save} = $cf::RUNTIME; 1479 $pl->{last_save} = $cf::RUNTIME;
1480
1481 cf::get_slot 0.01;
1433 1482
1434 $pl->save_pl ($path); 1483 $pl->save_pl ($path);
1435 cf::cede_to_tick; 1484 cf::cede_to_tick;
1436} 1485}
1437 1486
… …
1730our $MAX_RESET = 3600; 1779our $MAX_RESET = 3600;
1731our $DEFAULT_RESET = 3000; 1780our $DEFAULT_RESET = 3000;
1732 1781
1733sub generate_random_map { 1782sub generate_random_map {
1734 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
1735 # mit "rum" bekleckern, nicht 1787 # mit "rum" bekleckern, nicht
1736 $self->_create_random_map ( 1788 $self->_create_random_map (
1737 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1738 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1739 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1861 1913
1862# the temporary/swap location 1914# the temporary/swap location
1863sub save_path { 1915sub save_path {
1864 my ($self) = @_; 1916 my ($self) = @_;
1865 1917
1866 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1918 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1867 "$TMPDIR/$path.map" 1919 "$TMPDIR/$path.map"
1868} 1920}
1869 1921
1870# the unique path, undef == no special unique path 1922# the unique path, undef == no special unique path
1871sub uniq_path { 1923sub uniq_path {
1872 my ($self) = @_; 1924 my ($self) = @_;
1873 1925
1874 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1875 "$UNIQUEDIR/$path" 1927 "$UNIQUEDIR/$path"
1876} 1928}
1877 1929
1878# and all this just because we cannot iterate over 1930# and all this just because we cannot iterate over
1879# all maps in C++... 1931# all maps in C++...
… …
2065 } 2117 }
2066 2118
2067 $self->{last_save} = $cf::RUNTIME; 2119 $self->{last_save} = $cf::RUNTIME;
2068 $self->last_access ($cf::RUNTIME); 2120 $self->last_access ($cf::RUNTIME);
2069 2121
2070 $self->in_memory (cf::MAP_IN_MEMORY); 2122 $self->in_memory (cf::MAP_ACTIVE);
2071 } 2123 }
2072 2124
2073 $self->post_load; 2125 $self->post_load;
2074} 2126}
2075 2127
… …
2133 my ($path, $origin, $load) = @_; 2185 my ($path, $origin, $load) = @_;
2134 2186
2135 $path = normalise $path, $origin && $origin->{path}; 2187 $path = normalise $path, $origin && $origin->{path};
2136 2188
2137 if (my $map = $cf::MAP{$path}) { 2189 if (my $map = $cf::MAP{$path}) {
2138 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2190 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2139 } 2191 }
2140 2192
2141 $MAP_PREFETCH{$path} |= $load; 2193 $MAP_PREFETCH{$path} |= $load;
2142 2194
2143 $MAP_PREFETCHER ||= cf::async { 2195 $MAP_PREFETCHER ||= cf::async {
… …
2180 cf::async { 2232 cf::async {
2181 $Coro::current->{desc} = "map player save"; 2233 $Coro::current->{desc} = "map player save";
2182 $_->contr->save for $self->players; 2234 $_->contr->save for $self->players;
2183 }; 2235 };
2184 2236
2237 cf::get_slot 0.02;
2238
2185 if ($uniq) { 2239 if ($uniq) {
2186 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2240 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2187 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2241 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2188 } else { 2242 } else {
2189 $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);
… …
2197 $self->save; 2251 $self->save;
2198 2252
2199 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2253 my $lock = cf::lock_acquire "map_data:$self->{path}";
2200 2254
2201 return if $self->players; 2255 return if $self->players;
2202 return if $self->in_memory != cf::MAP_IN_MEMORY; 2256 return if $self->in_memory != cf::MAP_ACTIVE;
2203 return if $self->{deny_save}; 2257 return if $self->{deny_save};
2204 2258
2205 $self->in_memory (cf::MAP_SWAPPED); 2259 $self->in_memory (cf::MAP_SWAPPED);
2206 2260
2207 $self->deactivate; 2261 $self->deactivate;
… …
2325 2379
2326sub unique_maps() { 2380sub unique_maps() {
2327 [ 2381 [
2328 map { 2382 map {
2329 utf8::decode $_; 2383 utf8::decode $_;
2330 /\.map$/ 2384 s/\.map$//; # TODO future compatibility hack
2385 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2386 ? ()
2331 ? normalise $_ 2387 : normalise $_
2332 : ()
2333 } @{ aio_readdir $UNIQUEDIR or [] } 2388 } @{ aio_readdir $UNIQUEDIR or [] }
2334 ] 2389 ]
2335} 2390}
2336 2391
2337package cf;
2338
2339=back 2392=back
2340 2393
2341=head3 cf::object 2394=head3 cf::object
2342 2395
2343=cut 2396=cut
… …
2346 2399
2347=over 4 2400=over 4
2348 2401
2349=item $ob->inv_recursive 2402=item $ob->inv_recursive
2350 2403
2351Returns 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.
2352 2406
2353=cut 2407=cut
2354 2408
2355sub inv_recursive_; 2409sub inv_recursive_;
2356sub inv_recursive_ { 2410sub inv_recursive_ {
… …
2361 inv_recursive_ inv $_[0] 2415 inv_recursive_ inv $_[0]
2362} 2416}
2363 2417
2364=item $ref = $ob->ref 2418=item $ref = $ob->ref
2365 2419
2366creates 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.
2367 2421
2368=item $ob = cf::object::deref ($refstring) 2422=item $ob = cf::object::deref ($refstring)
2369 2423
2370returns 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,
2371even if the object actually exists. May block. 2425even if the object actually exists. May block.
… …
2645 $rmp->{origin_y} = $exit->y; 2699 $rmp->{origin_y} = $exit->y;
2646 } 2700 }
2647 2701
2648 $rmp->{random_seed} ||= $exit->random_seed; 2702 $rmp->{random_seed} ||= $exit->random_seed;
2649 2703
2650 my $data = cf::encode_json $rmp; 2704 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2651 my $md5 = Digest::MD5::md5_hex $data; 2705 my $md5 = Digest::MD5::md5_hex $data;
2652 my $meta = "$RANDOMDIR/$md5.meta"; 2706 my $meta = "$RANDOMDIR/$md5.meta";
2653 2707
2654 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2655 aio_write $fh, 0, (length $data), $data, 0; 2709 aio_write $fh, 0, (length $data), $data, 0;
… …
3024 3078
3025The following functions and methods are available within a safe environment: 3079The following functions and methods are available within a safe environment:
3026 3080
3027 cf::object 3081 cf::object
3028 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
3029 insert remove name archname title slaying race decrease_ob_nr 3083 insert remove name archname title slaying race decrease split
3030 3084
3031 cf::object::player 3085 cf::object::player
3032 player 3086 player
3033 3087
3034 cf::player 3088 cf::player
… …
3040=cut 3094=cut
3041 3095
3042for ( 3096for (
3043 ["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
3044 insert remove inv name archname title slaying race 3098 insert remove inv name archname title slaying race
3045 decrease_ob_nr destroy)], 3099 decrease split destroy)],
3046 ["cf::object::player" => qw(player)], 3100 ["cf::object::player" => qw(player)],
3047 ["cf::player" => qw(peaceful)], 3101 ["cf::player" => qw(peaceful)],
3048 ["cf::map" => qw(trigger)], 3102 ["cf::map" => qw(trigger)],
3049) { 3103) {
3050 no strict 'refs'; 3104 no strict 'refs';
… …
3258 while (my ($k, $v) = each %$want) { 3312 while (my ($k, $v) = each %$want) {
3259 $ns->fx_want ($k, $v); 3313 $ns->fx_want ($k, $v);
3260 } 3314 }
3261}; 3315};
3262 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
3263sub reload_regions { 3327sub reload_regions {
3264 # 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
3265 # for this (global event?) 3329 # for this (global event?)
3266 %ext::player_env::MUSIC_FACE_CACHE = (); 3330 %ext::player_env::MUSIC_FACE_CACHE = ();
3267 3331
… …
3280} 3344}
3281 3345
3282sub reload_archetypes { 3346sub reload_archetypes {
3283 load_resource_file "$DATADIR/archetypes" 3347 load_resource_file "$DATADIR/archetypes"
3284 or die "unable to load archetypes\n"; 3348 or die "unable to load archetypes\n";
3285 #d# NEED to laod twice to resolve forward references
3286 # this really needs to be done in an extra post-pass
3287 # (which needs to be synchronous, so solve it differently)
3288 load_resource_file "$DATADIR/archetypes"
3289 or die "unable to load archetypes\n";
3290} 3349}
3291 3350
3292sub reload_treasures { 3351sub reload_treasures {
3293 load_resource_file "$DATADIR/treasures" 3352 load_resource_file "$DATADIR/treasures"
3294 or die "unable to load treasurelists\n"; 3353 or die "unable to load treasurelists\n";
3295} 3354}
3296 3355
3297sub reload_resources { 3356sub reload_resources {
3298 warn "reloading resource files...\n"; 3357 warn "reloading resource files...\n";
3299 3358
3359 reload_facedata;
3360 reload_archetypes;
3300 reload_regions; 3361 reload_regions;
3301 reload_facedata;
3302 #reload_archetypes;#d#
3303 reload_archetypes;
3304 reload_treasures; 3362 reload_treasures;
3305 3363
3306 warn "finished reloading resource files\n"; 3364 warn "finished reloading resource files\n";
3307} 3365}
3308 3366
3309sub init { 3367sub init {
3368 my $guard = freeze_mainloop;
3369
3310 reload_resources; 3370 reload_resources;
3311} 3371}
3312 3372
3313sub reload_config { 3373sub reload_config {
3314 open my $fh, "<:utf8", "$CONFDIR/config" 3374 open my $fh, "<:utf8", "$CONFDIR/config"
3315 or return; 3375 or return;
3316 3376
3317 local $/; 3377 local $/;
3318 *CFG = YAML::Syck::Load <$fh>; 3378 *CFG = YAML::Load <$fh>;
3319 3379
3320 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3380 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3321 3381
3322 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3382 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3323 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3383 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3339 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3399 $Coro::current->{desc} = "IDLE BUG HANDLER";
3340 EV::loop EV::LOOP_ONESHOT; 3400 EV::loop EV::LOOP_ONESHOT;
3341 })->prio (Coro::PRIO_MAX); 3401 })->prio (Coro::PRIO_MAX);
3342 }; 3402 };
3343 3403
3404 {
3405 my $guard = freeze_mainloop;
3344 reload_config; 3406 reload_config;
3345 db_init; 3407 db_init;
3346 load_extensions; 3408 load_extensions;
3347 3409
3348 $TICK_WATCHER->start;
3349 $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
3350 EV::loop; 3414 EV::loop;
3351} 3415}
3352 3416
3353############################################################################# 3417#############################################################################
3354# initialisation and cleanup 3418# initialisation and cleanup
… …
3361 cf::cleanup "SIG$signal"; 3425 cf::cleanup "SIG$signal";
3362 }; 3426 };
3363 } 3427 }
3364} 3428}
3365 3429
3366sub write_runtime { 3430sub write_runtime_sync {
3367 my $runtime = "$LOCALDIR/runtime"; 3431 my $runtime = "$LOCALDIR/runtime";
3368 3432
3369 # first touch the runtime file to show we are still running: 3433 # first touch the runtime file to show we are still running:
3370 # the fsync below can take a very very long time. 3434 # the fsync below can take a very very long time.
3371 3435
… …
3397 and return; 3461 and return;
3398 3462
3399 warn "runtime file written.\n"; 3463 warn "runtime file written.\n";
3400 3464
3401 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 };
3402} 3509}
3403 3510
3404sub emergency_save() { 3511sub emergency_save() {
3405 my $freeze_guard = cf::freeze_mainloop; 3512 my $freeze_guard = cf::freeze_mainloop;
3406 3513
… …
3428 warn "end emergency map save\n"; 3535 warn "end emergency map save\n";
3429 3536
3430 warn "begin emergency database checkpoint\n"; 3537 warn "begin emergency database checkpoint\n";
3431 BDB::db_env_txn_checkpoint $DB_ENV; 3538 BDB::db_env_txn_checkpoint $DB_ENV;
3432 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";
3433 }; 3544 };
3434 3545
3435 warn "leave emergency perl save\n"; 3546 warn "leave emergency perl save\n";
3436} 3547}
3437 3548
… …
3452 warn "reloading..."; 3563 warn "reloading...";
3453 3564
3454 warn "entering sync_job"; 3565 warn "entering sync_job";
3455 3566
3456 cf::sync_job { 3567 cf::sync_job {
3457 cf::write_runtime; # external watchdog should not bark 3568 cf::write_runtime_sync; # external watchdog should not bark
3458 cf::emergency_save; 3569 cf::emergency_save;
3459 cf::write_runtime; # external watchdog should not bark 3570 cf::write_runtime_sync; # external watchdog should not bark
3460 3571
3461 warn "syncing database to disk"; 3572 warn "syncing database to disk";
3462 BDB::db_env_txn_checkpoint $DB_ENV; 3573 BDB::db_env_txn_checkpoint $DB_ENV;
3463 3574
3464 # 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
… …
3551 warn "leaving sync_job"; 3662 warn "leaving sync_job";
3552 3663
3553 1 3664 1
3554 } or do { 3665 } or do {
3555 warn $@; 3666 warn $@;
3556 warn "error while reloading, exiting."; 3667 cf::cleanup "error while reloading, exiting.";
3557 exit 1;
3558 }; 3668 };
3559 3669
3560 warn "reloaded"; 3670 warn "reloaded";
3561}; 3671};
3562 3672
… …
3565sub reload_perl() { 3675sub reload_perl() {
3566 # doing reload synchronously and two reloads happen back-to-back, 3676 # doing reload synchronously and two reloads happen back-to-back,
3567 # coro crashes during coro_state_free->destroy here. 3677 # coro crashes during coro_state_free->destroy here.
3568 3678
3569 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3679 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3680 do_reload_perl;
3570 undef $RELOAD_WATCHER; 3681 undef $RELOAD_WATCHER;
3571 do_reload_perl;
3572 }; 3682 };
3573} 3683}
3574 3684
3575register_command "reload" => sub { 3685register_command "reload" => sub {
3576 my ($who, $arg) = @_; 3686 my ($who, $arg) = @_;
… …
3590 3700
3591our @WAIT_FOR_TICK; 3701our @WAIT_FOR_TICK;
3592our @WAIT_FOR_TICK_BEGIN; 3702our @WAIT_FOR_TICK_BEGIN;
3593 3703
3594sub wait_for_tick { 3704sub wait_for_tick {
3595 return unless $TICK_WATCHER->is_active;
3596 return if $Coro::current == $Coro::main; 3705 return if tick_inhibit || $Coro::current == $Coro::main;
3597 3706
3598 my $signal = new Coro::Signal; 3707 my $signal = new Coro::Signal;
3599 push @WAIT_FOR_TICK, $signal; 3708 push @WAIT_FOR_TICK, $signal;
3600 $signal->wait; 3709 $signal->wait;
3601} 3710}
3602 3711
3603sub wait_for_tick_begin { 3712sub wait_for_tick_begin {
3604 return unless $TICK_WATCHER->is_active;
3605 return if $Coro::current == $Coro::main; 3713 return if tick_inhibit || $Coro::current == $Coro::main;
3606 3714
3607 my $signal = new Coro::Signal; 3715 my $signal = new Coro::Signal;
3608 push @WAIT_FOR_TICK_BEGIN, $signal; 3716 push @WAIT_FOR_TICK_BEGIN, $signal;
3609 $signal->wait; 3717 $signal->wait;
3610} 3718}
3611 3719
3612$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3720sub tick {
3613 if ($Coro::current != $Coro::main) { 3721 if ($Coro::current != $Coro::main) {
3614 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"
3615 unless ++$bug_warning > 10; 3723 unless ++$bug_warning > 10;
3616 return; 3724 return;
3617 } 3725 }
3618 3726
3619 $NOW = $tick_start = EV::now;
3620
3621 cf::server_tick; # one server iteration 3727 cf::server_tick; # one server iteration
3622
3623 $RUNTIME += $TICK;
3624 $NEXT_TICK = $_[0]->at;
3625 3728
3626 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3729 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3627 $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.;
3628 Coro::async_pool { 3731 Coro::async_pool {
3629 $Coro::current->{desc} = "runtime saver"; 3732 $Coro::current->{desc} = "runtime saver";
3630 write_runtime 3733 write_runtime_sync
3631 or warn "ERROR: unable to write runtime file: $!"; 3734 or warn "ERROR: unable to write runtime file: $!";
3632 }; 3735 };
3633 } 3736 }
3634 3737
3635 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3738 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3637 } 3740 }
3638 while (my $sig = shift @WAIT_FOR_TICK) { 3741 while (my $sig = shift @WAIT_FOR_TICK) {
3639 $sig->send; 3742 $sig->send;
3640 } 3743 }
3641 3744
3642 $LOAD = ($NOW - $tick_start) / $TICK; 3745 $LOAD = ($NOW - $TICK_START) / $TICK;
3643 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3746 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3644 3747
3645 _post_tick; 3748 if (0) {
3646}; 3749 if ($NEXT_TICK) {
3647$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}
3648 3756
3649{ 3757{
3650 # configure BDB 3758 # configure BDB
3651 3759
3652 BDB::min_parallel 8; 3760 BDB::min_parallel 8;

Diff Legend

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