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.502 by root, Sat Jan 23 20:24:50 2010 UTC vs.
Revision 1.606 by root, Sun Nov 18 08:34:23 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 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 ();
60use IO::AIO (); 62use IO::AIO ();
61use Time::HiRes;
62use Compress::LZF; 63use Compress::LZF;
63use Digest::MD5 (); 64use Digest::MD5 ();
64 65
65AnyEvent::detect; 66AnyEvent::detect;
66 67
78# strictly for debugging 79# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 80$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 81
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 83
84our @ORIG_INC;
85
83our %COMMAND = (); 86our %COMMAND = ();
84our %COMMAND_TIME = (); 87our %COMMAND_TIME = ();
85 88
86our @EXTS = (); # list of extension package names 89our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 90our %EXTCMD = ();
91our %EXTACMD = ();
88our %EXTICMD = (); 92our %EXTICMD = ();
93our %EXTIACMD = ();
89our %EXT_CORO = (); # coroutines bound to extensions 94our %EXT_CORO = (); # coroutines bound to extensions
90our %EXT_MAP = (); # pluggable maps 95our %EXT_MAP = (); # pluggable maps
91 96
92our $RELOAD; # number of reloads so far, non-zero while in reload 97our $RELOAD; # number of reloads so far, non-zero while in reload
93our @EVENT; 98our @EVENT;
94our @REFLECT; # set by XS 99our @REFLECT; # set by XS
95our %REFLECT; # set by us 100our %REFLECT; # set by us
96 101
97our $CONFDIR = confdir; 102our $CONFDIR = confdir;
103
98our $DATADIR = datadir; 104our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 105our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 106our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 107our $MAPDIR = "$DATADIR/" . mapdir;
108
102our $LOCALDIR = localdir; 109our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 110our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 111our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 112our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 113our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 114our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 115our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 116our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 117
111our %RESOURCE; 118#our %RESOURCE; # unused
119
120our $OUTPUT_RATE_MIN = 3000;
121our $OUTPUT_RATE_MAX = 1000000;
122
123our $MAX_LINKS = 32; # how many chained exits to follow
124our $VERBOSE_IO = 1;
112 125
113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 126our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 127our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
115our $NEXT_TICK; 128our $NEXT_TICK;
116our $USE_FSYNC = 1; # use fsync to write maps - default on 129our $USE_FSYNC = 1; # use fsync to write maps - default on
118our $BDB_DEADLOCK_WATCHER; 131our $BDB_DEADLOCK_WATCHER;
119our $BDB_CHECKPOINT_WATCHER; 132our $BDB_CHECKPOINT_WATCHER;
120our $BDB_TRICKLE_WATCHER; 133our $BDB_TRICKLE_WATCHER;
121our $DB_ENV; 134our $DB_ENV;
122 135
123our @EXTRA_MODULES = qw(pod match mapscript); 136our @EXTRA_MODULES = qw(pod match mapscript incloader);
124 137
125our %CFG; 138our %CFG;
139our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
126 140
127our $UPTIME; $UPTIME ||= time; 141our $UPTIME; $UPTIME ||= time;
128our $RUNTIME; 142our $RUNTIME = 0;
143our $SERVER_TICK = 0;
129our $NOW; 144our $NOW;
130 145
131our (%PLAYER, %PLAYER_LOADING); # all users 146our (%PLAYER, %PLAYER_LOADING); # all users
132our (%MAP, %MAP_LOADING ); # all maps 147our (%MAP, %MAP_LOADING ); # all maps
133our $LINK_MAP; # the special {link} map, which is always available 148our $LINK_MAP; # the special {link} map, which is always available
142 157
143our @POST_INIT; 158our @POST_INIT;
144 159
145our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 160our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146our $REALLY_UNLOOP; # never set to true, please :) 161our $REALLY_UNLOOP; # never set to true, please :)
162
163our $WAIT_FOR_TICK = new Coro::Signal;
164our @WAIT_FOR_TICK_BEGIN;
147 165
148binmode STDOUT; 166binmode STDOUT;
149binmode STDERR; 167binmode STDERR;
150 168
151# read virtual server time, if available 169# read virtual server time, if available
162 180
163our $EMERGENCY_POSITION; 181our $EMERGENCY_POSITION;
164 182
165sub cf::map::normalise; 183sub cf::map::normalise;
166 184
185sub in_main() {
186 $Coro::current == $Coro::main
187}
188
167############################################################################# 189#############################################################################
168 190
169%REFLECT = (); 191%REFLECT = ();
170for (@REFLECT) { 192for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_; 193 my $reflect = JSON::XS::decode_json $_;
181 203
182=over 4 204=over 4
183 205
184=item $cf::UPTIME 206=item $cf::UPTIME
185 207
186The timestamp of the server start (so not actually an uptime). 208The timestamp of the server start (so not actually an "uptime").
209
210=item $cf::SERVER_TICK
211
212An unsigned integer that starts at zero when the server is started and is
213incremented on every tick.
214
215=item $cf::NOW
216
217The (real) time of the last (current) server tick - updated before and
218after tick processing, so this is useful only as a rough "what time is it
219now" estimate.
220
221=item $cf::TICK
222
223The interval between each server tick, in seconds.
187 224
188=item $cf::RUNTIME 225=item $cf::RUNTIME
189 226
190The time this server has run, starts at 0 and is increased by $cf::TICK on 227The time this server has run, starts at 0 and is increased by $cf::TICK on
191every server tick. 228every server tick.
192 229
193=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 230=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
194$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 231$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
195$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 232$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
196 233
197Various directories - "/etc", read-only install directory, perl-library 234Various directories - "/etc", read-only install directory, perl-library
198directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 235directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
199unique-items directory, player file directory, random maps directory and 236unique-items directory, player file directory, random maps directory and
200database environment. 237database environment.
201 238
202=item $cf::NOW
203
204The time of the last (current) server tick.
205
206=item $cf::TICK
207
208The interval between server ticks, in seconds.
209
210=item $cf::LOADAVG 239=item $cf::LOADAVG
211 240
212The current CPU load on the server (alpha-smoothed), as a value between 0 241The current CPU load on the server (alpha-smoothed), as a value between 0
213(none) and 1 (overloaded), indicating how much time is spent on processing 242(none) and 1 (overloaded), indicating how much time is spent on processing
214objects per tick. Healthy values are < 0.5. 243objects per tick. Healthy values are < 0.5.
222Configuration for the server, loaded from C</etc/deliantra-server/config>, or 251Configuration for the server, loaded from C</etc/deliantra-server/config>, or
223from wherever your confdir points to. 252from wherever your confdir points to.
224 253
225=item cf::wait_for_tick, cf::wait_for_tick_begin 254=item cf::wait_for_tick, cf::wait_for_tick_begin
226 255
227These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 256These are functions that inhibit the current coroutine one tick.
228returns directly I<after> the tick processing (and consequently, can only wake one process 257cf::wait_for_tick_begin only returns directly I<after> the tick
258processing (and consequently, can only wake one thread per tick), while
229per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 259cf::wait_for_tick wakes up all waiters after tick processing.
260
261Note that cf::wait_for_tick will immediately return when the server is not
262ticking, making it suitable for small pauses in threads that need to run
263when the server is paused. If that is not applicable (i.e. you I<really>
264want to wait, use C<$cf::WAIT_FOR_TICK>).
265
266=item $cf::WAIT_FOR_TICK
267
268Note that C<cf::wait_for_tick> is probably the correct thing to use. This
269variable contains a L<Coro::Signal> that is broadcats after every server
270tick. Calling C<< ->wait >> on it will suspend the caller until after the
271next server tick.
272
273=cut
274
275sub wait_for_tick();
276sub wait_for_tick_begin();
230 277
231=item @cf::INVOKE_RESULTS 278=item @cf::INVOKE_RESULTS
232 279
233This array contains the results of the last C<invoke ()> call. When 280This array contains the results of the last C<invoke ()> call. When
234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 281C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
242 289
243=back 290=back
244 291
245=cut 292=cut
246 293
294sub error(@) { LOG llevError, join "", @_ }
295sub warn (@) { LOG llevWarn , join "", @_ }
296sub info (@) { LOG llevInfo , join "", @_ }
297sub debug(@) { LOG llevDebug, join "", @_ }
298sub trace(@) { LOG llevTrace, join "", @_ }
299
247$Coro::State::WARNHOOK = sub { 300$Coro::State::WARNHOOK = sub {
248 my $msg = join "", @_; 301 my $msg = join "", @_;
249 302
250 $msg .= "\n" 303 $msg .= "\n"
251 unless $msg =~ /\n$/; 304 unless $msg =~ /\n$/;
252 305
253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 306 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
254 307
255 LOG llevError, $msg; 308 LOG llevWarn, $msg;
256}; 309};
257 310
258$Coro::State::DIEHOOK = sub { 311$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "==" 312 return unless $^S eq 0; # "eq", not "=="
260 313
261 warn Carp::longmess $_[0]; 314 error Carp::longmess $_[0];
262 315
263 if ($Coro::current == $Coro::main) {#d# 316 if (in_main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d# 317 error "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d# 318 return;#d#
266 }#d# 319 }#d#
267 320
268 # kill coroutine otherwise 321 # kill coroutine otherwise
269 Coro::terminate 322 Coro::terminate
289)) { 342)) {
290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 343 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
291} 344}
292 345
293$EV::DIED = sub { 346$EV::DIED = sub {
294 Carp::cluck "error in event callback: @_"; 347 warn "error in event callback: $@";
295}; 348};
349
350#############################################################################
351
352sub fork_call(&@);
353sub get_slot($;$$);
296 354
297############################################################################# 355#############################################################################
298 356
299=head2 UTILITY FUNCTIONS 357=head2 UTILITY FUNCTIONS
300 358
321 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 379 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
322 $d 380 $d
323 } || "[unable to dump $_[0]: '$@']"; 381 } || "[unable to dump $_[0]: '$@']";
324} 382}
325 383
384=item $scalar = cf::load_file $path
385
386Loads the given file from path and returns its contents. Croaks on error
387and can block.
388
389=cut
390
391sub load_file($) {
392 0 <= aio_load $_[0], my $data
393 or Carp::croak "$_[0]: $!";
394
395 $data
396}
397
398=item $success = cf::replace_file $path, $data, $sync
399
400Atomically replaces the file at the given $path with new $data, and
401optionally $sync the data to disk before replacing the file.
402
403=cut
404
405sub replace_file($$;$) {
406 my ($path, $data, $sync) = @_;
407
408 my $lock = cf::lock_acquire ("replace_file:$path");
409
410 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
411 or return;
412
413 $data = $data->() if ref $data;
414
415 length $data == aio_write $fh, 0, (length $data), $data, 0
416 or return;
417
418 !$sync
419 or !aio_fsync $fh
420 or return;
421
422 aio_close $fh
423 and return;
424
425 aio_rename "$path~", $path
426 and return;
427
428 if ($sync) {
429 $path =~ s%/[^/]*$%%;
430 aio_pathsync $path;
431 }
432
433 1
434}
435
326=item $ref = cf::decode_json $json 436=item $ref = cf::decode_json $json
327 437
328Converts a JSON string into the corresponding perl data structure. 438Converts a JSON string into the corresponding perl data structure.
329 439
330=item $json = cf::encode_json $ref 440=item $json = cf::encode_json $ref
336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 446our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
337 447
338sub encode_json($) { $json_coder->encode ($_[0]) } 448sub encode_json($) { $json_coder->encode ($_[0]) }
339sub decode_json($) { $json_coder->decode ($_[0]) } 449sub decode_json($) { $json_coder->decode ($_[0]) }
340 450
451=item $ref = cf::decode_storable $scalar
452
453Same as Coro::Storable::thaw, so blocks.
454
455=cut
456
457BEGIN { *decode_storable = \&Coro::Storable::thaw }
458
459=item $ref = cf::decode_yaml $scalar
460
461Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
462
463=cut
464
465sub decode_yaml($) {
466 fork_call { YAML::XS::Load $_[0] } @_
467}
468
469=item $scalar = cf::unlzf $scalar
470
471Same as Compress::LZF::compress, but takes server ticks into account, so
472blocks.
473
474=cut
475
476sub unlzf($) {
477 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
478 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
479 Compress::LZF::decompress $_[0]
480}
481
341=item cf::post_init { BLOCK } 482=item cf::post_init { BLOCK }
342 483
343Execute the given codeblock, I<after> all extensions have been (re-)loaded, 484Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again. 485but I<before> the server starts ticking again.
345 486
346The cdoeblock will have a single boolean argument to indicate whether this 487The codeblock will have a single boolean argument to indicate whether this
347is a reload or not. 488is a reload or not.
348 489
349=cut 490=cut
350 491
351sub post_init(&) { 492sub post_init(&) {
352 push @POST_INIT, shift; 493 push @POST_INIT, shift;
494}
495
496sub _post_init {
497 trace "running post_init jobs";
498
499 # run them in parallel...
500
501 my @join;
502
503 while () {
504 push @join, map &Coro::async ($_, 0), @POST_INIT;
505 @POST_INIT = ();
506
507 @join or last;
508
509 (pop @join)->join;
510 }
353} 511}
354 512
355=item cf::lock_wait $string 513=item cf::lock_wait $string
356 514
357Wait until the given lock is available. See cf::lock_acquire. 515Wait until the given lock is available. See cf::lock_acquire.
396} 554}
397 555
398=item cf::periodic $interval, $cb 556=item cf::periodic $interval, $cb
399 557
400Like EV::periodic, but randomly selects a starting point so that the actions 558Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer. 559get spread over time.
402 560
403=cut 561=cut
404 562
405sub periodic($$) { 563sub periodic($$) {
406 my ($interval, $cb) = @_; 564 my ($interval, $cb) = @_;
410 EV::periodic $start, $interval, 0, $cb 568 EV::periodic $start, $interval, 0, $cb
411} 569}
412 570
413=item cf::get_slot $time[, $priority[, $name]] 571=item cf::get_slot $time[, $priority[, $name]]
414 572
415Allocate $time seconds of blocking CPU time at priority C<$priority>: 573Allocate $time seconds of blocking CPU time at priority C<$priority>
416This call blocks and returns only when you have at least C<$time> seconds 574(default: 0): This call blocks and returns only when you have at least
417of cpu time till the next tick. The slot is only valid till the next cede. 575C<$time> seconds of cpu time till the next tick. The slot is only valid
576till the next cede.
577
578Background jobs should use a priority less than zero, interactive jobs
579should use 100 or more.
418 580
419The optional C<$name> can be used to identify the job to run. It might be 581The optional C<$name> can be used to identify the job to run. It might be
420used for statistical purposes and should identify the same time-class. 582used for statistical purposes and should identify the same time-class.
421 583
422Useful for short background jobs. 584Useful for short background jobs.
451 } 613 }
452 } 614 }
453 615
454 if (@SLOT_QUEUE) { 616 if (@SLOT_QUEUE) {
455 # we do not use wait_for_tick() as it returns immediately when tick is inactive 617 # we do not use wait_for_tick() as it returns immediately when tick is inactive
456 push @cf::WAIT_FOR_TICK, $signal; 618 $WAIT_FOR_TICK->wait;
457 $signal->wait;
458 } else { 619 } else {
459 $busy = 0; 620 $busy = 0;
460 Coro::schedule; 621 Coro::schedule;
461 } 622 }
462 } 623 }
502=cut 663=cut
503 664
504sub sync_job(&) { 665sub sync_job(&) {
505 my ($job) = @_; 666 my ($job) = @_;
506 667
507 if ($Coro::current == $Coro::main) { 668 if (in_main) {
508 my $time = EV::time; 669 my $time = AE::time;
509 670
510 # this is the main coro, too bad, we have to block 671 # this is the main coro, too bad, we have to block
511 # till the operation succeeds, freezing the server :/ 672 # till the operation succeeds, freezing the server :/
512 673
513 LOG llevError, Carp::longmess "sync job";#d# 674 #LOG llevError, Carp::longmess "sync job";#d#
514 675
515 my $freeze_guard = freeze_mainloop; 676 my $freeze_guard = freeze_mainloop;
516 677
517 my $busy = 1; 678 my $busy = 1;
518 my @res; 679 my @res;
519 680
520 (async { 681 (async {
521 $Coro::current->desc ("sync job coro"); 682 $Coro::current->desc ("sync job coro");
522 @res = eval { $job->() }; 683 @res = eval { $job->() };
523 warn $@ if $@; 684 error $@ if $@;
524 undef $busy; 685 undef $busy;
525 })->prio (Coro::PRIO_MAX); 686 })->prio (Coro::PRIO_MAX);
526 687
527 while ($busy) { 688 while ($busy) {
528 if (Coro::nready) { 689 if (Coro::nready) {
530 } else { 691 } else {
531 EV::loop EV::LOOP_ONESHOT; 692 EV::loop EV::LOOP_ONESHOT;
532 } 693 }
533 } 694 }
534 695
535 my $time = EV::time - $time; 696 my $time = AE::time - $time;
536 697
537 $TICK_START += $time; # do not account sync jobs to server load 698 $TICK_START += $time; # do not account sync jobs to server load
538 699
539 wantarray ? @res : $res[0] 700 wantarray ? @res : $res[0]
540 } else { 701 } else {
562 $EXT_CORO{$coro+0} = $coro; 723 $EXT_CORO{$coro+0} = $coro;
563 724
564 $coro 725 $coro
565} 726}
566 727
567=item fork_call { }, $args 728=item fork_call { }, @args
568 729
569Executes the given code block with the given arguments in a seperate 730Executes the given code block with the given arguments in a seperate
570process, returning the results. Everything must be serialisable with 731process, returning the results. Everything must be serialisable with
571Coro::Storable. May, of course, block. Note that the executed sub may 732Coro::Storable. May, of course, block. Note that the executed sub may
572never block itself or use any form of event handling. 733never block itself or use any form of event handling.
573 734
574=cut 735=cut
575 736
737sub post_fork {
738 reset_signals;
739}
740
576sub fork_call(&@) { 741sub fork_call(&@) {
577 my ($cb, @args) = @_; 742 my ($cb, @args) = @_;
578 743
579 # we seemingly have to make a local copy of the whole thing,
580 # otherwise perl prematurely frees the stuff :/
581 # TODO: investigate and fix (likely this will be rather laborious)
582
583 my @res = Coro::Util::fork_eval { 744 my @res = Coro::Util::fork_eval {
584 reset_signals; 745 cf::post_fork;
585 &$cb 746 &$cb
586 }, @args; 747 } @args;
587 748
588 wantarray ? @res : $res[-1] 749 wantarray ? @res : $res[-1]
750}
751
752sub objinfo {
753 (
754 "counter value" => cf::object::object_count,
755 "objects created" => cf::object::create_count,
756 "objects destroyed" => cf::object::destroy_count,
757 "freelist size" => cf::object::free_count,
758 "allocated objects" => cf::object::objects_size,
759 "active objects" => cf::object::actives_size,
760 )
589} 761}
590 762
591=item $coin = coin_from_name $name 763=item $coin = coin_from_name $name
592 764
593=cut 765=cut
630within each server. 802within each server.
631 803
632=cut 804=cut
633 805
634sub db_table($) { 806sub db_table($) {
807 cf::error "db_get called from main context"
808 if $Coro::current == $Coro::main;
809
635 my ($name) = @_; 810 my ($name) = @_;
636 my $db = BDB::db_create $DB_ENV; 811 my $db = BDB::db_create $DB_ENV;
637 812
638 eval { 813 eval {
639 $db->set_flags (BDB::CHKSUM); 814 $db->set_flags (BDB::CHKSUM);
649} 824}
650 825
651our $DB; 826our $DB;
652 827
653sub db_init { 828sub db_init {
654 cf::sync_job {
655 $DB ||= db_table "db"; 829 $DB ||= db_table "db";
656 };
657} 830}
658 831
659sub db_get($$) { 832sub db_get($$) {
660 my $key = "$_[0]/$_[1]"; 833 my $key = "$_[0]/$_[1]";
661 834
662 cf::sync_job { 835 cf::error "db_get called from main context"
836 if $Coro::current == $Coro::main;
837
663 BDB::db_get $DB, undef, $key, my $data; 838 BDB::db_get $DB, undef, $key, my $data;
664 839
665 $! ? () 840 $! ? ()
666 : $data 841 : $data
667 }
668} 842}
669 843
670sub db_put($$$) { 844sub db_put($$$) {
671 BDB::dbreq_pri 4; 845 BDB::dbreq_pri 4;
672 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 846 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
700 874
701 my @data; 875 my @data;
702 my $md5; 876 my $md5;
703 877
704 for (0 .. $#$src) { 878 for (0 .. $#$src) {
705 0 <= aio_load $src->[$_], $data[$_] 879 $data[$_] = load_file $src->[$_];
706 or Carp::croak "$src->[$_]: $!";
707 } 880 }
708 881
709 # if processing is expensive, check 882 # if processing is expensive, check
710 # checksum first 883 # checksum first
711 if (1) { 884 if (1) {
724 897
725 return db_get cache => "$id/data"; 898 return db_get cache => "$id/data";
726 } 899 }
727 } 900 }
728 901
729 my $t1 = Time::HiRes::time; 902 my $t1 = EV::time;
730 my $data = $process->(\@data); 903 my $data = $process->(\@data);
731 my $t2 = Time::HiRes::time; 904 my $t2 = EV::time;
732 905
733 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 906 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
734 907
735 db_put cache => "$id/data", $data; 908 db_put cache => "$id/data", $data;
736 db_put cache => "$id/md5" , $md5; 909 db_put cache => "$id/md5" , $md5;
737 db_put cache => "$id/meta", $meta; 910 db_put cache => "$id/meta", $meta;
738 911
748 921
749=cut 922=cut
750 923
751sub datalog($@) { 924sub datalog($@) {
752 my ($type, %kv) = @_; 925 my ($type, %kv) = @_;
753 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 926 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
754} 927}
755 928
756=back 929=back
757 930
758=cut 931=cut
953 1126
954 } elsif (exists $cb_id{$type}) { 1127 } elsif (exists $cb_id{$type}) {
955 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1128 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
956 1129
957 } elsif (ref $type) { 1130 } elsif (ref $type) {
958 warn "attaching objects not supported, ignoring.\n"; 1131 error "attaching objects not supported, ignoring.\n";
959 1132
960 } else { 1133 } else {
961 shift @arg; 1134 shift @arg;
962 warn "attach argument '$type' not supported, ignoring.\n"; 1135 error "attach argument '$type' not supported, ignoring.\n";
963 } 1136 }
964 } 1137 }
965} 1138}
966 1139
967sub _object_attach { 1140sub _object_attach {
977 _attach $registry, $klass, @attach; 1150 _attach $registry, $klass, @attach;
978 } 1151 }
979 1152
980 $obj->{$name} = \%arg; 1153 $obj->{$name} = \%arg;
981 } else { 1154 } else {
982 warn "object uses attachment '$name' which is not available, postponing.\n"; 1155 info "object uses attachment '$name' which is not available, postponing.\n";
983 } 1156 }
984 1157
985 $obj->{_attachment}{$name} = undef; 1158 $obj->{_attachment}{$name} = undef;
986} 1159}
987 1160
1046 1219
1047 for (@$callbacks) { 1220 for (@$callbacks) {
1048 eval { &{$_->[1]} }; 1221 eval { &{$_->[1]} };
1049 1222
1050 if ($@) { 1223 if ($@) {
1051 warn "$@";
1052 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1224 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1053 override; 1225 override;
1054 } 1226 }
1055 1227
1056 return 1 if $override; 1228 return 1 if $override;
1057 } 1229 }
1136 for (@$attach) { 1308 for (@$attach) {
1137 my ($klass, @attach) = @$_; 1309 my ($klass, @attach) = @$_;
1138 _attach $registry, $klass, @attach; 1310 _attach $registry, $klass, @attach;
1139 } 1311 }
1140 } else { 1312 } else {
1141 warn "object uses attachment '$name' that is not available, postponing.\n"; 1313 info "object uses attachment '$name' that is not available, postponing.\n";
1142 } 1314 }
1143 } 1315 }
1144} 1316}
1145 1317
1146cf::attachable->attach ( 1318cf::attachable->attach (
1173 my ($filename, $rdata, $objs) = @_; 1345 my ($filename, $rdata, $objs) = @_;
1174 1346
1175 sync_job { 1347 sync_job {
1176 if (length $$rdata) { 1348 if (length $$rdata) {
1177 utf8::decode (my $decname = $filename); 1349 utf8::decode (my $decname = $filename);
1178 warn sprintf "saving %s (%d,%d)\n", 1350 trace sprintf "saving %s (%d,%d)\n",
1179 $decname, length $$rdata, scalar @$objs; 1351 $decname, length $$rdata, scalar @$objs
1352 if $VERBOSE_IO;
1180 1353
1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1354 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1182 aio_chmod $fh, SAVE_MODE; 1355 aio_chmod $fh, SAVE_MODE;
1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1356 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1184 if ($cf::USE_FSYNC) { 1357 if ($cf::USE_FSYNC) {
1206 aio_rename "$filename~", $filename; 1379 aio_rename "$filename~", $filename;
1207 1380
1208 $filename =~ s%/[^/]+$%%; 1381 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC; 1382 aio_pathsync $filename if $cf::USE_FSYNC;
1210 } else { 1383 } else {
1211 warn "unable to save objects: $filename~: $!\n"; 1384 error "unable to save objects: $filename~: $!\n";
1212 } 1385 }
1213 } else { 1386 } else {
1214 aio_unlink $filename; 1387 aio_unlink $filename;
1215 aio_unlink "$filename.pst"; 1388 aio_unlink "$filename.pst";
1216 } 1389 }
1240 my $st = eval { Coro::Storable::thaw $av }; 1413 my $st = eval { Coro::Storable::thaw $av };
1241 $av = $st->{objs}; 1414 $av = $st->{objs};
1242 } 1415 }
1243 1416
1244 utf8::decode (my $decname = $filename); 1417 utf8::decode (my $decname = $filename);
1245 warn sprintf "loading %s (%d,%d)\n", 1418 trace sprintf "loading %s (%d,%d)\n",
1246 $decname, length $data, scalar @{$av || []}; 1419 $decname, length $data, scalar @{$av || []}
1420 if $VERBOSE_IO;
1247 1421
1248 ($data, $av) 1422 ($data, $av)
1249} 1423}
1250 1424
1251=head2 COMMAND CALLBACKS 1425=head2 COMMAND CALLBACKS
1255=cut 1429=cut
1256 1430
1257############################################################################# 1431#############################################################################
1258# command handling &c 1432# command handling &c
1259 1433
1260=item cf::register_command $name => \&callback($ob,$args); 1434=item cf::register_command $name => \&callback($ob,$args)
1261 1435
1262Register a callback for execution when the client sends the user command 1436Register a callback for execution when the client sends the user command
1263$name. 1437$name.
1264 1438
1265=cut 1439=cut
1271 #warn "registering command '$name/$time' to '$caller'"; 1445 #warn "registering command '$name/$time' to '$caller'";
1272 1446
1273 push @{ $COMMAND{$name} }, [$caller, $cb]; 1447 push @{ $COMMAND{$name} }, [$caller, $cb];
1274} 1448}
1275 1449
1276=item cf::register_extcmd $name => \&callback($pl,$packet); 1450=item cf::register_extcmd $name => \&callback($pl,@args)
1277 1451
1278Register a callback for execution when the client sends an (synchronous) 1452Register a callback for execution when the client sends an (synchronous)
1279extcmd packet. Ext commands will be processed in the order they are 1453extcmd packet. Ext commands will be processed in the order they are
1280received by the server, like other user commands. The first argument is 1454received by the server, like other user commands. The first argument is
1281the logged-in player. Ext commands can only be processed after a player 1455the logged-in player. Ext commands can only be processed after a player
1282has logged in successfully. 1456has logged in successfully.
1283 1457
1284If the callback returns something, it is sent back as if reply was being 1458The values will be sent back to the client.
1285called.
1286 1459
1460=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1461
1462Same as C<cf::register_extcmd>, but instead of returning values, the
1463callback needs to clal the C<$reply> function.
1464
1287=item cf::register_exticmd $name => \&callback($ns,$packet); 1465=item cf::register_exticmd $name => \&callback($ns,@args)
1288 1466
1289Register a callback for execution when the client sends an (asynchronous) 1467Register a callback for execution when the client sends an (asynchronous)
1290exticmd packet. Exti commands are processed by the server as soon as they 1468exticmd packet. Exti commands are processed by the server as soon as they
1291are received, i.e. out of order w.r.t. other commands. The first argument 1469are received, i.e. out of order w.r.t. other commands. The first argument
1292is a client socket. Exti commands can be received anytime, even before 1470is a client socket. Exti commands can be received anytime, even before
1293log-in. 1471log-in.
1294 1472
1295If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1296called.
1297 1474
1298=cut 1475=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1299 1476
1477Same as C<cf::register_extcmd>, but instead of returning values, the
1478callback needs to clal the C<$reply> function.
1479
1480=cut
1481
1300sub register_extcmd { 1482sub register_extcmd($$) {
1301 my ($name, $cb) = @_; 1483 my ($name, $cb) = @_;
1302 1484
1303 $EXTCMD{$name} = $cb; 1485 $EXTCMD{$name} = $cb;
1304} 1486}
1305 1487
1306sub register_exticmd { 1488sub register_async_extcmd($$) {
1307 my ($name, $cb) = @_; 1489 my ($name, $cb) = @_;
1308 1490
1491 $EXTACMD{$name} = $cb;
1492}
1493
1494sub register_exticmd($$) {
1495 my ($name, $cb) = @_;
1496
1309 $EXTICMD{$name} = $cb; 1497 $EXTICMD{$name} = $cb;
1310} 1498}
1311 1499
1500sub register_async_exticmd($$) {
1501 my ($name, $cb) = @_;
1502
1503 $EXTIACMD{$name} = $cb;
1504}
1505
1312use File::Glob (); 1506use File::Glob ();
1313 1507
1314cf::player->attach ( 1508cf::player->attach (
1315 on_command => sub { 1509 on_unknown_command => sub {
1316 my ($pl, $name, $params) = @_; 1510 my ($pl, $name, $params) = @_;
1317 1511
1318 my $cb = $COMMAND{$name} 1512 my $cb = $COMMAND{$name}
1319 or return; 1513 or return;
1320 1514
1328 my ($pl, $buf) = @_; 1522 my ($pl, $buf) = @_;
1329 1523
1330 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1524 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1331 1525
1332 if (ref $msg) { 1526 if (ref $msg) {
1333 my ($type, $reply, @payload) = 1527 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1334 "ARRAY" eq ref $msg
1335 ? @$msg
1336 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1337 1528
1338 my @reply;
1339
1340 if (my $cb = $EXTCMD{$type}) { 1529 if (my $cb = $EXTACMD{$type}) {
1530 $cb->(
1531 $pl,
1532 sub {
1533 $pl->ext_msg ("reply-$reply", @_)
1534 if $reply;
1535 },
1536 @payload
1537 );
1538 } else {
1539 my @reply;
1540
1541 if (my $cb = $EXTCMD{$type}) {
1341 @reply = $cb->($pl, @payload); 1542 @reply = $cb->($pl, @payload);
1543 }
1544
1545 $pl->ext_msg ("reply-$reply", @reply)
1546 if $reply;
1342 } 1547 }
1343 1548
1344 $pl->ext_reply ($reply, @reply)
1345 if $reply;
1346
1347 } else { 1549 } else {
1348 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1550 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1349 } 1551 }
1350 1552
1351 cf::override; 1553 cf::override;
1352 }, 1554 },
1353); 1555);
1363 }; 1565 };
1364 1566
1365 $grp 1567 $grp
1366} 1568}
1367 1569
1570sub _ext_cfg_reg($$$$) {
1571 my ($rvar, $varname, $cfgname, $default) = @_;
1572
1573 $cfgname = lc $varname
1574 unless length $cfgname;
1575
1576 $EXT_CFG{$cfgname} = [$rvar, $default];
1577
1578 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1579}
1580
1368sub load_extensions { 1581sub load_extensions {
1582 info "loading extensions...";
1583
1584 %EXT_CFG = ();
1585
1369 cf::sync_job { 1586 cf::sync_job {
1370 my %todo; 1587 my %todo;
1371 1588
1372 for my $path (<$LIBDIR/*.ext>) { 1589 for my $path (<$LIBDIR/*.ext>) {
1373 next unless -r $path; 1590 next unless -r $path;
1391 1608
1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1609 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1610 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1394 1611
1395 $ext{source} = 1612 $ext{source} =
1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1613 "package $pkg; use common::sense;\n"
1397 . "#line 1 \"$path\"\n{\n" 1614 . "#line 1 \"$path\"\n{\n"
1398 . $source 1615 . $source
1399 . "\n};\n1"; 1616 . "\n};\n1";
1400 1617
1401 $todo{$base} = \%ext; 1618 $todo{$base} = \%ext;
1402 } 1619 }
1403 1620
1621 my $pass = 0;
1404 my %done; 1622 my %done;
1405 while (%todo) { 1623 while (%todo) {
1406 my $progress; 1624 my $progress;
1407 1625
1626 ++$pass;
1627
1628 ext:
1408 while (my ($k, $v) = each %todo) { 1629 while (my ($k, $v) = each %todo) {
1409 for (split /,\s*/, $v->{meta}{depends}) { 1630 for (split /,\s*/, $v->{meta}{depends}) {
1410 goto skip 1631 next ext
1411 unless exists $done{$_}; 1632 unless exists $done{$_};
1412 } 1633 }
1413 1634
1414 warn "... loading '$k' into '$v->{pkg}'\n"; 1635 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1415 1636
1416 unless (eval $v->{source}) { 1637 my $source = $v->{source};
1638
1639 # support "CONF varname :confname = default" pseudo-statements
1640 $source =~ s{
1641 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1642 }{
1643 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1644 }gmxe;
1645
1646 my $active = eval $source;
1647
1648 if (length $@) {
1417 my $msg = $@ ? "$v->{path}: $@\n" 1649 error "$v->{path}: $@\n";
1418 : "$v->{base}: extension inactive.\n";
1419 1650
1420 if (exists $v->{meta}{mandatory}) {
1421 warn $msg;
1422 cf::cleanup "mandatory extension failed to load, exiting."; 1651 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1423 } 1652 if exists $v->{meta}{mandatory};
1424 1653
1425 warn $msg; 1654 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1655 delete $todo{$k};
1656 } else {
1657 $done{$k} = delete $todo{$k};
1658 push @EXTS, $v->{pkg};
1659 $progress = 1;
1660
1661 info "$v->{base}: extension inactive.\n"
1662 unless $active;
1426 } 1663 }
1427
1428 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg};
1430 $progress = 1;
1431 } 1664 }
1432 1665
1433 skip: 1666 unless ($progress) {
1434 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1667 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1435 unless $progress; 1668
1669 while (my ($k, $v) = each %todo) {
1670 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1671 if exists $v->{meta}{mandatory};
1672 }
1673
1674 last;
1675 }
1436 } 1676 }
1437 }; 1677 };
1438} 1678}
1439 1679
1440############################################################################# 1680#############################################################################
1524 $cf::PLAYER{$login} = $pl 1764 $cf::PLAYER{$login} = $pl
1525 } 1765 }
1526 } 1766 }
1527} 1767}
1528 1768
1769cf::player->attach (
1770 on_load => sub {
1771 my ($pl, $path) = @_;
1772
1773 # restore slots saved in save, below
1774 my $slots = delete $pl->{_slots};
1775
1776 $pl->ob->current_weapon ($slots->[0]);
1777 $pl->combat_ob ($slots->[1]);
1778 $pl->ranged_ob ($slots->[2]);
1779 },
1780);
1781
1529sub save($) { 1782sub save($) {
1530 my ($pl) = @_; 1783 my ($pl) = @_;
1531 1784
1532 return if $pl->{deny_save}; 1785 return if $pl->{deny_save};
1533 1786
1538 1791
1539 aio_mkdir playerdir $pl, 0770; 1792 aio_mkdir playerdir $pl, 0770;
1540 $pl->{last_save} = $cf::RUNTIME; 1793 $pl->{last_save} = $cf::RUNTIME;
1541 1794
1542 cf::get_slot 0.01; 1795 cf::get_slot 0.01;
1796
1797 # save slots, to be restored later
1798 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1543 1799
1544 $pl->save_pl ($path); 1800 $pl->save_pl ($path);
1545 cf::cede_to_tick; 1801 cf::cede_to_tick;
1546} 1802}
1547 1803
1581 my $name = $pl->ob->name; 1837 my $name = $pl->ob->name;
1582 1838
1583 $pl->{deny_save} = 1; 1839 $pl->{deny_save} = 1;
1584 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1840 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1585 1841
1586 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1842 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1587 $pl->deactivate; 1843 $pl->deactivate;
1844
1588 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1845 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1589 $pl->ob->check_score;
1590 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1846 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1847 ext::highscore::check ($pl->ob);
1848
1591 $pl->ns->destroy if $pl->ns; 1849 $pl->ns->destroy if $pl->ns;
1592 1850
1593 my $path = playerdir $pl; 1851 my $path = playerdir $pl;
1594 my $temp = "$path~$cf::RUNTIME~deleting~"; 1852 my $temp = "$path~$cf::RUNTIME~deleting~";
1595 aio_rename $path, $temp; 1853 aio_rename $path, $temp;
1649 \@logins 1907 \@logins
1650} 1908}
1651 1909
1652=item $player->maps 1910=item $player->maps
1653 1911
1912=item cf::player::maps $login
1913
1654Returns an arrayref of map paths that are private for this 1914Returns an arrayref of map paths that are private for this
1655player. May block. 1915player. May block.
1656 1916
1657=cut 1917=cut
1658 1918
1679 1939
1680=item $protocol_xml = $player->expand_cfpod ($cfpod) 1940=item $protocol_xml = $player->expand_cfpod ($cfpod)
1681 1941
1682Expand deliantra pod fragments into protocol xml. 1942Expand deliantra pod fragments into protocol xml.
1683 1943
1684=item $player->ext_reply ($msgid, @msg)
1685
1686Sends an ext reply to the player.
1687
1688=cut
1689
1690sub ext_reply($$@) {
1691 my ($self, $id, @msg) = @_;
1692
1693 $self->ns->ext_reply ($id, @msg)
1694}
1695
1696=item $player->ext_msg ($type, @msg) 1944=item $player->ext_msg ($type, @msg)
1697 1945
1698Sends an ext event to the client. 1946Sends an ext event to the client.
1699 1947
1700=cut 1948=cut
1719 1967
1720=cut 1968=cut
1721 1969
1722sub find_by_path($) { 1970sub find_by_path($) {
1723 my ($path) = @_; 1971 my ($path) = @_;
1972
1973 $path =~ s/^~[^\/]*//; # skip ~login
1724 1974
1725 my ($match, $specificity); 1975 my ($match, $specificity);
1726 1976
1727 for my $region (list) { 1977 for my $region (list) {
1728 if ($region->{match} && $path =~ $region->{match}) { 1978 if ($region->{match} && $path =~ $region->{match}) {
1757sub generate_random_map { 2007sub generate_random_map {
1758 my ($self, $rmp) = @_; 2008 my ($self, $rmp) = @_;
1759 2009
1760 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 2010 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1761 2011
1762 # mit "rum" bekleckern, nicht
1763 $self->_create_random_map ( 2012 $self->_create_random_map ($rmp);
1764 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1765 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1766 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1767 $rmp->{exit_on_final_map},
1768 $rmp->{xsize}, $rmp->{ysize},
1769 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1770 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1771 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1772 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1773 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1774 (cf::region::find $rmp->{region}), $rmp->{custom}
1775 )
1776} 2013}
1777 2014
1778=item cf::map->register ($regex, $prio) 2015=item cf::map->register ($regex, $prio)
1779 2016
1780Register a handler for the map path matching the given regex at the 2017Register a handler for the map path matching the given regex at the
1785 2022
1786sub register { 2023sub register {
1787 my (undef, $regex, $prio) = @_; 2024 my (undef, $regex, $prio) = @_;
1788 my $pkg = caller; 2025 my $pkg = caller;
1789 2026
1790 no strict;
1791 push @{"$pkg\::ISA"}, __PACKAGE__; 2027 push @{"$pkg\::ISA"}, __PACKAGE__;
1792 2028
1793 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2029 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1794} 2030}
1795 2031
1796# also paths starting with '/' 2032# also paths starting with '/'
1797$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2033$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1798 2034
1799sub thawer_merge { 2035sub thawer_merge {
1800 my ($self, $merge) = @_; 2036 my ($self, $merge) = @_;
1801 2037
1802 # we have to keep some variables in memory intact 2038 # we have to keep some variables in memory intact
1807} 2043}
1808 2044
1809sub normalise { 2045sub normalise {
1810 my ($path, $base) = @_; 2046 my ($path, $base) = @_;
1811 2047
1812 $path = "$path"; # make sure its a string 2048 $path = "$path"; # make sure it's a string
1813 2049
1814 $path =~ s/\.map$//; 2050 $path =~ s/\.map$//;
1815 2051
1816 # map plan: 2052 # map plan:
1817 # 2053 #
1832 $base =~ s{[^/]+/?$}{}; 2068 $base =~ s{[^/]+/?$}{};
1833 $path = "$base/$path"; 2069 $path = "$base/$path";
1834 } 2070 }
1835 2071
1836 for ($path) { 2072 for ($path) {
1837 redo if s{//}{/};
1838 redo if s{/\.?/}{/}; 2073 redo if s{/\.?/}{/};
1839 redo if s{/[^/]+/\.\./}{/}; 2074 redo if s{/[^/]+/\.\./}{/};
1840 } 2075 }
1841 2076
1842 $path 2077 $path
1856 $self->init; # pass $1 etc. 2091 $self->init; # pass $1 etc.
1857 return $self; 2092 return $self;
1858 } 2093 }
1859 } 2094 }
1860 2095
1861 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2096 Carp::cluck "unable to resolve path '$path' (base '$base')";
1862 () 2097 ()
1863} 2098}
1864 2099
2100# may re-bless or do other evil things
1865sub init { 2101sub init {
1866 my ($self) = @_; 2102 my ($self) = @_;
1867 2103
1868 $self 2104 $self
1869} 2105}
1934 $self->{load_path} = $path; 2170 $self->{load_path} = $path;
1935 2171
1936 1 2172 1
1937} 2173}
1938 2174
2175# used to laod the header of an original map
1939sub load_header_orig { 2176sub load_header_orig {
1940 my ($self) = @_; 2177 my ($self) = @_;
1941 2178
1942 $self->load_header_from ($self->load_path) 2179 $self->load_header_from ($self->load_path)
1943} 2180}
1944 2181
2182# used to laod the header of an instantiated map
1945sub load_header_temp { 2183sub load_header_temp {
1946 my ($self) = @_; 2184 my ($self) = @_;
1947 2185
1948 $self->load_header_from ($self->save_path) 2186 $self->load_header_from ($self->save_path)
1949} 2187}
1950 2188
2189# called after loading the header from an instantiated map
1951sub prepare_temp { 2190sub prepare_temp {
1952 my ($self) = @_; 2191 my ($self) = @_;
1953 2192
1954 $self->last_access ((delete $self->{last_access}) 2193 $self->last_access ((delete $self->{last_access})
1955 || $cf::RUNTIME); #d# 2194 || $cf::RUNTIME); #d#
1956 # safety 2195 # safety
1957 $self->{instantiate_time} = $cf::RUNTIME 2196 $self->{instantiate_time} = $cf::RUNTIME
1958 if $self->{instantiate_time} > $cf::RUNTIME; 2197 if $self->{instantiate_time} > $cf::RUNTIME;
1959} 2198}
1960 2199
2200# called after loading the header from an original map
1961sub prepare_orig { 2201sub prepare_orig {
1962 my ($self) = @_; 2202 my ($self) = @_;
1963 2203
1964 $self->{load_original} = 1; 2204 $self->{load_original} = 1;
1965 $self->{instantiate_time} = $cf::RUNTIME; 2205 $self->{instantiate_time} = $cf::RUNTIME;
1989 2229
1990sub find; 2230sub find;
1991sub find { 2231sub find {
1992 my ($path, $origin) = @_; 2232 my ($path, $origin) = @_;
1993 2233
2234 cf::cede_to_tick;
2235
1994 $path = normalise $path, $origin && $origin->path; 2236 $path = normalise $path, $origin;
1995 2237
1996 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2238 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1997 my $guard2 = cf::lock_acquire "map_find:$path"; 2239 my $guard2 = cf::lock_acquire "map_find:$path";
1998 2240
1999 $cf::MAP{$path} || do { 2241 $cf::MAP{$path} || do {
2030 2272
2031 { 2273 {
2032 my $guard = cf::lock_acquire "map_data:$path"; 2274 my $guard = cf::lock_acquire "map_data:$path";
2033 2275
2034 return unless $self->valid; 2276 return unless $self->valid;
2035 return unless $self->in_memory == cf::MAP_SWAPPED; 2277 return unless $self->state == cf::MAP_SWAPPED;
2036
2037 $self->in_memory (cf::MAP_LOADING);
2038 2278
2039 $self->alloc; 2279 $self->alloc;
2040 2280
2041 $self->pre_load; 2281 $self->pre_load;
2042 cf::cede_to_tick; 2282 cf::cede_to_tick;
2043 2283
2284 if (exists $self->{load_path}) {
2044 my $f = new_from_file cf::object::thawer $self->{load_path}; 2285 my $f = new_from_file cf::object::thawer $self->{load_path};
2045 $f->skip_block; 2286 $f->skip_block;
2046 $self->_load_objects ($f) 2287 $self->_load_objects ($f)
2047 or return; 2288 or return;
2048 2289
2049 $self->post_load_original 2290 $self->post_load_original
2050 if delete $self->{load_original}; 2291 if delete $self->{load_original};
2051 2292
2052 if (my $uniq = $self->uniq_path) { 2293 if (my $uniq = $self->uniq_path) {
2053 utf8::encode $uniq; 2294 utf8::encode $uniq;
2054 unless (aio_stat $uniq) { 2295 unless (aio_stat $uniq) {
2055 if (my $f = new_from_file cf::object::thawer $uniq) { 2296 if (my $f = new_from_file cf::object::thawer $uniq) {
2056 $self->clear_unique_items; 2297 $self->clear_unique_items;
2057 $self->_load_objects ($f); 2298 $self->_load_objects ($f);
2058 $f->resolve_delayed_derefs; 2299 $f->resolve_delayed_derefs;
2300 }
2059 } 2301 }
2060 } 2302 }
2061 }
2062 2303
2063 $f->resolve_delayed_derefs; 2304 $f->resolve_delayed_derefs;
2305 } else {
2306 $self->post_load_original
2307 if delete $self->{load_original};
2308 }
2309
2310 $self->state (cf::MAP_INACTIVE);
2064 2311
2065 cf::cede_to_tick; 2312 cf::cede_to_tick;
2066 # now do the right thing for maps 2313 # now do the right thing for maps
2067 $self->link_multipart_objects; 2314 $self->link_multipart_objects;
2068 $self->difficulty ($self->estimate_difficulty) 2315 $self->difficulty ($self->estimate_difficulty)
2072 unless ($self->{deny_activate}) { 2319 unless ($self->{deny_activate}) {
2073 $self->decay_objects; 2320 $self->decay_objects;
2074 $self->fix_auto_apply; 2321 $self->fix_auto_apply;
2075 $self->update_buttons; 2322 $self->update_buttons;
2076 cf::cede_to_tick; 2323 cf::cede_to_tick;
2077 $self->activate; 2324 #$self->activate; # no longer activate maps automatically
2078 } 2325 }
2079 2326
2080 $self->{last_save} = $cf::RUNTIME; 2327 $self->{last_save} = $cf::RUNTIME;
2081 $self->last_access ($cf::RUNTIME); 2328 $self->last_access ($cf::RUNTIME);
2082
2083 $self->in_memory (cf::MAP_ACTIVE);
2084 } 2329 }
2085 2330
2086 $self->post_load; 2331 $self->post_load;
2087}
2088 2332
2333 1
2334}
2335
2336# customize the map for a given player, i.e.
2337# return the _real_ map. used by e.g. per-player
2338# maps to change the path to ~playername/mappath
2089sub customise_for { 2339sub customise_for {
2090 my ($self, $ob) = @_; 2340 my ($self, $ob) = @_;
2091 2341
2092 return find "~" . $ob->name . "/" . $self->{path} 2342 return find "~" . $ob->name . "/" . $self->{path}
2093 if $self->per_player; 2343 if $self->per_player;
2096# if $self->per_party; 2346# if $self->per_party;
2097 2347
2098 $self 2348 $self
2099} 2349}
2100 2350
2101# find and load all maps in the 3x3 area around a map
2102sub load_neighbours {
2103 my ($map) = @_;
2104
2105 my @neigh; # diagonal neighbours
2106
2107 for (0 .. 3) {
2108 my $neigh = $map->tile_path ($_)
2109 or next;
2110 $neigh = find $neigh, $map
2111 or next;
2112 $neigh->load;
2113
2114 push @neigh,
2115 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2116 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2117 }
2118
2119 for (grep defined $_->[0], @neigh) {
2120 my ($path, $origin) = @$_;
2121 my $neigh = find $path, $origin
2122 or next;
2123 $neigh->load;
2124 }
2125}
2126
2127sub find_sync { 2351sub find_sync {
2128 my ($path, $origin) = @_; 2352 my ($path, $origin) = @_;
2129 2353
2130 cf::sync_job { find $path, $origin } 2354 # it's a bug to call this from the main context
2355 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2356 if $Coro::current == $Coro::main;
2357
2358 find $path, $origin
2131} 2359}
2132 2360
2133sub do_load_sync { 2361sub do_load_sync {
2134 my ($map) = @_; 2362 my ($map) = @_;
2135 2363
2364 # it's a bug to call this from the main context
2136 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2365 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2137 if $Coro::current == $Coro::main; 2366 if $Coro::current == $Coro::main;
2138 2367
2139 cf::sync_job { $map->load }; 2368 $map->load;
2140} 2369}
2141 2370
2142our %MAP_PREFETCH; 2371our %MAP_PREFETCH;
2143our $MAP_PREFETCHER = undef; 2372our $MAP_PREFETCHER = undef;
2144 2373
2145sub find_async { 2374sub find_async {
2146 my ($path, $origin, $load) = @_; 2375 my ($path, $origin, $load) = @_;
2147 2376
2148 $path = normalise $path, $origin && $origin->{path}; 2377 $path = normalise $path, $origin;
2149 2378
2150 if (my $map = $cf::MAP{$path}) { 2379 if (my $map = $cf::MAP{$path}) {
2151 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2380 return $map if !$load || $map->linkable;
2152 } 2381 }
2153 2382
2154 $MAP_PREFETCH{$path} |= $load; 2383 $MAP_PREFETCH{$path} |= $load;
2155 2384
2156 $MAP_PREFETCHER ||= cf::async { 2385 $MAP_PREFETCHER ||= cf::async {
2170 $MAP_PREFETCHER->prio (6); 2399 $MAP_PREFETCHER->prio (6);
2171 2400
2172 () 2401 ()
2173} 2402}
2174 2403
2404# common code, used by both ->save and ->swapout
2175sub save { 2405sub _save {
2176 my ($self) = @_; 2406 my ($self) = @_;
2177
2178 my $lock = cf::lock_acquire "map_data:$self->{path}";
2179 2407
2180 $self->{last_save} = $cf::RUNTIME; 2408 $self->{last_save} = $cf::RUNTIME;
2181 2409
2182 return unless $self->dirty; 2410 return unless $self->dirty;
2183 2411
2203 } else { 2431 } else {
2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2432 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2205 } 2433 }
2206} 2434}
2207 2435
2436sub save {
2437 my ($self) = @_;
2438
2439 my $lock = cf::lock_acquire "map_data:$self->{path}";
2440
2441 $self->_save;
2442}
2443
2208sub swap_out { 2444sub swap_out {
2209 my ($self) = @_; 2445 my ($self) = @_;
2210 2446
2211 # save first because save cedes
2212 $self->save;
2213
2214 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2447 my $lock = cf::lock_acquire "map_data:$self->{path}";
2215 2448
2449 return if !$self->linkable;
2450 return if $self->{deny_save};
2216 return if $self->players; 2451 return if $self->players;
2217 return if $self->in_memory != cf::MAP_ACTIVE; 2452
2453 # first deactivate the map and "unlink" it from the core
2454 $self->deactivate;
2455 $_->clear_links_to ($self) for values %cf::MAP;
2456 $self->state (cf::MAP_SWAPPED);
2457
2458 # then atomically save
2459 $self->_save;
2460
2461 # then free the map
2462 $self->clear;
2463}
2464
2465sub reset_at {
2466 my ($self) = @_;
2467
2468 # TODO: safety, remove and allow resettable per-player maps
2218 return if $self->{deny_save}; 2469 return 1e99 if $self->{deny_reset};
2219 2470
2471 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2472 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2473
2474 $time + $to
2475}
2476
2477sub should_reset {
2478 my ($self) = @_;
2479
2480 $self->reset_at <= $cf::RUNTIME
2481}
2482
2483sub reset {
2484 my ($self) = @_;
2485
2486 my $lock = cf::lock_acquire "map_data:$self->{path}";
2487
2488 return if $self->players;
2489
2490 cf::trace "resetting map ", $self->path, "\n";
2491
2220 $self->in_memory (cf::MAP_SWAPPED); 2492 $self->state (cf::MAP_SWAPPED);
2493
2494 # need to save uniques path
2495 unless ($self->{deny_save}) {
2496 my $uniq = $self->uniq_path; utf8::encode $uniq;
2497
2498 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2499 if $uniq;
2500 }
2501
2502 delete $cf::MAP{$self->path};
2221 2503
2222 $self->deactivate; 2504 $self->deactivate;
2223 $_->clear_links_to ($self) for values %cf::MAP; 2505 $_->clear_links_to ($self) for values %cf::MAP;
2224 $self->clear; 2506 $self->clear;
2225}
2226
2227sub reset_at {
2228 my ($self) = @_;
2229
2230 # TODO: safety, remove and allow resettable per-player maps
2231 return 1e99 if $self->{deny_reset};
2232
2233 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2234 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2235
2236 $time + $to
2237}
2238
2239sub should_reset {
2240 my ($self) = @_;
2241
2242 $self->reset_at <= $cf::RUNTIME
2243}
2244
2245sub reset {
2246 my ($self) = @_;
2247
2248 my $lock = cf::lock_acquire "map_data:$self->{path}";
2249
2250 return if $self->players;
2251
2252 warn "resetting map ", $self->path, "\n";
2253
2254 $self->in_memory (cf::MAP_SWAPPED);
2255
2256 # need to save uniques path
2257 unless ($self->{deny_save}) {
2258 my $uniq = $self->uniq_path; utf8::encode $uniq;
2259
2260 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2261 if $uniq;
2262 }
2263
2264 delete $cf::MAP{$self->path};
2265
2266 $self->deactivate;
2267 $_->clear_links_to ($self) for values %cf::MAP;
2268 $self->clear;
2269 2507
2270 $self->unlink_save; 2508 $self->unlink_save;
2271 $self->destroy; 2509 $self->destroy;
2272} 2510}
2273 2511
2281 2519
2282 delete $cf::MAP{$self->path}; 2520 delete $cf::MAP{$self->path};
2283 2521
2284 $self->unlink_save; 2522 $self->unlink_save;
2285 2523
2286 bless $self, "cf::map"; 2524 bless $self, "cf::map::wrap";
2287 delete $self->{deny_reset}; 2525 delete $self->{deny_reset};
2288 $self->{deny_save} = 1; 2526 $self->{deny_save} = 1;
2289 $self->reset_timeout (1); 2527 $self->reset_timeout (1);
2290 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2528 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2291 2529
2412 2650
2413Creates and returns a persistent reference to an object that can be stored as a string. 2651Creates and returns a persistent reference to an object that can be stored as a string.
2414 2652
2415=item $ob = cf::object::deref ($refstring) 2653=item $ob = cf::object::deref ($refstring)
2416 2654
2417returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2655returns the objetc referenced by refstring. may return undef when it cannot find the object,
2418even if the object actually exists. May block. 2656even if the object actually exists. May block.
2419 2657
2420=cut 2658=cut
2421 2659
2422sub deref { 2660sub deref {
2521 2759
2522Freezes the player and moves him/her to a special map (C<{link}>). 2760Freezes the player and moves him/her to a special map (C<{link}>).
2523 2761
2524The player should be reasonably safe there for short amounts of time (e.g. 2762The player should be reasonably safe there for short amounts of time (e.g.
2525for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2763for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2526though, as the palyer cannot control the character while it is on the link 2764though, as the player cannot control the character while it is on the link
2527map. 2765map.
2528 2766
2529Will never block. 2767Will never block.
2530 2768
2531=item $player_object->leave_link ($map, $x, $y) 2769=item $player_object->leave_link ($map, $x, $y)
2552sub cf::object::player::enter_link { 2790sub cf::object::player::enter_link {
2553 my ($self) = @_; 2791 my ($self) = @_;
2554 2792
2555 $self->deactivate_recursive; 2793 $self->deactivate_recursive;
2556 2794
2795 ++$self->{_link_recursion};
2796
2557 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2797 return if UNIVERSAL::isa $self->map, "ext::map_link";
2558 2798
2559 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2799 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2560 if $self->map && $self->map->{path} ne "{link}"; 2800 if $self->map && $self->map->{path} ne "{link}";
2561 2801
2562 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2802 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2563} 2803}
2564 2804
2565sub cf::object::player::leave_link { 2805sub cf::object::player::leave_link {
2566 my ($self, $map, $x, $y) = @_; 2806 my ($self, $map, $x, $y) = @_;
2567 2807
2587 # use -1 or undef as default coordinates, not 0, 0 2827 # use -1 or undef as default coordinates, not 0, 0
2588 ($x, $y) = ($map->enter_x, $map->enter_y) 2828 ($x, $y) = ($map->enter_x, $map->enter_y)
2589 if $x <= 0 && $y <= 0; 2829 if $x <= 0 && $y <= 0;
2590 2830
2591 $map->load; 2831 $map->load;
2592 $map->load_neighbours;
2593 2832
2594 return unless $self->contr->active; 2833 return unless $self->contr->active;
2595 2834
2596 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2835 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2597 $self->enter_map ($map, $x, $y); 2836 if ($self->enter_map ($map, $x, $y)) {
2598 2837 # entering was successful
2838 delete $self->{_link_recursion};
2599 # only activate afterwards, to support waiting in hooks 2839 # only activate afterwards, to support waiting in hooks
2600 $self->activate_recursive; 2840 $self->activate_recursive;
2601} 2841 }
2602 2842
2843}
2844
2603=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2845=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2604 2846
2605Moves the player to the given map-path and coordinates by first freezing 2847Moves the player to the given map-path and coordinates by first freezing
2606her, loading and preparing them map, calling the provided $check callback 2848her, loading and preparing them map, calling the provided $check callback
2607that has to return the map if sucecssful, and then unfreezes the player on 2849that has to return the map if sucecssful, and then unfreezes the player on
2608the new (success) or old (failed) map position. In either case, $done will 2850the new (success) or old (failed) map position. In either case, $done will
2615 2857
2616our $GOTOGEN; 2858our $GOTOGEN;
2617 2859
2618sub cf::object::player::goto { 2860sub cf::object::player::goto {
2619 my ($self, $path, $x, $y, $check, $done) = @_; 2861 my ($self, $path, $x, $y, $check, $done) = @_;
2862
2863 if ($self->{_link_recursion} >= $MAX_LINKS) {
2864 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2865 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2866 ($path, $x, $y) = @$EMERGENCY_POSITION;
2867 }
2620 2868
2621 # do generation counting so two concurrent goto's will be executed in-order 2869 # do generation counting so two concurrent goto's will be executed in-order
2622 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2870 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2623 2871
2624 $self->enter_link; 2872 $self->enter_link;
2644 ($path, $x, $y) = (undef, undef, undef); 2892 ($path, $x, $y) = (undef, undef, undef);
2645 } 2893 }
2646 } 2894 }
2647 2895
2648 my $map = eval { 2896 my $map = eval {
2649 my $map = defined $path ? cf::map::find $path : undef; 2897 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2650 2898
2651 if ($map) { 2899 if ($map) {
2652 $map = $map->customise_for ($self); 2900 $map = $map->customise_for ($self);
2653 $map = $check->($map) if $check && $map; 2901 $map = $check->($map, $x, $y, $self) if $check && $map;
2654 } else { 2902 } else {
2655 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2903 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2656 } 2904 }
2657 2905
2658 $map 2906 $map
2666 if ($gen == $self->{_goto_generation}) { 2914 if ($gen == $self->{_goto_generation}) {
2667 delete $self->{_goto_generation}; 2915 delete $self->{_goto_generation};
2668 $self->leave_link ($map, $x, $y); 2916 $self->leave_link ($map, $x, $y);
2669 } 2917 }
2670 2918
2671 $done->() if $done; 2919 $done->($self) if $done;
2672 })->prio (1); 2920 })->prio (1);
2673} 2921}
2674 2922
2675=item $player_object->enter_exit ($exit_object) 2923=item $player_object->enter_exit ($exit_object)
2676 2924
2744 $Coro::current->{desc} = "enter_exit"; 2992 $Coro::current->{desc} = "enter_exit";
2745 2993
2746 unless (eval { 2994 unless (eval {
2747 $self->deactivate_recursive; # just to be sure 2995 $self->deactivate_recursive; # just to be sure
2748 2996
2749 # random map handling
2750 {
2751 my $guard = cf::lock_acquire "exit_prepare:$exit";
2752
2753 prepare_random_map $exit
2754 if $exit->slaying eq "/!";
2755 }
2756
2757 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2997 my $map = cf::map::normalise $exit->slaying, $exit->map;
2758 my $x = $exit->stats->hp; 2998 my $x = $exit->stats->hp;
2759 my $y = $exit->stats->sp; 2999 my $y = $exit->stats->sp;
3000
3001 # special map handling
3002 my $slaying = $exit->slaying;
3003
3004 # special map handling
3005 if ($slaying eq "/!") {
3006 my $guard = cf::lock_acquire "exit_prepare:$exit";
3007
3008 prepare_random_map $exit
3009 if $exit->slaying eq "/!"; # need to re-check after getting the lock
3010
3011 $map = $exit->slaying;
3012
3013 } elsif ($slaying eq '!up') {
3014 $map = $exit->map->tile_path (cf::TILE_UP);
3015 $x = $exit->x;
3016 $y = $exit->y;
3017
3018 } elsif ($slaying eq '!down') {
3019 $map = $exit->map->tile_path (cf::TILE_DOWN);
3020 $x = $exit->x;
3021 $y = $exit->y;
3022 }
2760 3023
2761 $self->goto ($map, $x, $y); 3024 $self->goto ($map, $x, $y);
2762 3025
2763 # if exit is damned, update players death & WoR home-position 3026 # if exit is damned, update players death & WoR home-position
2764 $self->contr->savebed ($map, $x, $y) 3027 $self->contr->savebed ($map, $x, $y)
2769 $self->message ("Something went wrong deep within the deliantra server. " 3032 $self->message ("Something went wrong deep within the deliantra server. "
2770 . "I'll try to bring you back to the map you were before. " 3033 . "I'll try to bring you back to the map you were before. "
2771 . "Please report this to the dungeon master!", 3034 . "Please report this to the dungeon master!",
2772 cf::NDI_UNIQUE | cf::NDI_RED); 3035 cf::NDI_UNIQUE | cf::NDI_RED);
2773 3036
2774 warn "ERROR in enter_exit: $@"; 3037 error "ERROR in enter_exit: $@";
2775 $self->leave_link; 3038 $self->leave_link;
2776 } 3039 }
2777 })->prio (1); 3040 })->prio (1);
2778} 3041}
2779 3042
2790 3053
2791sub cf::client::send_drawinfo { 3054sub cf::client::send_drawinfo {
2792 my ($self, $text, $flags) = @_; 3055 my ($self, $text, $flags) = @_;
2793 3056
2794 utf8::encode $text; 3057 utf8::encode $text;
2795 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3058 $self->send_packet (sprintf "msg %d 0 %s", $flags || cf::NDI_BLACK, $text);
2796} 3059}
2797 3060
2798=item $client->send_big_packet ($pkt) 3061=item $client->send_big_packet ($pkt)
2799 3062
2800Like C<send_packet>, but tries to compress large packets, and fragments 3063Like C<send_packet>, but tries to compress large packets, and fragments
2820 $self->send_packet ($pkt); 3083 $self->send_packet ($pkt);
2821} 3084}
2822 3085
2823=item $client->send_msg ($channel, $msg, $color, [extra...]) 3086=item $client->send_msg ($channel, $msg, $color, [extra...])
2824 3087
2825Send a drawinfo or msg packet to the client, formatting the msg for the 3088Send a msg packet to the client, formatting the msg for the client if
2826client if neccessary. C<$type> should be a string identifying the type of 3089necessary. C<$type> should be a string identifying the type of the
2827the message, with C<log> being the default. If C<$color> is negative, suppress 3090message, with C<log> being the default. If C<$color> is negative, suppress
2828the message unless the client supports the msg packet. 3091the message unless the client supports the msg packet.
2829 3092
2830=cut 3093=cut
2831 3094
2832# non-persistent channels (usually the info channel) 3095# non-persistent channels (usually the info channel)
2937 id => "death", 3200 id => "death",
2938 title => "Death", 3201 title => "Death",
2939 reply => undef, 3202 reply => undef,
2940 tooltip => "Reason for and more info about your most recent death", 3203 tooltip => "Reason for and more info about your most recent death",
2941 }, 3204 },
3205 "c/fatal" => {
3206 id => "fatal",
3207 title => "Fatal Error",
3208 reply => undef,
3209 tooltip => "Reason for the server disconnect",
3210 },
2942 "c/say" => $SAY_CHANNEL, 3211 "c/say" => $SAY_CHANNEL,
2943 "c/chat" => $CHAT_CHANNEL, 3212 "c/chat" => $CHAT_CHANNEL,
2944); 3213);
2945 3214
2946sub cf::client::send_msg { 3215sub cf::client::send_msg {
2989=cut 3258=cut
2990 3259
2991sub cf::client::ext_msg($$@) { 3260sub cf::client::ext_msg($$@) {
2992 my ($self, $type, @msg) = @_; 3261 my ($self, $type, @msg) = @_;
2993 3262
2994 if ($self->extcmd == 2) {
2995 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3263 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2996 } elsif ($self->extcmd == 1) { # TODO: remove
2997 push @msg, msgtype => "event_$type";
2998 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2999 }
3000}
3001
3002=item $client->ext_reply ($msgid, @msg)
3003
3004Sends an ext reply to the client.
3005
3006=cut
3007
3008sub cf::client::ext_reply($$@) {
3009 my ($self, $id, @msg) = @_;
3010
3011 if ($self->extcmd == 2) {
3012 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3013 } elsif ($self->extcmd == 1) {
3014 #TODO: version 1, remove
3015 unshift @msg, msgtype => "reply", msgid => $id;
3016 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3017 }
3018} 3264}
3019 3265
3020=item $success = $client->query ($flags, "text", \&cb) 3266=item $success = $client->query ($flags, "text", \&cb)
3021 3267
3022Queues a query to the client, calling the given callback with 3268Queues a query to the client, calling the given callback with
3077 my ($ns, $buf) = @_; 3323 my ($ns, $buf) = @_;
3078 3324
3079 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3325 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3080 3326
3081 if (ref $msg) { 3327 if (ref $msg) {
3082 my ($type, $reply, @payload) = 3328 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3083 "ARRAY" eq ref $msg
3084 ? @$msg
3085 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3086 3329
3087 my @reply;
3088
3089 if (my $cb = $EXTICMD{$type}) { 3330 if (my $cb = $EXTIACMD{$type}) {
3331 $cb->(
3332 $ns,
3333 sub {
3334 $ns->ext_msg ("reply-$reply", @_)
3335 if $reply;
3336 },
3337 @payload
3338 );
3339 } else {
3340 my @reply;
3341
3342 if (my $cb = $EXTICMD{$type}) {
3090 @reply = $cb->($ns, @payload); 3343 @reply = $cb->($ns, @payload);
3344 }
3345
3346 $ns->ext_msg ("reply-$reply", @reply)
3347 if $reply;
3091 } 3348 }
3092
3093 $ns->ext_reply ($reply, @reply)
3094 if $reply;
3095
3096 } else { 3349 } else {
3097 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3350 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3098 } 3351 }
3099 3352
3100 cf::override; 3353 cf::override;
3101 }, 3354 },
3102); 3355);
3122 3375
3123 $coro 3376 $coro
3124} 3377}
3125 3378
3126cf::client->attach ( 3379cf::client->attach (
3127 on_destroy => sub { 3380 on_client_destroy => sub {
3128 my ($ns) = @_; 3381 my ($ns) = @_;
3129 3382
3130 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3383 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3131 }, 3384 },
3132); 3385);
3183 decrease split destroy change_exp value msg lore send_msg)], 3436 decrease split destroy change_exp value msg lore send_msg)],
3184 ["cf::object::player" => qw(player)], 3437 ["cf::object::player" => qw(player)],
3185 ["cf::player" => qw(peaceful send_msg)], 3438 ["cf::player" => qw(peaceful send_msg)],
3186 ["cf::map" => qw(trigger)], 3439 ["cf::map" => qw(trigger)],
3187) { 3440) {
3188 no strict 'refs';
3189 my ($pkg, @funs) = @$_; 3441 my ($pkg, @funs) = @$_;
3190 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3442 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3191 for @funs; 3443 for @funs;
3192} 3444}
3193 3445
3232 local @cf::_safe_eval_args = values %vars; 3484 local @cf::_safe_eval_args = values %vars;
3233 @res = wantarray ? eval eval : scalar eval $eval; 3485 @res = wantarray ? eval eval : scalar eval $eval;
3234 } 3486 }
3235 3487
3236 if ($@) { 3488 if ($@) {
3237 warn "$@"; 3489 warn "$@",
3238 warn "while executing safe code '$code'\n"; 3490 "while executing safe code '$code'\n",
3239 warn "with arguments " . (join " ", %vars) . "\n"; 3491 "with arguments " . (join " ", %vars) . "\n";
3240 } 3492 }
3241 3493
3242 wantarray ? @res : $res[0] 3494 wantarray ? @res : $res[0]
3243} 3495}
3244 3496
3269=cut 3521=cut
3270 3522
3271############################################################################# 3523#############################################################################
3272# the server's init and main functions 3524# the server's init and main functions
3273 3525
3526{
3527 package cf::face;
3528
3529 our %HASH; # hash => idx
3530 our @DATA; # dynamically-created facedata, only faceste 0 used
3531 our @FOFS; # file offset, if > 0
3532 our @SIZE; # size of face, in octets
3533 our @META; # meta hash of face, if any
3534 our $DATAFH; # facedata filehandle
3535
3536 # internal api, not finalised
3537 sub set {
3538 my ($name, $type, $data) = @_;
3539
3540 my $idx = cf::face::find $name;
3541
3542 if ($idx) {
3543 delete $HASH{cf::face::get_csum $idx};
3544 } else {
3545 $idx = cf::face::alloc $name;
3546 }
3547
3548 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3549
3550 cf::face::set_type $idx, $type;
3551 cf::face::set_csum $idx, 0, $hash;
3552
3553 # we need to destroy the SV itself, not just modify it, as a running ix
3554 # might hold a reference to it: "delete" achieves that.
3555 delete $FOFS[0][$idx];
3556 delete $DATA[0][$idx];
3557 $DATA[0][$idx] = $data;
3558 $SIZE[0][$idx] = length $data;
3559 delete $META[$idx];
3560 $HASH{$hash} = $idx;#d#
3561
3562 $idx
3563 }
3564
3565 sub _get_data($$$) {
3566 my ($idx, $set, $cb) = @_;
3567
3568 if (defined $DATA[$set][$idx]) {
3569 $cb->($DATA[$set][$idx]);
3570 } elsif (my $fofs = $FOFS[$set][$idx]) {
3571 my $size = $SIZE[$set][$idx];
3572 my $buf;
3573 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3574 if ($_[0] == $size) {
3575 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3576 $cb->($buf);
3577 } else {
3578 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3579 }
3580 };
3581 } else {
3582 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3583 }
3584 }
3585
3586 # rather ineffient
3587 sub cf::face::get_data($;$) {
3588 my ($idx, $set) = @_;
3589
3590 _get_data $idx, $set, Coro::rouse_cb;
3591 Coro::rouse_wait
3592 }
3593
3594 sub cf::face::ix {
3595 my ($ns, $set, $idx, $pri) = @_;
3596
3597 _get_data $idx, $set, sub {
3598 $ns->ix_send ($idx, $pri, $_[0]);
3599 };
3600 }
3601}
3602
3274sub load_facedata($) { 3603sub load_facedata($) {
3275 my ($path) = @_; 3604 my ($path) = @_;
3276 3605
3277 # HACK to clear player env face cache, we need some signal framework
3278 # for this (global event?)
3279 %ext::player_env::MUSIC_FACE_CACHE = ();
3280
3281 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3606 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3282 3607
3283 warn "loading facedata from $path\n"; 3608 trace "loading facedata from $path\n";
3284 3609
3285 my $facedata; 3610 my $facedata = decode_storable load_file "$path/faceinfo";
3286 0 < aio_load $path, $facedata
3287 or die "$path: $!";
3288
3289 $facedata = Coro::Storable::thaw $facedata;
3290 3611
3291 $facedata->{version} == 2 3612 $facedata->{version} == 2
3292 or cf::cleanup "$path: version mismatch, cannot proceed."; 3613 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3293 3614
3294 # patch in the exptable 3615 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3295 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]); 3616 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3296 $facedata->{resource}{"res/exp_table"} = { 3617
3297 type => FT_RSRC, 3618 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3298 data => $exp_table, 3619
3299 hash => (Digest::MD5::md5 $exp_table), 3620 # BEGIN ATOMIC
3300 }; 3621 # from here on, everything must be atomic - no thread switch allowed
3301 cf::cede_to_tick; 3622 my $t1 = EV::time;
3302 3623
3303 { 3624 {
3304 my $faces = $facedata->{faceinfo}; 3625 my $faces = $facedata->{faceinfo};
3305 3626
3306 while (my ($face, $info) = each %$faces) { 3627 for my $face (sort keys %$faces) {
3628 my $info = $faces->{$face};
3307 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3629 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3308 3630
3309 cf::face::set_visibility $idx, $info->{visibility}; 3631 cf::face::set_visibility $idx, $info->{visibility};
3310 cf::face::set_magicmap $idx, $info->{magicmap}; 3632 cf::face::set_magicmap $idx, $info->{magicmap};
3311 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3633 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3312 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3634 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3313 3635 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3314 cf::cede_to_tick; 3636 $cf::face::HASH{$info->{hash64}} = $idx;
3637 delete $cf::face::META[$idx];
3315 } 3638 }
3316 3639
3317 while (my ($face, $info) = each %$faces) { 3640 while (my ($face, $info) = each %$faces) {
3318 next unless $info->{smooth}; 3641 next unless $info->{smooth};
3319 3642
3322 3645
3323 if (my $smooth = cf::face::find $info->{smooth}) { 3646 if (my $smooth = cf::face::find $info->{smooth}) {
3324 cf::face::set_smooth $idx, $smooth; 3647 cf::face::set_smooth $idx, $smooth;
3325 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3648 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3326 } else { 3649 } else {
3327 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3650 error "smooth face '$info->{smooth}' not found for face '$face'";
3328 } 3651 }
3329
3330 cf::cede_to_tick;
3331 } 3652 }
3332 } 3653 }
3333 3654
3334 { 3655 {
3335 my $anims = $facedata->{animinfo}; 3656 my $anims = $facedata->{animinfo};
3336 3657
3337 while (my ($anim, $info) = each %$anims) { 3658 while (my ($anim, $info) = each %$anims) {
3338 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3659 cf::anim::set $anim, $info->{frames}, $info->{facings};
3339 cf::cede_to_tick;
3340 } 3660 }
3341 3661
3342 cf::anim::invalidate_all; # d'oh 3662 cf::anim::invalidate_all; # d'oh
3343 } 3663 }
3344 3664
3345 { 3665 {
3346 my $res = $facedata->{resource}; 3666 my $res = $facedata->{resource};
3347 3667
3348 while (my ($name, $info) = each %$res) { 3668 while (my ($name, $info) = each %$res) {
3349 if (defined $info->{type}) { 3669 if (defined (my $type = $info->{type})) {
3670 # TODO: different hash - must free and use new index, or cache ixface data queue
3350 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3671 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3351 3672
3352 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3353 cf::face::set_type $idx, $info->{type}; 3673 cf::face::set_type $idx, $type;
3674 cf::face::set_csum $idx, 0, $info->{hash};
3675 $cf::face::SIZE[0][$idx] = $info->{size};
3676 $cf::face::FOFS[0][$idx] = $info->{fofs};
3677 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3678 $cf::face::HASH{$info->{hash}} = $idx;
3354 } else { 3679 } else {
3355 $RESOURCE{$name} = $info; 3680# $RESOURCE{$name} = $info; # unused
3356 } 3681 }
3357
3358 cf::cede_to_tick;
3359 } 3682 }
3360 } 3683 }
3684
3685 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3686
3687 # HACK to clear player env face cache, we need some signal framework
3688 # for this (global event?)
3689 %ext::player_env::MUSIC_FACE_CACHE = ();
3690
3691 # END ATOMIC
3692
3693 cf::debug "facedata atomic update time ", EV::time - $t1;
3361 3694
3362 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3695 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3363 3696
3697 aio_close $fh if $fh; # close old facedata
3698
3364 1 3699 1
3365} 3700}
3366
3367cf::global->attach (on_resource_update => sub {
3368 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3369 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3370
3371 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3372 my $sound = $soundconf->{compat}[$_]
3373 or next;
3374
3375 my $face = cf::face::find "sound/$sound->[1]";
3376 cf::sound::set $sound->[0] => $face;
3377 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3378 }
3379
3380 while (my ($k, $v) = each %{$soundconf->{event}}) {
3381 my $face = cf::face::find "sound/$v";
3382 cf::sound::set $k => $face;
3383 }
3384 }
3385});
3386 3701
3387register_exticmd fx_want => sub { 3702register_exticmd fx_want => sub {
3388 my ($ns, $want) = @_; 3703 my ($ns, $want) = @_;
3389 3704
3390 while (my ($k, $v) = each %$want) { 3705 while (my ($k, $v) = each %$want) {
3398 my $status = load_resource_file_ $_[0]; 3713 my $status = load_resource_file_ $_[0];
3399 get_slot 0.1, 100; 3714 get_slot 0.1, 100;
3400 cf::arch::commit_load; 3715 cf::arch::commit_load;
3401 3716
3402 $status 3717 $status
3718}
3719
3720sub reload_exp_table {
3721 _reload_exp_table;
3722
3723 cf::face::set
3724 "res/exp_table" => FT_RSRC,
3725 JSON::XS->new->utf8->canonical->encode (
3726 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3727 );
3728}
3729
3730sub reload_materials {
3731 _reload_materials;
3403} 3732}
3404 3733
3405sub reload_regions { 3734sub reload_regions {
3406 # HACK to clear player env face cache, we need some signal framework 3735 # HACK to clear player env face cache, we need some signal framework
3407 # for this (global event?) 3736 # for this (global event?)
3415 if exists $_->{match}; 3744 if exists $_->{match};
3416 } 3745 }
3417} 3746}
3418 3747
3419sub reload_facedata { 3748sub reload_facedata {
3420 load_facedata "$DATADIR/facedata" 3749 load_facedata $DATADIR
3421 or die "unable to load facedata\n"; 3750 or die "unable to load facedata\n";
3422} 3751}
3423 3752
3424sub reload_archetypes { 3753sub reload_archetypes {
3425 load_resource_file "$DATADIR/archetypes" 3754 load_resource_file "$DATADIR/archetypes"
3426 or die "unable to load archetypes\n"; 3755 or die "unable to load archetypes\n";
3756
3757 cf::face::set
3758 "res/skill_info" => FT_RSRC,
3759 JSON::XS->new->utf8->canonical->encode (
3760 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3761 );
3762
3763 cf::face::set
3764 "res/spell_paths" => FT_RSRC,
3765 JSON::XS->new->utf8->canonical->encode (
3766 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3767 );
3427} 3768}
3428 3769
3429sub reload_treasures { 3770sub reload_treasures {
3430 load_resource_file "$DATADIR/treasures" 3771 load_resource_file "$DATADIR/treasures"
3431 or die "unable to load treasurelists\n"; 3772 or die "unable to load treasurelists\n";
3432} 3773}
3433 3774
3775sub reload_sound {
3776 trace "loading sound config from $DATADIR/sound\n";
3777
3778 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3779
3780 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3781 my $sound = $soundconf->{compat}[$_]
3782 or next;
3783
3784 my $face = cf::face::find "sound/$sound->[1]";
3785 cf::sound::set $sound->[0] => $face;
3786 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3787 }
3788
3789 while (my ($k, $v) = each %{$soundconf->{event}}) {
3790 my $face = cf::face::find "sound/$v";
3791 cf::sound::set $k => $face;
3792 }
3793}
3794
3434sub reload_resources { 3795sub reload_resources {
3435 warn "reloading resource files...\n"; 3796 trace "reloading resource files...\n";
3436 3797
3798 reload_materials;
3437 reload_facedata; 3799 reload_facedata;
3800 reload_exp_table;
3801 reload_sound;
3438 reload_archetypes; 3802 reload_archetypes;
3439 reload_regions; 3803 reload_regions;
3440 reload_treasures; 3804 reload_treasures;
3441 3805
3442 warn "finished reloading resource files\n"; 3806 trace "finished reloading resource files\n";
3443} 3807}
3444 3808
3445sub reload_config { 3809sub reload_config {
3446 warn "reloading config file...\n"; 3810 trace "reloading config file...\n";
3447 3811
3448 open my $fh, "<:utf8", "$CONFDIR/config" 3812 my $config = load_file "$CONFDIR/config";
3449 or return; 3813 utf8::decode $config;
3814 *CFG = decode_yaml $config;
3450 3815
3451 local $/;
3452 *CFG = YAML::XS::Load scalar <$fh>;
3453
3454 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3816 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3455 3817
3456 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3818 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3457 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3819 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3458 3820
3459 if (exists $CFG{mlockall}) { 3821 if (exists $CFG{mlockall}) {
3461 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3823 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3462 and die "WARNING: m(un)lockall failed: $!\n"; 3824 and die "WARNING: m(un)lockall failed: $!\n";
3463 }; 3825 };
3464 warn $@ if $@; 3826 warn $@ if $@;
3465 } 3827 }
3466
3467 warn "finished reloading resource files\n";
3468} 3828}
3469 3829
3470sub pidfile() { 3830sub pidfile() {
3471 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3831 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3472 or die "$PIDFILE: $!"; 3832 or die "$PIDFILE: $!";
3485 seek $fh, 0, 0; 3845 seek $fh, 0, 0;
3486 print $fh $$; 3846 print $fh $$;
3487} 3847}
3488 3848
3489sub main_loop { 3849sub main_loop {
3490 warn "EV::loop starting\n"; 3850 trace "EV::loop starting\n";
3491 if (1) { 3851 if (1) {
3492 EV::loop; 3852 EV::loop;
3493 } 3853 }
3494 warn "EV::loop returned\n"; 3854 trace "EV::loop returned\n";
3495 goto &main_loop unless $REALLY_UNLOOP; 3855 goto &main_loop unless $REALLY_UNLOOP;
3496} 3856}
3497 3857
3498sub main { 3858sub main {
3499 cf::init_globals; # initialise logging 3859 cf::init_globals; # initialise logging
3500 3860
3501 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3861 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3502 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3862 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3503 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3863 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3504 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3864 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3505 3865
3506 cf::init_experience;
3507 cf::init_anim;
3508 cf::init_attackmess;
3509 cf::init_dynamic;
3510
3511 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3866 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3512 3867
3513 # we must not ever block the main coroutine 3868 # we must not ever block the main coroutine
3514 local $Coro::idle = sub { 3869 $Coro::idle = sub {
3515 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3870 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3516 (async { 3871 (async {
3517 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3872 $Coro::current->{desc} = "IDLE BUG HANDLER";
3518 EV::loop EV::LOOP_ONESHOT; 3873 EV::loop EV::LOOP_ONESHOT;
3519 })->prio (Coro::PRIO_MAX); 3874 })->prio (Coro::PRIO_MAX);
3520 }; 3875 };
3521 3876
3522 evthread_start IO::AIO::poll_fileno; 3877 evthread_start IO::AIO::poll_fileno;
3523 3878
3524 cf::sync_job { 3879 cf::sync_job {
3880 cf::incloader::init ();
3881
3882 db_init;
3883
3884 cf::init_anim;
3885 cf::init_attackmess;
3886 cf::init_dynamic;
3887
3525 cf::load_settings; 3888 cf::load_settings;
3526 cf::load_materials;
3527 3889
3528 reload_resources; 3890 reload_resources;
3529 reload_config; 3891 reload_config;
3530 db_init;
3531 3892
3532 cf::init_uuid; 3893 cf::init_uuid;
3533 cf::init_signals; 3894 cf::init_signals;
3534 cf::init_commands;
3535 cf::init_skills; 3895 cf::init_skills;
3536 3896
3537 cf::init_beforeplay; 3897 cf::init_beforeplay;
3538 3898
3539 atomic; 3899 atomic;
3544 3904
3545 # no (long-running) fork's whatsoever before this point(!) 3905 # no (long-running) fork's whatsoever before this point(!)
3546 use POSIX (); 3906 use POSIX ();
3547 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3907 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3548 3908
3549 (pop @POST_INIT)->(0) while @POST_INIT; 3909 cf::_post_init 0;
3550 }; 3910 };
3551 3911
3912 cf::object::thawer::errors_are_fatal 0;
3913 info "parse errors in files are no longer fatal from this point on.\n";
3914
3915 AE::postpone {
3916 undef &main; # free gobs of memory :)
3917 };
3918
3552 main_loop; 3919 goto &main_loop;
3553} 3920}
3554 3921
3555############################################################################# 3922#############################################################################
3556# initialisation and cleanup 3923# initialisation and cleanup
3557 3924
3558# install some emergency cleanup handlers 3925# install some emergency cleanup handlers
3559BEGIN { 3926BEGIN {
3560 our %SIGWATCHER = (); 3927 our %SIGWATCHER = ();
3561 for my $signal (qw(INT HUP TERM)) { 3928 for my $signal (qw(INT HUP TERM)) {
3562 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3929 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3563 cf::cleanup "SIG$signal"; 3930 cf::cleanup "SIG$signal";
3564 }; 3931 };
3565 } 3932 }
3566} 3933}
3567 3934
3568sub write_runtime_sync { 3935sub write_runtime_sync {
3936 my $t0 = AE::time;
3937
3569 # first touch the runtime file to show we are still running: 3938 # first touch the runtime file to show we are still running:
3570 # the fsync below can take a very very long time. 3939 # the fsync below can take a very very long time.
3571 3940
3572 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3941 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3573 3942
3574 my $guard = cf::lock_acquire "write_runtime"; 3943 my $guard = cf::lock_acquire "write_runtime";
3575 3944
3576 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3945 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3577 or return; 3946 or return;
3578 3947
3579 my $value = $cf::RUNTIME + 90 + 10; 3948 my $value = $cf::RUNTIME + 90 + 10;
3580 # 10 is the runtime save interval, for a monotonic clock 3949 # 10 is the runtime save interval, for a monotonic clock
3581 # 60 allows for the watchdog to kill the server. 3950 # 60 allows for the watchdog to kill the server.
3594 or return; 3963 or return;
3595 3964
3596 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3965 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3597 and return; 3966 and return;
3598 3967
3599 warn "runtime file written.\n"; 3968 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3600 3969
3601 1 3970 1
3602} 3971}
3603 3972
3604our $uuid_lock; 3973our $uuid_lock;
3616 or return; 3985 or return;
3617 3986
3618 my $value = uuid_seq uuid_cur; 3987 my $value = uuid_seq uuid_cur;
3619 3988
3620 unless ($value) { 3989 unless ($value) {
3621 warn "cowardly refusing to write zero uuid value!\n"; 3990 info "cowardly refusing to write zero uuid value!\n";
3622 return; 3991 return;
3623 } 3992 }
3624 3993
3625 my $value = uuid_str $value + $uuid_skip; 3994 my $value = uuid_str $value + $uuid_skip;
3626 $uuid_skip = 0; 3995 $uuid_skip = 0;
3636 or return; 4005 or return;
3637 4006
3638 aio_rename "$uuid~", $uuid 4007 aio_rename "$uuid~", $uuid
3639 and return; 4008 and return;
3640 4009
3641 warn "uuid file written ($value).\n"; 4010 trace "uuid file written ($value).\n";
3642 4011
3643 1 4012 1
3644 4013
3645} 4014}
3646 4015
3652} 4021}
3653 4022
3654sub emergency_save() { 4023sub emergency_save() {
3655 my $freeze_guard = cf::freeze_mainloop; 4024 my $freeze_guard = cf::freeze_mainloop;
3656 4025
3657 warn "emergency_perl_save: enter\n"; 4026 info "emergency_perl_save: enter\n";
4027
4028 # this is a trade-off: we want to be very quick here, so
4029 # save all maps without fsync, and later call a global sync
4030 # (which in turn might be very very slow)
4031 local $USE_FSYNC = 0;
3658 4032
3659 cf::sync_job { 4033 cf::sync_job {
3660 # this is a trade-off: we want to be very quick here, so 4034 cf::write_runtime_sync; # external watchdog should not bark
3661 # save all maps without fsync, and later call a global sync
3662 # (which in turn might be very very slow)
3663 local $USE_FSYNC = 0;
3664 4035
3665 # use a peculiar iteration method to avoid tripping on perl 4036 # use a peculiar iteration method to avoid tripping on perl
3666 # refcount bugs in for. also avoids problems with players 4037 # refcount bugs in for. also avoids problems with players
3667 # and maps saved/destroyed asynchronously. 4038 # and maps saved/destroyed asynchronously.
3668 warn "emergency_perl_save: begin player save\n"; 4039 info "emergency_perl_save: begin player save\n";
3669 for my $login (keys %cf::PLAYER) { 4040 for my $login (keys %cf::PLAYER) {
3670 my $pl = $cf::PLAYER{$login} or next; 4041 my $pl = $cf::PLAYER{$login} or next;
3671 $pl->valid or next; 4042 $pl->valid or next;
3672 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4043 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3673 $pl->save; 4044 $pl->save;
3674 } 4045 }
3675 warn "emergency_perl_save: end player save\n"; 4046 info "emergency_perl_save: end player save\n";
3676 4047
4048 cf::write_runtime_sync; # external watchdog should not bark
4049
3677 warn "emergency_perl_save: begin map save\n"; 4050 info "emergency_perl_save: begin map save\n";
3678 for my $path (keys %cf::MAP) { 4051 for my $path (keys %cf::MAP) {
3679 my $map = $cf::MAP{$path} or next; 4052 my $map = $cf::MAP{$path} or next;
3680 $map->valid or next; 4053 $map->valid or next;
3681 $map->save; 4054 $map->save;
3682 } 4055 }
3683 warn "emergency_perl_save: end map save\n"; 4056 info "emergency_perl_save: end map save\n";
3684 4057
4058 cf::write_runtime_sync; # external watchdog should not bark
4059
3685 warn "emergency_perl_save: begin database checkpoint\n"; 4060 info "emergency_perl_save: begin database checkpoint\n";
3686 BDB::db_env_txn_checkpoint $DB_ENV; 4061 BDB::db_env_txn_checkpoint $DB_ENV;
3687 warn "emergency_perl_save: end database checkpoint\n"; 4062 info "emergency_perl_save: end database checkpoint\n";
3688 4063
3689 warn "emergency_perl_save: begin write uuid\n"; 4064 info "emergency_perl_save: begin write uuid\n";
3690 write_uuid_sync 1; 4065 write_uuid_sync 1;
3691 warn "emergency_perl_save: end write uuid\n"; 4066 info "emergency_perl_save: end write uuid\n";
4067
4068 cf::write_runtime_sync; # external watchdog should not bark
4069
4070 trace "emergency_perl_save: syncing database to disk";
4071 BDB::db_env_txn_checkpoint $DB_ENV;
4072
4073 info "emergency_perl_save: starting sync\n";
4074 IO::AIO::aio_sync sub {
4075 info "emergency_perl_save: finished sync\n";
4076 };
4077
4078 cf::write_runtime_sync; # external watchdog should not bark
4079
4080 trace "emergency_perl_save: flushing outstanding aio requests";
4081 while (IO::AIO::nreqs || BDB::nreqs) {
4082 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4083 }
4084
4085 cf::write_runtime_sync; # external watchdog should not bark
3692 }; 4086 };
3693 4087
3694 warn "emergency_perl_save: starting sync()\n";
3695 IO::AIO::aio_sync sub {
3696 warn "emergency_perl_save: finished sync()\n";
3697 };
3698
3699 warn "emergency_perl_save: leave\n"; 4088 info "emergency_perl_save: leave\n";
3700} 4089}
3701 4090
3702sub post_cleanup { 4091sub post_cleanup {
3703 my ($make_core) = @_; 4092 my ($make_core) = @_;
3704 4093
4094 IO::AIO::flush;
4095
3705 warn Carp::longmess "post_cleanup backtrace" 4096 error Carp::longmess "post_cleanup backtrace"
3706 if $make_core; 4097 if $make_core;
3707 4098
3708 my $fh = pidfile; 4099 my $fh = pidfile;
3709 unlink $PIDFILE if <$fh> == $$; 4100 unlink $PIDFILE if <$fh> == $$;
3710} 4101}
3730 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4121 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3731 for my $name (keys %$leaf_symtab) { 4122 for my $name (keys %$leaf_symtab) {
3732 _gv_clear *{"$pkg$name"}; 4123 _gv_clear *{"$pkg$name"};
3733# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4124# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3734 } 4125 }
3735 warn "cleared package $pkg\n";#d#
3736} 4126}
3737 4127
3738sub do_reload_perl() { 4128sub do_reload_perl() {
3739 # can/must only be called in main 4129 # can/must only be called in main
3740 if ($Coro::current != $Coro::main) { 4130 unless (in_main) {
3741 warn "can only reload from main coroutine"; 4131 error "can only reload from main coroutine";
3742 return; 4132 return;
3743 } 4133 }
3744 4134
3745 return if $RELOAD++; 4135 return if $RELOAD++;
3746 4136
3747 my $t1 = EV::time; 4137 my $t1 = AE::time;
3748 4138
3749 while ($RELOAD) { 4139 while ($RELOAD) {
3750 warn "reloading..."; 4140 cf::get_slot 0.1, -1, "reload_perl";
4141 info "perl_reload: reloading...";
3751 4142
3752 warn "entering sync_job"; 4143 trace "perl_reload: entering sync_job";
3753 4144
3754 cf::sync_job { 4145 cf::sync_job {
3755 cf::write_runtime_sync; # external watchdog should not bark
3756 cf::emergency_save; 4146 #cf::emergency_save;
3757 cf::write_runtime_sync; # external watchdog should not bark
3758 4147
3759 warn "syncing database to disk";
3760 BDB::db_env_txn_checkpoint $DB_ENV;
3761
3762 # if anything goes wrong in here, we should simply crash as we already saved
3763
3764 warn "flushing outstanding aio requests";
3765 while (IO::AIO::nreqs || BDB::nreqs) {
3766 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3767 }
3768
3769 warn "cancelling all extension coros"; 4148 trace "perl_reload: cancelling all extension coros";
3770 $_->cancel for values %EXT_CORO; 4149 $_->cancel for values %EXT_CORO;
3771 %EXT_CORO = (); 4150 %EXT_CORO = ();
3772 4151
3773 warn "removing commands"; 4152 trace "perl_reload: removing commands";
3774 %COMMAND = (); 4153 %COMMAND = ();
3775 4154
3776 warn "removing ext/exti commands"; 4155 trace "perl_reload: removing ext/exti commands";
3777 %EXTCMD = (); 4156 %EXTCMD = ();
3778 %EXTICMD = (); 4157 %EXTICMD = ();
3779 4158
3780 warn "unloading/nuking all extensions"; 4159 trace "perl_reload: unloading/nuking all extensions";
3781 for my $pkg (@EXTS) { 4160 for my $pkg (@EXTS) {
3782 warn "... unloading $pkg"; 4161 trace "... unloading $pkg";
3783 4162
3784 if (my $cb = $pkg->can ("unload")) { 4163 if (my $cb = $pkg->can ("unload")) {
3785 eval { 4164 eval {
3786 $cb->($pkg); 4165 $cb->($pkg);
3787 1 4166 1
3788 } or warn "$pkg unloaded, but with errors: $@"; 4167 } or error "$pkg unloaded, but with errors: $@";
3789 } 4168 }
3790 4169
3791 warn "... clearing $pkg"; 4170 trace "... clearing $pkg";
3792 clear_package $pkg; 4171 clear_package $pkg;
3793 } 4172 }
3794 4173
3795 warn "unloading all perl modules loaded from $LIBDIR"; 4174 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3796 while (my ($k, $v) = each %INC) { 4175 while (my ($k, $v) = each %INC) {
3797 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4176 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3798 4177
3799 warn "... unloading $k"; 4178 trace "... unloading $k";
3800 delete $INC{$k}; 4179 delete $INC{$k};
3801 4180
3802 $k =~ s/\.pm$//; 4181 $k =~ s/\.pm$//;
3803 $k =~ s/\//::/g; 4182 $k =~ s/\//::/g;
3804 4183
3807 } 4186 }
3808 4187
3809 clear_package $k; 4188 clear_package $k;
3810 } 4189 }
3811 4190
3812 warn "getting rid of safe::, as good as possible"; 4191 trace "perl_reload: getting rid of safe::, as good as possible";
3813 clear_package "safe::$_" 4192 clear_package "safe::$_"
3814 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4193 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3815 4194
3816 warn "unloading cf.pm \"a bit\""; 4195 trace "perl_reload: unloading cf.pm \"a bit\"";
3817 delete $INC{"cf.pm"}; 4196 delete $INC{"cf.pm"};
3818 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4197 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3819 4198
3820 # don't, removes xs symbols, too, 4199 # don't, removes xs symbols, too,
3821 # and global variables created in xs 4200 # and global variables created in xs
3822 #clear_package __PACKAGE__; 4201 #clear_package __PACKAGE__;
3823 4202
3824 warn "unload completed, starting to reload now"; 4203 info "perl_reload: unload completed, starting to reload now";
3825 4204
3826 warn "reloading cf.pm"; 4205 trace "perl_reload: reloading cf.pm";
3827 require cf; 4206 require cf;
3828 cf::_connect_to_perl_1; 4207 cf::_connect_to_perl_1;
3829 4208
3830 warn "loading config and database again"; 4209 trace "perl_reload: loading config and database again";
3831 cf::reload_config; 4210 cf::reload_config;
3832 4211
3833 warn "loading extensions"; 4212 trace "perl_reload: loading extensions";
3834 cf::load_extensions; 4213 cf::load_extensions;
3835 4214
3836 if ($REATTACH_ON_RELOAD) { 4215 if ($REATTACH_ON_RELOAD) {
3837 warn "reattaching attachments to objects/players"; 4216 trace "perl_reload: reattaching attachments to objects/players";
3838 _global_reattach; # objects, sockets 4217 _global_reattach; # objects, sockets
3839 warn "reattaching attachments to maps"; 4218 trace "perl_reload: reattaching attachments to maps";
3840 reattach $_ for values %MAP; 4219 reattach $_ for values %MAP;
3841 warn "reattaching attachments to players"; 4220 trace "perl_reload: reattaching attachments to players";
3842 reattach $_ for values %PLAYER; 4221 reattach $_ for values %PLAYER;
3843 } 4222 }
3844 4223
3845 warn "running post_init jobs"; 4224 cf::_post_init 1;
3846 (pop @POST_INIT)->(1) while @POST_INIT;
3847 4225
3848 warn "leaving sync_job"; 4226 trace "perl_reload: leaving sync_job";
3849 4227
3850 1 4228 1
3851 } or do { 4229 } or do {
3852 warn $@; 4230 error $@;
3853 cf::cleanup "error while reloading, exiting."; 4231 cf::cleanup "perl_reload: error, exiting.";
3854 }; 4232 };
3855 4233
3856 warn "reloaded";
3857 --$RELOAD; 4234 --$RELOAD;
3858 } 4235 }
3859 4236
3860 $t1 = EV::time - $t1; 4237 $t1 = AE::time - $t1;
3861 warn "reload completed in ${t1}s\n"; 4238 info "perl_reload: completed in ${t1}s\n";
3862}; 4239};
3863 4240
3864our $RELOAD_WATCHER; # used only during reload 4241our $RELOAD_WATCHER; # used only during reload
3865 4242
3866sub reload_perl() { 4243sub reload_perl() {
3868 # coro crashes during coro_state_free->destroy here. 4245 # coro crashes during coro_state_free->destroy here.
3869 4246
3870 $RELOAD_WATCHER ||= cf::async { 4247 $RELOAD_WATCHER ||= cf::async {
3871 Coro::AIO::aio_wait cache_extensions; 4248 Coro::AIO::aio_wait cache_extensions;
3872 4249
3873 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4250 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3874 do_reload_perl; 4251 do_reload_perl;
3875 undef $RELOAD_WATCHER; 4252 undef $RELOAD_WATCHER;
3876 }; 4253 };
3877 }; 4254 };
3878} 4255}
3887 reload_perl; 4264 reload_perl;
3888 }; 4265 };
3889 } 4266 }
3890}; 4267};
3891 4268
3892unshift @INC, $LIBDIR; 4269#############################################################################
3893 4270
3894my $bug_warning = 0; 4271my $bug_warning = 0;
3895 4272
3896our @WAIT_FOR_TICK;
3897our @WAIT_FOR_TICK_BEGIN;
3898
3899sub wait_for_tick { 4273sub wait_for_tick() {
3900 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4274 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3901 4275
3902 my $signal = new Coro::Signal; 4276 $WAIT_FOR_TICK->wait;
3903 push @WAIT_FOR_TICK, $signal;
3904 $signal->wait;
3905} 4277}
3906 4278
3907sub wait_for_tick_begin { 4279sub wait_for_tick_begin() {
3908 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4280 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3909 4281
3910 my $signal = new Coro::Signal; 4282 my $signal = new Coro::Signal;
3911 push @WAIT_FOR_TICK_BEGIN, $signal; 4283 push @WAIT_FOR_TICK_BEGIN, $signal;
3912 $signal->wait; 4284 $signal->wait;
3913} 4285}
3917 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4289 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3918 unless ++$bug_warning > 10; 4290 unless ++$bug_warning > 10;
3919 return; 4291 return;
3920 } 4292 }
3921 4293
3922 cf::server_tick; # one server iteration 4294 cf::one_tick; # one server iteration
3923 4295
3924 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d# 4296 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3925 4297
3926 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4298 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3927 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4299 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3928 Coro::async_pool { 4300 Coro::async_pool {
3929 $Coro::current->{desc} = "runtime saver"; 4301 $Coro::current->{desc} = "runtime saver";
3930 write_runtime_sync 4302 write_runtime_sync
3931 or warn "ERROR: unable to write runtime file: $!"; 4303 or error "ERROR: unable to write runtime file: $!";
3932 }; 4304 };
3933 } 4305 }
3934 4306
3935 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4307 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3936 $sig->send; 4308 $sig->send;
3937 } 4309 }
3938 while (my $sig = shift @WAIT_FOR_TICK) { 4310 $WAIT_FOR_TICK->broadcast;
3939 $sig->send;
3940 }
3941 4311
3942 $LOAD = ($NOW - $TICK_START) / $TICK; 4312 $LOAD = ($NOW - $TICK_START) / $TICK;
3943 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4313 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3944 4314
3945 if (0) { 4315 if (0) {
3946 if ($NEXT_TICK) { 4316 if ($NEXT_TICK) {
3947 my $jitter = $TICK_START - $NEXT_TICK; 4317 my $jitter = $TICK_START - $NEXT_TICK;
3948 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4318 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3949 warn "jitter $JITTER\n";#d# 4319 debug "jitter $JITTER\n";#d#
3950 } 4320 }
3951 } 4321 }
3952} 4322}
3953 4323
3954{ 4324{
3955 # configure BDB 4325 # configure BDB
4326 info "initialising database";
3956 4327
3957 BDB::min_parallel 8; 4328 BDB::min_parallel 16;
3958 BDB::max_poll_reqs $TICK * 0.1; 4329 BDB::max_poll_reqs $TICK * 0.1;
3959 $AnyEvent::BDB::WATCHER->priority (1); 4330 #$AnyEvent::BDB::WATCHER->priority (1);
3960 4331
3961 unless ($DB_ENV) { 4332 unless ($DB_ENV) {
3962 $DB_ENV = BDB::db_env_create; 4333 $DB_ENV = BDB::db_env_create;
3963 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4334 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3964 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4335 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3989 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4360 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3990 }; 4361 };
3991 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4362 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3992 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4363 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3993 }; 4364 };
4365
4366 info "database initialised";
3994} 4367}
3995 4368
3996{ 4369{
3997 # configure IO::AIO 4370 # configure IO::AIO
3998 4371
4372 info "initialising aio";
3999 IO::AIO::min_parallel 8; 4373 IO::AIO::min_parallel 8;
4000 IO::AIO::max_poll_time $TICK * 0.1; 4374 IO::AIO::max_poll_time $TICK * 0.1;
4001 undef $AnyEvent::AIO::WATCHER; 4375 undef $AnyEvent::AIO::WATCHER;
4376 info "aio initialised";
4002} 4377}
4003 4378
4004my $_log_backtrace; 4379our $_log_backtrace;
4380our $_log_backtrace_last;
4005 4381
4006sub _log_backtrace { 4382sub _log_backtrace {
4007 my ($msg, @addr) = @_; 4383 my ($msg, @addr) = @_;
4008 4384
4009 $msg =~ s/\n//; 4385 $msg =~ s/\n$//;
4010 4386
4387 if ($_log_backtrace_last eq $msg) {
4388 LOG llevInfo, "[ABT] $msg\n";
4389 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4011 # limit the # of concurrent backtraces 4390 # limit the # of concurrent backtraces
4012 if ($_log_backtrace < 2) { 4391 } elsif ($_log_backtrace < 2) {
4392 $_log_backtrace_last = $msg;
4013 ++$_log_backtrace; 4393 ++$_log_backtrace;
4014 my $perl_bt = Carp::longmess $msg; 4394 my $perl_bt = Carp::longmess $msg;
4015 async { 4395 async {
4016 $Coro::current->{desc} = "abt $msg"; 4396 $Coro::current->{desc} = "abt $msg";
4017 4397
4037 LOG llevInfo, "[ABT] $_\n" for @bt; 4417 LOG llevInfo, "[ABT] $_\n" for @bt;
4038 --$_log_backtrace; 4418 --$_log_backtrace;
4039 }; 4419 };
4040 } else { 4420 } else {
4041 LOG llevInfo, "[ABT] $msg\n"; 4421 LOG llevInfo, "[ABT] $msg\n";
4042 LOG llevInfo, "[ABT] [suppressed]\n"; 4422 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4043 } 4423 }
4044} 4424}
4045 4425
4046# load additional modules 4426# load additional modules
4047require "cf/$_.pm" for @EXTRA_MODULES; 4427require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines