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.500 by root, Sat Jan 16 00:08:33 2010 UTC vs.
Revision 1.604 by root, Thu Nov 15 07:08:08 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines