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.527 by root, Fri Apr 23 04:32:47 2010 UTC vs.
Revision 1.593 by root, Fri Nov 9 01:59:33 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; 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
117our $VERBOSE_IO = 0;#d# 123our $VERBOSE_IO = 1;
118 124
119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 125our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 126our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
121our $NEXT_TICK; 127our $NEXT_TICK;
122our $USE_FSYNC = 1; # use fsync to write maps - default on 128our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
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
… …
252 287
253=back 288=back
254 289
255=cut 290=cut
256 291
292sub error(@) { LOG llevError, join "", @_ }
293sub warn (@) { LOG llevWarn , join "", @_ }
294sub info (@) { LOG llevInfo , join "", @_ }
295sub debug(@) { LOG llevDebug, join "", @_ }
296sub trace(@) { LOG llevTrace, join "", @_ }
297
257$Coro::State::WARNHOOK = sub { 298$Coro::State::WARNHOOK = sub {
258 my $msg = join "", @_; 299 my $msg = join "", @_;
259 300
260 $msg .= "\n" 301 $msg .= "\n"
261 unless $msg =~ /\n$/; 302 unless $msg =~ /\n$/;
262 303
263 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 304 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
264 305
265 LOG llevError, $msg; 306 LOG llevWarn, $msg;
266}; 307};
267 308
268$Coro::State::DIEHOOK = sub { 309$Coro::State::DIEHOOK = sub {
269 return unless $^S eq 0; # "eq", not "==" 310 return unless $^S eq 0; # "eq", not "=="
270 311
271 warn Carp::longmess $_[0]; 312 error Carp::longmess $_[0];
272 313
273 if (in_main) {#d# 314 if (in_main) {#d#
274 warn "DIEHOOK called in main context, Coro bug?\n";#d# 315 error "DIEHOOK called in main context, Coro bug?\n";#d#
275 return;#d# 316 return;#d#
276 }#d# 317 }#d#
277 318
278 # kill coroutine otherwise 319 # kill coroutine otherwise
279 Coro::terminate 320 Coro::terminate
… …
299)) { 340)) {
300 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 341 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
301} 342}
302 343
303$EV::DIED = sub { 344$EV::DIED = sub {
304 Carp::cluck "error in event callback: @_"; 345 warn "error in event callback: $@";
305}; 346};
347
348#############################################################################
349
350sub fork_call(&@);
351sub get_slot($;$$);
306 352
307############################################################################# 353#############################################################################
308 354
309=head2 UTILITY FUNCTIONS 355=head2 UTILITY FUNCTIONS
310 356
… …
331 $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;
332 $d 378 $d
333 } || "[unable to dump $_[0]: '$@']"; 379 } || "[unable to dump $_[0]: '$@']";
334} 380}
335 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
336=item $ref = cf::decode_json $json 434=item $ref = cf::decode_json $json
337 435
338Converts a JSON string into the corresponding perl data structure. 436Converts a JSON string into the corresponding perl data structure.
339 437
340=item $json = cf::encode_json $ref 438=item $json = cf::encode_json $ref
… …
346our $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
347 445
348sub encode_json($) { $json_coder->encode ($_[0]) } 446sub encode_json($) { $json_coder->encode ($_[0]) }
349sub decode_json($) { $json_coder->decode ($_[0]) } 447sub decode_json($) { $json_coder->decode ($_[0]) }
350 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
351=item cf::post_init { BLOCK } 480=item cf::post_init { BLOCK }
352 481
353Execute the given codeblock, I<after> all extensions have been (re-)loaded, 482Execute the given codeblock, I<after> all extensions have been (re-)loaded,
354but I<before> the server starts ticking again. 483but I<before> the server starts ticking again.
355 484
356The cdoeblock will have a single boolean argument to indicate whether this 485The codeblock will have a single boolean argument to indicate whether this
357is a reload or not. 486is a reload or not.
358 487
359=cut 488=cut
360 489
361sub post_init(&) { 490sub post_init(&) {
362 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 }
363} 509}
364 510
365=item cf::lock_wait $string 511=item cf::lock_wait $string
366 512
367Wait until the given lock is available. See cf::lock_acquire. 513Wait until the given lock is available. See cf::lock_acquire.
… …
420 EV::periodic $start, $interval, 0, $cb 566 EV::periodic $start, $interval, 0, $cb
421} 567}
422 568
423=item cf::get_slot $time[, $priority[, $name]] 569=item cf::get_slot $time[, $priority[, $name]]
424 570
425Allocate $time seconds of blocking CPU time at priority C<$priority>: 571Allocate $time seconds of blocking CPU time at priority C<$priority>
426This 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
427of 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.
428 578
429The 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
430used for statistical purposes and should identify the same time-class. 580used for statistical purposes and should identify the same time-class.
431 581
432Useful for short background jobs. 582Useful for short background jobs.
… …
461 } 611 }
462 } 612 }
463 613
464 if (@SLOT_QUEUE) { 614 if (@SLOT_QUEUE) {
465 # 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
466 push @cf::WAIT_FOR_TICK, $signal; 616 $WAIT_FOR_TICK->wait;
467 $signal->wait;
468 } else { 617 } else {
469 $busy = 0; 618 $busy = 0;
470 Coro::schedule; 619 Coro::schedule;
471 } 620 }
472 } 621 }
… …
512=cut 661=cut
513 662
514sub sync_job(&) { 663sub sync_job(&) {
515 my ($job) = @_; 664 my ($job) = @_;
516 665
517 if ($Coro::current == $Coro::main) { 666 if (in_main) {
518 my $time = AE::time; 667 my $time = AE::time;
519 668
520 # this is the main coro, too bad, we have to block 669 # this is the main coro, too bad, we have to block
521 # till the operation succeeds, freezing the server :/ 670 # till the operation succeeds, freezing the server :/
522 671
523 LOG llevError, Carp::longmess "sync job";#d# 672 #LOG llevError, Carp::longmess "sync job";#d#
524 673
525 my $freeze_guard = freeze_mainloop; 674 my $freeze_guard = freeze_mainloop;
526 675
527 my $busy = 1; 676 my $busy = 1;
528 my @res; 677 my @res;
529 678
530 (async { 679 (async {
531 $Coro::current->desc ("sync job coro"); 680 $Coro::current->desc ("sync job coro");
532 @res = eval { $job->() }; 681 @res = eval { $job->() };
533 warn $@ if $@; 682 error $@ if $@;
534 undef $busy; 683 undef $busy;
535 })->prio (Coro::PRIO_MAX); 684 })->prio (Coro::PRIO_MAX);
536 685
537 while ($busy) { 686 while ($busy) {
538 if (Coro::nready) { 687 if (Coro::nready) {
… …
572 $EXT_CORO{$coro+0} = $coro; 721 $EXT_CORO{$coro+0} = $coro;
573 722
574 $coro 723 $coro
575} 724}
576 725
577=item fork_call { }, $args 726=item fork_call { }, @args
578 727
579Executes the given code block with the given arguments in a seperate 728Executes the given code block with the given arguments in a seperate
580process, returning the results. Everything must be serialisable with 729process, returning the results. Everything must be serialisable with
581Coro::Storable. May, of course, block. Note that the executed sub may 730Coro::Storable. May, of course, block. Note that the executed sub may
582never block itself or use any form of event handling. 731never block itself or use any form of event handling.
583 732
584=cut 733=cut
585 734
735sub post_fork {
736 reset_signals;
737}
738
586sub fork_call(&@) { 739sub fork_call(&@) {
587 my ($cb, @args) = @_; 740 my ($cb, @args) = @_;
588 741
589 # 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,
590 # otherwise perl prematurely frees the stuff :/ 743 # otherwise perl prematurely frees the stuff :/
591 # TODO: investigate and fix (likely this will be rather laborious) 744 # TODO: investigate and fix (likely this will be rather laborious)
592 745
593 my @res = Coro::Util::fork_eval { 746 my @res = Coro::Util::fork_eval {
594 reset_signals; 747 cf::post_fork;
595 &$cb 748 &$cb
596 }, @args; 749 } @args;
597 750
598 wantarray ? @res : $res[-1] 751 wantarray ? @res : $res[-1]
599} 752}
600 753
601sub objinfo { 754sub objinfo {
… …
651within each server. 804within each server.
652 805
653=cut 806=cut
654 807
655sub db_table($) { 808sub db_table($) {
809 cf::error "db_get called from main context"
810 if $Coro::current == $Coro::main;
811
656 my ($name) = @_; 812 my ($name) = @_;
657 my $db = BDB::db_create $DB_ENV; 813 my $db = BDB::db_create $DB_ENV;
658 814
659 eval { 815 eval {
660 $db->set_flags (BDB::CHKSUM); 816 $db->set_flags (BDB::CHKSUM);
… …
670} 826}
671 827
672our $DB; 828our $DB;
673 829
674sub db_init { 830sub db_init {
675 cf::sync_job {
676 $DB ||= db_table "db"; 831 $DB ||= db_table "db";
677 };
678} 832}
679 833
680sub db_get($$) { 834sub db_get($$) {
681 my $key = "$_[0]/$_[1]"; 835 my $key = "$_[0]/$_[1]";
682 836
683 cf::sync_job { 837 cf::error "db_get called from main context"
838 if $Coro::current == $Coro::main;
839
684 BDB::db_get $DB, undef, $key, my $data; 840 BDB::db_get $DB, undef, $key, my $data;
685 841
686 $! ? () 842 $! ? ()
687 : $data 843 : $data
688 }
689} 844}
690 845
691sub db_put($$$) { 846sub db_put($$$) {
692 BDB::dbreq_pri 4; 847 BDB::dbreq_pri 4;
693 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 848 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
721 876
722 my @data; 877 my @data;
723 my $md5; 878 my $md5;
724 879
725 for (0 .. $#$src) { 880 for (0 .. $#$src) {
726 0 <= aio_load $src->[$_], $data[$_] 881 $data[$_] = load_file $src->[$_];
727 or Carp::croak "$src->[$_]: $!";
728 } 882 }
729 883
730 # if processing is expensive, check 884 # if processing is expensive, check
731 # checksum first 885 # checksum first
732 if (1) { 886 if (1) {
… …
749 903
750 my $t1 = Time::HiRes::time; 904 my $t1 = Time::HiRes::time;
751 my $data = $process->(\@data); 905 my $data = $process->(\@data);
752 my $t2 = Time::HiRes::time; 906 my $t2 = Time::HiRes::time;
753 907
754 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 908 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
755 909
756 db_put cache => "$id/data", $data; 910 db_put cache => "$id/data", $data;
757 db_put cache => "$id/md5" , $md5; 911 db_put cache => "$id/md5" , $md5;
758 db_put cache => "$id/meta", $meta; 912 db_put cache => "$id/meta", $meta;
759 913
… …
769 923
770=cut 924=cut
771 925
772sub datalog($@) { 926sub datalog($@) {
773 my ($type, %kv) = @_; 927 my ($type, %kv) = @_;
774 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 928 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
775} 929}
776 930
777=back 931=back
778 932
779=cut 933=cut
… …
974 1128
975 } elsif (exists $cb_id{$type}) { 1129 } elsif (exists $cb_id{$type}) {
976 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1130 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
977 1131
978 } elsif (ref $type) { 1132 } elsif (ref $type) {
979 warn "attaching objects not supported, ignoring.\n"; 1133 error "attaching objects not supported, ignoring.\n";
980 1134
981 } else { 1135 } else {
982 shift @arg; 1136 shift @arg;
983 warn "attach argument '$type' not supported, ignoring.\n"; 1137 error "attach argument '$type' not supported, ignoring.\n";
984 } 1138 }
985 } 1139 }
986} 1140}
987 1141
988sub _object_attach { 1142sub _object_attach {
… …
998 _attach $registry, $klass, @attach; 1152 _attach $registry, $klass, @attach;
999 } 1153 }
1000 1154
1001 $obj->{$name} = \%arg; 1155 $obj->{$name} = \%arg;
1002 } else { 1156 } else {
1003 warn "object uses attachment '$name' which is not available, postponing.\n"; 1157 info "object uses attachment '$name' which is not available, postponing.\n";
1004 } 1158 }
1005 1159
1006 $obj->{_attachment}{$name} = undef; 1160 $obj->{_attachment}{$name} = undef;
1007} 1161}
1008 1162
… …
1067 1221
1068 for (@$callbacks) { 1222 for (@$callbacks) {
1069 eval { &{$_->[1]} }; 1223 eval { &{$_->[1]} };
1070 1224
1071 if ($@) { 1225 if ($@) {
1072 warn "$@";
1073 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1226 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1074 override; 1227 override;
1075 } 1228 }
1076 1229
1077 return 1 if $override; 1230 return 1 if $override;
1078 } 1231 }
… …
1157 for (@$attach) { 1310 for (@$attach) {
1158 my ($klass, @attach) = @$_; 1311 my ($klass, @attach) = @$_;
1159 _attach $registry, $klass, @attach; 1312 _attach $registry, $klass, @attach;
1160 } 1313 }
1161 } else { 1314 } else {
1162 warn "object uses attachment '$name' that is not available, postponing.\n"; 1315 info "object uses attachment '$name' that is not available, postponing.\n";
1163 } 1316 }
1164 } 1317 }
1165} 1318}
1166 1319
1167cf::attachable->attach ( 1320cf::attachable->attach (
… …
1194 my ($filename, $rdata, $objs) = @_; 1347 my ($filename, $rdata, $objs) = @_;
1195 1348
1196 sync_job { 1349 sync_job {
1197 if (length $$rdata) { 1350 if (length $$rdata) {
1198 utf8::decode (my $decname = $filename); 1351 utf8::decode (my $decname = $filename);
1199 warn sprintf "saving %s (%d,%d)\n", 1352 trace sprintf "saving %s (%d,%d)\n",
1200 $decname, length $$rdata, scalar @$objs 1353 $decname, length $$rdata, scalar @$objs
1201 if $VERBOSE_IO; 1354 if $VERBOSE_IO;
1202 1355
1203 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1356 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1204 aio_chmod $fh, SAVE_MODE; 1357 aio_chmod $fh, SAVE_MODE;
1205 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1358 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
… …
1228 aio_rename "$filename~", $filename; 1381 aio_rename "$filename~", $filename;
1229 1382
1230 $filename =~ s%/[^/]+$%%; 1383 $filename =~ s%/[^/]+$%%;
1231 aio_pathsync $filename if $cf::USE_FSYNC; 1384 aio_pathsync $filename if $cf::USE_FSYNC;
1232 } else { 1385 } else {
1233 warn "unable to save objects: $filename~: $!\n"; 1386 error "unable to save objects: $filename~: $!\n";
1234 } 1387 }
1235 } else { 1388 } else {
1236 aio_unlink $filename; 1389 aio_unlink $filename;
1237 aio_unlink "$filename.pst"; 1390 aio_unlink "$filename.pst";
1238 } 1391 }
… …
1262 my $st = eval { Coro::Storable::thaw $av }; 1415 my $st = eval { Coro::Storable::thaw $av };
1263 $av = $st->{objs}; 1416 $av = $st->{objs};
1264 } 1417 }
1265 1418
1266 utf8::decode (my $decname = $filename); 1419 utf8::decode (my $decname = $filename);
1267 warn sprintf "loading %s (%d,%d)\n", 1420 trace sprintf "loading %s (%d,%d)\n",
1268 $decname, length $data, scalar @{$av || []} 1421 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO; 1422 if $VERBOSE_IO;
1270 1423
1271 ($data, $av) 1424 ($data, $av)
1272} 1425}
1273 1426
… …
1278=cut 1431=cut
1279 1432
1280############################################################################# 1433#############################################################################
1281# command handling &c 1434# command handling &c
1282 1435
1283=item cf::register_command $name => \&callback($ob,$args); 1436=item cf::register_command $name => \&callback($ob,$args)
1284 1437
1285Register a callback for execution when the client sends the user command 1438Register a callback for execution when the client sends the user command
1286$name. 1439$name.
1287 1440
1288=cut 1441=cut
… …
1294 #warn "registering command '$name/$time' to '$caller'"; 1447 #warn "registering command '$name/$time' to '$caller'";
1295 1448
1296 push @{ $COMMAND{$name} }, [$caller, $cb]; 1449 push @{ $COMMAND{$name} }, [$caller, $cb];
1297} 1450}
1298 1451
1299=item cf::register_extcmd $name => \&callback($pl,$packet); 1452=item cf::register_extcmd $name => \&callback($pl,$packet)
1300 1453
1301Register a callback for execution when the client sends an (synchronous) 1454Register a callback for execution when the client sends an (synchronous)
1302extcmd packet. Ext commands will be processed in the order they are 1455extcmd packet. Ext commands will be processed in the order they are
1303received by the server, like other user commands. The first argument is 1456received by the server, like other user commands. The first argument is
1304the logged-in player. Ext commands can only be processed after a player 1457the logged-in player. Ext commands can only be processed after a player
1305has logged in successfully. 1458has logged in successfully.
1306 1459
1307If the callback returns something, it is sent back as if reply was being 1460If the callback returns something, it is sent back as if reply was being
1308called. 1461called.
1309 1462
1310=item cf::register_exticmd $name => \&callback($ns,$packet); 1463=item cf::register_exticmd $name => \&callback($ns,$packet)
1311 1464
1312Register a callback for execution when the client sends an (asynchronous) 1465Register a callback for execution when the client sends an (asynchronous)
1313exticmd packet. Exti commands are processed by the server as soon as they 1466exticmd packet. Exti commands are processed by the server as soon as they
1314are received, i.e. out of order w.r.t. other commands. The first argument 1467are received, i.e. out of order w.r.t. other commands. The first argument
1315is a client socket. Exti commands can be received anytime, even before 1468is a client socket. Exti commands can be received anytime, even before
… …
1351 my ($pl, $buf) = @_; 1504 my ($pl, $buf) = @_;
1352 1505
1353 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1506 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1354 1507
1355 if (ref $msg) { 1508 if (ref $msg) {
1356 my ($type, $reply, @payload) = 1509 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1357 "ARRAY" eq ref $msg
1358 ? @$msg
1359 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1360 1510
1361 my @reply; 1511 my @reply;
1362 1512
1363 if (my $cb = $EXTCMD{$type}) { 1513 if (my $cb = $EXTCMD{$type}) {
1364 @reply = $cb->($pl, @payload); 1514 @reply = $cb->($pl, @payload);
1365 } 1515 }
1366 1516
1367 $pl->ext_reply ($reply, @reply) 1517 $pl->ext_msg ("reply-$reply", @reply)
1368 if $reply; 1518 if $reply;
1369 1519
1370 } else { 1520 } else {
1371 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1521 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1372 } 1522 }
1373 1523
1374 cf::override; 1524 cf::override;
1375 }, 1525 },
1376); 1526);
… …
1386 }; 1536 };
1387 1537
1388 $grp 1538 $grp
1389} 1539}
1390 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
1391sub load_extensions { 1552sub load_extensions {
1553 info "loading extensions...";
1554
1555 %EXT_CFG = ();
1556
1392 cf::sync_job { 1557 cf::sync_job {
1393 my %todo; 1558 my %todo;
1394 1559
1395 for my $path (<$LIBDIR/*.ext>) { 1560 for my $path (<$LIBDIR/*.ext>) {
1396 next unless -r $path; 1561 next unless -r $path;
… …
1414 1579
1415 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1580 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1416 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1581 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1417 1582
1418 $ext{source} = 1583 $ext{source} =
1419 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1584 "package $pkg; use common::sense;\n"
1420 . "#line 1 \"$path\"\n{\n" 1585 . "#line 1 \"$path\"\n{\n"
1421 . $source 1586 . $source
1422 . "\n};\n1"; 1587 . "\n};\n1";
1423 1588
1424 $todo{$base} = \%ext; 1589 $todo{$base} = \%ext;
… …
1436 for (split /,\s*/, $v->{meta}{depends}) { 1601 for (split /,\s*/, $v->{meta}{depends}) {
1437 next ext 1602 next ext
1438 unless exists $done{$_}; 1603 unless exists $done{$_};
1439 } 1604 }
1440 1605
1441 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1606 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1442 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
1443 my $active = eval $v->{source}; 1617 my $active = eval $source;
1444 1618
1445 if (length $@) { 1619 if (length $@) {
1446 warn "$v->{path}: $@\n"; 1620 error "$v->{path}: $@\n";
1447 1621
1448 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1622 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1449 if exists $v->{meta}{mandatory}; 1623 if exists $v->{meta}{mandatory};
1450 1624
1451 warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; 1625 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
… …
1453 } else { 1627 } else {
1454 $done{$k} = delete $todo{$k}; 1628 $done{$k} = delete $todo{$k};
1455 push @EXTS, $v->{pkg}; 1629 push @EXTS, $v->{pkg};
1456 $progress = 1; 1630 $progress = 1;
1457 1631
1458 warn "$v->{base}: extension inactive.\n" 1632 info "$v->{base}: extension inactive.\n"
1459 unless $active; 1633 unless $active;
1460 } 1634 }
1461 } 1635 }
1462 1636
1463 unless ($progress) { 1637 unless ($progress) {
… …
1465 1639
1466 while (my ($k, $v) = each %todo) { 1640 while (my ($k, $v) = each %todo) {
1467 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1641 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1468 if exists $v->{meta}{mandatory}; 1642 if exists $v->{meta}{mandatory};
1469 } 1643 }
1644
1645 last;
1470 } 1646 }
1471 } 1647 }
1472 }; 1648 };
1473} 1649}
1474 1650
… …
1632 my $name = $pl->ob->name; 1808 my $name = $pl->ob->name;
1633 1809
1634 $pl->{deny_save} = 1; 1810 $pl->{deny_save} = 1;
1635 $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
1636 1812
1637 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1813 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1638 $pl->deactivate; 1814 $pl->deactivate;
1815
1639 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;
1640 $pl->ob->check_score;
1641 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1817 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1818 ext::highscore::check ($pl->ob);
1819
1642 $pl->ns->destroy if $pl->ns; 1820 $pl->ns->destroy if $pl->ns;
1643 1821
1644 my $path = playerdir $pl; 1822 my $path = playerdir $pl;
1645 my $temp = "$path~$cf::RUNTIME~deleting~"; 1823 my $temp = "$path~$cf::RUNTIME~deleting~";
1646 aio_rename $path, $temp; 1824 aio_rename $path, $temp;
… …
1732 1910
1733=item $protocol_xml = $player->expand_cfpod ($cfpod) 1911=item $protocol_xml = $player->expand_cfpod ($cfpod)
1734 1912
1735Expand deliantra pod fragments into protocol xml. 1913Expand deliantra pod fragments into protocol xml.
1736 1914
1737=item $player->ext_reply ($msgid, @msg)
1738
1739Sends an ext reply to the player.
1740
1741=cut
1742
1743sub ext_reply($$@) {
1744 my ($self, $id, @msg) = @_;
1745
1746 $self->ns->ext_reply ($id, @msg)
1747}
1748
1749=item $player->ext_msg ($type, @msg) 1915=item $player->ext_msg ($type, @msg)
1750 1916
1751Sends an ext event to the client. 1917Sends an ext event to the client.
1752 1918
1753=cut 1919=cut
… …
1812sub generate_random_map { 1978sub generate_random_map {
1813 my ($self, $rmp) = @_; 1979 my ($self, $rmp) = @_;
1814 1980
1815 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1981 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1816 1982
1817 # mit "rum" bekleckern, nicht
1818 $self->_create_random_map ( 1983 $self->_create_random_map ($rmp);
1819 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1820 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1821 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1822 $rmp->{exit_on_final_map},
1823 $rmp->{xsize}, $rmp->{ysize},
1824 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1825 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1826 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1827 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1828 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1829 (cf::region::find $rmp->{region}), $rmp->{custom}
1830 )
1831} 1984}
1832 1985
1833=item cf::map->register ($regex, $prio) 1986=item cf::map->register ($regex, $prio)
1834 1987
1835Register a handler for the map path matching the given regex at the 1988Register a handler for the map path matching the given regex at the
… …
1840 1993
1841sub register { 1994sub register {
1842 my (undef, $regex, $prio) = @_; 1995 my (undef, $regex, $prio) = @_;
1843 my $pkg = caller; 1996 my $pkg = caller;
1844 1997
1845 no strict;
1846 push @{"$pkg\::ISA"}, __PACKAGE__; 1998 push @{"$pkg\::ISA"}, __PACKAGE__;
1847 1999
1848 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2000 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1849} 2001}
1850 2002
… …
1862} 2014}
1863 2015
1864sub normalise { 2016sub normalise {
1865 my ($path, $base) = @_; 2017 my ($path, $base) = @_;
1866 2018
1867 $path = "$path"; # make sure its a string 2019 $path = "$path"; # make sure it's a string
1868 2020
1869 $path =~ s/\.map$//; 2021 $path =~ s/\.map$//;
1870 2022
1871 # map plan: 2023 # map plan:
1872 # 2024 #
… …
1887 $base =~ s{[^/]+/?$}{}; 2039 $base =~ s{[^/]+/?$}{};
1888 $path = "$base/$path"; 2040 $path = "$base/$path";
1889 } 2041 }
1890 2042
1891 for ($path) { 2043 for ($path) {
1892 redo if s{//}{/};
1893 redo if s{/\.?/}{/}; 2044 redo if s{/\.?/}{/};
1894 redo if s{/[^/]+/\.\./}{/}; 2045 redo if s{/[^/]+/\.\./}{/};
1895 } 2046 }
1896 2047
1897 $path 2048 $path
… …
1911 $self->init; # pass $1 etc. 2062 $self->init; # pass $1 etc.
1912 return $self; 2063 return $self;
1913 } 2064 }
1914 } 2065 }
1915 2066
1916 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2067 Carp::cluck "unable to resolve path '$path' (base '$base')";
1917 () 2068 ()
1918} 2069}
1919 2070
2071# may re-bless or do other evil things
1920sub init { 2072sub init {
1921 my ($self) = @_; 2073 my ($self) = @_;
1922 2074
1923 $self 2075 $self
1924} 2076}
… …
1989 $self->{load_path} = $path; 2141 $self->{load_path} = $path;
1990 2142
1991 1 2143 1
1992} 2144}
1993 2145
2146# used to laod the header of an original map
1994sub load_header_orig { 2147sub load_header_orig {
1995 my ($self) = @_; 2148 my ($self) = @_;
1996 2149
1997 $self->load_header_from ($self->load_path) 2150 $self->load_header_from ($self->load_path)
1998} 2151}
1999 2152
2153# used to laod the header of an instantiated map
2000sub load_header_temp { 2154sub load_header_temp {
2001 my ($self) = @_; 2155 my ($self) = @_;
2002 2156
2003 $self->load_header_from ($self->save_path) 2157 $self->load_header_from ($self->save_path)
2004} 2158}
2005 2159
2160# called after loading the header from an instantiated map
2006sub prepare_temp { 2161sub prepare_temp {
2007 my ($self) = @_; 2162 my ($self) = @_;
2008 2163
2009 $self->last_access ((delete $self->{last_access}) 2164 $self->last_access ((delete $self->{last_access})
2010 || $cf::RUNTIME); #d# 2165 || $cf::RUNTIME); #d#
2011 # safety 2166 # safety
2012 $self->{instantiate_time} = $cf::RUNTIME 2167 $self->{instantiate_time} = $cf::RUNTIME
2013 if $self->{instantiate_time} > $cf::RUNTIME; 2168 if $self->{instantiate_time} > $cf::RUNTIME;
2014} 2169}
2015 2170
2171# called after loading the header from an original map
2016sub prepare_orig { 2172sub prepare_orig {
2017 my ($self) = @_; 2173 my ($self) = @_;
2018 2174
2019 $self->{load_original} = 1; 2175 $self->{load_original} = 1;
2020 $self->{instantiate_time} = $cf::RUNTIME; 2176 $self->{instantiate_time} = $cf::RUNTIME;
… …
2044 2200
2045sub find; 2201sub find;
2046sub find { 2202sub find {
2047 my ($path, $origin) = @_; 2203 my ($path, $origin) = @_;
2048 2204
2205 cf::cede_to_tick;
2206
2049 $path = normalise $path, $origin && $origin->path; 2207 $path = normalise $path, $origin;
2050 2208
2051 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2209 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2052 my $guard2 = cf::lock_acquire "map_find:$path"; 2210 my $guard2 = cf::lock_acquire "map_find:$path";
2053 2211
2054 $cf::MAP{$path} || do { 2212 $cf::MAP{$path} || do {
… …
2085 2243
2086 { 2244 {
2087 my $guard = cf::lock_acquire "map_data:$path"; 2245 my $guard = cf::lock_acquire "map_data:$path";
2088 2246
2089 return unless $self->valid; 2247 return unless $self->valid;
2090 return unless $self->in_memory == cf::MAP_SWAPPED; 2248 return unless $self->state == cf::MAP_SWAPPED;
2091
2092 $self->in_memory (cf::MAP_LOADING);
2093 2249
2094 $self->alloc; 2250 $self->alloc;
2095 2251
2096 $self->pre_load; 2252 $self->pre_load;
2097 cf::cede_to_tick; 2253 cf::cede_to_tick;
2098 2254
2255 if (exists $self->{load_path}) {
2099 my $f = new_from_file cf::object::thawer $self->{load_path}; 2256 my $f = new_from_file cf::object::thawer $self->{load_path};
2100 $f->skip_block; 2257 $f->skip_block;
2101 $self->_load_objects ($f) 2258 $self->_load_objects ($f)
2102 or return; 2259 or return;
2103 2260
2104 $self->post_load_original 2261 $self->post_load_original
2105 if delete $self->{load_original}; 2262 if delete $self->{load_original};
2106 2263
2107 if (my $uniq = $self->uniq_path) { 2264 if (my $uniq = $self->uniq_path) {
2108 utf8::encode $uniq; 2265 utf8::encode $uniq;
2109 unless (aio_stat $uniq) { 2266 unless (aio_stat $uniq) {
2110 if (my $f = new_from_file cf::object::thawer $uniq) { 2267 if (my $f = new_from_file cf::object::thawer $uniq) {
2111 $self->clear_unique_items; 2268 $self->clear_unique_items;
2112 $self->_load_objects ($f); 2269 $self->_load_objects ($f);
2113 $f->resolve_delayed_derefs; 2270 $f->resolve_delayed_derefs;
2271 }
2114 } 2272 }
2115 } 2273 }
2116 }
2117 2274
2118 $f->resolve_delayed_derefs; 2275 $f->resolve_delayed_derefs;
2276 } else {
2277 $self->post_load_original
2278 if delete $self->{load_original};
2279 }
2280
2281 $self->state (cf::MAP_INACTIVE);
2119 2282
2120 cf::cede_to_tick; 2283 cf::cede_to_tick;
2121 # now do the right thing for maps 2284 # now do the right thing for maps
2122 $self->link_multipart_objects; 2285 $self->link_multipart_objects;
2123 $self->difficulty ($self->estimate_difficulty) 2286 $self->difficulty ($self->estimate_difficulty)
… …
2127 unless ($self->{deny_activate}) { 2290 unless ($self->{deny_activate}) {
2128 $self->decay_objects; 2291 $self->decay_objects;
2129 $self->fix_auto_apply; 2292 $self->fix_auto_apply;
2130 $self->update_buttons; 2293 $self->update_buttons;
2131 cf::cede_to_tick; 2294 cf::cede_to_tick;
2132 $self->activate; 2295 #$self->activate; # no longer activate maps automatically
2133 } 2296 }
2134 2297
2135 $self->{last_save} = $cf::RUNTIME; 2298 $self->{last_save} = $cf::RUNTIME;
2136 $self->last_access ($cf::RUNTIME); 2299 $self->last_access ($cf::RUNTIME);
2137
2138 $self->in_memory (cf::MAP_ACTIVE);
2139 } 2300 }
2140 2301
2141 $self->post_load; 2302 $self->post_load;
2303
2304 1
2142} 2305}
2143 2306
2144# customize the map for a given player, i.e. 2307# customize the map for a given player, i.e.
2145# return the _real_ map. used by e.g. per-player 2308# return the _real_ map. used by e.g. per-player
2146# maps to change the path to ~playername/mappath 2309# maps to change the path to ~playername/mappath
… …
2154# if $self->per_party; 2317# if $self->per_party;
2155 2318
2156 $self 2319 $self
2157} 2320}
2158 2321
2159# find and load all maps in the 3x3 area around a map
2160sub load_neighbours {
2161 my ($map) = @_;
2162
2163 my @neigh; # diagonal neighbours
2164
2165 for (0 .. 3) {
2166 my $neigh = $map->tile_path ($_)
2167 or next;
2168 $neigh = find $neigh, $map
2169 or next;
2170 $neigh->load;
2171
2172 # now find the diagonal neighbours
2173 push @neigh,
2174 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2175 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2176 }
2177
2178 for (grep defined $_->[0], @neigh) {
2179 my ($path, $origin) = @$_;
2180 my $neigh = find $path, $origin
2181 or next;
2182 $neigh->load;
2183 }
2184}
2185
2186sub find_sync { 2322sub find_sync {
2187 my ($path, $origin) = @_; 2323 my ($path, $origin) = @_;
2188 2324
2189 cf::sync_job { find $path, $origin } 2325 # it's a bug to call this from the main context
2326 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2327 if $Coro::current == $Coro::main;
2328
2329 find $path, $origin
2190} 2330}
2191 2331
2192sub do_load_sync { 2332sub do_load_sync {
2193 my ($map) = @_; 2333 my ($map) = @_;
2194 2334
2335 # it's a bug to call this from the main context
2195 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2336 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2196 if $Coro::current == $Coro::main; 2337 if $Coro::current == $Coro::main;
2197 2338
2198 cf::sync_job { $map->load }; 2339 $map->load;
2199} 2340}
2200 2341
2201our %MAP_PREFETCH; 2342our %MAP_PREFETCH;
2202our $MAP_PREFETCHER = undef; 2343our $MAP_PREFETCHER = undef;
2203 2344
2204sub find_async { 2345sub find_async {
2205 my ($path, $origin, $load) = @_; 2346 my ($path, $origin, $load) = @_;
2206 2347
2207 $path = normalise $path, $origin && $origin->{path}; 2348 $path = normalise $path, $origin;
2208 2349
2209 if (my $map = $cf::MAP{$path}) { 2350 if (my $map = $cf::MAP{$path}) {
2210 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2351 return $map if !$load || $map->linkable;
2211 } 2352 }
2212 2353
2213 $MAP_PREFETCH{$path} |= $load; 2354 $MAP_PREFETCH{$path} |= $load;
2214 2355
2215 $MAP_PREFETCHER ||= cf::async { 2356 $MAP_PREFETCHER ||= cf::async {
… …
2274sub swap_out { 2415sub swap_out {
2275 my ($self) = @_; 2416 my ($self) = @_;
2276 2417
2277 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2418 my $lock = cf::lock_acquire "map_data:$self->{path}";
2278 2419
2279 return if $self->in_memory != cf::MAP_ACTIVE; 2420 return if !$self->linkable;
2280 return if $self->{deny_save}; 2421 return if $self->{deny_save};
2281 return if $self->players; 2422 return if $self->players;
2282 2423
2283 # first deactivate the map and "unlink" it from the core 2424 # first deactivate the map and "unlink" it from the core
2284 $self->deactivate; 2425 $self->deactivate;
2285 $_->clear_links_to ($self) for values %cf::MAP; 2426 $_->clear_links_to ($self) for values %cf::MAP;
2286 $self->in_memory (cf::MAP_SWAPPED); 2427 $self->state (cf::MAP_SWAPPED);
2287 2428
2288 # then atomically save 2429 # then atomically save
2289 $self->_save; 2430 $self->_save;
2290 2431
2291 # then free the map 2432 # then free the map
… …
2315 2456
2316 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2457 my $lock = cf::lock_acquire "map_data:$self->{path}";
2317 2458
2318 return if $self->players; 2459 return if $self->players;
2319 2460
2320 warn "resetting map ", $self->path, "\n"; 2461 cf::trace "resetting map ", $self->path, "\n";
2321 2462
2322 $self->in_memory (cf::MAP_SWAPPED); 2463 $self->state (cf::MAP_SWAPPED);
2323 2464
2324 # need to save uniques path 2465 # need to save uniques path
2325 unless ($self->{deny_save}) { 2466 unless ($self->{deny_save}) {
2326 my $uniq = $self->uniq_path; utf8::encode $uniq; 2467 my $uniq = $self->uniq_path; utf8::encode $uniq;
2327 2468
… …
2657 # use -1 or undef as default coordinates, not 0, 0 2798 # use -1 or undef as default coordinates, not 0, 0
2658 ($x, $y) = ($map->enter_x, $map->enter_y) 2799 ($x, $y) = ($map->enter_x, $map->enter_y)
2659 if $x <= 0 && $y <= 0; 2800 if $x <= 0 && $y <= 0;
2660 2801
2661 $map->load; 2802 $map->load;
2662 $map->load_neighbours;
2663 2803
2664 return unless $self->contr->active; 2804 return unless $self->contr->active;
2665 2805
2666 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2806 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2667 if ($self->enter_map ($map, $x, $y)) { 2807 if ($self->enter_map ($map, $x, $y)) {
… …
2690 2830
2691sub cf::object::player::goto { 2831sub cf::object::player::goto {
2692 my ($self, $path, $x, $y, $check, $done) = @_; 2832 my ($self, $path, $x, $y, $check, $done) = @_;
2693 2833
2694 if ($self->{_link_recursion} >= $MAX_LINKS) { 2834 if ($self->{_link_recursion} >= $MAX_LINKS) {
2695 warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting."; 2835 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2696 $self->failmsg ("Something went wrong inside the server - please contact an administrator!"); 2836 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2697 ($path, $x, $y) = @$EMERGENCY_POSITION; 2837 ($path, $x, $y) = @$EMERGENCY_POSITION;
2698 } 2838 }
2699 2839
2700 # do generation counting so two concurrent goto's will be executed in-order 2840 # do generation counting so two concurrent goto's will be executed in-order
… …
2723 ($path, $x, $y) = (undef, undef, undef); 2863 ($path, $x, $y) = (undef, undef, undef);
2724 } 2864 }
2725 } 2865 }
2726 2866
2727 my $map = eval { 2867 my $map = eval {
2728 my $map = defined $path ? cf::map::find $path : undef; 2868 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2729 2869
2730 if ($map) { 2870 if ($map) {
2731 $map = $map->customise_for ($self); 2871 $map = $map->customise_for ($self);
2732 $map = $check->($map, $x, $y, $self) if $check && $map; 2872 $map = $check->($map, $x, $y, $self) if $check && $map;
2733 } else { 2873 } else {
… …
2823 $Coro::current->{desc} = "enter_exit"; 2963 $Coro::current->{desc} = "enter_exit";
2824 2964
2825 unless (eval { 2965 unless (eval {
2826 $self->deactivate_recursive; # just to be sure 2966 $self->deactivate_recursive; # just to be sure
2827 2967
2828 # random map handling
2829 {
2830 my $guard = cf::lock_acquire "exit_prepare:$exit";
2831
2832 prepare_random_map $exit
2833 if $exit->slaying eq "/!";
2834 }
2835
2836 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2968 my $map = cf::map::normalise $exit->slaying, $exit->map;
2837 my $x = $exit->stats->hp; 2969 my $x = $exit->stats->hp;
2838 my $y = $exit->stats->sp; 2970 my $y = $exit->stats->sp;
2971
2972 # special map handling
2973 my $slaying = $exit->slaying;
2974
2975 # special map handling
2976 if ($slaying eq "/!") {
2977 my $guard = cf::lock_acquire "exit_prepare:$exit";
2978
2979 prepare_random_map $exit
2980 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2981
2982 $map = $exit->slaying;
2983
2984 } elsif ($slaying eq '!up') {
2985 $map = $exit->map->tile_path (cf::TILE_UP);
2986 $x = $exit->x;
2987 $y = $exit->y;
2988
2989 } elsif ($slaying eq '!down') {
2990 $map = $exit->map->tile_path (cf::TILE_DOWN);
2991 $x = $exit->x;
2992 $y = $exit->y;
2993 }
2839 2994
2840 $self->goto ($map, $x, $y); 2995 $self->goto ($map, $x, $y);
2841 2996
2842 # if exit is damned, update players death & WoR home-position 2997 # if exit is damned, update players death & WoR home-position
2843 $self->contr->savebed ($map, $x, $y) 2998 $self->contr->savebed ($map, $x, $y)
… …
2848 $self->message ("Something went wrong deep within the deliantra server. " 3003 $self->message ("Something went wrong deep within the deliantra server. "
2849 . "I'll try to bring you back to the map you were before. " 3004 . "I'll try to bring you back to the map you were before. "
2850 . "Please report this to the dungeon master!", 3005 . "Please report this to the dungeon master!",
2851 cf::NDI_UNIQUE | cf::NDI_RED); 3006 cf::NDI_UNIQUE | cf::NDI_RED);
2852 3007
2853 warn "ERROR in enter_exit: $@"; 3008 error "ERROR in enter_exit: $@";
2854 $self->leave_link; 3009 $self->leave_link;
2855 } 3010 }
2856 })->prio (1); 3011 })->prio (1);
2857} 3012}
2858 3013
… …
3068=cut 3223=cut
3069 3224
3070sub cf::client::ext_msg($$@) { 3225sub cf::client::ext_msg($$@) {
3071 my ($self, $type, @msg) = @_; 3226 my ($self, $type, @msg) = @_;
3072 3227
3073 if ($self->extcmd == 2) {
3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3228 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3075 } elsif ($self->extcmd == 1) { # TODO: remove
3076 push @msg, msgtype => "event_$type";
3077 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3078 }
3079}
3080
3081=item $client->ext_reply ($msgid, @msg)
3082
3083Sends an ext reply to the client.
3084
3085=cut
3086
3087sub cf::client::ext_reply($$@) {
3088 my ($self, $id, @msg) = @_;
3089
3090 if ($self->extcmd == 2) {
3091 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3092 } elsif ($self->extcmd == 1) {
3093 #TODO: version 1, remove
3094 unshift @msg, msgtype => "reply", msgid => $id;
3095 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3096 }
3097} 3229}
3098 3230
3099=item $success = $client->query ($flags, "text", \&cb) 3231=item $success = $client->query ($flags, "text", \&cb)
3100 3232
3101Queues a query to the client, calling the given callback with 3233Queues a query to the client, calling the given callback with
… …
3156 my ($ns, $buf) = @_; 3288 my ($ns, $buf) = @_;
3157 3289
3158 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3290 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3159 3291
3160 if (ref $msg) { 3292 if (ref $msg) {
3161 my ($type, $reply, @payload) = 3293 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3162 "ARRAY" eq ref $msg
3163 ? @$msg
3164 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3165 3294
3166 my @reply; 3295 my @reply;
3167 3296
3168 if (my $cb = $EXTICMD{$type}) { 3297 if (my $cb = $EXTICMD{$type}) {
3169 @reply = $cb->($ns, @payload); 3298 @reply = $cb->($ns, @payload);
3170 } 3299 }
3171 3300
3172 $ns->ext_reply ($reply, @reply) 3301 $ns->ext_msg ("reply-$reply", @reply)
3173 if $reply; 3302 if $reply;
3174 3303
3175 } else { 3304 } else {
3176 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3305 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3177 } 3306 }
3178 3307
3179 cf::override; 3308 cf::override;
3180 }, 3309 },
3181); 3310);
… …
3262 decrease split destroy change_exp value msg lore send_msg)], 3391 decrease split destroy change_exp value msg lore send_msg)],
3263 ["cf::object::player" => qw(player)], 3392 ["cf::object::player" => qw(player)],
3264 ["cf::player" => qw(peaceful send_msg)], 3393 ["cf::player" => qw(peaceful send_msg)],
3265 ["cf::map" => qw(trigger)], 3394 ["cf::map" => qw(trigger)],
3266) { 3395) {
3267 no strict 'refs';
3268 my ($pkg, @funs) = @$_; 3396 my ($pkg, @funs) = @$_;
3269 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3397 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3270 for @funs; 3398 for @funs;
3271} 3399}
3272 3400
… …
3311 local @cf::_safe_eval_args = values %vars; 3439 local @cf::_safe_eval_args = values %vars;
3312 @res = wantarray ? eval eval : scalar eval $eval; 3440 @res = wantarray ? eval eval : scalar eval $eval;
3313 } 3441 }
3314 3442
3315 if ($@) { 3443 if ($@) {
3316 warn "$@"; 3444 warn "$@",
3317 warn "while executing safe code '$code'\n"; 3445 "while executing safe code '$code'\n",
3318 warn "with arguments " . (join " ", %vars) . "\n"; 3446 "with arguments " . (join " ", %vars) . "\n";
3319 } 3447 }
3320 3448
3321 wantarray ? @res : $res[0] 3449 wantarray ? @res : $res[0]
3322} 3450}
3323 3451
… …
3348=cut 3476=cut
3349 3477
3350############################################################################# 3478#############################################################################
3351# the server's init and main functions 3479# the server's init and main functions
3352 3480
3481our %FACEHASH; # hash => idx, #d# HACK for http server
3482
3483# internal api, not fianlised
3484sub add_face {
3485 my ($name, $type, $data) = @_;
3486
3487 my $idx = cf::face::find $name;
3488
3489 if ($idx) {
3490 delete $FACEHASH{cf::face::get_chksum $idx};
3491 } else {
3492 $idx = cf::face::alloc $name;
3493 }
3494
3495 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
3496
3497 cf::face::set_type $idx, $type;
3498 cf::face::set_data $idx, 0, $data, $hash;
3499 cf::face::set_meta $idx, $type & 1 ? undef : undef;
3500 $FACEHASH{$hash} = $idx;#d#
3501
3502 $idx
3503}
3504
3353sub load_facedata($) { 3505sub load_facedata($) {
3354 my ($path) = @_; 3506 my ($path) = @_;
3355 3507
3356 # HACK to clear player env face cache, we need some signal framework 3508 # HACK to clear player env face cache, we need some signal framework
3357 # for this (global event?) 3509 # for this (global event?)
3358 %ext::player_env::MUSIC_FACE_CACHE = (); 3510 %ext::player_env::MUSIC_FACE_CACHE = ();
3359 3511
3360 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3512 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3361 3513
3362 warn "loading facedata from $path\n"; 3514 trace "loading facedata from $path\n";
3363 3515
3364 my $facedata; 3516 my $facedata = decode_storable load_file $path;
3365 0 < aio_load $path, $facedata
3366 or die "$path: $!";
3367
3368 $facedata = Coro::Storable::thaw $facedata;
3369 3517
3370 $facedata->{version} == 2 3518 $facedata->{version} == 2
3371 or cf::cleanup "$path: version mismatch, cannot proceed."; 3519 or cf::cleanup "$path: version mismatch, cannot proceed.";
3372 3520
3373 # patch in the exptable
3374 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3375 $facedata->{resource}{"res/exp_table"} = {
3376 type => FT_RSRC,
3377 data => $exp_table,
3378 hash => (Digest::MD5::md5 $exp_table),
3379 };
3380 cf::cede_to_tick; 3521 cf::cede_to_tick;
3381 3522
3382 { 3523 {
3383 my $faces = $facedata->{faceinfo}; 3524 my $faces = $facedata->{faceinfo};
3384 3525
3385 while (my ($face, $info) = each %$faces) { 3526 for my $face (sort keys %$faces) {
3527 my $info = $faces->{$face};
3386 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3528 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3387 3529
3388 cf::face::set_visibility $idx, $info->{visibility}; 3530 cf::face::set_visibility $idx, $info->{visibility};
3389 cf::face::set_magicmap $idx, $info->{magicmap}; 3531 cf::face::set_magicmap $idx, $info->{magicmap};
3390 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3532 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3391 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3533 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3534 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3535 $FACEHASH{$info->{hash64}} = $idx;#d#
3392 3536
3393 cf::cede_to_tick; 3537 cf::cede_to_tick;
3394 } 3538 }
3395 3539
3396 while (my ($face, $info) = each %$faces) { 3540 while (my ($face, $info) = each %$faces) {
… …
3401 3545
3402 if (my $smooth = cf::face::find $info->{smooth}) { 3546 if (my $smooth = cf::face::find $info->{smooth}) {
3403 cf::face::set_smooth $idx, $smooth; 3547 cf::face::set_smooth $idx, $smooth;
3404 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3548 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3405 } else { 3549 } else {
3406 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3550 error "smooth face '$info->{smooth}' not found for face '$face'";
3407 } 3551 }
3408 3552
3409 cf::cede_to_tick; 3553 cf::cede_to_tick;
3410 } 3554 }
3411 } 3555 }
… …
3423 3567
3424 { 3568 {
3425 my $res = $facedata->{resource}; 3569 my $res = $facedata->{resource};
3426 3570
3427 while (my ($name, $info) = each %$res) { 3571 while (my ($name, $info) = each %$res) {
3428 if (defined $info->{type}) { 3572 if (defined (my $type = $info->{type})) {
3573 # TODO: different hash - must free and use new index, or cache ixface data queue
3429 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3574 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3430 3575
3576 cf::face::set_type $idx, $type;
3431 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3577 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3432 cf::face::set_type $idx, $info->{type}; 3578 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3579 $FACEHASH{$info->{hash}} = $idx;#d#
3433 } else { 3580 } else {
3434 $RESOURCE{$name} = $info; 3581# $RESOURCE{$name} = $info; # unused
3435 } 3582 }
3436 3583
3437 cf::cede_to_tick; 3584 cf::cede_to_tick;
3438 } 3585 }
3439 } 3586 }
3440 3587
3441 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3588 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3442 3589
3443 1 3590 1
3444} 3591}
3445
3446cf::global->attach (on_resource_update => sub {
3447 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3448 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3449
3450 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3451 my $sound = $soundconf->{compat}[$_]
3452 or next;
3453
3454 my $face = cf::face::find "sound/$sound->[1]";
3455 cf::sound::set $sound->[0] => $face;
3456 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3457 }
3458
3459 while (my ($k, $v) = each %{$soundconf->{event}}) {
3460 my $face = cf::face::find "sound/$v";
3461 cf::sound::set $k => $face;
3462 }
3463 }
3464});
3465 3592
3466register_exticmd fx_want => sub { 3593register_exticmd fx_want => sub {
3467 my ($ns, $want) = @_; 3594 my ($ns, $want) = @_;
3468 3595
3469 while (my ($k, $v) = each %$want) { 3596 while (my ($k, $v) = each %$want) {
… …
3477 my $status = load_resource_file_ $_[0]; 3604 my $status = load_resource_file_ $_[0];
3478 get_slot 0.1, 100; 3605 get_slot 0.1, 100;
3479 cf::arch::commit_load; 3606 cf::arch::commit_load;
3480 3607
3481 $status 3608 $status
3609}
3610
3611sub reload_exp_table {
3612 _reload_exp_table;
3613
3614 add_face "res/exp_table" => FT_RSRC,
3615 JSON::XS->new->utf8->canonical->encode (
3616 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3617 );
3618}
3619
3620sub reload_materials {
3621 _reload_materials;
3482} 3622}
3483 3623
3484sub reload_regions { 3624sub reload_regions {
3485 # HACK to clear player env face cache, we need some signal framework 3625 # HACK to clear player env face cache, we need some signal framework
3486 # for this (global event?) 3626 # for this (global event?)
… …
3501} 3641}
3502 3642
3503sub reload_archetypes { 3643sub reload_archetypes {
3504 load_resource_file "$DATADIR/archetypes" 3644 load_resource_file "$DATADIR/archetypes"
3505 or die "unable to load archetypes\n"; 3645 or die "unable to load archetypes\n";
3646
3647 add_face "res/skill_info" => FT_RSRC,
3648 JSON::XS->new->utf8->canonical->encode (
3649 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3650 );
3651 add_face "res/spell_paths" => FT_RSRC,
3652 JSON::XS->new->utf8->canonical->encode (
3653 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3654 );
3506} 3655}
3507 3656
3508sub reload_treasures { 3657sub reload_treasures {
3509 load_resource_file "$DATADIR/treasures" 3658 load_resource_file "$DATADIR/treasures"
3510 or die "unable to load treasurelists\n"; 3659 or die "unable to load treasurelists\n";
3511} 3660}
3512 3661
3662sub reload_sound {
3663 trace "loading sound config from $DATADIR/sound\n";
3664
3665 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3666
3667 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3668 my $sound = $soundconf->{compat}[$_]
3669 or next;
3670
3671 my $face = cf::face::find "sound/$sound->[1]";
3672 cf::sound::set $sound->[0] => $face;
3673 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3674 }
3675
3676 while (my ($k, $v) = each %{$soundconf->{event}}) {
3677 my $face = cf::face::find "sound/$v";
3678 cf::sound::set $k => $face;
3679 }
3680}
3681
3682#d# move docstuff to help or so
3683our %DOCSTRING;
3684
3685sub reload_pod {
3686 trace "loading pods $PODDIR\n";
3687
3688 %DOCSTRING = ();
3689 my @command_list;
3690
3691 for (
3692 [0, "command_help"],
3693 [1, "emote_help"],
3694 [2, "dmcommand_help"],
3695 ) {
3696 my ($type, $path) = @$_;
3697
3698 my $paragraphs = &cf::pod::load_pod ("$PODDIR/$path.pod")
3699 or die "unable to load $path";
3700
3701 my $level = 1e9;
3702 my $rpar;
3703
3704 for my $par (@$paragraphs) {
3705 if ($par->{type} eq "head2") {
3706 # this code taken almost verbatim from DC/Protocol.pm
3707
3708 if ($par->{markup} =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x) {
3709 my $cmd = $1;
3710 my @args = split /\|/, $2;
3711 @args = (".*") unless @args;
3712
3713 $_ = $_ eq ".*" ? "" : " $_"
3714 for @args;
3715
3716 my @variants = map "$cmd$_", sort { (length $a) <=> (length $b) } @args;
3717
3718 $rpar = \($DOCSTRING{"command/$cmd"} = &cf::pod::as_cfpod ([$par]));
3719
3720 push @command_list, [$type, \@variants];
3721 $level = $par->{level};
3722 } else {
3723 error "$par->{markup}: unparsable command heading";
3724 }
3725 } elsif ($par->{level} > $level) {
3726 $$rpar .= &cf::pod::as_cfpod ([$par]);
3727 }
3728
3729 cf::cede_to_tick;
3730 }
3731 }
3732
3733 @command_list = sort {
3734 $a->[0] <=> $b->[0]
3735 or $a->[1] cmp $b->[1]
3736 } @command_list;
3737
3738 cf::cede_to_tick;
3739
3740 add_face "res/command_list" => FT_RSRC,
3741 JSON::XS->new->utf8->encode (\@command_list);
3742}
3743
3513sub reload_resources { 3744sub reload_resources {
3514 warn "reloading resource files...\n"; 3745 trace "reloading resource files...\n";
3515 3746
3747 reload_materials;
3516 reload_facedata; 3748 reload_facedata;
3749 reload_exp_table;
3750 reload_sound;
3517 reload_archetypes; 3751 reload_archetypes;
3518 reload_regions; 3752 reload_regions;
3519 reload_treasures; 3753 reload_treasures;
3754 reload_pod;
3520 3755
3521 warn "finished reloading resource files\n"; 3756 trace "finished reloading resource files\n";
3522} 3757}
3523 3758
3524sub reload_config { 3759sub reload_config {
3525 warn "reloading config file...\n"; 3760 trace "reloading config file...\n";
3526 3761
3527 open my $fh, "<:utf8", "$CONFDIR/config" 3762 my $config = load_file "$CONFDIR/config";
3528 or return; 3763 utf8::decode $config;
3529 3764 *CFG = decode_yaml $config;
3530 local $/;
3531 *CFG = YAML::XS::Load scalar <$fh>;
3532 3765
3533 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3766 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3534 3767
3535 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3768 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3536 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3769 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3540 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3773 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3541 and die "WARNING: m(un)lockall failed: $!\n"; 3774 and die "WARNING: m(un)lockall failed: $!\n";
3542 }; 3775 };
3543 warn $@ if $@; 3776 warn $@ if $@;
3544 } 3777 }
3545
3546 warn "finished reloading resource files\n";
3547} 3778}
3548 3779
3549sub pidfile() { 3780sub pidfile() {
3550 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3781 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3551 or die "$PIDFILE: $!"; 3782 or die "$PIDFILE: $!";
… …
3564 seek $fh, 0, 0; 3795 seek $fh, 0, 0;
3565 print $fh $$; 3796 print $fh $$;
3566} 3797}
3567 3798
3568sub main_loop { 3799sub main_loop {
3569 warn "EV::loop starting\n"; 3800 trace "EV::loop starting\n";
3570 if (1) { 3801 if (1) {
3571 EV::loop; 3802 EV::loop;
3572 } 3803 }
3573 warn "EV::loop returned\n"; 3804 trace "EV::loop returned\n";
3574 goto &main_loop unless $REALLY_UNLOOP; 3805 goto &main_loop unless $REALLY_UNLOOP;
3575} 3806}
3576 3807
3577sub main { 3808sub main {
3578 cf::init_globals; # initialise logging 3809 cf::init_globals; # initialise logging
3579 3810
3580 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3811 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3581 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3812 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3582 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3813 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3583 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3814 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3584 3815
3585 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3816 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3586 3817
3587 # we must not ever block the main coroutine 3818 # we must not ever block the main coroutine
3588 local $Coro::idle = sub { 3819 $Coro::idle = sub {
3589 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3820 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3590 (async { 3821 (async {
3591 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3822 $Coro::current->{desc} = "IDLE BUG HANDLER";
3592 EV::loop EV::LOOP_ONESHOT; 3823 EV::loop EV::LOOP_ONESHOT;
3593 })->prio (Coro::PRIO_MAX); 3824 })->prio (Coro::PRIO_MAX);
3594 }; 3825 };
3595 3826
3596 evthread_start IO::AIO::poll_fileno; 3827 evthread_start IO::AIO::poll_fileno;
3597 3828
3598 cf::sync_job { 3829 cf::sync_job {
3599 cf::init_experience; 3830 cf::incloader::init ();
3831
3832 db_init;
3833
3600 cf::init_anim; 3834 cf::init_anim;
3601 cf::init_attackmess; 3835 cf::init_attackmess;
3602 cf::init_dynamic; 3836 cf::init_dynamic;
3603 3837
3604 cf::load_settings; 3838 cf::load_settings;
3605 cf::load_materials;
3606 3839
3607 reload_resources; 3840 reload_resources;
3608 reload_config; 3841 reload_config;
3609 db_init;
3610 3842
3611 cf::init_uuid; 3843 cf::init_uuid;
3612 cf::init_signals; 3844 cf::init_signals;
3613 cf::init_skills; 3845 cf::init_skills;
3614 3846
… …
3622 3854
3623 # no (long-running) fork's whatsoever before this point(!) 3855 # no (long-running) fork's whatsoever before this point(!)
3624 use POSIX (); 3856 use POSIX ();
3625 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3857 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3626 3858
3627 (pop @POST_INIT)->(0) while @POST_INIT; 3859 cf::_post_init 0;
3628 }; 3860 };
3629 3861
3630 cf::object::thawer::errors_are_fatal 0; 3862 cf::object::thawer::errors_are_fatal 0;
3631 warn "parse errors in files are no longer fatal from this point on.\n"; 3863 info "parse errors in files are no longer fatal from this point on.\n";
3632 3864
3865 AE::postpone {
3866 undef &main; # free gobs of memory :)
3867 };
3868
3633 main_loop; 3869 goto &main_loop;
3634} 3870}
3635 3871
3636############################################################################# 3872#############################################################################
3637# initialisation and cleanup 3873# initialisation and cleanup
3638 3874
… …
3677 or return; 3913 or return;
3678 3914
3679 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3915 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3680 and return; 3916 and return;
3681 3917
3682 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3918 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3683 3919
3684 1 3920 1
3685} 3921}
3686 3922
3687our $uuid_lock; 3923our $uuid_lock;
… …
3699 or return; 3935 or return;
3700 3936
3701 my $value = uuid_seq uuid_cur; 3937 my $value = uuid_seq uuid_cur;
3702 3938
3703 unless ($value) { 3939 unless ($value) {
3704 warn "cowardly refusing to write zero uuid value!\n"; 3940 info "cowardly refusing to write zero uuid value!\n";
3705 return; 3941 return;
3706 } 3942 }
3707 3943
3708 my $value = uuid_str $value + $uuid_skip; 3944 my $value = uuid_str $value + $uuid_skip;
3709 $uuid_skip = 0; 3945 $uuid_skip = 0;
… …
3719 or return; 3955 or return;
3720 3956
3721 aio_rename "$uuid~", $uuid 3957 aio_rename "$uuid~", $uuid
3722 and return; 3958 and return;
3723 3959
3724 warn "uuid file written ($value).\n"; 3960 trace "uuid file written ($value).\n";
3725 3961
3726 1 3962 1
3727 3963
3728} 3964}
3729 3965
… …
3735} 3971}
3736 3972
3737sub emergency_save() { 3973sub emergency_save() {
3738 my $freeze_guard = cf::freeze_mainloop; 3974 my $freeze_guard = cf::freeze_mainloop;
3739 3975
3740 warn "emergency_perl_save: enter\n"; 3976 info "emergency_perl_save: enter\n";
3977
3978 # this is a trade-off: we want to be very quick here, so
3979 # save all maps without fsync, and later call a global sync
3980 # (which in turn might be very very slow)
3981 local $USE_FSYNC = 0;
3741 3982
3742 cf::sync_job { 3983 cf::sync_job {
3743 # this is a trade-off: we want to be very quick here, so 3984 cf::write_runtime_sync; # external watchdog should not bark
3744 # save all maps without fsync, and later call a global sync
3745 # (which in turn might be very very slow)
3746 local $USE_FSYNC = 0;
3747 3985
3748 # use a peculiar iteration method to avoid tripping on perl 3986 # use a peculiar iteration method to avoid tripping on perl
3749 # refcount bugs in for. also avoids problems with players 3987 # refcount bugs in for. also avoids problems with players
3750 # and maps saved/destroyed asynchronously. 3988 # and maps saved/destroyed asynchronously.
3751 warn "emergency_perl_save: begin player save\n"; 3989 info "emergency_perl_save: begin player save\n";
3752 for my $login (keys %cf::PLAYER) { 3990 for my $login (keys %cf::PLAYER) {
3753 my $pl = $cf::PLAYER{$login} or next; 3991 my $pl = $cf::PLAYER{$login} or next;
3754 $pl->valid or next; 3992 $pl->valid or next;
3755 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3993 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3756 $pl->save; 3994 $pl->save;
3757 } 3995 }
3758 warn "emergency_perl_save: end player save\n"; 3996 info "emergency_perl_save: end player save\n";
3759 3997
3998 cf::write_runtime_sync; # external watchdog should not bark
3999
3760 warn "emergency_perl_save: begin map save\n"; 4000 info "emergency_perl_save: begin map save\n";
3761 for my $path (keys %cf::MAP) { 4001 for my $path (keys %cf::MAP) {
3762 my $map = $cf::MAP{$path} or next; 4002 my $map = $cf::MAP{$path} or next;
3763 $map->valid or next; 4003 $map->valid or next;
3764 $map->save; 4004 $map->save;
3765 } 4005 }
3766 warn "emergency_perl_save: end map save\n"; 4006 info "emergency_perl_save: end map save\n";
3767 4007
4008 cf::write_runtime_sync; # external watchdog should not bark
4009
3768 warn "emergency_perl_save: begin database checkpoint\n"; 4010 info "emergency_perl_save: begin database checkpoint\n";
3769 BDB::db_env_txn_checkpoint $DB_ENV; 4011 BDB::db_env_txn_checkpoint $DB_ENV;
3770 warn "emergency_perl_save: end database checkpoint\n"; 4012 info "emergency_perl_save: end database checkpoint\n";
3771 4013
3772 warn "emergency_perl_save: begin write uuid\n"; 4014 info "emergency_perl_save: begin write uuid\n";
3773 write_uuid_sync 1; 4015 write_uuid_sync 1;
3774 warn "emergency_perl_save: end write uuid\n"; 4016 info "emergency_perl_save: end write uuid\n";
4017
4018 cf::write_runtime_sync; # external watchdog should not bark
4019
4020 trace "emergency_perl_save: syncing database to disk";
4021 BDB::db_env_txn_checkpoint $DB_ENV;
4022
4023 info "emergency_perl_save: starting sync\n";
4024 IO::AIO::aio_sync sub {
4025 info "emergency_perl_save: finished sync\n";
4026 };
4027
4028 cf::write_runtime_sync; # external watchdog should not bark
4029
4030 trace "emergency_perl_save: flushing outstanding aio requests";
4031 while (IO::AIO::nreqs || BDB::nreqs) {
4032 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4033 }
4034
4035 cf::write_runtime_sync; # external watchdog should not bark
3775 }; 4036 };
3776 4037
3777 warn "emergency_perl_save: starting sync()\n";
3778 IO::AIO::aio_sync sub {
3779 warn "emergency_perl_save: finished sync()\n";
3780 };
3781
3782 warn "emergency_perl_save: leave\n"; 4038 info "emergency_perl_save: leave\n";
3783} 4039}
3784 4040
3785sub post_cleanup { 4041sub post_cleanup {
3786 my ($make_core) = @_; 4042 my ($make_core) = @_;
3787 4043
4044 IO::AIO::flush;
4045
3788 warn Carp::longmess "post_cleanup backtrace" 4046 error Carp::longmess "post_cleanup backtrace"
3789 if $make_core; 4047 if $make_core;
3790 4048
3791 my $fh = pidfile; 4049 my $fh = pidfile;
3792 unlink $PIDFILE if <$fh> == $$; 4050 unlink $PIDFILE if <$fh> == $$;
3793} 4051}
… …
3817 } 4075 }
3818} 4076}
3819 4077
3820sub do_reload_perl() { 4078sub do_reload_perl() {
3821 # can/must only be called in main 4079 # can/must only be called in main
3822 if (in_main) { 4080 unless (in_main) {
3823 warn "can only reload from main coroutine"; 4081 error "can only reload from main coroutine";
3824 return; 4082 return;
3825 } 4083 }
3826 4084
3827 return if $RELOAD++; 4085 return if $RELOAD++;
3828 4086
3829 my $t1 = AE::time; 4087 my $t1 = AE::time;
3830 4088
3831 while ($RELOAD) { 4089 while ($RELOAD) {
3832 warn "reloading..."; 4090 cf::get_slot 0.1, -1, "reload_perl";
4091 info "perl_reload: reloading...";
3833 4092
3834 warn "entering sync_job"; 4093 trace "perl_reload: entering sync_job";
3835 4094
3836 cf::sync_job { 4095 cf::sync_job {
3837 cf::write_runtime_sync; # external watchdog should not bark
3838 cf::emergency_save; 4096 #cf::emergency_save;
3839 cf::write_runtime_sync; # external watchdog should not bark
3840 4097
3841 warn "syncing database to disk";
3842 BDB::db_env_txn_checkpoint $DB_ENV;
3843
3844 # if anything goes wrong in here, we should simply crash as we already saved
3845
3846 warn "flushing outstanding aio requests";
3847 while (IO::AIO::nreqs || BDB::nreqs) {
3848 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3849 }
3850
3851 warn "cancelling all extension coros"; 4098 trace "perl_reload: cancelling all extension coros";
3852 $_->cancel for values %EXT_CORO; 4099 $_->cancel for values %EXT_CORO;
3853 %EXT_CORO = (); 4100 %EXT_CORO = ();
3854 4101
3855 warn "removing commands"; 4102 trace "perl_reload: removing commands";
3856 %COMMAND = (); 4103 %COMMAND = ();
3857 4104
3858 warn "removing ext/exti commands"; 4105 trace "perl_reload: removing ext/exti commands";
3859 %EXTCMD = (); 4106 %EXTCMD = ();
3860 %EXTICMD = (); 4107 %EXTICMD = ();
3861 4108
3862 warn "unloading/nuking all extensions"; 4109 trace "perl_reload: unloading/nuking all extensions";
3863 for my $pkg (@EXTS) { 4110 for my $pkg (@EXTS) {
3864 warn "... unloading $pkg"; 4111 trace "... unloading $pkg";
3865 4112
3866 if (my $cb = $pkg->can ("unload")) { 4113 if (my $cb = $pkg->can ("unload")) {
3867 eval { 4114 eval {
3868 $cb->($pkg); 4115 $cb->($pkg);
3869 1 4116 1
3870 } or warn "$pkg unloaded, but with errors: $@"; 4117 } or error "$pkg unloaded, but with errors: $@";
3871 } 4118 }
3872 4119
3873 warn "... clearing $pkg"; 4120 trace "... clearing $pkg";
3874 clear_package $pkg; 4121 clear_package $pkg;
3875 } 4122 }
3876 4123
3877 warn "unloading all perl modules loaded from $LIBDIR"; 4124 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3878 while (my ($k, $v) = each %INC) { 4125 while (my ($k, $v) = each %INC) {
3879 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4126 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3880 4127
3881 warn "... unloading $k"; 4128 trace "... unloading $k";
3882 delete $INC{$k}; 4129 delete $INC{$k};
3883 4130
3884 $k =~ s/\.pm$//; 4131 $k =~ s/\.pm$//;
3885 $k =~ s/\//::/g; 4132 $k =~ s/\//::/g;
3886 4133
… …
3889 } 4136 }
3890 4137
3891 clear_package $k; 4138 clear_package $k;
3892 } 4139 }
3893 4140
3894 warn "getting rid of safe::, as good as possible"; 4141 trace "perl_reload: getting rid of safe::, as good as possible";
3895 clear_package "safe::$_" 4142 clear_package "safe::$_"
3896 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4143 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3897 4144
3898 warn "unloading cf.pm \"a bit\""; 4145 trace "perl_reload: unloading cf.pm \"a bit\"";
3899 delete $INC{"cf.pm"}; 4146 delete $INC{"cf.pm"};
3900 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4147 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3901 4148
3902 # don't, removes xs symbols, too, 4149 # don't, removes xs symbols, too,
3903 # and global variables created in xs 4150 # and global variables created in xs
3904 #clear_package __PACKAGE__; 4151 #clear_package __PACKAGE__;
3905 4152
3906 warn "unload completed, starting to reload now"; 4153 info "perl_reload: unload completed, starting to reload now";
3907 4154
3908 warn "reloading cf.pm"; 4155 trace "perl_reload: reloading cf.pm";
3909 require cf; 4156 require cf;
3910 cf::_connect_to_perl_1; 4157 cf::_connect_to_perl_1;
3911 4158
3912 warn "loading config and database again"; 4159 trace "perl_reload: loading config and database again";
3913 cf::reload_config; 4160 cf::reload_config;
3914 4161
3915 warn "loading extensions"; 4162 trace "perl_reload: loading extensions";
3916 cf::load_extensions; 4163 cf::load_extensions;
3917 4164
3918 if ($REATTACH_ON_RELOAD) { 4165 if ($REATTACH_ON_RELOAD) {
3919 warn "reattaching attachments to objects/players"; 4166 trace "perl_reload: reattaching attachments to objects/players";
3920 _global_reattach; # objects, sockets 4167 _global_reattach; # objects, sockets
3921 warn "reattaching attachments to maps"; 4168 trace "perl_reload: reattaching attachments to maps";
3922 reattach $_ for values %MAP; 4169 reattach $_ for values %MAP;
3923 warn "reattaching attachments to players"; 4170 trace "perl_reload: reattaching attachments to players";
3924 reattach $_ for values %PLAYER; 4171 reattach $_ for values %PLAYER;
3925 } 4172 }
3926 4173
3927 warn "running post_init jobs"; 4174 cf::_post_init 1;
3928 (pop @POST_INIT)->(1) while @POST_INIT;
3929 4175
3930 warn "leaving sync_job"; 4176 trace "perl_reload: leaving sync_job";
3931 4177
3932 1 4178 1
3933 } or do { 4179 } or do {
3934 warn $@; 4180 error $@;
3935 cf::cleanup "error while reloading, exiting."; 4181 cf::cleanup "perl_reload: error, exiting.";
3936 }; 4182 };
3937 4183
3938 warn "reloaded";
3939 --$RELOAD; 4184 --$RELOAD;
3940 } 4185 }
3941 4186
3942 $t1 = AE::time - $t1; 4187 $t1 = AE::time - $t1;
3943 warn "reload completed in ${t1}s\n"; 4188 info "perl_reload: completed in ${t1}s\n";
3944}; 4189};
3945 4190
3946our $RELOAD_WATCHER; # used only during reload 4191our $RELOAD_WATCHER; # used only during reload
3947 4192
3948sub reload_perl() { 4193sub reload_perl() {
… …
3969 reload_perl; 4214 reload_perl;
3970 }; 4215 };
3971 } 4216 }
3972}; 4217};
3973 4218
3974unshift @INC, $LIBDIR; 4219#############################################################################
3975 4220
3976my $bug_warning = 0; 4221my $bug_warning = 0;
3977 4222
3978our @WAIT_FOR_TICK;
3979our @WAIT_FOR_TICK_BEGIN;
3980
3981sub wait_for_tick { 4223sub wait_for_tick() {
3982 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4224 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3983 4225
3984 my $signal = new Coro::Signal; 4226 $WAIT_FOR_TICK->wait;
3985 push @WAIT_FOR_TICK, $signal;
3986 $signal->wait;
3987} 4227}
3988 4228
3989sub wait_for_tick_begin { 4229sub wait_for_tick_begin() {
3990 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4230 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3991 4231
3992 my $signal = new Coro::Signal; 4232 my $signal = new Coro::Signal;
3993 push @WAIT_FOR_TICK_BEGIN, $signal; 4233 push @WAIT_FOR_TICK_BEGIN, $signal;
3994 $signal->wait; 4234 $signal->wait;
3995} 4235}
… …
3999 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4239 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4000 unless ++$bug_warning > 10; 4240 unless ++$bug_warning > 10;
4001 return; 4241 return;
4002 } 4242 }
4003 4243
4004 cf::server_tick; # one server iteration 4244 cf::one_tick; # one server iteration
4005 4245
4006 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4246 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4007 4247
4008 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4248 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4009 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4249 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
4010 Coro::async_pool { 4250 Coro::async_pool {
4011 $Coro::current->{desc} = "runtime saver"; 4251 $Coro::current->{desc} = "runtime saver";
4012 write_runtime_sync 4252 write_runtime_sync
4013 or warn "ERROR: unable to write runtime file: $!"; 4253 or error "ERROR: unable to write runtime file: $!";
4014 }; 4254 };
4015 } 4255 }
4016 4256
4017 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4257 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4018 $sig->send; 4258 $sig->send;
4019 } 4259 }
4020 while (my $sig = shift @WAIT_FOR_TICK) { 4260 $WAIT_FOR_TICK->broadcast;
4021 $sig->send;
4022 }
4023 4261
4024 $LOAD = ($NOW - $TICK_START) / $TICK; 4262 $LOAD = ($NOW - $TICK_START) / $TICK;
4025 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4263 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4026 4264
4027 if (0) { 4265 if (0) {
4028 if ($NEXT_TICK) { 4266 if ($NEXT_TICK) {
4029 my $jitter = $TICK_START - $NEXT_TICK; 4267 my $jitter = $TICK_START - $NEXT_TICK;
4030 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4268 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4031 warn "jitter $JITTER\n";#d# 4269 debug "jitter $JITTER\n";#d#
4032 } 4270 }
4033 } 4271 }
4034} 4272}
4035 4273
4036{ 4274{
4037 # configure BDB 4275 # configure BDB
4276 info "initialising database";
4038 4277
4039 BDB::min_parallel 16; 4278 BDB::min_parallel 16;
4040 BDB::max_poll_reqs $TICK * 0.1; 4279 BDB::max_poll_reqs $TICK * 0.1;
4041 $AnyEvent::BDB::WATCHER->priority (1); 4280 #$AnyEvent::BDB::WATCHER->priority (1);
4042 4281
4043 unless ($DB_ENV) { 4282 unless ($DB_ENV) {
4044 $DB_ENV = BDB::db_env_create; 4283 $DB_ENV = BDB::db_env_create;
4045 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4284 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4046 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4285 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
… …
4071 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4310 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4072 }; 4311 };
4073 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4312 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4074 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4313 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4075 }; 4314 };
4315
4316 info "database initialised";
4076} 4317}
4077 4318
4078{ 4319{
4079 # configure IO::AIO 4320 # configure IO::AIO
4080 4321
4322 info "initialising aio";
4081 IO::AIO::min_parallel 8; 4323 IO::AIO::min_parallel 8;
4082 IO::AIO::max_poll_time $TICK * 0.1; 4324 IO::AIO::max_poll_time $TICK * 0.1;
4083 undef $AnyEvent::AIO::WATCHER; 4325 undef $AnyEvent::AIO::WATCHER;
4326 info "aio initialised";
4084} 4327}
4085 4328
4086my $_log_backtrace; 4329our $_log_backtrace;
4330our $_log_backtrace_last;
4087 4331
4088sub _log_backtrace { 4332sub _log_backtrace {
4089 my ($msg, @addr) = @_; 4333 my ($msg, @addr) = @_;
4090 4334
4091 $msg =~ s/\n//; 4335 $msg =~ s/\n$//;
4092 4336
4337 if ($_log_backtrace_last eq $msg) {
4338 LOG llevInfo, "[ABT] $msg\n";
4339 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4093 # limit the # of concurrent backtraces 4340 # limit the # of concurrent backtraces
4094 if ($_log_backtrace < 2) { 4341 } elsif ($_log_backtrace < 2) {
4342 $_log_backtrace_last = $msg;
4095 ++$_log_backtrace; 4343 ++$_log_backtrace;
4096 my $perl_bt = Carp::longmess $msg; 4344 my $perl_bt = Carp::longmess $msg;
4097 async { 4345 async {
4098 $Coro::current->{desc} = "abt $msg"; 4346 $Coro::current->{desc} = "abt $msg";
4099 4347
… …
4119 LOG llevInfo, "[ABT] $_\n" for @bt; 4367 LOG llevInfo, "[ABT] $_\n" for @bt;
4120 --$_log_backtrace; 4368 --$_log_backtrace;
4121 }; 4369 };
4122 } else { 4370 } else {
4123 LOG llevInfo, "[ABT] $msg\n"; 4371 LOG llevInfo, "[ABT] $msg\n";
4124 LOG llevInfo, "[ABT] [suppressed]\n"; 4372 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4125 } 4373 }
4126} 4374}
4127 4375
4128# load additional modules 4376# load additional modules
4129require "cf/$_.pm" for @EXTRA_MODULES; 4377require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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