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.493 by root, Mon Oct 26 02:34:37 2009 UTC vs.
Revision 1.604 by root, Thu Nov 15 07:08:08 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines