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.487 by root, Fri Oct 16 01:56:41 2009 UTC vs.
Revision 1.597 by root, Sun Nov 11 02:14:37 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;
33use Opcode; 31use Opcode;
34use Safe; 32use Safe;
35use Safe::Hole; 33use Safe::Hole;
36use Storable (); 34use Storable ();
37
38use Guard (); 35use Carp ();
36
37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
39use Coro (); 41use Coro ();
40use Coro::State; 42use Coro::State;
41use Coro::Handle; 43use Coro::Handle;
42use Coro::EV; 44use Coro::EV;
43use Coro::AnyEvent; 45use Coro::AnyEvent;
49use Coro::AIO; 51use Coro::AIO;
50use Coro::BDB 1.6; 52use Coro::BDB 1.6;
51use Coro::Storable; 53use Coro::Storable;
52use Coro::Util (); 54use Coro::Util ();
53 55
56use Guard ();
54use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
55use BDB (); 58use BDB ();
56use Data::Dumper; 59use Data::Dumper;
57use Digest::MD5;
58use Fcntl; 60use Fcntl;
59use YAML::XS (); 61use YAML::XS ();
60use IO::AIO (); 62use IO::AIO ();
61use Time::HiRes; 63use Time::HiRes;
62use Compress::LZF; 64use Compress::LZF;
78# strictly for debugging 80# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 81$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 82
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 83sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 84
85our @ORIG_INC;
86
83our %COMMAND = (); 87our %COMMAND = ();
84our %COMMAND_TIME = (); 88our %COMMAND_TIME = ();
85 89
86our @EXTS = (); # list of extension package names 90our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 91our %EXTCMD = ();
92our %EXTACMD = ();
88our %EXTICMD = (); 93our %EXTICMD = ();
94our %EXTIACMD = ();
89our %EXT_CORO = (); # coroutines bound to extensions 95our %EXT_CORO = (); # coroutines bound to extensions
90our %EXT_MAP = (); # pluggable maps 96our %EXT_MAP = (); # pluggable maps
91 97
92our $RELOAD; # number of reloads so far, non-zero while in reload 98our $RELOAD; # number of reloads so far, non-zero while in reload
93our @EVENT; 99our @EVENT;
94our @REFLECT; # set by XS 100our @REFLECT; # set by XS
95our %REFLECT; # set by us 101our %REFLECT; # set by us
96 102
97our $CONFDIR = confdir; 103our $CONFDIR = confdir;
104
98our $DATADIR = datadir; 105our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 106our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 107our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 108our $MAPDIR = "$DATADIR/" . mapdir;
109
102our $LOCALDIR = localdir; 110our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 111our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 112our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 113our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 114our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 115our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 116our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 117our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 118
111our %RESOURCE; 119#our %RESOURCE; # unused
120
121our $OUTPUT_RATE_MIN = 3000;
122our $OUTPUT_RATE_MAX = 1000000;
123
124our $MAX_LINKS = 32; # how many chained exits to follow
125our $VERBOSE_IO = 1;
112 126
113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 127our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 128our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
115our $NEXT_TICK; 129our $NEXT_TICK;
116our $USE_FSYNC = 1; # use fsync to write maps - default on 130our $USE_FSYNC = 1; # use fsync to write maps - default on
118our $BDB_DEADLOCK_WATCHER; 132our $BDB_DEADLOCK_WATCHER;
119our $BDB_CHECKPOINT_WATCHER; 133our $BDB_CHECKPOINT_WATCHER;
120our $BDB_TRICKLE_WATCHER; 134our $BDB_TRICKLE_WATCHER;
121our $DB_ENV; 135our $DB_ENV;
122 136
123our @EXTRA_MODULES = qw(pod match mapscript); 137our @EXTRA_MODULES = qw(pod match mapscript incloader);
124 138
125our %CFG; 139our %CFG;
140our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
126 141
127our $UPTIME; $UPTIME ||= time; 142our $UPTIME; $UPTIME ||= time;
128our $RUNTIME; 143our $RUNTIME = 0;
144our $SERVER_TICK = 0;
129our $NOW; 145our $NOW;
130 146
131our (%PLAYER, %PLAYER_LOADING); # all users 147our (%PLAYER, %PLAYER_LOADING); # all users
132our (%MAP, %MAP_LOADING ); # all maps 148our (%MAP, %MAP_LOADING ); # all maps
133our $LINK_MAP; # the special {link} map, which is always available 149our $LINK_MAP; # the special {link} map, which is always available
142 158
143our @POST_INIT; 159our @POST_INIT;
144 160
145our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 161our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146our $REALLY_UNLOOP; # never set to true, please :) 162our $REALLY_UNLOOP; # never set to true, please :)
163
164our $WAIT_FOR_TICK = new Coro::Signal;
165our @WAIT_FOR_TICK_BEGIN;
147 166
148binmode STDOUT; 167binmode STDOUT;
149binmode STDERR; 168binmode STDERR;
150 169
151# read virtual server time, if available 170# read virtual server time, if available
162 181
163our $EMERGENCY_POSITION; 182our $EMERGENCY_POSITION;
164 183
165sub cf::map::normalise; 184sub cf::map::normalise;
166 185
186sub in_main() {
187 $Coro::current == $Coro::main
188}
189
167############################################################################# 190#############################################################################
168 191
169%REFLECT = (); 192%REFLECT = ();
170for (@REFLECT) { 193for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_; 194 my $reflect = JSON::XS::decode_json $_;
181 204
182=over 4 205=over 4
183 206
184=item $cf::UPTIME 207=item $cf::UPTIME
185 208
186The timestamp of the server start (so not actually an uptime). 209The timestamp of the server start (so not actually an "uptime").
210
211=item $cf::SERVER_TICK
212
213An unsigned integer that starts at zero when the server is started and is
214incremented on every tick.
215
216=item $cf::NOW
217
218The (real) time of the last (current) server tick - updated before and
219after tick processing, so this is useful only as a rough "what time is it
220now" estimate.
221
222=item $cf::TICK
223
224The interval between each server tick, in seconds.
187 225
188=item $cf::RUNTIME 226=item $cf::RUNTIME
189 227
190The time this server has run, starts at 0 and is increased by $cf::TICK on 228The time this server has run, starts at 0 and is increased by $cf::TICK on
191every server tick. 229every server tick.
192 230
193=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 231=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
194$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 232$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
195$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 233$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
196 234
197Various directories - "/etc", read-only install directory, perl-library 235Various directories - "/etc", read-only install directory, perl-library
198directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 236directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
199unique-items directory, player file directory, random maps directory and 237unique-items directory, player file directory, random maps directory and
200database environment. 238database environment.
201 239
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 240=item $cf::LOADAVG
211 241
212The current CPU load on the server (alpha-smoothed), as a value between 0 242The 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 243(none) and 1 (overloaded), indicating how much time is spent on processing
214objects per tick. Healthy values are < 0.5. 244objects per tick. Healthy values are < 0.5.
223from wherever your confdir points to. 253from wherever your confdir points to.
224 254
225=item cf::wait_for_tick, cf::wait_for_tick_begin 255=item cf::wait_for_tick, cf::wait_for_tick_begin
226 256
227These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 257These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
228returns directly I<after> the tick processing (and consequently, can only wake one process 258returns directly I<after> the tick processing (and consequently, can only wake one thread
229per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 259per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
230 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();
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
235that call. 282that call.
236 283
237=item %cf::REFLECT 284=item %cf::REFLECT
238 285
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 warn "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 les 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, 744 # we seemingly have to make a local copy of the whole thing,
573 # otherwise perl prematurely frees the stuff :/ 745 # otherwise perl prematurely frees the stuff :/
574 # TODO: investigate and fix (likely this will be rather laborious) 746 # TODO: investigate and fix (likely this will be rather laborious)
575 747
576 my @res = Coro::Util::fork_eval { 748 my @res = Coro::Util::fork_eval {
577 reset_signals; 749 cf::post_fork;
578 &$cb 750 &$cb
579 }, @args; 751 } @args;
580 752
581 wantarray ? @res : $res[-1] 753 wantarray ? @res : $res[-1]
754}
755
756sub objinfo {
757 (
758 "counter value" => cf::object::object_count,
759 "objects created" => cf::object::create_count,
760 "objects destroyed" => cf::object::destroy_count,
761 "freelist size" => cf::object::free_count,
762 "allocated objects" => cf::object::objects_size,
763 "active objects" => cf::object::actives_size,
764 )
582} 765}
583 766
584=item $coin = coin_from_name $name 767=item $coin = coin_from_name $name
585 768
586=cut 769=cut
623within each server. 806within each server.
624 807
625=cut 808=cut
626 809
627sub db_table($) { 810sub db_table($) {
811 cf::error "db_get called from main context"
812 if $Coro::current == $Coro::main;
813
628 my ($name) = @_; 814 my ($name) = @_;
629 my $db = BDB::db_create $DB_ENV; 815 my $db = BDB::db_create $DB_ENV;
630 816
631 eval { 817 eval {
632 $db->set_flags (BDB::CHKSUM); 818 $db->set_flags (BDB::CHKSUM);
642} 828}
643 829
644our $DB; 830our $DB;
645 831
646sub db_init { 832sub db_init {
647 cf::sync_job {
648 $DB ||= db_table "db"; 833 $DB ||= db_table "db";
649 };
650} 834}
651 835
652sub db_get($$) { 836sub db_get($$) {
653 my $key = "$_[0]/$_[1]"; 837 my $key = "$_[0]/$_[1]";
654 838
655 cf::sync_job { 839 cf::error "db_get called from main context"
840 if $Coro::current == $Coro::main;
841
656 BDB::db_get $DB, undef, $key, my $data; 842 BDB::db_get $DB, undef, $key, my $data;
657 843
658 $! ? () 844 $! ? ()
659 : $data 845 : $data
660 }
661} 846}
662 847
663sub db_put($$$) { 848sub db_put($$$) {
664 BDB::dbreq_pri 4; 849 BDB::dbreq_pri 4;
665 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 850 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
693 878
694 my @data; 879 my @data;
695 my $md5; 880 my $md5;
696 881
697 for (0 .. $#$src) { 882 for (0 .. $#$src) {
698 0 <= aio_load $src->[$_], $data[$_] 883 $data[$_] = load_file $src->[$_];
699 or Carp::croak "$src->[$_]: $!";
700 } 884 }
701 885
702 # if processing is expensive, check 886 # if processing is expensive, check
703 # checksum first 887 # checksum first
704 if (1) { 888 if (1) {
721 905
722 my $t1 = Time::HiRes::time; 906 my $t1 = Time::HiRes::time;
723 my $data = $process->(\@data); 907 my $data = $process->(\@data);
724 my $t2 = Time::HiRes::time; 908 my $t2 = Time::HiRes::time;
725 909
726 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 910 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
727 911
728 db_put cache => "$id/data", $data; 912 db_put cache => "$id/data", $data;
729 db_put cache => "$id/md5" , $md5; 913 db_put cache => "$id/md5" , $md5;
730 db_put cache => "$id/meta", $meta; 914 db_put cache => "$id/meta", $meta;
731 915
741 925
742=cut 926=cut
743 927
744sub datalog($@) { 928sub datalog($@) {
745 my ($type, %kv) = @_; 929 my ($type, %kv) = @_;
746 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 930 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
747} 931}
748 932
749=back 933=back
750 934
751=cut 935=cut
946 1130
947 } elsif (exists $cb_id{$type}) { 1131 } elsif (exists $cb_id{$type}) {
948 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1132 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
949 1133
950 } elsif (ref $type) { 1134 } elsif (ref $type) {
951 warn "attaching objects not supported, ignoring.\n"; 1135 error "attaching objects not supported, ignoring.\n";
952 1136
953 } else { 1137 } else {
954 shift @arg; 1138 shift @arg;
955 warn "attach argument '$type' not supported, ignoring.\n"; 1139 error "attach argument '$type' not supported, ignoring.\n";
956 } 1140 }
957 } 1141 }
958} 1142}
959 1143
960sub _object_attach { 1144sub _object_attach {
970 _attach $registry, $klass, @attach; 1154 _attach $registry, $klass, @attach;
971 } 1155 }
972 1156
973 $obj->{$name} = \%arg; 1157 $obj->{$name} = \%arg;
974 } else { 1158 } else {
975 warn "object uses attachment '$name' which is not available, postponing.\n"; 1159 info "object uses attachment '$name' which is not available, postponing.\n";
976 } 1160 }
977 1161
978 $obj->{_attachment}{$name} = undef; 1162 $obj->{_attachment}{$name} = undef;
979} 1163}
980 1164
1039 1223
1040 for (@$callbacks) { 1224 for (@$callbacks) {
1041 eval { &{$_->[1]} }; 1225 eval { &{$_->[1]} };
1042 1226
1043 if ($@) { 1227 if ($@) {
1044 warn "$@";
1045 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1228 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1046 override; 1229 override;
1047 } 1230 }
1048 1231
1049 return 1 if $override; 1232 return 1 if $override;
1050 } 1233 }
1129 for (@$attach) { 1312 for (@$attach) {
1130 my ($klass, @attach) = @$_; 1313 my ($klass, @attach) = @$_;
1131 _attach $registry, $klass, @attach; 1314 _attach $registry, $klass, @attach;
1132 } 1315 }
1133 } else { 1316 } else {
1134 warn "object uses attachment '$name' that is not available, postponing.\n"; 1317 info "object uses attachment '$name' that is not available, postponing.\n";
1135 } 1318 }
1136 } 1319 }
1137} 1320}
1138 1321
1139cf::attachable->attach ( 1322cf::attachable->attach (
1166 my ($filename, $rdata, $objs) = @_; 1349 my ($filename, $rdata, $objs) = @_;
1167 1350
1168 sync_job { 1351 sync_job {
1169 if (length $$rdata) { 1352 if (length $$rdata) {
1170 utf8::decode (my $decname = $filename); 1353 utf8::decode (my $decname = $filename);
1171 warn sprintf "saving %s (%d,%d)\n", 1354 trace sprintf "saving %s (%d,%d)\n",
1172 $decname, length $$rdata, scalar @$objs; 1355 $decname, length $$rdata, scalar @$objs
1356 if $VERBOSE_IO;
1173 1357
1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1358 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1175 aio_chmod $fh, SAVE_MODE; 1359 aio_chmod $fh, SAVE_MODE;
1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1360 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1177 if ($cf::USE_FSYNC) { 1361 if ($cf::USE_FSYNC) {
1199 aio_rename "$filename~", $filename; 1383 aio_rename "$filename~", $filename;
1200 1384
1201 $filename =~ s%/[^/]+$%%; 1385 $filename =~ s%/[^/]+$%%;
1202 aio_pathsync $filename if $cf::USE_FSYNC; 1386 aio_pathsync $filename if $cf::USE_FSYNC;
1203 } else { 1387 } else {
1204 warn "unable to save objects: $filename~: $!\n"; 1388 error "unable to save objects: $filename~: $!\n";
1205 } 1389 }
1206 } else { 1390 } else {
1207 aio_unlink $filename; 1391 aio_unlink $filename;
1208 aio_unlink "$filename.pst"; 1392 aio_unlink "$filename.pst";
1209 } 1393 }
1233 my $st = eval { Coro::Storable::thaw $av }; 1417 my $st = eval { Coro::Storable::thaw $av };
1234 $av = $st->{objs}; 1418 $av = $st->{objs};
1235 } 1419 }
1236 1420
1237 utf8::decode (my $decname = $filename); 1421 utf8::decode (my $decname = $filename);
1238 warn sprintf "loading %s (%d,%d)\n", 1422 trace sprintf "loading %s (%d,%d)\n",
1239 $decname, length $data, scalar @{$av || []}; 1423 $decname, length $data, scalar @{$av || []}
1424 if $VERBOSE_IO;
1240 1425
1241 ($data, $av) 1426 ($data, $av)
1242} 1427}
1243 1428
1244=head2 COMMAND CALLBACKS 1429=head2 COMMAND CALLBACKS
1248=cut 1433=cut
1249 1434
1250############################################################################# 1435#############################################################################
1251# command handling &c 1436# command handling &c
1252 1437
1253=item cf::register_command $name => \&callback($ob,$args); 1438=item cf::register_command $name => \&callback($ob,$args)
1254 1439
1255Register a callback for execution when the client sends the user command 1440Register a callback for execution when the client sends the user command
1256$name. 1441$name.
1257 1442
1258=cut 1443=cut
1264 #warn "registering command '$name/$time' to '$caller'"; 1449 #warn "registering command '$name/$time' to '$caller'";
1265 1450
1266 push @{ $COMMAND{$name} }, [$caller, $cb]; 1451 push @{ $COMMAND{$name} }, [$caller, $cb];
1267} 1452}
1268 1453
1269=item cf::register_extcmd $name => \&callback($pl,$packet); 1454=item cf::register_extcmd $name => \&callback($pl,@args)
1270 1455
1271Register a callback for execution when the client sends an (synchronous) 1456Register a callback for execution when the client sends an (synchronous)
1272extcmd packet. Ext commands will be processed in the order they are 1457extcmd packet. Ext commands will be processed in the order they are
1273received by the server, like other user commands. The first argument is 1458received by the server, like other user commands. The first argument is
1274the logged-in player. Ext commands can only be processed after a player 1459the logged-in player. Ext commands can only be processed after a player
1275has logged in successfully. 1460has logged in successfully.
1276 1461
1277If the callback returns something, it is sent back as if reply was being 1462The values will be sent back to the client.
1278called.
1279 1463
1464=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1465
1466Same as C<cf::register_extcmd>, but instead of returning values, the
1467callback needs to clal the C<$reply> function.
1468
1280=item cf::register_exticmd $name => \&callback($ns,$packet); 1469=item cf::register_exticmd $name => \&callback($ns,@args)
1281 1470
1282Register a callback for execution when the client sends an (asynchronous) 1471Register a callback for execution when the client sends an (asynchronous)
1283exticmd packet. Exti commands are processed by the server as soon as they 1472exticmd packet. Exti commands are processed by the server as soon as they
1284are received, i.e. out of order w.r.t. other commands. The first argument 1473are received, i.e. out of order w.r.t. other commands. The first argument
1285is a client socket. Exti commands can be received anytime, even before 1474is a client socket. Exti commands can be received anytime, even before
1286log-in. 1475log-in.
1287 1476
1288If the callback returns something, it is sent back as if reply was being 1477The values will be sent back to the client.
1289called.
1290 1478
1291=cut 1479=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1292 1480
1481Same as C<cf::register_extcmd>, but instead of returning values, the
1482callback needs to clal the C<$reply> function.
1483
1484=cut
1485
1293sub register_extcmd { 1486sub register_extcmd($$) {
1294 my ($name, $cb) = @_; 1487 my ($name, $cb) = @_;
1295 1488
1296 $EXTCMD{$name} = $cb; 1489 $EXTCMD{$name} = $cb;
1297} 1490}
1298 1491
1299sub register_exticmd { 1492sub register_async_extcmd($$) {
1300 my ($name, $cb) = @_; 1493 my ($name, $cb) = @_;
1301 1494
1495 $EXTACMD{$name} = $cb;
1496}
1497
1498sub register_exticmd($$) {
1499 my ($name, $cb) = @_;
1500
1302 $EXTICMD{$name} = $cb; 1501 $EXTICMD{$name} = $cb;
1303} 1502}
1304 1503
1504sub register_async_exticmd($$) {
1505 my ($name, $cb) = @_;
1506
1507 $EXTIACMD{$name} = $cb;
1508}
1509
1305use File::Glob (); 1510use File::Glob ();
1306 1511
1307cf::player->attach ( 1512cf::player->attach (
1308 on_command => sub { 1513 on_unknown_command => sub {
1309 my ($pl, $name, $params) = @_; 1514 my ($pl, $name, $params) = @_;
1310 1515
1311 my $cb = $COMMAND{$name} 1516 my $cb = $COMMAND{$name}
1312 or return; 1517 or return;
1313 1518
1321 my ($pl, $buf) = @_; 1526 my ($pl, $buf) = @_;
1322 1527
1323 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1528 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1324 1529
1325 if (ref $msg) { 1530 if (ref $msg) {
1326 my ($type, $reply, @payload) = 1531 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 1532
1331 my @reply;
1332
1333 if (my $cb = $EXTCMD{$type}) { 1533 if (my $cb = $EXTACMD{$type}) {
1534 $cb->(
1535 $pl,
1536 sub {
1537 $pl->ext_msg ("reply-$reply", @_)
1538 if $reply;
1539 },
1540 @payload
1541 );
1542 } else {
1543 my @reply;
1544
1545 if (my $cb = $EXTCMD{$type}) {
1334 @reply = $cb->($pl, @payload); 1546 @reply = $cb->($pl, @payload);
1547 }
1548
1549 $pl->ext_msg ("reply-$reply", @reply)
1550 if $reply;
1335 } 1551 }
1336 1552
1337 $pl->ext_reply ($reply, @reply)
1338 if $reply;
1339
1340 } else { 1553 } else {
1341 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1554 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1342 } 1555 }
1343 1556
1344 cf::override; 1557 cf::override;
1345 }, 1558 },
1346); 1559);
1356 }; 1569 };
1357 1570
1358 $grp 1571 $grp
1359} 1572}
1360 1573
1574sub _ext_cfg_reg($$$$) {
1575 my ($rvar, $varname, $cfgname, $default) = @_;
1576
1577 $cfgname = lc $varname
1578 unless length $cfgname;
1579
1580 $EXT_CFG{$cfgname} = [$rvar, $default];
1581
1582 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1583}
1584
1361sub load_extensions { 1585sub load_extensions {
1586 info "loading extensions...";
1587
1588 %EXT_CFG = ();
1589
1362 cf::sync_job { 1590 cf::sync_job {
1363 my %todo; 1591 my %todo;
1364 1592
1365 for my $path (<$LIBDIR/*.ext>) { 1593 for my $path (<$LIBDIR/*.ext>) {
1366 next unless -r $path; 1594 next unless -r $path;
1384 1612
1385 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1613 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1386 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1614 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1387 1615
1388 $ext{source} = 1616 $ext{source} =
1389 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1617 "package $pkg; use common::sense;\n"
1390 . "#line 1 \"$path\"\n{\n" 1618 . "#line 1 \"$path\"\n{\n"
1391 . $source 1619 . $source
1392 . "\n};\n1"; 1620 . "\n};\n1";
1393 1621
1394 $todo{$base} = \%ext; 1622 $todo{$base} = \%ext;
1395 } 1623 }
1396 1624
1625 my $pass = 0;
1397 my %done; 1626 my %done;
1398 while (%todo) { 1627 while (%todo) {
1399 my $progress; 1628 my $progress;
1400 1629
1630 ++$pass;
1631
1632 ext:
1401 while (my ($k, $v) = each %todo) { 1633 while (my ($k, $v) = each %todo) {
1402 for (split /,\s*/, $v->{meta}{depends}) { 1634 for (split /,\s*/, $v->{meta}{depends}) {
1403 goto skip 1635 next ext
1404 unless exists $done{$_}; 1636 unless exists $done{$_};
1405 } 1637 }
1406 1638
1407 warn "... loading '$k' into '$v->{pkg}'\n"; 1639 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1408 1640
1409 unless (eval $v->{source}) { 1641 my $source = $v->{source};
1642
1643 # support "CONF varname :confname = default" pseudo-statements
1644 $source =~ s{
1645 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1646 }{
1647 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1648 }gmxe;
1649
1650 my $active = eval $source;
1651
1652 if (length $@) {
1410 my $msg = $@ ? "$v->{path}: $@\n" 1653 error "$v->{path}: $@\n";
1411 : "$v->{base}: extension inactive.\n";
1412 1654
1413 if (exists $v->{meta}{mandatory}) {
1414 warn $msg;
1415 cf::cleanup "mandatory extension failed to load, exiting."; 1655 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1416 } 1656 if exists $v->{meta}{mandatory};
1417 1657
1418 warn $msg; 1658 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1659 delete $todo{$k};
1660 } else {
1661 $done{$k} = delete $todo{$k};
1662 push @EXTS, $v->{pkg};
1663 $progress = 1;
1664
1665 info "$v->{base}: extension inactive.\n"
1666 unless $active;
1419 } 1667 }
1420
1421 $done{$k} = delete $todo{$k};
1422 push @EXTS, $v->{pkg};
1423 $progress = 1;
1424 } 1668 }
1425 1669
1426 skip: 1670 unless ($progress) {
1427 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1671 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1428 unless $progress; 1672
1673 while (my ($k, $v) = each %todo) {
1674 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1675 if exists $v->{meta}{mandatory};
1676 }
1677
1678 last;
1679 }
1429 } 1680 }
1430 }; 1681 };
1431} 1682}
1432 1683
1433############################################################################# 1684#############################################################################
1517 $cf::PLAYER{$login} = $pl 1768 $cf::PLAYER{$login} = $pl
1518 } 1769 }
1519 } 1770 }
1520} 1771}
1521 1772
1773cf::player->attach (
1774 on_load => sub {
1775 my ($pl, $path) = @_;
1776
1777 # restore slots saved in save, below
1778 my $slots = delete $pl->{_slots};
1779
1780 $pl->ob->current_weapon ($slots->[0]);
1781 $pl->combat_ob ($slots->[1]);
1782 $pl->ranged_ob ($slots->[2]);
1783 },
1784);
1785
1522sub save($) { 1786sub save($) {
1523 my ($pl) = @_; 1787 my ($pl) = @_;
1524 1788
1525 return if $pl->{deny_save}; 1789 return if $pl->{deny_save};
1526 1790
1531 1795
1532 aio_mkdir playerdir $pl, 0770; 1796 aio_mkdir playerdir $pl, 0770;
1533 $pl->{last_save} = $cf::RUNTIME; 1797 $pl->{last_save} = $cf::RUNTIME;
1534 1798
1535 cf::get_slot 0.01; 1799 cf::get_slot 0.01;
1800
1801 # save slots, to be restored later
1802 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1536 1803
1537 $pl->save_pl ($path); 1804 $pl->save_pl ($path);
1538 cf::cede_to_tick; 1805 cf::cede_to_tick;
1539} 1806}
1540 1807
1574 my $name = $pl->ob->name; 1841 my $name = $pl->ob->name;
1575 1842
1576 $pl->{deny_save} = 1; 1843 $pl->{deny_save} = 1;
1577 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1844 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1578 1845
1579 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1846 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1580 $pl->deactivate; 1847 $pl->deactivate;
1848
1581 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1849 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1582 $pl->ob->check_score;
1583 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1850 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1851 ext::highscore::check ($pl->ob);
1852
1584 $pl->ns->destroy if $pl->ns; 1853 $pl->ns->destroy if $pl->ns;
1585 1854
1586 my $path = playerdir $pl; 1855 my $path = playerdir $pl;
1587 my $temp = "$path~$cf::RUNTIME~deleting~"; 1856 my $temp = "$path~$cf::RUNTIME~deleting~";
1588 aio_rename $path, $temp; 1857 aio_rename $path, $temp;
1642 \@logins 1911 \@logins
1643} 1912}
1644 1913
1645=item $player->maps 1914=item $player->maps
1646 1915
1916=item cf::player::maps $login
1917
1647Returns an arrayref of map paths that are private for this 1918Returns an arrayref of map paths that are private for this
1648player. May block. 1919player. May block.
1649 1920
1650=cut 1921=cut
1651 1922
1672 1943
1673=item $protocol_xml = $player->expand_cfpod ($cfpod) 1944=item $protocol_xml = $player->expand_cfpod ($cfpod)
1674 1945
1675Expand deliantra pod fragments into protocol xml. 1946Expand deliantra pod fragments into protocol xml.
1676 1947
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) 1948=item $player->ext_msg ($type, @msg)
1690 1949
1691Sends an ext event to the client. 1950Sends an ext event to the client.
1692 1951
1693=cut 1952=cut
1712 1971
1713=cut 1972=cut
1714 1973
1715sub find_by_path($) { 1974sub find_by_path($) {
1716 my ($path) = @_; 1975 my ($path) = @_;
1976
1977 $path =~ s/^~[^\/]*//; # skip ~login
1717 1978
1718 my ($match, $specificity); 1979 my ($match, $specificity);
1719 1980
1720 for my $region (list) { 1981 for my $region (list) {
1721 if ($region->{match} && $path =~ $region->{match}) { 1982 if ($region->{match} && $path =~ $region->{match}) {
1750sub generate_random_map { 2011sub generate_random_map {
1751 my ($self, $rmp) = @_; 2012 my ($self, $rmp) = @_;
1752 2013
1753 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 2014 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1754 2015
1755 # mit "rum" bekleckern, nicht
1756 $self->_create_random_map ( 2016 $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} 2017}
1770 2018
1771=item cf::map->register ($regex, $prio) 2019=item cf::map->register ($regex, $prio)
1772 2020
1773Register a handler for the map path matching the given regex at the 2021Register a handler for the map path matching the given regex at the
1778 2026
1779sub register { 2027sub register {
1780 my (undef, $regex, $prio) = @_; 2028 my (undef, $regex, $prio) = @_;
1781 my $pkg = caller; 2029 my $pkg = caller;
1782 2030
1783 no strict;
1784 push @{"$pkg\::ISA"}, __PACKAGE__; 2031 push @{"$pkg\::ISA"}, __PACKAGE__;
1785 2032
1786 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2033 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1787} 2034}
1788 2035
1789# also paths starting with '/' 2036# also paths starting with '/'
1790$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2037$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1791 2038
1792sub thawer_merge { 2039sub thawer_merge {
1793 my ($self, $merge) = @_; 2040 my ($self, $merge) = @_;
1794 2041
1795 # we have to keep some variables in memory intact 2042 # we have to keep some variables in memory intact
1800} 2047}
1801 2048
1802sub normalise { 2049sub normalise {
1803 my ($path, $base) = @_; 2050 my ($path, $base) = @_;
1804 2051
1805 $path = "$path"; # make sure its a string 2052 $path = "$path"; # make sure it's a string
1806 2053
1807 $path =~ s/\.map$//; 2054 $path =~ s/\.map$//;
1808 2055
1809 # map plan: 2056 # map plan:
1810 # 2057 #
1825 $base =~ s{[^/]+/?$}{}; 2072 $base =~ s{[^/]+/?$}{};
1826 $path = "$base/$path"; 2073 $path = "$base/$path";
1827 } 2074 }
1828 2075
1829 for ($path) { 2076 for ($path) {
1830 redo if s{//}{/};
1831 redo if s{/\.?/}{/}; 2077 redo if s{/\.?/}{/};
1832 redo if s{/[^/]+/\.\./}{/}; 2078 redo if s{/[^/]+/\.\./}{/};
1833 } 2079 }
1834 2080
1835 $path 2081 $path
1849 $self->init; # pass $1 etc. 2095 $self->init; # pass $1 etc.
1850 return $self; 2096 return $self;
1851 } 2097 }
1852 } 2098 }
1853 2099
1854 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2100 Carp::cluck "unable to resolve path '$path' (base '$base')";
1855 () 2101 ()
1856} 2102}
1857 2103
2104# may re-bless or do other evil things
1858sub init { 2105sub init {
1859 my ($self) = @_; 2106 my ($self) = @_;
1860 2107
1861 $self 2108 $self
1862} 2109}
1927 $self->{load_path} = $path; 2174 $self->{load_path} = $path;
1928 2175
1929 1 2176 1
1930} 2177}
1931 2178
2179# used to laod the header of an original map
1932sub load_header_orig { 2180sub load_header_orig {
1933 my ($self) = @_; 2181 my ($self) = @_;
1934 2182
1935 $self->load_header_from ($self->load_path) 2183 $self->load_header_from ($self->load_path)
1936} 2184}
1937 2185
2186# used to laod the header of an instantiated map
1938sub load_header_temp { 2187sub load_header_temp {
1939 my ($self) = @_; 2188 my ($self) = @_;
1940 2189
1941 $self->load_header_from ($self->save_path) 2190 $self->load_header_from ($self->save_path)
1942} 2191}
1943 2192
2193# called after loading the header from an instantiated map
1944sub prepare_temp { 2194sub prepare_temp {
1945 my ($self) = @_; 2195 my ($self) = @_;
1946 2196
1947 $self->last_access ((delete $self->{last_access}) 2197 $self->last_access ((delete $self->{last_access})
1948 || $cf::RUNTIME); #d# 2198 || $cf::RUNTIME); #d#
1949 # safety 2199 # safety
1950 $self->{instantiate_time} = $cf::RUNTIME 2200 $self->{instantiate_time} = $cf::RUNTIME
1951 if $self->{instantiate_time} > $cf::RUNTIME; 2201 if $self->{instantiate_time} > $cf::RUNTIME;
1952} 2202}
1953 2203
2204# called after loading the header from an original map
1954sub prepare_orig { 2205sub prepare_orig {
1955 my ($self) = @_; 2206 my ($self) = @_;
1956 2207
1957 $self->{load_original} = 1; 2208 $self->{load_original} = 1;
1958 $self->{instantiate_time} = $cf::RUNTIME; 2209 $self->{instantiate_time} = $cf::RUNTIME;
1982 2233
1983sub find; 2234sub find;
1984sub find { 2235sub find {
1985 my ($path, $origin) = @_; 2236 my ($path, $origin) = @_;
1986 2237
2238 cf::cede_to_tick;
2239
1987 $path = normalise $path, $origin && $origin->path; 2240 $path = normalise $path, $origin;
1988 2241
1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2242 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1990 my $guard2 = cf::lock_acquire "map_find:$path"; 2243 my $guard2 = cf::lock_acquire "map_find:$path";
1991 2244
1992 $cf::MAP{$path} || do { 2245 $cf::MAP{$path} || do {
2009 2262
2010 $cf::MAP{$path} = $map 2263 $cf::MAP{$path} = $map
2011 } 2264 }
2012} 2265}
2013 2266
2014sub pre_load { } 2267sub pre_load { }
2015sub post_load { } 2268#sub post_load { } # XS
2016 2269
2017sub load { 2270sub load {
2018 my ($self) = @_; 2271 my ($self) = @_;
2019 2272
2020 local $self->{deny_reset} = 1; # loading can take a long time 2273 local $self->{deny_reset} = 1; # loading can take a long time
2023 2276
2024 { 2277 {
2025 my $guard = cf::lock_acquire "map_data:$path"; 2278 my $guard = cf::lock_acquire "map_data:$path";
2026 2279
2027 return unless $self->valid; 2280 return unless $self->valid;
2028 return unless $self->in_memory == cf::MAP_SWAPPED; 2281 return unless $self->state == cf::MAP_SWAPPED;
2029
2030 $self->in_memory (cf::MAP_LOADING);
2031 2282
2032 $self->alloc; 2283 $self->alloc;
2033 2284
2034 $self->pre_load; 2285 $self->pre_load;
2035 cf::cede_to_tick; 2286 cf::cede_to_tick;
2036 2287
2288 if (exists $self->{load_path}) {
2037 my $f = new_from_file cf::object::thawer $self->{load_path}; 2289 my $f = new_from_file cf::object::thawer $self->{load_path};
2038 $f->skip_block; 2290 $f->skip_block;
2039 $self->_load_objects ($f) 2291 $self->_load_objects ($f)
2040 or return; 2292 or return;
2041 2293
2042 $self->post_load_original 2294 $self->post_load_original
2043 if delete $self->{load_original}; 2295 if delete $self->{load_original};
2044 2296
2045 if (my $uniq = $self->uniq_path) { 2297 if (my $uniq = $self->uniq_path) {
2046 utf8::encode $uniq; 2298 utf8::encode $uniq;
2047 unless (aio_stat $uniq) { 2299 unless (aio_stat $uniq) {
2048 if (my $f = new_from_file cf::object::thawer $uniq) { 2300 if (my $f = new_from_file cf::object::thawer $uniq) {
2049 $self->clear_unique_items; 2301 $self->clear_unique_items;
2050 $self->_load_objects ($f); 2302 $self->_load_objects ($f);
2051 $f->resolve_delayed_derefs; 2303 $f->resolve_delayed_derefs;
2304 }
2052 } 2305 }
2053 } 2306 }
2054 }
2055 2307
2056 $f->resolve_delayed_derefs; 2308 $f->resolve_delayed_derefs;
2309 } else {
2310 $self->post_load_original
2311 if delete $self->{load_original};
2312 }
2313
2314 $self->state (cf::MAP_INACTIVE);
2057 2315
2058 cf::cede_to_tick; 2316 cf::cede_to_tick;
2059 # now do the right thing for maps 2317 # now do the right thing for maps
2060 $self->link_multipart_objects; 2318 $self->link_multipart_objects;
2061 $self->difficulty ($self->estimate_difficulty) 2319 $self->difficulty ($self->estimate_difficulty)
2065 unless ($self->{deny_activate}) { 2323 unless ($self->{deny_activate}) {
2066 $self->decay_objects; 2324 $self->decay_objects;
2067 $self->fix_auto_apply; 2325 $self->fix_auto_apply;
2068 $self->update_buttons; 2326 $self->update_buttons;
2069 cf::cede_to_tick; 2327 cf::cede_to_tick;
2070 $self->activate; 2328 #$self->activate; # no longer activate maps automatically
2071 } 2329 }
2072 2330
2073 $self->{last_save} = $cf::RUNTIME; 2331 $self->{last_save} = $cf::RUNTIME;
2074 $self->last_access ($cf::RUNTIME); 2332 $self->last_access ($cf::RUNTIME);
2075
2076 $self->in_memory (cf::MAP_ACTIVE);
2077 } 2333 }
2078 2334
2079 $self->post_load; 2335 $self->post_load;
2080}
2081 2336
2337 1
2338}
2339
2340# customize the map for a given player, i.e.
2341# return the _real_ map. used by e.g. per-player
2342# maps to change the path to ~playername/mappath
2082sub customise_for { 2343sub customise_for {
2083 my ($self, $ob) = @_; 2344 my ($self, $ob) = @_;
2084 2345
2085 return find "~" . $ob->name . "/" . $self->{path} 2346 return find "~" . $ob->name . "/" . $self->{path}
2086 if $self->per_player; 2347 if $self->per_player;
2089# if $self->per_party; 2350# if $self->per_party;
2090 2351
2091 $self 2352 $self
2092} 2353}
2093 2354
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 { 2355sub find_sync {
2121 my ($path, $origin) = @_; 2356 my ($path, $origin) = @_;
2122 2357
2123 cf::sync_job { find $path, $origin } 2358 # it's a bug to call this from the main context
2359 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2360 if $Coro::current == $Coro::main;
2361
2362 find $path, $origin
2124} 2363}
2125 2364
2126sub do_load_sync { 2365sub do_load_sync {
2127 my ($map) = @_; 2366 my ($map) = @_;
2128 2367
2368 # it's a bug to call this from the main context
2129 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2369 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2130 if $Coro::current == $Coro::main; 2370 if $Coro::current == $Coro::main;
2131 2371
2132 cf::sync_job { $map->load }; 2372 $map->load;
2133} 2373}
2134 2374
2135our %MAP_PREFETCH; 2375our %MAP_PREFETCH;
2136our $MAP_PREFETCHER = undef; 2376our $MAP_PREFETCHER = undef;
2137 2377
2138sub find_async { 2378sub find_async {
2139 my ($path, $origin, $load) = @_; 2379 my ($path, $origin, $load) = @_;
2140 2380
2141 $path = normalise $path, $origin && $origin->{path}; 2381 $path = normalise $path, $origin;
2142 2382
2143 if (my $map = $cf::MAP{$path}) { 2383 if (my $map = $cf::MAP{$path}) {
2144 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2384 return $map if !$load || $map->linkable;
2145 } 2385 }
2146 2386
2147 $MAP_PREFETCH{$path} |= $load; 2387 $MAP_PREFETCH{$path} |= $load;
2148 2388
2149 $MAP_PREFETCHER ||= cf::async { 2389 $MAP_PREFETCHER ||= cf::async {
2163 $MAP_PREFETCHER->prio (6); 2403 $MAP_PREFETCHER->prio (6);
2164 2404
2165 () 2405 ()
2166} 2406}
2167 2407
2408# common code, used by both ->save and ->swapout
2168sub save { 2409sub _save {
2169 my ($self) = @_; 2410 my ($self) = @_;
2170
2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
2172 2411
2173 $self->{last_save} = $cf::RUNTIME; 2412 $self->{last_save} = $cf::RUNTIME;
2174 2413
2175 return unless $self->dirty; 2414 return unless $self->dirty;
2176 2415
2196 } else { 2435 } else {
2197 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2436 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2198 } 2437 }
2199} 2438}
2200 2439
2440sub save {
2441 my ($self) = @_;
2442
2443 my $lock = cf::lock_acquire "map_data:$self->{path}";
2444
2445 $self->_save;
2446}
2447
2201sub swap_out { 2448sub swap_out {
2202 my ($self) = @_; 2449 my ($self) = @_;
2203 2450
2204 # save first because save cedes
2205 $self->save;
2206
2207 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2451 my $lock = cf::lock_acquire "map_data:$self->{path}";
2208 2452
2453 return if !$self->linkable;
2454 return if $self->{deny_save};
2209 return if $self->players; 2455 return if $self->players;
2210 return if $self->in_memory != cf::MAP_ACTIVE; 2456
2457 # first deactivate the map and "unlink" it from the core
2458 $self->deactivate;
2459 $_->clear_links_to ($self) for values %cf::MAP;
2460 $self->state (cf::MAP_SWAPPED);
2461
2462 # then atomically save
2463 $self->_save;
2464
2465 # then free the map
2466 $self->clear;
2467}
2468
2469sub reset_at {
2470 my ($self) = @_;
2471
2472 # TODO: safety, remove and allow resettable per-player maps
2211 return if $self->{deny_save}; 2473 return 1e99 if $self->{deny_reset};
2212 2474
2475 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2476 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2477
2478 $time + $to
2479}
2480
2481sub should_reset {
2482 my ($self) = @_;
2483
2484 $self->reset_at <= $cf::RUNTIME
2485}
2486
2487sub reset {
2488 my ($self) = @_;
2489
2490 my $lock = cf::lock_acquire "map_data:$self->{path}";
2491
2492 return if $self->players;
2493
2494 cf::trace "resetting map ", $self->path, "\n";
2495
2213 $self->in_memory (cf::MAP_SWAPPED); 2496 $self->state (cf::MAP_SWAPPED);
2497
2498 # need to save uniques path
2499 unless ($self->{deny_save}) {
2500 my $uniq = $self->uniq_path; utf8::encode $uniq;
2501
2502 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2503 if $uniq;
2504 }
2505
2506 delete $cf::MAP{$self->path};
2214 2507
2215 $self->deactivate; 2508 $self->deactivate;
2216 $_->clear_links_to ($self) for values %cf::MAP; 2509 $_->clear_links_to ($self) for values %cf::MAP;
2217 $self->clear; 2510 $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 2511
2263 $self->unlink_save; 2512 $self->unlink_save;
2264 $self->destroy; 2513 $self->destroy;
2265} 2514}
2266 2515
2274 2523
2275 delete $cf::MAP{$self->path}; 2524 delete $cf::MAP{$self->path};
2276 2525
2277 $self->unlink_save; 2526 $self->unlink_save;
2278 2527
2279 bless $self, "cf::map"; 2528 bless $self, "cf::map::wrap";
2280 delete $self->{deny_reset}; 2529 delete $self->{deny_reset};
2281 $self->{deny_save} = 1; 2530 $self->{deny_save} = 1;
2282 $self->reset_timeout (1); 2531 $self->reset_timeout (1);
2283 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2532 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2284 2533
2341 : normalise $_ 2590 : normalise $_
2342 } @{ aio_readdir $UNIQUEDIR or [] } 2591 } @{ aio_readdir $UNIQUEDIR or [] }
2343 ] 2592 ]
2344} 2593}
2345 2594
2595=item cf::map::static_maps
2596
2597Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2598file in the shared directory excluding F</styles> and F</editor>). May
2599block.
2600
2601=cut
2602
2603sub static_maps() {
2604 my @dirs = "";
2605 my @maps;
2606
2607 while (@dirs) {
2608 my $dir = shift @dirs;
2609
2610 next if $dir eq "/styles" || $dir eq "/editor";
2611
2612 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2613 or return;
2614
2615 for (@$files) {
2616 s/\.map$// or next;
2617 utf8::decode $_;
2618 push @maps, "$dir/$_";
2619 }
2620
2621 push @dirs, map "$dir/$_", @$dirs;
2622 }
2623
2624 \@maps
2625}
2626
2346=back 2627=back
2347 2628
2348=head3 cf::object 2629=head3 cf::object
2349 2630
2350=cut 2631=cut
2482 2763
2483Freezes the player and moves him/her to a special map (C<{link}>). 2764Freezes the player and moves him/her to a special map (C<{link}>).
2484 2765
2485The player should be reasonably safe there for short amounts of time (e.g. 2766The player should be reasonably safe there for short amounts of time (e.g.
2486for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2767for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2487though, as the palyer cannot control the character while it is on the link 2768though, as the player cannot control the character while it is on the link
2488map. 2769map.
2489 2770
2490Will never block. 2771Will never block.
2491 2772
2492=item $player_object->leave_link ($map, $x, $y) 2773=item $player_object->leave_link ($map, $x, $y)
2513sub cf::object::player::enter_link { 2794sub cf::object::player::enter_link {
2514 my ($self) = @_; 2795 my ($self) = @_;
2515 2796
2516 $self->deactivate_recursive; 2797 $self->deactivate_recursive;
2517 2798
2799 ++$self->{_link_recursion};
2800
2518 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2801 return if UNIVERSAL::isa $self->map, "ext::map_link";
2519 2802
2520 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2803 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2521 if $self->map && $self->map->{path} ne "{link}"; 2804 if $self->map && $self->map->{path} ne "{link}";
2522 2805
2523 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2806 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2524} 2807}
2525 2808
2526sub cf::object::player::leave_link { 2809sub cf::object::player::leave_link {
2527 my ($self, $map, $x, $y) = @_; 2810 my ($self, $map, $x, $y) = @_;
2528 2811
2545 ($x, $y) = (-1, -1) 2828 ($x, $y) = (-1, -1)
2546 unless (defined $x) && (defined $y); 2829 unless (defined $x) && (defined $y);
2547 2830
2548 # use -1 or undef as default coordinates, not 0, 0 2831 # use -1 or undef as default coordinates, not 0, 0
2549 ($x, $y) = ($map->enter_x, $map->enter_y) 2832 ($x, $y) = ($map->enter_x, $map->enter_y)
2550 if $x <=0 && $y <= 0; 2833 if $x <= 0 && $y <= 0;
2551 2834
2552 $map->load; 2835 $map->load;
2553 $map->load_neighbours;
2554 2836
2555 return unless $self->contr->active; 2837 return unless $self->contr->active;
2556 2838
2557 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2839 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2558 $self->enter_map ($map, $x, $y); 2840 if ($self->enter_map ($map, $x, $y)) {
2559 2841 # entering was successful
2842 delete $self->{_link_recursion};
2560 # only activate afterwards, to support waiting in hooks 2843 # only activate afterwards, to support waiting in hooks
2561 $self->activate_recursive; 2844 $self->activate_recursive;
2562} 2845 }
2563 2846
2847}
2848
2564=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2849=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2565 2850
2566Moves the player to the given map-path and coordinates by first freezing 2851Moves the player to the given map-path and coordinates by first freezing
2567her, loading and preparing them map, calling the provided $check callback 2852her, loading and preparing them map, calling the provided $check callback
2568that has to return the map if sucecssful, and then unfreezes the player on 2853that has to return the map if sucecssful, and then unfreezes the player on
2569the new (success) or old (failed) map position. In either case, $done will 2854the new (success) or old (failed) map position. In either case, $done will
2576 2861
2577our $GOTOGEN; 2862our $GOTOGEN;
2578 2863
2579sub cf::object::player::goto { 2864sub cf::object::player::goto {
2580 my ($self, $path, $x, $y, $check, $done) = @_; 2865 my ($self, $path, $x, $y, $check, $done) = @_;
2866
2867 if ($self->{_link_recursion} >= $MAX_LINKS) {
2868 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2869 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2870 ($path, $x, $y) = @$EMERGENCY_POSITION;
2871 }
2581 2872
2582 # do generation counting so two concurrent goto's will be executed in-order 2873 # do generation counting so two concurrent goto's will be executed in-order
2583 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2874 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2584 2875
2585 $self->enter_link; 2876 $self->enter_link;
2605 ($path, $x, $y) = (undef, undef, undef); 2896 ($path, $x, $y) = (undef, undef, undef);
2606 } 2897 }
2607 } 2898 }
2608 2899
2609 my $map = eval { 2900 my $map = eval {
2610 my $map = defined $path ? cf::map::find $path : undef; 2901 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2611 2902
2612 if ($map) { 2903 if ($map) {
2613 $map = $map->customise_for ($self); 2904 $map = $map->customise_for ($self);
2614 $map = $check->($map) if $check && $map; 2905 $map = $check->($map, $x, $y, $self) if $check && $map;
2615 } else { 2906 } else {
2616 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2907 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2617 } 2908 }
2618 2909
2619 $map 2910 $map
2627 if ($gen == $self->{_goto_generation}) { 2918 if ($gen == $self->{_goto_generation}) {
2628 delete $self->{_goto_generation}; 2919 delete $self->{_goto_generation};
2629 $self->leave_link ($map, $x, $y); 2920 $self->leave_link ($map, $x, $y);
2630 } 2921 }
2631 2922
2632 $done->() if $done; 2923 $done->($self) if $done;
2633 })->prio (1); 2924 })->prio (1);
2634} 2925}
2635 2926
2636=item $player_object->enter_exit ($exit_object) 2927=item $player_object->enter_exit ($exit_object)
2637 2928
2705 $Coro::current->{desc} = "enter_exit"; 2996 $Coro::current->{desc} = "enter_exit";
2706 2997
2707 unless (eval { 2998 unless (eval {
2708 $self->deactivate_recursive; # just to be sure 2999 $self->deactivate_recursive; # just to be sure
2709 3000
2710 # random map handling
2711 {
2712 my $guard = cf::lock_acquire "exit_prepare:$exit";
2713
2714 prepare_random_map $exit
2715 if $exit->slaying eq "/!";
2716 }
2717
2718 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 3001 my $map = cf::map::normalise $exit->slaying, $exit->map;
2719 my $x = $exit->stats->hp; 3002 my $x = $exit->stats->hp;
2720 my $y = $exit->stats->sp; 3003 my $y = $exit->stats->sp;
3004
3005 # special map handling
3006 my $slaying = $exit->slaying;
3007
3008 # special map handling
3009 if ($slaying eq "/!") {
3010 my $guard = cf::lock_acquire "exit_prepare:$exit";
3011
3012 prepare_random_map $exit
3013 if $exit->slaying eq "/!"; # need to re-check after getting the lock
3014
3015 $map = $exit->slaying;
3016
3017 } elsif ($slaying eq '!up') {
3018 $map = $exit->map->tile_path (cf::TILE_UP);
3019 $x = $exit->x;
3020 $y = $exit->y;
3021
3022 } elsif ($slaying eq '!down') {
3023 $map = $exit->map->tile_path (cf::TILE_DOWN);
3024 $x = $exit->x;
3025 $y = $exit->y;
3026 }
2721 3027
2722 $self->goto ($map, $x, $y); 3028 $self->goto ($map, $x, $y);
2723 3029
2724 # if exit is damned, update players death & WoR home-position 3030 # if exit is damned, update players death & WoR home-position
2725 $self->contr->savebed ($map, $x, $y) 3031 $self->contr->savebed ($map, $x, $y)
2730 $self->message ("Something went wrong deep within the deliantra server. " 3036 $self->message ("Something went wrong deep within the deliantra server. "
2731 . "I'll try to bring you back to the map you were before. " 3037 . "I'll try to bring you back to the map you were before. "
2732 . "Please report this to the dungeon master!", 3038 . "Please report this to the dungeon master!",
2733 cf::NDI_UNIQUE | cf::NDI_RED); 3039 cf::NDI_UNIQUE | cf::NDI_RED);
2734 3040
2735 warn "ERROR in enter_exit: $@"; 3041 error "ERROR in enter_exit: $@";
2736 $self->leave_link; 3042 $self->leave_link;
2737 } 3043 }
2738 })->prio (1); 3044 })->prio (1);
2739} 3045}
2740 3046
2752sub cf::client::send_drawinfo { 3058sub cf::client::send_drawinfo {
2753 my ($self, $text, $flags) = @_; 3059 my ($self, $text, $flags) = @_;
2754 3060
2755 utf8::encode $text; 3061 utf8::encode $text;
2756 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3062 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3063}
3064
3065=item $client->send_big_packet ($pkt)
3066
3067Like C<send_packet>, but tries to compress large packets, and fragments
3068them as required.
3069
3070=cut
3071
3072our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3073
3074sub cf::client::send_big_packet {
3075 my ($self, $pkt) = @_;
3076
3077 # try lzf for large packets
3078 $pkt = "lzf " . Compress::LZF::compress $pkt
3079 if 1024 <= length $pkt and $self->{can_lzf};
3080
3081 # split very large packets
3082 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3083 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3084 $pkt = "frag";
3085 }
3086
3087 $self->send_packet ($pkt);
2757} 3088}
2758 3089
2759=item $client->send_msg ($channel, $msg, $color, [extra...]) 3090=item $client->send_msg ($channel, $msg, $color, [extra...])
2760 3091
2761Send a drawinfo or msg packet to the client, formatting the msg for the 3092Send a drawinfo or msg packet to the client, formatting the msg for the
2913 my $pkt = "msg " 3244 my $pkt = "msg "
2914 . $self->{json_coder}->encode ( 3245 . $self->{json_coder}->encode (
2915 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3246 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2916 ); 3247 );
2917 3248
2918 # try lzf for large packets
2919 $pkt = "lzf " . Compress::LZF::compress $pkt
2920 if 1024 <= length $pkt and $self->{can_lzf};
2921
2922 # split very large packets
2923 if (8192 < length $pkt and $self->{can_lzf}) {
2924 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2925 $pkt = "frag";
2926 }
2927
2928 $self->send_packet ($pkt); 3249 $self->send_big_packet ($pkt);
2929} 3250}
2930 3251
2931=item $client->ext_msg ($type, @msg) 3252=item $client->ext_msg ($type, @msg)
2932 3253
2933Sends an ext event to the client. 3254Sends an ext event to the client.
2935=cut 3256=cut
2936 3257
2937sub cf::client::ext_msg($$@) { 3258sub cf::client::ext_msg($$@) {
2938 my ($self, $type, @msg) = @_; 3259 my ($self, $type, @msg) = @_;
2939 3260
2940 if ($self->extcmd == 2) {
2941 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3261 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2942 } elsif ($self->extcmd == 1) { # TODO: remove
2943 push @msg, msgtype => "event_$type";
2944 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2945 }
2946}
2947
2948=item $client->ext_reply ($msgid, @msg)
2949
2950Sends an ext reply to the client.
2951
2952=cut
2953
2954sub cf::client::ext_reply($$@) {
2955 my ($self, $id, @msg) = @_;
2956
2957 if ($self->extcmd == 2) {
2958 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2959 } elsif ($self->extcmd == 1) {
2960 #TODO: version 1, remove
2961 unshift @msg, msgtype => "reply", msgid => $id;
2962 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2963 }
2964} 3262}
2965 3263
2966=item $success = $client->query ($flags, "text", \&cb) 3264=item $success = $client->query ($flags, "text", \&cb)
2967 3265
2968Queues a query to the client, calling the given callback with 3266Queues a query to the client, calling the given callback with
3023 my ($ns, $buf) = @_; 3321 my ($ns, $buf) = @_;
3024 3322
3025 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3323 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3026 3324
3027 if (ref $msg) { 3325 if (ref $msg) {
3028 my ($type, $reply, @payload) = 3326 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3029 "ARRAY" eq ref $msg
3030 ? @$msg
3031 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3032 3327
3033 my @reply;
3034
3035 if (my $cb = $EXTICMD{$type}) { 3328 if (my $cb = $EXTIACMD{$type}) {
3329 $cb->(
3330 $ns,
3331 sub {
3332 $ns->ext_msg ("reply-$reply", @_)
3333 if $reply;
3334 },
3335 @payload
3336 );
3337 } else {
3338 my @reply;
3339
3340 if (my $cb = $EXTICMD{$type}) {
3036 @reply = $cb->($ns, @payload); 3341 @reply = $cb->($ns, @payload);
3342 }
3343
3344 $ns->ext_msg ("reply-$reply", @reply)
3345 if $reply;
3037 } 3346 }
3038
3039 $ns->ext_reply ($reply, @reply)
3040 if $reply;
3041
3042 } else { 3347 } else {
3043 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3348 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3044 } 3349 }
3045 3350
3046 cf::override; 3351 cf::override;
3047 }, 3352 },
3048); 3353);
3068 3373
3069 $coro 3374 $coro
3070} 3375}
3071 3376
3072cf::client->attach ( 3377cf::client->attach (
3073 on_destroy => sub { 3378 on_client_destroy => sub {
3074 my ($ns) = @_; 3379 my ($ns) = @_;
3075 3380
3076 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3381 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3077 }, 3382 },
3078); 3383);
3094our $safe_hole = new Safe::Hole; 3399our $safe_hole = new Safe::Hole;
3095 3400
3096$SIG{FPE} = 'IGNORE'; 3401$SIG{FPE} = 'IGNORE';
3097 3402
3098$safe->permit_only (Opcode::opset qw( 3403$safe->permit_only (Opcode::opset qw(
3099 :base_core :base_mem :base_orig :base_math 3404 :base_core :base_mem :base_orig :base_math :base_loop
3100 grepstart grepwhile mapstart mapwhile 3405 grepstart grepwhile mapstart mapwhile
3101 sort time 3406 sort time
3102)); 3407));
3103 3408
3104# here we export the classes and methods available to script code 3409# here we export the classes and methods available to script code
3129 decrease split destroy change_exp value msg lore send_msg)], 3434 decrease split destroy change_exp value msg lore send_msg)],
3130 ["cf::object::player" => qw(player)], 3435 ["cf::object::player" => qw(player)],
3131 ["cf::player" => qw(peaceful send_msg)], 3436 ["cf::player" => qw(peaceful send_msg)],
3132 ["cf::map" => qw(trigger)], 3437 ["cf::map" => qw(trigger)],
3133) { 3438) {
3134 no strict 'refs';
3135 my ($pkg, @funs) = @$_; 3439 my ($pkg, @funs) = @$_;
3136 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3440 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3137 for @funs; 3441 for @funs;
3138} 3442}
3139 3443
3156 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3460 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3157 $qcode =~ s/\n/\\n/g; 3461 $qcode =~ s/\n/\\n/g;
3158 3462
3159 %vars = (_dummy => 0) unless %vars; 3463 %vars = (_dummy => 0) unless %vars;
3160 3464
3465 my @res;
3161 local $_; 3466 local $_;
3162 local @safe::cf::_safe_eval_args = values %vars;
3163 3467
3164 my $eval = 3468 my $eval =
3165 "do {\n" 3469 "do {\n"
3166 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3470 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3167 . "#line 0 \"{$qcode}\"\n" 3471 . "#line 0 \"{$qcode}\"\n"
3168 . $code 3472 . $code
3169 . "\n}" 3473 . "\n}"
3170 ; 3474 ;
3171 3475
3476 if ($CFG{safe_eval}) {
3172 sub_generation_inc; 3477 sub_generation_inc;
3478 local @safe::cf::_safe_eval_args = values %vars;
3173 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3479 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3174 sub_generation_inc; 3480 sub_generation_inc;
3481 } else {
3482 local @cf::_safe_eval_args = values %vars;
3483 @res = wantarray ? eval eval : scalar eval $eval;
3484 }
3175 3485
3176 if ($@) { 3486 if ($@) {
3177 warn "$@"; 3487 warn "$@",
3178 warn "while executing safe code '$code'\n"; 3488 "while executing safe code '$code'\n",
3179 warn "with arguments " . (join " ", %vars) . "\n"; 3489 "with arguments " . (join " ", %vars) . "\n";
3180 } 3490 }
3181 3491
3182 wantarray ? @res : $res[0] 3492 wantarray ? @res : $res[0]
3183} 3493}
3184 3494
3198=cut 3508=cut
3199 3509
3200sub register_script_function { 3510sub register_script_function {
3201 my ($fun, $cb) = @_; 3511 my ($fun, $cb) = @_;
3202 3512
3203 no strict 'refs'; 3513 $fun = "safe::$fun" if $CFG{safe_eval};
3204 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3514 *$fun = $safe_hole->wrap ($cb);
3205} 3515}
3206 3516
3207=back 3517=back
3208 3518
3209=cut 3519=cut
3210 3520
3211############################################################################# 3521#############################################################################
3212# the server's init and main functions 3522# the server's init and main functions
3523
3524our %FACEHASH; # hash => idx, #d# HACK for http server
3525
3526# internal api, not fianlised
3527sub set_face {
3528 my ($name, $type, $data) = @_;
3529
3530 my $idx = cf::face::find $name;
3531
3532 if ($idx) {
3533 delete $FACEHASH{cf::face::get_chksum $idx};
3534 } else {
3535 $idx = cf::face::alloc $name;
3536 }
3537
3538 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
3539
3540 cf::face::set_type $idx, $type;
3541 cf::face::set_data $idx, 0, $data, $hash;
3542 cf::face::set_meta $idx, $type & 1 ? undef : undef;
3543 $FACEHASH{$hash} = $idx;#d#
3544
3545 $idx
3546}
3213 3547
3214sub load_facedata($) { 3548sub load_facedata($) {
3215 my ($path) = @_; 3549 my ($path) = @_;
3216 3550
3217 # HACK to clear player env face cache, we need some signal framework 3551 # HACK to clear player env face cache, we need some signal framework
3218 # for this (global event?) 3552 # for this (global event?)
3219 %ext::player_env::MUSIC_FACE_CACHE = (); 3553 %ext::player_env::MUSIC_FACE_CACHE = ();
3220 3554
3221 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3555 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3222 3556
3223 warn "loading facedata from $path\n"; 3557 trace "loading facedata from $path\n";
3224 3558
3225 my $facedata; 3559 my $facedata = decode_storable load_file $path;
3226 0 < aio_load $path, $facedata
3227 or die "$path: $!";
3228
3229 $facedata = Coro::Storable::thaw $facedata;
3230 3560
3231 $facedata->{version} == 2 3561 $facedata->{version} == 2
3232 or cf::cleanup "$path: version mismatch, cannot proceed."; 3562 or cf::cleanup "$path: version mismatch, cannot proceed.";
3233 3563
3234 # patch in the exptable
3235 $facedata->{resource}{"res/exp_table"} = {
3236 type => FT_RSRC,
3237 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3238 };
3239 cf::cede_to_tick; 3564 cf::cede_to_tick;
3240 3565
3241 { 3566 {
3242 my $faces = $facedata->{faceinfo}; 3567 my $faces = delete $facedata->{faceinfo};
3243 3568
3244 while (my ($face, $info) = each %$faces) { 3569 for my $face (sort keys %$faces) {
3570 my $info = $faces->{$face};
3245 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3571 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3246 3572
3247 cf::face::set_visibility $idx, $info->{visibility}; 3573 cf::face::set_visibility $idx, $info->{visibility};
3248 cf::face::set_magicmap $idx, $info->{magicmap}; 3574 cf::face::set_magicmap $idx, $info->{magicmap};
3249 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3575 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3250 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3576 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3251 3577 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3578 $FACEHASH{$info->{hash64}} = $idx;#d#
3579
3252 cf::cede_to_tick; 3580 cf::cede_to_tick;
3253 } 3581 }
3254 3582
3255 while (my ($face, $info) = each %$faces) { 3583 while (my ($face, $info) = each %$faces) {
3256 next unless $info->{smooth}; 3584 next unless $info->{smooth};
3260 3588
3261 if (my $smooth = cf::face::find $info->{smooth}) { 3589 if (my $smooth = cf::face::find $info->{smooth}) {
3262 cf::face::set_smooth $idx, $smooth; 3590 cf::face::set_smooth $idx, $smooth;
3263 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3591 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3264 } else { 3592 } else {
3265 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3593 error "smooth face '$info->{smooth}' not found for face '$face'";
3266 } 3594 }
3267 3595
3268 cf::cede_to_tick; 3596 cf::cede_to_tick;
3269 } 3597 }
3270 } 3598 }
3271 3599
3272 { 3600 {
3273 my $anims = $facedata->{animinfo}; 3601 my $anims = delete $facedata->{animinfo};
3274 3602
3275 while (my ($anim, $info) = each %$anims) { 3603 while (my ($anim, $info) = each %$anims) {
3276 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3604 cf::anim::set $anim, $info->{frames}, $info->{facings};
3277 cf::cede_to_tick; 3605 cf::cede_to_tick;
3278 } 3606 }
3279 3607
3280 cf::anim::invalidate_all; # d'oh 3608 cf::anim::invalidate_all; # d'oh
3281 } 3609 }
3282 3610
3283 { 3611 {
3284 # TODO: for gcfclient pleasure, we should give resources
3285 # that gcfclient doesn't grok a >10000 face index.
3286 my $res = $facedata->{resource}; 3612 my $res = delete $facedata->{resource};
3287 3613
3288 while (my ($name, $info) = each %$res) { 3614 while (my ($name, $info) = each %$res) {
3289 if (defined $info->{type}) { 3615 if (defined (my $type = $info->{type})) {
3616 # TODO: different hash - must free and use new index, or cache ixface data queue
3290 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3617 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3291 my $data;
3292 3618
3293 if ($info->{type} & 1) {
3294 # prepend meta info
3295
3296 my $meta = $enc->encode ({
3297 name => $name,
3298 %{ $info->{meta} || {} },
3299 });
3300
3301 $data = pack "(w/a*)*", $meta, $info->{data};
3302 } else {
3303 $data = $info->{data};
3304 }
3305
3306 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3307 cf::face::set_type $idx, $info->{type}; 3619 cf::face::set_type $idx, $type;
3620 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3621 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3622 $FACEHASH{$info->{hash}} = $idx;#d#
3308 } else { 3623 } else {
3309 $RESOURCE{$name} = $info; 3624# $RESOURCE{$name} = $info; # unused
3310 } 3625 }
3311 3626
3312 cf::cede_to_tick; 3627 cf::cede_to_tick;
3313 } 3628 }
3314 } 3629 }
3315 3630
3316 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3631 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3317 3632
3318 1 3633 1
3319} 3634}
3320
3321cf::global->attach (on_resource_update => sub {
3322 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3323 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3324
3325 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3326 my $sound = $soundconf->{compat}[$_]
3327 or next;
3328
3329 my $face = cf::face::find "sound/$sound->[1]";
3330 cf::sound::set $sound->[0] => $face;
3331 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3332 }
3333
3334 while (my ($k, $v) = each %{$soundconf->{event}}) {
3335 my $face = cf::face::find "sound/$v";
3336 cf::sound::set $k => $face;
3337 }
3338 }
3339});
3340 3635
3341register_exticmd fx_want => sub { 3636register_exticmd fx_want => sub {
3342 my ($ns, $want) = @_; 3637 my ($ns, $want) = @_;
3343 3638
3344 while (my ($k, $v) = each %$want) { 3639 while (my ($k, $v) = each %$want) {
3352 my $status = load_resource_file_ $_[0]; 3647 my $status = load_resource_file_ $_[0];
3353 get_slot 0.1, 100; 3648 get_slot 0.1, 100;
3354 cf::arch::commit_load; 3649 cf::arch::commit_load;
3355 3650
3356 $status 3651 $status
3652}
3653
3654sub reload_exp_table {
3655 _reload_exp_table;
3656
3657 set_face "res/exp_table" => FT_RSRC,
3658 JSON::XS->new->utf8->canonical->encode (
3659 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3660 );
3661}
3662
3663sub reload_materials {
3664 _reload_materials;
3357} 3665}
3358 3666
3359sub reload_regions { 3667sub reload_regions {
3360 # HACK to clear player env face cache, we need some signal framework 3668 # HACK to clear player env face cache, we need some signal framework
3361 # for this (global event?) 3669 # for this (global event?)
3376} 3684}
3377 3685
3378sub reload_archetypes { 3686sub reload_archetypes {
3379 load_resource_file "$DATADIR/archetypes" 3687 load_resource_file "$DATADIR/archetypes"
3380 or die "unable to load archetypes\n"; 3688 or die "unable to load archetypes\n";
3689
3690 set_face "res/skill_info" => FT_RSRC,
3691 JSON::XS->new->utf8->canonical->encode (
3692 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3693 );
3694 set_face "res/spell_paths" => FT_RSRC,
3695 JSON::XS->new->utf8->canonical->encode (
3696 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3697 );
3381} 3698}
3382 3699
3383sub reload_treasures { 3700sub reload_treasures {
3384 load_resource_file "$DATADIR/treasures" 3701 load_resource_file "$DATADIR/treasures"
3385 or die "unable to load treasurelists\n"; 3702 or die "unable to load treasurelists\n";
3386} 3703}
3387 3704
3705sub reload_sound {
3706 trace "loading sound config from $DATADIR/sound\n";
3707
3708 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3709
3710 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3711 my $sound = $soundconf->{compat}[$_]
3712 or next;
3713
3714 my $face = cf::face::find "sound/$sound->[1]";
3715 cf::sound::set $sound->[0] => $face;
3716 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3717 }
3718
3719 while (my ($k, $v) = each %{$soundconf->{event}}) {
3720 my $face = cf::face::find "sound/$v";
3721 cf::sound::set $k => $face;
3722 }
3723}
3724
3388sub reload_resources { 3725sub reload_resources {
3389 warn "reloading resource files...\n"; 3726 trace "reloading resource files...\n";
3390 3727
3728 reload_materials;
3391 reload_facedata; 3729 reload_facedata;
3730 reload_exp_table;
3731 reload_sound;
3392 reload_archetypes; 3732 reload_archetypes;
3393 reload_regions; 3733 reload_regions;
3394 reload_treasures; 3734 reload_treasures;
3395 3735
3396 warn "finished reloading resource files\n"; 3736 trace "finished reloading resource files\n";
3397} 3737}
3398 3738
3399sub reload_config { 3739sub reload_config {
3400 warn "reloading config file...\n"; 3740 trace "reloading config file...\n";
3401 3741
3402 open my $fh, "<:utf8", "$CONFDIR/config" 3742 my $config = load_file "$CONFDIR/config";
3403 or return; 3743 utf8::decode $config;
3744 *CFG = decode_yaml $config;
3404 3745
3405 local $/;
3406 *CFG = YAML::XS::Load scalar <$fh>;
3407
3408 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3746 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3409 3747
3410 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3748 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3411 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3749 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3412 3750
3413 if (exists $CFG{mlockall}) { 3751 if (exists $CFG{mlockall}) {
3415 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3753 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3416 and die "WARNING: m(un)lockall failed: $!\n"; 3754 and die "WARNING: m(un)lockall failed: $!\n";
3417 }; 3755 };
3418 warn $@ if $@; 3756 warn $@ if $@;
3419 } 3757 }
3420
3421 warn "finished reloading resource files\n";
3422} 3758}
3423 3759
3424sub pidfile() { 3760sub pidfile() {
3425 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3761 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3426 or die "$PIDFILE: $!"; 3762 or die "$PIDFILE: $!";
3439 seek $fh, 0, 0; 3775 seek $fh, 0, 0;
3440 print $fh $$; 3776 print $fh $$;
3441} 3777}
3442 3778
3443sub main_loop { 3779sub main_loop {
3444 warn "EV::loop starting\n"; 3780 trace "EV::loop starting\n";
3445 if (1) { 3781 if (1) {
3446 EV::loop; 3782 EV::loop;
3447 } 3783 }
3448 warn "EV::loop returned\n"; 3784 trace "EV::loop returned\n";
3449 goto &main_loop unless $REALLY_UNLOOP; 3785 goto &main_loop unless $REALLY_UNLOOP;
3450} 3786}
3451 3787
3452sub main { 3788sub main {
3453 cf::init_globals; # initialise logging 3789 cf::init_globals; # initialise logging
3454 3790
3455 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3791 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3456 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3792 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3457 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3793 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3458 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3794 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3459 3795
3460 cf::init_experience;
3461 cf::init_anim;
3462 cf::init_attackmess;
3463 cf::init_dynamic;
3464
3465 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3796 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3466 3797
3467 # we must not ever block the main coroutine 3798 # we must not ever block the main coroutine
3468 local $Coro::idle = sub { 3799 $Coro::idle = sub {
3469 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3800 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3470 (async { 3801 (async {
3471 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3802 $Coro::current->{desc} = "IDLE BUG HANDLER";
3472 EV::loop EV::LOOP_ONESHOT; 3803 EV::loop EV::LOOP_ONESHOT;
3473 })->prio (Coro::PRIO_MAX); 3804 })->prio (Coro::PRIO_MAX);
3474 }; 3805 };
3475 3806
3476 evthread_start IO::AIO::poll_fileno; 3807 evthread_start IO::AIO::poll_fileno;
3477 3808
3478 cf::sync_job { 3809 cf::sync_job {
3810 cf::incloader::init ();
3811
3812 db_init;
3813
3814 cf::init_anim;
3815 cf::init_attackmess;
3816 cf::init_dynamic;
3817
3818 cf::load_settings;
3819
3479 reload_resources; 3820 reload_resources;
3480 reload_config; 3821 reload_config;
3481 db_init;
3482 3822
3483 cf::load_settings;
3484 cf::load_materials;
3485 cf::init_uuid; 3823 cf::init_uuid;
3486 cf::init_signals; 3824 cf::init_signals;
3487 cf::init_commands;
3488 cf::init_skills; 3825 cf::init_skills;
3489 3826
3490 cf::init_beforeplay; 3827 cf::init_beforeplay;
3491 3828
3492 atomic; 3829 atomic;
3497 3834
3498 # no (long-running) fork's whatsoever before this point(!) 3835 # no (long-running) fork's whatsoever before this point(!)
3499 use POSIX (); 3836 use POSIX ();
3500 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3837 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3501 3838
3502 (pop @POST_INIT)->(0) while @POST_INIT; 3839 cf::_post_init 0;
3503 }; 3840 };
3504 3841
3842 cf::object::thawer::errors_are_fatal 0;
3843 info "parse errors in files are no longer fatal from this point on.\n";
3844
3845 AE::postpone {
3846 undef &main; # free gobs of memory :)
3847 };
3848
3505 main_loop; 3849 goto &main_loop;
3506} 3850}
3507 3851
3508############################################################################# 3852#############################################################################
3509# initialisation and cleanup 3853# initialisation and cleanup
3510 3854
3511# install some emergency cleanup handlers 3855# install some emergency cleanup handlers
3512BEGIN { 3856BEGIN {
3513 our %SIGWATCHER = (); 3857 our %SIGWATCHER = ();
3514 for my $signal (qw(INT HUP TERM)) { 3858 for my $signal (qw(INT HUP TERM)) {
3515 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3859 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3516 cf::cleanup "SIG$signal"; 3860 cf::cleanup "SIG$signal";
3517 }; 3861 };
3518 } 3862 }
3519} 3863}
3520 3864
3521sub write_runtime_sync { 3865sub write_runtime_sync {
3866 my $t0 = AE::time;
3867
3522 # first touch the runtime file to show we are still running: 3868 # first touch the runtime file to show we are still running:
3523 # the fsync below can take a very very long time. 3869 # the fsync below can take a very very long time.
3524 3870
3525 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3871 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3526 3872
3527 my $guard = cf::lock_acquire "write_runtime"; 3873 my $guard = cf::lock_acquire "write_runtime";
3528 3874
3529 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3875 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3530 or return; 3876 or return;
3531 3877
3532 my $value = $cf::RUNTIME + 90 + 10; 3878 my $value = $cf::RUNTIME + 90 + 10;
3533 # 10 is the runtime save interval, for a monotonic clock 3879 # 10 is the runtime save interval, for a monotonic clock
3534 # 60 allows for the watchdog to kill the server. 3880 # 60 allows for the watchdog to kill the server.
3547 or return; 3893 or return;
3548 3894
3549 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3895 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3550 and return; 3896 and return;
3551 3897
3552 warn "runtime file written.\n"; 3898 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3553 3899
3554 1 3900 1
3555} 3901}
3556 3902
3557our $uuid_lock; 3903our $uuid_lock;
3569 or return; 3915 or return;
3570 3916
3571 my $value = uuid_seq uuid_cur; 3917 my $value = uuid_seq uuid_cur;
3572 3918
3573 unless ($value) { 3919 unless ($value) {
3574 warn "cowardly refusing to write zero uuid value!\n"; 3920 info "cowardly refusing to write zero uuid value!\n";
3575 return; 3921 return;
3576 } 3922 }
3577 3923
3578 my $value = uuid_str $value + $uuid_skip; 3924 my $value = uuid_str $value + $uuid_skip;
3579 $uuid_skip = 0; 3925 $uuid_skip = 0;
3589 or return; 3935 or return;
3590 3936
3591 aio_rename "$uuid~", $uuid 3937 aio_rename "$uuid~", $uuid
3592 and return; 3938 and return;
3593 3939
3594 warn "uuid file written ($value).\n"; 3940 trace "uuid file written ($value).\n";
3595 3941
3596 1 3942 1
3597 3943
3598} 3944}
3599 3945
3605} 3951}
3606 3952
3607sub emergency_save() { 3953sub emergency_save() {
3608 my $freeze_guard = cf::freeze_mainloop; 3954 my $freeze_guard = cf::freeze_mainloop;
3609 3955
3610 warn "emergency_perl_save: enter\n"; 3956 info "emergency_perl_save: enter\n";
3957
3958 # this is a trade-off: we want to be very quick here, so
3959 # save all maps without fsync, and later call a global sync
3960 # (which in turn might be very very slow)
3961 local $USE_FSYNC = 0;
3611 3962
3612 cf::sync_job { 3963 cf::sync_job {
3613 # this is a trade-off: we want to be very quick here, so 3964 cf::write_runtime_sync; # external watchdog should not bark
3614 # save all maps without fsync, and later call a global sync
3615 # (which in turn might be very very slow)
3616 local $USE_FSYNC = 0;
3617 3965
3618 # use a peculiar iteration method to avoid tripping on perl 3966 # use a peculiar iteration method to avoid tripping on perl
3619 # refcount bugs in for. also avoids problems with players 3967 # refcount bugs in for. also avoids problems with players
3620 # and maps saved/destroyed asynchronously. 3968 # and maps saved/destroyed asynchronously.
3621 warn "emergency_perl_save: begin player save\n"; 3969 info "emergency_perl_save: begin player save\n";
3622 for my $login (keys %cf::PLAYER) { 3970 for my $login (keys %cf::PLAYER) {
3623 my $pl = $cf::PLAYER{$login} or next; 3971 my $pl = $cf::PLAYER{$login} or next;
3624 $pl->valid or next; 3972 $pl->valid or next;
3625 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3973 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3626 $pl->save; 3974 $pl->save;
3627 } 3975 }
3628 warn "emergency_perl_save: end player save\n"; 3976 info "emergency_perl_save: end player save\n";
3629 3977
3978 cf::write_runtime_sync; # external watchdog should not bark
3979
3630 warn "emergency_perl_save: begin map save\n"; 3980 info "emergency_perl_save: begin map save\n";
3631 for my $path (keys %cf::MAP) { 3981 for my $path (keys %cf::MAP) {
3632 my $map = $cf::MAP{$path} or next; 3982 my $map = $cf::MAP{$path} or next;
3633 $map->valid or next; 3983 $map->valid or next;
3634 $map->save; 3984 $map->save;
3635 } 3985 }
3636 warn "emergency_perl_save: end map save\n"; 3986 info "emergency_perl_save: end map save\n";
3637 3987
3988 cf::write_runtime_sync; # external watchdog should not bark
3989
3638 warn "emergency_perl_save: begin database checkpoint\n"; 3990 info "emergency_perl_save: begin database checkpoint\n";
3639 BDB::db_env_txn_checkpoint $DB_ENV; 3991 BDB::db_env_txn_checkpoint $DB_ENV;
3640 warn "emergency_perl_save: end database checkpoint\n"; 3992 info "emergency_perl_save: end database checkpoint\n";
3641 3993
3642 warn "emergency_perl_save: begin write uuid\n"; 3994 info "emergency_perl_save: begin write uuid\n";
3643 write_uuid_sync 1; 3995 write_uuid_sync 1;
3644 warn "emergency_perl_save: end write uuid\n"; 3996 info "emergency_perl_save: end write uuid\n";
3997
3998 cf::write_runtime_sync; # external watchdog should not bark
3999
4000 trace "emergency_perl_save: syncing database to disk";
4001 BDB::db_env_txn_checkpoint $DB_ENV;
4002
4003 info "emergency_perl_save: starting sync\n";
4004 IO::AIO::aio_sync sub {
4005 info "emergency_perl_save: finished sync\n";
4006 };
4007
4008 cf::write_runtime_sync; # external watchdog should not bark
4009
4010 trace "emergency_perl_save: flushing outstanding aio requests";
4011 while (IO::AIO::nreqs || BDB::nreqs) {
4012 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4013 }
4014
4015 cf::write_runtime_sync; # external watchdog should not bark
3645 }; 4016 };
3646 4017
3647 warn "emergency_perl_save: starting sync()\n";
3648 IO::AIO::aio_sync sub {
3649 warn "emergency_perl_save: finished sync()\n";
3650 };
3651
3652 warn "emergency_perl_save: leave\n"; 4018 info "emergency_perl_save: leave\n";
3653} 4019}
3654 4020
3655sub post_cleanup { 4021sub post_cleanup {
3656 my ($make_core) = @_; 4022 my ($make_core) = @_;
3657 4023
4024 IO::AIO::flush;
4025
3658 warn Carp::longmess "post_cleanup backtrace" 4026 error Carp::longmess "post_cleanup backtrace"
3659 if $make_core; 4027 if $make_core;
3660 4028
3661 my $fh = pidfile; 4029 my $fh = pidfile;
3662 unlink $PIDFILE if <$fh> == $$; 4030 unlink $PIDFILE if <$fh> == $$;
3663} 4031}
3683 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4051 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3684 for my $name (keys %$leaf_symtab) { 4052 for my $name (keys %$leaf_symtab) {
3685 _gv_clear *{"$pkg$name"}; 4053 _gv_clear *{"$pkg$name"};
3686# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4054# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3687 } 4055 }
3688 warn "cleared package $pkg\n";#d#
3689} 4056}
3690 4057
3691sub do_reload_perl() { 4058sub do_reload_perl() {
3692 # can/must only be called in main 4059 # can/must only be called in main
3693 if ($Coro::current != $Coro::main) { 4060 unless (in_main) {
3694 warn "can only reload from main coroutine"; 4061 error "can only reload from main coroutine";
3695 return; 4062 return;
3696 } 4063 }
3697 4064
3698 return if $RELOAD++; 4065 return if $RELOAD++;
3699 4066
3700 my $t1 = EV::time; 4067 my $t1 = AE::time;
3701 4068
3702 while ($RELOAD) { 4069 while ($RELOAD) {
3703 warn "reloading..."; 4070 cf::get_slot 0.1, -1, "reload_perl";
4071 info "perl_reload: reloading...";
3704 4072
3705 warn "entering sync_job"; 4073 trace "perl_reload: entering sync_job";
3706 4074
3707 cf::sync_job { 4075 cf::sync_job {
3708 cf::write_runtime_sync; # external watchdog should not bark
3709 cf::emergency_save; 4076 #cf::emergency_save;
3710 cf::write_runtime_sync; # external watchdog should not bark
3711 4077
3712 warn "syncing database to disk";
3713 BDB::db_env_txn_checkpoint $DB_ENV;
3714
3715 # if anything goes wrong in here, we should simply crash as we already saved
3716
3717 warn "flushing outstanding aio requests";
3718 while (IO::AIO::nreqs || BDB::nreqs) {
3719 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3720 }
3721
3722 warn "cancelling all extension coros"; 4078 trace "perl_reload: cancelling all extension coros";
3723 $_->cancel for values %EXT_CORO; 4079 $_->cancel for values %EXT_CORO;
3724 %EXT_CORO = (); 4080 %EXT_CORO = ();
3725 4081
3726 warn "removing commands"; 4082 trace "perl_reload: removing commands";
3727 %COMMAND = (); 4083 %COMMAND = ();
3728 4084
3729 warn "removing ext/exti commands"; 4085 trace "perl_reload: removing ext/exti commands";
3730 %EXTCMD = (); 4086 %EXTCMD = ();
3731 %EXTICMD = (); 4087 %EXTICMD = ();
3732 4088
3733 warn "unloading/nuking all extensions"; 4089 trace "perl_reload: unloading/nuking all extensions";
3734 for my $pkg (@EXTS) { 4090 for my $pkg (@EXTS) {
3735 warn "... unloading $pkg"; 4091 trace "... unloading $pkg";
3736 4092
3737 if (my $cb = $pkg->can ("unload")) { 4093 if (my $cb = $pkg->can ("unload")) {
3738 eval { 4094 eval {
3739 $cb->($pkg); 4095 $cb->($pkg);
3740 1 4096 1
3741 } or warn "$pkg unloaded, but with errors: $@"; 4097 } or error "$pkg unloaded, but with errors: $@";
3742 } 4098 }
3743 4099
3744 warn "... clearing $pkg"; 4100 trace "... clearing $pkg";
3745 clear_package $pkg; 4101 clear_package $pkg;
3746 } 4102 }
3747 4103
3748 warn "unloading all perl modules loaded from $LIBDIR"; 4104 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3749 while (my ($k, $v) = each %INC) { 4105 while (my ($k, $v) = each %INC) {
3750 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4106 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3751 4107
3752 warn "... unloading $k"; 4108 trace "... unloading $k";
3753 delete $INC{$k}; 4109 delete $INC{$k};
3754 4110
3755 $k =~ s/\.pm$//; 4111 $k =~ s/\.pm$//;
3756 $k =~ s/\//::/g; 4112 $k =~ s/\//::/g;
3757 4113
3760 } 4116 }
3761 4117
3762 clear_package $k; 4118 clear_package $k;
3763 } 4119 }
3764 4120
3765 warn "getting rid of safe::, as good as possible"; 4121 trace "perl_reload: getting rid of safe::, as good as possible";
3766 clear_package "safe::$_" 4122 clear_package "safe::$_"
3767 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4123 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3768 4124
3769 warn "unloading cf.pm \"a bit\""; 4125 trace "perl_reload: unloading cf.pm \"a bit\"";
3770 delete $INC{"cf.pm"}; 4126 delete $INC{"cf.pm"};
3771 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4127 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3772 4128
3773 # don't, removes xs symbols, too, 4129 # don't, removes xs symbols, too,
3774 # and global variables created in xs 4130 # and global variables created in xs
3775 #clear_package __PACKAGE__; 4131 #clear_package __PACKAGE__;
3776 4132
3777 warn "unload completed, starting to reload now"; 4133 info "perl_reload: unload completed, starting to reload now";
3778 4134
3779 warn "reloading cf.pm"; 4135 trace "perl_reload: reloading cf.pm";
3780 require cf; 4136 require cf;
3781 cf::_connect_to_perl_1; 4137 cf::_connect_to_perl_1;
3782 4138
3783 warn "loading config and database again"; 4139 trace "perl_reload: loading config and database again";
3784 cf::reload_config; 4140 cf::reload_config;
3785 4141
3786 warn "loading extensions"; 4142 trace "perl_reload: loading extensions";
3787 cf::load_extensions; 4143 cf::load_extensions;
3788 4144
3789 if ($REATTACH_ON_RELOAD) { 4145 if ($REATTACH_ON_RELOAD) {
3790 warn "reattaching attachments to objects/players"; 4146 trace "perl_reload: reattaching attachments to objects/players";
3791 _global_reattach; # objects, sockets 4147 _global_reattach; # objects, sockets
3792 warn "reattaching attachments to maps"; 4148 trace "perl_reload: reattaching attachments to maps";
3793 reattach $_ for values %MAP; 4149 reattach $_ for values %MAP;
3794 warn "reattaching attachments to players"; 4150 trace "perl_reload: reattaching attachments to players";
3795 reattach $_ for values %PLAYER; 4151 reattach $_ for values %PLAYER;
3796 } 4152 }
3797 4153
3798 warn "running post_init jobs"; 4154 cf::_post_init 1;
3799 (pop @POST_INIT)->(1) while @POST_INIT;
3800 4155
3801 warn "leaving sync_job"; 4156 trace "perl_reload: leaving sync_job";
3802 4157
3803 1 4158 1
3804 } or do { 4159 } or do {
3805 warn $@; 4160 error $@;
3806 cf::cleanup "error while reloading, exiting."; 4161 cf::cleanup "perl_reload: error, exiting.";
3807 }; 4162 };
3808 4163
3809 warn "reloaded";
3810 --$RELOAD; 4164 --$RELOAD;
3811 } 4165 }
3812 4166
3813 $t1 = EV::time - $t1; 4167 $t1 = AE::time - $t1;
3814 warn "reload completed in ${t1}s\n"; 4168 info "perl_reload: completed in ${t1}s\n";
3815}; 4169};
3816 4170
3817our $RELOAD_WATCHER; # used only during reload 4171our $RELOAD_WATCHER; # used only during reload
3818 4172
3819sub reload_perl() { 4173sub reload_perl() {
3821 # coro crashes during coro_state_free->destroy here. 4175 # coro crashes during coro_state_free->destroy here.
3822 4176
3823 $RELOAD_WATCHER ||= cf::async { 4177 $RELOAD_WATCHER ||= cf::async {
3824 Coro::AIO::aio_wait cache_extensions; 4178 Coro::AIO::aio_wait cache_extensions;
3825 4179
3826 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4180 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3827 do_reload_perl; 4181 do_reload_perl;
3828 undef $RELOAD_WATCHER; 4182 undef $RELOAD_WATCHER;
3829 }; 4183 };
3830 }; 4184 };
3831} 4185}
3840 reload_perl; 4194 reload_perl;
3841 }; 4195 };
3842 } 4196 }
3843}; 4197};
3844 4198
3845unshift @INC, $LIBDIR; 4199#############################################################################
3846 4200
3847my $bug_warning = 0; 4201my $bug_warning = 0;
3848 4202
3849our @WAIT_FOR_TICK;
3850our @WAIT_FOR_TICK_BEGIN;
3851
3852sub wait_for_tick { 4203sub wait_for_tick() {
3853 return if tick_inhibit || $Coro::current == $Coro::main; 4204 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3854 4205
3855 my $signal = new Coro::Signal; 4206 $WAIT_FOR_TICK->wait;
3856 push @WAIT_FOR_TICK, $signal;
3857 $signal->wait;
3858} 4207}
3859 4208
3860sub wait_for_tick_begin { 4209sub wait_for_tick_begin() {
3861 return if tick_inhibit || $Coro::current == $Coro::main; 4210 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3862 4211
3863 my $signal = new Coro::Signal; 4212 my $signal = new Coro::Signal;
3864 push @WAIT_FOR_TICK_BEGIN, $signal; 4213 push @WAIT_FOR_TICK_BEGIN, $signal;
3865 $signal->wait; 4214 $signal->wait;
3866} 4215}
3870 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4219 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3871 unless ++$bug_warning > 10; 4220 unless ++$bug_warning > 10;
3872 return; 4221 return;
3873 } 4222 }
3874 4223
3875 cf::server_tick; # one server iteration 4224 cf::one_tick; # one server iteration
4225
4226 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3876 4227
3877 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4228 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3878 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4229 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3879 Coro::async_pool { 4230 Coro::async_pool {
3880 $Coro::current->{desc} = "runtime saver"; 4231 $Coro::current->{desc} = "runtime saver";
3881 write_runtime_sync 4232 write_runtime_sync
3882 or warn "ERROR: unable to write runtime file: $!"; 4233 or error "ERROR: unable to write runtime file: $!";
3883 }; 4234 };
3884 } 4235 }
3885 4236
3886 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4237 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3887 $sig->send; 4238 $sig->send;
3888 } 4239 }
3889 while (my $sig = shift @WAIT_FOR_TICK) { 4240 $WAIT_FOR_TICK->broadcast;
3890 $sig->send;
3891 }
3892 4241
3893 $LOAD = ($NOW - $TICK_START) / $TICK; 4242 $LOAD = ($NOW - $TICK_START) / $TICK;
3894 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4243 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3895 4244
3896 if (0) { 4245 if (0) {
3897 if ($NEXT_TICK) { 4246 if ($NEXT_TICK) {
3898 my $jitter = $TICK_START - $NEXT_TICK; 4247 my $jitter = $TICK_START - $NEXT_TICK;
3899 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4248 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3900 warn "jitter $JITTER\n";#d# 4249 debug "jitter $JITTER\n";#d#
3901 } 4250 }
3902 } 4251 }
3903} 4252}
3904 4253
3905{ 4254{
3906 # configure BDB 4255 # configure BDB
4256 info "initialising database";
3907 4257
3908 BDB::min_parallel 8; 4258 BDB::min_parallel 16;
3909 BDB::max_poll_reqs $TICK * 0.1; 4259 BDB::max_poll_reqs $TICK * 0.1;
3910 $AnyEvent::BDB::WATCHER->priority (1); 4260 #$AnyEvent::BDB::WATCHER->priority (1);
3911 4261
3912 unless ($DB_ENV) { 4262 unless ($DB_ENV) {
3913 $DB_ENV = BDB::db_env_create; 4263 $DB_ENV = BDB::db_env_create;
3914 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4264 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3915 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4265 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3940 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4290 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3941 }; 4291 };
3942 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4292 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3943 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4293 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3944 }; 4294 };
4295
4296 info "database initialised";
3945} 4297}
3946 4298
3947{ 4299{
3948 # configure IO::AIO 4300 # configure IO::AIO
3949 4301
4302 info "initialising aio";
3950 IO::AIO::min_parallel 8; 4303 IO::AIO::min_parallel 8;
3951 IO::AIO::max_poll_time $TICK * 0.1; 4304 IO::AIO::max_poll_time $TICK * 0.1;
3952 undef $AnyEvent::AIO::WATCHER; 4305 undef $AnyEvent::AIO::WATCHER;
4306 info "aio initialised";
3953} 4307}
3954 4308
3955my $_log_backtrace; 4309our $_log_backtrace;
4310our $_log_backtrace_last;
3956 4311
3957sub _log_backtrace { 4312sub _log_backtrace {
3958 my ($msg, @addr) = @_; 4313 my ($msg, @addr) = @_;
3959 4314
3960 $msg =~ s/\n//; 4315 $msg =~ s/\n$//;
3961 4316
4317 if ($_log_backtrace_last eq $msg) {
4318 LOG llevInfo, "[ABT] $msg\n";
4319 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3962 # limit the # of concurrent backtraces 4320 # limit the # of concurrent backtraces
3963 if ($_log_backtrace < 2) { 4321 } elsif ($_log_backtrace < 2) {
4322 $_log_backtrace_last = $msg;
3964 ++$_log_backtrace; 4323 ++$_log_backtrace;
3965 my $perl_bt = Carp::longmess $msg; 4324 my $perl_bt = Carp::longmess $msg;
3966 async { 4325 async {
3967 $Coro::current->{desc} = "abt $msg"; 4326 $Coro::current->{desc} = "abt $msg";
3968 4327
3988 LOG llevInfo, "[ABT] $_\n" for @bt; 4347 LOG llevInfo, "[ABT] $_\n" for @bt;
3989 --$_log_backtrace; 4348 --$_log_backtrace;
3990 }; 4349 };
3991 } else { 4350 } else {
3992 LOG llevInfo, "[ABT] $msg\n"; 4351 LOG llevInfo, "[ABT] $msg\n";
3993 LOG llevInfo, "[ABT] [suppressed]\n"; 4352 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3994 } 4353 }
3995} 4354}
3996 4355
3997# load additional modules 4356# load additional modules
3998require "cf/$_.pm" for @EXTRA_MODULES; 4357require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines