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.534 by root, Thu Apr 29 08:13:51 2010 UTC vs.
Revision 1.591 by root, Tue Nov 6 23:33:15 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the Affero GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>. 18# <http://www.gnu.org/licenses/>.
19# 19#
20# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
21# 21#
22 22
23package cf; 23package cf;
24 24
25use 5.10.0; 25use common::sense;
26use utf8;
27use strict qw(vars subs);
28 26
29use Symbol; 27use Symbol;
30use List::Util; 28use List::Util;
31use Socket; 29use Socket;
32use EV; 30use EV;
… …
34use Safe; 32use Safe;
35use Safe::Hole; 33use Safe::Hole;
36use Storable (); 34use Storable ();
37use Carp (); 35use Carp ();
38 36
39use Guard (); 37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
40use Coro (); 41use Coro ();
41use Coro::State; 42use Coro::State;
42use Coro::Handle; 43use Coro::Handle;
43use Coro::EV; 44use Coro::EV;
44use Coro::AnyEvent; 45use Coro::AnyEvent;
… …
50use Coro::AIO; 51use Coro::AIO;
51use Coro::BDB 1.6; 52use Coro::BDB 1.6;
52use Coro::Storable; 53use Coro::Storable;
53use Coro::Util (); 54use Coro::Util ();
54 55
56use Guard ();
55use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
56use BDB (); 58use BDB ();
57use Data::Dumper; 59use Data::Dumper;
58use Fcntl; 60use Fcntl;
59use YAML::XS (); 61use YAML::XS ();
… …
78# strictly for debugging 80# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 81$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 82
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 83sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 84
85our @ORIG_INC;
86
83our %COMMAND = (); 87our %COMMAND = ();
84our %COMMAND_TIME = (); 88our %COMMAND_TIME = ();
85 89
86our @EXTS = (); # list of extension package names 90our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 91our %EXTCMD = ();
… …
93our @EVENT; 97our @EVENT;
94our @REFLECT; # set by XS 98our @REFLECT; # set by XS
95our %REFLECT; # set by us 99our %REFLECT; # set by us
96 100
97our $CONFDIR = confdir; 101our $CONFDIR = confdir;
102
98our $DATADIR = datadir; 103our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 104our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 105our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 106our $MAPDIR = "$DATADIR/" . mapdir;
107
102our $LOCALDIR = localdir; 108our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 109our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 110our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 111our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 112our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 113our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 114our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 115our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 116
111our %RESOURCE; # unused 117#our %RESOURCE; # unused
112 118
113our $OUTPUT_RATE_MIN = 3000; 119our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000; 120our $OUTPUT_RATE_MAX = 1000000;
115 121
116our $MAX_LINKS = 32; # how many chained exits to follow 122our $MAX_LINKS = 32; # how many chained exits to follow
… …
124our $BDB_DEADLOCK_WATCHER; 130our $BDB_DEADLOCK_WATCHER;
125our $BDB_CHECKPOINT_WATCHER; 131our $BDB_CHECKPOINT_WATCHER;
126our $BDB_TRICKLE_WATCHER; 132our $BDB_TRICKLE_WATCHER;
127our $DB_ENV; 133our $DB_ENV;
128 134
129our @EXTRA_MODULES = qw(pod match mapscript); 135our @EXTRA_MODULES = qw(pod match mapscript incloader);
130 136
131our %CFG; 137our %CFG;
138our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
132 139
133our $UPTIME; $UPTIME ||= time; 140our $UPTIME; $UPTIME ||= time;
134our $RUNTIME; 141our $RUNTIME = 0;
142our $SERVER_TICK = 0;
135our $NOW; 143our $NOW;
136 144
137our (%PLAYER, %PLAYER_LOADING); # all users 145our (%PLAYER, %PLAYER_LOADING); # all users
138our (%MAP, %MAP_LOADING ); # all maps 146our (%MAP, %MAP_LOADING ); # all maps
139our $LINK_MAP; # the special {link} map, which is always available 147our $LINK_MAP; # the special {link} map, which is always available
… …
148 156
149our @POST_INIT; 157our @POST_INIT;
150 158
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 159our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :) 160our $REALLY_UNLOOP; # never set to true, please :)
161
162our $WAIT_FOR_TICK = new Coro::Signal;
163our @WAIT_FOR_TICK_BEGIN;
153 164
154binmode STDOUT; 165binmode STDOUT;
155binmode STDERR; 166binmode STDERR;
156 167
157# read virtual server time, if available 168# read virtual server time, if available
… …
191 202
192=over 4 203=over 4
193 204
194=item $cf::UPTIME 205=item $cf::UPTIME
195 206
196The timestamp of the server start (so not actually an uptime). 207The timestamp of the server start (so not actually an "uptime").
208
209=item $cf::SERVER_TICK
210
211An unsigned integer that starts at zero when the server is started and is
212incremented on every tick.
213
214=item $cf::NOW
215
216The (real) time of the last (current) server tick - updated before and
217after tick processing, so this is useful only as a rough "what time is it
218now" estimate.
219
220=item $cf::TICK
221
222The interval between each server tick, in seconds.
197 223
198=item $cf::RUNTIME 224=item $cf::RUNTIME
199 225
200The time this server has run, starts at 0 and is increased by $cf::TICK on 226The time this server has run, starts at 0 and is increased by $cf::TICK on
201every server tick. 227every server tick.
202 228
203=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 229=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
204$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 230$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
205$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 231$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
206 232
207Various directories - "/etc", read-only install directory, perl-library 233Various directories - "/etc", read-only install directory, perl-library
208directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 234directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209unique-items directory, player file directory, random maps directory and 235unique-items directory, player file directory, random maps directory and
210database environment. 236database environment.
211 237
212=item $cf::NOW
213
214The time of the last (current) server tick.
215
216=item $cf::TICK
217
218The interval between server ticks, in seconds.
219
220=item $cf::LOADAVG 238=item $cf::LOADAVG
221 239
222The current CPU load on the server (alpha-smoothed), as a value between 0 240The current CPU load on the server (alpha-smoothed), as a value between 0
223(none) and 1 (overloaded), indicating how much time is spent on processing 241(none) and 1 (overloaded), indicating how much time is spent on processing
224objects per tick. Healthy values are < 0.5. 242objects per tick. Healthy values are < 0.5.
… …
233from wherever your confdir points to. 251from wherever your confdir points to.
234 252
235=item cf::wait_for_tick, cf::wait_for_tick_begin 253=item cf::wait_for_tick, cf::wait_for_tick_begin
236 254
237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 255These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
238returns directly I<after> the tick processing (and consequently, can only wake one process 256returns directly I<after> the tick processing (and consequently, can only wake one thread
239per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 257per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
258
259Note that cf::Wait_for_tick will immediately return when the server is not
260ticking, making it suitable for small pauses in threads that need to run
261when the server is paused. If that is not applicable (i.e. you I<really>
262want to wait, use C<$cf::WAIT_FOR_TICK>).
263
264=item $cf::WAIT_FOR_TICK
265
266Note that C<cf::wait_for_tick> is probably the correct thing to use. This
267variable contains a L<Coro::Signal> that is broadcats after every server
268tick. Calling C<< ->wait >> on it will suspend the caller until after the
269next server tick.
270
271=cut
272
273sub wait_for_tick();
274sub wait_for_tick_begin();
240 275
241=item @cf::INVOKE_RESULTS 276=item @cf::INVOKE_RESULTS
242 277
243This array contains the results of the last C<invoke ()> call. When 278This array contains the results of the last C<invoke ()> call. When
244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 279C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
… …
305)) { 340)) {
306 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 341 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
307} 342}
308 343
309$EV::DIED = sub { 344$EV::DIED = sub {
310 Carp::cluck "error in event callback: @_"; 345 warn "error in event callback: $@";
311}; 346};
347
348#############################################################################
349
350sub fork_call(&@);
351sub get_slot($;$$);
312 352
313############################################################################# 353#############################################################################
314 354
315=head2 UTILITY FUNCTIONS 355=head2 UTILITY FUNCTIONS
316 356
… …
337 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 377 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
338 $d 378 $d
339 } || "[unable to dump $_[0]: '$@']"; 379 } || "[unable to dump $_[0]: '$@']";
340} 380}
341 381
382=item $scalar = cf::load_file $path
383
384Loads the given file from path and returns its contents. Croaks on error
385and can block.
386
387=cut
388
389sub load_file($) {
390 0 <= aio_load $_[0], my $data
391 or Carp::croak "$_[0]: $!";
392
393 $data
394}
395
396=item $success = cf::replace_file $path, $data, $sync
397
398Atomically replaces the file at the given $path with new $data, and
399optionally $sync the data to disk before replacing the file.
400
401=cut
402
403sub replace_file($$;$) {
404 my ($path, $data, $sync) = @_;
405
406 my $lock = cf::lock_acquire ("replace_file:$path");
407
408 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
409 or return;
410
411 $data = $data->() if ref $data;
412
413 length $data == aio_write $fh, 0, (length $data), $data, 0
414 or return;
415
416 !$sync
417 or !aio_fsync $fh
418 or return;
419
420 aio_close $fh
421 and return;
422
423 aio_rename "$path~", $path
424 and return;
425
426 if ($sync) {
427 $path =~ s%/[^/]*$%%;
428 aio_pathsync $path;
429 }
430
431 1
432}
433
342=item $ref = cf::decode_json $json 434=item $ref = cf::decode_json $json
343 435
344Converts a JSON string into the corresponding perl data structure. 436Converts a JSON string into the corresponding perl data structure.
345 437
346=item $json = cf::encode_json $ref 438=item $json = cf::encode_json $ref
… …
352our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 444our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
353 445
354sub encode_json($) { $json_coder->encode ($_[0]) } 446sub encode_json($) { $json_coder->encode ($_[0]) }
355sub decode_json($) { $json_coder->decode ($_[0]) } 447sub decode_json($) { $json_coder->decode ($_[0]) }
356 448
449=item $ref = cf::decode_storable $scalar
450
451Same as Coro::Storable::thaw, so blocks.
452
453=cut
454
455BEGIN { *decode_storable = \&Coro::Storable::thaw }
456
457=item $ref = cf::decode_yaml $scalar
458
459Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
460
461=cut
462
463sub decode_yaml($) {
464 fork_call { YAML::XS::Load $_[0] } @_
465}
466
467=item $scalar = cf::unlzf $scalar
468
469Same as Compress::LZF::compress, but takes server ticks into account, so
470blocks.
471
472=cut
473
474sub unlzf($) {
475 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
476 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
477 Compress::LZF::decompress $_[0]
478}
479
357=item cf::post_init { BLOCK } 480=item cf::post_init { BLOCK }
358 481
359Execute the given codeblock, I<after> all extensions have been (re-)loaded, 482Execute the given codeblock, I<after> all extensions have been (re-)loaded,
360but I<before> the server starts ticking again. 483but I<before> the server starts ticking again.
361 484
362The cdoeblock will have a single boolean argument to indicate whether this 485The codeblock will have a single boolean argument to indicate whether this
363is a reload or not. 486is a reload or not.
364 487
365=cut 488=cut
366 489
367sub post_init(&) { 490sub post_init(&) {
368 push @POST_INIT, shift; 491 push @POST_INIT, shift;
492}
493
494sub _post_init {
495 trace "running post_init jobs";
496
497 # run them in parallel...
498
499 my @join;
500
501 while () {
502 push @join, map &Coro::async ($_, 0), @POST_INIT;
503 @POST_INIT = ();
504
505 @join or last;
506
507 (pop @join)->join;
508 }
369} 509}
370 510
371=item cf::lock_wait $string 511=item cf::lock_wait $string
372 512
373Wait until the given lock is available. See cf::lock_acquire. 513Wait until the given lock is available. See cf::lock_acquire.
… …
426 EV::periodic $start, $interval, 0, $cb 566 EV::periodic $start, $interval, 0, $cb
427} 567}
428 568
429=item cf::get_slot $time[, $priority[, $name]] 569=item cf::get_slot $time[, $priority[, $name]]
430 570
431Allocate $time seconds of blocking CPU time at priority C<$priority>: 571Allocate $time seconds of blocking CPU time at priority C<$priority>
432This call blocks and returns only when you have at least C<$time> seconds 572(default: 0): This call blocks and returns only when you have at least
433of cpu time till the next tick. The slot is only valid till the next cede. 573C<$time> seconds of cpu time till the next tick. The slot is only valid
574till the next cede.
575
576Background jobs should use a priority les than zero, interactive jobs
577should use 100 or more.
434 578
435The optional C<$name> can be used to identify the job to run. It might be 579The optional C<$name> can be used to identify the job to run. It might be
436used for statistical purposes and should identify the same time-class. 580used for statistical purposes and should identify the same time-class.
437 581
438Useful for short background jobs. 582Useful for short background jobs.
… …
467 } 611 }
468 } 612 }
469 613
470 if (@SLOT_QUEUE) { 614 if (@SLOT_QUEUE) {
471 # we do not use wait_for_tick() as it returns immediately when tick is inactive 615 # we do not use wait_for_tick() as it returns immediately when tick is inactive
472 push @cf::WAIT_FOR_TICK, $signal; 616 $WAIT_FOR_TICK->wait;
473 $signal->wait;
474 } else { 617 } else {
475 $busy = 0; 618 $busy = 0;
476 Coro::schedule; 619 Coro::schedule;
477 } 620 }
478 } 621 }
… …
578 $EXT_CORO{$coro+0} = $coro; 721 $EXT_CORO{$coro+0} = $coro;
579 722
580 $coro 723 $coro
581} 724}
582 725
583=item fork_call { }, $args 726=item fork_call { }, @args
584 727
585Executes the given code block with the given arguments in a seperate 728Executes the given code block with the given arguments in a seperate
586process, returning the results. Everything must be serialisable with 729process, returning the results. Everything must be serialisable with
587Coro::Storable. May, of course, block. Note that the executed sub may 730Coro::Storable. May, of course, block. Note that the executed sub may
588never block itself or use any form of event handling. 731never block itself or use any form of event handling.
589 732
590=cut 733=cut
591 734
735sub post_fork {
736 reset_signals;
737}
738
592sub fork_call(&@) { 739sub fork_call(&@) {
593 my ($cb, @args) = @_; 740 my ($cb, @args) = @_;
594 741
595 # we seemingly have to make a local copy of the whole thing, 742 # we seemingly have to make a local copy of the whole thing,
596 # otherwise perl prematurely frees the stuff :/ 743 # otherwise perl prematurely frees the stuff :/
597 # TODO: investigate and fix (likely this will be rather laborious) 744 # TODO: investigate and fix (likely this will be rather laborious)
598 745
599 my @res = Coro::Util::fork_eval { 746 my @res = Coro::Util::fork_eval {
600 reset_signals; 747 cf::post_fork;
601 &$cb 748 &$cb
602 }, @args; 749 } @args;
603 750
604 wantarray ? @res : $res[-1] 751 wantarray ? @res : $res[-1]
605} 752}
606 753
607sub objinfo { 754sub objinfo {
… …
729 876
730 my @data; 877 my @data;
731 my $md5; 878 my $md5;
732 879
733 for (0 .. $#$src) { 880 for (0 .. $#$src) {
734 0 <= aio_load $src->[$_], $data[$_] 881 $data[$_] = load_file $src->[$_];
735 or Carp::croak "$src->[$_]: $!";
736 } 882 }
737 883
738 # if processing is expensive, check 884 # if processing is expensive, check
739 # checksum first 885 # checksum first
740 if (1) { 886 if (1) {
… …
1358 my ($pl, $buf) = @_; 1504 my ($pl, $buf) = @_;
1359 1505
1360 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1506 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1361 1507
1362 if (ref $msg) { 1508 if (ref $msg) {
1363 my ($type, $reply, @payload) = 1509 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1364 "ARRAY" eq ref $msg
1365 ? @$msg
1366 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1367 1510
1368 my @reply; 1511 my @reply;
1369 1512
1370 if (my $cb = $EXTCMD{$type}) { 1513 if (my $cb = $EXTCMD{$type}) {
1371 @reply = $cb->($pl, @payload); 1514 @reply = $cb->($pl, @payload);
… …
1393 }; 1536 };
1394 1537
1395 $grp 1538 $grp
1396} 1539}
1397 1540
1541sub _ext_cfg_reg($$$$) {
1542 my ($rvar, $varname, $cfgname, $default) = @_;
1543
1544 $cfgname = lc $varname
1545 unless length $cfgname;
1546
1547 $EXT_CFG{$cfgname} = [$rvar, $default];
1548
1549 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1550}
1551
1398sub load_extensions { 1552sub load_extensions {
1399 info "loading extensions..."; 1553 info "loading extensions...";
1554
1555 %EXT_CFG = ();
1400 1556
1401 cf::sync_job { 1557 cf::sync_job {
1402 my %todo; 1558 my %todo;
1403 1559
1404 for my $path (<$LIBDIR/*.ext>) { 1560 for my $path (<$LIBDIR/*.ext>) {
… …
1423 1579
1424 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1580 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1425 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1581 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1426 1582
1427 $ext{source} = 1583 $ext{source} =
1428 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1584 "package $pkg; use common::sense;\n"
1429 . "#line 1 \"$path\"\n{\n" 1585 . "#line 1 \"$path\"\n{\n"
1430 . $source 1586 . $source
1431 . "\n};\n1"; 1587 . "\n};\n1";
1432 1588
1433 $todo{$base} = \%ext; 1589 $todo{$base} = \%ext;
… …
1447 unless exists $done{$_}; 1603 unless exists $done{$_};
1448 } 1604 }
1449 1605
1450 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1606 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1451 1607
1608 my $source = $v->{source};
1609
1610 # support "CONF varname :confname = default" pseudo-statements
1611 $source =~ s{
1612 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1613 }{
1614 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1615 }gmxe;
1616
1452 my $active = eval $v->{source}; 1617 my $active = eval $source;
1453 1618
1454 if (length $@) { 1619 if (length $@) {
1455 error "$v->{path}: $@\n"; 1620 error "$v->{path}: $@\n";
1456 1621
1457 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1622 cf::cleanup "mandatory extension '$k' failed to load, exiting."
… …
1474 1639
1475 while (my ($k, $v) = each %todo) { 1640 while (my ($k, $v) = each %todo) {
1476 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1641 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1477 if exists $v->{meta}{mandatory}; 1642 if exists $v->{meta}{mandatory};
1478 } 1643 }
1644
1645 last;
1479 } 1646 }
1480 } 1647 }
1481 }; 1648 };
1482} 1649}
1483 1650
… …
1641 my $name = $pl->ob->name; 1808 my $name = $pl->ob->name;
1642 1809
1643 $pl->{deny_save} = 1; 1810 $pl->{deny_save} = 1;
1644 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1811 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1645 1812
1646 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1813 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1647 $pl->deactivate; 1814 $pl->deactivate;
1815
1648 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1816 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1649 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1817 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1818 ext::highscore::check ($pl->ob);
1819
1650 $pl->ns->destroy if $pl->ns; 1820 $pl->ns->destroy if $pl->ns;
1651 1821
1652 my $path = playerdir $pl; 1822 my $path = playerdir $pl;
1653 my $temp = "$path~$cf::RUNTIME~deleting~"; 1823 my $temp = "$path~$cf::RUNTIME~deleting~";
1654 aio_rename $path, $temp; 1824 aio_rename $path, $temp;
… …
1820sub generate_random_map { 1990sub generate_random_map {
1821 my ($self, $rmp) = @_; 1991 my ($self, $rmp) = @_;
1822 1992
1823 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1993 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1824 1994
1825 # mit "rum" bekleckern, nicht
1826 $self->_create_random_map ( 1995 $self->_create_random_map ($rmp);
1827 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1828 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1829 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1830 $rmp->{exit_on_final_map},
1831 $rmp->{xsize}, $rmp->{ysize},
1832 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1833 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1834 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1835 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1836 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1837 (cf::region::find $rmp->{region}), $rmp->{custom}
1838 )
1839} 1996}
1840 1997
1841=item cf::map->register ($regex, $prio) 1998=item cf::map->register ($regex, $prio)
1842 1999
1843Register a handler for the map path matching the given regex at the 2000Register a handler for the map path matching the given regex at the
… …
1848 2005
1849sub register { 2006sub register {
1850 my (undef, $regex, $prio) = @_; 2007 my (undef, $regex, $prio) = @_;
1851 my $pkg = caller; 2008 my $pkg = caller;
1852 2009
1853 no strict;
1854 push @{"$pkg\::ISA"}, __PACKAGE__; 2010 push @{"$pkg\::ISA"}, __PACKAGE__;
1855 2011
1856 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2012 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1857} 2013}
1858 2014
… …
1870} 2026}
1871 2027
1872sub normalise { 2028sub normalise {
1873 my ($path, $base) = @_; 2029 my ($path, $base) = @_;
1874 2030
1875 $path = "$path"; # make sure its a string 2031 $path = "$path"; # make sure it's a string
1876 2032
1877 $path =~ s/\.map$//; 2033 $path =~ s/\.map$//;
1878 2034
1879 # map plan: 2035 # map plan:
1880 # 2036 #
… …
1895 $base =~ s{[^/]+/?$}{}; 2051 $base =~ s{[^/]+/?$}{};
1896 $path = "$base/$path"; 2052 $path = "$base/$path";
1897 } 2053 }
1898 2054
1899 for ($path) { 2055 for ($path) {
1900 redo if s{//}{/};
1901 redo if s{/\.?/}{/}; 2056 redo if s{/\.?/}{/};
1902 redo if s{/[^/]+/\.\./}{/}; 2057 redo if s{/[^/]+/\.\./}{/};
1903 } 2058 }
1904 2059
1905 $path 2060 $path
… …
1919 $self->init; # pass $1 etc. 2074 $self->init; # pass $1 etc.
1920 return $self; 2075 return $self;
1921 } 2076 }
1922 } 2077 }
1923 2078
1924 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2079 Carp::cluck "unable to resolve path '$path' (base '$base')";
1925 () 2080 ()
1926} 2081}
1927 2082
2083# may re-bless or do other evil things
1928sub init { 2084sub init {
1929 my ($self) = @_; 2085 my ($self) = @_;
1930 2086
1931 $self 2087 $self
1932} 2088}
… …
1997 $self->{load_path} = $path; 2153 $self->{load_path} = $path;
1998 2154
1999 1 2155 1
2000} 2156}
2001 2157
2158# used to laod the header of an original map
2002sub load_header_orig { 2159sub load_header_orig {
2003 my ($self) = @_; 2160 my ($self) = @_;
2004 2161
2005 $self->load_header_from ($self->load_path) 2162 $self->load_header_from ($self->load_path)
2006} 2163}
2007 2164
2165# used to laod the header of an instantiated map
2008sub load_header_temp { 2166sub load_header_temp {
2009 my ($self) = @_; 2167 my ($self) = @_;
2010 2168
2011 $self->load_header_from ($self->save_path) 2169 $self->load_header_from ($self->save_path)
2012} 2170}
2013 2171
2172# called after loading the header from an instantiated map
2014sub prepare_temp { 2173sub prepare_temp {
2015 my ($self) = @_; 2174 my ($self) = @_;
2016 2175
2017 $self->last_access ((delete $self->{last_access}) 2176 $self->last_access ((delete $self->{last_access})
2018 || $cf::RUNTIME); #d# 2177 || $cf::RUNTIME); #d#
2019 # safety 2178 # safety
2020 $self->{instantiate_time} = $cf::RUNTIME 2179 $self->{instantiate_time} = $cf::RUNTIME
2021 if $self->{instantiate_time} > $cf::RUNTIME; 2180 if $self->{instantiate_time} > $cf::RUNTIME;
2022} 2181}
2023 2182
2183# called after loading the header from an original map
2024sub prepare_orig { 2184sub prepare_orig {
2025 my ($self) = @_; 2185 my ($self) = @_;
2026 2186
2027 $self->{load_original} = 1; 2187 $self->{load_original} = 1;
2028 $self->{instantiate_time} = $cf::RUNTIME; 2188 $self->{instantiate_time} = $cf::RUNTIME;
… …
2052 2212
2053sub find; 2213sub find;
2054sub find { 2214sub find {
2055 my ($path, $origin) = @_; 2215 my ($path, $origin) = @_;
2056 2216
2217 cf::cede_to_tick;
2218
2057 $path = normalise $path, $origin && $origin->path; 2219 $path = normalise $path, $origin;
2058 2220
2059 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2221 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2060 my $guard2 = cf::lock_acquire "map_find:$path"; 2222 my $guard2 = cf::lock_acquire "map_find:$path";
2061 2223
2062 $cf::MAP{$path} || do { 2224 $cf::MAP{$path} || do {
… …
2093 2255
2094 { 2256 {
2095 my $guard = cf::lock_acquire "map_data:$path"; 2257 my $guard = cf::lock_acquire "map_data:$path";
2096 2258
2097 return unless $self->valid; 2259 return unless $self->valid;
2098 return unless $self->in_memory == cf::MAP_SWAPPED; 2260 return unless $self->state == cf::MAP_SWAPPED;
2099
2100 $self->in_memory (cf::MAP_LOADING);
2101 2261
2102 $self->alloc; 2262 $self->alloc;
2103 2263
2104 $self->pre_load; 2264 $self->pre_load;
2105 cf::cede_to_tick; 2265 cf::cede_to_tick;
2106 2266
2267 if (exists $self->{load_path}) {
2107 my $f = new_from_file cf::object::thawer $self->{load_path}; 2268 my $f = new_from_file cf::object::thawer $self->{load_path};
2108 $f->skip_block; 2269 $f->skip_block;
2109 $self->_load_objects ($f) 2270 $self->_load_objects ($f)
2110 or return; 2271 or return;
2111 2272
2112 $self->post_load_original 2273 $self->post_load_original
2113 if delete $self->{load_original}; 2274 if delete $self->{load_original};
2114 2275
2115 if (my $uniq = $self->uniq_path) { 2276 if (my $uniq = $self->uniq_path) {
2116 utf8::encode $uniq; 2277 utf8::encode $uniq;
2117 unless (aio_stat $uniq) { 2278 unless (aio_stat $uniq) {
2118 if (my $f = new_from_file cf::object::thawer $uniq) { 2279 if (my $f = new_from_file cf::object::thawer $uniq) {
2119 $self->clear_unique_items; 2280 $self->clear_unique_items;
2120 $self->_load_objects ($f); 2281 $self->_load_objects ($f);
2121 $f->resolve_delayed_derefs; 2282 $f->resolve_delayed_derefs;
2283 }
2122 } 2284 }
2123 } 2285 }
2124 }
2125 2286
2126 $f->resolve_delayed_derefs; 2287 $f->resolve_delayed_derefs;
2288 } else {
2289 $self->post_load_original
2290 if delete $self->{load_original};
2291 }
2292
2293 $self->state (cf::MAP_INACTIVE);
2127 2294
2128 cf::cede_to_tick; 2295 cf::cede_to_tick;
2129 # now do the right thing for maps 2296 # now do the right thing for maps
2130 $self->link_multipart_objects; 2297 $self->link_multipart_objects;
2131 $self->difficulty ($self->estimate_difficulty) 2298 $self->difficulty ($self->estimate_difficulty)
… …
2135 unless ($self->{deny_activate}) { 2302 unless ($self->{deny_activate}) {
2136 $self->decay_objects; 2303 $self->decay_objects;
2137 $self->fix_auto_apply; 2304 $self->fix_auto_apply;
2138 $self->update_buttons; 2305 $self->update_buttons;
2139 cf::cede_to_tick; 2306 cf::cede_to_tick;
2140 $self->activate; 2307 #$self->activate; # no longer activate maps automatically
2141 } 2308 }
2142 2309
2143 $self->{last_save} = $cf::RUNTIME; 2310 $self->{last_save} = $cf::RUNTIME;
2144 $self->last_access ($cf::RUNTIME); 2311 $self->last_access ($cf::RUNTIME);
2145
2146 $self->in_memory (cf::MAP_ACTIVE);
2147 } 2312 }
2148 2313
2149 $self->post_load; 2314 $self->post_load;
2315
2316 1
2150} 2317}
2151 2318
2152# customize the map for a given player, i.e. 2319# customize the map for a given player, i.e.
2153# return the _real_ map. used by e.g. per-player 2320# return the _real_ map. used by e.g. per-player
2154# maps to change the path to ~playername/mappath 2321# maps to change the path to ~playername/mappath
… …
2162# if $self->per_party; 2329# if $self->per_party;
2163 2330
2164 $self 2331 $self
2165} 2332}
2166 2333
2167# find and load all maps in the 3x3 area around a map
2168sub load_neighbours {
2169 my ($map) = @_;
2170
2171 my @neigh; # diagonal neighbours
2172
2173 for (0 .. 3) {
2174 my $neigh = $map->tile_path ($_)
2175 or next;
2176 $neigh = find $neigh, $map
2177 or next;
2178 $neigh->load;
2179
2180 # now find the diagonal neighbours
2181 push @neigh,
2182 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2183 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2184 }
2185
2186 for (grep defined $_->[0], @neigh) {
2187 my ($path, $origin) = @$_;
2188 my $neigh = find $path, $origin
2189 or next;
2190 $neigh->load;
2191 }
2192}
2193
2194sub find_sync { 2334sub find_sync {
2195 my ($path, $origin) = @_; 2335 my ($path, $origin) = @_;
2196 2336
2337 # it's a bug to call this from the main context
2197 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2338 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2198 if $Coro::current == $Coro::main; 2339 if $Coro::current == $Coro::main;
2199 2340
2200 find $path, $origin 2341 find $path, $origin
2201} 2342}
2202 2343
2203sub do_load_sync { 2344sub do_load_sync {
2204 my ($map) = @_; 2345 my ($map) = @_;
2205 2346
2347 # it's a bug to call this from the main context
2206 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2348 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2207 if $Coro::current == $Coro::main; 2349 if $Coro::current == $Coro::main;
2208 2350
2209 $map->load; 2351 $map->load;
2210} 2352}
… …
2213our $MAP_PREFETCHER = undef; 2355our $MAP_PREFETCHER = undef;
2214 2356
2215sub find_async { 2357sub find_async {
2216 my ($path, $origin, $load) = @_; 2358 my ($path, $origin, $load) = @_;
2217 2359
2218 $path = normalise $path, $origin && $origin->{path}; 2360 $path = normalise $path, $origin;
2219 2361
2220 if (my $map = $cf::MAP{$path}) { 2362 if (my $map = $cf::MAP{$path}) {
2221 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2363 return $map if !$load || $map->linkable;
2222 } 2364 }
2223 2365
2224 $MAP_PREFETCH{$path} |= $load; 2366 $MAP_PREFETCH{$path} |= $load;
2225 2367
2226 $MAP_PREFETCHER ||= cf::async { 2368 $MAP_PREFETCHER ||= cf::async {
… …
2285sub swap_out { 2427sub swap_out {
2286 my ($self) = @_; 2428 my ($self) = @_;
2287 2429
2288 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2430 my $lock = cf::lock_acquire "map_data:$self->{path}";
2289 2431
2290 return if $self->in_memory != cf::MAP_ACTIVE; 2432 return if !$self->linkable;
2291 return if $self->{deny_save}; 2433 return if $self->{deny_save};
2292 return if $self->players; 2434 return if $self->players;
2293 2435
2294 # first deactivate the map and "unlink" it from the core 2436 # first deactivate the map and "unlink" it from the core
2295 $self->deactivate; 2437 $self->deactivate;
2296 $_->clear_links_to ($self) for values %cf::MAP; 2438 $_->clear_links_to ($self) for values %cf::MAP;
2297 $self->in_memory (cf::MAP_SWAPPED); 2439 $self->state (cf::MAP_SWAPPED);
2298 2440
2299 # then atomically save 2441 # then atomically save
2300 $self->_save; 2442 $self->_save;
2301 2443
2302 # then free the map 2444 # then free the map
… …
2328 2470
2329 return if $self->players; 2471 return if $self->players;
2330 2472
2331 cf::trace "resetting map ", $self->path, "\n"; 2473 cf::trace "resetting map ", $self->path, "\n";
2332 2474
2333 $self->in_memory (cf::MAP_SWAPPED); 2475 $self->state (cf::MAP_SWAPPED);
2334 2476
2335 # need to save uniques path 2477 # need to save uniques path
2336 unless ($self->{deny_save}) { 2478 unless ($self->{deny_save}) {
2337 my $uniq = $self->uniq_path; utf8::encode $uniq; 2479 my $uniq = $self->uniq_path; utf8::encode $uniq;
2338 2480
… …
2668 # use -1 or undef as default coordinates, not 0, 0 2810 # use -1 or undef as default coordinates, not 0, 0
2669 ($x, $y) = ($map->enter_x, $map->enter_y) 2811 ($x, $y) = ($map->enter_x, $map->enter_y)
2670 if $x <= 0 && $y <= 0; 2812 if $x <= 0 && $y <= 0;
2671 2813
2672 $map->load; 2814 $map->load;
2673 $map->load_neighbours;
2674 2815
2675 return unless $self->contr->active; 2816 return unless $self->contr->active;
2676 2817
2677 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2818 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2678 if ($self->enter_map ($map, $x, $y)) { 2819 if ($self->enter_map ($map, $x, $y)) {
… …
2734 ($path, $x, $y) = (undef, undef, undef); 2875 ($path, $x, $y) = (undef, undef, undef);
2735 } 2876 }
2736 } 2877 }
2737 2878
2738 my $map = eval { 2879 my $map = eval {
2739 my $map = defined $path ? cf::map::find $path : undef; 2880 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2740 2881
2741 if ($map) { 2882 if ($map) {
2742 $map = $map->customise_for ($self); 2883 $map = $map->customise_for ($self);
2743 $map = $check->($map, $x, $y, $self) if $check && $map; 2884 $map = $check->($map, $x, $y, $self) if $check && $map;
2744 } else { 2885 } else {
… …
2834 $Coro::current->{desc} = "enter_exit"; 2975 $Coro::current->{desc} = "enter_exit";
2835 2976
2836 unless (eval { 2977 unless (eval {
2837 $self->deactivate_recursive; # just to be sure 2978 $self->deactivate_recursive; # just to be sure
2838 2979
2839 # random map handling
2840 {
2841 my $guard = cf::lock_acquire "exit_prepare:$exit";
2842
2843 prepare_random_map $exit
2844 if $exit->slaying eq "/!";
2845 }
2846
2847 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2980 my $map = cf::map::normalise $exit->slaying, $exit->map;
2848 my $x = $exit->stats->hp; 2981 my $x = $exit->stats->hp;
2849 my $y = $exit->stats->sp; 2982 my $y = $exit->stats->sp;
2983
2984 # special map handling
2985 my $slaying = $exit->slaying;
2986
2987 # special map handling
2988 if ($slaying eq "/!") {
2989 my $guard = cf::lock_acquire "exit_prepare:$exit";
2990
2991 prepare_random_map $exit
2992 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2993
2994 $map = $exit->slaying;
2995
2996 } elsif ($slaying eq '!up') {
2997 $map = $exit->map->tile_path (cf::TILE_UP);
2998 $x = $exit->x;
2999 $y = $exit->y;
3000
3001 } elsif ($slaying eq '!down') {
3002 $map = $exit->map->tile_path (cf::TILE_DOWN);
3003 $x = $exit->x;
3004 $y = $exit->y;
3005 }
2850 3006
2851 $self->goto ($map, $x, $y); 3007 $self->goto ($map, $x, $y);
2852 3008
2853 # if exit is damned, update players death & WoR home-position 3009 # if exit is damned, update players death & WoR home-position
2854 $self->contr->savebed ($map, $x, $y) 3010 $self->contr->savebed ($map, $x, $y)
… …
3079=cut 3235=cut
3080 3236
3081sub cf::client::ext_msg($$@) { 3237sub cf::client::ext_msg($$@) {
3082 my ($self, $type, @msg) = @_; 3238 my ($self, $type, @msg) = @_;
3083 3239
3084 if ($self->extcmd == 2) {
3085 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3240 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3086 } elsif ($self->extcmd == 1) { # TODO: remove
3087 push @msg, msgtype => "event_$type";
3088 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3089 }
3090} 3241}
3091 3242
3092=item $client->ext_reply ($msgid, @msg) 3243=item $client->ext_reply ($msgid, @msg)
3093 3244
3094Sends an ext reply to the client. 3245Sends an ext reply to the client.
… …
3096=cut 3247=cut
3097 3248
3098sub cf::client::ext_reply($$@) { 3249sub cf::client::ext_reply($$@) {
3099 my ($self, $id, @msg) = @_; 3250 my ($self, $id, @msg) = @_;
3100 3251
3101 if ($self->extcmd == 2) {
3102 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3252 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3103 } elsif ($self->extcmd == 1) {
3104 #TODO: version 1, remove
3105 unshift @msg, msgtype => "reply", msgid => $id;
3106 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3107 }
3108} 3253}
3109 3254
3110=item $success = $client->query ($flags, "text", \&cb) 3255=item $success = $client->query ($flags, "text", \&cb)
3111 3256
3112Queues a query to the client, calling the given callback with 3257Queues a query to the client, calling the given callback with
… …
3167 my ($ns, $buf) = @_; 3312 my ($ns, $buf) = @_;
3168 3313
3169 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3314 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3170 3315
3171 if (ref $msg) { 3316 if (ref $msg) {
3172 my ($type, $reply, @payload) = 3317 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3173 "ARRAY" eq ref $msg
3174 ? @$msg
3175 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3176 3318
3177 my @reply; 3319 my @reply;
3178 3320
3179 if (my $cb = $EXTICMD{$type}) { 3321 if (my $cb = $EXTICMD{$type}) {
3180 @reply = $cb->($ns, @payload); 3322 @reply = $cb->($ns, @payload);
… …
3273 decrease split destroy change_exp value msg lore send_msg)], 3415 decrease split destroy change_exp value msg lore send_msg)],
3274 ["cf::object::player" => qw(player)], 3416 ["cf::object::player" => qw(player)],
3275 ["cf::player" => qw(peaceful send_msg)], 3417 ["cf::player" => qw(peaceful send_msg)],
3276 ["cf::map" => qw(trigger)], 3418 ["cf::map" => qw(trigger)],
3277) { 3419) {
3278 no strict 'refs';
3279 my ($pkg, @funs) = @$_; 3420 my ($pkg, @funs) = @$_;
3280 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3421 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3281 for @funs; 3422 for @funs;
3282} 3423}
3283 3424
… …
3359=cut 3500=cut
3360 3501
3361############################################################################# 3502#############################################################################
3362# the server's init and main functions 3503# the server's init and main functions
3363 3504
3505our %FACEHASH; # hash => idx, #d# HACK for http server
3506
3507# internal api, not fianlised
3508sub add_face {
3509 my ($name, $type, $data) = @_;
3510
3511 my $idx = cf::face::find $name;
3512
3513 if ($idx) {
3514 delete $FACEHASH{cf::face::get_chksum $idx};
3515 } else {
3516 $idx = cf::face::alloc $name;
3517 }
3518
3519 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
3520
3521 cf::face::set_type $idx, $type;
3522 cf::face::set_data $idx, 0, $data, $hash;
3523 cf::face::set_meta $idx, $type & 1 ? undef : undef;
3524 $FACEHASH{$hash} = $idx;#d#
3525
3526 $idx
3527}
3528
3364sub load_facedata($) { 3529sub load_facedata($) {
3365 my ($path) = @_; 3530 my ($path) = @_;
3366 3531
3367 # HACK to clear player env face cache, we need some signal framework 3532 # HACK to clear player env face cache, we need some signal framework
3368 # for this (global event?) 3533 # for this (global event?)
… …
3370 3535
3371 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3536 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3372 3537
3373 trace "loading facedata from $path\n"; 3538 trace "loading facedata from $path\n";
3374 3539
3375 my $facedata; 3540 my $facedata = decode_storable load_file $path;
3376 0 < aio_load $path, $facedata
3377 or die "$path: $!";
3378
3379 $facedata = Coro::Storable::thaw $facedata;
3380 3541
3381 $facedata->{version} == 2 3542 $facedata->{version} == 2
3382 or cf::cleanup "$path: version mismatch, cannot proceed."; 3543 or cf::cleanup "$path: version mismatch, cannot proceed.";
3383 3544
3384 # patch in the exptable
3385 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3386 $facedata->{resource}{"res/exp_table"} = {
3387 type => FT_RSRC,
3388 data => $exp_table,
3389 hash => (Digest::MD5::md5 $exp_table),
3390 };
3391 cf::cede_to_tick; 3545 cf::cede_to_tick;
3392 3546
3393 { 3547 {
3394 my $faces = $facedata->{faceinfo}; 3548 my $faces = $facedata->{faceinfo};
3395 3549
3396 while (my ($face, $info) = each %$faces) { 3550 for my $face (sort keys %$faces) {
3551 my $info = $faces->{$face};
3397 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3552 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3398 3553
3399 cf::face::set_visibility $idx, $info->{visibility}; 3554 cf::face::set_visibility $idx, $info->{visibility};
3400 cf::face::set_magicmap $idx, $info->{magicmap}; 3555 cf::face::set_magicmap $idx, $info->{magicmap};
3401 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3556 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3402 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3557 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3558 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3559 $FACEHASH{$info->{hash64}} = $idx;#d#
3403 3560
3404 cf::cede_to_tick; 3561 cf::cede_to_tick;
3405 } 3562 }
3406 3563
3407 while (my ($face, $info) = each %$faces) { 3564 while (my ($face, $info) = each %$faces) {
… …
3434 3591
3435 { 3592 {
3436 my $res = $facedata->{resource}; 3593 my $res = $facedata->{resource};
3437 3594
3438 while (my ($name, $info) = each %$res) { 3595 while (my ($name, $info) = each %$res) {
3439 if (defined $info->{type}) { 3596 if (defined (my $type = $info->{type})) {
3597 # TODO: different hash - must free and use new index, or cache ixface data queue
3440 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3598 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3441 3599
3600 cf::face::set_type $idx, $type;
3442 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3601 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3443 cf::face::set_type $idx, $info->{type}; 3602 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3603 $FACEHASH{$info->{hash}} = $idx;#d#
3444 } else { 3604 } else {
3445 $RESOURCE{$name} = $info; # unused 3605# $RESOURCE{$name} = $info; # unused
3446 } 3606 }
3447 3607
3448 cf::cede_to_tick; 3608 cf::cede_to_tick;
3449 } 3609 }
3450 } 3610 }
… …
3468 my $status = load_resource_file_ $_[0]; 3628 my $status = load_resource_file_ $_[0];
3469 get_slot 0.1, 100; 3629 get_slot 0.1, 100;
3470 cf::arch::commit_load; 3630 cf::arch::commit_load;
3471 3631
3472 $status 3632 $status
3633}
3634
3635sub reload_exp_table {
3636 _reload_exp_table;
3637
3638 add_face "res/exp_table" => FT_RSRC,
3639 JSON::XS->new->utf8->canonical->encode (
3640 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3641 );
3642}
3643
3644sub reload_materials {
3645 _reload_materials;
3473} 3646}
3474 3647
3475sub reload_regions { 3648sub reload_regions {
3476 # HACK to clear player env face cache, we need some signal framework 3649 # HACK to clear player env face cache, we need some signal framework
3477 # for this (global event?) 3650 # for this (global event?)
… …
3492} 3665}
3493 3666
3494sub reload_archetypes { 3667sub reload_archetypes {
3495 load_resource_file "$DATADIR/archetypes" 3668 load_resource_file "$DATADIR/archetypes"
3496 or die "unable to load archetypes\n"; 3669 or die "unable to load archetypes\n";
3670
3671 add_face "res/skill_info" => FT_RSRC,
3672 JSON::XS->new->utf8->canonical->encode (
3673 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3674 );
3675 add_face "res/spell_paths" => FT_RSRC,
3676 JSON::XS->new->utf8->canonical->encode (
3677 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3678 );
3497} 3679}
3498 3680
3499sub reload_treasures { 3681sub reload_treasures {
3500 load_resource_file "$DATADIR/treasures" 3682 load_resource_file "$DATADIR/treasures"
3501 or die "unable to load treasurelists\n"; 3683 or die "unable to load treasurelists\n";
3502} 3684}
3503 3685
3504sub reload_sound { 3686sub reload_sound {
3505 trace "loading sound config from $DATADIR/sound\n"; 3687 trace "loading sound config from $DATADIR/sound\n";
3506 3688
3507 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3508 or die "$DATADIR/sound $!";
3509
3510 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3689 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3511 3690
3512 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3691 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3513 my $sound = $soundconf->{compat}[$_] 3692 my $sound = $soundconf->{compat}[$_]
3514 or next; 3693 or next;
3515 3694
… …
3522 my $face = cf::face::find "sound/$v"; 3701 my $face = cf::face::find "sound/$v";
3523 cf::sound::set $k => $face; 3702 cf::sound::set $k => $face;
3524 } 3703 }
3525} 3704}
3526 3705
3706sub reload_pod {
3707 trace "loading pods $PODDIR\n";
3708
3709 my @command_help;
3710
3711 for (
3712 [0, "command_help"],
3713 [1, "emote_help"],
3714 [2, "dmcommand_help"],
3715 ) {
3716 my ($type, $path) = @$_;
3717
3718 my $paragraphs = &cf::pod::load_pod ("$PODDIR/$path.pod")
3719 or die "unable to load $path";
3720
3721 my $level = 1e9;
3722
3723 for my $par (@$paragraphs) {
3724 if ($par->{type} eq "head2") {
3725 # this code taken almost verbatim from DC/Protocol.pm
3726
3727 if ($par->{markup} =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x) {
3728 my $cmd = $1;
3729 my @args = split /\|/, $2;
3730 @args = (".*") unless @args;
3731
3732 $_ = $_ eq ".*" ? "" : " $_"
3733 for @args;
3734
3735 my @variants = map "$cmd$_", sort { (length $a) <=> (length $b) } @args;
3736
3737 push @command_help, [$type, \@variants, &cf::pod::as_cfpod ([$par])];
3738 $level = $par->{level};
3739 } else {
3740 error "$par->{markup}: unparsable command heading";
3741 }
3742 } elsif ($par->{level} > $level) {
3743 $command_help[-1][2] .= &cf::pod::as_cfpod ([$par]);
3744 }
3745
3746 cf::cede_to_tick;
3747 }
3748 }
3749
3750 @command_help = sort {
3751 $a->[0] <=> $b->[0]
3752 or $a->[1] cmp $b->[1]
3753 } @command_help;
3754
3755 cf::cede_to_tick;
3756
3757 add_face "res/command_help" => FT_RSRC,
3758 JSON::XS->new->utf8->encode (\@command_help);
3759}
3760
3527sub reload_resources { 3761sub reload_resources {
3528 trace "reloading resource files...\n"; 3762 trace "reloading resource files...\n";
3529 3763
3764 reload_materials;
3530 reload_facedata; 3765 reload_facedata;
3766 reload_exp_table;
3531 reload_sound; 3767 reload_sound;
3532 reload_archetypes; 3768 reload_archetypes;
3533 reload_regions; 3769 reload_regions;
3534 reload_treasures; 3770 reload_treasures;
3771 reload_pod;
3535 3772
3536 trace "finished reloading resource files\n"; 3773 trace "finished reloading resource files\n";
3537} 3774}
3538 3775
3539sub reload_config { 3776sub reload_config {
3540 trace "reloading config file...\n"; 3777 trace "reloading config file...\n";
3541 3778
3542 open my $fh, "<:utf8", "$CONFDIR/config" 3779 my $config = load_file "$CONFDIR/config";
3543 or return; 3780 utf8::decode $config;
3544 3781 *CFG = decode_yaml $config;
3545 local $/;
3546 *CFG = YAML::XS::Load scalar <$fh>;
3547 3782
3548 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3783 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3549 3784
3550 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3785 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3551 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3786 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3555 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3790 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3556 and die "WARNING: m(un)lockall failed: $!\n"; 3791 and die "WARNING: m(un)lockall failed: $!\n";
3557 }; 3792 };
3558 warn $@ if $@; 3793 warn $@ if $@;
3559 } 3794 }
3560
3561 trace "finished reloading resource files\n";
3562} 3795}
3563 3796
3564sub pidfile() { 3797sub pidfile() {
3565 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3798 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3566 or die "$PIDFILE: $!"; 3799 or die "$PIDFILE: $!";
… …
3591 3824
3592sub main { 3825sub main {
3593 cf::init_globals; # initialise logging 3826 cf::init_globals; # initialise logging
3594 3827
3595 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3828 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3596 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3829 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3597 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3830 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3598 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3831 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3599 3832
3600 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3833 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3601 3834
3602 # we must not ever block the main coroutine 3835 # we must not ever block the main coroutine
3603 local $Coro::idle = sub { 3836 $Coro::idle = sub {
3604 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3837 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3605 (async { 3838 (async {
3606 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3839 $Coro::current->{desc} = "IDLE BUG HANDLER";
3607 EV::loop EV::LOOP_ONESHOT; 3840 EV::loop EV::LOOP_ONESHOT;
3608 })->prio (Coro::PRIO_MAX); 3841 })->prio (Coro::PRIO_MAX);
3609 }; 3842 };
3610 3843
3611 evthread_start IO::AIO::poll_fileno; 3844 evthread_start IO::AIO::poll_fileno;
3612 3845
3613 cf::sync_job { 3846 cf::sync_job {
3614 cf::init_experience; 3847 cf::incloader::init ();
3848
3849 db_init;
3850
3615 cf::init_anim; 3851 cf::init_anim;
3616 cf::init_attackmess; 3852 cf::init_attackmess;
3617 cf::init_dynamic; 3853 cf::init_dynamic;
3618 3854
3619 cf::load_settings; 3855 cf::load_settings;
3620 cf::load_materials;
3621 3856
3622 reload_resources; 3857 reload_resources;
3623 reload_config; 3858 reload_config;
3624 db_init;
3625 3859
3626 cf::init_uuid; 3860 cf::init_uuid;
3627 cf::init_signals; 3861 cf::init_signals;
3628 cf::init_skills; 3862 cf::init_skills;
3629 3863
… …
3637 3871
3638 # no (long-running) fork's whatsoever before this point(!) 3872 # no (long-running) fork's whatsoever before this point(!)
3639 use POSIX (); 3873 use POSIX ();
3640 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3874 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3641 3875
3642 (pop @POST_INIT)->(0) while @POST_INIT; 3876 cf::_post_init 0;
3643 }; 3877 };
3644 3878
3645 cf::object::thawer::errors_are_fatal 0; 3879 cf::object::thawer::errors_are_fatal 0;
3646 info "parse errors in files are no longer fatal from this point on.\n"; 3880 info "parse errors in files are no longer fatal from this point on.\n";
3647 3881
3882 AE::postpone {
3883 undef &main; # free gobs of memory :)
3884 };
3885
3648 main_loop; 3886 goto &main_loop;
3649} 3887}
3650 3888
3651############################################################################# 3889#############################################################################
3652# initialisation and cleanup 3890# initialisation and cleanup
3653 3891
… …
3758 # save all maps without fsync, and later call a global sync 3996 # save all maps without fsync, and later call a global sync
3759 # (which in turn might be very very slow) 3997 # (which in turn might be very very slow)
3760 local $USE_FSYNC = 0; 3998 local $USE_FSYNC = 0;
3761 3999
3762 cf::sync_job { 4000 cf::sync_job {
4001 cf::write_runtime_sync; # external watchdog should not bark
4002
3763 # use a peculiar iteration method to avoid tripping on perl 4003 # use a peculiar iteration method to avoid tripping on perl
3764 # refcount bugs in for. also avoids problems with players 4004 # refcount bugs in for. also avoids problems with players
3765 # and maps saved/destroyed asynchronously. 4005 # and maps saved/destroyed asynchronously.
3766 info "emergency_perl_save: begin player save\n"; 4006 info "emergency_perl_save: begin player save\n";
3767 for my $login (keys %cf::PLAYER) { 4007 for my $login (keys %cf::PLAYER) {
… …
3770 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4010 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3771 $pl->save; 4011 $pl->save;
3772 } 4012 }
3773 info "emergency_perl_save: end player save\n"; 4013 info "emergency_perl_save: end player save\n";
3774 4014
4015 cf::write_runtime_sync; # external watchdog should not bark
4016
3775 info "emergency_perl_save: begin map save\n"; 4017 info "emergency_perl_save: begin map save\n";
3776 for my $path (keys %cf::MAP) { 4018 for my $path (keys %cf::MAP) {
3777 my $map = $cf::MAP{$path} or next; 4019 my $map = $cf::MAP{$path} or next;
3778 $map->valid or next; 4020 $map->valid or next;
3779 $map->save; 4021 $map->save;
3780 } 4022 }
3781 info "emergency_perl_save: end map save\n"; 4023 info "emergency_perl_save: end map save\n";
3782 4024
4025 cf::write_runtime_sync; # external watchdog should not bark
4026
3783 info "emergency_perl_save: begin database checkpoint\n"; 4027 info "emergency_perl_save: begin database checkpoint\n";
3784 BDB::db_env_txn_checkpoint $DB_ENV; 4028 BDB::db_env_txn_checkpoint $DB_ENV;
3785 info "emergency_perl_save: end database checkpoint\n"; 4029 info "emergency_perl_save: end database checkpoint\n";
3786 4030
3787 info "emergency_perl_save: begin write uuid\n"; 4031 info "emergency_perl_save: begin write uuid\n";
3788 write_uuid_sync 1; 4032 write_uuid_sync 1;
3789 info "emergency_perl_save: end write uuid\n"; 4033 info "emergency_perl_save: end write uuid\n";
3790 };
3791 4034
4035 cf::write_runtime_sync; # external watchdog should not bark
4036
4037 trace "emergency_perl_save: syncing database to disk";
4038 BDB::db_env_txn_checkpoint $DB_ENV;
4039
3792 info "emergency_perl_save: starting sync()\n"; 4040 info "emergency_perl_save: starting sync\n";
3793 IO::AIO::aio_sync sub { 4041 IO::AIO::aio_sync sub {
3794 info "emergency_perl_save: finished sync()\n"; 4042 info "emergency_perl_save: finished sync\n";
4043 };
4044
4045 cf::write_runtime_sync; # external watchdog should not bark
4046
4047 trace "emergency_perl_save: flushing outstanding aio requests";
4048 while (IO::AIO::nreqs || BDB::nreqs) {
4049 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4050 }
4051
4052 cf::write_runtime_sync; # external watchdog should not bark
3795 }; 4053 };
3796 4054
3797 info "emergency_perl_save: leave\n"; 4055 info "emergency_perl_save: leave\n";
3798} 4056}
3799 4057
3800sub post_cleanup { 4058sub post_cleanup {
3801 my ($make_core) = @_; 4059 my ($make_core) = @_;
4060
4061 IO::AIO::flush;
3802 4062
3803 error Carp::longmess "post_cleanup backtrace" 4063 error Carp::longmess "post_cleanup backtrace"
3804 if $make_core; 4064 if $make_core;
3805 4065
3806 my $fh = pidfile; 4066 my $fh = pidfile;
… …
3832 } 4092 }
3833} 4093}
3834 4094
3835sub do_reload_perl() { 4095sub do_reload_perl() {
3836 # can/must only be called in main 4096 # can/must only be called in main
3837 if (in_main) { 4097 unless (in_main) {
3838 error "can only reload from main coroutine"; 4098 error "can only reload from main coroutine";
3839 return; 4099 return;
3840 } 4100 }
3841 4101
3842 return if $RELOAD++; 4102 return if $RELOAD++;
3843 4103
3844 my $t1 = AE::time; 4104 my $t1 = AE::time;
3845 4105
3846 while ($RELOAD) { 4106 while ($RELOAD) {
4107 cf::get_slot 0.1, -1, "reload_perl";
3847 info "reloading..."; 4108 info "perl_reload: reloading...";
3848 4109
3849 trace "entering sync_job"; 4110 trace "perl_reload: entering sync_job";
3850 4111
3851 cf::sync_job { 4112 cf::sync_job {
3852 cf::write_runtime_sync; # external watchdog should not bark
3853 cf::emergency_save; 4113 #cf::emergency_save;
3854 cf::write_runtime_sync; # external watchdog should not bark
3855 4114
3856 trace "syncing database to disk";
3857 BDB::db_env_txn_checkpoint $DB_ENV;
3858
3859 # if anything goes wrong in here, we should simply crash as we already saved
3860
3861 trace "flushing outstanding aio requests";
3862 while (IO::AIO::nreqs || BDB::nreqs) {
3863 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3864 }
3865
3866 trace "cancelling all extension coros"; 4115 trace "perl_reload: cancelling all extension coros";
3867 $_->cancel for values %EXT_CORO; 4116 $_->cancel for values %EXT_CORO;
3868 %EXT_CORO = (); 4117 %EXT_CORO = ();
3869 4118
3870 trace "removing commands"; 4119 trace "perl_reload: removing commands";
3871 %COMMAND = (); 4120 %COMMAND = ();
3872 4121
3873 trace "removing ext/exti commands"; 4122 trace "perl_reload: removing ext/exti commands";
3874 %EXTCMD = (); 4123 %EXTCMD = ();
3875 %EXTICMD = (); 4124 %EXTICMD = ();
3876 4125
3877 trace "unloading/nuking all extensions"; 4126 trace "perl_reload: unloading/nuking all extensions";
3878 for my $pkg (@EXTS) { 4127 for my $pkg (@EXTS) {
3879 trace "... unloading $pkg"; 4128 trace "... unloading $pkg";
3880 4129
3881 if (my $cb = $pkg->can ("unload")) { 4130 if (my $cb = $pkg->can ("unload")) {
3882 eval { 4131 eval {
… …
3887 4136
3888 trace "... clearing $pkg"; 4137 trace "... clearing $pkg";
3889 clear_package $pkg; 4138 clear_package $pkg;
3890 } 4139 }
3891 4140
3892 trace "unloading all perl modules loaded from $LIBDIR"; 4141 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3893 while (my ($k, $v) = each %INC) { 4142 while (my ($k, $v) = each %INC) {
3894 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4143 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3895 4144
3896 trace "... unloading $k"; 4145 trace "... unloading $k";
3897 delete $INC{$k}; 4146 delete $INC{$k};
… …
3904 } 4153 }
3905 4154
3906 clear_package $k; 4155 clear_package $k;
3907 } 4156 }
3908 4157
3909 trace "getting rid of safe::, as good as possible"; 4158 trace "perl_reload: getting rid of safe::, as good as possible";
3910 clear_package "safe::$_" 4159 clear_package "safe::$_"
3911 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4160 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3912 4161
3913 trace "unloading cf.pm \"a bit\""; 4162 trace "perl_reload: unloading cf.pm \"a bit\"";
3914 delete $INC{"cf.pm"}; 4163 delete $INC{"cf.pm"};
3915 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4164 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3916 4165
3917 # don't, removes xs symbols, too, 4166 # don't, removes xs symbols, too,
3918 # and global variables created in xs 4167 # and global variables created in xs
3919 #clear_package __PACKAGE__; 4168 #clear_package __PACKAGE__;
3920 4169
3921 info "unload completed, starting to reload now"; 4170 info "perl_reload: unload completed, starting to reload now";
3922 4171
3923 trace "reloading cf.pm"; 4172 trace "perl_reload: reloading cf.pm";
3924 require cf; 4173 require cf;
3925 cf::_connect_to_perl_1; 4174 cf::_connect_to_perl_1;
3926 4175
3927 trace "loading config and database again"; 4176 trace "perl_reload: loading config and database again";
3928 cf::reload_config; 4177 cf::reload_config;
3929 4178
3930 trace "loading extensions"; 4179 trace "perl_reload: loading extensions";
3931 cf::load_extensions; 4180 cf::load_extensions;
3932 4181
3933 if ($REATTACH_ON_RELOAD) { 4182 if ($REATTACH_ON_RELOAD) {
3934 trace "reattaching attachments to objects/players"; 4183 trace "perl_reload: reattaching attachments to objects/players";
3935 _global_reattach; # objects, sockets 4184 _global_reattach; # objects, sockets
3936 trace "reattaching attachments to maps"; 4185 trace "perl_reload: reattaching attachments to maps";
3937 reattach $_ for values %MAP; 4186 reattach $_ for values %MAP;
3938 trace "reattaching attachments to players"; 4187 trace "perl_reload: reattaching attachments to players";
3939 reattach $_ for values %PLAYER; 4188 reattach $_ for values %PLAYER;
3940 } 4189 }
3941 4190
3942 trace "running post_init jobs"; 4191 cf::_post_init 1;
3943 (pop @POST_INIT)->(1) while @POST_INIT;
3944 4192
3945 trace "leaving sync_job"; 4193 trace "perl_reload: leaving sync_job";
3946 4194
3947 1 4195 1
3948 } or do { 4196 } or do {
3949 error $@; 4197 error $@;
3950 cf::cleanup "error while reloading, exiting."; 4198 cf::cleanup "perl_reload: error, exiting.";
3951 }; 4199 };
3952 4200
3953 info "reloaded";
3954 --$RELOAD; 4201 --$RELOAD;
3955 } 4202 }
3956 4203
3957 $t1 = AE::time - $t1; 4204 $t1 = AE::time - $t1;
3958 info "reload completed in ${t1}s\n"; 4205 info "perl_reload: completed in ${t1}s\n";
3959}; 4206};
3960 4207
3961our $RELOAD_WATCHER; # used only during reload 4208our $RELOAD_WATCHER; # used only during reload
3962 4209
3963sub reload_perl() { 4210sub reload_perl() {
… …
3984 reload_perl; 4231 reload_perl;
3985 }; 4232 };
3986 } 4233 }
3987}; 4234};
3988 4235
3989unshift @INC, $LIBDIR; 4236#############################################################################
3990 4237
3991my $bug_warning = 0; 4238my $bug_warning = 0;
3992 4239
3993our @WAIT_FOR_TICK;
3994our @WAIT_FOR_TICK_BEGIN;
3995
3996sub wait_for_tick { 4240sub wait_for_tick() {
3997 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4241 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3998 4242
3999 my $signal = new Coro::Signal; 4243 $WAIT_FOR_TICK->wait;
4000 push @WAIT_FOR_TICK, $signal;
4001 $signal->wait;
4002} 4244}
4003 4245
4004sub wait_for_tick_begin { 4246sub wait_for_tick_begin() {
4005 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4247 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4006 4248
4007 my $signal = new Coro::Signal; 4249 my $signal = new Coro::Signal;
4008 push @WAIT_FOR_TICK_BEGIN, $signal; 4250 push @WAIT_FOR_TICK_BEGIN, $signal;
4009 $signal->wait; 4251 $signal->wait;
4010} 4252}
… …
4014 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4256 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4015 unless ++$bug_warning > 10; 4257 unless ++$bug_warning > 10;
4016 return; 4258 return;
4017 } 4259 }
4018 4260
4019 cf::server_tick; # one server iteration 4261 cf::one_tick; # one server iteration
4020 4262
4021 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4263 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4022 4264
4023 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4265 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4024 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4266 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
… …
4030 } 4272 }
4031 4273
4032 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4274 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4033 $sig->send; 4275 $sig->send;
4034 } 4276 }
4035 while (my $sig = shift @WAIT_FOR_TICK) { 4277 $WAIT_FOR_TICK->broadcast;
4036 $sig->send;
4037 }
4038 4278
4039 $LOAD = ($NOW - $TICK_START) / $TICK; 4279 $LOAD = ($NOW - $TICK_START) / $TICK;
4040 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4280 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4041 4281
4042 if (0) { 4282 if (0) {
… …
4048 } 4288 }
4049} 4289}
4050 4290
4051{ 4291{
4052 # configure BDB 4292 # configure BDB
4293 info "initialising database";
4053 4294
4054 BDB::min_parallel 16; 4295 BDB::min_parallel 16;
4055 BDB::max_poll_reqs $TICK * 0.1; 4296 BDB::max_poll_reqs $TICK * 0.1;
4056 $AnyEvent::BDB::WATCHER->priority (1); 4297 #$AnyEvent::BDB::WATCHER->priority (1);
4057 4298
4058 unless ($DB_ENV) { 4299 unless ($DB_ENV) {
4059 $DB_ENV = BDB::db_env_create; 4300 $DB_ENV = BDB::db_env_create;
4060 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4301 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4061 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4302 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
… …
4086 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4327 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4087 }; 4328 };
4088 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4329 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4089 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4330 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4090 }; 4331 };
4332
4333 info "database initialised";
4091} 4334}
4092 4335
4093{ 4336{
4094 # configure IO::AIO 4337 # configure IO::AIO
4095 4338
4339 info "initialising aio";
4096 IO::AIO::min_parallel 8; 4340 IO::AIO::min_parallel 8;
4097 IO::AIO::max_poll_time $TICK * 0.1; 4341 IO::AIO::max_poll_time $TICK * 0.1;
4098 undef $AnyEvent::AIO::WATCHER; 4342 undef $AnyEvent::AIO::WATCHER;
4343 info "aio initialised";
4099} 4344}
4100 4345
4101my $_log_backtrace; 4346our $_log_backtrace;
4347our $_log_backtrace_last;
4102 4348
4103sub _log_backtrace { 4349sub _log_backtrace {
4104 my ($msg, @addr) = @_; 4350 my ($msg, @addr) = @_;
4105 4351
4106 $msg =~ s/\n//; 4352 $msg =~ s/\n$//;
4107 4353
4354 if ($_log_backtrace_last eq $msg) {
4355 LOG llevInfo, "[ABT] $msg\n";
4356 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4108 # limit the # of concurrent backtraces 4357 # limit the # of concurrent backtraces
4109 if ($_log_backtrace < 2) { 4358 } elsif ($_log_backtrace < 2) {
4359 $_log_backtrace_last = $msg;
4110 ++$_log_backtrace; 4360 ++$_log_backtrace;
4111 my $perl_bt = Carp::longmess $msg; 4361 my $perl_bt = Carp::longmess $msg;
4112 async { 4362 async {
4113 $Coro::current->{desc} = "abt $msg"; 4363 $Coro::current->{desc} = "abt $msg";
4114 4364
… …
4134 LOG llevInfo, "[ABT] $_\n" for @bt; 4384 LOG llevInfo, "[ABT] $_\n" for @bt;
4135 --$_log_backtrace; 4385 --$_log_backtrace;
4136 }; 4386 };
4137 } else { 4387 } else {
4138 LOG llevInfo, "[ABT] $msg\n"; 4388 LOG llevInfo, "[ABT] $msg\n";
4139 LOG llevInfo, "[ABT] [suppressed]\n"; 4389 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4140 } 4390 }
4141} 4391}
4142 4392
4143# load additional modules 4393# load additional modules
4144require "cf/$_.pm" for @EXTRA_MODULES; 4394require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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