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.455 by root, Sat Sep 27 08:17:40 2008 UTC vs.
Revision 1.569 by root, Wed May 4 07:36:40 2011 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your 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 GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# 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>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use common::sense;
25use utf8;
26use strict "vars", "subs";
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
35use Carp ();
36 36
37use Guard ();
37use Coro (); 38use Coro ();
38use Coro::State; 39use Coro::State;
39use Coro::Handle; 40use Coro::Handle;
40use Coro::EV; 41use Coro::EV;
41use Coro::AnyEvent; 42use Coro::AnyEvent;
42use Coro::Timer; 43use Coro::Timer;
43use Coro::Signal; 44use Coro::Signal;
44use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
45use Coro::AnyEvent; 47use Coro::AnyEvent;
46use Coro::AIO; 48use Coro::AIO;
47use Coro::BDB 1.6; 49use Coro::BDB 1.6;
48use Coro::Storable; 50use Coro::Storable;
49use Coro::Util (); 51use Coro::Util ();
50 52
51use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
52use BDB (); 54use BDB ();
53use Data::Dumper; 55use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 56use Fcntl;
56use YAML (); 57use YAML::XS ();
57use IO::AIO (); 58use IO::AIO ();
58use Time::HiRes; 59use Time::HiRes;
59use Compress::LZF; 60use Compress::LZF;
60use Digest::MD5 (); 61use Digest::MD5 ();
61 62
70 71
71# make sure c-lzf reinitialises itself 72# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
73Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
74 75
76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
78
75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
76 82
77our %COMMAND = (); 83our %COMMAND = ();
78our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
79 85
80our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
83our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
84our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
85 91
86our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
87our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
88 96
89our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
90our $DATADIR = datadir; 99our $DATADIR = datadir;
91our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
92our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
93our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
94our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
95our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
96our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
97our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
98our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
99our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
102 112
103our %RESOURCE; 113our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
104 120
105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107our $NEXT_TICK; 123our $NEXT_TICK;
108our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
109 125
110our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
112our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
113our $DB_ENV; 129our $DB_ENV;
114 130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
115our %CFG; 133our %CFG;
116 134
117our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
118our $RUNTIME; 136our $RUNTIME;
119our $NOW; 137our $NOW;
129our $LOADAVG; # same thing, but with alpha-smoothing 147our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter 148our $JITTER; # average jitter
131our $TICK_START; # for load detecting purposes 149our $TICK_START; # for load detecting purposes
132 150
133our @POST_INIT; 151our @POST_INIT;
152
153our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
154our $REALLY_UNLOOP; # never set to true, please :)
134 155
135binmode STDOUT; 156binmode STDOUT;
136binmode STDERR; 157binmode STDERR;
137 158
138# read virtual server time, if available 159# read virtual server time, if available
140 open my $fh, "<", $RUNTIMEFILE 161 open my $fh, "<", $RUNTIMEFILE
141 or die "unable to read $RUNTIMEFILE file: $!"; 162 or die "unable to read $RUNTIMEFILE file: $!";
142 $RUNTIME = <$fh> + 0.; 163 $RUNTIME = <$fh> + 0.;
143} 164}
144 165
166eval "sub TICK() { $TICK } 1" or die;
167
145mkdir $_ 168mkdir $_
146 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 169 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
147 170
148our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
149 172
150sub cf::map::normalise; 173sub cf::map::normalise;
174
175sub in_main() {
176 $Coro::current == $Coro::main
177}
178
179#############################################################################
180
181%REFLECT = ();
182for (@REFLECT) {
183 my $reflect = JSON::XS::decode_json $_;
184 $REFLECT{$reflect->{class}} = $reflect;
185}
186
187# this is decidedly evil
188$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
151 189
152############################################################################# 190#############################################################################
153 191
154=head2 GLOBAL VARIABLES 192=head2 GLOBAL VARIABLES
155 193
197from wherever your confdir points to. 235from wherever your confdir points to.
198 236
199=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
200 238
201These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 239These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
202returns directly I<after> the tick processing (and consequently, can only wake one process 240returns directly I<after> the tick processing (and consequently, can only wake one thread
203per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 241per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
204 242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
247
205=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
206 249
207This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
208C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 251C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
209that call. 252that call.
210 253
254=item %cf::REFLECT
255
256Contains, for each (C++) class name, a hash reference with information
257about object members (methods, scalars, arrays and flags) and other
258metadata, which is useful for introspection.
259
211=back 260=back
212 261
213=cut 262=cut
214 263
215BEGIN { 264sub error(@) { LOG llevError, join "", @_ }
216 *CORE::GLOBAL::warn = sub { 265sub warn (@) { LOG llevWarn , join "", @_ }
266sub info (@) { LOG llevInfo , join "", @_ }
267sub debug(@) { LOG llevDebug, join "", @_ }
268sub trace(@) { LOG llevTrace, join "", @_ }
269
270$Coro::State::WARNHOOK = sub {
217 my $msg = join "", @_; 271 my $msg = join "", @_;
218 272
219 $msg .= "\n" 273 $msg .= "\n"
220 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
221 275
222 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 276 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
223 277
224 LOG llevError, $msg; 278 LOG llevWarn, $msg;
225 }; 279};
226}
227 280
228$Coro::State::DIEHOOK = sub { 281$Coro::State::DIEHOOK = sub {
229 return unless $^S eq 0; # "eq", not "==" 282 return unless $^S eq 0; # "eq", not "=="
230 283
231 if ($Coro::current == $Coro::main) {#d# 284 error Carp::longmess $_[0];
285
286 if (in_main) {#d#
232 warn "DIEHOOK called in main context, Coro bug?\n";#d# 287 error "DIEHOOK called in main context, Coro bug?\n";#d#
233 return;#d# 288 return;#d#
234 }#d# 289 }#d#
235 290
236 # kill coroutine otherwise 291 # kill coroutine otherwise
237 warn Carp::longmess $_[0];
238 Coro::terminate 292 Coro::terminate
239}; 293};
240
241$SIG{__DIE__} = sub { }; #d#?
242 294
243@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 295@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
244@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 296@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
245@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 297@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
246@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 298@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
260)) { 312)) {
261 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
262} 314}
263 315
264$EV::DIED = sub { 316$EV::DIED = sub {
265 warn "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
266}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
267 324
268############################################################################# 325#############################################################################
269 326
270=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
271 328
292 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 349 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
293 $d 350 $d
294 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
295} 352}
296 353
354=item $scalar = load_file $path
355
356Loads the given file from path and returns its contents. Croaks on error
357and can block.
358
359=cut
360
361sub load_file($) {
362 0 <= aio_load $_[0], my $data
363 or Carp::croak "$_[0]: $!";
364
365 $data
366}
367
297=item $ref = cf::decode_json $json 368=item $ref = cf::decode_json $json
298 369
299Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
300 371
301=item $json = cf::encode_json $ref 372=item $json = cf::encode_json $ref
307our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 378our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
308 379
309sub encode_json($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
310sub decode_json($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
311 382
383=item $ref = cf::decode_storable $scalar
384
385Same as Coro::Storable::thaw, so blocks.
386
387=cut
388
389BEGIN { *decode_storable = \&Coro::Storable::thaw }
390
391=item $ref = cf::decode_yaml $scalar
392
393Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
394
395=cut
396
397sub decode_yaml($) {
398 fork_call { YAML::XS::Load $_[0] } @_
399}
400
401=item $scalar = cf::unlzf $scalar
402
403Same as Compress::LZF::compress, but takes server ticks into account, so
404blocks.
405
406=cut
407
408sub unlzf($) {
409 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
410 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
411 Compress::LZF::decompress $_[0]
412}
413
312=item cf::post_init { BLOCK } 414=item cf::post_init { BLOCK }
313 415
314Execute the given codeblock, I<after> all extensions have been (re-)loaded, 416Execute the given codeblock, I<after> all extensions have been (re-)loaded,
315but I<before> the server starts ticking again. 417but I<before> the server starts ticking again.
316 418
317The cdoeblock will have a single boolean argument to indicate whether this 419The codeblock will have a single boolean argument to indicate whether this
318is a reload or not. 420is a reload or not.
319 421
320=cut 422=cut
321 423
322sub post_init(&) { 424sub post_init(&) {
323 push @POST_INIT, shift; 425 push @POST_INIT, shift;
324} 426}
325 427
428sub _post_init {
429 trace "running post_init jobs";
430
431 # run them in parallel...
432
433 my @join;
434
435 while () {
436 push @join, map &Coro::async ($_, 0), @POST_INIT;
437 @POST_INIT = ();
438
439 @join or last;
440
441 (pop @join)->join;
442 }
443}
444
326=item cf::lock_wait $string 445=item cf::lock_wait $string
327 446
328Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
329 448
330=item my $lock = cf::lock_acquire $string 449=item my $lock = cf::lock_acquire $string
331 450
332Wait until the given lock is available and then acquires it and returns 451Wait until the given lock is available and then acquires it and returns
333a Coro::guard object. If the guard object gets destroyed (goes out of scope, 452a L<Guard> object. If the guard object gets destroyed (goes out of scope,
334for example when the coroutine gets canceled), the lock is automatically 453for example when the coroutine gets canceled), the lock is automatically
335returned. 454returned.
336 455
337Locks are *not* recursive, locking from the same coro twice results in a 456Locks are *not* recursive, locking from the same coro twice results in a
338deadlocked coro. 457deadlocked coro.
344 463
345Return true if the lock is currently active, i.e. somebody has locked it. 464Return true if the lock is currently active, i.e. somebody has locked it.
346 465
347=cut 466=cut
348 467
349our %LOCK; 468our $LOCKS = new Coro::SemaphoreSet;
350our %LOCKER;#d#
351 469
352sub lock_wait($) { 470sub lock_wait($) {
353 my ($key) = @_; 471 $LOCKS->wait ($_[0]);
354
355 if ($LOCKER{$key} == $Coro::current) {#d#
356 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
357 return;#d#
358 }#d#
359
360 # wait for lock, if any
361 while ($LOCK{$key}) {
362 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
363 push @{ $LOCK{$key} }, $Coro::current;
364 Coro::schedule;
365 }
366} 472}
367 473
368sub lock_acquire($) { 474sub lock_acquire($) {
369 my ($key) = @_; 475 $LOCKS->guard ($_[0])
370
371 # wait, to be sure we are not locked
372 lock_wait $key;
373
374 $LOCK{$key} = [];
375 $LOCKER{$key} = $Coro::current;#d#
376
377 Coro::guard {
378 delete $LOCKER{$key};#d#
379 # wake up all waiters, to be on the safe side
380 $_->ready for @{ delete $LOCK{$key} };
381 }
382} 476}
383 477
384sub lock_active($) { 478sub lock_active($) {
385 my ($key) = @_; 479 $LOCKS->count ($_[0]) < 1
386
387 ! ! $LOCK{$key}
388} 480}
389 481
390sub freeze_mainloop { 482sub freeze_mainloop {
391 tick_inhibit_inc; 483 tick_inhibit_inc;
392 484
393 Coro::guard \&tick_inhibit_dec; 485 &Guard::guard (\&tick_inhibit_dec);
394} 486}
395 487
396=item cf::periodic $interval, $cb 488=item cf::periodic $interval, $cb
397 489
398Like EV::periodic, but randomly selects a starting point so that the actions 490Like EV::periodic, but randomly selects a starting point so that the actions
399get spread over timer. 491get spread over time.
400 492
401=cut 493=cut
402 494
403sub periodic($$) { 495sub periodic($$) {
404 my ($interval, $cb) = @_; 496 my ($interval, $cb) = @_;
408 EV::periodic $start, $interval, 0, $cb 500 EV::periodic $start, $interval, 0, $cb
409} 501}
410 502
411=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
412 504
413Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
414This call blocks and returns only when you have at least C<$time> seconds 506(default: 0): This call blocks and returns only when you have at least
415of cpu time till the next tick. The slot is only valid till the next cede. 507C<$time> seconds of cpu time till the next tick. The slot is only valid
508till the next cede.
509
510Background jobs should use a priority les than zero, interactive jobs
511should use 100 or more.
416 512
417The optional C<$name> can be used to identify the job to run. It might be 513The optional C<$name> can be used to identify the job to run. It might be
418used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
419 515
420Useful for short background jobs. 516Useful for short background jobs.
421 517
422=cut 518=cut
423 519
424our @SLOT_QUEUE; 520our @SLOT_QUEUE;
425our $SLOT_QUEUE; 521our $SLOT_QUEUE;
522our $SLOT_DECAY = 0.9;
426 523
427$SLOT_QUEUE->cancel if $SLOT_QUEUE; 524$SLOT_QUEUE->cancel if $SLOT_QUEUE;
428$SLOT_QUEUE = Coro::async { 525$SLOT_QUEUE = Coro::async {
429 $Coro::current->desc ("timeslot manager"); 526 $Coro::current->desc ("timeslot manager");
430 527
431 my $signal = new Coro::Signal; 528 my $signal = new Coro::Signal;
529 my $busy;
432 530
433 while () { 531 while () {
434 next_job: 532 next_job:
533
435 my $avail = cf::till_tick; 534 my $avail = cf::till_tick;
436 if ($avail > 0.01) { 535
437 for (0 .. $#SLOT_QUEUE) { 536 for (0 .. $#SLOT_QUEUE) {
438 if ($SLOT_QUEUE[$_][0] < $avail) { 537 if ($SLOT_QUEUE[$_][0] <= $avail) {
538 $busy = 0;
439 my $job = splice @SLOT_QUEUE, $_, 1, (); 539 my $job = splice @SLOT_QUEUE, $_, 1, ();
440 $job->[2]->send; 540 $job->[2]->send;
441 Coro::cede; 541 Coro::cede;
442 goto next_job; 542 goto next_job;
443 } 543 } else {
544 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
444 } 545 }
445 } 546 }
446 547
447 if (@SLOT_QUEUE) { 548 if (@SLOT_QUEUE) {
448 # we do not use wait_for_tick() as it returns immediately when tick is inactive 549 # we do not use wait_for_tick() as it returns immediately when tick is inactive
449 push @cf::WAIT_FOR_TICK, $signal; 550 push @cf::WAIT_FOR_TICK, $signal;
450 $signal->wait; 551 $signal->wait;
451 } else { 552 } else {
553 $busy = 0;
452 Coro::schedule; 554 Coro::schedule;
453 } 555 }
454 } 556 }
455}; 557};
456 558
457sub get_slot($;$$) { 559sub get_slot($;$$) {
458 return if tick_inhibit || $Coro::current == $Coro::main; 560 return if tick_inhibit || $Coro::current == $Coro::main;
459 561
460 my ($time, $pri, $name) = @_; 562 my ($time, $pri, $name) = @_;
461 563
462 $time = $TICK * .6 if $time > $TICK * .6; 564 $time = clamp $time, 0.01, $TICK * .6;
565
463 my $sig = new Coro::Signal; 566 my $sig = new Coro::Signal;
464 567
465 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 568 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
466 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 569 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
467 $SLOT_QUEUE->ready; 570 $SLOT_QUEUE->ready;
493=cut 596=cut
494 597
495sub sync_job(&) { 598sub sync_job(&) {
496 my ($job) = @_; 599 my ($job) = @_;
497 600
498 if ($Coro::current == $Coro::main) { 601 if (in_main) {
499 my $time = EV::time; 602 my $time = AE::time;
500 603
501 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
502 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
503 606
504 LOG llevError, Carp::longmess "sync job";#d# 607 #LOG llevError, Carp::longmess "sync job";#d#
505 608
506 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
507 610
508 my $busy = 1; 611 my $busy = 1;
509 my @res; 612 my @res;
510 613
511 (async { 614 (async {
512 $Coro::current->desc ("sync job coro"); 615 $Coro::current->desc ("sync job coro");
513 @res = eval { $job->() }; 616 @res = eval { $job->() };
514 warn $@ if $@; 617 error $@ if $@;
515 undef $busy; 618 undef $busy;
516 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
517 620
518 while ($busy) { 621 while ($busy) {
519 if (Coro::nready) { 622 if (Coro::nready) {
521 } else { 624 } else {
522 EV::loop EV::LOOP_ONESHOT; 625 EV::loop EV::LOOP_ONESHOT;
523 } 626 }
524 } 627 }
525 628
526 my $time = EV::time - $time; 629 my $time = AE::time - $time;
527 630
528 $TICK_START += $time; # do not account sync jobs to server load 631 $TICK_START += $time; # do not account sync jobs to server load
529 632
530 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
531 } else { 634 } else {
553 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
554 657
555 $coro 658 $coro
556} 659}
557 660
558=item fork_call { }, $args 661=item fork_call { }, @args
559 662
560Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
561process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
562Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
563never block itself or use any form of event handling. 666never block itself or use any form of event handling.
564 667
565=cut 668=cut
566 669
670sub post_fork {
671 reset_signals;
672}
673
567sub fork_call(&@) { 674sub fork_call(&@) {
568 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
569 676
570 # we seemingly have to make a local copy of the whole thing, 677 # we seemingly have to make a local copy of the whole thing,
571 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
572 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
573 680
574 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
575 reset_signals; 682 cf::post_fork;
576 &$cb 683 &$cb
577 }, @args; 684 } @args;
578 685
579 wantarray ? @res : $res[-1] 686 wantarray ? @res : $res[-1]
687}
688
689sub objinfo {
690 (
691 "counter value" => cf::object::object_count,
692 "objects created" => cf::object::create_count,
693 "objects destroyed" => cf::object::destroy_count,
694 "freelist size" => cf::object::free_count,
695 "allocated objects" => cf::object::objects_size,
696 "active objects" => cf::object::actives_size,
697 )
580} 698}
581 699
582=item $coin = coin_from_name $name 700=item $coin = coin_from_name $name
583 701
584=cut 702=cut
621within each server. 739within each server.
622 740
623=cut 741=cut
624 742
625sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
626 my ($name) = @_; 747 my ($name) = @_;
627 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
628 749
629 eval { 750 eval {
630 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
640} 761}
641 762
642our $DB; 763our $DB;
643 764
644sub db_init { 765sub db_init {
645 cf::sync_job {
646 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
647 };
648} 767}
649 768
650sub db_get($$) { 769sub db_get($$) {
651 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
652 771
653 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
654 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
655 776
656 $! ? () 777 $! ? ()
657 : $data 778 : $data
658 }
659} 779}
660 780
661sub db_put($$$) { 781sub db_put($$$) {
662 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
663 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
691 811
692 my @data; 812 my @data;
693 my $md5; 813 my $md5;
694 814
695 for (0 .. $#$src) { 815 for (0 .. $#$src) {
696 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
697 or Carp::croak "$src->[$_]: $!";
698 } 817 }
699 818
700 # if processing is expensive, check 819 # if processing is expensive, check
701 # checksum first 820 # checksum first
702 if (1) { 821 if (1) {
719 838
720 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
721 my $data = $process->(\@data); 840 my $data = $process->(\@data);
722 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
723 842
724 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
725 844
726 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
727 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
728 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
729 848
739 858
740=cut 859=cut
741 860
742sub datalog($@) { 861sub datalog($@) {
743 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
744 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
745} 864}
746 865
747=back 866=back
748 867
749=cut 868=cut
944 1063
945 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
946 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
947 1066
948 } elsif (ref $type) { 1067 } elsif (ref $type) {
949 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
950 1069
951 } else { 1070 } else {
952 shift @arg; 1071 shift @arg;
953 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
954 } 1073 }
955 } 1074 }
956} 1075}
957 1076
958sub _object_attach { 1077sub _object_attach {
968 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
969 } 1088 }
970 1089
971 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
972 } else { 1091 } else {
973 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
974 } 1093 }
975 1094
976 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
977} 1096}
978 1097
1037 1156
1038 for (@$callbacks) { 1157 for (@$callbacks) {
1039 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
1040 1159
1041 if ($@) { 1160 if ($@) {
1042 warn "$@";
1043 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1044 override; 1162 override;
1045 } 1163 }
1046 1164
1047 return 1 if $override; 1165 return 1 if $override;
1048 } 1166 }
1127 for (@$attach) { 1245 for (@$attach) {
1128 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
1129 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
1130 } 1248 }
1131 } else { 1249 } else {
1132 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
1133 } 1251 }
1134 } 1252 }
1135} 1253}
1136 1254
1137cf::attachable->attach ( 1255cf::attachable->attach (
1164 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1165 1283
1166 sync_job { 1284 sync_job {
1167 if (length $$rdata) { 1285 if (length $$rdata) {
1168 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1169 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1170 $decname, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1171 1290
1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1173 aio_chmod $fh, SAVE_MODE; 1292 aio_chmod $fh, SAVE_MODE;
1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1175 aio_fsync $fh if $cf::USE_FSYNC; 1294 if ($cf::USE_FSYNC) {
1295 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1296 aio_fsync $fh;
1297 }
1176 aio_close $fh; 1298 aio_close $fh;
1177 1299
1178 if (@$objs) { 1300 if (@$objs) {
1179 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1301 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1180 aio_chmod $fh, SAVE_MODE; 1302 aio_chmod $fh, SAVE_MODE;
1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1303 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1182 aio_write $fh, 0, (length $data), $data, 0; 1304 aio_write $fh, 0, (length $data), $data, 0;
1183 aio_fsync $fh if $cf::USE_FSYNC; 1305 if ($cf::USE_FSYNC) {
1306 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1307 aio_fsync $fh;
1308 }
1184 aio_close $fh; 1309 aio_close $fh;
1185 aio_rename "$filename.pst~", "$filename.pst"; 1310 aio_rename "$filename.pst~", "$filename.pst";
1186 } 1311 }
1187 } else { 1312 } else {
1188 aio_unlink "$filename.pst"; 1313 aio_unlink "$filename.pst";
1189 } 1314 }
1190 1315
1191 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1317
1318 $filename =~ s%/[^/]+$%%;
1319 aio_pathsync $filename if $cf::USE_FSYNC;
1192 } else { 1320 } else {
1193 warn "FATAL: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1194 } 1322 }
1195 } else { 1323 } else {
1196 aio_unlink $filename; 1324 aio_unlink $filename;
1197 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1198 } 1326 }
1222 my $st = eval { Coro::Storable::thaw $av }; 1350 my $st = eval { Coro::Storable::thaw $av };
1223 $av = $st->{objs}; 1351 $av = $st->{objs};
1224 } 1352 }
1225 1353
1226 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1227 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1228 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1229 1358
1230 ($data, $av) 1359 ($data, $av)
1231} 1360}
1232 1361
1233=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
1289 my ($name, $cb) = @_; 1418 my ($name, $cb) = @_;
1290 1419
1291 $EXTICMD{$name} = $cb; 1420 $EXTICMD{$name} = $cb;
1292} 1421}
1293 1422
1423use File::Glob ();
1424
1294cf::player->attach ( 1425cf::player->attach (
1295 on_command => sub { 1426 on_unknown_command => sub {
1296 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1297 1428
1298 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1299 or return; 1430 or return;
1300 1431
1323 1454
1324 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1325 if $reply; 1456 if $reply;
1326 1457
1327 } else { 1458 } else {
1328 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1329 } 1460 }
1330 1461
1331 cf::override; 1462 cf::override;
1332 }, 1463 },
1333); 1464);
1334 1465
1466# "readahead" all extensions
1467sub cache_extensions {
1468 my $grp = IO::AIO::aio_group;
1469
1470 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1471 for (grep /\.ext$/, @{$_[0]}) {
1472 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1473 }
1474 };
1475
1476 $grp
1477}
1478
1335sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1336 cf::sync_job { 1482 cf::sync_job {
1337 my %todo; 1483 my %todo;
1338 1484
1339 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1340 next unless -r $path; 1486 next unless -r $path;
1358 1504
1359 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1360 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1361 1507
1362 $ext{source} = 1508 $ext{source} =
1363 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1364 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1365 . $source 1511 . $source
1366 . "\n};\n1"; 1512 . "\n};\n1";
1367 1513
1368 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
1369 } 1515 }
1370 1516
1517 my $pass = 0;
1371 my %done; 1518 my %done;
1372 while (%todo) { 1519 while (%todo) {
1373 my $progress; 1520 my $progress;
1374 1521
1522 ++$pass;
1523
1524 ext:
1375 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
1376 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1377 goto skip 1527 next ext
1378 unless exists $done{$_}; 1528 unless exists $done{$_};
1379 } 1529 }
1380 1530
1381 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1382 1532
1383 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
1384 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
1385 : "$v->{base}: extension inactive.\n";
1386 1537
1387 if (exists $v->{meta}{mandatory}) {
1388 warn $msg;
1389 cf::cleanup "mandatory extension failed to load, exiting."; 1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1390 } 1539 if exists $v->{meta}{mandatory};
1391 1540
1392 warn $msg; 1541 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1542 delete $todo{$k};
1543 } else {
1544 $done{$k} = delete $todo{$k};
1545 push @EXTS, $v->{pkg};
1546 $progress = 1;
1547
1548 info "$v->{base}: extension inactive.\n"
1549 unless $active;
1393 } 1550 }
1394
1395 $done{$k} = delete $todo{$k};
1396 push @EXTS, $v->{pkg};
1397 $progress = 1;
1398 } 1551 }
1399 1552
1400 skip: 1553 unless ($progress) {
1401 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1402 unless $progress; 1555
1556 while (my ($k, $v) = each %todo) {
1557 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1558 if exists $v->{meta}{mandatory};
1559 }
1560
1561 last;
1562 }
1403 } 1563 }
1404 }; 1564 };
1405} 1565}
1406 1566
1407############################################################################# 1567#############################################################################
1491 $cf::PLAYER{$login} = $pl 1651 $cf::PLAYER{$login} = $pl
1492 } 1652 }
1493 } 1653 }
1494} 1654}
1495 1655
1656cf::player->attach (
1657 on_load => sub {
1658 my ($pl, $path) = @_;
1659
1660 # restore slots saved in save, below
1661 my $slots = delete $pl->{_slots};
1662
1663 $pl->ob->current_weapon ($slots->[0]);
1664 $pl->combat_ob ($slots->[1]);
1665 $pl->ranged_ob ($slots->[2]);
1666 },
1667);
1668
1496sub save($) { 1669sub save($) {
1497 my ($pl) = @_; 1670 my ($pl) = @_;
1498 1671
1499 return if $pl->{deny_save}; 1672 return if $pl->{deny_save};
1500 1673
1505 1678
1506 aio_mkdir playerdir $pl, 0770; 1679 aio_mkdir playerdir $pl, 0770;
1507 $pl->{last_save} = $cf::RUNTIME; 1680 $pl->{last_save} = $cf::RUNTIME;
1508 1681
1509 cf::get_slot 0.01; 1682 cf::get_slot 0.01;
1683
1684 # save slots, to be restored later
1685 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1510 1686
1511 $pl->save_pl ($path); 1687 $pl->save_pl ($path);
1512 cf::cede_to_tick; 1688 cf::cede_to_tick;
1513} 1689}
1514 1690
1548 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1549 1725
1550 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1551 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1727 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1552 1728
1553 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1554 $pl->deactivate; 1730 $pl->deactivate;
1731
1555 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1732 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1556 $pl->ob->check_score;
1557 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1558 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1559 1737
1560 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1561 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1562 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
1616 \@logins 1794 \@logins
1617} 1795}
1618 1796
1619=item $player->maps 1797=item $player->maps
1620 1798
1799=item cf::player::maps $login
1800
1621Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1622player. May block. 1802player. May block.
1623 1803
1624=cut 1804=cut
1625 1805
1687=cut 1867=cut
1688 1868
1689sub find_by_path($) { 1869sub find_by_path($) {
1690 my ($path) = @_; 1870 my ($path) = @_;
1691 1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1873
1692 my ($match, $specificity); 1874 my ($match, $specificity);
1693 1875
1694 for my $region (list) { 1876 for my $region (list) {
1695 if ($region->{match} && $path =~ $region->{match}) { 1877 if ($region->{match} && $path =~ $region->{match}) {
1696 ($match, $specificity) = ($region, $region->specificity) 1878 ($match, $specificity) = ($region, $region->specificity)
1724sub generate_random_map { 1906sub generate_random_map {
1725 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1726 1908
1727 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1909 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1728 1910
1729 # mit "rum" bekleckern, nicht
1730 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1734 $rmp->{exit_on_final_map},
1735 $rmp->{xsize}, $rmp->{ysize},
1736 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1737 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1738 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1739 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1740 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1741 (cf::region::find $rmp->{region}), $rmp->{custom}
1742 )
1743} 1912}
1744 1913
1745=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1746 1915
1747Register a handler for the map path matching the given regex at the 1916Register a handler for the map path matching the given regex at the
1752 1921
1753sub register { 1922sub register {
1754 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1755 my $pkg = caller; 1924 my $pkg = caller;
1756 1925
1757 no strict;
1758 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1759 1927
1760 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1761} 1929}
1762 1930
1763# also paths starting with '/' 1931# also paths starting with '/'
1764$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1765 1933
1766sub thawer_merge { 1934sub thawer_merge {
1767 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1768 1936
1769 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
1774} 1942}
1775 1943
1776sub normalise { 1944sub normalise {
1777 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1778 1946
1779 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1780 1948
1781 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1782 1950
1783 # map plan: 1951 # map plan:
1784 # 1952 #
1799 $base =~ s{[^/]+/?$}{}; 1967 $base =~ s{[^/]+/?$}{};
1800 $path = "$base/$path"; 1968 $path = "$base/$path";
1801 } 1969 }
1802 1970
1803 for ($path) { 1971 for ($path) {
1804 redo if s{//}{/};
1805 redo if s{/\.?/}{/}; 1972 redo if s{/\.?/}{/};
1806 redo if s{/[^/]+/\.\./}{/}; 1973 redo if s{/[^/]+/\.\./}{/};
1807 } 1974 }
1808 1975
1809 $path 1976 $path
1823 $self->init; # pass $1 etc. 1990 $self->init; # pass $1 etc.
1824 return $self; 1991 return $self;
1825 } 1992 }
1826 } 1993 }
1827 1994
1828 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1995 Carp::cluck "unable to resolve path '$path' (base '$base')";
1829 () 1996 ()
1830} 1997}
1831 1998
1999# may re-bless or do other evil things
1832sub init { 2000sub init {
1833 my ($self) = @_; 2001 my ($self) = @_;
1834 2002
1835 $self 2003 $self
1836} 2004}
1867 2035
1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2036 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1869 "$UNIQUEDIR/$path" 2037 "$UNIQUEDIR/$path"
1870} 2038}
1871 2039
1872# and all this just because we cannot iterate over
1873# all maps in C++...
1874sub change_all_map_light {
1875 my ($change) = @_;
1876
1877 $_->change_map_light ($change)
1878 for grep $_->outdoor, values %cf::MAP;
1879}
1880
1881sub decay_objects { 2040sub decay_objects {
1882 my ($self) = @_; 2041 my ($self) = @_;
1883 2042
1884 return if $self->{deny_reset}; 2043 return if $self->{deny_reset};
1885 2044
1910 $self->{load_path} = $path; 2069 $self->{load_path} = $path;
1911 2070
1912 1 2071 1
1913} 2072}
1914 2073
2074# used to laod the header of an original map
1915sub load_header_orig { 2075sub load_header_orig {
1916 my ($self) = @_; 2076 my ($self) = @_;
1917 2077
1918 $self->load_header_from ($self->load_path) 2078 $self->load_header_from ($self->load_path)
1919} 2079}
1920 2080
2081# used to laod the header of an instantiated map
1921sub load_header_temp { 2082sub load_header_temp {
1922 my ($self) = @_; 2083 my ($self) = @_;
1923 2084
1924 $self->load_header_from ($self->save_path) 2085 $self->load_header_from ($self->save_path)
1925} 2086}
1926 2087
2088# called after loading the header from an instantiated map
1927sub prepare_temp { 2089sub prepare_temp {
1928 my ($self) = @_; 2090 my ($self) = @_;
1929 2091
1930 $self->last_access ((delete $self->{last_access}) 2092 $self->last_access ((delete $self->{last_access})
1931 || $cf::RUNTIME); #d# 2093 || $cf::RUNTIME); #d#
1932 # safety 2094 # safety
1933 $self->{instantiate_time} = $cf::RUNTIME 2095 $self->{instantiate_time} = $cf::RUNTIME
1934 if $self->{instantiate_time} > $cf::RUNTIME; 2096 if $self->{instantiate_time} > $cf::RUNTIME;
1935} 2097}
1936 2098
2099# called after loading the header from an original map
1937sub prepare_orig { 2100sub prepare_orig {
1938 my ($self) = @_; 2101 my ($self) = @_;
1939 2102
1940 $self->{load_original} = 1; 2103 $self->{load_original} = 1;
1941 $self->{instantiate_time} = $cf::RUNTIME; 2104 $self->{instantiate_time} = $cf::RUNTIME;
1965 2128
1966sub find; 2129sub find;
1967sub find { 2130sub find {
1968 my ($path, $origin) = @_; 2131 my ($path, $origin) = @_;
1969 2132
2133 cf::cede_to_tick;
2134
1970 $path = normalise $path, $origin && $origin->path; 2135 $path = normalise $path, $origin;
1971 2136
1972 cf::lock_wait "map_data:$path";#d#remove 2137 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 cf::lock_wait "map_find:$path"; 2138 my $guard2 = cf::lock_acquire "map_find:$path";
1974 2139
1975 $cf::MAP{$path} || do { 2140 $cf::MAP{$path} || do {
1976 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1977 my $guard2 = cf::lock_acquire "map_find:$path";
1978
1979 my $map = new_from_path cf::map $path 2141 my $map = new_from_path cf::map $path
1980 or return; 2142 or return;
1981 2143
1982 $map->{last_save} = $cf::RUNTIME; 2144 $map->{last_save} = $cf::RUNTIME;
1983 2145
1995 2157
1996 $cf::MAP{$path} = $map 2158 $cf::MAP{$path} = $map
1997 } 2159 }
1998} 2160}
1999 2161
2000sub pre_load { } 2162sub pre_load { }
2001sub post_load { } 2163#sub post_load { } # XS
2002 2164
2003sub load { 2165sub load {
2004 my ($self) = @_; 2166 my ($self) = @_;
2005 2167
2006 local $self->{deny_reset} = 1; # loading can take a long time 2168 local $self->{deny_reset} = 1; # loading can take a long time
2011 my $guard = cf::lock_acquire "map_data:$path"; 2173 my $guard = cf::lock_acquire "map_data:$path";
2012 2174
2013 return unless $self->valid; 2175 return unless $self->valid;
2014 return unless $self->in_memory == cf::MAP_SWAPPED; 2176 return unless $self->in_memory == cf::MAP_SWAPPED;
2015 2177
2016 $self->in_memory (cf::MAP_LOADING);
2017
2018 $self->alloc; 2178 $self->alloc;
2019 2179
2020 $self->pre_load; 2180 $self->pre_load;
2021 cf::cede_to_tick; 2181 cf::cede_to_tick;
2022 2182
2183 if (exists $self->{load_path}) {
2023 my $f = new_from_file cf::object::thawer $self->{load_path}; 2184 my $f = new_from_file cf::object::thawer $self->{load_path};
2024 $f->skip_block; 2185 $f->skip_block;
2025 $self->_load_objects ($f) 2186 $self->_load_objects ($f)
2026 or return; 2187 or return;
2027 2188
2028 $self->post_load_original 2189 $self->post_load_original
2029 if delete $self->{load_original}; 2190 if delete $self->{load_original};
2030 2191
2031 if (my $uniq = $self->uniq_path) { 2192 if (my $uniq = $self->uniq_path) {
2032 utf8::encode $uniq; 2193 utf8::encode $uniq;
2033 unless (aio_stat $uniq) { 2194 unless (aio_stat $uniq) {
2034 if (my $f = new_from_file cf::object::thawer $uniq) { 2195 if (my $f = new_from_file cf::object::thawer $uniq) {
2035 $self->clear_unique_items; 2196 $self->clear_unique_items;
2036 $self->_load_objects ($f); 2197 $self->_load_objects ($f);
2037 $f->resolve_delayed_derefs; 2198 $f->resolve_delayed_derefs;
2199 }
2038 } 2200 }
2039 } 2201 }
2040 }
2041 2202
2042 $f->resolve_delayed_derefs; 2203 $f->resolve_delayed_derefs;
2204 } else {
2205 $self->post_load_original
2206 if delete $self->{load_original};
2207 }
2208
2209 $self->in_memory (cf::MAP_INACTIVE);
2043 2210
2044 cf::cede_to_tick; 2211 cf::cede_to_tick;
2045 # now do the right thing for maps 2212 # now do the right thing for maps
2046 $self->link_multipart_objects; 2213 $self->link_multipart_objects;
2047 $self->difficulty ($self->estimate_difficulty) 2214 $self->difficulty ($self->estimate_difficulty)
2051 unless ($self->{deny_activate}) { 2218 unless ($self->{deny_activate}) {
2052 $self->decay_objects; 2219 $self->decay_objects;
2053 $self->fix_auto_apply; 2220 $self->fix_auto_apply;
2054 $self->update_buttons; 2221 $self->update_buttons;
2055 cf::cede_to_tick; 2222 cf::cede_to_tick;
2056 $self->set_darkness_map; 2223 #$self->activate; # no longer activate maps automatically
2057 cf::cede_to_tick;
2058 $self->activate;
2059 } 2224 }
2060 2225
2061 $self->{last_save} = $cf::RUNTIME; 2226 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME); 2227 $self->last_access ($cf::RUNTIME);
2063
2064 $self->in_memory (cf::MAP_ACTIVE);
2065 } 2228 }
2066 2229
2067 $self->post_load; 2230 $self->post_load;
2068}
2069 2231
2232 1
2233}
2234
2235# customize the map for a given player, i.e.
2236# return the _real_ map. used by e.g. per-player
2237# maps to change the path to ~playername/mappath
2070sub customise_for { 2238sub customise_for {
2071 my ($self, $ob) = @_; 2239 my ($self, $ob) = @_;
2072 2240
2073 return find "~" . $ob->name . "/" . $self->{path} 2241 return find "~" . $ob->name . "/" . $self->{path}
2074 if $self->per_player; 2242 if $self->per_player;
2090 or next; 2258 or next;
2091 $neigh = find $neigh, $map 2259 $neigh = find $neigh, $map
2092 or next; 2260 or next;
2093 $neigh->load; 2261 $neigh->load;
2094 2262
2263 # now find the diagonal neighbours
2095 push @neigh, 2264 push @neigh,
2096 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2265 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2097 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2266 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2098 } 2267 }
2099 2268
2106} 2275}
2107 2276
2108sub find_sync { 2277sub find_sync {
2109 my ($path, $origin) = @_; 2278 my ($path, $origin) = @_;
2110 2279
2111 cf::sync_job { find $path, $origin } 2280 # it's a bug to call this from the main context
2281 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2282 if $Coro::current == $Coro::main;
2283
2284 find $path, $origin
2112} 2285}
2113 2286
2114sub do_load_sync { 2287sub do_load_sync {
2115 my ($map) = @_; 2288 my ($map) = @_;
2116 2289
2290 # it's a bug to call this from the main context
2117 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2291 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2118 if $Coro::current == $Coro::main; 2292 if $Coro::current == $Coro::main;
2119 2293
2120 cf::sync_job { $map->load }; 2294 $map->load;
2121} 2295}
2122 2296
2123our %MAP_PREFETCH; 2297our %MAP_PREFETCH;
2124our $MAP_PREFETCHER = undef; 2298our $MAP_PREFETCHER = undef;
2125 2299
2126sub find_async { 2300sub find_async {
2127 my ($path, $origin, $load) = @_; 2301 my ($path, $origin, $load) = @_;
2128 2302
2129 $path = normalise $path, $origin && $origin->{path}; 2303 $path = normalise $path, $origin;
2130 2304
2131 if (my $map = $cf::MAP{$path}) { 2305 if (my $map = $cf::MAP{$path}) {
2132 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2306 return $map if !$load || $map->linkable;
2133 } 2307 }
2134 2308
2135 $MAP_PREFETCH{$path} |= $load; 2309 $MAP_PREFETCH{$path} |= $load;
2136 2310
2137 $MAP_PREFETCHER ||= cf::async { 2311 $MAP_PREFETCHER ||= cf::async {
2151 $MAP_PREFETCHER->prio (6); 2325 $MAP_PREFETCHER->prio (6);
2152 2326
2153 () 2327 ()
2154} 2328}
2155 2329
2330# common code, used by both ->save and ->swapout
2156sub save { 2331sub _save {
2157 my ($self) = @_; 2332 my ($self) = @_;
2158
2159 my $lock = cf::lock_acquire "map_data:$self->{path}";
2160 2333
2161 $self->{last_save} = $cf::RUNTIME; 2334 $self->{last_save} = $cf::RUNTIME;
2162 2335
2163 return unless $self->dirty; 2336 return unless $self->dirty;
2164 2337
2184 } else { 2357 } else {
2185 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2358 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2186 } 2359 }
2187} 2360}
2188 2361
2362sub save {
2363 my ($self) = @_;
2364
2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2366
2367 $self->_save;
2368}
2369
2189sub swap_out { 2370sub swap_out {
2190 my ($self) = @_; 2371 my ($self) = @_;
2191 2372
2192 # save first because save cedes
2193 $self->save;
2194
2195 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2373 my $lock = cf::lock_acquire "map_data:$self->{path}";
2196 2374
2375 return if !$self->linkable;
2376 return if $self->{deny_save};
2197 return if $self->players; 2377 return if $self->players;
2198 return if $self->in_memory != cf::MAP_ACTIVE;
2199 return if $self->{deny_save};
2200 2378
2379 # first deactivate the map and "unlink" it from the core
2380 $self->deactivate;
2381 $_->clear_links_to ($self) for values %cf::MAP;
2201 $self->in_memory (cf::MAP_SWAPPED); 2382 $self->in_memory (cf::MAP_SWAPPED);
2383
2384 # then atomically save
2385 $self->_save;
2386
2387 # then free the map
2388 $self->clear;
2389}
2390
2391sub reset_at {
2392 my ($self) = @_;
2393
2394 # TODO: safety, remove and allow resettable per-player maps
2395 return 1e99 if $self->{deny_reset};
2396
2397 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2398 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2399
2400 $time + $to
2401}
2402
2403sub should_reset {
2404 my ($self) = @_;
2405
2406 $self->reset_at <= $cf::RUNTIME
2407}
2408
2409sub reset {
2410 my ($self) = @_;
2411
2412 my $lock = cf::lock_acquire "map_data:$self->{path}";
2413
2414 return if $self->players;
2415
2416 cf::trace "resetting map ", $self->path, "\n";
2417
2418 $self->in_memory (cf::MAP_SWAPPED);
2419
2420 # need to save uniques path
2421 unless ($self->{deny_save}) {
2422 my $uniq = $self->uniq_path; utf8::encode $uniq;
2423
2424 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2425 if $uniq;
2426 }
2427
2428 delete $cf::MAP{$self->path};
2202 2429
2203 $self->deactivate; 2430 $self->deactivate;
2204 $_->clear_links_to ($self) for values %cf::MAP; 2431 $_->clear_links_to ($self) for values %cf::MAP;
2205 $self->clear; 2432 $self->clear;
2206}
2207
2208sub reset_at {
2209 my ($self) = @_;
2210
2211 # TODO: safety, remove and allow resettable per-player maps
2212 return 1e99 if $self->{deny_reset};
2213
2214 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2215 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2216
2217 $time + $to
2218}
2219
2220sub should_reset {
2221 my ($self) = @_;
2222
2223 $self->reset_at <= $cf::RUNTIME
2224}
2225
2226sub reset {
2227 my ($self) = @_;
2228
2229 my $lock = cf::lock_acquire "map_data:$self->{path}";
2230
2231 return if $self->players;
2232
2233 warn "resetting map ", $self->path;
2234
2235 $self->in_memory (cf::MAP_SWAPPED);
2236
2237 # need to save uniques path
2238 unless ($self->{deny_save}) {
2239 my $uniq = $self->uniq_path; utf8::encode $uniq;
2240
2241 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2242 if $uniq;
2243 }
2244
2245 delete $cf::MAP{$self->path};
2246
2247 $self->deactivate;
2248 $_->clear_links_to ($self) for values %cf::MAP;
2249 $self->clear;
2250 2433
2251 $self->unlink_save; 2434 $self->unlink_save;
2252 $self->destroy; 2435 $self->destroy;
2253} 2436}
2254 2437
2262 2445
2263 delete $cf::MAP{$self->path}; 2446 delete $cf::MAP{$self->path};
2264 2447
2265 $self->unlink_save; 2448 $self->unlink_save;
2266 2449
2267 bless $self, "cf::map"; 2450 bless $self, "cf::map::wrap";
2268 delete $self->{deny_reset}; 2451 delete $self->{deny_reset};
2269 $self->{deny_save} = 1; 2452 $self->{deny_save} = 1;
2270 $self->reset_timeout (1); 2453 $self->reset_timeout (1);
2271 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2454 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2272 2455
2329 : normalise $_ 2512 : normalise $_
2330 } @{ aio_readdir $UNIQUEDIR or [] } 2513 } @{ aio_readdir $UNIQUEDIR or [] }
2331 ] 2514 ]
2332} 2515}
2333 2516
2517=item cf::map::static_maps
2518
2519Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2520file in the shared directory excluding F</styles> and F</editor>). May
2521block.
2522
2523=cut
2524
2525sub static_maps() {
2526 my @dirs = "";
2527 my @maps;
2528
2529 while (@dirs) {
2530 my $dir = shift @dirs;
2531
2532 next if $dir eq "/styles" || $dir eq "/editor";
2533
2534 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2535 or return;
2536
2537 for (@$files) {
2538 s/\.map$// or next;
2539 utf8::decode $_;
2540 push @maps, "$dir/$_";
2541 }
2542
2543 push @dirs, map "$dir/$_", @$dirs;
2544 }
2545
2546 \@maps
2547}
2548
2334=back 2549=back
2335 2550
2336=head3 cf::object 2551=head3 cf::object
2337 2552
2338=cut 2553=cut
2403 2618
2404our $SAY_CHANNEL = { 2619our $SAY_CHANNEL = {
2405 id => "say", 2620 id => "say",
2406 title => "Map", 2621 title => "Map",
2407 reply => "say ", 2622 reply => "say ",
2408 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2623 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2409}; 2624};
2410 2625
2411our $CHAT_CHANNEL = { 2626our $CHAT_CHANNEL = {
2412 id => "chat", 2627 id => "chat",
2413 title => "Chat", 2628 title => "Chat",
2470 2685
2471Freezes the player and moves him/her to a special map (C<{link}>). 2686Freezes the player and moves him/her to a special map (C<{link}>).
2472 2687
2473The player should be reasonably safe there for short amounts of time (e.g. 2688The player should be reasonably safe there for short amounts of time (e.g.
2474for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2689for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2475though, as the palyer cannot control the character while it is on the link 2690though, as the player cannot control the character while it is on the link
2476map. 2691map.
2477 2692
2478Will never block. 2693Will never block.
2479 2694
2480=item $player_object->leave_link ($map, $x, $y) 2695=item $player_object->leave_link ($map, $x, $y)
2501sub cf::object::player::enter_link { 2716sub cf::object::player::enter_link {
2502 my ($self) = @_; 2717 my ($self) = @_;
2503 2718
2504 $self->deactivate_recursive; 2719 $self->deactivate_recursive;
2505 2720
2721 ++$self->{_link_recursion};
2722
2506 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2723 return if UNIVERSAL::isa $self->map, "ext::map_link";
2507 2724
2508 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2725 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2509 if $self->map && $self->map->{path} ne "{link}"; 2726 if $self->map && $self->map->{path} ne "{link}";
2510 2727
2511 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2728 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2512} 2729}
2513 2730
2514sub cf::object::player::leave_link { 2731sub cf::object::player::leave_link {
2515 my ($self, $map, $x, $y) = @_; 2732 my ($self, $map, $x, $y) = @_;
2516 2733
2533 ($x, $y) = (-1, -1) 2750 ($x, $y) = (-1, -1)
2534 unless (defined $x) && (defined $y); 2751 unless (defined $x) && (defined $y);
2535 2752
2536 # use -1 or undef as default coordinates, not 0, 0 2753 # use -1 or undef as default coordinates, not 0, 0
2537 ($x, $y) = ($map->enter_x, $map->enter_y) 2754 ($x, $y) = ($map->enter_x, $map->enter_y)
2538 if $x <=0 && $y <= 0; 2755 if $x <= 0 && $y <= 0;
2539 2756
2540 $map->load; 2757 $map->load;
2541 $map->load_neighbours; 2758 $map->load_neighbours;
2542 2759
2543 return unless $self->contr->active; 2760 return unless $self->contr->active;
2544 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2545 $self->activate_recursive;
2546 2761
2547 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2762 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2548 $self->enter_map ($map, $x, $y); 2763 if ($self->enter_map ($map, $x, $y)) {
2549} 2764 # entering was successful
2765 delete $self->{_link_recursion};
2766 # only activate afterwards, to support waiting in hooks
2767 $self->activate_recursive;
2768 }
2550 2769
2770}
2771
2551=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2772=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2552 2773
2553Moves the player to the given map-path and coordinates by first freezing 2774Moves the player to the given map-path and coordinates by first freezing
2554her, loading and preparing them map, calling the provided $check callback 2775her, loading and preparing them map, calling the provided $check callback
2555that has to return the map if sucecssful, and then unfreezes the player on 2776that has to return the map if sucecssful, and then unfreezes the player on
2556the new (success) or old (failed) map position. In either case, $done will 2777the new (success) or old (failed) map position. In either case, $done will
2563 2784
2564our $GOTOGEN; 2785our $GOTOGEN;
2565 2786
2566sub cf::object::player::goto { 2787sub cf::object::player::goto {
2567 my ($self, $path, $x, $y, $check, $done) = @_; 2788 my ($self, $path, $x, $y, $check, $done) = @_;
2789
2790 if ($self->{_link_recursion} >= $MAX_LINKS) {
2791 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2792 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2793 ($path, $x, $y) = @$EMERGENCY_POSITION;
2794 }
2568 2795
2569 # do generation counting so two concurrent goto's will be executed in-order 2796 # do generation counting so two concurrent goto's will be executed in-order
2570 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2797 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2571 2798
2572 $self->enter_link; 2799 $self->enter_link;
2592 ($path, $x, $y) = (undef, undef, undef); 2819 ($path, $x, $y) = (undef, undef, undef);
2593 } 2820 }
2594 } 2821 }
2595 2822
2596 my $map = eval { 2823 my $map = eval {
2597 my $map = defined $path ? cf::map::find $path : undef; 2824 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2598 2825
2599 if ($map) { 2826 if ($map) {
2600 $map = $map->customise_for ($self); 2827 $map = $map->customise_for ($self);
2601 $map = $check->($map) if $check && $map; 2828 $map = $check->($map, $x, $y, $self) if $check && $map;
2602 } else { 2829 } else {
2603 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2830 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2604 } 2831 }
2605 2832
2606 $map 2833 $map
2614 if ($gen == $self->{_goto_generation}) { 2841 if ($gen == $self->{_goto_generation}) {
2615 delete $self->{_goto_generation}; 2842 delete $self->{_goto_generation};
2616 $self->leave_link ($map, $x, $y); 2843 $self->leave_link ($map, $x, $y);
2617 } 2844 }
2618 2845
2619 $done->() if $done; 2846 $done->($self) if $done;
2620 })->prio (1); 2847 })->prio (1);
2621} 2848}
2622 2849
2623=item $player_object->enter_exit ($exit_object) 2850=item $player_object->enter_exit ($exit_object)
2624 2851
2692 $Coro::current->{desc} = "enter_exit"; 2919 $Coro::current->{desc} = "enter_exit";
2693 2920
2694 unless (eval { 2921 unless (eval {
2695 $self->deactivate_recursive; # just to be sure 2922 $self->deactivate_recursive; # just to be sure
2696 2923
2697 # random map handling
2698 {
2699 my $guard = cf::lock_acquire "exit_prepare:$exit";
2700
2701 prepare_random_map $exit
2702 if $exit->slaying eq "/!";
2703 }
2704
2705 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2924 my $map = cf::map::normalise $exit->slaying, $exit->map;
2706 my $x = $exit->stats->hp; 2925 my $x = $exit->stats->hp;
2707 my $y = $exit->stats->sp; 2926 my $y = $exit->stats->sp;
2927
2928 # special map handling
2929 my $slaying = $exit->slaying;
2930
2931 # special map handling
2932 if ($slaying eq "/!") {
2933 my $guard = cf::lock_acquire "exit_prepare:$exit";
2934
2935 prepare_random_map $exit
2936 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2937
2938 $map = $exit->slaying;
2939
2940 } elsif ($slaying eq '!up') {
2941 $map = $exit->map->tile_path (cf::TILE_UP);
2942 $x = $exit->x;
2943 $y = $exit->y;
2944
2945 } elsif ($slaying eq '!down') {
2946 $map = $exit->map->tile_path (cf::TILE_DOWN);
2947 $x = $exit->x;
2948 $y = $exit->y;
2949 }
2708 2950
2709 $self->goto ($map, $x, $y); 2951 $self->goto ($map, $x, $y);
2710 2952
2711 # if exit is damned, update players death & WoR home-position 2953 # if exit is damned, update players death & WoR home-position
2712 $self->contr->savebed ($map, $x, $y) 2954 $self->contr->savebed ($map, $x, $y)
2717 $self->message ("Something went wrong deep within the deliantra server. " 2959 $self->message ("Something went wrong deep within the deliantra server. "
2718 . "I'll try to bring you back to the map you were before. " 2960 . "I'll try to bring you back to the map you were before. "
2719 . "Please report this to the dungeon master!", 2961 . "Please report this to the dungeon master!",
2720 cf::NDI_UNIQUE | cf::NDI_RED); 2962 cf::NDI_UNIQUE | cf::NDI_RED);
2721 2963
2722 warn "ERROR in enter_exit: $@"; 2964 error "ERROR in enter_exit: $@";
2723 $self->leave_link; 2965 $self->leave_link;
2724 } 2966 }
2725 })->prio (1); 2967 })->prio (1);
2726} 2968}
2727 2969
2739sub cf::client::send_drawinfo { 2981sub cf::client::send_drawinfo {
2740 my ($self, $text, $flags) = @_; 2982 my ($self, $text, $flags) = @_;
2741 2983
2742 utf8::encode $text; 2984 utf8::encode $text;
2743 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2985 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2986}
2987
2988=item $client->send_big_packet ($pkt)
2989
2990Like C<send_packet>, but tries to compress large packets, and fragments
2991them as required.
2992
2993=cut
2994
2995our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2996
2997sub cf::client::send_big_packet {
2998 my ($self, $pkt) = @_;
2999
3000 # try lzf for large packets
3001 $pkt = "lzf " . Compress::LZF::compress $pkt
3002 if 1024 <= length $pkt and $self->{can_lzf};
3003
3004 # split very large packets
3005 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3006 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3007 $pkt = "frag";
3008 }
3009
3010 $self->send_packet ($pkt);
2744} 3011}
2745 3012
2746=item $client->send_msg ($channel, $msg, $color, [extra...]) 3013=item $client->send_msg ($channel, $msg, $color, [extra...])
2747 3014
2748Send a drawinfo or msg packet to the client, formatting the msg for the 3015Send a drawinfo or msg packet to the client, formatting the msg for the
2752 3019
2753=cut 3020=cut
2754 3021
2755# non-persistent channels (usually the info channel) 3022# non-persistent channels (usually the info channel)
2756our %CHANNEL = ( 3023our %CHANNEL = (
3024 "c/motd" => {
3025 id => "infobox",
3026 title => "MOTD",
3027 reply => undef,
3028 tooltip => "The message of the day",
3029 },
2757 "c/identify" => { 3030 "c/identify" => {
2758 id => "infobox", 3031 id => "infobox",
2759 title => "Identify", 3032 title => "Identify",
2760 reply => undef, 3033 reply => undef,
2761 tooltip => "Items recently identified", 3034 tooltip => "Items recently identified",
2763 "c/examine" => { 3036 "c/examine" => {
2764 id => "infobox", 3037 id => "infobox",
2765 title => "Examine", 3038 title => "Examine",
2766 reply => undef, 3039 reply => undef,
2767 tooltip => "Signs and other items you examined", 3040 tooltip => "Signs and other items you examined",
3041 },
3042 "c/shopinfo" => {
3043 id => "infobox",
3044 title => "Shop Info",
3045 reply => undef,
3046 tooltip => "What your bargaining skill tells you about the shop",
2768 }, 3047 },
2769 "c/book" => { 3048 "c/book" => {
2770 id => "infobox", 3049 id => "infobox",
2771 title => "Book", 3050 title => "Book",
2772 reply => undef, 3051 reply => undef,
2788 id => "infobox", 3067 id => "infobox",
2789 title => "Body Parts", 3068 title => "Body Parts",
2790 reply => undef, 3069 reply => undef,
2791 tooltip => "Shows which body parts you posess and are available", 3070 tooltip => "Shows which body parts you posess and are available",
2792 }, 3071 },
3072 "c/statistics" => {
3073 id => "infobox",
3074 title => "Statistics",
3075 reply => undef,
3076 tooltip => "Shows your primary statistics",
3077 },
2793 "c/skills" => { 3078 "c/skills" => {
2794 id => "infobox", 3079 id => "infobox",
2795 title => "Skills", 3080 title => "Skills",
2796 reply => undef, 3081 reply => undef,
2797 tooltip => "Shows your experience per skill and item power", 3082 tooltip => "Shows your experience per skill and item power",
3083 },
3084 "c/shopitems" => {
3085 id => "infobox",
3086 title => "Shop Items",
3087 reply => undef,
3088 tooltip => "Shows the items currently for sale in this shop",
3089 },
3090 "c/resistances" => {
3091 id => "infobox",
3092 title => "Resistances",
3093 reply => undef,
3094 tooltip => "Shows your resistances",
3095 },
3096 "c/pets" => {
3097 id => "infobox",
3098 title => "Pets",
3099 reply => undef,
3100 tooltip => "Shows information abotu your pets/a specific pet",
3101 },
3102 "c/perceiveself" => {
3103 id => "infobox",
3104 title => "Perceive Self",
3105 reply => undef,
3106 tooltip => "You gained detailed knowledge about yourself",
2798 }, 3107 },
2799 "c/uptime" => { 3108 "c/uptime" => {
2800 id => "infobox", 3109 id => "infobox",
2801 title => "Uptime", 3110 title => "Uptime",
2802 reply => undef, 3111 reply => undef,
2812 id => "party", 3121 id => "party",
2813 title => "Party", 3122 title => "Party",
2814 reply => "gsay ", 3123 reply => "gsay ",
2815 tooltip => "Messages and chat related to your party", 3124 tooltip => "Messages and chat related to your party",
2816 }, 3125 },
3126 "c/death" => {
3127 id => "death",
3128 title => "Death",
3129 reply => undef,
3130 tooltip => "Reason for and more info about your most recent death",
3131 },
3132 "c/say" => $SAY_CHANNEL,
3133 "c/chat" => $CHAT_CHANNEL,
2817); 3134);
2818 3135
2819sub cf::client::send_msg { 3136sub cf::client::send_msg {
2820 my ($self, $channel, $msg, $color, @extra) = @_; 3137 my ($self, $channel, $msg, $color, @extra) = @_;
2821 3138
2826 3143
2827 # check predefined channels, for the benefit of C 3144 # check predefined channels, for the benefit of C
2828 if ($CHANNEL{$channel}) { 3145 if ($CHANNEL{$channel}) {
2829 $channel = $CHANNEL{$channel}; 3146 $channel = $CHANNEL{$channel};
2830 3147
2831 $self->ext_msg (channel_info => $channel) 3148 $self->ext_msg (channel_info => $channel);
2832 if $self->can_msg;
2833
2834 $channel = $channel->{id}; 3149 $channel = $channel->{id};
2835 3150
2836 } elsif (ref $channel) { 3151 } elsif (ref $channel) {
2837 # send meta info to client, if not yet sent 3152 # send meta info to client, if not yet sent
2838 unless (exists $self->{channel}{$channel->{id}}) { 3153 unless (exists $self->{channel}{$channel->{id}}) {
2839 $self->{channel}{$channel->{id}} = $channel; 3154 $self->{channel}{$channel->{id}} = $channel;
2840 $self->ext_msg (channel_info => $channel) 3155 $self->ext_msg (channel_info => $channel);
2841 if $self->can_msg;
2842 } 3156 }
2843 3157
2844 $channel = $channel->{id}; 3158 $channel = $channel->{id};
2845 } 3159 }
2846 3160
2847 return unless @extra || length $msg; 3161 return unless @extra || length $msg;
2848 3162
2849 if ($self->can_msg) {
2850 # default colour, mask it out 3163 # default colour, mask it out
2851 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3164 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2852 if $color & cf::NDI_DEF; 3165 if $color & cf::NDI_DEF;
2853 3166
2854 my $pkt = "msg " 3167 my $pkt = "msg "
2855 . $self->{json_coder}->encode ( 3168 . $self->{json_coder}->encode (
2856 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3169 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2857 ); 3170 );
2858 3171
2859 # try lzf for large packets
2860 $pkt = "lzf " . Compress::LZF::compress $pkt
2861 if 1024 <= length $pkt and $self->{can_lzf};
2862
2863 # split very large packets
2864 if (8192 < length $pkt and $self->{can_lzf}) {
2865 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2866 $pkt = "frag";
2867 }
2868
2869 $self->send_packet ($pkt); 3172 $self->send_big_packet ($pkt);
2870 } else {
2871 if ($color >= 0) {
2872 # replace some tags by gcfclient-compatible ones
2873 for ($msg) {
2874 1 while
2875 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2876 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2877 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2878 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2879 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2880 }
2881
2882 $color &= cf::NDI_COLOR_MASK;
2883
2884 utf8::encode $msg;
2885
2886 if (0 && $msg =~ /\[/) {
2887 # COMMAND/INFO
2888 $self->send_packet ("drawextinfo $color 10 8 $msg")
2889 } else {
2890 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2891 $self->send_packet ("drawinfo $color $msg")
2892 }
2893 }
2894 }
2895} 3173}
2896 3174
2897=item $client->ext_msg ($type, @msg) 3175=item $client->ext_msg ($type, @msg)
2898 3176
2899Sends an ext event to the client. 3177Sends an ext event to the client.
2902 3180
2903sub cf::client::ext_msg($$@) { 3181sub cf::client::ext_msg($$@) {
2904 my ($self, $type, @msg) = @_; 3182 my ($self, $type, @msg) = @_;
2905 3183
2906 if ($self->extcmd == 2) { 3184 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3185 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2908 } elsif ($self->extcmd == 1) { # TODO: remove 3186 } elsif ($self->extcmd == 1) { # TODO: remove
2909 push @msg, msgtype => "event_$type"; 3187 push @msg, msgtype => "event_$type";
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3188 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 } 3189 }
2912} 3190}
2913 3191
2914=item $client->ext_reply ($msgid, @msg) 3192=item $client->ext_reply ($msgid, @msg)
2915 3193
2919 3197
2920sub cf::client::ext_reply($$@) { 3198sub cf::client::ext_reply($$@) {
2921 my ($self, $id, @msg) = @_; 3199 my ($self, $id, @msg) = @_;
2922 3200
2923 if ($self->extcmd == 2) { 3201 if ($self->extcmd == 2) {
2924 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3202 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2925 } elsif ($self->extcmd == 1) { 3203 } elsif ($self->extcmd == 1) {
2926 #TODO: version 1, remove 3204 #TODO: version 1, remove
2927 unshift @msg, msgtype => "reply", msgid => $id; 3205 unshift @msg, msgtype => "reply", msgid => $id;
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3206 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2929 } 3207 }
2930} 3208}
2931 3209
2932=item $success = $client->query ($flags, "text", \&cb) 3210=item $success = $client->query ($flags, "text", \&cb)
2933 3211
3004 3282
3005 $ns->ext_reply ($reply, @reply) 3283 $ns->ext_reply ($reply, @reply)
3006 if $reply; 3284 if $reply;
3007 3285
3008 } else { 3286 } else {
3009 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3287 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3010 } 3288 }
3011 3289
3012 cf::override; 3290 cf::override;
3013 }, 3291 },
3014); 3292);
3034 3312
3035 $coro 3313 $coro
3036} 3314}
3037 3315
3038cf::client->attach ( 3316cf::client->attach (
3039 on_destroy => sub { 3317 on_client_destroy => sub {
3040 my ($ns) = @_; 3318 my ($ns) = @_;
3041 3319
3042 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3320 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3043 }, 3321 },
3044); 3322);
3060our $safe_hole = new Safe::Hole; 3338our $safe_hole = new Safe::Hole;
3061 3339
3062$SIG{FPE} = 'IGNORE'; 3340$SIG{FPE} = 'IGNORE';
3063 3341
3064$safe->permit_only (Opcode::opset qw( 3342$safe->permit_only (Opcode::opset qw(
3065 :base_core :base_mem :base_orig :base_math 3343 :base_core :base_mem :base_orig :base_math :base_loop
3066 grepstart grepwhile mapstart mapwhile 3344 grepstart grepwhile mapstart mapwhile
3067 sort time 3345 sort time
3068)); 3346));
3069 3347
3070# here we export the classes and methods available to script code 3348# here we export the classes and methods available to script code
3074The following functions and methods are available within a safe environment: 3352The following functions and methods are available within a safe environment:
3075 3353
3076 cf::object 3354 cf::object
3077 contr pay_amount pay_player map x y force_find force_add destroy 3355 contr pay_amount pay_player map x y force_find force_add destroy
3078 insert remove name archname title slaying race decrease split 3356 insert remove name archname title slaying race decrease split
3357 value
3079 3358
3080 cf::object::player 3359 cf::object::player
3081 player 3360 player
3082 3361
3083 cf::player 3362 cf::player
3089=cut 3368=cut
3090 3369
3091for ( 3370for (
3092 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3371 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3093 insert remove inv nrof name archname title slaying race 3372 insert remove inv nrof name archname title slaying race
3094 decrease split destroy change_exp)], 3373 decrease split destroy change_exp value msg lore send_msg)],
3095 ["cf::object::player" => qw(player)], 3374 ["cf::object::player" => qw(player)],
3096 ["cf::player" => qw(peaceful)], 3375 ["cf::player" => qw(peaceful send_msg)],
3097 ["cf::map" => qw(trigger)], 3376 ["cf::map" => qw(trigger)],
3098) { 3377) {
3099 no strict 'refs';
3100 my ($pkg, @funs) = @$_; 3378 my ($pkg, @funs) = @$_;
3101 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3379 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3102 for @funs; 3380 for @funs;
3103} 3381}
3104 3382
3119 3397
3120 my $qcode = $code; 3398 my $qcode = $code;
3121 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3399 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3122 $qcode =~ s/\n/\\n/g; 3400 $qcode =~ s/\n/\\n/g;
3123 3401
3402 %vars = (_dummy => 0) unless %vars;
3403
3404 my @res;
3124 local $_; 3405 local $_;
3125 local @safe::cf::_safe_eval_args = values %vars;
3126 3406
3127 my $eval = 3407 my $eval =
3128 "do {\n" 3408 "do {\n"
3129 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3409 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3130 . "#line 0 \"{$qcode}\"\n" 3410 . "#line 0 \"{$qcode}\"\n"
3131 . $code 3411 . $code
3132 . "\n}" 3412 . "\n}"
3133 ; 3413 ;
3134 3414
3415 if ($CFG{safe_eval}) {
3135 sub_generation_inc; 3416 sub_generation_inc;
3417 local @safe::cf::_safe_eval_args = values %vars;
3136 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3418 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3137 sub_generation_inc; 3419 sub_generation_inc;
3420 } else {
3421 local @cf::_safe_eval_args = values %vars;
3422 @res = wantarray ? eval eval : scalar eval $eval;
3423 }
3138 3424
3139 if ($@) { 3425 if ($@) {
3140 warn "$@"; 3426 warn "$@",
3141 warn "while executing safe code '$code'\n"; 3427 "while executing safe code '$code'\n",
3142 warn "with arguments " . (join " ", %vars) . "\n"; 3428 "with arguments " . (join " ", %vars) . "\n";
3143 } 3429 }
3144 3430
3145 wantarray ? @res : $res[0] 3431 wantarray ? @res : $res[0]
3146} 3432}
3147 3433
3161=cut 3447=cut
3162 3448
3163sub register_script_function { 3449sub register_script_function {
3164 my ($fun, $cb) = @_; 3450 my ($fun, $cb) = @_;
3165 3451
3166 no strict 'refs'; 3452 $fun = "safe::$fun" if $CFG{safe_eval};
3167 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3453 *$fun = $safe_hole->wrap ($cb);
3168} 3454}
3169 3455
3170=back 3456=back
3171 3457
3172=cut 3458=cut
3181 # for this (global event?) 3467 # for this (global event?)
3182 %ext::player_env::MUSIC_FACE_CACHE = (); 3468 %ext::player_env::MUSIC_FACE_CACHE = ();
3183 3469
3184 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3470 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3185 3471
3186 warn "loading facedata from $path\n"; 3472 trace "loading facedata from $path\n";
3187 3473
3188 my $facedata; 3474 my $facedata = decode_storable load_file $path;
3189 0 < aio_load $path, $facedata
3190 or die "$path: $!";
3191
3192 $facedata = Coro::Storable::thaw $facedata;
3193 3475
3194 $facedata->{version} == 2 3476 $facedata->{version} == 2
3195 or cf::cleanup "$path: version mismatch, cannot proceed."; 3477 or cf::cleanup "$path: version mismatch, cannot proceed.";
3196 3478
3197 # patch in the exptable 3479 # patch in the exptable
3480 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3198 $facedata->{resource}{"res/exp_table"} = { 3481 $facedata->{resource}{"res/exp_table"} = {
3199 type => FT_RSRC, 3482 type => FT_RSRC,
3200 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3483 data => $exp_table,
3484 hash => (Digest::MD5::md5 $exp_table),
3201 }; 3485 };
3202 cf::cede_to_tick; 3486 cf::cede_to_tick;
3203 3487
3204 { 3488 {
3205 my $faces = $facedata->{faceinfo}; 3489 my $faces = $facedata->{faceinfo};
3207 while (my ($face, $info) = each %$faces) { 3491 while (my ($face, $info) = each %$faces) {
3208 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3492 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3209 3493
3210 cf::face::set_visibility $idx, $info->{visibility}; 3494 cf::face::set_visibility $idx, $info->{visibility};
3211 cf::face::set_magicmap $idx, $info->{magicmap}; 3495 cf::face::set_magicmap $idx, $info->{magicmap};
3212 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3496 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3213 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3497 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3498 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3214 3499
3215 cf::cede_to_tick; 3500 cf::cede_to_tick;
3216 } 3501 }
3217 3502
3218 while (my ($face, $info) = each %$faces) { 3503 while (my ($face, $info) = each %$faces) {
3223 3508
3224 if (my $smooth = cf::face::find $info->{smooth}) { 3509 if (my $smooth = cf::face::find $info->{smooth}) {
3225 cf::face::set_smooth $idx, $smooth; 3510 cf::face::set_smooth $idx, $smooth;
3226 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3511 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3227 } else { 3512 } else {
3228 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3513 error "smooth face '$info->{smooth}' not found for face '$face'";
3229 } 3514 }
3230 3515
3231 cf::cede_to_tick; 3516 cf::cede_to_tick;
3232 } 3517 }
3233 } 3518 }
3242 3527
3243 cf::anim::invalidate_all; # d'oh 3528 cf::anim::invalidate_all; # d'oh
3244 } 3529 }
3245 3530
3246 { 3531 {
3247 # TODO: for gcfclient pleasure, we should give resources
3248 # that gcfclient doesn't grok a >10000 face index.
3249 my $res = $facedata->{resource}; 3532 my $res = $facedata->{resource};
3250 3533
3251 while (my ($name, $info) = each %$res) { 3534 while (my ($name, $info) = each %$res) {
3252 if (defined $info->{type}) { 3535 if (defined $info->{type}) {
3253 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3536 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3254 my $data;
3255 3537
3256 if ($info->{type} & 1) { 3538 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3257 # prepend meta info
3258
3259 my $meta = $enc->encode ({
3260 name => $name,
3261 %{ $info->{meta} || {} },
3262 });
3263
3264 $data = pack "(w/a*)*", $meta, $info->{data};
3265 } else {
3266 $data = $info->{data};
3267 }
3268
3269 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3270 cf::face::set_type $idx, $info->{type}; 3539 cf::face::set_type $idx, $info->{type};
3271 } else { 3540 } else {
3272 $RESOURCE{$name} = $info; 3541 $RESOURCE{$name} = $info; # unused
3273 } 3542 }
3274 3543
3275 cf::cede_to_tick; 3544 cf::cede_to_tick;
3276 } 3545 }
3277 } 3546 }
3278 3547
3279 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3548 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3280 3549
3281 1 3550 1
3282} 3551}
3283
3284cf::global->attach (on_resource_update => sub {
3285 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3286 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3287
3288 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3289 my $sound = $soundconf->{compat}[$_]
3290 or next;
3291
3292 my $face = cf::face::find "sound/$sound->[1]";
3293 cf::sound::set $sound->[0] => $face;
3294 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3295 }
3296
3297 while (my ($k, $v) = each %{$soundconf->{event}}) {
3298 my $face = cf::face::find "sound/$v";
3299 cf::sound::set $k => $face;
3300 }
3301 }
3302});
3303 3552
3304register_exticmd fx_want => sub { 3553register_exticmd fx_want => sub {
3305 my ($ns, $want) = @_; 3554 my ($ns, $want) = @_;
3306 3555
3307 while (my ($k, $v) = each %$want) { 3556 while (my ($k, $v) = each %$want) {
3346sub reload_treasures { 3595sub reload_treasures {
3347 load_resource_file "$DATADIR/treasures" 3596 load_resource_file "$DATADIR/treasures"
3348 or die "unable to load treasurelists\n"; 3597 or die "unable to load treasurelists\n";
3349} 3598}
3350 3599
3600sub reload_sound {
3601 trace "loading sound config from $DATADIR/sound\n";
3602
3603 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3604
3605 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3606 my $sound = $soundconf->{compat}[$_]
3607 or next;
3608
3609 my $face = cf::face::find "sound/$sound->[1]";
3610 cf::sound::set $sound->[0] => $face;
3611 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3612 }
3613
3614 while (my ($k, $v) = each %{$soundconf->{event}}) {
3615 my $face = cf::face::find "sound/$v";
3616 cf::sound::set $k => $face;
3617 }
3618}
3619
3351sub reload_resources { 3620sub reload_resources {
3352 warn "reloading resource files...\n"; 3621 trace "reloading resource files...\n";
3353 3622
3623 reload_exp_table;
3624 reload_materials;
3354 reload_facedata; 3625 reload_facedata;
3626 reload_sound;
3355 reload_archetypes; 3627 reload_archetypes;
3356 reload_regions; 3628 reload_regions;
3357 reload_treasures; 3629 reload_treasures;
3358 3630
3359 warn "finished reloading resource files\n"; 3631 trace "finished reloading resource files\n";
3360} 3632}
3361 3633
3362sub reload_config { 3634sub reload_config {
3363 open my $fh, "<:utf8", "$CONFDIR/config" 3635 trace "reloading config file...\n";
3364 or return;
3365 3636
3366 local $/; 3637 my $config = load_file "$CONFDIR/config";
3367 *CFG = YAML::Load <$fh>; 3638 utf8::decode $config;
3639 *CFG = decode_yaml $config;
3368 3640
3369 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3641 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3370 3642
3371 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3643 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3372 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3644 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3373 3645
3374 if (exists $CFG{mlockall}) { 3646 if (exists $CFG{mlockall}) {
3397 3669
3398 seek $fh, 0, 0; 3670 seek $fh, 0, 0;
3399 print $fh $$; 3671 print $fh $$;
3400} 3672}
3401 3673
3674sub main_loop {
3675 trace "EV::loop starting\n";
3676 if (1) {
3677 EV::loop;
3678 }
3679 trace "EV::loop returned\n";
3680 goto &main_loop unless $REALLY_UNLOOP;
3681}
3682
3402sub main { 3683sub main {
3403 cf::init_globals; # initialise logging 3684 cf::init_globals; # initialise logging
3404 3685
3405 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3686 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3406 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3687 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3407 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3688 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3408 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3689 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3409
3410 cf::init_experience;
3411 cf::init_anim;
3412 cf::init_attackmess;
3413 cf::init_dynamic;
3414 cf::init_block;
3415 3690
3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3691 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3417 3692
3418 # we must not ever block the main coroutine 3693 # we must not ever block the main coroutine
3419 local $Coro::idle = sub { 3694 local $Coro::idle = sub {
3425 }; 3700 };
3426 3701
3427 evthread_start IO::AIO::poll_fileno; 3702 evthread_start IO::AIO::poll_fileno;
3428 3703
3429 cf::sync_job { 3704 cf::sync_job {
3705 cf::incloader::init ();
3706
3707 cf::init_anim;
3708 cf::init_attackmess;
3709 cf::init_dynamic;
3710
3711 cf::load_settings;
3712
3430 reload_resources; 3713 reload_resources;
3431 reload_config; 3714 reload_config;
3432 db_init; 3715 db_init;
3433 3716
3434 cf::load_settings;
3435 cf::load_materials;
3436 cf::init_uuid; 3717 cf::init_uuid;
3437 cf::init_signals; 3718 cf::init_signals;
3438 cf::init_commands;
3439 cf::init_skills; 3719 cf::init_skills;
3440 3720
3441 cf::init_beforeplay; 3721 cf::init_beforeplay;
3442 3722
3443 atomic; 3723 atomic;
3445 load_extensions; 3725 load_extensions;
3446 3726
3447 utime time, time, $RUNTIMEFILE; 3727 utime time, time, $RUNTIMEFILE;
3448 3728
3449 # no (long-running) fork's whatsoever before this point(!) 3729 # no (long-running) fork's whatsoever before this point(!)
3730 use POSIX ();
3450 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3731 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3451 3732
3452 (pop @POST_INIT)->(0) while @POST_INIT; 3733 cf::_post_init 0;
3453 }; 3734 };
3454 3735
3455 EV::loop; 3736 cf::object::thawer::errors_are_fatal 0;
3737 info "parse errors in files are no longer fatal from this point on.\n";
3738
3739 my $free_main; $free_main = EV::idle sub {
3740 undef $free_main;
3741 undef &main; # free gobs of memory :)
3742 };
3743
3744 goto &main_loop;
3456} 3745}
3457 3746
3458############################################################################# 3747#############################################################################
3459# initialisation and cleanup 3748# initialisation and cleanup
3460 3749
3461# install some emergency cleanup handlers 3750# install some emergency cleanup handlers
3462BEGIN { 3751BEGIN {
3463 our %SIGWATCHER = (); 3752 our %SIGWATCHER = ();
3464 for my $signal (qw(INT HUP TERM)) { 3753 for my $signal (qw(INT HUP TERM)) {
3465 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3754 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3466 cf::cleanup "SIG$signal"; 3755 cf::cleanup "SIG$signal";
3467 }; 3756 };
3468 } 3757 }
3469} 3758}
3470 3759
3471sub write_runtime_sync { 3760sub write_runtime_sync {
3761 my $t0 = AE::time;
3762
3472 # first touch the runtime file to show we are still running: 3763 # first touch the runtime file to show we are still running:
3473 # the fsync below can take a very very long time. 3764 # the fsync below can take a very very long time.
3474 3765
3475 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3766 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3476 3767
3477 my $guard = cf::lock_acquire "write_runtime"; 3768 my $guard = cf::lock_acquire "write_runtime";
3478 3769
3479 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3770 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3480 or return; 3771 or return;
3481 3772
3482 my $value = $cf::RUNTIME + 90 + 10; 3773 my $value = $cf::RUNTIME + 90 + 10;
3483 # 10 is the runtime save interval, for a monotonic clock 3774 # 10 is the runtime save interval, for a monotonic clock
3484 # 60 allows for the watchdog to kill the server. 3775 # 60 allows for the watchdog to kill the server.
3497 or return; 3788 or return;
3498 3789
3499 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3790 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3500 and return; 3791 and return;
3501 3792
3502 warn "runtime file written.\n"; 3793 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3503 3794
3504 1 3795 1
3505} 3796}
3506 3797
3507our $uuid_lock; 3798our $uuid_lock;
3519 or return; 3810 or return;
3520 3811
3521 my $value = uuid_seq uuid_cur; 3812 my $value = uuid_seq uuid_cur;
3522 3813
3523 unless ($value) { 3814 unless ($value) {
3524 warn "cowardly refusing to write zero uuid value!\n"; 3815 info "cowardly refusing to write zero uuid value!\n";
3525 return; 3816 return;
3526 } 3817 }
3527 3818
3528 my $value = uuid_str $value + $uuid_skip; 3819 my $value = uuid_str $value + $uuid_skip;
3529 $uuid_skip = 0; 3820 $uuid_skip = 0;
3539 or return; 3830 or return;
3540 3831
3541 aio_rename "$uuid~", $uuid 3832 aio_rename "$uuid~", $uuid
3542 and return; 3833 and return;
3543 3834
3544 warn "uuid file written ($value).\n"; 3835 trace "uuid file written ($value).\n";
3545 3836
3546 1 3837 1
3547 3838
3548} 3839}
3549 3840
3555} 3846}
3556 3847
3557sub emergency_save() { 3848sub emergency_save() {
3558 my $freeze_guard = cf::freeze_mainloop; 3849 my $freeze_guard = cf::freeze_mainloop;
3559 3850
3560 warn "enter emergency perl save\n"; 3851 info "emergency_perl_save: enter\n";
3852
3853 # this is a trade-off: we want to be very quick here, so
3854 # save all maps without fsync, and later call a global sync
3855 # (which in turn might be very very slow)
3856 local $USE_FSYNC = 0;
3561 3857
3562 cf::sync_job { 3858 cf::sync_job {
3859 cf::write_runtime_sync; # external watchdog should not bark
3860
3563 # use a peculiar iteration method to avoid tripping on perl 3861 # use a peculiar iteration method to avoid tripping on perl
3564 # refcount bugs in for. also avoids problems with players 3862 # refcount bugs in for. also avoids problems with players
3565 # and maps saved/destroyed asynchronously. 3863 # and maps saved/destroyed asynchronously.
3566 warn "begin emergency player save\n"; 3864 info "emergency_perl_save: begin player save\n";
3567 for my $login (keys %cf::PLAYER) { 3865 for my $login (keys %cf::PLAYER) {
3568 my $pl = $cf::PLAYER{$login} or next; 3866 my $pl = $cf::PLAYER{$login} or next;
3569 $pl->valid or next; 3867 $pl->valid or next;
3570 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3868 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3571 $pl->save; 3869 $pl->save;
3572 } 3870 }
3573 warn "end emergency player save\n"; 3871 info "emergency_perl_save: end player save\n";
3574 3872
3575 warn "begin emergency map save\n"; 3873 cf::write_runtime_sync; # external watchdog should not bark
3874
3875 info "emergency_perl_save: begin map save\n";
3576 for my $path (keys %cf::MAP) { 3876 for my $path (keys %cf::MAP) {
3577 my $map = $cf::MAP{$path} or next; 3877 my $map = $cf::MAP{$path} or next;
3578 $map->valid or next; 3878 $map->valid or next;
3579 $map->save; 3879 $map->save;
3580 } 3880 }
3581 warn "end emergency map save\n"; 3881 info "emergency_perl_save: end map save\n";
3582 3882
3583 warn "begin emergency database checkpoint\n"; 3883 cf::write_runtime_sync; # external watchdog should not bark
3884
3885 info "emergency_perl_save: begin database checkpoint\n";
3584 BDB::db_env_txn_checkpoint $DB_ENV; 3886 BDB::db_env_txn_checkpoint $DB_ENV;
3585 warn "end emergency database checkpoint\n"; 3887 info "emergency_perl_save: end database checkpoint\n";
3586 3888
3587 warn "begin write uuid\n"; 3889 info "emergency_perl_save: begin write uuid\n";
3588 write_uuid_sync 1; 3890 write_uuid_sync 1;
3589 warn "end write uuid\n"; 3891 info "emergency_perl_save: end write uuid\n";
3892
3893 cf::write_runtime_sync; # external watchdog should not bark
3894
3895 trace "emergency_perl_save: syncing database to disk";
3896 BDB::db_env_txn_checkpoint $DB_ENV;
3897
3898 info "emergency_perl_save: starting sync\n";
3899 IO::AIO::aio_sync sub {
3900 info "emergency_perl_save: finished sync\n";
3901 };
3902
3903 cf::write_runtime_sync; # external watchdog should not bark
3904
3905 trace "emergency_perl_save: flushing outstanding aio requests";
3906 while (IO::AIO::nreqs || BDB::nreqs) {
3907 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3908 }
3909
3910 cf::write_runtime_sync; # external watchdog should not bark
3590 }; 3911 };
3591 3912
3592 warn "leave emergency perl save\n"; 3913 info "emergency_perl_save: leave\n";
3593} 3914}
3594 3915
3595sub post_cleanup { 3916sub post_cleanup {
3596 my ($make_core) = @_; 3917 my ($make_core) = @_;
3597 3918
3919 IO::AIO::flush;
3920
3598 warn Carp::longmess "post_cleanup backtrace" 3921 error Carp::longmess "post_cleanup backtrace"
3599 if $make_core; 3922 if $make_core;
3600 3923
3601 my $fh = pidfile; 3924 my $fh = pidfile;
3602 unlink $PIDFILE if <$fh> == $$; 3925 unlink $PIDFILE if <$fh> == $$;
3603} 3926}
3623 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3946 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3624 for my $name (keys %$leaf_symtab) { 3947 for my $name (keys %$leaf_symtab) {
3625 _gv_clear *{"$pkg$name"}; 3948 _gv_clear *{"$pkg$name"};
3626# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3949# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3627 } 3950 }
3628 warn "cleared package $pkg\n";#d#
3629} 3951}
3630 3952
3631sub do_reload_perl() { 3953sub do_reload_perl() {
3632 # can/must only be called in main 3954 # can/must only be called in main
3633 if ($Coro::current != $Coro::main) { 3955 unless (in_main) {
3634 warn "can only reload from main coroutine"; 3956 error "can only reload from main coroutine";
3635 return; 3957 return;
3636 } 3958 }
3637 3959
3638 return if $RELOAD++; 3960 return if $RELOAD++;
3639 3961
3962 my $t1 = AE::time;
3963
3640 while ($RELOAD) { 3964 while ($RELOAD) {
3641 warn "reloading..."; 3965 cf::get_slot 0.1, -1, "reload_perl";
3966 info "perl_reload: reloading...";
3642 3967
3643 warn "entering sync_job"; 3968 trace "perl_reload: entering sync_job";
3644 3969
3645 cf::sync_job { 3970 cf::sync_job {
3646 cf::write_runtime_sync; # external watchdog should not bark
3647 cf::emergency_save; 3971 #cf::emergency_save;
3648 cf::write_runtime_sync; # external watchdog should not bark
3649 3972
3650 warn "syncing database to disk";
3651 BDB::db_env_txn_checkpoint $DB_ENV;
3652
3653 # if anything goes wrong in here, we should simply crash as we already saved
3654
3655 warn "flushing outstanding aio requests";
3656 while (IO::AIO::nreqs || BDB::nreqs) {
3657 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3658 }
3659
3660 warn "cancelling all extension coros"; 3973 trace "perl_reload: cancelling all extension coros";
3661 $_->cancel for values %EXT_CORO; 3974 $_->cancel for values %EXT_CORO;
3662 %EXT_CORO = (); 3975 %EXT_CORO = ();
3663 3976
3664 warn "removing commands"; 3977 trace "perl_reload: removing commands";
3665 %COMMAND = (); 3978 %COMMAND = ();
3666 3979
3667 warn "removing ext/exti commands"; 3980 trace "perl_reload: removing ext/exti commands";
3668 %EXTCMD = (); 3981 %EXTCMD = ();
3669 %EXTICMD = (); 3982 %EXTICMD = ();
3670 3983
3671 warn "unloading/nuking all extensions"; 3984 trace "perl_reload: unloading/nuking all extensions";
3672 for my $pkg (@EXTS) { 3985 for my $pkg (@EXTS) {
3673 warn "... unloading $pkg"; 3986 trace "... unloading $pkg";
3674 3987
3675 if (my $cb = $pkg->can ("unload")) { 3988 if (my $cb = $pkg->can ("unload")) {
3676 eval { 3989 eval {
3677 $cb->($pkg); 3990 $cb->($pkg);
3678 1 3991 1
3679 } or warn "$pkg unloaded, but with errors: $@"; 3992 } or error "$pkg unloaded, but with errors: $@";
3680 } 3993 }
3681 3994
3682 warn "... clearing $pkg"; 3995 trace "... clearing $pkg";
3683 clear_package $pkg; 3996 clear_package $pkg;
3684 } 3997 }
3685 3998
3686 warn "unloading all perl modules loaded from $LIBDIR"; 3999 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3687 while (my ($k, $v) = each %INC) { 4000 while (my ($k, $v) = each %INC) {
3688 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4001 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3689 4002
3690 warn "... unloading $k"; 4003 trace "... unloading $k";
3691 delete $INC{$k}; 4004 delete $INC{$k};
3692 4005
3693 $k =~ s/\.pm$//; 4006 $k =~ s/\.pm$//;
3694 $k =~ s/\//::/g; 4007 $k =~ s/\//::/g;
3695 4008
3698 } 4011 }
3699 4012
3700 clear_package $k; 4013 clear_package $k;
3701 } 4014 }
3702 4015
3703 warn "getting rid of safe::, as good as possible"; 4016 trace "perl_reload: getting rid of safe::, as good as possible";
3704 clear_package "safe::$_" 4017 clear_package "safe::$_"
3705 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4018 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3706 4019
3707 warn "unloading cf.pm \"a bit\""; 4020 trace "perl_reload: unloading cf.pm \"a bit\"";
3708 delete $INC{"cf.pm"}; 4021 delete $INC{"cf.pm"};
3709 delete $INC{"cf/pod.pm"}; 4022 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3710 4023
3711 # don't, removes xs symbols, too, 4024 # don't, removes xs symbols, too,
3712 # and global variables created in xs 4025 # and global variables created in xs
3713 #clear_package __PACKAGE__; 4026 #clear_package __PACKAGE__;
3714 4027
3715 warn "unload completed, starting to reload now"; 4028 info "perl_reload: unload completed, starting to reload now";
3716 4029
3717 warn "reloading cf.pm"; 4030 trace "perl_reload: reloading cf.pm";
3718 require cf; 4031 require cf;
3719 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4032 cf::_connect_to_perl_1;
3720 4033
3721 warn "loading config and database again"; 4034 trace "perl_reload: loading config and database again";
3722 cf::reload_config; 4035 cf::reload_config;
3723 4036
3724 warn "loading extensions"; 4037 trace "perl_reload: loading extensions";
3725 cf::load_extensions; 4038 cf::load_extensions;
3726 4039
4040 if ($REATTACH_ON_RELOAD) {
3727 warn "reattaching attachments to objects/players"; 4041 trace "perl_reload: reattaching attachments to objects/players";
3728 _global_reattach; # objects, sockets 4042 _global_reattach; # objects, sockets
3729 warn "reattaching attachments to maps"; 4043 trace "perl_reload: reattaching attachments to maps";
3730 reattach $_ for values %MAP; 4044 reattach $_ for values %MAP;
3731 warn "reattaching attachments to players"; 4045 trace "perl_reload: reattaching attachments to players";
3732 reattach $_ for values %PLAYER; 4046 reattach $_ for values %PLAYER;
4047 }
3733 4048
3734 warn "running post_load"; 4049 cf::_post_init 1;
3735 (pop @POST_INIT)->(1) while @POST_INIT;
3736 4050
3737 warn "leaving sync_job"; 4051 trace "perl_reload: leaving sync_job";
3738 4052
3739 1 4053 1
3740 } or do { 4054 } or do {
3741 warn $@; 4055 error $@;
3742 cf::cleanup "error while reloading, exiting."; 4056 cf::cleanup "perl_reload: error, exiting.";
3743 }; 4057 };
3744 4058
3745 warn "reloaded";
3746 --$RELOAD; 4059 --$RELOAD;
3747 } 4060 }
4061
4062 $t1 = AE::time - $t1;
4063 info "perl_reload: completed in ${t1}s\n";
3748}; 4064};
3749 4065
3750our $RELOAD_WATCHER; # used only during reload 4066our $RELOAD_WATCHER; # used only during reload
3751 4067
3752sub reload_perl() { 4068sub reload_perl() {
3753 # doing reload synchronously and two reloads happen back-to-back, 4069 # doing reload synchronously and two reloads happen back-to-back,
3754 # coro crashes during coro_state_free->destroy here. 4070 # coro crashes during coro_state_free->destroy here.
3755 4071
4072 $RELOAD_WATCHER ||= cf::async {
4073 Coro::AIO::aio_wait cache_extensions;
4074
3756 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 4075 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3757 do_reload_perl; 4076 do_reload_perl;
3758 undef $RELOAD_WATCHER; 4077 undef $RELOAD_WATCHER;
4078 };
3759 }; 4079 };
3760} 4080}
3761 4081
3762register_command "reload" => sub { 4082register_command "reload" => sub {
3763 my ($who, $arg) = @_; 4083 my ($who, $arg) = @_;
3769 reload_perl; 4089 reload_perl;
3770 }; 4090 };
3771 } 4091 }
3772}; 4092};
3773 4093
3774unshift @INC, $LIBDIR; 4094#############################################################################
3775 4095
3776my $bug_warning = 0; 4096my $bug_warning = 0;
3777 4097
3778our @WAIT_FOR_TICK; 4098our @WAIT_FOR_TICK;
3779our @WAIT_FOR_TICK_BEGIN; 4099our @WAIT_FOR_TICK_BEGIN;
3780 4100
3781sub wait_for_tick { 4101sub wait_for_tick() {
3782 return if tick_inhibit || $Coro::current == $Coro::main; 4102 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3783 4103
3784 my $signal = new Coro::Signal; 4104 my $signal = new Coro::Signal;
3785 push @WAIT_FOR_TICK, $signal; 4105 push @WAIT_FOR_TICK, $signal;
3786 $signal->wait; 4106 $signal->wait;
3787} 4107}
3788 4108
3789sub wait_for_tick_begin { 4109sub wait_for_tick_begin() {
3790 return if tick_inhibit || $Coro::current == $Coro::main; 4110 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3791 4111
3792 my $signal = new Coro::Signal; 4112 my $signal = new Coro::Signal;
3793 push @WAIT_FOR_TICK_BEGIN, $signal; 4113 push @WAIT_FOR_TICK_BEGIN, $signal;
3794 $signal->wait; 4114 $signal->wait;
3795} 4115}
3801 return; 4121 return;
3802 } 4122 }
3803 4123
3804 cf::server_tick; # one server iteration 4124 cf::server_tick; # one server iteration
3805 4125
4126 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4127
3806 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4128 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3807 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4129 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3808 Coro::async_pool { 4130 Coro::async_pool {
3809 $Coro::current->{desc} = "runtime saver"; 4131 $Coro::current->{desc} = "runtime saver";
3810 write_runtime_sync 4132 write_runtime_sync
3811 or warn "ERROR: unable to write runtime file: $!"; 4133 or error "ERROR: unable to write runtime file: $!";
3812 }; 4134 };
3813 } 4135 }
3814 4136
3815 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4137 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3816 $sig->send; 4138 $sig->send;
3824 4146
3825 if (0) { 4147 if (0) {
3826 if ($NEXT_TICK) { 4148 if ($NEXT_TICK) {
3827 my $jitter = $TICK_START - $NEXT_TICK; 4149 my $jitter = $TICK_START - $NEXT_TICK;
3828 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4150 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3829 warn "jitter $JITTER\n";#d# 4151 debug "jitter $JITTER\n";#d#
3830 } 4152 }
3831 } 4153 }
3832} 4154}
3833 4155
3834{ 4156{
3835 # configure BDB 4157 # configure BDB
3836 4158
3837 BDB::min_parallel 8; 4159 BDB::min_parallel 16;
3838 BDB::max_poll_reqs $TICK * 0.1; 4160 BDB::max_poll_reqs $TICK * 0.1;
3839 $AnyEvent::BDB::WATCHER->priority (1); 4161 $AnyEvent::BDB::WATCHER->priority (1);
3840 4162
3841 unless ($DB_ENV) { 4163 unless ($DB_ENV) {
3842 $DB_ENV = BDB::db_env_create; 4164 $DB_ENV = BDB::db_env_create;
3879 IO::AIO::min_parallel 8; 4201 IO::AIO::min_parallel 8;
3880 IO::AIO::max_poll_time $TICK * 0.1; 4202 IO::AIO::max_poll_time $TICK * 0.1;
3881 undef $AnyEvent::AIO::WATCHER; 4203 undef $AnyEvent::AIO::WATCHER;
3882} 4204}
3883 4205
3884my $_log_backtrace; 4206our $_log_backtrace;
4207our $_log_backtrace_last;
3885 4208
3886sub _log_backtrace { 4209sub _log_backtrace {
3887 my ($msg, @addr) = @_; 4210 my ($msg, @addr) = @_;
3888 4211
3889 $msg =~ s/\n//; 4212 $msg =~ s/\n$//;
3890 4213
4214 if ($_log_backtrace_last eq $msg) {
4215 LOG llevInfo, "[ABT] $msg\n";
4216 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3891 # limit the # of concurrent backtraces 4217 # limit the # of concurrent backtraces
3892 if ($_log_backtrace < 2) { 4218 } elsif ($_log_backtrace < 2) {
4219 $_log_backtrace_last = $msg;
3893 ++$_log_backtrace; 4220 ++$_log_backtrace;
3894 my $perl_bt = Carp::longmess $msg; 4221 my $perl_bt = Carp::longmess $msg;
3895 async { 4222 async {
3896 $Coro::current->{desc} = "abt $msg"; 4223 $Coro::current->{desc} = "abt $msg";
3897 4224
3917 LOG llevInfo, "[ABT] $_\n" for @bt; 4244 LOG llevInfo, "[ABT] $_\n" for @bt;
3918 --$_log_backtrace; 4245 --$_log_backtrace;
3919 }; 4246 };
3920 } else { 4247 } else {
3921 LOG llevInfo, "[ABT] $msg\n"; 4248 LOG llevInfo, "[ABT] $msg\n";
3922 LOG llevInfo, "[ABT] [suppressed]\n"; 4249 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3923 } 4250 }
3924} 4251}
3925 4252
3926# load additional modules 4253# load additional modules
3927use cf::pod; 4254require "cf/$_.pm" for @EXTRA_MODULES;
4255cf::_connect_to_perl_2;
3928 4256
3929END { cf::emergency_save } 4257END { cf::emergency_save }
3930 4258
39311 42591
3932 4260

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines