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.510 by root, Tue Apr 6 22:59:28 2010 UTC vs.
Revision 1.614 by root, Mon Nov 26 15:12:16 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.
434 my $signal = new Coro::Signal; 596 my $signal = new Coro::Signal;
435 my $busy; 597 my $busy;
436 598
437 while () { 599 while () {
438 next_job: 600 next_job:
601
602 Coro::cede;
439 603
440 my $avail = cf::till_tick; 604 my $avail = cf::till_tick;
441 605
442 for (0 .. $#SLOT_QUEUE) { 606 for (0 .. $#SLOT_QUEUE) {
443 if ($SLOT_QUEUE[$_][0] <= $avail) { 607 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0; 608 $busy = 0;
445 my $job = splice @SLOT_QUEUE, $_, 1, (); 609 my $job = splice @SLOT_QUEUE, $_, 1, ();
446 $job->[2]->send; 610 $job->[2]->send;
447 Coro::cede;
448 goto next_job; 611 goto next_job;
449 } else { 612 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY; 613 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
451 } 614 }
452 } 615 }
453 616
454 if (@SLOT_QUEUE) { 617 if (@SLOT_QUEUE) {
455 # we do not use wait_for_tick() as it returns immediately when tick is inactive 618 wait_for_tick;
456 push @cf::WAIT_FOR_TICK, $signal;
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;
1498}
1499
1500sub register_async_exticmd($$) {
1501 my ($name, $cb) = @_;
1502
1503 $EXTIACMD{$name} = $cb;
1310} 1504}
1311 1505
1312use File::Glob (); 1506use File::Glob ();
1313 1507
1314cf::player->attach ( 1508cf::player->attach (
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}, $rmp->{miningstyle},
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;
2332
2333 1
2096} 2334}
2097 2335
2098# customize the map for a given player, i.e. 2336# customize the map for a given player, i.e.
2099# return the _real_ map. used by e.g. per-player 2337# return the _real_ map. used by e.g. per-player
2100# maps to change the path to ~playername/mappath 2338# maps to change the path to ~playername/mappath
2108# if $self->per_party; 2346# if $self->per_party;
2109 2347
2110 $self 2348 $self
2111} 2349}
2112 2350
2113# find and load all maps in the 3x3 area around a map
2114sub load_neighbours {
2115 my ($map) = @_;
2116
2117 my @neigh; # diagonal neighbours
2118
2119 for (0 .. 3) {
2120 my $neigh = $map->tile_path ($_)
2121 or next;
2122 $neigh = find $neigh, $map
2123 or next;
2124 $neigh->load;
2125
2126 push @neigh,
2127 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2128 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2129 }
2130
2131 for (grep defined $_->[0], @neigh) {
2132 my ($path, $origin) = @$_;
2133 my $neigh = find $path, $origin
2134 or next;
2135 $neigh->load;
2136 }
2137}
2138
2139sub find_sync { 2351sub find_sync {
2140 my ($path, $origin) = @_; 2352 my ($path, $origin) = @_;
2141 2353
2142 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
2143} 2359}
2144 2360
2145sub do_load_sync { 2361sub do_load_sync {
2146 my ($map) = @_; 2362 my ($map) = @_;
2147 2363
2364 # it's a bug to call this from the main context
2148 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2365 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2149 if $Coro::current == $Coro::main; 2366 if $Coro::current == $Coro::main;
2150 2367
2151 cf::sync_job { $map->load }; 2368 $map->load;
2152} 2369}
2153 2370
2154our %MAP_PREFETCH; 2371our %MAP_PREFETCH;
2155our $MAP_PREFETCHER = undef; 2372our $MAP_PREFETCHER = undef;
2156 2373
2157sub find_async { 2374sub find_async {
2158 my ($path, $origin, $load) = @_; 2375 my ($path, $origin, $load) = @_;
2159 2376
2160 $path = normalise $path, $origin && $origin->{path}; 2377 $path = normalise $path, $origin;
2161 2378
2162 if (my $map = $cf::MAP{$path}) { 2379 if (my $map = $cf::MAP{$path}) {
2163 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2380 return $map if !$load || $map->linkable;
2164 } 2381 }
2165 2382
2166 $MAP_PREFETCH{$path} |= $load; 2383 $MAP_PREFETCH{$path} |= $load;
2167 2384
2168 $MAP_PREFETCHER ||= cf::async { 2385 $MAP_PREFETCHER ||= cf::async {
2182 $MAP_PREFETCHER->prio (6); 2399 $MAP_PREFETCHER->prio (6);
2183 2400
2184 () 2401 ()
2185} 2402}
2186 2403
2404# common code, used by both ->save and ->swapout
2187sub save { 2405sub _save {
2188 my ($self) = @_; 2406 my ($self) = @_;
2189
2190 my $lock = cf::lock_acquire "map_data:$self->{path}";
2191 2407
2192 $self->{last_save} = $cf::RUNTIME; 2408 $self->{last_save} = $cf::RUNTIME;
2193 2409
2194 return unless $self->dirty; 2410 return unless $self->dirty;
2195 2411
2215 } else { 2431 } else {
2216 $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);
2217 } 2433 }
2218} 2434}
2219 2435
2436sub save {
2437 my ($self) = @_;
2438
2439 my $lock = cf::lock_acquire "map_data:$self->{path}";
2440
2441 $self->_save;
2442}
2443
2220sub swap_out { 2444sub swap_out {
2221 my ($self) = @_; 2445 my ($self) = @_;
2222 2446
2223 # save first because save cedes
2224 $self->save;
2225
2226 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2447 my $lock = cf::lock_acquire "map_data:$self->{path}";
2227 2448
2449 return if !$self->linkable;
2450 return if $self->{deny_save};
2228 return if $self->players; 2451 return if $self->players;
2229 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
2230 return if $self->{deny_save}; 2469 return 1e99 if $self->{deny_reset};
2231 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
2232 $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};
2233 2503
2234 $self->deactivate; 2504 $self->deactivate;
2235 $_->clear_links_to ($self) for values %cf::MAP; 2505 $_->clear_links_to ($self) for values %cf::MAP;
2236 $self->clear; 2506 $self->clear;
2237}
2238
2239sub reset_at {
2240 my ($self) = @_;
2241
2242 # TODO: safety, remove and allow resettable per-player maps
2243 return 1e99 if $self->{deny_reset};
2244
2245 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2246 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2247
2248 $time + $to
2249}
2250
2251sub should_reset {
2252 my ($self) = @_;
2253
2254 $self->reset_at <= $cf::RUNTIME
2255}
2256
2257sub reset {
2258 my ($self) = @_;
2259
2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2261
2262 return if $self->players;
2263
2264 warn "resetting map ", $self->path, "\n";
2265
2266 $self->in_memory (cf::MAP_SWAPPED);
2267
2268 # need to save uniques path
2269 unless ($self->{deny_save}) {
2270 my $uniq = $self->uniq_path; utf8::encode $uniq;
2271
2272 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2273 if $uniq;
2274 }
2275
2276 delete $cf::MAP{$self->path};
2277
2278 $self->deactivate;
2279 $_->clear_links_to ($self) for values %cf::MAP;
2280 $self->clear;
2281 2507
2282 $self->unlink_save; 2508 $self->unlink_save;
2283 $self->destroy; 2509 $self->destroy;
2284} 2510}
2285 2511
2293 2519
2294 delete $cf::MAP{$self->path}; 2520 delete $cf::MAP{$self->path};
2295 2521
2296 $self->unlink_save; 2522 $self->unlink_save;
2297 2523
2298 bless $self, "cf::map"; 2524 bless $self, "cf::map::wrap";
2299 delete $self->{deny_reset}; 2525 delete $self->{deny_reset};
2300 $self->{deny_save} = 1; 2526 $self->{deny_save} = 1;
2301 $self->reset_timeout (1); 2527 $self->reset_timeout (1);
2302 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2528 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2303 2529
2424 2650
2425Creates 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.
2426 2652
2427=item $ob = cf::object::deref ($refstring) 2653=item $ob = cf::object::deref ($refstring)
2428 2654
2429returns 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,
2430even if the object actually exists. May block. 2656even if the object actually exists. May block.
2431 2657
2432=cut 2658=cut
2433 2659
2434sub deref { 2660sub deref {
2516=item $player_object->may ("access") 2742=item $player_object->may ("access")
2517 2743
2518Returns wether the given player is authorized to access resource "access" 2744Returns wether the given player is authorized to access resource "access"
2519(e.g. "command_wizcast"). 2745(e.g. "command_wizcast").
2520 2746
2747This is implemented by checking a config setting of C<may_access> where
2748C<access> is replaced by the access string. The following alternatives are
2749possible (and are tested in order):
2750
2751=over 4
2752
2753=item * Player is DM
2754
2755The request will succeed.
2756
2757=item * may_access is an array reference
2758
2759If either the player nickname or UUID is in the array, the request will
2760succeed, otherwise it will fail.
2761
2762=item * may_access is a true value
2763
2764The request will succeed.
2765
2766=item * may_access is missing or false
2767
2768The request will fail.
2769
2770=back
2771
2521=cut 2772=cut
2522 2773
2523sub cf::object::player::may { 2774sub cf::object::player::may {
2524 my ($self, $access) = @_; 2775 my ($self, $access) = @_;
2525 2776
2526 $self->flag (cf::FLAG_WIZ) || 2777 $self->flag (cf::FLAG_WIZ) ||
2527 (ref $cf::CFG{"may_$access"} 2778 (ref $cf::CFG{"may_$access"}
2528 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 2779 ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2529 : $cf::CFG{"may_$access"}) 2780 : $cf::CFG{"may_$access"})
2530} 2781}
2531 2782
2532=item $player_object->enter_link 2783=item $player_object->enter_link
2533 2784
2534Freezes the player and moves him/her to a special map (C<{link}>). 2785Freezes the player and moves him/her to a special map (C<{link}>).
2535 2786
2536The player should be reasonably safe there for short amounts of time (e.g. 2787The player should be reasonably safe there for short amounts of time (e.g.
2537for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2788for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2538though, as the palyer cannot control the character while it is on the link 2789though, as the player cannot control the character while it is on the link
2539map. 2790map.
2540 2791
2541Will never block. 2792Will never block.
2542 2793
2543=item $player_object->leave_link ($map, $x, $y) 2794=item $player_object->leave_link ($map, $x, $y)
2564sub cf::object::player::enter_link { 2815sub cf::object::player::enter_link {
2565 my ($self) = @_; 2816 my ($self) = @_;
2566 2817
2567 $self->deactivate_recursive; 2818 $self->deactivate_recursive;
2568 2819
2820 ++$self->{_link_recursion};
2821
2569 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2822 return if UNIVERSAL::isa $self->map, "ext::map_link";
2570 2823
2571 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2824 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2572 if $self->map && $self->map->{path} ne "{link}"; 2825 if $self->map && $self->map->{path} ne "{link}";
2573 2826
2574 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2827 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2575} 2828}
2576 2829
2577sub cf::object::player::leave_link { 2830sub cf::object::player::leave_link {
2578 my ($self, $map, $x, $y) = @_; 2831 my ($self, $map, $x, $y) = @_;
2579 2832
2599 # use -1 or undef as default coordinates, not 0, 0 2852 # use -1 or undef as default coordinates, not 0, 0
2600 ($x, $y) = ($map->enter_x, $map->enter_y) 2853 ($x, $y) = ($map->enter_x, $map->enter_y)
2601 if $x <= 0 && $y <= 0; 2854 if $x <= 0 && $y <= 0;
2602 2855
2603 $map->load; 2856 $map->load;
2604 $map->load_neighbours;
2605 2857
2606 return unless $self->contr->active; 2858 return unless $self->contr->active;
2607 2859
2608 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2860 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2609 $self->enter_map ($map, $x, $y); 2861 if ($self->enter_map ($map, $x, $y)) {
2610 2862 # entering was successful
2863 delete $self->{_link_recursion};
2611 # only activate afterwards, to support waiting in hooks 2864 # only activate afterwards, to support waiting in hooks
2612 $self->activate_recursive; 2865 $self->activate_recursive;
2613} 2866 }
2614 2867
2868}
2869
2615=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2870=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2616 2871
2617Moves the player to the given map-path and coordinates by first freezing 2872Moves the player to the given map-path and coordinates by first freezing
2618her, loading and preparing them map, calling the provided $check callback 2873her, loading and preparing them map, calling the provided $check callback
2619that has to return the map if sucecssful, and then unfreezes the player on 2874that has to return the map if sucecssful, and then unfreezes the player on
2620the new (success) or old (failed) map position. In either case, $done will 2875the new (success) or old (failed) map position. In either case, $done will
2627 2882
2628our $GOTOGEN; 2883our $GOTOGEN;
2629 2884
2630sub cf::object::player::goto { 2885sub cf::object::player::goto {
2631 my ($self, $path, $x, $y, $check, $done) = @_; 2886 my ($self, $path, $x, $y, $check, $done) = @_;
2887
2888 if ($self->{_link_recursion} >= $MAX_LINKS) {
2889 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2890 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2891 ($path, $x, $y) = @$EMERGENCY_POSITION;
2892 }
2632 2893
2633 # do generation counting so two concurrent goto's will be executed in-order 2894 # do generation counting so two concurrent goto's will be executed in-order
2634 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2895 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2635 2896
2636 $self->enter_link; 2897 $self->enter_link;
2656 ($path, $x, $y) = (undef, undef, undef); 2917 ($path, $x, $y) = (undef, undef, undef);
2657 } 2918 }
2658 } 2919 }
2659 2920
2660 my $map = eval { 2921 my $map = eval {
2661 my $map = defined $path ? cf::map::find $path : undef; 2922 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2662 2923
2663 if ($map) { 2924 if ($map) {
2664 $map = $map->customise_for ($self); 2925 $map = $map->customise_for ($self);
2665 $map = $check->($map) if $check && $map; 2926 $map = $check->($map, $x, $y, $self) if $check && $map;
2666 } else { 2927 } else {
2667 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2928 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2668 } 2929 }
2669 2930
2670 $map 2931 $map
2678 if ($gen == $self->{_goto_generation}) { 2939 if ($gen == $self->{_goto_generation}) {
2679 delete $self->{_goto_generation}; 2940 delete $self->{_goto_generation};
2680 $self->leave_link ($map, $x, $y); 2941 $self->leave_link ($map, $x, $y);
2681 } 2942 }
2682 2943
2683 $done->() if $done; 2944 $done->($self) if $done;
2684 })->prio (1); 2945 })->prio (1);
2685} 2946}
2686 2947
2687=item $player_object->enter_exit ($exit_object) 2948=item $player_object->enter_exit ($exit_object)
2688 2949
2756 $Coro::current->{desc} = "enter_exit"; 3017 $Coro::current->{desc} = "enter_exit";
2757 3018
2758 unless (eval { 3019 unless (eval {
2759 $self->deactivate_recursive; # just to be sure 3020 $self->deactivate_recursive; # just to be sure
2760 3021
2761 # random map handling
2762 {
2763 my $guard = cf::lock_acquire "exit_prepare:$exit";
2764
2765 prepare_random_map $exit
2766 if $exit->slaying eq "/!";
2767 }
2768
2769 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 3022 my $map = cf::map::normalise $exit->slaying, $exit->map;
2770 my $x = $exit->stats->hp; 3023 my $x = $exit->stats->hp;
2771 my $y = $exit->stats->sp; 3024 my $y = $exit->stats->sp;
3025
3026 # special map handling
3027 my $slaying = $exit->slaying;
3028
3029 # special map handling
3030 if ($slaying eq "/!") {
3031 my $guard = cf::lock_acquire "exit_prepare:$exit";
3032
3033 prepare_random_map $exit
3034 if $exit->slaying eq "/!"; # need to re-check after getting the lock
3035
3036 $map = $exit->slaying;
3037
3038 } elsif ($slaying eq '!up') {
3039 $map = $exit->map->tile_path (cf::TILE_UP);
3040 $x = $exit->x;
3041 $y = $exit->y;
3042
3043 } elsif ($slaying eq '!down') {
3044 $map = $exit->map->tile_path (cf::TILE_DOWN);
3045 $x = $exit->x;
3046 $y = $exit->y;
3047 }
2772 3048
2773 $self->goto ($map, $x, $y); 3049 $self->goto ($map, $x, $y);
2774 3050
2775 # if exit is damned, update players death & WoR home-position 3051 # if exit is damned, update players death & WoR home-position
2776 $self->contr->savebed ($map, $x, $y) 3052 $self->contr->savebed ($map, $x, $y)
2781 $self->message ("Something went wrong deep within the deliantra server. " 3057 $self->message ("Something went wrong deep within the deliantra server. "
2782 . "I'll try to bring you back to the map you were before. " 3058 . "I'll try to bring you back to the map you were before. "
2783 . "Please report this to the dungeon master!", 3059 . "Please report this to the dungeon master!",
2784 cf::NDI_UNIQUE | cf::NDI_RED); 3060 cf::NDI_UNIQUE | cf::NDI_RED);
2785 3061
2786 warn "ERROR in enter_exit: $@"; 3062 error "ERROR in enter_exit: $@";
2787 $self->leave_link; 3063 $self->leave_link;
2788 } 3064 }
2789 })->prio (1); 3065 })->prio (1);
2790} 3066}
2791 3067
2792=head3 cf::client 3068=head3 cf::client
2793 3069
2794=over 4 3070=over 4
2795
2796=item $client->send_drawinfo ($text, $flags)
2797
2798Sends a drawinfo packet to the client. Circumvents output buffering so
2799should not be used under normal circumstances.
2800
2801=cut
2802
2803sub cf::client::send_drawinfo {
2804 my ($self, $text, $flags) = @_;
2805
2806 utf8::encode $text;
2807 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2808}
2809 3071
2810=item $client->send_big_packet ($pkt) 3072=item $client->send_big_packet ($pkt)
2811 3073
2812Like C<send_packet>, but tries to compress large packets, and fragments 3074Like C<send_packet>, but tries to compress large packets, and fragments
2813them as required. 3075them as required.
2832 $self->send_packet ($pkt); 3094 $self->send_packet ($pkt);
2833} 3095}
2834 3096
2835=item $client->send_msg ($channel, $msg, $color, [extra...]) 3097=item $client->send_msg ($channel, $msg, $color, [extra...])
2836 3098
2837Send a drawinfo or msg packet to the client, formatting the msg for the 3099Send a msg packet to the client, formatting the msg for the client if
2838client if neccessary. C<$type> should be a string identifying the type of 3100necessary. C<$type> should be a string identifying the type of the
2839the message, with C<log> being the default. If C<$color> is negative, suppress 3101message, with C<log> being the default. If C<$color> is negative, suppress
2840the message unless the client supports the msg packet. 3102the message unless the client supports the msg packet.
2841 3103
2842=cut 3104=cut
2843 3105
2844# non-persistent channels (usually the info channel) 3106# non-persistent channels (usually the info channel)
2949 id => "death", 3211 id => "death",
2950 title => "Death", 3212 title => "Death",
2951 reply => undef, 3213 reply => undef,
2952 tooltip => "Reason for and more info about your most recent death", 3214 tooltip => "Reason for and more info about your most recent death",
2953 }, 3215 },
3216 "c/fatal" => {
3217 id => "fatal",
3218 title => "Fatal Error",
3219 reply => undef,
3220 tooltip => "Reason for the server disconnect",
3221 },
2954 "c/say" => $SAY_CHANNEL, 3222 "c/say" => $SAY_CHANNEL,
2955 "c/chat" => $CHAT_CHANNEL, 3223 "c/chat" => $CHAT_CHANNEL,
2956); 3224);
2957 3225
2958sub cf::client::send_msg { 3226sub cf::client::send_msg {
3001=cut 3269=cut
3002 3270
3003sub cf::client::ext_msg($$@) { 3271sub cf::client::ext_msg($$@) {
3004 my ($self, $type, @msg) = @_; 3272 my ($self, $type, @msg) = @_;
3005 3273
3006 if ($self->extcmd == 2) {
3007 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3274 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3008 } elsif ($self->extcmd == 1) { # TODO: remove
3009 push @msg, msgtype => "event_$type";
3010 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3011 }
3012}
3013
3014=item $client->ext_reply ($msgid, @msg)
3015
3016Sends an ext reply to the client.
3017
3018=cut
3019
3020sub cf::client::ext_reply($$@) {
3021 my ($self, $id, @msg) = @_;
3022
3023 if ($self->extcmd == 2) {
3024 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3025 } elsif ($self->extcmd == 1) {
3026 #TODO: version 1, remove
3027 unshift @msg, msgtype => "reply", msgid => $id;
3028 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3029 }
3030} 3275}
3031 3276
3032=item $success = $client->query ($flags, "text", \&cb) 3277=item $success = $client->query ($flags, "text", \&cb)
3033 3278
3034Queues a query to the client, calling the given callback with 3279Queues a query to the client, calling the given callback with
3054 3299
3055 $self->send_packet ($self->{query_queue}[0][0]) 3300 $self->send_packet ($self->{query_queue}[0][0])
3056 if @{ $self->{query_queue} } == 1; 3301 if @{ $self->{query_queue} } == 1;
3057 3302
3058 1 3303 1
3304}
3305
3306=item $client->update_command_faces
3307
3308=cut
3309
3310our %COMMAND_FACE;
3311
3312sub cf::client::update_command_faces {
3313 my ($self) = @_;
3314
3315 my @faces = grep $_,
3316 $COMMAND_FACE{preferred},
3317 $COMMAND_FACE{standard},
3318 $COMMAND_FACE{skill},
3319 $self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
3320 $COMMAND_FACE{emote},
3321 ;
3322
3323 $self->send_face ($_)
3324 for @faces;
3325 $self->flush_fx;
3326
3327 $self->ext_msg (command_list => @faces);
3328}
3329
3330=item cf::client::set_command_face $type, $commands
3331
3332=cut
3333
3334sub cf::client::set_command_face {
3335 my ($type, $list) = @_;
3336
3337 my $idx = &cf::face::set ( #d# ugly forward reference
3338 "command_list/$type" => cf::FT_RSRC,
3339 JSON::XS->new->utf8->encode ([ sort @$list ])
3340 );
3341
3342 $COMMAND_FACE{$type} = $idx;
3059} 3343}
3060 3344
3061cf::client->attach ( 3345cf::client->attach (
3062 on_connect => sub { 3346 on_connect => sub {
3063 my ($ns) = @_; 3347 my ($ns) = @_;
3089 my ($ns, $buf) = @_; 3373 my ($ns, $buf) = @_;
3090 3374
3091 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3375 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3092 3376
3093 if (ref $msg) { 3377 if (ref $msg) {
3094 my ($type, $reply, @payload) = 3378 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3095 "ARRAY" eq ref $msg
3096 ? @$msg
3097 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3098 3379
3099 my @reply;
3100
3101 if (my $cb = $EXTICMD{$type}) { 3380 if (my $cb = $EXTIACMD{$type}) {
3381 $cb->(
3382 $ns,
3383 sub {
3384 $ns->ext_msg ("reply-$reply", @_)
3385 if $reply;
3386 },
3387 @payload
3388 );
3389 } else {
3390 my @reply;
3391
3392 if (my $cb = $EXTICMD{$type}) {
3102 @reply = $cb->($ns, @payload); 3393 @reply = $cb->($ns, @payload);
3394 }
3395
3396 $ns->ext_msg ("reply-$reply", @reply)
3397 if $reply;
3103 } 3398 }
3104
3105 $ns->ext_reply ($reply, @reply)
3106 if $reply;
3107
3108 } else { 3399 } else {
3109 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3400 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3110 } 3401 }
3111 3402
3112 cf::override; 3403 cf::override;
3113 }, 3404 },
3114); 3405);
3195 decrease split destroy change_exp value msg lore send_msg)], 3486 decrease split destroy change_exp value msg lore send_msg)],
3196 ["cf::object::player" => qw(player)], 3487 ["cf::object::player" => qw(player)],
3197 ["cf::player" => qw(peaceful send_msg)], 3488 ["cf::player" => qw(peaceful send_msg)],
3198 ["cf::map" => qw(trigger)], 3489 ["cf::map" => qw(trigger)],
3199) { 3490) {
3200 no strict 'refs';
3201 my ($pkg, @funs) = @$_; 3491 my ($pkg, @funs) = @$_;
3202 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3492 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3203 for @funs; 3493 for @funs;
3204} 3494}
3205 3495
3244 local @cf::_safe_eval_args = values %vars; 3534 local @cf::_safe_eval_args = values %vars;
3245 @res = wantarray ? eval eval : scalar eval $eval; 3535 @res = wantarray ? eval eval : scalar eval $eval;
3246 } 3536 }
3247 3537
3248 if ($@) { 3538 if ($@) {
3249 warn "$@"; 3539 warn "$@",
3250 warn "while executing safe code '$code'\n"; 3540 "while executing safe code '$code'\n",
3251 warn "with arguments " . (join " ", %vars) . "\n"; 3541 "with arguments " . (join " ", %vars) . "\n";
3252 } 3542 }
3253 3543
3254 wantarray ? @res : $res[0] 3544 wantarray ? @res : $res[0]
3255} 3545}
3256 3546
3281=cut 3571=cut
3282 3572
3283############################################################################# 3573#############################################################################
3284# the server's init and main functions 3574# the server's init and main functions
3285 3575
3576{
3577 package cf::face;
3578
3579 our %HASH; # hash => idx
3580 our @DATA; # dynamically-created facedata, only faceste 0 used
3581 our @FOFS; # file offset, if > 0
3582 our @SIZE; # size of face, in octets
3583 our @META; # meta hash of face, if any
3584 our $DATAFH; # facedata filehandle
3585
3586 # internal api, not finalised
3587 sub set {
3588 my ($name, $type, $data) = @_;
3589
3590 my $idx = cf::face::find $name;
3591
3592 if ($idx) {
3593 delete $HASH{cf::face::get_csum $idx};
3594 } else {
3595 $idx = cf::face::alloc $name;
3596 }
3597
3598 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3599
3600 cf::face::set_type $idx, $type;
3601 cf::face::set_csum $idx, 0, $hash;
3602
3603 # we need to destroy the SV itself, not just modify it, as a running ix
3604 # might hold a reference to it: "delete" achieves that.
3605 delete $FOFS[0][$idx];
3606 delete $DATA[0][$idx];
3607 $DATA[0][$idx] = $data;
3608 $SIZE[0][$idx] = length $data;
3609 delete $META[$idx];
3610 $HASH{$hash} = $idx;#d#
3611
3612 $idx
3613 }
3614
3615 sub _get_data($$$) {
3616 my ($idx, $set, $cb) = @_;
3617
3618 if (defined $DATA[$set][$idx]) {
3619 $cb->($DATA[$set][$idx]);
3620 } elsif (my $fofs = $FOFS[$set][$idx]) {
3621 my $size = $SIZE[$set][$idx];
3622 my $buf;
3623 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3624 if ($_[0] == $size) {
3625 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3626 $cb->($buf);
3627 } else {
3628 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3629 }
3630 };
3631 } else {
3632 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3633 }
3634 }
3635
3636 # rather ineffient
3637 sub cf::face::get_data($;$) {
3638 my ($idx, $set) = @_;
3639
3640 _get_data $idx, $set, Coro::rouse_cb;
3641 Coro::rouse_wait
3642 }
3643
3644 sub cf::face::ix {
3645 my ($ns, $set, $idx, $pri) = @_;
3646
3647 _get_data $idx, $set, sub {
3648 $ns->ix_send ($idx, $pri, $_[0]);
3649 };
3650 }
3651}
3652
3286sub load_facedata($) { 3653sub load_facedata($) {
3287 my ($path) = @_; 3654 my ($path) = @_;
3288 3655
3289 # HACK to clear player env face cache, we need some signal framework
3290 # for this (global event?)
3291 %ext::player_env::MUSIC_FACE_CACHE = ();
3292
3293 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3656 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3294 3657
3295 warn "loading facedata from $path\n"; 3658 trace "loading facedata from $path\n";
3296 3659
3297 my $facedata; 3660 my $facedata = decode_storable load_file "$path/faceinfo";
3298 0 < aio_load $path, $facedata
3299 or die "$path: $!";
3300
3301 $facedata = Coro::Storable::thaw $facedata;
3302 3661
3303 $facedata->{version} == 2 3662 $facedata->{version} == 2
3304 or cf::cleanup "$path: version mismatch, cannot proceed."; 3663 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3305 3664
3306 # patch in the exptable 3665 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3307 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]); 3666 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3308 $facedata->{resource}{"res/exp_table"} = { 3667
3309 type => FT_RSRC, 3668 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3310 data => $exp_table, 3669
3311 hash => (Digest::MD5::md5 $exp_table), 3670 # BEGIN ATOMIC
3312 }; 3671 # from here on, everything must be atomic - no thread switch allowed
3313 cf::cede_to_tick; 3672 my $t1 = EV::time;
3314 3673
3315 { 3674 {
3316 my $faces = $facedata->{faceinfo}; 3675 my $faces = $facedata->{faceinfo};
3317 3676
3318 while (my ($face, $info) = each %$faces) { 3677 for my $face (sort keys %$faces) {
3678 my $info = $faces->{$face};
3319 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3679 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3320 3680
3321 cf::face::set_visibility $idx, $info->{visibility}; 3681 cf::face::set_visibility $idx, $info->{visibility};
3322 cf::face::set_magicmap $idx, $info->{magicmap}; 3682 cf::face::set_magicmap $idx, $info->{magicmap};
3323 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3683 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3324 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3684 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3325 3685 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3326 cf::cede_to_tick; 3686 $cf::face::HASH{$info->{hash64}} = $idx;
3687 delete $cf::face::META[$idx];
3327 } 3688 }
3328 3689
3329 while (my ($face, $info) = each %$faces) { 3690 while (my ($face, $info) = each %$faces) {
3330 next unless $info->{smooth}; 3691 next unless $info->{smooth};
3331 3692
3334 3695
3335 if (my $smooth = cf::face::find $info->{smooth}) { 3696 if (my $smooth = cf::face::find $info->{smooth}) {
3336 cf::face::set_smooth $idx, $smooth; 3697 cf::face::set_smooth $idx, $smooth;
3337 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3698 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3338 } else { 3699 } else {
3339 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3700 error "smooth face '$info->{smooth}' not found for face '$face'";
3340 } 3701 }
3341
3342 cf::cede_to_tick;
3343 } 3702 }
3344 } 3703 }
3345 3704
3346 { 3705 {
3347 my $anims = $facedata->{animinfo}; 3706 my $anims = $facedata->{animinfo};
3348 3707
3349 while (my ($anim, $info) = each %$anims) { 3708 while (my ($anim, $info) = each %$anims) {
3350 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3709 cf::anim::set $anim, $info->{frames}, $info->{facings};
3351 cf::cede_to_tick;
3352 } 3710 }
3353 3711
3354 cf::anim::invalidate_all; # d'oh 3712 cf::anim::invalidate_all; # d'oh
3355 } 3713 }
3356 3714
3357 { 3715 {
3358 my $res = $facedata->{resource}; 3716 my $res = $facedata->{resource};
3359 3717
3360 while (my ($name, $info) = each %$res) { 3718 while (my ($name, $info) = each %$res) {
3361 if (defined $info->{type}) { 3719 if (defined (my $type = $info->{type})) {
3720 # TODO: different hash - must free and use new index, or cache ixface data queue
3362 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3721 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3363 3722
3364 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3365 cf::face::set_type $idx, $info->{type}; 3723 cf::face::set_type $idx, $type;
3724 cf::face::set_csum $idx, 0, $info->{hash};
3725 $cf::face::SIZE[0][$idx] = $info->{size};
3726 $cf::face::FOFS[0][$idx] = $info->{fofs};
3727 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3728 $cf::face::HASH{$info->{hash}} = $idx;
3366 } else { 3729 } else {
3367 $RESOURCE{$name} = $info; 3730# $RESOURCE{$name} = $info; # unused
3368 } 3731 }
3369
3370 cf::cede_to_tick;
3371 } 3732 }
3372 } 3733 }
3734
3735 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3736
3737 # HACK to clear player env face cache, we need some signal framework
3738 # for this (global event?)
3739 %ext::player_env::MUSIC_FACE_CACHE = ();
3740
3741 # END ATOMIC
3742
3743 cf::debug "facedata atomic update time ", EV::time - $t1;
3373 3744
3374 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3745 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3375 3746
3747 aio_close $fh if $fh; # close old facedata
3748
3376 1 3749 1
3377} 3750}
3378
3379cf::global->attach (on_resource_update => sub {
3380 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3381 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3382
3383 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3384 my $sound = $soundconf->{compat}[$_]
3385 or next;
3386
3387 my $face = cf::face::find "sound/$sound->[1]";
3388 cf::sound::set $sound->[0] => $face;
3389 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3390 }
3391
3392 while (my ($k, $v) = each %{$soundconf->{event}}) {
3393 my $face = cf::face::find "sound/$v";
3394 cf::sound::set $k => $face;
3395 }
3396 }
3397});
3398 3751
3399register_exticmd fx_want => sub { 3752register_exticmd fx_want => sub {
3400 my ($ns, $want) = @_; 3753 my ($ns, $want) = @_;
3401 3754
3402 while (my ($k, $v) = each %$want) { 3755 while (my ($k, $v) = each %$want) {
3410 my $status = load_resource_file_ $_[0]; 3763 my $status = load_resource_file_ $_[0];
3411 get_slot 0.1, 100; 3764 get_slot 0.1, 100;
3412 cf::arch::commit_load; 3765 cf::arch::commit_load;
3413 3766
3414 $status 3767 $status
3768}
3769
3770sub reload_exp_table {
3771 _reload_exp_table;
3772
3773 cf::face::set
3774 "res/exp_table" => FT_RSRC,
3775 JSON::XS->new->utf8->canonical->encode (
3776 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3777 );
3778}
3779
3780sub reload_materials {
3781 _reload_materials;
3415} 3782}
3416 3783
3417sub reload_regions { 3784sub reload_regions {
3418 # HACK to clear player env face cache, we need some signal framework 3785 # HACK to clear player env face cache, we need some signal framework
3419 # for this (global event?) 3786 # for this (global event?)
3427 if exists $_->{match}; 3794 if exists $_->{match};
3428 } 3795 }
3429} 3796}
3430 3797
3431sub reload_facedata { 3798sub reload_facedata {
3432 load_facedata "$DATADIR/facedata" 3799 load_facedata $DATADIR
3433 or die "unable to load facedata\n"; 3800 or die "unable to load facedata\n";
3434} 3801}
3435 3802
3436sub reload_archetypes { 3803sub reload_archetypes {
3437 load_resource_file "$DATADIR/archetypes" 3804 load_resource_file "$DATADIR/archetypes"
3438 or die "unable to load archetypes\n"; 3805 or die "unable to load archetypes\n";
3806
3807 cf::face::set
3808 "res/skill_info" => FT_RSRC,
3809 JSON::XS->new->utf8->canonical->encode (
3810 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3811 );
3812
3813 cf::face::set
3814 "res/spell_paths" => FT_RSRC,
3815 JSON::XS->new->utf8->canonical->encode (
3816 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3817 );
3818
3819 # command completion
3820 my @commands;
3821
3822 for (0..cf::arch::skillvec_size - 1) {
3823 my $skill = cf::arch::skillvec $_;
3824 my $name = $skill->name;
3825 my $flags = cf::skill_flags $skill->subtype;
3826
3827 push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
3828 push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
3829 }
3830
3831 cf::client::set_command_face skill => \@commands;
3439} 3832}
3440 3833
3441sub reload_treasures { 3834sub reload_treasures {
3442 load_resource_file "$DATADIR/treasures" 3835 load_resource_file "$DATADIR/treasures"
3443 or die "unable to load treasurelists\n"; 3836 or die "unable to load treasurelists\n";
3444} 3837}
3445 3838
3839sub reload_sound {
3840 trace "loading sound config from $DATADIR/sound\n";
3841
3842 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3843
3844 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3845 my $sound = $soundconf->{compat}[$_]
3846 or next;
3847
3848 my $face = cf::face::find "sound/$sound->[1]";
3849 cf::sound::set $sound->[0] => $face;
3850 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3851 }
3852
3853 while (my ($k, $v) = each %{$soundconf->{event}}) {
3854 my $face = cf::face::find "sound/$v";
3855 cf::sound::set $k => $face;
3856 }
3857}
3858
3446sub reload_resources { 3859sub reload_resources {
3447 warn "reloading resource files...\n"; 3860 trace "reloading resource files...\n";
3448 3861
3862 reload_materials;
3449 reload_facedata; 3863 reload_facedata;
3864 reload_exp_table;
3865 reload_sound;
3450 reload_archetypes; 3866 reload_archetypes;
3451 reload_regions; 3867 reload_regions;
3452 reload_treasures; 3868 reload_treasures;
3453 3869
3454 warn "finished reloading resource files\n"; 3870 trace "finished reloading resource files\n";
3455} 3871}
3456 3872
3457sub reload_config { 3873sub reload_config {
3458 warn "reloading config file...\n"; 3874 trace "reloading config file...\n";
3459 3875
3460 open my $fh, "<:utf8", "$CONFDIR/config" 3876 my $config = load_file "$CONFDIR/config";
3461 or return; 3877 utf8::decode $config;
3878 *CFG = decode_yaml $config;
3462 3879
3463 local $/;
3464 *CFG = YAML::XS::Load scalar <$fh>;
3465
3466 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3880 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3467 3881
3468 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3882 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3469 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3883 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3470 3884
3471 if (exists $CFG{mlockall}) { 3885 if (exists $CFG{mlockall}) {
3473 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3887 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3474 and die "WARNING: m(un)lockall failed: $!\n"; 3888 and die "WARNING: m(un)lockall failed: $!\n";
3475 }; 3889 };
3476 warn $@ if $@; 3890 warn $@ if $@;
3477 } 3891 }
3478
3479 warn "finished reloading resource files\n";
3480} 3892}
3481 3893
3482sub pidfile() { 3894sub pidfile() {
3483 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3895 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3484 or die "$PIDFILE: $!"; 3896 or die "$PIDFILE: $!";
3497 seek $fh, 0, 0; 3909 seek $fh, 0, 0;
3498 print $fh $$; 3910 print $fh $$;
3499} 3911}
3500 3912
3501sub main_loop { 3913sub main_loop {
3502 warn "EV::loop starting\n"; 3914 trace "EV::loop starting\n";
3503 if (1) { 3915 if (1) {
3504 EV::loop; 3916 EV::loop;
3505 } 3917 }
3506 warn "EV::loop returned\n"; 3918 trace "EV::loop returned\n";
3507 goto &main_loop unless $REALLY_UNLOOP; 3919 goto &main_loop unless $REALLY_UNLOOP;
3508} 3920}
3509 3921
3510sub main { 3922sub main {
3511 cf::init_globals; # initialise logging 3923 cf::init_globals; # initialise logging
3512 3924
3513 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3925 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3514 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3926 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3515 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3927 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3516 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3928 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3517 3929
3518 cf::init_experience;
3519 cf::init_anim;
3520 cf::init_attackmess;
3521 cf::init_dynamic;
3522
3523 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3930 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3524 3931
3525 # we must not ever block the main coroutine 3932 # we must not ever block the main coroutine
3526 local $Coro::idle = sub { 3933 $Coro::idle = sub {
3527 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3934 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3528 (async { 3935 (async {
3529 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3936 $Coro::current->{desc} = "IDLE BUG HANDLER";
3530 EV::loop EV::LOOP_ONESHOT; 3937 EV::loop EV::LOOP_ONESHOT;
3531 })->prio (Coro::PRIO_MAX); 3938 })->prio (Coro::PRIO_MAX);
3532 }; 3939 };
3533 3940
3534 evthread_start IO::AIO::poll_fileno; 3941 evthread_start IO::AIO::poll_fileno;
3535 3942
3536 cf::sync_job { 3943 cf::sync_job {
3944 cf::incloader::init ();
3945
3946 db_init;
3947
3948 cf::init_anim;
3949 cf::init_attackmess;
3950 cf::init_dynamic;
3951
3537 cf::load_settings; 3952 cf::load_settings;
3538 cf::load_materials;
3539 3953
3540 reload_resources; 3954 reload_resources;
3541 reload_config; 3955 reload_config;
3542 db_init;
3543 3956
3544 cf::init_uuid; 3957 cf::init_uuid;
3545 cf::init_signals; 3958 cf::init_signals;
3546 cf::init_skills; 3959 cf::init_skills;
3547 3960
3555 3968
3556 # no (long-running) fork's whatsoever before this point(!) 3969 # no (long-running) fork's whatsoever before this point(!)
3557 use POSIX (); 3970 use POSIX ();
3558 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3971 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3559 3972
3560 (pop @POST_INIT)->(0) while @POST_INIT; 3973 cf::_post_init 0;
3561 }; 3974 };
3562 3975
3976 cf::object::thawer::errors_are_fatal 0;
3977 info "parse errors in files are no longer fatal from this point on.\n";
3978
3979 AE::postpone {
3980 undef &main; # free gobs of memory :)
3981 };
3982
3563 main_loop; 3983 goto &main_loop;
3564} 3984}
3565 3985
3566############################################################################# 3986#############################################################################
3567# initialisation and cleanup 3987# initialisation and cleanup
3568 3988
3569# install some emergency cleanup handlers 3989# install some emergency cleanup handlers
3570BEGIN { 3990BEGIN {
3571 our %SIGWATCHER = (); 3991 our %SIGWATCHER = ();
3572 for my $signal (qw(INT HUP TERM)) { 3992 for my $signal (qw(INT HUP TERM)) {
3573 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3993 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3574 cf::cleanup "SIG$signal"; 3994 cf::cleanup "SIG$signal";
3575 }; 3995 };
3576 } 3996 }
3577} 3997}
3578 3998
3579sub write_runtime_sync { 3999sub write_runtime_sync {
3580 my $t0 = EV::time; 4000 my $t0 = AE::time;
3581 4001
3582 # first touch the runtime file to show we are still running: 4002 # first touch the runtime file to show we are still running:
3583 # the fsync below can take a very very long time. 4003 # the fsync below can take a very very long time.
3584 4004
3585 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 4005 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3607 or return; 4027 or return;
3608 4028
3609 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 4029 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3610 and return; 4030 and return;
3611 4031
3612 warn sprintf "runtime file written (%gs).\n", EV::time - $t0; 4032 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3613 4033
3614 1 4034 1
3615} 4035}
3616 4036
3617our $uuid_lock; 4037our $uuid_lock;
3629 or return; 4049 or return;
3630 4050
3631 my $value = uuid_seq uuid_cur; 4051 my $value = uuid_seq uuid_cur;
3632 4052
3633 unless ($value) { 4053 unless ($value) {
3634 warn "cowardly refusing to write zero uuid value!\n"; 4054 info "cowardly refusing to write zero uuid value!\n";
3635 return; 4055 return;
3636 } 4056 }
3637 4057
3638 my $value = uuid_str $value + $uuid_skip; 4058 my $value = uuid_str $value + $uuid_skip;
3639 $uuid_skip = 0; 4059 $uuid_skip = 0;
3649 or return; 4069 or return;
3650 4070
3651 aio_rename "$uuid~", $uuid 4071 aio_rename "$uuid~", $uuid
3652 and return; 4072 and return;
3653 4073
3654 warn "uuid file written ($value).\n"; 4074 trace "uuid file written ($value).\n";
3655 4075
3656 1 4076 1
3657 4077
3658} 4078}
3659 4079
3665} 4085}
3666 4086
3667sub emergency_save() { 4087sub emergency_save() {
3668 my $freeze_guard = cf::freeze_mainloop; 4088 my $freeze_guard = cf::freeze_mainloop;
3669 4089
3670 warn "emergency_perl_save: enter\n"; 4090 info "emergency_perl_save: enter\n";
4091
4092 # this is a trade-off: we want to be very quick here, so
4093 # save all maps without fsync, and later call a global sync
4094 # (which in turn might be very very slow)
4095 local $USE_FSYNC = 0;
3671 4096
3672 cf::sync_job { 4097 cf::sync_job {
3673 # this is a trade-off: we want to be very quick here, so 4098 cf::write_runtime_sync; # external watchdog should not bark
3674 # save all maps without fsync, and later call a global sync
3675 # (which in turn might be very very slow)
3676 local $USE_FSYNC = 0;
3677 4099
3678 # use a peculiar iteration method to avoid tripping on perl 4100 # use a peculiar iteration method to avoid tripping on perl
3679 # refcount bugs in for. also avoids problems with players 4101 # refcount bugs in for. also avoids problems with players
3680 # and maps saved/destroyed asynchronously. 4102 # and maps saved/destroyed asynchronously.
3681 warn "emergency_perl_save: begin player save\n"; 4103 info "emergency_perl_save: begin player save\n";
3682 for my $login (keys %cf::PLAYER) { 4104 for my $login (keys %cf::PLAYER) {
3683 my $pl = $cf::PLAYER{$login} or next; 4105 my $pl = $cf::PLAYER{$login} or next;
3684 $pl->valid or next; 4106 $pl->valid or next;
3685 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4107 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3686 $pl->save; 4108 $pl->save;
3687 } 4109 }
3688 warn "emergency_perl_save: end player save\n"; 4110 info "emergency_perl_save: end player save\n";
3689 4111
4112 cf::write_runtime_sync; # external watchdog should not bark
4113
3690 warn "emergency_perl_save: begin map save\n"; 4114 info "emergency_perl_save: begin map save\n";
3691 for my $path (keys %cf::MAP) { 4115 for my $path (keys %cf::MAP) {
3692 my $map = $cf::MAP{$path} or next; 4116 my $map = $cf::MAP{$path} or next;
3693 $map->valid or next; 4117 $map->valid or next;
3694 $map->save; 4118 $map->save;
3695 } 4119 }
3696 warn "emergency_perl_save: end map save\n"; 4120 info "emergency_perl_save: end map save\n";
3697 4121
4122 cf::write_runtime_sync; # external watchdog should not bark
4123
3698 warn "emergency_perl_save: begin database checkpoint\n"; 4124 info "emergency_perl_save: begin database checkpoint\n";
3699 BDB::db_env_txn_checkpoint $DB_ENV; 4125 BDB::db_env_txn_checkpoint $DB_ENV;
3700 warn "emergency_perl_save: end database checkpoint\n"; 4126 info "emergency_perl_save: end database checkpoint\n";
3701 4127
3702 warn "emergency_perl_save: begin write uuid\n"; 4128 info "emergency_perl_save: begin write uuid\n";
3703 write_uuid_sync 1; 4129 write_uuid_sync 1;
3704 warn "emergency_perl_save: end write uuid\n"; 4130 info "emergency_perl_save: end write uuid\n";
4131
4132 cf::write_runtime_sync; # external watchdog should not bark
4133
4134 trace "emergency_perl_save: syncing database to disk";
4135 BDB::db_env_txn_checkpoint $DB_ENV;
4136
4137 info "emergency_perl_save: starting sync\n";
4138 IO::AIO::aio_sync sub {
4139 info "emergency_perl_save: finished sync\n";
4140 };
4141
4142 cf::write_runtime_sync; # external watchdog should not bark
4143
4144 trace "emergency_perl_save: flushing outstanding aio requests";
4145 while (IO::AIO::nreqs || BDB::nreqs) {
4146 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4147 }
4148
4149 cf::write_runtime_sync; # external watchdog should not bark
3705 }; 4150 };
3706 4151
3707 warn "emergency_perl_save: starting sync()\n";
3708 IO::AIO::aio_sync sub {
3709 warn "emergency_perl_save: finished sync()\n";
3710 };
3711
3712 warn "emergency_perl_save: leave\n"; 4152 info "emergency_perl_save: leave\n";
3713} 4153}
3714 4154
3715sub post_cleanup { 4155sub post_cleanup {
3716 my ($make_core) = @_; 4156 my ($make_core) = @_;
3717 4157
4158 IO::AIO::flush;
4159
3718 warn Carp::longmess "post_cleanup backtrace" 4160 error Carp::longmess "post_cleanup backtrace"
3719 if $make_core; 4161 if $make_core;
3720 4162
3721 my $fh = pidfile; 4163 my $fh = pidfile;
3722 unlink $PIDFILE if <$fh> == $$; 4164 unlink $PIDFILE if <$fh> == $$;
3723} 4165}
3743 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4185 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3744 for my $name (keys %$leaf_symtab) { 4186 for my $name (keys %$leaf_symtab) {
3745 _gv_clear *{"$pkg$name"}; 4187 _gv_clear *{"$pkg$name"};
3746# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4188# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3747 } 4189 }
3748 warn "cleared package $pkg\n";#d#
3749} 4190}
3750 4191
3751sub do_reload_perl() { 4192sub do_reload_perl() {
3752 # can/must only be called in main 4193 # can/must only be called in main
3753 if ($Coro::current != $Coro::main) { 4194 unless (in_main) {
3754 warn "can only reload from main coroutine"; 4195 error "can only reload from main coroutine";
3755 return; 4196 return;
3756 } 4197 }
3757 4198
3758 return if $RELOAD++; 4199 return if $RELOAD++;
3759 4200
3760 my $t1 = EV::time; 4201 my $t1 = AE::time;
3761 4202
3762 while ($RELOAD) { 4203 while ($RELOAD) {
3763 warn "reloading..."; 4204 cf::get_slot 0.1, -1, "reload_perl";
4205 info "perl_reload: reloading...";
3764 4206
3765 warn "entering sync_job"; 4207 trace "perl_reload: entering sync_job";
3766 4208
3767 cf::sync_job { 4209 cf::sync_job {
3768 cf::write_runtime_sync; # external watchdog should not bark
3769 cf::emergency_save; 4210 #cf::emergency_save;
3770 cf::write_runtime_sync; # external watchdog should not bark
3771 4211
3772 warn "syncing database to disk";
3773 BDB::db_env_txn_checkpoint $DB_ENV;
3774
3775 # if anything goes wrong in here, we should simply crash as we already saved
3776
3777 warn "flushing outstanding aio requests";
3778 while (IO::AIO::nreqs || BDB::nreqs) {
3779 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3780 }
3781
3782 warn "cancelling all extension coros"; 4212 trace "perl_reload: cancelling all extension coros";
3783 $_->cancel for values %EXT_CORO; 4213 $_->cancel for values %EXT_CORO;
3784 %EXT_CORO = (); 4214 %EXT_CORO = ();
3785 4215
3786 warn "removing commands"; 4216 trace "perl_reload: removing commands";
3787 %COMMAND = (); 4217 %COMMAND = ();
3788 4218
3789 warn "removing ext/exti commands"; 4219 trace "perl_reload: removing ext/exti commands";
3790 %EXTCMD = (); 4220 %EXTCMD = ();
3791 %EXTICMD = (); 4221 %EXTICMD = ();
3792 4222
3793 warn "unloading/nuking all extensions"; 4223 trace "perl_reload: unloading/nuking all extensions";
3794 for my $pkg (@EXTS) { 4224 for my $pkg (@EXTS) {
3795 warn "... unloading $pkg"; 4225 trace "... unloading $pkg";
3796 4226
3797 if (my $cb = $pkg->can ("unload")) { 4227 if (my $cb = $pkg->can ("unload")) {
3798 eval { 4228 eval {
3799 $cb->($pkg); 4229 $cb->($pkg);
3800 1 4230 1
3801 } or warn "$pkg unloaded, but with errors: $@"; 4231 } or error "$pkg unloaded, but with errors: $@";
3802 } 4232 }
3803 4233
3804 warn "... clearing $pkg"; 4234 trace "... clearing $pkg";
3805 clear_package $pkg; 4235 clear_package $pkg;
3806 } 4236 }
3807 4237
3808 warn "unloading all perl modules loaded from $LIBDIR"; 4238 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3809 while (my ($k, $v) = each %INC) { 4239 while (my ($k, $v) = each %INC) {
3810 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4240 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3811 4241
3812 warn "... unloading $k"; 4242 trace "... unloading $k";
3813 delete $INC{$k}; 4243 delete $INC{$k};
3814 4244
3815 $k =~ s/\.pm$//; 4245 $k =~ s/\.pm$//;
3816 $k =~ s/\//::/g; 4246 $k =~ s/\//::/g;
3817 4247
3820 } 4250 }
3821 4251
3822 clear_package $k; 4252 clear_package $k;
3823 } 4253 }
3824 4254
3825 warn "getting rid of safe::, as good as possible"; 4255 trace "perl_reload: getting rid of safe::, as good as possible";
3826 clear_package "safe::$_" 4256 clear_package "safe::$_"
3827 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4257 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3828 4258
3829 warn "unloading cf.pm \"a bit\""; 4259 trace "perl_reload: unloading cf.pm \"a bit\"";
3830 delete $INC{"cf.pm"}; 4260 delete $INC{"cf.pm"};
3831 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4261 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3832 4262
3833 # don't, removes xs symbols, too, 4263 # don't, removes xs symbols, too,
3834 # and global variables created in xs 4264 # and global variables created in xs
3835 #clear_package __PACKAGE__; 4265 #clear_package __PACKAGE__;
3836 4266
3837 warn "unload completed, starting to reload now"; 4267 info "perl_reload: unload completed, starting to reload now";
3838 4268
3839 warn "reloading cf.pm"; 4269 trace "perl_reload: reloading cf.pm";
3840 require cf; 4270 require cf;
3841 cf::_connect_to_perl_1; 4271 cf::_connect_to_perl_1;
3842 4272
3843 warn "loading config and database again"; 4273 trace "perl_reload: loading config and database again";
3844 cf::reload_config; 4274 cf::reload_config;
3845 4275
3846 warn "loading extensions"; 4276 trace "perl_reload: loading extensions";
3847 cf::load_extensions; 4277 cf::load_extensions;
3848 4278
3849 if ($REATTACH_ON_RELOAD) { 4279 if ($REATTACH_ON_RELOAD) {
3850 warn "reattaching attachments to objects/players"; 4280 trace "perl_reload: reattaching attachments to objects/players";
3851 _global_reattach; # objects, sockets 4281 _global_reattach; # objects, sockets
3852 warn "reattaching attachments to maps"; 4282 trace "perl_reload: reattaching attachments to maps";
3853 reattach $_ for values %MAP; 4283 reattach $_ for values %MAP;
3854 warn "reattaching attachments to players"; 4284 trace "perl_reload: reattaching attachments to players";
3855 reattach $_ for values %PLAYER; 4285 reattach $_ for values %PLAYER;
3856 } 4286 }
3857 4287
3858 warn "running post_init jobs"; 4288 cf::_post_init 1;
3859 (pop @POST_INIT)->(1) while @POST_INIT;
3860 4289
3861 warn "leaving sync_job"; 4290 trace "perl_reload: leaving sync_job";
3862 4291
3863 1 4292 1
3864 } or do { 4293 } or do {
3865 warn $@; 4294 error $@;
3866 cf::cleanup "error while reloading, exiting."; 4295 cf::cleanup "perl_reload: error, exiting.";
3867 }; 4296 };
3868 4297
3869 warn "reloaded";
3870 --$RELOAD; 4298 --$RELOAD;
3871 } 4299 }
3872 4300
3873 $t1 = EV::time - $t1; 4301 $t1 = AE::time - $t1;
3874 warn "reload completed in ${t1}s\n"; 4302 info "perl_reload: completed in ${t1}s\n";
3875}; 4303};
3876 4304
3877our $RELOAD_WATCHER; # used only during reload 4305our $RELOAD_WATCHER; # used only during reload
3878 4306
3879sub reload_perl() { 4307sub reload_perl() {
3881 # coro crashes during coro_state_free->destroy here. 4309 # coro crashes during coro_state_free->destroy here.
3882 4310
3883 $RELOAD_WATCHER ||= cf::async { 4311 $RELOAD_WATCHER ||= cf::async {
3884 Coro::AIO::aio_wait cache_extensions; 4312 Coro::AIO::aio_wait cache_extensions;
3885 4313
3886 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4314 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3887 do_reload_perl; 4315 do_reload_perl;
3888 undef $RELOAD_WATCHER; 4316 undef $RELOAD_WATCHER;
3889 }; 4317 };
3890 }; 4318 };
3891} 4319}
3900 reload_perl; 4328 reload_perl;
3901 }; 4329 };
3902 } 4330 }
3903}; 4331};
3904 4332
3905unshift @INC, $LIBDIR; 4333#############################################################################
3906 4334
3907my $bug_warning = 0; 4335my $bug_warning = 0;
3908 4336
3909our @WAIT_FOR_TICK;
3910our @WAIT_FOR_TICK_BEGIN;
3911
3912sub wait_for_tick { 4337sub wait_for_tick() {
3913 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4338 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3914 4339
3915 my $signal = new Coro::Signal; 4340 $WAIT_FOR_TICK->wait;
3916 push @WAIT_FOR_TICK, $signal;
3917 $signal->wait;
3918} 4341}
3919 4342
3920sub wait_for_tick_begin { 4343sub wait_for_tick_begin() {
3921 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4344 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3922 4345
3923 my $signal = new Coro::Signal; 4346 my $signal = new Coro::Signal;
3924 push @WAIT_FOR_TICK_BEGIN, $signal; 4347 push @WAIT_FOR_TICK_BEGIN, $signal;
3925 $signal->wait; 4348 $signal->wait;
3926} 4349}
3930 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4353 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3931 unless ++$bug_warning > 10; 4354 unless ++$bug_warning > 10;
3932 return; 4355 return;
3933 } 4356 }
3934 4357
3935 cf::server_tick; # one server iteration 4358 cf::one_tick; # one server iteration
3936 4359
3937 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d# 4360 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3938 4361
3939 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4362 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3940 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4363 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3941 Coro::async_pool { 4364 Coro::async_pool {
3942 $Coro::current->{desc} = "runtime saver"; 4365 $Coro::current->{desc} = "runtime saver";
3943 write_runtime_sync 4366 write_runtime_sync
3944 or warn "ERROR: unable to write runtime file: $!"; 4367 or error "ERROR: unable to write runtime file: $!";
3945 }; 4368 };
3946 } 4369 }
3947 4370
3948 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4371 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3949 $sig->send; 4372 $sig->send;
3950 } 4373 }
3951 while (my $sig = shift @WAIT_FOR_TICK) { 4374 $WAIT_FOR_TICK->broadcast;
3952 $sig->send;
3953 }
3954 4375
3955 $LOAD = ($NOW - $TICK_START) / $TICK; 4376 $LOAD = ($NOW - $TICK_START) / $TICK;
3956 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4377 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3957 4378
3958 if (0) { 4379 if (0) {
3959 if ($NEXT_TICK) { 4380 if ($NEXT_TICK) {
3960 my $jitter = $TICK_START - $NEXT_TICK; 4381 my $jitter = $TICK_START - $NEXT_TICK;
3961 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4382 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3962 warn "jitter $JITTER\n";#d# 4383 debug "jitter $JITTER\n";#d#
3963 } 4384 }
3964 } 4385 }
3965} 4386}
3966 4387
3967{ 4388{
3968 # configure BDB 4389 # configure BDB
4390 info "initialising database";
3969 4391
3970 BDB::min_parallel 16; 4392 BDB::min_parallel 16;
3971 BDB::max_poll_reqs $TICK * 0.1; 4393 BDB::max_poll_reqs $TICK * 0.1;
3972 $AnyEvent::BDB::WATCHER->priority (1); 4394 #$AnyEvent::BDB::WATCHER->priority (1);
3973 4395
3974 unless ($DB_ENV) { 4396 unless ($DB_ENV) {
3975 $DB_ENV = BDB::db_env_create; 4397 $DB_ENV = BDB::db_env_create;
3976 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4398 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3977 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4399 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4002 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4424 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4003 }; 4425 };
4004 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4426 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4005 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4427 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4006 }; 4428 };
4429
4430 info "database initialised";
4007} 4431}
4008 4432
4009{ 4433{
4010 # configure IO::AIO 4434 # configure IO::AIO
4011 4435
4436 info "initialising aio";
4012 IO::AIO::min_parallel 8; 4437 IO::AIO::min_parallel 8;
4013 IO::AIO::max_poll_time $TICK * 0.1; 4438 IO::AIO::max_poll_time $TICK * 0.1;
4014 undef $AnyEvent::AIO::WATCHER; 4439 undef $AnyEvent::AIO::WATCHER;
4440 info "aio initialised";
4015} 4441}
4016 4442
4017my $_log_backtrace; 4443our $_log_backtrace;
4444our $_log_backtrace_last;
4018 4445
4019sub _log_backtrace { 4446sub _log_backtrace {
4020 my ($msg, @addr) = @_; 4447 my ($msg, @addr) = @_;
4021 4448
4022 $msg =~ s/\n//; 4449 $msg =~ s/\n$//;
4023 4450
4451 if ($_log_backtrace_last eq $msg) {
4452 LOG llevInfo, "[ABT] $msg\n";
4453 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4024 # limit the # of concurrent backtraces 4454 # limit the # of concurrent backtraces
4025 if ($_log_backtrace < 2) { 4455 } elsif ($_log_backtrace < 2) {
4456 $_log_backtrace_last = $msg;
4026 ++$_log_backtrace; 4457 ++$_log_backtrace;
4027 my $perl_bt = Carp::longmess $msg; 4458 my $perl_bt = Carp::longmess $msg;
4028 async { 4459 async {
4029 $Coro::current->{desc} = "abt $msg"; 4460 $Coro::current->{desc} = "abt $msg";
4030 4461
4050 LOG llevInfo, "[ABT] $_\n" for @bt; 4481 LOG llevInfo, "[ABT] $_\n" for @bt;
4051 --$_log_backtrace; 4482 --$_log_backtrace;
4052 }; 4483 };
4053 } else { 4484 } else {
4054 LOG llevInfo, "[ABT] $msg\n"; 4485 LOG llevInfo, "[ABT] $msg\n";
4055 LOG llevInfo, "[ABT] [suppressed]\n"; 4486 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4056 } 4487 }
4057} 4488}
4058 4489
4059# load additional modules 4490# load additional modules
4060require "cf/$_.pm" for @EXTRA_MODULES; 4491require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines