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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines