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.506 by root, Wed Feb 3 20:48:22 2010 UTC vs.
Revision 1.611 by root, Tue Nov 20 14:54:17 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the Affero GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>. 18# <http://www.gnu.org/licenses/>.
19# 19#
20# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
21# 21#
22 22
23package cf; 23package cf;
24 24
25use 5.10.0; 25use common::sense;
26use utf8;
27use strict qw(vars subs);
28 26
29use Symbol; 27use Symbol;
30use List::Util; 28use List::Util;
31use Socket; 29use Socket;
32use EV; 30use EV;
34use Safe; 32use Safe;
35use Safe::Hole; 33use Safe::Hole;
36use Storable (); 34use Storable ();
37use Carp (); 35use Carp ();
38 36
39use Guard (); 37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
40use Coro (); 41use Coro ();
41use Coro::State; 42use Coro::State;
42use Coro::Handle; 43use Coro::Handle;
43use Coro::EV; 44use Coro::EV;
44use Coro::AnyEvent; 45use Coro::AnyEvent;
50use Coro::AIO; 51use Coro::AIO;
51use Coro::BDB 1.6; 52use Coro::BDB 1.6;
52use Coro::Storable; 53use Coro::Storable;
53use Coro::Util (); 54use Coro::Util ();
54 55
56use Guard ();
55use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
56use BDB (); 58use BDB ();
57use Data::Dumper; 59use Data::Dumper;
58use Fcntl; 60use Fcntl;
59use YAML::XS (); 61use YAML::XS ();
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;
1413 for (split /,\s*/, $v->{meta}{depends}) { 1630 for (split /,\s*/, $v->{meta}{depends}) {
1414 next ext 1631 next ext
1415 unless exists $done{$_}; 1632 unless exists $done{$_};
1416 } 1633 }
1417 1634
1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1635 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1419 1636
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
1420 my $active = eval $v->{source}; 1646 my $active = eval $source;
1421 1647
1422 if (length $@) { 1648 if (length $@) {
1423 warn "$v->{path}: $@\n"; 1649 error "$v->{path}: $@\n";
1424 1650
1425 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1651 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1426 if exists $v->{meta}{mandatory}; 1652 if exists $v->{meta}{mandatory};
1653
1654 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1655 delete $todo{$k};
1427 } else { 1656 } else {
1428 $done{$k} = delete $todo{$k}; 1657 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg}; 1658 push @EXTS, $v->{pkg};
1430 $progress = 1; 1659 $progress = 1;
1431 1660
1432 warn "$v->{base}: extension inactive.\n" 1661 info "$v->{base}: extension inactive.\n"
1433 unless $active; 1662 unless $active;
1434 } 1663 }
1435 } 1664 }
1436 1665
1437 unless ($progress) { 1666 unless ($progress) {
1439 1668
1440 while (my ($k, $v) = each %todo) { 1669 while (my ($k, $v) = each %todo) {
1441 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1670 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1442 if exists $v->{meta}{mandatory}; 1671 if exists $v->{meta}{mandatory};
1443 } 1672 }
1673
1674 last;
1444 } 1675 }
1445 } 1676 }
1446 }; 1677 };
1447} 1678}
1448 1679
1533 $cf::PLAYER{$login} = $pl 1764 $cf::PLAYER{$login} = $pl
1534 } 1765 }
1535 } 1766 }
1536} 1767}
1537 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
1538sub save($) { 1782sub save($) {
1539 my ($pl) = @_; 1783 my ($pl) = @_;
1540 1784
1541 return if $pl->{deny_save}; 1785 return if $pl->{deny_save};
1542 1786
1547 1791
1548 aio_mkdir playerdir $pl, 0770; 1792 aio_mkdir playerdir $pl, 0770;
1549 $pl->{last_save} = $cf::RUNTIME; 1793 $pl->{last_save} = $cf::RUNTIME;
1550 1794
1551 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];
1552 1799
1553 $pl->save_pl ($path); 1800 $pl->save_pl ($path);
1554 cf::cede_to_tick; 1801 cf::cede_to_tick;
1555} 1802}
1556 1803
1590 my $name = $pl->ob->name; 1837 my $name = $pl->ob->name;
1591 1838
1592 $pl->{deny_save} = 1; 1839 $pl->{deny_save} = 1;
1593 $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
1594 1841
1595 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1842 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1596 $pl->deactivate; 1843 $pl->deactivate;
1844
1597 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;
1598 $pl->ob->check_score;
1599 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1846 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1847 ext::highscore::check ($pl->ob);
1848
1600 $pl->ns->destroy if $pl->ns; 1849 $pl->ns->destroy if $pl->ns;
1601 1850
1602 my $path = playerdir $pl; 1851 my $path = playerdir $pl;
1603 my $temp = "$path~$cf::RUNTIME~deleting~"; 1852 my $temp = "$path~$cf::RUNTIME~deleting~";
1604 aio_rename $path, $temp; 1853 aio_rename $path, $temp;
1658 \@logins 1907 \@logins
1659} 1908}
1660 1909
1661=item $player->maps 1910=item $player->maps
1662 1911
1912=item cf::player::maps $login
1913
1663Returns an arrayref of map paths that are private for this 1914Returns an arrayref of map paths that are private for this
1664player. May block. 1915player. May block.
1665 1916
1666=cut 1917=cut
1667 1918
1688 1939
1689=item $protocol_xml = $player->expand_cfpod ($cfpod) 1940=item $protocol_xml = $player->expand_cfpod ($cfpod)
1690 1941
1691Expand deliantra pod fragments into protocol xml. 1942Expand deliantra pod fragments into protocol xml.
1692 1943
1693=item $player->ext_reply ($msgid, @msg)
1694
1695Sends an ext reply to the player.
1696
1697=cut
1698
1699sub ext_reply($$@) {
1700 my ($self, $id, @msg) = @_;
1701
1702 $self->ns->ext_reply ($id, @msg)
1703}
1704
1705=item $player->ext_msg ($type, @msg) 1944=item $player->ext_msg ($type, @msg)
1706 1945
1707Sends an ext event to the client. 1946Sends an ext event to the client.
1708 1947
1709=cut 1948=cut
1728 1967
1729=cut 1968=cut
1730 1969
1731sub find_by_path($) { 1970sub find_by_path($) {
1732 my ($path) = @_; 1971 my ($path) = @_;
1972
1973 $path =~ s/^~[^\/]*//; # skip ~login
1733 1974
1734 my ($match, $specificity); 1975 my ($match, $specificity);
1735 1976
1736 for my $region (list) { 1977 for my $region (list) {
1737 if ($region->{match} && $path =~ $region->{match}) { 1978 if ($region->{match} && $path =~ $region->{match}) {
1766sub generate_random_map { 2007sub generate_random_map {
1767 my ($self, $rmp) = @_; 2008 my ($self, $rmp) = @_;
1768 2009
1769 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
1770 2011
1771 # mit "rum" bekleckern, nicht
1772 $self->_create_random_map ( 2012 $self->_create_random_map ($rmp);
1773 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1774 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1775 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1776 $rmp->{exit_on_final_map},
1777 $rmp->{xsize}, $rmp->{ysize},
1778 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1779 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1780 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1781 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1782 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1783 (cf::region::find $rmp->{region}), $rmp->{custom}
1784 )
1785} 2013}
1786 2014
1787=item cf::map->register ($regex, $prio) 2015=item cf::map->register ($regex, $prio)
1788 2016
1789Register 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
1794 2022
1795sub register { 2023sub register {
1796 my (undef, $regex, $prio) = @_; 2024 my (undef, $regex, $prio) = @_;
1797 my $pkg = caller; 2025 my $pkg = caller;
1798 2026
1799 no strict;
1800 push @{"$pkg\::ISA"}, __PACKAGE__; 2027 push @{"$pkg\::ISA"}, __PACKAGE__;
1801 2028
1802 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2029 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1803} 2030}
1804 2031
1805# also paths starting with '/' 2032# also paths starting with '/'
1806$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2033$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1807 2034
1808sub thawer_merge { 2035sub thawer_merge {
1809 my ($self, $merge) = @_; 2036 my ($self, $merge) = @_;
1810 2037
1811 # we have to keep some variables in memory intact 2038 # we have to keep some variables in memory intact
1816} 2043}
1817 2044
1818sub normalise { 2045sub normalise {
1819 my ($path, $base) = @_; 2046 my ($path, $base) = @_;
1820 2047
1821 $path = "$path"; # make sure its a string 2048 $path = "$path"; # make sure it's a string
1822 2049
1823 $path =~ s/\.map$//; 2050 $path =~ s/\.map$//;
1824 2051
1825 # map plan: 2052 # map plan:
1826 # 2053 #
1841 $base =~ s{[^/]+/?$}{}; 2068 $base =~ s{[^/]+/?$}{};
1842 $path = "$base/$path"; 2069 $path = "$base/$path";
1843 } 2070 }
1844 2071
1845 for ($path) { 2072 for ($path) {
1846 redo if s{//}{/};
1847 redo if s{/\.?/}{/}; 2073 redo if s{/\.?/}{/};
1848 redo if s{/[^/]+/\.\./}{/}; 2074 redo if s{/[^/]+/\.\./}{/};
1849 } 2075 }
1850 2076
1851 $path 2077 $path
1865 $self->init; # pass $1 etc. 2091 $self->init; # pass $1 etc.
1866 return $self; 2092 return $self;
1867 } 2093 }
1868 } 2094 }
1869 2095
1870 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2096 Carp::cluck "unable to resolve path '$path' (base '$base')";
1871 () 2097 ()
1872} 2098}
1873 2099
2100# may re-bless or do other evil things
1874sub init { 2101sub init {
1875 my ($self) = @_; 2102 my ($self) = @_;
1876 2103
1877 $self 2104 $self
1878} 2105}
1943 $self->{load_path} = $path; 2170 $self->{load_path} = $path;
1944 2171
1945 1 2172 1
1946} 2173}
1947 2174
2175# used to laod the header of an original map
1948sub load_header_orig { 2176sub load_header_orig {
1949 my ($self) = @_; 2177 my ($self) = @_;
1950 2178
1951 $self->load_header_from ($self->load_path) 2179 $self->load_header_from ($self->load_path)
1952} 2180}
1953 2181
2182# used to laod the header of an instantiated map
1954sub load_header_temp { 2183sub load_header_temp {
1955 my ($self) = @_; 2184 my ($self) = @_;
1956 2185
1957 $self->load_header_from ($self->save_path) 2186 $self->load_header_from ($self->save_path)
1958} 2187}
1959 2188
2189# called after loading the header from an instantiated map
1960sub prepare_temp { 2190sub prepare_temp {
1961 my ($self) = @_; 2191 my ($self) = @_;
1962 2192
1963 $self->last_access ((delete $self->{last_access}) 2193 $self->last_access ((delete $self->{last_access})
1964 || $cf::RUNTIME); #d# 2194 || $cf::RUNTIME); #d#
1965 # safety 2195 # safety
1966 $self->{instantiate_time} = $cf::RUNTIME 2196 $self->{instantiate_time} = $cf::RUNTIME
1967 if $self->{instantiate_time} > $cf::RUNTIME; 2197 if $self->{instantiate_time} > $cf::RUNTIME;
1968} 2198}
1969 2199
2200# called after loading the header from an original map
1970sub prepare_orig { 2201sub prepare_orig {
1971 my ($self) = @_; 2202 my ($self) = @_;
1972 2203
1973 $self->{load_original} = 1; 2204 $self->{load_original} = 1;
1974 $self->{instantiate_time} = $cf::RUNTIME; 2205 $self->{instantiate_time} = $cf::RUNTIME;
1998 2229
1999sub find; 2230sub find;
2000sub find { 2231sub find {
2001 my ($path, $origin) = @_; 2232 my ($path, $origin) = @_;
2002 2233
2234 cf::cede_to_tick;
2235
2003 $path = normalise $path, $origin && $origin->path; 2236 $path = normalise $path, $origin;
2004 2237
2005 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2238 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2006 my $guard2 = cf::lock_acquire "map_find:$path"; 2239 my $guard2 = cf::lock_acquire "map_find:$path";
2007 2240
2008 $cf::MAP{$path} || do { 2241 $cf::MAP{$path} || do {
2039 2272
2040 { 2273 {
2041 my $guard = cf::lock_acquire "map_data:$path"; 2274 my $guard = cf::lock_acquire "map_data:$path";
2042 2275
2043 return unless $self->valid; 2276 return unless $self->valid;
2044 return unless $self->in_memory == cf::MAP_SWAPPED; 2277 return unless $self->state == cf::MAP_SWAPPED;
2045
2046 $self->in_memory (cf::MAP_LOADING);
2047 2278
2048 $self->alloc; 2279 $self->alloc;
2049 2280
2050 $self->pre_load; 2281 $self->pre_load;
2051 cf::cede_to_tick; 2282 cf::cede_to_tick;
2052 2283
2284 if (exists $self->{load_path}) {
2053 my $f = new_from_file cf::object::thawer $self->{load_path}; 2285 my $f = new_from_file cf::object::thawer $self->{load_path};
2054 $f->skip_block; 2286 $f->skip_block;
2055 $self->_load_objects ($f) 2287 $self->_load_objects ($f)
2056 or return; 2288 or return;
2057 2289
2058 $self->post_load_original 2290 $self->post_load_original
2059 if delete $self->{load_original}; 2291 if delete $self->{load_original};
2060 2292
2061 if (my $uniq = $self->uniq_path) { 2293 if (my $uniq = $self->uniq_path) {
2062 utf8::encode $uniq; 2294 utf8::encode $uniq;
2063 unless (aio_stat $uniq) { 2295 unless (aio_stat $uniq) {
2064 if (my $f = new_from_file cf::object::thawer $uniq) { 2296 if (my $f = new_from_file cf::object::thawer $uniq) {
2065 $self->clear_unique_items; 2297 $self->clear_unique_items;
2066 $self->_load_objects ($f); 2298 $self->_load_objects ($f);
2067 $f->resolve_delayed_derefs; 2299 $f->resolve_delayed_derefs;
2300 }
2068 } 2301 }
2069 } 2302 }
2070 }
2071 2303
2072 $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);
2073 2311
2074 cf::cede_to_tick; 2312 cf::cede_to_tick;
2075 # now do the right thing for maps 2313 # now do the right thing for maps
2076 $self->link_multipart_objects; 2314 $self->link_multipart_objects;
2077 $self->difficulty ($self->estimate_difficulty) 2315 $self->difficulty ($self->estimate_difficulty)
2081 unless ($self->{deny_activate}) { 2319 unless ($self->{deny_activate}) {
2082 $self->decay_objects; 2320 $self->decay_objects;
2083 $self->fix_auto_apply; 2321 $self->fix_auto_apply;
2084 $self->update_buttons; 2322 $self->update_buttons;
2085 cf::cede_to_tick; 2323 cf::cede_to_tick;
2086 $self->activate; 2324 #$self->activate; # no longer activate maps automatically
2087 } 2325 }
2088 2326
2089 $self->{last_save} = $cf::RUNTIME; 2327 $self->{last_save} = $cf::RUNTIME;
2090 $self->last_access ($cf::RUNTIME); 2328 $self->last_access ($cf::RUNTIME);
2091
2092 $self->in_memory (cf::MAP_ACTIVE);
2093 } 2329 }
2094 2330
2095 $self->post_load; 2331 $self->post_load;
2096}
2097 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
2098sub customise_for { 2339sub customise_for {
2099 my ($self, $ob) = @_; 2340 my ($self, $ob) = @_;
2100 2341
2101 return find "~" . $ob->name . "/" . $self->{path} 2342 return find "~" . $ob->name . "/" . $self->{path}
2102 if $self->per_player; 2343 if $self->per_player;
2105# if $self->per_party; 2346# if $self->per_party;
2106 2347
2107 $self 2348 $self
2108} 2349}
2109 2350
2110# find and load all maps in the 3x3 area around a map
2111sub load_neighbours {
2112 my ($map) = @_;
2113
2114 my @neigh; # diagonal neighbours
2115
2116 for (0 .. 3) {
2117 my $neigh = $map->tile_path ($_)
2118 or next;
2119 $neigh = find $neigh, $map
2120 or next;
2121 $neigh->load;
2122
2123 push @neigh,
2124 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2125 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2126 }
2127
2128 for (grep defined $_->[0], @neigh) {
2129 my ($path, $origin) = @$_;
2130 my $neigh = find $path, $origin
2131 or next;
2132 $neigh->load;
2133 }
2134}
2135
2136sub find_sync { 2351sub find_sync {
2137 my ($path, $origin) = @_; 2352 my ($path, $origin) = @_;
2138 2353
2139 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
2140} 2359}
2141 2360
2142sub do_load_sync { 2361sub do_load_sync {
2143 my ($map) = @_; 2362 my ($map) = @_;
2144 2363
2364 # it's a bug to call this from the main context
2145 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2365 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2146 if $Coro::current == $Coro::main; 2366 if $Coro::current == $Coro::main;
2147 2367
2148 cf::sync_job { $map->load }; 2368 $map->load;
2149} 2369}
2150 2370
2151our %MAP_PREFETCH; 2371our %MAP_PREFETCH;
2152our $MAP_PREFETCHER = undef; 2372our $MAP_PREFETCHER = undef;
2153 2373
2154sub find_async { 2374sub find_async {
2155 my ($path, $origin, $load) = @_; 2375 my ($path, $origin, $load) = @_;
2156 2376
2157 $path = normalise $path, $origin && $origin->{path}; 2377 $path = normalise $path, $origin;
2158 2378
2159 if (my $map = $cf::MAP{$path}) { 2379 if (my $map = $cf::MAP{$path}) {
2160 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2380 return $map if !$load || $map->linkable;
2161 } 2381 }
2162 2382
2163 $MAP_PREFETCH{$path} |= $load; 2383 $MAP_PREFETCH{$path} |= $load;
2164 2384
2165 $MAP_PREFETCHER ||= cf::async { 2385 $MAP_PREFETCHER ||= cf::async {
2179 $MAP_PREFETCHER->prio (6); 2399 $MAP_PREFETCHER->prio (6);
2180 2400
2181 () 2401 ()
2182} 2402}
2183 2403
2404# common code, used by both ->save and ->swapout
2184sub save { 2405sub _save {
2185 my ($self) = @_; 2406 my ($self) = @_;
2186
2187 my $lock = cf::lock_acquire "map_data:$self->{path}";
2188 2407
2189 $self->{last_save} = $cf::RUNTIME; 2408 $self->{last_save} = $cf::RUNTIME;
2190 2409
2191 return unless $self->dirty; 2410 return unless $self->dirty;
2192 2411
2212 } else { 2431 } else {
2213 $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);
2214 } 2433 }
2215} 2434}
2216 2435
2436sub save {
2437 my ($self) = @_;
2438
2439 my $lock = cf::lock_acquire "map_data:$self->{path}";
2440
2441 $self->_save;
2442}
2443
2217sub swap_out { 2444sub swap_out {
2218 my ($self) = @_; 2445 my ($self) = @_;
2219 2446
2220 # save first because save cedes
2221 $self->save;
2222
2223 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2447 my $lock = cf::lock_acquire "map_data:$self->{path}";
2224 2448
2449 return if !$self->linkable;
2450 return if $self->{deny_save};
2225 return if $self->players; 2451 return if $self->players;
2226 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
2227 return if $self->{deny_save}; 2469 return 1e99 if $self->{deny_reset};
2228 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
2229 $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};
2230 2503
2231 $self->deactivate; 2504 $self->deactivate;
2232 $_->clear_links_to ($self) for values %cf::MAP; 2505 $_->clear_links_to ($self) for values %cf::MAP;
2233 $self->clear; 2506 $self->clear;
2234}
2235
2236sub reset_at {
2237 my ($self) = @_;
2238
2239 # TODO: safety, remove and allow resettable per-player maps
2240 return 1e99 if $self->{deny_reset};
2241
2242 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2243 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2244
2245 $time + $to
2246}
2247
2248sub should_reset {
2249 my ($self) = @_;
2250
2251 $self->reset_at <= $cf::RUNTIME
2252}
2253
2254sub reset {
2255 my ($self) = @_;
2256
2257 my $lock = cf::lock_acquire "map_data:$self->{path}";
2258
2259 return if $self->players;
2260
2261 warn "resetting map ", $self->path, "\n";
2262
2263 $self->in_memory (cf::MAP_SWAPPED);
2264
2265 # need to save uniques path
2266 unless ($self->{deny_save}) {
2267 my $uniq = $self->uniq_path; utf8::encode $uniq;
2268
2269 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2270 if $uniq;
2271 }
2272
2273 delete $cf::MAP{$self->path};
2274
2275 $self->deactivate;
2276 $_->clear_links_to ($self) for values %cf::MAP;
2277 $self->clear;
2278 2507
2279 $self->unlink_save; 2508 $self->unlink_save;
2280 $self->destroy; 2509 $self->destroy;
2281} 2510}
2282 2511
2290 2519
2291 delete $cf::MAP{$self->path}; 2520 delete $cf::MAP{$self->path};
2292 2521
2293 $self->unlink_save; 2522 $self->unlink_save;
2294 2523
2295 bless $self, "cf::map"; 2524 bless $self, "cf::map::wrap";
2296 delete $self->{deny_reset}; 2525 delete $self->{deny_reset};
2297 $self->{deny_save} = 1; 2526 $self->{deny_save} = 1;
2298 $self->reset_timeout (1); 2527 $self->reset_timeout (1);
2299 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2528 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2300 2529
2421 2650
2422Creates 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.
2423 2652
2424=item $ob = cf::object::deref ($refstring) 2653=item $ob = cf::object::deref ($refstring)
2425 2654
2426returns 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,
2427even if the object actually exists. May block. 2656even if the object actually exists. May block.
2428 2657
2429=cut 2658=cut
2430 2659
2431sub deref { 2660sub deref {
2530 2759
2531Freezes 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}>).
2532 2761
2533The 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.
2534for 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,
2535though, 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
2536map. 2765map.
2537 2766
2538Will never block. 2767Will never block.
2539 2768
2540=item $player_object->leave_link ($map, $x, $y) 2769=item $player_object->leave_link ($map, $x, $y)
2561sub cf::object::player::enter_link { 2790sub cf::object::player::enter_link {
2562 my ($self) = @_; 2791 my ($self) = @_;
2563 2792
2564 $self->deactivate_recursive; 2793 $self->deactivate_recursive;
2565 2794
2795 ++$self->{_link_recursion};
2796
2566 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2797 return if UNIVERSAL::isa $self->map, "ext::map_link";
2567 2798
2568 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2799 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2569 if $self->map && $self->map->{path} ne "{link}"; 2800 if $self->map && $self->map->{path} ne "{link}";
2570 2801
2571 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2802 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2572} 2803}
2573 2804
2574sub cf::object::player::leave_link { 2805sub cf::object::player::leave_link {
2575 my ($self, $map, $x, $y) = @_; 2806 my ($self, $map, $x, $y) = @_;
2576 2807
2596 # use -1 or undef as default coordinates, not 0, 0 2827 # use -1 or undef as default coordinates, not 0, 0
2597 ($x, $y) = ($map->enter_x, $map->enter_y) 2828 ($x, $y) = ($map->enter_x, $map->enter_y)
2598 if $x <= 0 && $y <= 0; 2829 if $x <= 0 && $y <= 0;
2599 2830
2600 $map->load; 2831 $map->load;
2601 $map->load_neighbours;
2602 2832
2603 return unless $self->contr->active; 2833 return unless $self->contr->active;
2604 2834
2605 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2835 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2606 $self->enter_map ($map, $x, $y); 2836 if ($self->enter_map ($map, $x, $y)) {
2607 2837 # entering was successful
2838 delete $self->{_link_recursion};
2608 # only activate afterwards, to support waiting in hooks 2839 # only activate afterwards, to support waiting in hooks
2609 $self->activate_recursive; 2840 $self->activate_recursive;
2610} 2841 }
2611 2842
2843}
2844
2612=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)]])
2613 2846
2614Moves 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
2615her, loading and preparing them map, calling the provided $check callback 2848her, loading and preparing them map, calling the provided $check callback
2616that 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
2617the 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
2624 2857
2625our $GOTOGEN; 2858our $GOTOGEN;
2626 2859
2627sub cf::object::player::goto { 2860sub cf::object::player::goto {
2628 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 }
2629 2868
2630 # 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
2631 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2870 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2632 2871
2633 $self->enter_link; 2872 $self->enter_link;
2653 ($path, $x, $y) = (undef, undef, undef); 2892 ($path, $x, $y) = (undef, undef, undef);
2654 } 2893 }
2655 } 2894 }
2656 2895
2657 my $map = eval { 2896 my $map = eval {
2658 my $map = defined $path ? cf::map::find $path : undef; 2897 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2659 2898
2660 if ($map) { 2899 if ($map) {
2661 $map = $map->customise_for ($self); 2900 $map = $map->customise_for ($self);
2662 $map = $check->($map) if $check && $map; 2901 $map = $check->($map, $x, $y, $self) if $check && $map;
2663 } else { 2902 } else {
2664 $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);
2665 } 2904 }
2666 2905
2667 $map 2906 $map
2675 if ($gen == $self->{_goto_generation}) { 2914 if ($gen == $self->{_goto_generation}) {
2676 delete $self->{_goto_generation}; 2915 delete $self->{_goto_generation};
2677 $self->leave_link ($map, $x, $y); 2916 $self->leave_link ($map, $x, $y);
2678 } 2917 }
2679 2918
2680 $done->() if $done; 2919 $done->($self) if $done;
2681 })->prio (1); 2920 })->prio (1);
2682} 2921}
2683 2922
2684=item $player_object->enter_exit ($exit_object) 2923=item $player_object->enter_exit ($exit_object)
2685 2924
2753 $Coro::current->{desc} = "enter_exit"; 2992 $Coro::current->{desc} = "enter_exit";
2754 2993
2755 unless (eval { 2994 unless (eval {
2756 $self->deactivate_recursive; # just to be sure 2995 $self->deactivate_recursive; # just to be sure
2757 2996
2758 # random map handling
2759 {
2760 my $guard = cf::lock_acquire "exit_prepare:$exit";
2761
2762 prepare_random_map $exit
2763 if $exit->slaying eq "/!";
2764 }
2765
2766 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2997 my $map = cf::map::normalise $exit->slaying, $exit->map;
2767 my $x = $exit->stats->hp; 2998 my $x = $exit->stats->hp;
2768 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 }
2769 3023
2770 $self->goto ($map, $x, $y); 3024 $self->goto ($map, $x, $y);
2771 3025
2772 # if exit is damned, update players death & WoR home-position 3026 # if exit is damned, update players death & WoR home-position
2773 $self->contr->savebed ($map, $x, $y) 3027 $self->contr->savebed ($map, $x, $y)
2778 $self->message ("Something went wrong deep within the deliantra server. " 3032 $self->message ("Something went wrong deep within the deliantra server. "
2779 . "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. "
2780 . "Please report this to the dungeon master!", 3034 . "Please report this to the dungeon master!",
2781 cf::NDI_UNIQUE | cf::NDI_RED); 3035 cf::NDI_UNIQUE | cf::NDI_RED);
2782 3036
2783 warn "ERROR in enter_exit: $@"; 3037 error "ERROR in enter_exit: $@";
2784 $self->leave_link; 3038 $self->leave_link;
2785 } 3039 }
2786 })->prio (1); 3040 })->prio (1);
2787} 3041}
2788 3042
2789=head3 cf::client 3043=head3 cf::client
2790 3044
2791=over 4 3045=over 4
2792
2793=item $client->send_drawinfo ($text, $flags)
2794
2795Sends a drawinfo packet to the client. Circumvents output buffering so
2796should not be used under normal circumstances.
2797
2798=cut
2799
2800sub cf::client::send_drawinfo {
2801 my ($self, $text, $flags) = @_;
2802
2803 utf8::encode $text;
2804 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2805}
2806 3046
2807=item $client->send_big_packet ($pkt) 3047=item $client->send_big_packet ($pkt)
2808 3048
2809Like C<send_packet>, but tries to compress large packets, and fragments 3049Like C<send_packet>, but tries to compress large packets, and fragments
2810them as required. 3050them as required.
2829 $self->send_packet ($pkt); 3069 $self->send_packet ($pkt);
2830} 3070}
2831 3071
2832=item $client->send_msg ($channel, $msg, $color, [extra...]) 3072=item $client->send_msg ($channel, $msg, $color, [extra...])
2833 3073
2834Send a drawinfo or msg packet to the client, formatting the msg for the 3074Send a msg packet to the client, formatting the msg for the client if
2835client if neccessary. C<$type> should be a string identifying the type of 3075necessary. C<$type> should be a string identifying the type of the
2836the message, with C<log> being the default. If C<$color> is negative, suppress 3076message, with C<log> being the default. If C<$color> is negative, suppress
2837the message unless the client supports the msg packet. 3077the message unless the client supports the msg packet.
2838 3078
2839=cut 3079=cut
2840 3080
2841# non-persistent channels (usually the info channel) 3081# non-persistent channels (usually the info channel)
2946 id => "death", 3186 id => "death",
2947 title => "Death", 3187 title => "Death",
2948 reply => undef, 3188 reply => undef,
2949 tooltip => "Reason for and more info about your most recent death", 3189 tooltip => "Reason for and more info about your most recent death",
2950 }, 3190 },
3191 "c/fatal" => {
3192 id => "fatal",
3193 title => "Fatal Error",
3194 reply => undef,
3195 tooltip => "Reason for the server disconnect",
3196 },
2951 "c/say" => $SAY_CHANNEL, 3197 "c/say" => $SAY_CHANNEL,
2952 "c/chat" => $CHAT_CHANNEL, 3198 "c/chat" => $CHAT_CHANNEL,
2953); 3199);
2954 3200
2955sub cf::client::send_msg { 3201sub cf::client::send_msg {
2998=cut 3244=cut
2999 3245
3000sub cf::client::ext_msg($$@) { 3246sub cf::client::ext_msg($$@) {
3001 my ($self, $type, @msg) = @_; 3247 my ($self, $type, @msg) = @_;
3002 3248
3003 if ($self->extcmd == 2) {
3004 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3249 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3005 } elsif ($self->extcmd == 1) { # TODO: remove
3006 push @msg, msgtype => "event_$type";
3007 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3008 }
3009}
3010
3011=item $client->ext_reply ($msgid, @msg)
3012
3013Sends an ext reply to the client.
3014
3015=cut
3016
3017sub cf::client::ext_reply($$@) {
3018 my ($self, $id, @msg) = @_;
3019
3020 if ($self->extcmd == 2) {
3021 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3022 } elsif ($self->extcmd == 1) {
3023 #TODO: version 1, remove
3024 unshift @msg, msgtype => "reply", msgid => $id;
3025 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3026 }
3027} 3250}
3028 3251
3029=item $success = $client->query ($flags, "text", \&cb) 3252=item $success = $client->query ($flags, "text", \&cb)
3030 3253
3031Queues a query to the client, calling the given callback with 3254Queues a query to the client, calling the given callback with
3051 3274
3052 $self->send_packet ($self->{query_queue}[0][0]) 3275 $self->send_packet ($self->{query_queue}[0][0])
3053 if @{ $self->{query_queue} } == 1; 3276 if @{ $self->{query_queue} } == 1;
3054 3277
3055 1 3278 1
3279}
3280
3281=item $client->update_command_faces
3282
3283=cut
3284
3285our %COMMAND_FACE;
3286
3287sub cf::client::update_command_faces {
3288 my ($self) = @_;
3289
3290 my @faces = grep $_,
3291 $COMMAND_FACE{standard},
3292 $COMMAND_FACE{emote},
3293 $COMMAND_FACE{skill},
3294 $self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
3295 ;
3296
3297 $self->send_face ($_)
3298 for @faces;
3299 $self->flush_fx;
3300
3301 $self->ext_msg (command_list => @faces);
3302}
3303
3304=item cf::client::set_command_face $type, $commands
3305
3306=cut
3307
3308sub cf::client::set_command_face {
3309 my ($type, $list) = @_;
3310
3311 my $idx = &cf::face::set ( #d# ugly forward reference
3312 "command_list/$type" => cf::FT_RSRC,
3313 JSON::XS->new->utf8->encode ([ sort @$list ])
3314 );
3315
3316 $COMMAND_FACE{$type} = $idx;
3056} 3317}
3057 3318
3058cf::client->attach ( 3319cf::client->attach (
3059 on_connect => sub { 3320 on_connect => sub {
3060 my ($ns) = @_; 3321 my ($ns) = @_;
3086 my ($ns, $buf) = @_; 3347 my ($ns, $buf) = @_;
3087 3348
3088 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3349 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3089 3350
3090 if (ref $msg) { 3351 if (ref $msg) {
3091 my ($type, $reply, @payload) = 3352 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3092 "ARRAY" eq ref $msg
3093 ? @$msg
3094 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3095 3353
3096 my @reply;
3097
3098 if (my $cb = $EXTICMD{$type}) { 3354 if (my $cb = $EXTIACMD{$type}) {
3355 $cb->(
3356 $ns,
3357 sub {
3358 $ns->ext_msg ("reply-$reply", @_)
3359 if $reply;
3360 },
3361 @payload
3362 );
3363 } else {
3364 my @reply;
3365
3366 if (my $cb = $EXTICMD{$type}) {
3099 @reply = $cb->($ns, @payload); 3367 @reply = $cb->($ns, @payload);
3368 }
3369
3370 $ns->ext_msg ("reply-$reply", @reply)
3371 if $reply;
3100 } 3372 }
3101
3102 $ns->ext_reply ($reply, @reply)
3103 if $reply;
3104
3105 } else { 3373 } else {
3106 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3374 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3107 } 3375 }
3108 3376
3109 cf::override; 3377 cf::override;
3110 }, 3378 },
3111); 3379);
3131 3399
3132 $coro 3400 $coro
3133} 3401}
3134 3402
3135cf::client->attach ( 3403cf::client->attach (
3136 on_destroy => sub { 3404 on_client_destroy => sub {
3137 my ($ns) = @_; 3405 my ($ns) = @_;
3138 3406
3139 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3407 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3140 }, 3408 },
3141); 3409);
3192 decrease split destroy change_exp value msg lore send_msg)], 3460 decrease split destroy change_exp value msg lore send_msg)],
3193 ["cf::object::player" => qw(player)], 3461 ["cf::object::player" => qw(player)],
3194 ["cf::player" => qw(peaceful send_msg)], 3462 ["cf::player" => qw(peaceful send_msg)],
3195 ["cf::map" => qw(trigger)], 3463 ["cf::map" => qw(trigger)],
3196) { 3464) {
3197 no strict 'refs';
3198 my ($pkg, @funs) = @$_; 3465 my ($pkg, @funs) = @$_;
3199 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3466 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3200 for @funs; 3467 for @funs;
3201} 3468}
3202 3469
3241 local @cf::_safe_eval_args = values %vars; 3508 local @cf::_safe_eval_args = values %vars;
3242 @res = wantarray ? eval eval : scalar eval $eval; 3509 @res = wantarray ? eval eval : scalar eval $eval;
3243 } 3510 }
3244 3511
3245 if ($@) { 3512 if ($@) {
3246 warn "$@"; 3513 warn "$@",
3247 warn "while executing safe code '$code'\n"; 3514 "while executing safe code '$code'\n",
3248 warn "with arguments " . (join " ", %vars) . "\n"; 3515 "with arguments " . (join " ", %vars) . "\n";
3249 } 3516 }
3250 3517
3251 wantarray ? @res : $res[0] 3518 wantarray ? @res : $res[0]
3252} 3519}
3253 3520
3278=cut 3545=cut
3279 3546
3280############################################################################# 3547#############################################################################
3281# the server's init and main functions 3548# the server's init and main functions
3282 3549
3550{
3551 package cf::face;
3552
3553 our %HASH; # hash => idx
3554 our @DATA; # dynamically-created facedata, only faceste 0 used
3555 our @FOFS; # file offset, if > 0
3556 our @SIZE; # size of face, in octets
3557 our @META; # meta hash of face, if any
3558 our $DATAFH; # facedata filehandle
3559
3560 # internal api, not finalised
3561 sub set {
3562 my ($name, $type, $data) = @_;
3563
3564 my $idx = cf::face::find $name;
3565
3566 if ($idx) {
3567 delete $HASH{cf::face::get_csum $idx};
3568 } else {
3569 $idx = cf::face::alloc $name;
3570 }
3571
3572 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3573
3574 cf::face::set_type $idx, $type;
3575 cf::face::set_csum $idx, 0, $hash;
3576
3577 # we need to destroy the SV itself, not just modify it, as a running ix
3578 # might hold a reference to it: "delete" achieves that.
3579 delete $FOFS[0][$idx];
3580 delete $DATA[0][$idx];
3581 $DATA[0][$idx] = $data;
3582 $SIZE[0][$idx] = length $data;
3583 delete $META[$idx];
3584 $HASH{$hash} = $idx;#d#
3585
3586 $idx
3587 }
3588
3589 sub _get_data($$$) {
3590 my ($idx, $set, $cb) = @_;
3591
3592 if (defined $DATA[$set][$idx]) {
3593 $cb->($DATA[$set][$idx]);
3594 } elsif (my $fofs = $FOFS[$set][$idx]) {
3595 my $size = $SIZE[$set][$idx];
3596 my $buf;
3597 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3598 if ($_[0] == $size) {
3599 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3600 $cb->($buf);
3601 } else {
3602 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3603 }
3604 };
3605 } else {
3606 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3607 }
3608 }
3609
3610 # rather ineffient
3611 sub cf::face::get_data($;$) {
3612 my ($idx, $set) = @_;
3613
3614 _get_data $idx, $set, Coro::rouse_cb;
3615 Coro::rouse_wait
3616 }
3617
3618 sub cf::face::ix {
3619 my ($ns, $set, $idx, $pri) = @_;
3620
3621 _get_data $idx, $set, sub {
3622 $ns->ix_send ($idx, $pri, $_[0]);
3623 };
3624 }
3625}
3626
3283sub load_facedata($) { 3627sub load_facedata($) {
3284 my ($path) = @_; 3628 my ($path) = @_;
3285 3629
3286 # HACK to clear player env face cache, we need some signal framework
3287 # for this (global event?)
3288 %ext::player_env::MUSIC_FACE_CACHE = ();
3289
3290 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3630 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3291 3631
3292 warn "loading facedata from $path\n"; 3632 trace "loading facedata from $path\n";
3293 3633
3294 my $facedata; 3634 my $facedata = decode_storable load_file "$path/faceinfo";
3295 0 < aio_load $path, $facedata
3296 or die "$path: $!";
3297
3298 $facedata = Coro::Storable::thaw $facedata;
3299 3635
3300 $facedata->{version} == 2 3636 $facedata->{version} == 2
3301 or cf::cleanup "$path: version mismatch, cannot proceed."; 3637 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3302 3638
3303 # patch in the exptable 3639 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3304 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]); 3640 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3305 $facedata->{resource}{"res/exp_table"} = { 3641
3306 type => FT_RSRC, 3642 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3307 data => $exp_table, 3643
3308 hash => (Digest::MD5::md5 $exp_table), 3644 # BEGIN ATOMIC
3309 }; 3645 # from here on, everything must be atomic - no thread switch allowed
3310 cf::cede_to_tick; 3646 my $t1 = EV::time;
3311 3647
3312 { 3648 {
3313 my $faces = $facedata->{faceinfo}; 3649 my $faces = $facedata->{faceinfo};
3314 3650
3315 while (my ($face, $info) = each %$faces) { 3651 for my $face (sort keys %$faces) {
3652 my $info = $faces->{$face};
3316 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3653 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3317 3654
3318 cf::face::set_visibility $idx, $info->{visibility}; 3655 cf::face::set_visibility $idx, $info->{visibility};
3319 cf::face::set_magicmap $idx, $info->{magicmap}; 3656 cf::face::set_magicmap $idx, $info->{magicmap};
3320 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3657 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3321 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3658 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3322 3659 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3323 cf::cede_to_tick; 3660 $cf::face::HASH{$info->{hash64}} = $idx;
3661 delete $cf::face::META[$idx];
3324 } 3662 }
3325 3663
3326 while (my ($face, $info) = each %$faces) { 3664 while (my ($face, $info) = each %$faces) {
3327 next unless $info->{smooth}; 3665 next unless $info->{smooth};
3328 3666
3331 3669
3332 if (my $smooth = cf::face::find $info->{smooth}) { 3670 if (my $smooth = cf::face::find $info->{smooth}) {
3333 cf::face::set_smooth $idx, $smooth; 3671 cf::face::set_smooth $idx, $smooth;
3334 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3672 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3335 } else { 3673 } else {
3336 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3674 error "smooth face '$info->{smooth}' not found for face '$face'";
3337 } 3675 }
3338
3339 cf::cede_to_tick;
3340 } 3676 }
3341 } 3677 }
3342 3678
3343 { 3679 {
3344 my $anims = $facedata->{animinfo}; 3680 my $anims = $facedata->{animinfo};
3345 3681
3346 while (my ($anim, $info) = each %$anims) { 3682 while (my ($anim, $info) = each %$anims) {
3347 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3683 cf::anim::set $anim, $info->{frames}, $info->{facings};
3348 cf::cede_to_tick;
3349 } 3684 }
3350 3685
3351 cf::anim::invalidate_all; # d'oh 3686 cf::anim::invalidate_all; # d'oh
3352 } 3687 }
3353 3688
3354 { 3689 {
3355 my $res = $facedata->{resource}; 3690 my $res = $facedata->{resource};
3356 3691
3357 while (my ($name, $info) = each %$res) { 3692 while (my ($name, $info) = each %$res) {
3358 if (defined $info->{type}) { 3693 if (defined (my $type = $info->{type})) {
3694 # TODO: different hash - must free and use new index, or cache ixface data queue
3359 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3695 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3360 3696
3361 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3362 cf::face::set_type $idx, $info->{type}; 3697 cf::face::set_type $idx, $type;
3698 cf::face::set_csum $idx, 0, $info->{hash};
3699 $cf::face::SIZE[0][$idx] = $info->{size};
3700 $cf::face::FOFS[0][$idx] = $info->{fofs};
3701 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3702 $cf::face::HASH{$info->{hash}} = $idx;
3363 } else { 3703 } else {
3364 $RESOURCE{$name} = $info; 3704# $RESOURCE{$name} = $info; # unused
3365 } 3705 }
3366
3367 cf::cede_to_tick;
3368 } 3706 }
3369 } 3707 }
3708
3709 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3710
3711 # HACK to clear player env face cache, we need some signal framework
3712 # for this (global event?)
3713 %ext::player_env::MUSIC_FACE_CACHE = ();
3714
3715 # END ATOMIC
3716
3717 cf::debug "facedata atomic update time ", EV::time - $t1;
3370 3718
3371 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3719 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3372 3720
3721 aio_close $fh if $fh; # close old facedata
3722
3373 1 3723 1
3374} 3724}
3375
3376cf::global->attach (on_resource_update => sub {
3377 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3378 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3379
3380 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3381 my $sound = $soundconf->{compat}[$_]
3382 or next;
3383
3384 my $face = cf::face::find "sound/$sound->[1]";
3385 cf::sound::set $sound->[0] => $face;
3386 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3387 }
3388
3389 while (my ($k, $v) = each %{$soundconf->{event}}) {
3390 my $face = cf::face::find "sound/$v";
3391 cf::sound::set $k => $face;
3392 }
3393 }
3394});
3395 3725
3396register_exticmd fx_want => sub { 3726register_exticmd fx_want => sub {
3397 my ($ns, $want) = @_; 3727 my ($ns, $want) = @_;
3398 3728
3399 while (my ($k, $v) = each %$want) { 3729 while (my ($k, $v) = each %$want) {
3407 my $status = load_resource_file_ $_[0]; 3737 my $status = load_resource_file_ $_[0];
3408 get_slot 0.1, 100; 3738 get_slot 0.1, 100;
3409 cf::arch::commit_load; 3739 cf::arch::commit_load;
3410 3740
3411 $status 3741 $status
3742}
3743
3744sub reload_exp_table {
3745 _reload_exp_table;
3746
3747 cf::face::set
3748 "res/exp_table" => FT_RSRC,
3749 JSON::XS->new->utf8->canonical->encode (
3750 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3751 );
3752}
3753
3754sub reload_materials {
3755 _reload_materials;
3412} 3756}
3413 3757
3414sub reload_regions { 3758sub reload_regions {
3415 # HACK to clear player env face cache, we need some signal framework 3759 # HACK to clear player env face cache, we need some signal framework
3416 # for this (global event?) 3760 # for this (global event?)
3424 if exists $_->{match}; 3768 if exists $_->{match};
3425 } 3769 }
3426} 3770}
3427 3771
3428sub reload_facedata { 3772sub reload_facedata {
3429 load_facedata "$DATADIR/facedata" 3773 load_facedata $DATADIR
3430 or die "unable to load facedata\n"; 3774 or die "unable to load facedata\n";
3431} 3775}
3432 3776
3433sub reload_archetypes { 3777sub reload_archetypes {
3434 load_resource_file "$DATADIR/archetypes" 3778 load_resource_file "$DATADIR/archetypes"
3435 or die "unable to load archetypes\n"; 3779 or die "unable to load archetypes\n";
3780
3781 cf::face::set
3782 "res/skill_info" => FT_RSRC,
3783 JSON::XS->new->utf8->canonical->encode (
3784 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3785 );
3786
3787 cf::face::set
3788 "res/spell_paths" => FT_RSRC,
3789 JSON::XS->new->utf8->canonical->encode (
3790 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3791 );
3792
3793 # command completion
3794 my @commands;
3795
3796 for (0..cf::arch::skillvec_size - 1) {
3797 my $skill = cf::arch::skillvec $_;
3798 my $name = $skill->name;
3799 my $flags = cf::skill_flags $skill->subtype;
3800
3801 push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
3802 push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
3803 }
3804
3805 cf::client::set_command_face skill => \@commands;
3436} 3806}
3437 3807
3438sub reload_treasures { 3808sub reload_treasures {
3439 load_resource_file "$DATADIR/treasures" 3809 load_resource_file "$DATADIR/treasures"
3440 or die "unable to load treasurelists\n"; 3810 or die "unable to load treasurelists\n";
3441} 3811}
3442 3812
3813sub reload_sound {
3814 trace "loading sound config from $DATADIR/sound\n";
3815
3816 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3817
3818 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3819 my $sound = $soundconf->{compat}[$_]
3820 or next;
3821
3822 my $face = cf::face::find "sound/$sound->[1]";
3823 cf::sound::set $sound->[0] => $face;
3824 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3825 }
3826
3827 while (my ($k, $v) = each %{$soundconf->{event}}) {
3828 my $face = cf::face::find "sound/$v";
3829 cf::sound::set $k => $face;
3830 }
3831}
3832
3443sub reload_resources { 3833sub reload_resources {
3444 warn "reloading resource files...\n"; 3834 trace "reloading resource files...\n";
3445 3835
3836 reload_materials;
3446 reload_facedata; 3837 reload_facedata;
3838 reload_exp_table;
3839 reload_sound;
3447 reload_archetypes; 3840 reload_archetypes;
3448 reload_regions; 3841 reload_regions;
3449 reload_treasures; 3842 reload_treasures;
3450 3843
3451 warn "finished reloading resource files\n"; 3844 trace "finished reloading resource files\n";
3452} 3845}
3453 3846
3454sub reload_config { 3847sub reload_config {
3455 warn "reloading config file...\n"; 3848 trace "reloading config file...\n";
3456 3849
3457 open my $fh, "<:utf8", "$CONFDIR/config" 3850 my $config = load_file "$CONFDIR/config";
3458 or return; 3851 utf8::decode $config;
3852 *CFG = decode_yaml $config;
3459 3853
3460 local $/;
3461 *CFG = YAML::XS::Load scalar <$fh>;
3462
3463 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3854 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3464 3855
3465 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3856 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3466 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3857 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3467 3858
3468 if (exists $CFG{mlockall}) { 3859 if (exists $CFG{mlockall}) {
3470 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3861 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3471 and die "WARNING: m(un)lockall failed: $!\n"; 3862 and die "WARNING: m(un)lockall failed: $!\n";
3472 }; 3863 };
3473 warn $@ if $@; 3864 warn $@ if $@;
3474 } 3865 }
3475
3476 warn "finished reloading resource files\n";
3477} 3866}
3478 3867
3479sub pidfile() { 3868sub pidfile() {
3480 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3869 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3481 or die "$PIDFILE: $!"; 3870 or die "$PIDFILE: $!";
3494 seek $fh, 0, 0; 3883 seek $fh, 0, 0;
3495 print $fh $$; 3884 print $fh $$;
3496} 3885}
3497 3886
3498sub main_loop { 3887sub main_loop {
3499 warn "EV::loop starting\n"; 3888 trace "EV::loop starting\n";
3500 if (1) { 3889 if (1) {
3501 EV::loop; 3890 EV::loop;
3502 } 3891 }
3503 warn "EV::loop returned\n"; 3892 trace "EV::loop returned\n";
3504 goto &main_loop unless $REALLY_UNLOOP; 3893 goto &main_loop unless $REALLY_UNLOOP;
3505} 3894}
3506 3895
3507sub main { 3896sub main {
3508 cf::init_globals; # initialise logging 3897 cf::init_globals; # initialise logging
3509 3898
3510 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3899 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3511 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3900 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3512 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3901 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3513 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3902 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3514 3903
3515 cf::init_experience;
3516 cf::init_anim;
3517 cf::init_attackmess;
3518 cf::init_dynamic;
3519
3520 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3904 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3521 3905
3522 # we must not ever block the main coroutine 3906 # we must not ever block the main coroutine
3523 local $Coro::idle = sub { 3907 $Coro::idle = sub {
3524 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3908 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3525 (async { 3909 (async {
3526 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3910 $Coro::current->{desc} = "IDLE BUG HANDLER";
3527 EV::loop EV::LOOP_ONESHOT; 3911 EV::loop EV::LOOP_ONESHOT;
3528 })->prio (Coro::PRIO_MAX); 3912 })->prio (Coro::PRIO_MAX);
3529 }; 3913 };
3530 3914
3531 evthread_start IO::AIO::poll_fileno; 3915 evthread_start IO::AIO::poll_fileno;
3532 3916
3533 cf::sync_job { 3917 cf::sync_job {
3918 cf::incloader::init ();
3919
3920 db_init;
3921
3922 cf::init_anim;
3923 cf::init_attackmess;
3924 cf::init_dynamic;
3925
3534 cf::load_settings; 3926 cf::load_settings;
3535 cf::load_materials;
3536 3927
3537 reload_resources; 3928 reload_resources;
3538 reload_config; 3929 reload_config;
3539 db_init;
3540 3930
3541 cf::init_uuid; 3931 cf::init_uuid;
3542 cf::init_signals; 3932 cf::init_signals;
3543 cf::init_commands;
3544 cf::init_skills; 3933 cf::init_skills;
3545 3934
3546 cf::init_beforeplay; 3935 cf::init_beforeplay;
3547 3936
3548 atomic; 3937 atomic;
3553 3942
3554 # no (long-running) fork's whatsoever before this point(!) 3943 # no (long-running) fork's whatsoever before this point(!)
3555 use POSIX (); 3944 use POSIX ();
3556 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3945 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3557 3946
3558 (pop @POST_INIT)->(0) while @POST_INIT; 3947 cf::_post_init 0;
3559 }; 3948 };
3560 3949
3950 cf::object::thawer::errors_are_fatal 0;
3951 info "parse errors in files are no longer fatal from this point on.\n";
3952
3953 AE::postpone {
3954 undef &main; # free gobs of memory :)
3955 };
3956
3561 main_loop; 3957 goto &main_loop;
3562} 3958}
3563 3959
3564############################################################################# 3960#############################################################################
3565# initialisation and cleanup 3961# initialisation and cleanup
3566 3962
3567# install some emergency cleanup handlers 3963# install some emergency cleanup handlers
3568BEGIN { 3964BEGIN {
3569 our %SIGWATCHER = (); 3965 our %SIGWATCHER = ();
3570 for my $signal (qw(INT HUP TERM)) { 3966 for my $signal (qw(INT HUP TERM)) {
3571 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3967 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3572 cf::cleanup "SIG$signal"; 3968 cf::cleanup "SIG$signal";
3573 }; 3969 };
3574 } 3970 }
3575} 3971}
3576 3972
3577sub write_runtime_sync { 3973sub write_runtime_sync {
3578 my $t0 = EV::time; 3974 my $t0 = AE::time;
3579 3975
3580 # first touch the runtime file to show we are still running: 3976 # first touch the runtime file to show we are still running:
3581 # the fsync below can take a very very long time. 3977 # the fsync below can take a very very long time.
3582 3978
3583 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3979 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3605 or return; 4001 or return;
3606 4002
3607 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 4003 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3608 and return; 4004 and return;
3609 4005
3610 warn sprintf "runtime file written (%gs).\n", EV::time - $t0; 4006 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3611 4007
3612 1 4008 1
3613} 4009}
3614 4010
3615our $uuid_lock; 4011our $uuid_lock;
3627 or return; 4023 or return;
3628 4024
3629 my $value = uuid_seq uuid_cur; 4025 my $value = uuid_seq uuid_cur;
3630 4026
3631 unless ($value) { 4027 unless ($value) {
3632 warn "cowardly refusing to write zero uuid value!\n"; 4028 info "cowardly refusing to write zero uuid value!\n";
3633 return; 4029 return;
3634 } 4030 }
3635 4031
3636 my $value = uuid_str $value + $uuid_skip; 4032 my $value = uuid_str $value + $uuid_skip;
3637 $uuid_skip = 0; 4033 $uuid_skip = 0;
3647 or return; 4043 or return;
3648 4044
3649 aio_rename "$uuid~", $uuid 4045 aio_rename "$uuid~", $uuid
3650 and return; 4046 and return;
3651 4047
3652 warn "uuid file written ($value).\n"; 4048 trace "uuid file written ($value).\n";
3653 4049
3654 1 4050 1
3655 4051
3656} 4052}
3657 4053
3663} 4059}
3664 4060
3665sub emergency_save() { 4061sub emergency_save() {
3666 my $freeze_guard = cf::freeze_mainloop; 4062 my $freeze_guard = cf::freeze_mainloop;
3667 4063
3668 warn "emergency_perl_save: enter\n"; 4064 info "emergency_perl_save: enter\n";
4065
4066 # this is a trade-off: we want to be very quick here, so
4067 # save all maps without fsync, and later call a global sync
4068 # (which in turn might be very very slow)
4069 local $USE_FSYNC = 0;
3669 4070
3670 cf::sync_job { 4071 cf::sync_job {
3671 # this is a trade-off: we want to be very quick here, so 4072 cf::write_runtime_sync; # external watchdog should not bark
3672 # save all maps without fsync, and later call a global sync
3673 # (which in turn might be very very slow)
3674 local $USE_FSYNC = 0;
3675 4073
3676 # use a peculiar iteration method to avoid tripping on perl 4074 # use a peculiar iteration method to avoid tripping on perl
3677 # refcount bugs in for. also avoids problems with players 4075 # refcount bugs in for. also avoids problems with players
3678 # and maps saved/destroyed asynchronously. 4076 # and maps saved/destroyed asynchronously.
3679 warn "emergency_perl_save: begin player save\n"; 4077 info "emergency_perl_save: begin player save\n";
3680 for my $login (keys %cf::PLAYER) { 4078 for my $login (keys %cf::PLAYER) {
3681 my $pl = $cf::PLAYER{$login} or next; 4079 my $pl = $cf::PLAYER{$login} or next;
3682 $pl->valid or next; 4080 $pl->valid or next;
3683 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4081 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3684 $pl->save; 4082 $pl->save;
3685 } 4083 }
3686 warn "emergency_perl_save: end player save\n"; 4084 info "emergency_perl_save: end player save\n";
3687 4085
4086 cf::write_runtime_sync; # external watchdog should not bark
4087
3688 warn "emergency_perl_save: begin map save\n"; 4088 info "emergency_perl_save: begin map save\n";
3689 for my $path (keys %cf::MAP) { 4089 for my $path (keys %cf::MAP) {
3690 my $map = $cf::MAP{$path} or next; 4090 my $map = $cf::MAP{$path} or next;
3691 $map->valid or next; 4091 $map->valid or next;
3692 $map->save; 4092 $map->save;
3693 } 4093 }
3694 warn "emergency_perl_save: end map save\n"; 4094 info "emergency_perl_save: end map save\n";
3695 4095
4096 cf::write_runtime_sync; # external watchdog should not bark
4097
3696 warn "emergency_perl_save: begin database checkpoint\n"; 4098 info "emergency_perl_save: begin database checkpoint\n";
3697 BDB::db_env_txn_checkpoint $DB_ENV; 4099 BDB::db_env_txn_checkpoint $DB_ENV;
3698 warn "emergency_perl_save: end database checkpoint\n"; 4100 info "emergency_perl_save: end database checkpoint\n";
3699 4101
3700 warn "emergency_perl_save: begin write uuid\n"; 4102 info "emergency_perl_save: begin write uuid\n";
3701 write_uuid_sync 1; 4103 write_uuid_sync 1;
3702 warn "emergency_perl_save: end write uuid\n"; 4104 info "emergency_perl_save: end write uuid\n";
4105
4106 cf::write_runtime_sync; # external watchdog should not bark
4107
4108 trace "emergency_perl_save: syncing database to disk";
4109 BDB::db_env_txn_checkpoint $DB_ENV;
4110
4111 info "emergency_perl_save: starting sync\n";
4112 IO::AIO::aio_sync sub {
4113 info "emergency_perl_save: finished sync\n";
4114 };
4115
4116 cf::write_runtime_sync; # external watchdog should not bark
4117
4118 trace "emergency_perl_save: flushing outstanding aio requests";
4119 while (IO::AIO::nreqs || BDB::nreqs) {
4120 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4121 }
4122
4123 cf::write_runtime_sync; # external watchdog should not bark
3703 }; 4124 };
3704 4125
3705 warn "emergency_perl_save: starting sync()\n";
3706 IO::AIO::aio_sync sub {
3707 warn "emergency_perl_save: finished sync()\n";
3708 };
3709
3710 warn "emergency_perl_save: leave\n"; 4126 info "emergency_perl_save: leave\n";
3711} 4127}
3712 4128
3713sub post_cleanup { 4129sub post_cleanup {
3714 my ($make_core) = @_; 4130 my ($make_core) = @_;
3715 4131
4132 IO::AIO::flush;
4133
3716 warn Carp::longmess "post_cleanup backtrace" 4134 error Carp::longmess "post_cleanup backtrace"
3717 if $make_core; 4135 if $make_core;
3718 4136
3719 my $fh = pidfile; 4137 my $fh = pidfile;
3720 unlink $PIDFILE if <$fh> == $$; 4138 unlink $PIDFILE if <$fh> == $$;
3721} 4139}
3741 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4159 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3742 for my $name (keys %$leaf_symtab) { 4160 for my $name (keys %$leaf_symtab) {
3743 _gv_clear *{"$pkg$name"}; 4161 _gv_clear *{"$pkg$name"};
3744# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4162# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3745 } 4163 }
3746 warn "cleared package $pkg\n";#d#
3747} 4164}
3748 4165
3749sub do_reload_perl() { 4166sub do_reload_perl() {
3750 # can/must only be called in main 4167 # can/must only be called in main
3751 if ($Coro::current != $Coro::main) { 4168 unless (in_main) {
3752 warn "can only reload from main coroutine"; 4169 error "can only reload from main coroutine";
3753 return; 4170 return;
3754 } 4171 }
3755 4172
3756 return if $RELOAD++; 4173 return if $RELOAD++;
3757 4174
3758 my $t1 = EV::time; 4175 my $t1 = AE::time;
3759 4176
3760 while ($RELOAD) { 4177 while ($RELOAD) {
3761 warn "reloading..."; 4178 cf::get_slot 0.1, -1, "reload_perl";
4179 info "perl_reload: reloading...";
3762 4180
3763 warn "entering sync_job"; 4181 trace "perl_reload: entering sync_job";
3764 4182
3765 cf::sync_job { 4183 cf::sync_job {
3766 cf::write_runtime_sync; # external watchdog should not bark
3767 cf::emergency_save; 4184 #cf::emergency_save;
3768 cf::write_runtime_sync; # external watchdog should not bark
3769 4185
3770 warn "syncing database to disk";
3771 BDB::db_env_txn_checkpoint $DB_ENV;
3772
3773 # if anything goes wrong in here, we should simply crash as we already saved
3774
3775 warn "flushing outstanding aio requests";
3776 while (IO::AIO::nreqs || BDB::nreqs) {
3777 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3778 }
3779
3780 warn "cancelling all extension coros"; 4186 trace "perl_reload: cancelling all extension coros";
3781 $_->cancel for values %EXT_CORO; 4187 $_->cancel for values %EXT_CORO;
3782 %EXT_CORO = (); 4188 %EXT_CORO = ();
3783 4189
3784 warn "removing commands"; 4190 trace "perl_reload: removing commands";
3785 %COMMAND = (); 4191 %COMMAND = ();
3786 4192
3787 warn "removing ext/exti commands"; 4193 trace "perl_reload: removing ext/exti commands";
3788 %EXTCMD = (); 4194 %EXTCMD = ();
3789 %EXTICMD = (); 4195 %EXTICMD = ();
3790 4196
3791 warn "unloading/nuking all extensions"; 4197 trace "perl_reload: unloading/nuking all extensions";
3792 for my $pkg (@EXTS) { 4198 for my $pkg (@EXTS) {
3793 warn "... unloading $pkg"; 4199 trace "... unloading $pkg";
3794 4200
3795 if (my $cb = $pkg->can ("unload")) { 4201 if (my $cb = $pkg->can ("unload")) {
3796 eval { 4202 eval {
3797 $cb->($pkg); 4203 $cb->($pkg);
3798 1 4204 1
3799 } or warn "$pkg unloaded, but with errors: $@"; 4205 } or error "$pkg unloaded, but with errors: $@";
3800 } 4206 }
3801 4207
3802 warn "... clearing $pkg"; 4208 trace "... clearing $pkg";
3803 clear_package $pkg; 4209 clear_package $pkg;
3804 } 4210 }
3805 4211
3806 warn "unloading all perl modules loaded from $LIBDIR"; 4212 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3807 while (my ($k, $v) = each %INC) { 4213 while (my ($k, $v) = each %INC) {
3808 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4214 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3809 4215
3810 warn "... unloading $k"; 4216 trace "... unloading $k";
3811 delete $INC{$k}; 4217 delete $INC{$k};
3812 4218
3813 $k =~ s/\.pm$//; 4219 $k =~ s/\.pm$//;
3814 $k =~ s/\//::/g; 4220 $k =~ s/\//::/g;
3815 4221
3818 } 4224 }
3819 4225
3820 clear_package $k; 4226 clear_package $k;
3821 } 4227 }
3822 4228
3823 warn "getting rid of safe::, as good as possible"; 4229 trace "perl_reload: getting rid of safe::, as good as possible";
3824 clear_package "safe::$_" 4230 clear_package "safe::$_"
3825 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4231 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3826 4232
3827 warn "unloading cf.pm \"a bit\""; 4233 trace "perl_reload: unloading cf.pm \"a bit\"";
3828 delete $INC{"cf.pm"}; 4234 delete $INC{"cf.pm"};
3829 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4235 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3830 4236
3831 # don't, removes xs symbols, too, 4237 # don't, removes xs symbols, too,
3832 # and global variables created in xs 4238 # and global variables created in xs
3833 #clear_package __PACKAGE__; 4239 #clear_package __PACKAGE__;
3834 4240
3835 warn "unload completed, starting to reload now"; 4241 info "perl_reload: unload completed, starting to reload now";
3836 4242
3837 warn "reloading cf.pm"; 4243 trace "perl_reload: reloading cf.pm";
3838 require cf; 4244 require cf;
3839 cf::_connect_to_perl_1; 4245 cf::_connect_to_perl_1;
3840 4246
3841 warn "loading config and database again"; 4247 trace "perl_reload: loading config and database again";
3842 cf::reload_config; 4248 cf::reload_config;
3843 4249
3844 warn "loading extensions"; 4250 trace "perl_reload: loading extensions";
3845 cf::load_extensions; 4251 cf::load_extensions;
3846 4252
3847 if ($REATTACH_ON_RELOAD) { 4253 if ($REATTACH_ON_RELOAD) {
3848 warn "reattaching attachments to objects/players"; 4254 trace "perl_reload: reattaching attachments to objects/players";
3849 _global_reattach; # objects, sockets 4255 _global_reattach; # objects, sockets
3850 warn "reattaching attachments to maps"; 4256 trace "perl_reload: reattaching attachments to maps";
3851 reattach $_ for values %MAP; 4257 reattach $_ for values %MAP;
3852 warn "reattaching attachments to players"; 4258 trace "perl_reload: reattaching attachments to players";
3853 reattach $_ for values %PLAYER; 4259 reattach $_ for values %PLAYER;
3854 } 4260 }
3855 4261
3856 warn "running post_init jobs"; 4262 cf::_post_init 1;
3857 (pop @POST_INIT)->(1) while @POST_INIT;
3858 4263
3859 warn "leaving sync_job"; 4264 trace "perl_reload: leaving sync_job";
3860 4265
3861 1 4266 1
3862 } or do { 4267 } or do {
3863 warn $@; 4268 error $@;
3864 cf::cleanup "error while reloading, exiting."; 4269 cf::cleanup "perl_reload: error, exiting.";
3865 }; 4270 };
3866 4271
3867 warn "reloaded";
3868 --$RELOAD; 4272 --$RELOAD;
3869 } 4273 }
3870 4274
3871 $t1 = EV::time - $t1; 4275 $t1 = AE::time - $t1;
3872 warn "reload completed in ${t1}s\n"; 4276 info "perl_reload: completed in ${t1}s\n";
3873}; 4277};
3874 4278
3875our $RELOAD_WATCHER; # used only during reload 4279our $RELOAD_WATCHER; # used only during reload
3876 4280
3877sub reload_perl() { 4281sub reload_perl() {
3879 # coro crashes during coro_state_free->destroy here. 4283 # coro crashes during coro_state_free->destroy here.
3880 4284
3881 $RELOAD_WATCHER ||= cf::async { 4285 $RELOAD_WATCHER ||= cf::async {
3882 Coro::AIO::aio_wait cache_extensions; 4286 Coro::AIO::aio_wait cache_extensions;
3883 4287
3884 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4288 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3885 do_reload_perl; 4289 do_reload_perl;
3886 undef $RELOAD_WATCHER; 4290 undef $RELOAD_WATCHER;
3887 }; 4291 };
3888 }; 4292 };
3889} 4293}
3898 reload_perl; 4302 reload_perl;
3899 }; 4303 };
3900 } 4304 }
3901}; 4305};
3902 4306
3903unshift @INC, $LIBDIR; 4307#############################################################################
3904 4308
3905my $bug_warning = 0; 4309my $bug_warning = 0;
3906 4310
3907our @WAIT_FOR_TICK;
3908our @WAIT_FOR_TICK_BEGIN;
3909
3910sub wait_for_tick { 4311sub wait_for_tick() {
3911 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4312 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3912 4313
3913 my $signal = new Coro::Signal; 4314 $WAIT_FOR_TICK->wait;
3914 push @WAIT_FOR_TICK, $signal;
3915 $signal->wait;
3916} 4315}
3917 4316
3918sub wait_for_tick_begin { 4317sub wait_for_tick_begin() {
3919 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4318 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3920 4319
3921 my $signal = new Coro::Signal; 4320 my $signal = new Coro::Signal;
3922 push @WAIT_FOR_TICK_BEGIN, $signal; 4321 push @WAIT_FOR_TICK_BEGIN, $signal;
3923 $signal->wait; 4322 $signal->wait;
3924} 4323}
3928 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4327 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3929 unless ++$bug_warning > 10; 4328 unless ++$bug_warning > 10;
3930 return; 4329 return;
3931 } 4330 }
3932 4331
3933 cf::server_tick; # one server iteration 4332 cf::one_tick; # one server iteration
3934 4333
3935 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d# 4334 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3936 4335
3937 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4336 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3938 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4337 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3939 Coro::async_pool { 4338 Coro::async_pool {
3940 $Coro::current->{desc} = "runtime saver"; 4339 $Coro::current->{desc} = "runtime saver";
3941 write_runtime_sync 4340 write_runtime_sync
3942 or warn "ERROR: unable to write runtime file: $!"; 4341 or error "ERROR: unable to write runtime file: $!";
3943 }; 4342 };
3944 } 4343 }
3945 4344
3946 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4345 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3947 $sig->send; 4346 $sig->send;
3948 } 4347 }
3949 while (my $sig = shift @WAIT_FOR_TICK) { 4348 $WAIT_FOR_TICK->broadcast;
3950 $sig->send;
3951 }
3952 4349
3953 $LOAD = ($NOW - $TICK_START) / $TICK; 4350 $LOAD = ($NOW - $TICK_START) / $TICK;
3954 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4351 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3955 4352
3956 if (0) { 4353 if (0) {
3957 if ($NEXT_TICK) { 4354 if ($NEXT_TICK) {
3958 my $jitter = $TICK_START - $NEXT_TICK; 4355 my $jitter = $TICK_START - $NEXT_TICK;
3959 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4356 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3960 warn "jitter $JITTER\n";#d# 4357 debug "jitter $JITTER\n";#d#
3961 } 4358 }
3962 } 4359 }
3963} 4360}
3964 4361
3965{ 4362{
3966 # configure BDB 4363 # configure BDB
4364 info "initialising database";
3967 4365
3968 BDB::min_parallel 16; 4366 BDB::min_parallel 16;
3969 BDB::max_poll_reqs $TICK * 0.1; 4367 BDB::max_poll_reqs $TICK * 0.1;
3970 $AnyEvent::BDB::WATCHER->priority (1); 4368 #$AnyEvent::BDB::WATCHER->priority (1);
3971 4369
3972 unless ($DB_ENV) { 4370 unless ($DB_ENV) {
3973 $DB_ENV = BDB::db_env_create; 4371 $DB_ENV = BDB::db_env_create;
3974 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4372 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3975 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4373 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4000 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4398 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4001 }; 4399 };
4002 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4400 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4003 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4401 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4004 }; 4402 };
4403
4404 info "database initialised";
4005} 4405}
4006 4406
4007{ 4407{
4008 # configure IO::AIO 4408 # configure IO::AIO
4009 4409
4410 info "initialising aio";
4010 IO::AIO::min_parallel 8; 4411 IO::AIO::min_parallel 8;
4011 IO::AIO::max_poll_time $TICK * 0.1; 4412 IO::AIO::max_poll_time $TICK * 0.1;
4012 undef $AnyEvent::AIO::WATCHER; 4413 undef $AnyEvent::AIO::WATCHER;
4414 info "aio initialised";
4013} 4415}
4014 4416
4015my $_log_backtrace; 4417our $_log_backtrace;
4418our $_log_backtrace_last;
4016 4419
4017sub _log_backtrace { 4420sub _log_backtrace {
4018 my ($msg, @addr) = @_; 4421 my ($msg, @addr) = @_;
4019 4422
4020 $msg =~ s/\n//; 4423 $msg =~ s/\n$//;
4021 4424
4425 if ($_log_backtrace_last eq $msg) {
4426 LOG llevInfo, "[ABT] $msg\n";
4427 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4022 # limit the # of concurrent backtraces 4428 # limit the # of concurrent backtraces
4023 if ($_log_backtrace < 2) { 4429 } elsif ($_log_backtrace < 2) {
4430 $_log_backtrace_last = $msg;
4024 ++$_log_backtrace; 4431 ++$_log_backtrace;
4025 my $perl_bt = Carp::longmess $msg; 4432 my $perl_bt = Carp::longmess $msg;
4026 async { 4433 async {
4027 $Coro::current->{desc} = "abt $msg"; 4434 $Coro::current->{desc} = "abt $msg";
4028 4435
4048 LOG llevInfo, "[ABT] $_\n" for @bt; 4455 LOG llevInfo, "[ABT] $_\n" for @bt;
4049 --$_log_backtrace; 4456 --$_log_backtrace;
4050 }; 4457 };
4051 } else { 4458 } else {
4052 LOG llevInfo, "[ABT] $msg\n"; 4459 LOG llevInfo, "[ABT] $msg\n";
4053 LOG llevInfo, "[ABT] [suppressed]\n"; 4460 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4054 } 4461 }
4055} 4462}
4056 4463
4057# load additional modules 4464# load additional modules
4058require "cf/$_.pm" for @EXTRA_MODULES; 4465require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines