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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.405 by root, Mon Dec 17 08:03:22 2007 UTC vs.
Revision 1.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
… …
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 212
195 LOG llevError, $msg; 213 LOG llevError, $msg;
196 }; 214 };
197} 215}
216
217$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "=="
219
220 if ($Coro::current == $Coro::main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d#
223 }#d#
224
225 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate
228};
229
230$SIG{__DIE__} = sub { }; #d#?
198 231
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
327 360
328 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
329} 362}
330 363
331sub freeze_mainloop { 364sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
333 366
334 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
335 $TICK_WATCHER->start;
336 };
337 $TICK_WATCHER->stop;
338 $guard
339} 368}
340 369
341=item cf::periodic $interval, $cb 370=item cf::periodic $interval, $cb
342 371
343Like EV::periodic, but randomly selects a starting point so that the actions 372Like EV::periodic, but randomly selects a starting point so that the actions
… …
398 } 427 }
399 } 428 }
400}; 429};
401 430
402sub get_slot($;$$) { 431sub get_slot($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main;
433
403 my ($time, $pri, $name) = @_; 434 my ($time, $pri, $name) = @_;
404 435
405 $time = $TICK * .6 if $time > $TICK * .6; 436 $time = $TICK * .6 if $time > $TICK * .6;
406 my $sig = new Coro::Signal; 437 my $sig = new Coro::Signal;
407 438
… …
444 # this is the main coro, too bad, we have to block 475 # this is the main coro, too bad, we have to block
445 # till the operation succeeds, freezing the server :/ 476 # till the operation succeeds, freezing the server :/
446 477
447 LOG llevError, Carp::longmess "sync job";#d# 478 LOG llevError, Carp::longmess "sync job";#d#
448 479
449 # TODO: use suspend/resume instead
450 # (but this is cancel-safe)
451 my $freeze_guard = freeze_mainloop; 480 my $freeze_guard = freeze_mainloop;
452 481
453 my $busy = 1; 482 my $busy = 1;
454 my @res; 483 my @res;
455 484
… …
466 } else { 495 } else {
467 EV::loop EV::LOOP_ONESHOT; 496 EV::loop EV::LOOP_ONESHOT;
468 } 497 }
469 } 498 }
470 499
471 $time = EV::time - $time; 500 my $time = EV::time - $time;
472 501
473 LOG llevError | logBacktrace, Carp::longmess "long sync job"
474 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
475
476 $tick_start += $time; # do not account sync jobs to server load 502 $TICK_START += $time; # do not account sync jobs to server load
477 503
478 wantarray ? @res : $res[0] 504 wantarray ? @res : $res[0]
479 } else { 505 } else {
480 # we are in another coroutine, how wonderful, everything just works 506 # we are in another coroutine, how wonderful, everything just works
481 507
… …
523 reset_signals; 549 reset_signals;
524 &$cb 550 &$cb
525 }, @args; 551 }, @args;
526 552
527 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
528} 581}
529 582
530=item $value = cf::db_get $family => $key 583=item $value = cf::db_get $family => $key
531 584
532Returns a single value from the environment database. 585Returns a single value from the environment database.
… …
969 } 1022 }
970 1023
971 0 1024 0
972} 1025}
973 1026
974=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
975 1028
976=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1029=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
977 1030
978Generate an object-specific event with the given arguments. 1031Generate an object-specific event with the given arguments.
979 1032
… …
1304 my $msg = $@ ? "$v->{path}: $@\n" 1357 my $msg = $@ ? "$v->{path}: $@\n"
1305 : "$v->{base}: extension inactive.\n"; 1358 : "$v->{base}: extension inactive.\n";
1306 1359
1307 if (exists $v->{meta}{mandatory}) { 1360 if (exists $v->{meta}{mandatory}) {
1308 warn $msg; 1361 warn $msg;
1309 warn "mandatory extension failed to load, exiting.\n"; 1362 cf::cleanup "mandatory extension failed to load, exiting.";
1310 exit 1;
1311 } 1363 }
1312 1364
1313 warn $msg; 1365 warn $msg;
1314 } 1366 }
1315 1367
… …
1423 1475
1424 return if $pl->{deny_save}; 1476 return if $pl->{deny_save};
1425 1477
1426 aio_mkdir playerdir $pl, 0770; 1478 aio_mkdir playerdir $pl, 0770;
1427 $pl->{last_save} = $cf::RUNTIME; 1479 $pl->{last_save} = $cf::RUNTIME;
1480
1481 cf::get_slot 0.01;
1428 1482
1429 $pl->save_pl ($path); 1483 $pl->save_pl ($path);
1430 cf::cede_to_tick; 1484 cf::cede_to_tick;
1431} 1485}
1432 1486
… …
1725our $MAX_RESET = 3600; 1779our $MAX_RESET = 3600;
1726our $DEFAULT_RESET = 3000; 1780our $DEFAULT_RESET = 3000;
1727 1781
1728sub generate_random_map { 1782sub generate_random_map {
1729 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
1730 # mit "rum" bekleckern, nicht 1787 # mit "rum" bekleckern, nicht
1731 $self->_create_random_map ( 1788 $self->_create_random_map (
1732 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1733 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1734 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1856 1913
1857# the temporary/swap location 1914# the temporary/swap location
1858sub save_path { 1915sub save_path {
1859 my ($self) = @_; 1916 my ($self) = @_;
1860 1917
1861 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1918 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1862 "$TMPDIR/$path.map" 1919 "$TMPDIR/$path.map"
1863} 1920}
1864 1921
1865# the unique path, undef == no special unique path 1922# the unique path, undef == no special unique path
1866sub uniq_path { 1923sub uniq_path {
1867 my ($self) = @_; 1924 my ($self) = @_;
1868 1925
1869 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1870 "$UNIQUEDIR/$path" 1927 "$UNIQUEDIR/$path"
1871} 1928}
1872 1929
1873# and all this just because we cannot iterate over 1930# and all this just because we cannot iterate over
1874# all maps in C++... 1931# all maps in C++...
… …
2060 } 2117 }
2061 2118
2062 $self->{last_save} = $cf::RUNTIME; 2119 $self->{last_save} = $cf::RUNTIME;
2063 $self->last_access ($cf::RUNTIME); 2120 $self->last_access ($cf::RUNTIME);
2064 2121
2065 $self->in_memory (cf::MAP_IN_MEMORY); 2122 $self->in_memory (cf::MAP_ACTIVE);
2066 } 2123 }
2067 2124
2068 $self->post_load; 2125 $self->post_load;
2069} 2126}
2070 2127
… …
2128 my ($path, $origin, $load) = @_; 2185 my ($path, $origin, $load) = @_;
2129 2186
2130 $path = normalise $path, $origin && $origin->{path}; 2187 $path = normalise $path, $origin && $origin->{path};
2131 2188
2132 if (my $map = $cf::MAP{$path}) { 2189 if (my $map = $cf::MAP{$path}) {
2133 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2190 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2134 } 2191 }
2135 2192
2136 $MAP_PREFETCH{$path} |= $load; 2193 $MAP_PREFETCH{$path} |= $load;
2137 2194
2138 $MAP_PREFETCHER ||= cf::async { 2195 $MAP_PREFETCHER ||= cf::async {
… …
2175 cf::async { 2232 cf::async {
2176 $Coro::current->{desc} = "map player save"; 2233 $Coro::current->{desc} = "map player save";
2177 $_->contr->save for $self->players; 2234 $_->contr->save for $self->players;
2178 }; 2235 };
2179 2236
2237 cf::get_slot 0.02;
2238
2180 if ($uniq) { 2239 if ($uniq) {
2181 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2240 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2182 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2241 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2183 } else { 2242 } else {
2184 $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);
… …
2192 $self->save; 2251 $self->save;
2193 2252
2194 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2253 my $lock = cf::lock_acquire "map_data:$self->{path}";
2195 2254
2196 return if $self->players; 2255 return if $self->players;
2197 return if $self->in_memory != cf::MAP_IN_MEMORY; 2256 return if $self->in_memory != cf::MAP_ACTIVE;
2198 return if $self->{deny_save}; 2257 return if $self->{deny_save};
2199 2258
2200 $self->in_memory (cf::MAP_SWAPPED); 2259 $self->in_memory (cf::MAP_SWAPPED);
2201 2260
2202 $self->deactivate; 2261 $self->deactivate;
… …
2320 2379
2321sub unique_maps() { 2380sub unique_maps() {
2322 [ 2381 [
2323 map { 2382 map {
2324 utf8::decode $_; 2383 utf8::decode $_;
2325 /\.map$/ 2384 s/\.map$//; # TODO future compatibility hack
2385 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2386 ? ()
2326 ? normalise $_ 2387 : normalise $_
2327 : ()
2328 } @{ aio_readdir $UNIQUEDIR or [] } 2388 } @{ aio_readdir $UNIQUEDIR or [] }
2329 ] 2389 ]
2330} 2390}
2331 2391
2332package cf;
2333
2334=back 2392=back
2335 2393
2336=head3 cf::object 2394=head3 cf::object
2337 2395
2338=cut 2396=cut
… …
2341 2399
2342=over 4 2400=over 4
2343 2401
2344=item $ob->inv_recursive 2402=item $ob->inv_recursive
2345 2403
2346Returns 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.
2347 2406
2348=cut 2407=cut
2349 2408
2350sub inv_recursive_; 2409sub inv_recursive_;
2351sub inv_recursive_ { 2410sub inv_recursive_ {
… …
2356 inv_recursive_ inv $_[0] 2415 inv_recursive_ inv $_[0]
2357} 2416}
2358 2417
2359=item $ref = $ob->ref 2418=item $ref = $ob->ref
2360 2419
2361creates 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.
2362 2421
2363=item $ob = cf::object::deref ($refstring) 2422=item $ob = cf::object::deref ($refstring)
2364 2423
2365returns 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,
2366even if the object actually exists. May block. 2425even if the object actually exists. May block.
… …
2640 $rmp->{origin_y} = $exit->y; 2699 $rmp->{origin_y} = $exit->y;
2641 } 2700 }
2642 2701
2643 $rmp->{random_seed} ||= $exit->random_seed; 2702 $rmp->{random_seed} ||= $exit->random_seed;
2644 2703
2645 my $data = cf::encode_json $rmp; 2704 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2646 my $md5 = Digest::MD5::md5_hex $data; 2705 my $md5 = Digest::MD5::md5_hex $data;
2647 my $meta = "$RANDOMDIR/$md5.meta"; 2706 my $meta = "$RANDOMDIR/$md5.meta";
2648 2707
2649 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2650 aio_write $fh, 0, (length $data), $data, 0; 2709 aio_write $fh, 0, (length $data), $data, 0;
… …
3019 3078
3020The following functions and methods are available within a safe environment: 3079The following functions and methods are available within a safe environment:
3021 3080
3022 cf::object 3081 cf::object
3023 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
3024 insert remove name archname title slaying race decrease_ob_nr 3083 insert remove name archname title slaying race decrease split
3025 3084
3026 cf::object::player 3085 cf::object::player
3027 player 3086 player
3028 3087
3029 cf::player 3088 cf::player
… …
3035=cut 3094=cut
3036 3095
3037for ( 3096for (
3038 ["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
3039 insert remove inv name archname title slaying race 3098 insert remove inv name archname title slaying race
3040 decrease_ob_nr destroy)], 3099 decrease split destroy)],
3041 ["cf::object::player" => qw(player)], 3100 ["cf::object::player" => qw(player)],
3042 ["cf::player" => qw(peaceful)], 3101 ["cf::player" => qw(peaceful)],
3043 ["cf::map" => qw(trigger)], 3102 ["cf::map" => qw(trigger)],
3044) { 3103) {
3045 no strict 'refs'; 3104 no strict 'refs';
… …
3218 $RESOURCE{$name} = $info; 3277 $RESOURCE{$name} = $info;
3219 } 3278 }
3220 3279
3221 cf::cede_to_tick; 3280 cf::cede_to_tick;
3222 } 3281 }
3223
3224 if (my $soundconf = delete $res->{"res/sound.conf"}) {
3225 $soundconf = $enc->decode (delete $soundconf->{data});
3226
3227 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3228 my $sound = $soundconf->{compat}[$_]
3229 or next;
3230
3231 my $face = cf::face::find "sound/$sound->[1]";
3232 cf::sound::set $sound->[0] => $face;
3233 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3234 }
3235
3236 while (my ($k, $v) = each %{$soundconf->{event}}) {
3237 my $face = cf::face::find "sound/$v";
3238 cf::sound::set $k => $face;
3239 }
3240 }
3241 } 3282 }
3283
3284 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3242 3285
3243 1 3286 1
3244} 3287}
3288
3289cf::global->attach (on_resource_update => sub {
3290 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3291 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3292
3293 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3294 my $sound = $soundconf->{compat}[$_]
3295 or next;
3296
3297 my $face = cf::face::find "sound/$sound->[1]";
3298 cf::sound::set $sound->[0] => $face;
3299 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3300 }
3301
3302 while (my ($k, $v) = each %{$soundconf->{event}}) {
3303 my $face = cf::face::find "sound/$v";
3304 cf::sound::set $k => $face;
3305 }
3306 }
3307});
3245 3308
3246register_exticmd fx_want => sub { 3309register_exticmd fx_want => sub {
3247 my ($ns, $want) = @_; 3310 my ($ns, $want) = @_;
3248 3311
3249 while (my ($k, $v) = each %$want) { 3312 while (my ($k, $v) = each %$want) {
3250 $ns->fx_want ($k, $v); 3313 $ns->fx_want ($k, $v);
3251 } 3314 }
3252}; 3315};
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}
3253 3326
3254sub reload_regions { 3327sub reload_regions {
3255 # 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
3256 # for this (global event?) 3329 # for this (global event?)
3257 %ext::player_env::MUSIC_FACE_CACHE = (); 3330 %ext::player_env::MUSIC_FACE_CACHE = ();
… …
3271} 3344}
3272 3345
3273sub reload_archetypes { 3346sub reload_archetypes {
3274 load_resource_file "$DATADIR/archetypes" 3347 load_resource_file "$DATADIR/archetypes"
3275 or die "unable to load archetypes\n"; 3348 or die "unable to load archetypes\n";
3276 #d# NEED to laod twice to resolve forward references
3277 # this really needs to be done in an extra post-pass
3278 # (which needs to be synchronous, so solve it differently)
3279 load_resource_file "$DATADIR/archetypes"
3280 or die "unable to load archetypes\n";
3281} 3349}
3282 3350
3283sub reload_treasures { 3351sub reload_treasures {
3284 load_resource_file "$DATADIR/treasures" 3352 load_resource_file "$DATADIR/treasures"
3285 or die "unable to load treasurelists\n"; 3353 or die "unable to load treasurelists\n";
3286} 3354}
3287 3355
3288sub reload_resources { 3356sub reload_resources {
3289 warn "reloading resource files...\n"; 3357 warn "reloading resource files...\n";
3290 3358
3359 reload_facedata;
3360 reload_archetypes;
3291 reload_regions; 3361 reload_regions;
3292 reload_facedata;
3293 #reload_archetypes;#d#
3294 reload_archetypes;
3295 reload_treasures; 3362 reload_treasures;
3296 3363
3297 warn "finished reloading resource files\n"; 3364 warn "finished reloading resource files\n";
3298} 3365}
3299 3366
3300sub init { 3367sub init {
3368 my $guard = freeze_mainloop;
3369
3301 reload_resources; 3370 reload_resources;
3302} 3371}
3303 3372
3304sub reload_config { 3373sub reload_config {
3305 open my $fh, "<:utf8", "$CONFDIR/config" 3374 open my $fh, "<:utf8", "$CONFDIR/config"
3306 or return; 3375 or return;
3307 3376
3308 local $/; 3377 local $/;
3309 *CFG = YAML::Syck::Load <$fh>; 3378 *CFG = YAML::Load <$fh>;
3310 3379
3311 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3380 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3312 3381
3313 $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};
3314 $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};
… …
3330 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3399 $Coro::current->{desc} = "IDLE BUG HANDLER";
3331 EV::loop EV::LOOP_ONESHOT; 3400 EV::loop EV::LOOP_ONESHOT;
3332 })->prio (Coro::PRIO_MAX); 3401 })->prio (Coro::PRIO_MAX);
3333 }; 3402 };
3334 3403
3404 {
3405 my $guard = freeze_mainloop;
3335 reload_config; 3406 reload_config;
3336 db_init; 3407 db_init;
3337 load_extensions; 3408 load_extensions;
3338 3409
3339 $TICK_WATCHER->start;
3340 $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
3341 EV::loop; 3414 EV::loop;
3342} 3415}
3343 3416
3344############################################################################# 3417#############################################################################
3345# initialisation and cleanup 3418# initialisation and cleanup
… …
3352 cf::cleanup "SIG$signal"; 3425 cf::cleanup "SIG$signal";
3353 }; 3426 };
3354 } 3427 }
3355} 3428}
3356 3429
3357sub write_runtime { 3430sub write_runtime_sync {
3358 my $runtime = "$LOCALDIR/runtime"; 3431 my $runtime = "$LOCALDIR/runtime";
3359 3432
3360 # first touch the runtime file to show we are still running: 3433 # first touch the runtime file to show we are still running:
3361 # the fsync below can take a very very long time. 3434 # the fsync below can take a very very long time.
3362 3435
… …
3388 and return; 3461 and return;
3389 3462
3390 warn "runtime file written.\n"; 3463 warn "runtime file written.\n";
3391 3464
3392 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 };
3393} 3509}
3394 3510
3395sub emergency_save() { 3511sub emergency_save() {
3396 my $freeze_guard = cf::freeze_mainloop; 3512 my $freeze_guard = cf::freeze_mainloop;
3397 3513
… …
3419 warn "end emergency map save\n"; 3535 warn "end emergency map save\n";
3420 3536
3421 warn "begin emergency database checkpoint\n"; 3537 warn "begin emergency database checkpoint\n";
3422 BDB::db_env_txn_checkpoint $DB_ENV; 3538 BDB::db_env_txn_checkpoint $DB_ENV;
3423 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";
3424 }; 3544 };
3425 3545
3426 warn "leave emergency perl save\n"; 3546 warn "leave emergency perl save\n";
3427} 3547}
3428 3548
… …
3443 warn "reloading..."; 3563 warn "reloading...";
3444 3564
3445 warn "entering sync_job"; 3565 warn "entering sync_job";
3446 3566
3447 cf::sync_job { 3567 cf::sync_job {
3448 cf::write_runtime; # external watchdog should not bark 3568 cf::write_runtime_sync; # external watchdog should not bark
3449 cf::emergency_save; 3569 cf::emergency_save;
3450 cf::write_runtime; # external watchdog should not bark 3570 cf::write_runtime_sync; # external watchdog should not bark
3451 3571
3452 warn "syncing database to disk"; 3572 warn "syncing database to disk";
3453 BDB::db_env_txn_checkpoint $DB_ENV; 3573 BDB::db_env_txn_checkpoint $DB_ENV;
3454 3574
3455 # 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
… …
3542 warn "leaving sync_job"; 3662 warn "leaving sync_job";
3543 3663
3544 1 3664 1
3545 } or do { 3665 } or do {
3546 warn $@; 3666 warn $@;
3547 warn "error while reloading, exiting."; 3667 cf::cleanup "error while reloading, exiting.";
3548 exit 1;
3549 }; 3668 };
3550 3669
3551 warn "reloaded"; 3670 warn "reloaded";
3552}; 3671};
3553 3672
… …
3556sub reload_perl() { 3675sub reload_perl() {
3557 # doing reload synchronously and two reloads happen back-to-back, 3676 # doing reload synchronously and two reloads happen back-to-back,
3558 # coro crashes during coro_state_free->destroy here. 3677 # coro crashes during coro_state_free->destroy here.
3559 3678
3560 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3679 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3680 do_reload_perl;
3561 undef $RELOAD_WATCHER; 3681 undef $RELOAD_WATCHER;
3562 do_reload_perl;
3563 }; 3682 };
3564} 3683}
3565 3684
3566register_command "reload" => sub { 3685register_command "reload" => sub {
3567 my ($who, $arg) = @_; 3686 my ($who, $arg) = @_;
… …
3581 3700
3582our @WAIT_FOR_TICK; 3701our @WAIT_FOR_TICK;
3583our @WAIT_FOR_TICK_BEGIN; 3702our @WAIT_FOR_TICK_BEGIN;
3584 3703
3585sub wait_for_tick { 3704sub wait_for_tick {
3586 return unless $TICK_WATCHER->is_active;
3587 return if $Coro::current == $Coro::main; 3705 return if tick_inhibit || $Coro::current == $Coro::main;
3588 3706
3589 my $signal = new Coro::Signal; 3707 my $signal = new Coro::Signal;
3590 push @WAIT_FOR_TICK, $signal; 3708 push @WAIT_FOR_TICK, $signal;
3591 $signal->wait; 3709 $signal->wait;
3592} 3710}
3593 3711
3594sub wait_for_tick_begin { 3712sub wait_for_tick_begin {
3595 return unless $TICK_WATCHER->is_active;
3596 return if $Coro::current == $Coro::main; 3713 return if tick_inhibit || $Coro::current == $Coro::main;
3597 3714
3598 my $signal = new Coro::Signal; 3715 my $signal = new Coro::Signal;
3599 push @WAIT_FOR_TICK_BEGIN, $signal; 3716 push @WAIT_FOR_TICK_BEGIN, $signal;
3600 $signal->wait; 3717 $signal->wait;
3601} 3718}
3602 3719
3603$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3720sub tick {
3604 if ($Coro::current != $Coro::main) { 3721 if ($Coro::current != $Coro::main) {
3605 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"
3606 unless ++$bug_warning > 10; 3723 unless ++$bug_warning > 10;
3607 return; 3724 return;
3608 } 3725 }
3609 3726
3610 $NOW = $tick_start = EV::now;
3611
3612 cf::server_tick; # one server iteration 3727 cf::server_tick; # one server iteration
3613
3614 $RUNTIME += $TICK;
3615 $NEXT_TICK = $_[0]->at;
3616 3728
3617 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3729 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3618 $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.;
3619 Coro::async_pool { 3731 Coro::async_pool {
3620 $Coro::current->{desc} = "runtime saver"; 3732 $Coro::current->{desc} = "runtime saver";
3621 write_runtime 3733 write_runtime_sync
3622 or warn "ERROR: unable to write runtime file: $!"; 3734 or warn "ERROR: unable to write runtime file: $!";
3623 }; 3735 };
3624 } 3736 }
3625 3737
3626 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3738 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3628 } 3740 }
3629 while (my $sig = shift @WAIT_FOR_TICK) { 3741 while (my $sig = shift @WAIT_FOR_TICK) {
3630 $sig->send; 3742 $sig->send;
3631 } 3743 }
3632 3744
3633 $LOAD = ($NOW - $tick_start) / $TICK; 3745 $LOAD = ($NOW - $TICK_START) / $TICK;
3634 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3746 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3635 3747
3636 _post_tick; 3748 if (0) {
3637}; 3749 if ($NEXT_TICK) {
3638$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}
3639 3756
3640{ 3757{
3641 # configure BDB 3758 # configure BDB
3642 3759
3643 BDB::min_parallel 8; 3760 BDB::min_parallel 8;

Diff Legend

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