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.494 by root, Mon Oct 26 05:18:00 2009 UTC vs.
Revision 1.602 by root, Sun Nov 11 18:21:21 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 les 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, 744 # we seemingly have to make a local copy of the whole thing,
574 # otherwise perl prematurely frees the stuff :/ 745 # otherwise perl prematurely frees the stuff :/
575 # TODO: investigate and fix (likely this will be rather laborious) 746 # TODO: investigate and fix (likely this will be rather laborious)
576 747
577 my @res = Coro::Util::fork_eval { 748 my @res = Coro::Util::fork_eval {
578 reset_signals; 749 cf::post_fork;
579 &$cb 750 &$cb
580 }, @args; 751 } @args;
581 752
582 wantarray ? @res : $res[-1] 753 wantarray ? @res : $res[-1]
754}
755
756sub objinfo {
757 (
758 "counter value" => cf::object::object_count,
759 "objects created" => cf::object::create_count,
760 "objects destroyed" => cf::object::destroy_count,
761 "freelist size" => cf::object::free_count,
762 "allocated objects" => cf::object::objects_size,
763 "active objects" => cf::object::actives_size,
764 )
583} 765}
584 766
585=item $coin = coin_from_name $name 767=item $coin = coin_from_name $name
586 768
587=cut 769=cut
624within each server. 806within each server.
625 807
626=cut 808=cut
627 809
628sub db_table($) { 810sub db_table($) {
811 cf::error "db_get called from main context"
812 if $Coro::current == $Coro::main;
813
629 my ($name) = @_; 814 my ($name) = @_;
630 my $db = BDB::db_create $DB_ENV; 815 my $db = BDB::db_create $DB_ENV;
631 816
632 eval { 817 eval {
633 $db->set_flags (BDB::CHKSUM); 818 $db->set_flags (BDB::CHKSUM);
643} 828}
644 829
645our $DB; 830our $DB;
646 831
647sub db_init { 832sub db_init {
648 cf::sync_job {
649 $DB ||= db_table "db"; 833 $DB ||= db_table "db";
650 };
651} 834}
652 835
653sub db_get($$) { 836sub db_get($$) {
654 my $key = "$_[0]/$_[1]"; 837 my $key = "$_[0]/$_[1]";
655 838
656 cf::sync_job { 839 cf::error "db_get called from main context"
840 if $Coro::current == $Coro::main;
841
657 BDB::db_get $DB, undef, $key, my $data; 842 BDB::db_get $DB, undef, $key, my $data;
658 843
659 $! ? () 844 $! ? ()
660 : $data 845 : $data
661 }
662} 846}
663 847
664sub db_put($$$) { 848sub db_put($$$) {
665 BDB::dbreq_pri 4; 849 BDB::dbreq_pri 4;
666 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 850 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
694 878
695 my @data; 879 my @data;
696 my $md5; 880 my $md5;
697 881
698 for (0 .. $#$src) { 882 for (0 .. $#$src) {
699 0 <= aio_load $src->[$_], $data[$_] 883 $data[$_] = load_file $src->[$_];
700 or Carp::croak "$src->[$_]: $!";
701 } 884 }
702 885
703 # if processing is expensive, check 886 # if processing is expensive, check
704 # checksum first 887 # checksum first
705 if (1) { 888 if (1) {
718 901
719 return db_get cache => "$id/data"; 902 return db_get cache => "$id/data";
720 } 903 }
721 } 904 }
722 905
723 my $t1 = Time::HiRes::time; 906 my $t1 = EV::time;
724 my $data = $process->(\@data); 907 my $data = $process->(\@data);
725 my $t2 = Time::HiRes::time; 908 my $t2 = EV::time;
726 909
727 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 910 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
728 911
729 db_put cache => "$id/data", $data; 912 db_put cache => "$id/data", $data;
730 db_put cache => "$id/md5" , $md5; 913 db_put cache => "$id/md5" , $md5;
731 db_put cache => "$id/meta", $meta; 914 db_put cache => "$id/meta", $meta;
732 915
742 925
743=cut 926=cut
744 927
745sub datalog($@) { 928sub datalog($@) {
746 my ($type, %kv) = @_; 929 my ($type, %kv) = @_;
747 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 930 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
748} 931}
749 932
750=back 933=back
751 934
752=cut 935=cut
947 1130
948 } elsif (exists $cb_id{$type}) { 1131 } elsif (exists $cb_id{$type}) {
949 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1132 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
950 1133
951 } elsif (ref $type) { 1134 } elsif (ref $type) {
952 warn "attaching objects not supported, ignoring.\n"; 1135 error "attaching objects not supported, ignoring.\n";
953 1136
954 } else { 1137 } else {
955 shift @arg; 1138 shift @arg;
956 warn "attach argument '$type' not supported, ignoring.\n"; 1139 error "attach argument '$type' not supported, ignoring.\n";
957 } 1140 }
958 } 1141 }
959} 1142}
960 1143
961sub _object_attach { 1144sub _object_attach {
971 _attach $registry, $klass, @attach; 1154 _attach $registry, $klass, @attach;
972 } 1155 }
973 1156
974 $obj->{$name} = \%arg; 1157 $obj->{$name} = \%arg;
975 } else { 1158 } else {
976 warn "object uses attachment '$name' which is not available, postponing.\n"; 1159 info "object uses attachment '$name' which is not available, postponing.\n";
977 } 1160 }
978 1161
979 $obj->{_attachment}{$name} = undef; 1162 $obj->{_attachment}{$name} = undef;
980} 1163}
981 1164
1040 1223
1041 for (@$callbacks) { 1224 for (@$callbacks) {
1042 eval { &{$_->[1]} }; 1225 eval { &{$_->[1]} };
1043 1226
1044 if ($@) { 1227 if ($@) {
1045 warn "$@";
1046 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1228 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1047 override; 1229 override;
1048 } 1230 }
1049 1231
1050 return 1 if $override; 1232 return 1 if $override;
1051 } 1233 }
1130 for (@$attach) { 1312 for (@$attach) {
1131 my ($klass, @attach) = @$_; 1313 my ($klass, @attach) = @$_;
1132 _attach $registry, $klass, @attach; 1314 _attach $registry, $klass, @attach;
1133 } 1315 }
1134 } else { 1316 } else {
1135 warn "object uses attachment '$name' that is not available, postponing.\n"; 1317 info "object uses attachment '$name' that is not available, postponing.\n";
1136 } 1318 }
1137 } 1319 }
1138} 1320}
1139 1321
1140cf::attachable->attach ( 1322cf::attachable->attach (
1167 my ($filename, $rdata, $objs) = @_; 1349 my ($filename, $rdata, $objs) = @_;
1168 1350
1169 sync_job { 1351 sync_job {
1170 if (length $$rdata) { 1352 if (length $$rdata) {
1171 utf8::decode (my $decname = $filename); 1353 utf8::decode (my $decname = $filename);
1172 warn sprintf "saving %s (%d,%d)\n", 1354 trace sprintf "saving %s (%d,%d)\n",
1173 $decname, length $$rdata, scalar @$objs; 1355 $decname, length $$rdata, scalar @$objs
1356 if $VERBOSE_IO;
1174 1357
1175 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1358 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1176 aio_chmod $fh, SAVE_MODE; 1359 aio_chmod $fh, SAVE_MODE;
1177 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1360 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1178 if ($cf::USE_FSYNC) { 1361 if ($cf::USE_FSYNC) {
1200 aio_rename "$filename~", $filename; 1383 aio_rename "$filename~", $filename;
1201 1384
1202 $filename =~ s%/[^/]+$%%; 1385 $filename =~ s%/[^/]+$%%;
1203 aio_pathsync $filename if $cf::USE_FSYNC; 1386 aio_pathsync $filename if $cf::USE_FSYNC;
1204 } else { 1387 } else {
1205 warn "unable to save objects: $filename~: $!\n"; 1388 error "unable to save objects: $filename~: $!\n";
1206 } 1389 }
1207 } else { 1390 } else {
1208 aio_unlink $filename; 1391 aio_unlink $filename;
1209 aio_unlink "$filename.pst"; 1392 aio_unlink "$filename.pst";
1210 } 1393 }
1234 my $st = eval { Coro::Storable::thaw $av }; 1417 my $st = eval { Coro::Storable::thaw $av };
1235 $av = $st->{objs}; 1418 $av = $st->{objs};
1236 } 1419 }
1237 1420
1238 utf8::decode (my $decname = $filename); 1421 utf8::decode (my $decname = $filename);
1239 warn sprintf "loading %s (%d,%d)\n", 1422 trace sprintf "loading %s (%d,%d)\n",
1240 $decname, length $data, scalar @{$av || []}; 1423 $decname, length $data, scalar @{$av || []}
1424 if $VERBOSE_IO;
1241 1425
1242 ($data, $av) 1426 ($data, $av)
1243} 1427}
1244 1428
1245=head2 COMMAND CALLBACKS 1429=head2 COMMAND CALLBACKS
1249=cut 1433=cut
1250 1434
1251############################################################################# 1435#############################################################################
1252# command handling &c 1436# command handling &c
1253 1437
1254=item cf::register_command $name => \&callback($ob,$args); 1438=item cf::register_command $name => \&callback($ob,$args)
1255 1439
1256Register a callback for execution when the client sends the user command 1440Register a callback for execution when the client sends the user command
1257$name. 1441$name.
1258 1442
1259=cut 1443=cut
1265 #warn "registering command '$name/$time' to '$caller'"; 1449 #warn "registering command '$name/$time' to '$caller'";
1266 1450
1267 push @{ $COMMAND{$name} }, [$caller, $cb]; 1451 push @{ $COMMAND{$name} }, [$caller, $cb];
1268} 1452}
1269 1453
1270=item cf::register_extcmd $name => \&callback($pl,$packet); 1454=item cf::register_extcmd $name => \&callback($pl,@args)
1271 1455
1272Register a callback for execution when the client sends an (synchronous) 1456Register a callback for execution when the client sends an (synchronous)
1273extcmd packet. Ext commands will be processed in the order they are 1457extcmd packet. Ext commands will be processed in the order they are
1274received by the server, like other user commands. The first argument is 1458received by the server, like other user commands. The first argument is
1275the logged-in player. Ext commands can only be processed after a player 1459the logged-in player. Ext commands can only be processed after a player
1276has logged in successfully. 1460has logged in successfully.
1277 1461
1278If the callback returns something, it is sent back as if reply was being 1462The values will be sent back to the client.
1279called.
1280 1463
1464=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1465
1466Same as C<cf::register_extcmd>, but instead of returning values, the
1467callback needs to clal the C<$reply> function.
1468
1281=item cf::register_exticmd $name => \&callback($ns,$packet); 1469=item cf::register_exticmd $name => \&callback($ns,@args)
1282 1470
1283Register a callback for execution when the client sends an (asynchronous) 1471Register a callback for execution when the client sends an (asynchronous)
1284exticmd packet. Exti commands are processed by the server as soon as they 1472exticmd 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 1473are 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 1474is a client socket. Exti commands can be received anytime, even before
1287log-in. 1475log-in.
1288 1476
1289If the callback returns something, it is sent back as if reply was being 1477The values will be sent back to the client.
1290called.
1291 1478
1292=cut 1479=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1293 1480
1481Same as C<cf::register_extcmd>, but instead of returning values, the
1482callback needs to clal the C<$reply> function.
1483
1484=cut
1485
1294sub register_extcmd { 1486sub register_extcmd($$) {
1295 my ($name, $cb) = @_; 1487 my ($name, $cb) = @_;
1296 1488
1297 $EXTCMD{$name} = $cb; 1489 $EXTCMD{$name} = $cb;
1298} 1490}
1299 1491
1300sub register_exticmd { 1492sub register_async_extcmd($$) {
1301 my ($name, $cb) = @_; 1493 my ($name, $cb) = @_;
1302 1494
1495 $EXTACMD{$name} = $cb;
1496}
1497
1498sub register_exticmd($$) {
1499 my ($name, $cb) = @_;
1500
1303 $EXTICMD{$name} = $cb; 1501 $EXTICMD{$name} = $cb;
1304} 1502}
1305 1503
1504sub register_async_exticmd($$) {
1505 my ($name, $cb) = @_;
1506
1507 $EXTIACMD{$name} = $cb;
1508}
1509
1306use File::Glob (); 1510use File::Glob ();
1307 1511
1308cf::player->attach ( 1512cf::player->attach (
1309 on_command => sub { 1513 on_unknown_command => sub {
1310 my ($pl, $name, $params) = @_; 1514 my ($pl, $name, $params) = @_;
1311 1515
1312 my $cb = $COMMAND{$name} 1516 my $cb = $COMMAND{$name}
1313 or return; 1517 or return;
1314 1518
1322 my ($pl, $buf) = @_; 1526 my ($pl, $buf) = @_;
1323 1527
1324 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1528 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1325 1529
1326 if (ref $msg) { 1530 if (ref $msg) {
1327 my ($type, $reply, @payload) = 1531 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 1532
1332 my @reply;
1333
1334 if (my $cb = $EXTCMD{$type}) { 1533 if (my $cb = $EXTACMD{$type}) {
1534 $cb->(
1535 $pl,
1536 sub {
1537 $pl->ext_msg ("reply-$reply", @_)
1538 if $reply;
1539 },
1540 @payload
1541 );
1542 } else {
1543 my @reply;
1544
1545 if (my $cb = $EXTCMD{$type}) {
1335 @reply = $cb->($pl, @payload); 1546 @reply = $cb->($pl, @payload);
1547 }
1548
1549 $pl->ext_msg ("reply-$reply", @reply)
1550 if $reply;
1336 } 1551 }
1337 1552
1338 $pl->ext_reply ($reply, @reply)
1339 if $reply;
1340
1341 } else { 1553 } else {
1342 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1554 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1343 } 1555 }
1344 1556
1345 cf::override; 1557 cf::override;
1346 }, 1558 },
1347); 1559);
1357 }; 1569 };
1358 1570
1359 $grp 1571 $grp
1360} 1572}
1361 1573
1574sub _ext_cfg_reg($$$$) {
1575 my ($rvar, $varname, $cfgname, $default) = @_;
1576
1577 $cfgname = lc $varname
1578 unless length $cfgname;
1579
1580 $EXT_CFG{$cfgname} = [$rvar, $default];
1581
1582 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1583}
1584
1362sub load_extensions { 1585sub load_extensions {
1586 info "loading extensions...";
1587
1588 %EXT_CFG = ();
1589
1363 cf::sync_job { 1590 cf::sync_job {
1364 my %todo; 1591 my %todo;
1365 1592
1366 for my $path (<$LIBDIR/*.ext>) { 1593 for my $path (<$LIBDIR/*.ext>) {
1367 next unless -r $path; 1594 next unless -r $path;
1385 1612
1386 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1613 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1387 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1614 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1388 1615
1389 $ext{source} = 1616 $ext{source} =
1390 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1617 "package $pkg; use common::sense;\n"
1391 . "#line 1 \"$path\"\n{\n" 1618 . "#line 1 \"$path\"\n{\n"
1392 . $source 1619 . $source
1393 . "\n};\n1"; 1620 . "\n};\n1";
1394 1621
1395 $todo{$base} = \%ext; 1622 $todo{$base} = \%ext;
1396 } 1623 }
1397 1624
1625 my $pass = 0;
1398 my %done; 1626 my %done;
1399 while (%todo) { 1627 while (%todo) {
1400 my $progress; 1628 my $progress;
1401 1629
1630 ++$pass;
1631
1632 ext:
1402 while (my ($k, $v) = each %todo) { 1633 while (my ($k, $v) = each %todo) {
1403 for (split /,\s*/, $v->{meta}{depends}) { 1634 for (split /,\s*/, $v->{meta}{depends}) {
1404 goto skip 1635 next ext
1405 unless exists $done{$_}; 1636 unless exists $done{$_};
1406 } 1637 }
1407 1638
1408 warn "... loading '$k' into '$v->{pkg}'\n"; 1639 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1409 1640
1410 unless (eval $v->{source}) { 1641 my $source = $v->{source};
1642
1643 # support "CONF varname :confname = default" pseudo-statements
1644 $source =~ s{
1645 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1646 }{
1647 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1648 }gmxe;
1649
1650 my $active = eval $source;
1651
1652 if (length $@) {
1411 my $msg = $@ ? "$v->{path}: $@\n" 1653 error "$v->{path}: $@\n";
1412 : "$v->{base}: extension inactive.\n";
1413 1654
1414 if (exists $v->{meta}{mandatory}) {
1415 warn $msg;
1416 cf::cleanup "mandatory extension failed to load, exiting."; 1655 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1417 } 1656 if exists $v->{meta}{mandatory};
1418 1657
1419 warn $msg; 1658 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1659 delete $todo{$k};
1660 } else {
1661 $done{$k} = delete $todo{$k};
1662 push @EXTS, $v->{pkg};
1663 $progress = 1;
1664
1665 info "$v->{base}: extension inactive.\n"
1666 unless $active;
1420 } 1667 }
1421
1422 $done{$k} = delete $todo{$k};
1423 push @EXTS, $v->{pkg};
1424 $progress = 1;
1425 } 1668 }
1426 1669
1427 skip: 1670 unless ($progress) {
1428 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1671 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1429 unless $progress; 1672
1673 while (my ($k, $v) = each %todo) {
1674 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1675 if exists $v->{meta}{mandatory};
1676 }
1677
1678 last;
1679 }
1430 } 1680 }
1431 }; 1681 };
1432} 1682}
1433 1683
1434############################################################################# 1684#############################################################################
1518 $cf::PLAYER{$login} = $pl 1768 $cf::PLAYER{$login} = $pl
1519 } 1769 }
1520 } 1770 }
1521} 1771}
1522 1772
1773cf::player->attach (
1774 on_load => sub {
1775 my ($pl, $path) = @_;
1776
1777 # restore slots saved in save, below
1778 my $slots = delete $pl->{_slots};
1779
1780 $pl->ob->current_weapon ($slots->[0]);
1781 $pl->combat_ob ($slots->[1]);
1782 $pl->ranged_ob ($slots->[2]);
1783 },
1784);
1785
1523sub save($) { 1786sub save($) {
1524 my ($pl) = @_; 1787 my ($pl) = @_;
1525 1788
1526 return if $pl->{deny_save}; 1789 return if $pl->{deny_save};
1527 1790
1532 1795
1533 aio_mkdir playerdir $pl, 0770; 1796 aio_mkdir playerdir $pl, 0770;
1534 $pl->{last_save} = $cf::RUNTIME; 1797 $pl->{last_save} = $cf::RUNTIME;
1535 1798
1536 cf::get_slot 0.01; 1799 cf::get_slot 0.01;
1800
1801 # save slots, to be restored later
1802 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1537 1803
1538 $pl->save_pl ($path); 1804 $pl->save_pl ($path);
1539 cf::cede_to_tick; 1805 cf::cede_to_tick;
1540} 1806}
1541 1807
1575 my $name = $pl->ob->name; 1841 my $name = $pl->ob->name;
1576 1842
1577 $pl->{deny_save} = 1; 1843 $pl->{deny_save} = 1;
1578 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1844 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1579 1845
1580 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1846 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1581 $pl->deactivate; 1847 $pl->deactivate;
1848
1582 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1849 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1583 $pl->ob->check_score;
1584 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1850 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1851 ext::highscore::check ($pl->ob);
1852
1585 $pl->ns->destroy if $pl->ns; 1853 $pl->ns->destroy if $pl->ns;
1586 1854
1587 my $path = playerdir $pl; 1855 my $path = playerdir $pl;
1588 my $temp = "$path~$cf::RUNTIME~deleting~"; 1856 my $temp = "$path~$cf::RUNTIME~deleting~";
1589 aio_rename $path, $temp; 1857 aio_rename $path, $temp;
1643 \@logins 1911 \@logins
1644} 1912}
1645 1913
1646=item $player->maps 1914=item $player->maps
1647 1915
1916=item cf::player::maps $login
1917
1648Returns an arrayref of map paths that are private for this 1918Returns an arrayref of map paths that are private for this
1649player. May block. 1919player. May block.
1650 1920
1651=cut 1921=cut
1652 1922
1673 1943
1674=item $protocol_xml = $player->expand_cfpod ($cfpod) 1944=item $protocol_xml = $player->expand_cfpod ($cfpod)
1675 1945
1676Expand deliantra pod fragments into protocol xml. 1946Expand deliantra pod fragments into protocol xml.
1677 1947
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) 1948=item $player->ext_msg ($type, @msg)
1691 1949
1692Sends an ext event to the client. 1950Sends an ext event to the client.
1693 1951
1694=cut 1952=cut
1713 1971
1714=cut 1972=cut
1715 1973
1716sub find_by_path($) { 1974sub find_by_path($) {
1717 my ($path) = @_; 1975 my ($path) = @_;
1976
1977 $path =~ s/^~[^\/]*//; # skip ~login
1718 1978
1719 my ($match, $specificity); 1979 my ($match, $specificity);
1720 1980
1721 for my $region (list) { 1981 for my $region (list) {
1722 if ($region->{match} && $path =~ $region->{match}) { 1982 if ($region->{match} && $path =~ $region->{match}) {
1751sub generate_random_map { 2011sub generate_random_map {
1752 my ($self, $rmp) = @_; 2012 my ($self, $rmp) = @_;
1753 2013
1754 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 2014 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1755 2015
1756 # mit "rum" bekleckern, nicht
1757 $self->_create_random_map ( 2016 $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} 2017}
1771 2018
1772=item cf::map->register ($regex, $prio) 2019=item cf::map->register ($regex, $prio)
1773 2020
1774Register a handler for the map path matching the given regex at the 2021Register a handler for the map path matching the given regex at the
1779 2026
1780sub register { 2027sub register {
1781 my (undef, $regex, $prio) = @_; 2028 my (undef, $regex, $prio) = @_;
1782 my $pkg = caller; 2029 my $pkg = caller;
1783 2030
1784 no strict;
1785 push @{"$pkg\::ISA"}, __PACKAGE__; 2031 push @{"$pkg\::ISA"}, __PACKAGE__;
1786 2032
1787 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2033 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1788} 2034}
1789 2035
1790# also paths starting with '/' 2036# also paths starting with '/'
1791$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2037$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1792 2038
1793sub thawer_merge { 2039sub thawer_merge {
1794 my ($self, $merge) = @_; 2040 my ($self, $merge) = @_;
1795 2041
1796 # we have to keep some variables in memory intact 2042 # we have to keep some variables in memory intact
1801} 2047}
1802 2048
1803sub normalise { 2049sub normalise {
1804 my ($path, $base) = @_; 2050 my ($path, $base) = @_;
1805 2051
1806 $path = "$path"; # make sure its a string 2052 $path = "$path"; # make sure it's a string
1807 2053
1808 $path =~ s/\.map$//; 2054 $path =~ s/\.map$//;
1809 2055
1810 # map plan: 2056 # map plan:
1811 # 2057 #
1826 $base =~ s{[^/]+/?$}{}; 2072 $base =~ s{[^/]+/?$}{};
1827 $path = "$base/$path"; 2073 $path = "$base/$path";
1828 } 2074 }
1829 2075
1830 for ($path) { 2076 for ($path) {
1831 redo if s{//}{/};
1832 redo if s{/\.?/}{/}; 2077 redo if s{/\.?/}{/};
1833 redo if s{/[^/]+/\.\./}{/}; 2078 redo if s{/[^/]+/\.\./}{/};
1834 } 2079 }
1835 2080
1836 $path 2081 $path
1850 $self->init; # pass $1 etc. 2095 $self->init; # pass $1 etc.
1851 return $self; 2096 return $self;
1852 } 2097 }
1853 } 2098 }
1854 2099
1855 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2100 Carp::cluck "unable to resolve path '$path' (base '$base')";
1856 () 2101 ()
1857} 2102}
1858 2103
2104# may re-bless or do other evil things
1859sub init { 2105sub init {
1860 my ($self) = @_; 2106 my ($self) = @_;
1861 2107
1862 $self 2108 $self
1863} 2109}
1928 $self->{load_path} = $path; 2174 $self->{load_path} = $path;
1929 2175
1930 1 2176 1
1931} 2177}
1932 2178
2179# used to laod the header of an original map
1933sub load_header_orig { 2180sub load_header_orig {
1934 my ($self) = @_; 2181 my ($self) = @_;
1935 2182
1936 $self->load_header_from ($self->load_path) 2183 $self->load_header_from ($self->load_path)
1937} 2184}
1938 2185
2186# used to laod the header of an instantiated map
1939sub load_header_temp { 2187sub load_header_temp {
1940 my ($self) = @_; 2188 my ($self) = @_;
1941 2189
1942 $self->load_header_from ($self->save_path) 2190 $self->load_header_from ($self->save_path)
1943} 2191}
1944 2192
2193# called after loading the header from an instantiated map
1945sub prepare_temp { 2194sub prepare_temp {
1946 my ($self) = @_; 2195 my ($self) = @_;
1947 2196
1948 $self->last_access ((delete $self->{last_access}) 2197 $self->last_access ((delete $self->{last_access})
1949 || $cf::RUNTIME); #d# 2198 || $cf::RUNTIME); #d#
1950 # safety 2199 # safety
1951 $self->{instantiate_time} = $cf::RUNTIME 2200 $self->{instantiate_time} = $cf::RUNTIME
1952 if $self->{instantiate_time} > $cf::RUNTIME; 2201 if $self->{instantiate_time} > $cf::RUNTIME;
1953} 2202}
1954 2203
2204# called after loading the header from an original map
1955sub prepare_orig { 2205sub prepare_orig {
1956 my ($self) = @_; 2206 my ($self) = @_;
1957 2207
1958 $self->{load_original} = 1; 2208 $self->{load_original} = 1;
1959 $self->{instantiate_time} = $cf::RUNTIME; 2209 $self->{instantiate_time} = $cf::RUNTIME;
1983 2233
1984sub find; 2234sub find;
1985sub find { 2235sub find {
1986 my ($path, $origin) = @_; 2236 my ($path, $origin) = @_;
1987 2237
2238 cf::cede_to_tick;
2239
1988 $path = normalise $path, $origin && $origin->path; 2240 $path = normalise $path, $origin;
1989 2241
1990 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2242 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1991 my $guard2 = cf::lock_acquire "map_find:$path"; 2243 my $guard2 = cf::lock_acquire "map_find:$path";
1992 2244
1993 $cf::MAP{$path} || do { 2245 $cf::MAP{$path} || do {
2010 2262
2011 $cf::MAP{$path} = $map 2263 $cf::MAP{$path} = $map
2012 } 2264 }
2013} 2265}
2014 2266
2015sub pre_load { } 2267sub pre_load { }
2016sub post_load { } 2268#sub post_load { } # XS
2017 2269
2018sub load { 2270sub load {
2019 my ($self) = @_; 2271 my ($self) = @_;
2020 2272
2021 local $self->{deny_reset} = 1; # loading can take a long time 2273 local $self->{deny_reset} = 1; # loading can take a long time
2024 2276
2025 { 2277 {
2026 my $guard = cf::lock_acquire "map_data:$path"; 2278 my $guard = cf::lock_acquire "map_data:$path";
2027 2279
2028 return unless $self->valid; 2280 return unless $self->valid;
2029 return unless $self->in_memory == cf::MAP_SWAPPED; 2281 return unless $self->state == cf::MAP_SWAPPED;
2030
2031 $self->in_memory (cf::MAP_LOADING);
2032 2282
2033 $self->alloc; 2283 $self->alloc;
2034 2284
2035 $self->pre_load; 2285 $self->pre_load;
2036 cf::cede_to_tick; 2286 cf::cede_to_tick;
2037 2287
2288 if (exists $self->{load_path}) {
2038 my $f = new_from_file cf::object::thawer $self->{load_path}; 2289 my $f = new_from_file cf::object::thawer $self->{load_path};
2039 $f->skip_block; 2290 $f->skip_block;
2040 $self->_load_objects ($f) 2291 $self->_load_objects ($f)
2041 or return; 2292 or return;
2042 2293
2043 $self->post_load_original 2294 $self->post_load_original
2044 if delete $self->{load_original}; 2295 if delete $self->{load_original};
2045 2296
2046 if (my $uniq = $self->uniq_path) { 2297 if (my $uniq = $self->uniq_path) {
2047 utf8::encode $uniq; 2298 utf8::encode $uniq;
2048 unless (aio_stat $uniq) { 2299 unless (aio_stat $uniq) {
2049 if (my $f = new_from_file cf::object::thawer $uniq) { 2300 if (my $f = new_from_file cf::object::thawer $uniq) {
2050 $self->clear_unique_items; 2301 $self->clear_unique_items;
2051 $self->_load_objects ($f); 2302 $self->_load_objects ($f);
2052 $f->resolve_delayed_derefs; 2303 $f->resolve_delayed_derefs;
2304 }
2053 } 2305 }
2054 } 2306 }
2055 }
2056 2307
2057 $f->resolve_delayed_derefs; 2308 $f->resolve_delayed_derefs;
2309 } else {
2310 $self->post_load_original
2311 if delete $self->{load_original};
2312 }
2313
2314 $self->state (cf::MAP_INACTIVE);
2058 2315
2059 cf::cede_to_tick; 2316 cf::cede_to_tick;
2060 # now do the right thing for maps 2317 # now do the right thing for maps
2061 $self->link_multipart_objects; 2318 $self->link_multipart_objects;
2062 $self->difficulty ($self->estimate_difficulty) 2319 $self->difficulty ($self->estimate_difficulty)
2066 unless ($self->{deny_activate}) { 2323 unless ($self->{deny_activate}) {
2067 $self->decay_objects; 2324 $self->decay_objects;
2068 $self->fix_auto_apply; 2325 $self->fix_auto_apply;
2069 $self->update_buttons; 2326 $self->update_buttons;
2070 cf::cede_to_tick; 2327 cf::cede_to_tick;
2071 $self->activate; 2328 #$self->activate; # no longer activate maps automatically
2072 } 2329 }
2073 2330
2074 $self->{last_save} = $cf::RUNTIME; 2331 $self->{last_save} = $cf::RUNTIME;
2075 $self->last_access ($cf::RUNTIME); 2332 $self->last_access ($cf::RUNTIME);
2076
2077 $self->in_memory (cf::MAP_ACTIVE);
2078 } 2333 }
2079 2334
2080 $self->post_load; 2335 $self->post_load;
2081}
2082 2336
2337 1
2338}
2339
2340# customize the map for a given player, i.e.
2341# return the _real_ map. used by e.g. per-player
2342# maps to change the path to ~playername/mappath
2083sub customise_for { 2343sub customise_for {
2084 my ($self, $ob) = @_; 2344 my ($self, $ob) = @_;
2085 2345
2086 return find "~" . $ob->name . "/" . $self->{path} 2346 return find "~" . $ob->name . "/" . $self->{path}
2087 if $self->per_player; 2347 if $self->per_player;
2090# if $self->per_party; 2350# if $self->per_party;
2091 2351
2092 $self 2352 $self
2093} 2353}
2094 2354
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 { 2355sub find_sync {
2122 my ($path, $origin) = @_; 2356 my ($path, $origin) = @_;
2123 2357
2124 cf::sync_job { find $path, $origin } 2358 # it's a bug to call this from the main context
2359 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2360 if $Coro::current == $Coro::main;
2361
2362 find $path, $origin
2125} 2363}
2126 2364
2127sub do_load_sync { 2365sub do_load_sync {
2128 my ($map) = @_; 2366 my ($map) = @_;
2129 2367
2368 # it's a bug to call this from the main context
2130 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2369 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2131 if $Coro::current == $Coro::main; 2370 if $Coro::current == $Coro::main;
2132 2371
2133 cf::sync_job { $map->load }; 2372 $map->load;
2134} 2373}
2135 2374
2136our %MAP_PREFETCH; 2375our %MAP_PREFETCH;
2137our $MAP_PREFETCHER = undef; 2376our $MAP_PREFETCHER = undef;
2138 2377
2139sub find_async { 2378sub find_async {
2140 my ($path, $origin, $load) = @_; 2379 my ($path, $origin, $load) = @_;
2141 2380
2142 $path = normalise $path, $origin && $origin->{path}; 2381 $path = normalise $path, $origin;
2143 2382
2144 if (my $map = $cf::MAP{$path}) { 2383 if (my $map = $cf::MAP{$path}) {
2145 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2384 return $map if !$load || $map->linkable;
2146 } 2385 }
2147 2386
2148 $MAP_PREFETCH{$path} |= $load; 2387 $MAP_PREFETCH{$path} |= $load;
2149 2388
2150 $MAP_PREFETCHER ||= cf::async { 2389 $MAP_PREFETCHER ||= cf::async {
2164 $MAP_PREFETCHER->prio (6); 2403 $MAP_PREFETCHER->prio (6);
2165 2404
2166 () 2405 ()
2167} 2406}
2168 2407
2408# common code, used by both ->save and ->swapout
2169sub save { 2409sub _save {
2170 my ($self) = @_; 2410 my ($self) = @_;
2171
2172 my $lock = cf::lock_acquire "map_data:$self->{path}";
2173 2411
2174 $self->{last_save} = $cf::RUNTIME; 2412 $self->{last_save} = $cf::RUNTIME;
2175 2413
2176 return unless $self->dirty; 2414 return unless $self->dirty;
2177 2415
2197 } else { 2435 } else {
2198 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2436 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2199 } 2437 }
2200} 2438}
2201 2439
2440sub save {
2441 my ($self) = @_;
2442
2443 my $lock = cf::lock_acquire "map_data:$self->{path}";
2444
2445 $self->_save;
2446}
2447
2202sub swap_out { 2448sub swap_out {
2203 my ($self) = @_; 2449 my ($self) = @_;
2204 2450
2205 # save first because save cedes
2206 $self->save;
2207
2208 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2451 my $lock = cf::lock_acquire "map_data:$self->{path}";
2209 2452
2453 return if !$self->linkable;
2454 return if $self->{deny_save};
2210 return if $self->players; 2455 return if $self->players;
2211 return if $self->in_memory != cf::MAP_ACTIVE; 2456
2457 # first deactivate the map and "unlink" it from the core
2458 $self->deactivate;
2459 $_->clear_links_to ($self) for values %cf::MAP;
2460 $self->state (cf::MAP_SWAPPED);
2461
2462 # then atomically save
2463 $self->_save;
2464
2465 # then free the map
2466 $self->clear;
2467}
2468
2469sub reset_at {
2470 my ($self) = @_;
2471
2472 # TODO: safety, remove and allow resettable per-player maps
2212 return if $self->{deny_save}; 2473 return 1e99 if $self->{deny_reset};
2213 2474
2475 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2476 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2477
2478 $time + $to
2479}
2480
2481sub should_reset {
2482 my ($self) = @_;
2483
2484 $self->reset_at <= $cf::RUNTIME
2485}
2486
2487sub reset {
2488 my ($self) = @_;
2489
2490 my $lock = cf::lock_acquire "map_data:$self->{path}";
2491
2492 return if $self->players;
2493
2494 cf::trace "resetting map ", $self->path, "\n";
2495
2214 $self->in_memory (cf::MAP_SWAPPED); 2496 $self->state (cf::MAP_SWAPPED);
2497
2498 # need to save uniques path
2499 unless ($self->{deny_save}) {
2500 my $uniq = $self->uniq_path; utf8::encode $uniq;
2501
2502 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2503 if $uniq;
2504 }
2505
2506 delete $cf::MAP{$self->path};
2215 2507
2216 $self->deactivate; 2508 $self->deactivate;
2217 $_->clear_links_to ($self) for values %cf::MAP; 2509 $_->clear_links_to ($self) for values %cf::MAP;
2218 $self->clear; 2510 $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 2511
2264 $self->unlink_save; 2512 $self->unlink_save;
2265 $self->destroy; 2513 $self->destroy;
2266} 2514}
2267 2515
2275 2523
2276 delete $cf::MAP{$self->path}; 2524 delete $cf::MAP{$self->path};
2277 2525
2278 $self->unlink_save; 2526 $self->unlink_save;
2279 2527
2280 bless $self, "cf::map"; 2528 bless $self, "cf::map::wrap";
2281 delete $self->{deny_reset}; 2529 delete $self->{deny_reset};
2282 $self->{deny_save} = 1; 2530 $self->{deny_save} = 1;
2283 $self->reset_timeout (1); 2531 $self->reset_timeout (1);
2284 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2532 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2285 2533
2406 2654
2407Creates and returns a persistent reference to an object that can be stored as a string. 2655Creates and returns a persistent reference to an object that can be stored as a string.
2408 2656
2409=item $ob = cf::object::deref ($refstring) 2657=item $ob = cf::object::deref ($refstring)
2410 2658
2411returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2659returns the objetc referenced by refstring. may return undef when it cannot find the object,
2412even if the object actually exists. May block. 2660even if the object actually exists. May block.
2413 2661
2414=cut 2662=cut
2415 2663
2416sub deref { 2664sub deref {
2515 2763
2516Freezes the player and moves him/her to a special map (C<{link}>). 2764Freezes the player and moves him/her to a special map (C<{link}>).
2517 2765
2518The player should be reasonably safe there for short amounts of time (e.g. 2766The 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, 2767for 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 2768though, as the player cannot control the character while it is on the link
2521map. 2769map.
2522 2770
2523Will never block. 2771Will never block.
2524 2772
2525=item $player_object->leave_link ($map, $x, $y) 2773=item $player_object->leave_link ($map, $x, $y)
2546sub cf::object::player::enter_link { 2794sub cf::object::player::enter_link {
2547 my ($self) = @_; 2795 my ($self) = @_;
2548 2796
2549 $self->deactivate_recursive; 2797 $self->deactivate_recursive;
2550 2798
2799 ++$self->{_link_recursion};
2800
2551 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2801 return if UNIVERSAL::isa $self->map, "ext::map_link";
2552 2802
2553 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2803 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2554 if $self->map && $self->map->{path} ne "{link}"; 2804 if $self->map && $self->map->{path} ne "{link}";
2555 2805
2556 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2806 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2557} 2807}
2558 2808
2559sub cf::object::player::leave_link { 2809sub cf::object::player::leave_link {
2560 my ($self, $map, $x, $y) = @_; 2810 my ($self, $map, $x, $y) = @_;
2561 2811
2581 # use -1 or undef as default coordinates, not 0, 0 2831 # use -1 or undef as default coordinates, not 0, 0
2582 ($x, $y) = ($map->enter_x, $map->enter_y) 2832 ($x, $y) = ($map->enter_x, $map->enter_y)
2583 if $x <= 0 && $y <= 0; 2833 if $x <= 0 && $y <= 0;
2584 2834
2585 $map->load; 2835 $map->load;
2586 $map->load_neighbours;
2587 2836
2588 return unless $self->contr->active; 2837 return unless $self->contr->active;
2589 2838
2590 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2839 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2591 $self->enter_map ($map, $x, $y); 2840 if ($self->enter_map ($map, $x, $y)) {
2592 2841 # entering was successful
2842 delete $self->{_link_recursion};
2593 # only activate afterwards, to support waiting in hooks 2843 # only activate afterwards, to support waiting in hooks
2594 $self->activate_recursive; 2844 $self->activate_recursive;
2595} 2845 }
2596 2846
2847}
2848
2597=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2849=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2598 2850
2599Moves the player to the given map-path and coordinates by first freezing 2851Moves the player to the given map-path and coordinates by first freezing
2600her, loading and preparing them map, calling the provided $check callback 2852her, loading and preparing them map, calling the provided $check callback
2601that has to return the map if sucecssful, and then unfreezes the player on 2853that 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 2854the new (success) or old (failed) map position. In either case, $done will
2609 2861
2610our $GOTOGEN; 2862our $GOTOGEN;
2611 2863
2612sub cf::object::player::goto { 2864sub cf::object::player::goto {
2613 my ($self, $path, $x, $y, $check, $done) = @_; 2865 my ($self, $path, $x, $y, $check, $done) = @_;
2866
2867 if ($self->{_link_recursion} >= $MAX_LINKS) {
2868 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2869 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2870 ($path, $x, $y) = @$EMERGENCY_POSITION;
2871 }
2614 2872
2615 # do generation counting so two concurrent goto's will be executed in-order 2873 # do generation counting so two concurrent goto's will be executed in-order
2616 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2874 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2617 2875
2618 $self->enter_link; 2876 $self->enter_link;
2638 ($path, $x, $y) = (undef, undef, undef); 2896 ($path, $x, $y) = (undef, undef, undef);
2639 } 2897 }
2640 } 2898 }
2641 2899
2642 my $map = eval { 2900 my $map = eval {
2643 my $map = defined $path ? cf::map::find $path : undef; 2901 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2644 2902
2645 if ($map) { 2903 if ($map) {
2646 $map = $map->customise_for ($self); 2904 $map = $map->customise_for ($self);
2647 $map = $check->($map) if $check && $map; 2905 $map = $check->($map, $x, $y, $self) if $check && $map;
2648 } else { 2906 } else {
2649 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2907 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2650 } 2908 }
2651 2909
2652 $map 2910 $map
2660 if ($gen == $self->{_goto_generation}) { 2918 if ($gen == $self->{_goto_generation}) {
2661 delete $self->{_goto_generation}; 2919 delete $self->{_goto_generation};
2662 $self->leave_link ($map, $x, $y); 2920 $self->leave_link ($map, $x, $y);
2663 } 2921 }
2664 2922
2665 $done->() if $done; 2923 $done->($self) if $done;
2666 })->prio (1); 2924 })->prio (1);
2667} 2925}
2668 2926
2669=item $player_object->enter_exit ($exit_object) 2927=item $player_object->enter_exit ($exit_object)
2670 2928
2738 $Coro::current->{desc} = "enter_exit"; 2996 $Coro::current->{desc} = "enter_exit";
2739 2997
2740 unless (eval { 2998 unless (eval {
2741 $self->deactivate_recursive; # just to be sure 2999 $self->deactivate_recursive; # just to be sure
2742 3000
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; 3001 my $map = cf::map::normalise $exit->slaying, $exit->map;
2752 my $x = $exit->stats->hp; 3002 my $x = $exit->stats->hp;
2753 my $y = $exit->stats->sp; 3003 my $y = $exit->stats->sp;
3004
3005 # special map handling
3006 my $slaying = $exit->slaying;
3007
3008 # special map handling
3009 if ($slaying eq "/!") {
3010 my $guard = cf::lock_acquire "exit_prepare:$exit";
3011
3012 prepare_random_map $exit
3013 if $exit->slaying eq "/!"; # need to re-check after getting the lock
3014
3015 $map = $exit->slaying;
3016
3017 } elsif ($slaying eq '!up') {
3018 $map = $exit->map->tile_path (cf::TILE_UP);
3019 $x = $exit->x;
3020 $y = $exit->y;
3021
3022 } elsif ($slaying eq '!down') {
3023 $map = $exit->map->tile_path (cf::TILE_DOWN);
3024 $x = $exit->x;
3025 $y = $exit->y;
3026 }
2754 3027
2755 $self->goto ($map, $x, $y); 3028 $self->goto ($map, $x, $y);
2756 3029
2757 # if exit is damned, update players death & WoR home-position 3030 # if exit is damned, update players death & WoR home-position
2758 $self->contr->savebed ($map, $x, $y) 3031 $self->contr->savebed ($map, $x, $y)
2763 $self->message ("Something went wrong deep within the deliantra server. " 3036 $self->message ("Something went wrong deep within the deliantra server. "
2764 . "I'll try to bring you back to the map you were before. " 3037 . "I'll try to bring you back to the map you were before. "
2765 . "Please report this to the dungeon master!", 3038 . "Please report this to the dungeon master!",
2766 cf::NDI_UNIQUE | cf::NDI_RED); 3039 cf::NDI_UNIQUE | cf::NDI_RED);
2767 3040
2768 warn "ERROR in enter_exit: $@"; 3041 error "ERROR in enter_exit: $@";
2769 $self->leave_link; 3042 $self->leave_link;
2770 } 3043 }
2771 })->prio (1); 3044 })->prio (1);
2772} 3045}
2773 3046
2983=cut 3256=cut
2984 3257
2985sub cf::client::ext_msg($$@) { 3258sub cf::client::ext_msg($$@) {
2986 my ($self, $type, @msg) = @_; 3259 my ($self, $type, @msg) = @_;
2987 3260
2988 if ($self->extcmd == 2) {
2989 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3261 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2990 } elsif ($self->extcmd == 1) { # TODO: remove
2991 push @msg, msgtype => "event_$type";
2992 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2993 }
2994}
2995
2996=item $client->ext_reply ($msgid, @msg)
2997
2998Sends an ext reply to the client.
2999
3000=cut
3001
3002sub cf::client::ext_reply($$@) {
3003 my ($self, $id, @msg) = @_;
3004
3005 if ($self->extcmd == 2) {
3006 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3007 } elsif ($self->extcmd == 1) {
3008 #TODO: version 1, remove
3009 unshift @msg, msgtype => "reply", msgid => $id;
3010 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3011 }
3012} 3262}
3013 3263
3014=item $success = $client->query ($flags, "text", \&cb) 3264=item $success = $client->query ($flags, "text", \&cb)
3015 3265
3016Queues a query to the client, calling the given callback with 3266Queues a query to the client, calling the given callback with
3071 my ($ns, $buf) = @_; 3321 my ($ns, $buf) = @_;
3072 3322
3073 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3323 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3074 3324
3075 if (ref $msg) { 3325 if (ref $msg) {
3076 my ($type, $reply, @payload) = 3326 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3077 "ARRAY" eq ref $msg
3078 ? @$msg
3079 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3080 3327
3081 my @reply;
3082
3083 if (my $cb = $EXTICMD{$type}) { 3328 if (my $cb = $EXTIACMD{$type}) {
3329 $cb->(
3330 $ns,
3331 sub {
3332 $ns->ext_msg ("reply-$reply", @_)
3333 if $reply;
3334 },
3335 @payload
3336 );
3337 } else {
3338 my @reply;
3339
3340 if (my $cb = $EXTICMD{$type}) {
3084 @reply = $cb->($ns, @payload); 3341 @reply = $cb->($ns, @payload);
3342 }
3343
3344 $ns->ext_msg ("reply-$reply", @reply)
3345 if $reply;
3085 } 3346 }
3086
3087 $ns->ext_reply ($reply, @reply)
3088 if $reply;
3089
3090 } else { 3347 } else {
3091 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3348 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3092 } 3349 }
3093 3350
3094 cf::override; 3351 cf::override;
3095 }, 3352 },
3096); 3353);
3116 3373
3117 $coro 3374 $coro
3118} 3375}
3119 3376
3120cf::client->attach ( 3377cf::client->attach (
3121 on_destroy => sub { 3378 on_client_destroy => sub {
3122 my ($ns) = @_; 3379 my ($ns) = @_;
3123 3380
3124 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3381 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3125 }, 3382 },
3126); 3383);
3142our $safe_hole = new Safe::Hole; 3399our $safe_hole = new Safe::Hole;
3143 3400
3144$SIG{FPE} = 'IGNORE'; 3401$SIG{FPE} = 'IGNORE';
3145 3402
3146$safe->permit_only (Opcode::opset qw( 3403$safe->permit_only (Opcode::opset qw(
3147 :base_core :base_mem :base_orig :base_math 3404 :base_core :base_mem :base_orig :base_math :base_loop
3148 grepstart grepwhile mapstart mapwhile 3405 grepstart grepwhile mapstart mapwhile
3149 sort time 3406 sort time
3150)); 3407));
3151 3408
3152# here we export the classes and methods available to script code 3409# here we export the classes and methods available to script code
3177 decrease split destroy change_exp value msg lore send_msg)], 3434 decrease split destroy change_exp value msg lore send_msg)],
3178 ["cf::object::player" => qw(player)], 3435 ["cf::object::player" => qw(player)],
3179 ["cf::player" => qw(peaceful send_msg)], 3436 ["cf::player" => qw(peaceful send_msg)],
3180 ["cf::map" => qw(trigger)], 3437 ["cf::map" => qw(trigger)],
3181) { 3438) {
3182 no strict 'refs';
3183 my ($pkg, @funs) = @$_; 3439 my ($pkg, @funs) = @$_;
3184 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3440 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3185 for @funs; 3441 for @funs;
3186} 3442}
3187 3443
3204 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3460 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3205 $qcode =~ s/\n/\\n/g; 3461 $qcode =~ s/\n/\\n/g;
3206 3462
3207 %vars = (_dummy => 0) unless %vars; 3463 %vars = (_dummy => 0) unless %vars;
3208 3464
3465 my @res;
3209 local $_; 3466 local $_;
3210 local @safe::cf::_safe_eval_args = values %vars;
3211 3467
3212 my $eval = 3468 my $eval =
3213 "do {\n" 3469 "do {\n"
3214 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3470 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3215 . "#line 0 \"{$qcode}\"\n" 3471 . "#line 0 \"{$qcode}\"\n"
3216 . $code 3472 . $code
3217 . "\n}" 3473 . "\n}"
3218 ; 3474 ;
3219 3475
3476 if ($CFG{safe_eval}) {
3220 sub_generation_inc; 3477 sub_generation_inc;
3478 local @safe::cf::_safe_eval_args = values %vars;
3221 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3479 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3222 sub_generation_inc; 3480 sub_generation_inc;
3481 } else {
3482 local @cf::_safe_eval_args = values %vars;
3483 @res = wantarray ? eval eval : scalar eval $eval;
3484 }
3223 3485
3224 if ($@) { 3486 if ($@) {
3225 warn "$@"; 3487 warn "$@",
3226 warn "while executing safe code '$code'\n"; 3488 "while executing safe code '$code'\n",
3227 warn "with arguments " . (join " ", %vars) . "\n"; 3489 "with arguments " . (join " ", %vars) . "\n";
3228 } 3490 }
3229 3491
3230 wantarray ? @res : $res[0] 3492 wantarray ? @res : $res[0]
3231} 3493}
3232 3494
3246=cut 3508=cut
3247 3509
3248sub register_script_function { 3510sub register_script_function {
3249 my ($fun, $cb) = @_; 3511 my ($fun, $cb) = @_;
3250 3512
3251 no strict 'refs'; 3513 $fun = "safe::$fun" if $CFG{safe_eval};
3252 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3514 *$fun = $safe_hole->wrap ($cb);
3253} 3515}
3254 3516
3255=back 3517=back
3256 3518
3257=cut 3519=cut
3258 3520
3259############################################################################# 3521#############################################################################
3260# the server's init and main functions 3522# the server's init and main functions
3261 3523
3524{
3525 package cf::face;
3526
3527 our %HASH; # hash => idx
3528 our @DATA; # dynamically-created facedata, only faceste 0 used
3529 our @FOFS; # file offset, if > 0
3530 our @SIZE; # size of face, in octets
3531 our @META; # meta hash of face, if any
3532 our $DATAFH; # facedata filehandle
3533
3534 # internal api, not finalised
3535 sub set {
3536 my ($name, $type, $data) = @_;
3537
3538 my $idx = cf::face::find $name;
3539
3540 if ($idx) {
3541 delete $HASH{cf::face::get_chksum $idx};
3542 } else {
3543 $idx = cf::face::alloc $name;
3544 }
3545
3546 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3547
3548 cf::face::set_type $idx, $type;
3549 cf::face::set_csum $idx, 0, $hash;
3550
3551 # we need to destroy the SV itself, not just modify it, as a running ix
3552 # might hold a reference to it: "delete" achieves that.
3553 delete $FOFS[0][$idx];
3554 delete $DATA[0][$idx];
3555 $DATA[0][$idx] = $data;
3556 $SIZE[0][$idx] = length $data;
3557 delete $META[$idx];
3558 $HASH{$hash} = $idx;#d#
3559
3560 $idx
3561 }
3562
3563 sub _get_data($$$) {
3564 my ($idx, $set, $cb) = @_;
3565
3566 if (defined $DATA[$set][$idx]) {
3567 $cb->($DATA[$set][$idx]);
3568 } elsif (my $fofs = $FOFS[$set][$idx]) {
3569 my $size = $SIZE[$set][$idx];
3570 my $buf;
3571 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3572 if ($_[0] == $size) {
3573 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3574 $cb->($buf);
3575 } else {
3576 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3577 }
3578 };
3579 } else {
3580 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3581 }
3582 }
3583
3584 # rather ineffient
3585 sub cf::face::get_data($;$) {
3586 my ($idx, $set) = @_;
3587
3588 _get_data $idx, $set, Coro::rouse_cb;
3589 Coro::rouse_wait
3590 }
3591
3592 sub cf::face::ix {
3593 my ($ns, $set, $idx, $pri) = @_;
3594
3595 _get_data $idx, $set, sub {
3596 $ns->ix_send ($idx, $pri, $_[0]);
3597 };
3598 }
3599}
3600
3262sub load_facedata($) { 3601sub load_facedata($) {
3263 my ($path) = @_; 3602 my ($path) = @_;
3264 3603
3265 # HACK to clear player env face cache, we need some signal framework
3266 # for this (global event?)
3267 %ext::player_env::MUSIC_FACE_CACHE = ();
3268
3269 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3604 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3270 3605
3271 warn "loading facedata from $path\n"; 3606 trace "loading facedata from $path\n";
3272 3607
3273 my $facedata; 3608 my $facedata = decode_storable load_file "$path/faceinfo";
3274 0 < aio_load $path, $facedata
3275 or die "$path: $!";
3276
3277 $facedata = Coro::Storable::thaw $facedata;
3278 3609
3279 $facedata->{version} == 2 3610 $facedata->{version} == 2
3280 or cf::cleanup "$path: version mismatch, cannot proceed."; 3611 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3281 3612
3282 # patch in the exptable 3613 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3283 $facedata->{resource}{"res/exp_table"} = { 3614 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3284 type => FT_RSRC, 3615
3285 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3616 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3286 }; 3617
3287 cf::cede_to_tick; 3618 # BEGIN ATOMIC
3619 # from here on, everything must be atomic - no thread switch allowed
3620 my $t1 = EV::time;
3288 3621
3289 { 3622 {
3290 my $faces = $facedata->{faceinfo}; 3623 my $faces = $facedata->{faceinfo};
3291 3624
3292 while (my ($face, $info) = each %$faces) { 3625 for my $face (sort keys %$faces) {
3626 my $info = $faces->{$face};
3293 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3627 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3294 3628
3295 cf::face::set_visibility $idx, $info->{visibility}; 3629 cf::face::set_visibility $idx, $info->{visibility};
3296 cf::face::set_magicmap $idx, $info->{magicmap}; 3630 cf::face::set_magicmap $idx, $info->{magicmap};
3297 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3631 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3298 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3632 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3299 3633 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3300 cf::cede_to_tick; 3634 $cf::face::HASH{$info->{hash64}} = $idx;
3635 delete $cf::face::META[$idx];
3301 } 3636 }
3302 3637
3303 while (my ($face, $info) = each %$faces) { 3638 while (my ($face, $info) = each %$faces) {
3304 next unless $info->{smooth}; 3639 next unless $info->{smooth};
3305 3640
3308 3643
3309 if (my $smooth = cf::face::find $info->{smooth}) { 3644 if (my $smooth = cf::face::find $info->{smooth}) {
3310 cf::face::set_smooth $idx, $smooth; 3645 cf::face::set_smooth $idx, $smooth;
3311 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3646 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3312 } else { 3647 } else {
3313 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3648 error "smooth face '$info->{smooth}' not found for face '$face'";
3314 } 3649 }
3315
3316 cf::cede_to_tick;
3317 } 3650 }
3318 } 3651 }
3319 3652
3320 { 3653 {
3321 my $anims = $facedata->{animinfo}; 3654 my $anims = $facedata->{animinfo};
3322 3655
3323 while (my ($anim, $info) = each %$anims) { 3656 while (my ($anim, $info) = each %$anims) {
3324 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3657 cf::anim::set $anim, $info->{frames}, $info->{facings};
3325 cf::cede_to_tick;
3326 } 3658 }
3327 3659
3328 cf::anim::invalidate_all; # d'oh 3660 cf::anim::invalidate_all; # d'oh
3329 } 3661 }
3330 3662
3331 { 3663 {
3332 # TODO: for gcfclient pleasure, we should give resources
3333 # that gcfclient doesn't grok a >10000 face index.
3334 my $res = $facedata->{resource}; 3664 my $res = $facedata->{resource};
3335 3665
3336 while (my ($name, $info) = each %$res) { 3666 while (my ($name, $info) = each %$res) {
3337 if (defined $info->{type}) { 3667 if (defined (my $type = $info->{type})) {
3668 # TODO: different hash - must free and use new index, or cache ixface data queue
3338 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3669 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3339 my $data;
3340 3670
3341 if ($info->{type} & 1) {
3342 # prepend meta info
3343
3344 my $meta = $enc->encode ({
3345 name => $name,
3346 %{ $info->{meta} || {} },
3347 });
3348
3349 $data = pack "(w/a*)*", $meta, $info->{data};
3350 } else {
3351 $data = $info->{data};
3352 }
3353
3354 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3355 cf::face::set_type $idx, $info->{type}; 3671 cf::face::set_type $idx, $type;
3672 cf::face::set_csum $idx, 0, $info->{hash};
3673 $cf::face::SIZE[0][$idx] = $info->{size};
3674 $cf::face::FOFS[0][$idx] = $info->{fofs};
3675 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3676 $cf::face::HASH{$info->{hash}} = $idx;
3356 } else { 3677 } else {
3357 $RESOURCE{$name} = $info; 3678# $RESOURCE{$name} = $info; # unused
3358 } 3679 }
3359
3360 cf::cede_to_tick;
3361 } 3680 }
3362 } 3681 }
3682
3683 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3684
3685 # HACK to clear player env face cache, we need some signal framework
3686 # for this (global event?)
3687 %ext::player_env::MUSIC_FACE_CACHE = ();
3688
3689 # END ATOMIC
3690
3691 cf::debug "facedata atomic update time ", EV::time - $t1;
3363 3692
3364 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3693 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3365 3694
3695 aio_close $fh if $fh; # close old facedata
3696
3366 1 3697 1
3367} 3698}
3368
3369cf::global->attach (on_resource_update => sub {
3370 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3371 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3372
3373 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3374 my $sound = $soundconf->{compat}[$_]
3375 or next;
3376
3377 my $face = cf::face::find "sound/$sound->[1]";
3378 cf::sound::set $sound->[0] => $face;
3379 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3380 }
3381
3382 while (my ($k, $v) = each %{$soundconf->{event}}) {
3383 my $face = cf::face::find "sound/$v";
3384 cf::sound::set $k => $face;
3385 }
3386 }
3387});
3388 3699
3389register_exticmd fx_want => sub { 3700register_exticmd fx_want => sub {
3390 my ($ns, $want) = @_; 3701 my ($ns, $want) = @_;
3391 3702
3392 while (my ($k, $v) = each %$want) { 3703 while (my ($k, $v) = each %$want) {
3400 my $status = load_resource_file_ $_[0]; 3711 my $status = load_resource_file_ $_[0];
3401 get_slot 0.1, 100; 3712 get_slot 0.1, 100;
3402 cf::arch::commit_load; 3713 cf::arch::commit_load;
3403 3714
3404 $status 3715 $status
3716}
3717
3718sub reload_exp_table {
3719 _reload_exp_table;
3720
3721 cf::face::set
3722 "res/exp_table" => FT_RSRC,
3723 JSON::XS->new->utf8->canonical->encode (
3724 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3725 );
3726}
3727
3728sub reload_materials {
3729 _reload_materials;
3405} 3730}
3406 3731
3407sub reload_regions { 3732sub reload_regions {
3408 # HACK to clear player env face cache, we need some signal framework 3733 # HACK to clear player env face cache, we need some signal framework
3409 # for this (global event?) 3734 # for this (global event?)
3417 if exists $_->{match}; 3742 if exists $_->{match};
3418 } 3743 }
3419} 3744}
3420 3745
3421sub reload_facedata { 3746sub reload_facedata {
3422 load_facedata "$DATADIR/facedata" 3747 load_facedata $DATADIR
3423 or die "unable to load facedata\n"; 3748 or die "unable to load facedata\n";
3424} 3749}
3425 3750
3426sub reload_archetypes { 3751sub reload_archetypes {
3427 load_resource_file "$DATADIR/archetypes" 3752 load_resource_file "$DATADIR/archetypes"
3428 or die "unable to load archetypes\n"; 3753 or die "unable to load archetypes\n";
3754
3755 cf::face::set
3756 "res/skill_info" => FT_RSRC,
3757 JSON::XS->new->utf8->canonical->encode (
3758 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3759 );
3760
3761 cf::face::set
3762 "res/spell_paths" => FT_RSRC,
3763 JSON::XS->new->utf8->canonical->encode (
3764 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3765 );
3429} 3766}
3430 3767
3431sub reload_treasures { 3768sub reload_treasures {
3432 load_resource_file "$DATADIR/treasures" 3769 load_resource_file "$DATADIR/treasures"
3433 or die "unable to load treasurelists\n"; 3770 or die "unable to load treasurelists\n";
3434} 3771}
3435 3772
3773sub reload_sound {
3774 trace "loading sound config from $DATADIR/sound\n";
3775
3776 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3777
3778 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3779 my $sound = $soundconf->{compat}[$_]
3780 or next;
3781
3782 my $face = cf::face::find "sound/$sound->[1]";
3783 cf::sound::set $sound->[0] => $face;
3784 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3785 }
3786
3787 while (my ($k, $v) = each %{$soundconf->{event}}) {
3788 my $face = cf::face::find "sound/$v";
3789 cf::sound::set $k => $face;
3790 }
3791}
3792
3436sub reload_resources { 3793sub reload_resources {
3437 warn "reloading resource files...\n"; 3794 trace "reloading resource files...\n";
3438 3795
3796 reload_materials;
3439 reload_facedata; 3797 reload_facedata;
3798 reload_exp_table;
3799 reload_sound;
3440 reload_archetypes; 3800 reload_archetypes;
3441 reload_regions; 3801 reload_regions;
3442 reload_treasures; 3802 reload_treasures;
3443 3803
3444 warn "finished reloading resource files\n"; 3804 trace "finished reloading resource files\n";
3445} 3805}
3446 3806
3447sub reload_config { 3807sub reload_config {
3448 warn "reloading config file...\n"; 3808 trace "reloading config file...\n";
3449 3809
3450 open my $fh, "<:utf8", "$CONFDIR/config" 3810 my $config = load_file "$CONFDIR/config";
3451 or return; 3811 utf8::decode $config;
3812 *CFG = decode_yaml $config;
3452 3813
3453 local $/;
3454 *CFG = YAML::XS::Load scalar <$fh>;
3455
3456 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3814 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3457 3815
3458 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3816 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3459 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3817 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3460 3818
3461 if (exists $CFG{mlockall}) { 3819 if (exists $CFG{mlockall}) {
3463 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3821 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3464 and die "WARNING: m(un)lockall failed: $!\n"; 3822 and die "WARNING: m(un)lockall failed: $!\n";
3465 }; 3823 };
3466 warn $@ if $@; 3824 warn $@ if $@;
3467 } 3825 }
3468
3469 warn "finished reloading resource files\n";
3470} 3826}
3471 3827
3472sub pidfile() { 3828sub pidfile() {
3473 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3829 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3474 or die "$PIDFILE: $!"; 3830 or die "$PIDFILE: $!";
3487 seek $fh, 0, 0; 3843 seek $fh, 0, 0;
3488 print $fh $$; 3844 print $fh $$;
3489} 3845}
3490 3846
3491sub main_loop { 3847sub main_loop {
3492 warn "EV::loop starting\n"; 3848 trace "EV::loop starting\n";
3493 if (1) { 3849 if (1) {
3494 EV::loop; 3850 EV::loop;
3495 } 3851 }
3496 warn "EV::loop returned\n"; 3852 trace "EV::loop returned\n";
3497 goto &main_loop unless $REALLY_UNLOOP; 3853 goto &main_loop unless $REALLY_UNLOOP;
3498} 3854}
3499 3855
3500sub main { 3856sub main {
3501 cf::init_globals; # initialise logging 3857 cf::init_globals; # initialise logging
3502 3858
3503 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3859 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3504 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3860 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3505 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3861 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3506 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3862 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3507 3863
3508 cf::init_experience;
3509 cf::init_anim;
3510 cf::init_attackmess;
3511 cf::init_dynamic;
3512
3513 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3864 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3514 3865
3515 # we must not ever block the main coroutine 3866 # we must not ever block the main coroutine
3516 local $Coro::idle = sub { 3867 $Coro::idle = sub {
3517 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3868 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3518 (async { 3869 (async {
3519 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3870 $Coro::current->{desc} = "IDLE BUG HANDLER";
3520 EV::loop EV::LOOP_ONESHOT; 3871 EV::loop EV::LOOP_ONESHOT;
3521 })->prio (Coro::PRIO_MAX); 3872 })->prio (Coro::PRIO_MAX);
3522 }; 3873 };
3523 3874
3524 evthread_start IO::AIO::poll_fileno; 3875 evthread_start IO::AIO::poll_fileno;
3525 3876
3526 cf::sync_job { 3877 cf::sync_job {
3878 cf::incloader::init ();
3879
3880 db_init;
3881
3882 cf::init_anim;
3883 cf::init_attackmess;
3884 cf::init_dynamic;
3885
3886 cf::load_settings;
3887
3527 reload_resources; 3888 reload_resources;
3528 reload_config; 3889 reload_config;
3529 db_init;
3530 3890
3531 cf::load_settings;
3532 cf::load_materials;
3533 cf::init_uuid; 3891 cf::init_uuid;
3534 cf::init_signals; 3892 cf::init_signals;
3535 cf::init_commands;
3536 cf::init_skills; 3893 cf::init_skills;
3537 3894
3538 cf::init_beforeplay; 3895 cf::init_beforeplay;
3539 3896
3540 atomic; 3897 atomic;
3545 3902
3546 # no (long-running) fork's whatsoever before this point(!) 3903 # no (long-running) fork's whatsoever before this point(!)
3547 use POSIX (); 3904 use POSIX ();
3548 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3905 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3549 3906
3550 (pop @POST_INIT)->(0) while @POST_INIT; 3907 cf::_post_init 0;
3551 }; 3908 };
3552 3909
3910 cf::object::thawer::errors_are_fatal 0;
3911 info "parse errors in files are no longer fatal from this point on.\n";
3912
3913 AE::postpone {
3914 undef &main; # free gobs of memory :)
3915 };
3916
3553 main_loop; 3917 goto &main_loop;
3554} 3918}
3555 3919
3556############################################################################# 3920#############################################################################
3557# initialisation and cleanup 3921# initialisation and cleanup
3558 3922
3559# install some emergency cleanup handlers 3923# install some emergency cleanup handlers
3560BEGIN { 3924BEGIN {
3561 our %SIGWATCHER = (); 3925 our %SIGWATCHER = ();
3562 for my $signal (qw(INT HUP TERM)) { 3926 for my $signal (qw(INT HUP TERM)) {
3563 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3927 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3564 cf::cleanup "SIG$signal"; 3928 cf::cleanup "SIG$signal";
3565 }; 3929 };
3566 } 3930 }
3567} 3931}
3568 3932
3569sub write_runtime_sync { 3933sub write_runtime_sync {
3934 my $t0 = AE::time;
3935
3570 # first touch the runtime file to show we are still running: 3936 # first touch the runtime file to show we are still running:
3571 # the fsync below can take a very very long time. 3937 # the fsync below can take a very very long time.
3572 3938
3573 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3939 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3574 3940
3575 my $guard = cf::lock_acquire "write_runtime"; 3941 my $guard = cf::lock_acquire "write_runtime";
3576 3942
3577 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3943 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3578 or return; 3944 or return;
3579 3945
3580 my $value = $cf::RUNTIME + 90 + 10; 3946 my $value = $cf::RUNTIME + 90 + 10;
3581 # 10 is the runtime save interval, for a monotonic clock 3947 # 10 is the runtime save interval, for a monotonic clock
3582 # 60 allows for the watchdog to kill the server. 3948 # 60 allows for the watchdog to kill the server.
3595 or return; 3961 or return;
3596 3962
3597 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3963 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3598 and return; 3964 and return;
3599 3965
3600 warn "runtime file written.\n"; 3966 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3601 3967
3602 1 3968 1
3603} 3969}
3604 3970
3605our $uuid_lock; 3971our $uuid_lock;
3617 or return; 3983 or return;
3618 3984
3619 my $value = uuid_seq uuid_cur; 3985 my $value = uuid_seq uuid_cur;
3620 3986
3621 unless ($value) { 3987 unless ($value) {
3622 warn "cowardly refusing to write zero uuid value!\n"; 3988 info "cowardly refusing to write zero uuid value!\n";
3623 return; 3989 return;
3624 } 3990 }
3625 3991
3626 my $value = uuid_str $value + $uuid_skip; 3992 my $value = uuid_str $value + $uuid_skip;
3627 $uuid_skip = 0; 3993 $uuid_skip = 0;
3637 or return; 4003 or return;
3638 4004
3639 aio_rename "$uuid~", $uuid 4005 aio_rename "$uuid~", $uuid
3640 and return; 4006 and return;
3641 4007
3642 warn "uuid file written ($value).\n"; 4008 trace "uuid file written ($value).\n";
3643 4009
3644 1 4010 1
3645 4011
3646} 4012}
3647 4013
3653} 4019}
3654 4020
3655sub emergency_save() { 4021sub emergency_save() {
3656 my $freeze_guard = cf::freeze_mainloop; 4022 my $freeze_guard = cf::freeze_mainloop;
3657 4023
3658 warn "emergency_perl_save: enter\n"; 4024 info "emergency_perl_save: enter\n";
4025
4026 # this is a trade-off: we want to be very quick here, so
4027 # save all maps without fsync, and later call a global sync
4028 # (which in turn might be very very slow)
4029 local $USE_FSYNC = 0;
3659 4030
3660 cf::sync_job { 4031 cf::sync_job {
3661 # this is a trade-off: we want to be very quick here, so 4032 cf::write_runtime_sync; # external watchdog should not bark
3662 # save all maps without fsync, and later call a global sync
3663 # (which in turn might be very very slow)
3664 local $USE_FSYNC = 0;
3665 4033
3666 # use a peculiar iteration method to avoid tripping on perl 4034 # use a peculiar iteration method to avoid tripping on perl
3667 # refcount bugs in for. also avoids problems with players 4035 # refcount bugs in for. also avoids problems with players
3668 # and maps saved/destroyed asynchronously. 4036 # and maps saved/destroyed asynchronously.
3669 warn "emergency_perl_save: begin player save\n"; 4037 info "emergency_perl_save: begin player save\n";
3670 for my $login (keys %cf::PLAYER) { 4038 for my $login (keys %cf::PLAYER) {
3671 my $pl = $cf::PLAYER{$login} or next; 4039 my $pl = $cf::PLAYER{$login} or next;
3672 $pl->valid or next; 4040 $pl->valid or next;
3673 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4041 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3674 $pl->save; 4042 $pl->save;
3675 } 4043 }
3676 warn "emergency_perl_save: end player save\n"; 4044 info "emergency_perl_save: end player save\n";
3677 4045
4046 cf::write_runtime_sync; # external watchdog should not bark
4047
3678 warn "emergency_perl_save: begin map save\n"; 4048 info "emergency_perl_save: begin map save\n";
3679 for my $path (keys %cf::MAP) { 4049 for my $path (keys %cf::MAP) {
3680 my $map = $cf::MAP{$path} or next; 4050 my $map = $cf::MAP{$path} or next;
3681 $map->valid or next; 4051 $map->valid or next;
3682 $map->save; 4052 $map->save;
3683 } 4053 }
3684 warn "emergency_perl_save: end map save\n"; 4054 info "emergency_perl_save: end map save\n";
3685 4055
4056 cf::write_runtime_sync; # external watchdog should not bark
4057
3686 warn "emergency_perl_save: begin database checkpoint\n"; 4058 info "emergency_perl_save: begin database checkpoint\n";
3687 BDB::db_env_txn_checkpoint $DB_ENV; 4059 BDB::db_env_txn_checkpoint $DB_ENV;
3688 warn "emergency_perl_save: end database checkpoint\n"; 4060 info "emergency_perl_save: end database checkpoint\n";
3689 4061
3690 warn "emergency_perl_save: begin write uuid\n"; 4062 info "emergency_perl_save: begin write uuid\n";
3691 write_uuid_sync 1; 4063 write_uuid_sync 1;
3692 warn "emergency_perl_save: end write uuid\n"; 4064 info "emergency_perl_save: end write uuid\n";
4065
4066 cf::write_runtime_sync; # external watchdog should not bark
4067
4068 trace "emergency_perl_save: syncing database to disk";
4069 BDB::db_env_txn_checkpoint $DB_ENV;
4070
4071 info "emergency_perl_save: starting sync\n";
4072 IO::AIO::aio_sync sub {
4073 info "emergency_perl_save: finished sync\n";
4074 };
4075
4076 cf::write_runtime_sync; # external watchdog should not bark
4077
4078 trace "emergency_perl_save: flushing outstanding aio requests";
4079 while (IO::AIO::nreqs || BDB::nreqs) {
4080 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4081 }
4082
4083 cf::write_runtime_sync; # external watchdog should not bark
3693 }; 4084 };
3694 4085
3695 warn "emergency_perl_save: starting sync()\n";
3696 IO::AIO::aio_sync sub {
3697 warn "emergency_perl_save: finished sync()\n";
3698 };
3699
3700 warn "emergency_perl_save: leave\n"; 4086 info "emergency_perl_save: leave\n";
3701} 4087}
3702 4088
3703sub post_cleanup { 4089sub post_cleanup {
3704 my ($make_core) = @_; 4090 my ($make_core) = @_;
3705 4091
4092 IO::AIO::flush;
4093
3706 warn Carp::longmess "post_cleanup backtrace" 4094 error Carp::longmess "post_cleanup backtrace"
3707 if $make_core; 4095 if $make_core;
3708 4096
3709 my $fh = pidfile; 4097 my $fh = pidfile;
3710 unlink $PIDFILE if <$fh> == $$; 4098 unlink $PIDFILE if <$fh> == $$;
3711} 4099}
3731 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4119 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3732 for my $name (keys %$leaf_symtab) { 4120 for my $name (keys %$leaf_symtab) {
3733 _gv_clear *{"$pkg$name"}; 4121 _gv_clear *{"$pkg$name"};
3734# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4122# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3735 } 4123 }
3736 warn "cleared package $pkg\n";#d#
3737} 4124}
3738 4125
3739sub do_reload_perl() { 4126sub do_reload_perl() {
3740 # can/must only be called in main 4127 # can/must only be called in main
3741 if ($Coro::current != $Coro::main) { 4128 unless (in_main) {
3742 warn "can only reload from main coroutine"; 4129 error "can only reload from main coroutine";
3743 return; 4130 return;
3744 } 4131 }
3745 4132
3746 return if $RELOAD++; 4133 return if $RELOAD++;
3747 4134
3748 my $t1 = EV::time; 4135 my $t1 = AE::time;
3749 4136
3750 while ($RELOAD) { 4137 while ($RELOAD) {
3751 warn "reloading..."; 4138 cf::get_slot 0.1, -1, "reload_perl";
4139 info "perl_reload: reloading...";
3752 4140
3753 warn "entering sync_job"; 4141 trace "perl_reload: entering sync_job";
3754 4142
3755 cf::sync_job { 4143 cf::sync_job {
3756 cf::write_runtime_sync; # external watchdog should not bark
3757 cf::emergency_save; 4144 #cf::emergency_save;
3758 cf::write_runtime_sync; # external watchdog should not bark
3759 4145
3760 warn "syncing database to disk";
3761 BDB::db_env_txn_checkpoint $DB_ENV;
3762
3763 # if anything goes wrong in here, we should simply crash as we already saved
3764
3765 warn "flushing outstanding aio requests";
3766 while (IO::AIO::nreqs || BDB::nreqs) {
3767 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3768 }
3769
3770 warn "cancelling all extension coros"; 4146 trace "perl_reload: cancelling all extension coros";
3771 $_->cancel for values %EXT_CORO; 4147 $_->cancel for values %EXT_CORO;
3772 %EXT_CORO = (); 4148 %EXT_CORO = ();
3773 4149
3774 warn "removing commands"; 4150 trace "perl_reload: removing commands";
3775 %COMMAND = (); 4151 %COMMAND = ();
3776 4152
3777 warn "removing ext/exti commands"; 4153 trace "perl_reload: removing ext/exti commands";
3778 %EXTCMD = (); 4154 %EXTCMD = ();
3779 %EXTICMD = (); 4155 %EXTICMD = ();
3780 4156
3781 warn "unloading/nuking all extensions"; 4157 trace "perl_reload: unloading/nuking all extensions";
3782 for my $pkg (@EXTS) { 4158 for my $pkg (@EXTS) {
3783 warn "... unloading $pkg"; 4159 trace "... unloading $pkg";
3784 4160
3785 if (my $cb = $pkg->can ("unload")) { 4161 if (my $cb = $pkg->can ("unload")) {
3786 eval { 4162 eval {
3787 $cb->($pkg); 4163 $cb->($pkg);
3788 1 4164 1
3789 } or warn "$pkg unloaded, but with errors: $@"; 4165 } or error "$pkg unloaded, but with errors: $@";
3790 } 4166 }
3791 4167
3792 warn "... clearing $pkg"; 4168 trace "... clearing $pkg";
3793 clear_package $pkg; 4169 clear_package $pkg;
3794 } 4170 }
3795 4171
3796 warn "unloading all perl modules loaded from $LIBDIR"; 4172 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3797 while (my ($k, $v) = each %INC) { 4173 while (my ($k, $v) = each %INC) {
3798 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4174 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3799 4175
3800 warn "... unloading $k"; 4176 trace "... unloading $k";
3801 delete $INC{$k}; 4177 delete $INC{$k};
3802 4178
3803 $k =~ s/\.pm$//; 4179 $k =~ s/\.pm$//;
3804 $k =~ s/\//::/g; 4180 $k =~ s/\//::/g;
3805 4181
3808 } 4184 }
3809 4185
3810 clear_package $k; 4186 clear_package $k;
3811 } 4187 }
3812 4188
3813 warn "getting rid of safe::, as good as possible"; 4189 trace "perl_reload: getting rid of safe::, as good as possible";
3814 clear_package "safe::$_" 4190 clear_package "safe::$_"
3815 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4191 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3816 4192
3817 warn "unloading cf.pm \"a bit\""; 4193 trace "perl_reload: unloading cf.pm \"a bit\"";
3818 delete $INC{"cf.pm"}; 4194 delete $INC{"cf.pm"};
3819 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4195 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3820 4196
3821 # don't, removes xs symbols, too, 4197 # don't, removes xs symbols, too,
3822 # and global variables created in xs 4198 # and global variables created in xs
3823 #clear_package __PACKAGE__; 4199 #clear_package __PACKAGE__;
3824 4200
3825 warn "unload completed, starting to reload now"; 4201 info "perl_reload: unload completed, starting to reload now";
3826 4202
3827 warn "reloading cf.pm"; 4203 trace "perl_reload: reloading cf.pm";
3828 require cf; 4204 require cf;
3829 cf::_connect_to_perl_1; 4205 cf::_connect_to_perl_1;
3830 4206
3831 warn "loading config and database again"; 4207 trace "perl_reload: loading config and database again";
3832 cf::reload_config; 4208 cf::reload_config;
3833 4209
3834 warn "loading extensions"; 4210 trace "perl_reload: loading extensions";
3835 cf::load_extensions; 4211 cf::load_extensions;
3836 4212
3837 if ($REATTACH_ON_RELOAD) { 4213 if ($REATTACH_ON_RELOAD) {
3838 warn "reattaching attachments to objects/players"; 4214 trace "perl_reload: reattaching attachments to objects/players";
3839 _global_reattach; # objects, sockets 4215 _global_reattach; # objects, sockets
3840 warn "reattaching attachments to maps"; 4216 trace "perl_reload: reattaching attachments to maps";
3841 reattach $_ for values %MAP; 4217 reattach $_ for values %MAP;
3842 warn "reattaching attachments to players"; 4218 trace "perl_reload: reattaching attachments to players";
3843 reattach $_ for values %PLAYER; 4219 reattach $_ for values %PLAYER;
3844 } 4220 }
3845 4221
3846 warn "running post_init jobs"; 4222 cf::_post_init 1;
3847 (pop @POST_INIT)->(1) while @POST_INIT;
3848 4223
3849 warn "leaving sync_job"; 4224 trace "perl_reload: leaving sync_job";
3850 4225
3851 1 4226 1
3852 } or do { 4227 } or do {
3853 warn $@; 4228 error $@;
3854 cf::cleanup "error while reloading, exiting."; 4229 cf::cleanup "perl_reload: error, exiting.";
3855 }; 4230 };
3856 4231
3857 warn "reloaded";
3858 --$RELOAD; 4232 --$RELOAD;
3859 } 4233 }
3860 4234
3861 $t1 = EV::time - $t1; 4235 $t1 = AE::time - $t1;
3862 warn "reload completed in ${t1}s\n"; 4236 info "perl_reload: completed in ${t1}s\n";
3863}; 4237};
3864 4238
3865our $RELOAD_WATCHER; # used only during reload 4239our $RELOAD_WATCHER; # used only during reload
3866 4240
3867sub reload_perl() { 4241sub reload_perl() {
3869 # coro crashes during coro_state_free->destroy here. 4243 # coro crashes during coro_state_free->destroy here.
3870 4244
3871 $RELOAD_WATCHER ||= cf::async { 4245 $RELOAD_WATCHER ||= cf::async {
3872 Coro::AIO::aio_wait cache_extensions; 4246 Coro::AIO::aio_wait cache_extensions;
3873 4247
3874 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4248 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3875 do_reload_perl; 4249 do_reload_perl;
3876 undef $RELOAD_WATCHER; 4250 undef $RELOAD_WATCHER;
3877 }; 4251 };
3878 }; 4252 };
3879} 4253}
3888 reload_perl; 4262 reload_perl;
3889 }; 4263 };
3890 } 4264 }
3891}; 4265};
3892 4266
3893unshift @INC, $LIBDIR; 4267#############################################################################
3894 4268
3895my $bug_warning = 0; 4269my $bug_warning = 0;
3896 4270
3897our @WAIT_FOR_TICK;
3898our @WAIT_FOR_TICK_BEGIN;
3899
3900sub wait_for_tick { 4271sub wait_for_tick() {
3901 return if tick_inhibit || $Coro::current == $Coro::main; 4272 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3902 4273
3903 my $signal = new Coro::Signal; 4274 $WAIT_FOR_TICK->wait;
3904 push @WAIT_FOR_TICK, $signal;
3905 $signal->wait;
3906} 4275}
3907 4276
3908sub wait_for_tick_begin { 4277sub wait_for_tick_begin() {
3909 return if tick_inhibit || $Coro::current == $Coro::main; 4278 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3910 4279
3911 my $signal = new Coro::Signal; 4280 my $signal = new Coro::Signal;
3912 push @WAIT_FOR_TICK_BEGIN, $signal; 4281 push @WAIT_FOR_TICK_BEGIN, $signal;
3913 $signal->wait; 4282 $signal->wait;
3914} 4283}
3918 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4287 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3919 unless ++$bug_warning > 10; 4288 unless ++$bug_warning > 10;
3920 return; 4289 return;
3921 } 4290 }
3922 4291
3923 cf::server_tick; # one server iteration 4292 cf::one_tick; # one server iteration
4293
4294 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3924 4295
3925 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4296 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3926 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4297 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3927 Coro::async_pool { 4298 Coro::async_pool {
3928 $Coro::current->{desc} = "runtime saver"; 4299 $Coro::current->{desc} = "runtime saver";
3929 write_runtime_sync 4300 write_runtime_sync
3930 or warn "ERROR: unable to write runtime file: $!"; 4301 or error "ERROR: unable to write runtime file: $!";
3931 }; 4302 };
3932 } 4303 }
3933 4304
3934 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4305 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3935 $sig->send; 4306 $sig->send;
3936 } 4307 }
3937 while (my $sig = shift @WAIT_FOR_TICK) { 4308 $WAIT_FOR_TICK->broadcast;
3938 $sig->send;
3939 }
3940 4309
3941 $LOAD = ($NOW - $TICK_START) / $TICK; 4310 $LOAD = ($NOW - $TICK_START) / $TICK;
3942 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4311 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3943 4312
3944 if (0) { 4313 if (0) {
3945 if ($NEXT_TICK) { 4314 if ($NEXT_TICK) {
3946 my $jitter = $TICK_START - $NEXT_TICK; 4315 my $jitter = $TICK_START - $NEXT_TICK;
3947 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4316 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3948 warn "jitter $JITTER\n";#d# 4317 debug "jitter $JITTER\n";#d#
3949 } 4318 }
3950 } 4319 }
3951} 4320}
3952 4321
3953{ 4322{
3954 # configure BDB 4323 # configure BDB
4324 info "initialising database";
3955 4325
3956 BDB::min_parallel 8; 4326 BDB::min_parallel 16;
3957 BDB::max_poll_reqs $TICK * 0.1; 4327 BDB::max_poll_reqs $TICK * 0.1;
3958 $AnyEvent::BDB::WATCHER->priority (1); 4328 #$AnyEvent::BDB::WATCHER->priority (1);
3959 4329
3960 unless ($DB_ENV) { 4330 unless ($DB_ENV) {
3961 $DB_ENV = BDB::db_env_create; 4331 $DB_ENV = BDB::db_env_create;
3962 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4332 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3963 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4333 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3988 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4358 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3989 }; 4359 };
3990 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4360 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3991 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4361 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3992 }; 4362 };
4363
4364 info "database initialised";
3993} 4365}
3994 4366
3995{ 4367{
3996 # configure IO::AIO 4368 # configure IO::AIO
3997 4369
4370 info "initialising aio";
3998 IO::AIO::min_parallel 8; 4371 IO::AIO::min_parallel 8;
3999 IO::AIO::max_poll_time $TICK * 0.1; 4372 IO::AIO::max_poll_time $TICK * 0.1;
4000 undef $AnyEvent::AIO::WATCHER; 4373 undef $AnyEvent::AIO::WATCHER;
4374 info "aio initialised";
4001} 4375}
4002 4376
4003my $_log_backtrace; 4377our $_log_backtrace;
4378our $_log_backtrace_last;
4004 4379
4005sub _log_backtrace { 4380sub _log_backtrace {
4006 my ($msg, @addr) = @_; 4381 my ($msg, @addr) = @_;
4007 4382
4008 $msg =~ s/\n//; 4383 $msg =~ s/\n$//;
4009 4384
4385 if ($_log_backtrace_last eq $msg) {
4386 LOG llevInfo, "[ABT] $msg\n";
4387 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4010 # limit the # of concurrent backtraces 4388 # limit the # of concurrent backtraces
4011 if ($_log_backtrace < 2) { 4389 } elsif ($_log_backtrace < 2) {
4390 $_log_backtrace_last = $msg;
4012 ++$_log_backtrace; 4391 ++$_log_backtrace;
4013 my $perl_bt = Carp::longmess $msg; 4392 my $perl_bt = Carp::longmess $msg;
4014 async { 4393 async {
4015 $Coro::current->{desc} = "abt $msg"; 4394 $Coro::current->{desc} = "abt $msg";
4016 4395
4036 LOG llevInfo, "[ABT] $_\n" for @bt; 4415 LOG llevInfo, "[ABT] $_\n" for @bt;
4037 --$_log_backtrace; 4416 --$_log_backtrace;
4038 }; 4417 };
4039 } else { 4418 } else {
4040 LOG llevInfo, "[ABT] $msg\n"; 4419 LOG llevInfo, "[ABT] $msg\n";
4041 LOG llevInfo, "[ABT] [suppressed]\n"; 4420 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4042 } 4421 }
4043} 4422}
4044 4423
4045# load additional modules 4424# load additional modules
4046require "cf/$_.pm" for @EXTRA_MODULES; 4425require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines