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.564 by elmex, Thu Apr 28 14:58:08 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
1636 for (@$files) { 1816 for (@$files) {
1637 utf8::decode $_; 1817 utf8::decode $_;
1638 next if /\.(?:pl|pst)$/; 1818 next if /\.(?:pl|pst)$/;
1639 next unless /^$PATH_SEP/o; 1819 next unless /^$PATH_SEP/o;
1640 1820
1641 push @paths, cf::map::normalise "~$pl/$_"; 1821 push @paths, cf::map::normalise "~$pl/$_", $pl->map;
1642 } 1822 }
1643 1823
1644 \@paths 1824 \@paths
1645} 1825}
1646 1826
1686 1866
1687=cut 1867=cut
1688 1868
1689sub find_by_path($) { 1869sub find_by_path($) {
1690 my ($path) = @_; 1870 my ($path) = @_;
1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1691 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}) {
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 #
1786 # {... are special paths that are not being touched 1954 # {... are special paths that are not being touched
1787 # ?xxx/... are special absolute paths 1955 # ?xxx/... are special absolute paths
1788 # ?random/... random maps 1956 # ?random/... random maps
1789 # /... normal maps 1957 # /... normal maps
1790 # ~user/... per-player map of a specific user 1958 # ~user/... per-player map of a specific user
1959 # !up !down for quad maps, or other maps with up/down layers
1791 1960
1792 $path =~ s/$PATH_SEP/\//go; 1961 $path =~ s/$PATH_SEP/\//go;
1793 1962
1794 # treat it as relative path if it starts with 1963 # treat it as relative path if it starts with
1795 # something that looks reasonable 1964 # something that looks reasonable
1796 if ($path =~ m{^(?:\./|\.\./|\w)}) { 1965 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1797 $base or Carp::carp "normalise called with relative path and no base: '$path'"; 1966 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1798 1967
1799 $base =~ s{[^/]+/?$}{}; 1968 $base =~ s{[^/]+/?$}{};
1800 $path = "$base/$path"; 1969 $path = "$base/$path";
1970
1971 } elsif ($path eq '!up') {
1972 $base && ref $base
1973 or Carp::carp "normalise called with relative tile path and no base: '$path'";
1974
1975 my $uppth = $base->tile_path (cf::TILE_UP);
1976 $path = $uppth if $uppth;
1977
1978 } elsif ($path eq '!down') {
1979 $base && ref $base
1980 or Carp::carp "normalise called with relative tile path and no base: '$path'";
1981
1982 my $dpth = $base->tile_path (cf::TILE_DOWN);
1983 $path = $dpth if $dpth;
1801 } 1984 }
1802 1985
1803 for ($path) { 1986 for ($path) {
1804 redo if s{//}{/};
1805 redo if s{/\.?/}{/}; 1987 redo if s{/\.?/}{/};
1806 redo if s{/[^/]+/\.\./}{/}; 1988 redo if s{/[^/]+/\.\./}{/};
1807 } 1989 }
1808 1990
1809 $path 1991 $path
1823 $self->init; # pass $1 etc. 2005 $self->init; # pass $1 etc.
1824 return $self; 2006 return $self;
1825 } 2007 }
1826 } 2008 }
1827 2009
1828 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2010 Carp::cluck "unable to resolve path '$path' (base '$base')";
1829 () 2011 ()
1830} 2012}
1831 2013
2014# may re-bless or do other evil things
1832sub init { 2015sub init {
1833 my ($self) = @_; 2016 my ($self) = @_;
1834 2017
1835 $self 2018 $self
1836} 2019}
1865sub uniq_path { 2048sub uniq_path {
1866 my ($self) = @_; 2049 my ($self) = @_;
1867 2050
1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2051 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1869 "$UNIQUEDIR/$path" 2052 "$UNIQUEDIR/$path"
1870}
1871
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} 2053}
1880 2054
1881sub decay_objects { 2055sub decay_objects {
1882 my ($self) = @_; 2056 my ($self) = @_;
1883 2057
1965 2139
1966sub find; 2140sub find;
1967sub find { 2141sub find {
1968 my ($path, $origin) = @_; 2142 my ($path, $origin) = @_;
1969 2143
2144 cf::cede_to_tick;
2145
1970 $path = normalise $path, $origin && $origin->path; 2146 $path = normalise $path, $origin;
1971 2147
1972 cf::lock_wait "map_data:$path";#d#remove 2148 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 cf::lock_wait "map_find:$path"; 2149 my $guard2 = cf::lock_acquire "map_find:$path";
1974 2150
1975 $cf::MAP{$path} || do { 2151 $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 2152 my $map = new_from_path cf::map $path
1980 or return; 2153 or return;
1981 2154
1982 $map->{last_save} = $cf::RUNTIME; 2155 $map->{last_save} = $cf::RUNTIME;
1983 2156
1995 2168
1996 $cf::MAP{$path} = $map 2169 $cf::MAP{$path} = $map
1997 } 2170 }
1998} 2171}
1999 2172
2000sub pre_load { } 2173sub pre_load { }
2001sub post_load { } 2174#sub post_load { } # XS
2002 2175
2003sub load { 2176sub load {
2004 my ($self) = @_; 2177 my ($self) = @_;
2005 2178
2006 local $self->{deny_reset} = 1; # loading can take a long time 2179 local $self->{deny_reset} = 1; # loading can take a long time
2018 $self->alloc; 2191 $self->alloc;
2019 2192
2020 $self->pre_load; 2193 $self->pre_load;
2021 cf::cede_to_tick; 2194 cf::cede_to_tick;
2022 2195
2196 if (exists $self->{load_path}) {
2023 my $f = new_from_file cf::object::thawer $self->{load_path}; 2197 my $f = new_from_file cf::object::thawer $self->{load_path};
2024 $f->skip_block; 2198 $f->skip_block;
2025 $self->_load_objects ($f) 2199 $self->_load_objects ($f)
2026 or return; 2200 or return;
2027 2201
2028 $self->post_load_original 2202 $self->post_load_original
2029 if delete $self->{load_original}; 2203 if delete $self->{load_original};
2030 2204
2031 if (my $uniq = $self->uniq_path) { 2205 if (my $uniq = $self->uniq_path) {
2032 utf8::encode $uniq; 2206 utf8::encode $uniq;
2033 unless (aio_stat $uniq) { 2207 unless (aio_stat $uniq) {
2034 if (my $f = new_from_file cf::object::thawer $uniq) { 2208 if (my $f = new_from_file cf::object::thawer $uniq) {
2035 $self->clear_unique_items; 2209 $self->clear_unique_items;
2036 $self->_load_objects ($f); 2210 $self->_load_objects ($f);
2037 $f->resolve_delayed_derefs; 2211 $f->resolve_delayed_derefs;
2212 }
2038 } 2213 }
2039 } 2214 }
2040 }
2041 2215
2042 $f->resolve_delayed_derefs; 2216 $f->resolve_delayed_derefs;
2217 }
2043 2218
2044 cf::cede_to_tick; 2219 cf::cede_to_tick;
2045 # now do the right thing for maps 2220 # now do the right thing for maps
2046 $self->link_multipart_objects; 2221 $self->link_multipart_objects;
2047 $self->difficulty ($self->estimate_difficulty) 2222 $self->difficulty ($self->estimate_difficulty)
2051 unless ($self->{deny_activate}) { 2226 unless ($self->{deny_activate}) {
2052 $self->decay_objects; 2227 $self->decay_objects;
2053 $self->fix_auto_apply; 2228 $self->fix_auto_apply;
2054 $self->update_buttons; 2229 $self->update_buttons;
2055 cf::cede_to_tick; 2230 cf::cede_to_tick;
2056 $self->set_darkness_map;
2057 cf::cede_to_tick;
2058 $self->activate; 2231 $self->activate;
2059 } 2232 }
2060 2233
2061 $self->{last_save} = $cf::RUNTIME; 2234 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME); 2235 $self->last_access ($cf::RUNTIME);
2063 2236
2064 $self->in_memory (cf::MAP_ACTIVE); 2237 $self->in_memory (cf::MAP_ACTIVE);
2065 } 2238 }
2066 2239
2067 $self->post_load; 2240 $self->post_load;
2068}
2069 2241
2242 1
2243}
2244
2245# customize the map for a given player, i.e.
2246# return the _real_ map. used by e.g. per-player
2247# maps to change the path to ~playername/mappath
2070sub customise_for { 2248sub customise_for {
2071 my ($self, $ob) = @_; 2249 my ($self, $ob) = @_;
2072 2250
2073 return find "~" . $ob->name . "/" . $self->{path} 2251 return find "~" . $ob->name . "/" . $self->{path}
2074 if $self->per_player; 2252 if $self->per_player;
2090 or next; 2268 or next;
2091 $neigh = find $neigh, $map 2269 $neigh = find $neigh, $map
2092 or next; 2270 or next;
2093 $neigh->load; 2271 $neigh->load;
2094 2272
2273 # now find the diagonal neighbours
2095 push @neigh, 2274 push @neigh,
2096 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2275 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2097 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2276 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2098 } 2277 }
2099 2278
2106} 2285}
2107 2286
2108sub find_sync { 2287sub find_sync {
2109 my ($path, $origin) = @_; 2288 my ($path, $origin) = @_;
2110 2289
2111 cf::sync_job { find $path, $origin } 2290 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2291 if $Coro::current == $Coro::main;
2292
2293 find $path, $origin
2112} 2294}
2113 2295
2114sub do_load_sync { 2296sub do_load_sync {
2115 my ($map) = @_; 2297 my ($map) = @_;
2116 2298
2117 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2299 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2118 if $Coro::current == $Coro::main; 2300 if $Coro::current == $Coro::main;
2119 2301
2120 cf::sync_job { $map->load }; 2302 $map->load;
2121} 2303}
2122 2304
2123our %MAP_PREFETCH; 2305our %MAP_PREFETCH;
2124our $MAP_PREFETCHER = undef; 2306our $MAP_PREFETCHER = undef;
2125 2307
2126sub find_async { 2308sub find_async {
2127 my ($path, $origin, $load) = @_; 2309 my ($path, $origin, $load) = @_;
2128 2310
2129 $path = normalise $path, $origin && $origin->{path}; 2311 $path = normalise $path, $origin;
2130 2312
2131 if (my $map = $cf::MAP{$path}) { 2313 if (my $map = $cf::MAP{$path}) {
2132 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2314 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2133 } 2315 }
2134 2316
2151 $MAP_PREFETCHER->prio (6); 2333 $MAP_PREFETCHER->prio (6);
2152 2334
2153 () 2335 ()
2154} 2336}
2155 2337
2338# common code, used by both ->save and ->swapout
2156sub save { 2339sub _save {
2157 my ($self) = @_; 2340 my ($self) = @_;
2158
2159 my $lock = cf::lock_acquire "map_data:$self->{path}";
2160 2341
2161 $self->{last_save} = $cf::RUNTIME; 2342 $self->{last_save} = $cf::RUNTIME;
2162 2343
2163 return unless $self->dirty; 2344 return unless $self->dirty;
2164 2345
2184 } else { 2365 } else {
2185 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2366 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2186 } 2367 }
2187} 2368}
2188 2369
2370sub save {
2371 my ($self) = @_;
2372
2373 my $lock = cf::lock_acquire "map_data:$self->{path}";
2374
2375 $self->_save;
2376}
2377
2189sub swap_out { 2378sub swap_out {
2190 my ($self) = @_; 2379 my ($self) = @_;
2191 2380
2192 # save first because save cedes
2193 $self->save;
2194
2195 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2381 my $lock = cf::lock_acquire "map_data:$self->{path}";
2196 2382
2197 return if $self->players;
2198 return if $self->in_memory != cf::MAP_ACTIVE; 2383 return if $self->in_memory != cf::MAP_ACTIVE;
2199 return if $self->{deny_save}; 2384 return if $self->{deny_save};
2385 return if $self->players;
2200 2386
2387 # first deactivate the map and "unlink" it from the core
2388 $self->deactivate;
2389 $_->clear_links_to ($self) for values %cf::MAP;
2201 $self->in_memory (cf::MAP_SWAPPED); 2390 $self->in_memory (cf::MAP_SWAPPED);
2391
2392 # then atomically save
2393 $self->_save;
2394
2395 # then free the map
2396 $self->clear;
2397}
2398
2399sub reset_at {
2400 my ($self) = @_;
2401
2402 # TODO: safety, remove and allow resettable per-player maps
2403 return 1e99 if $self->{deny_reset};
2404
2405 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2406 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2407
2408 $time + $to
2409}
2410
2411sub should_reset {
2412 my ($self) = @_;
2413
2414 $self->reset_at <= $cf::RUNTIME
2415}
2416
2417sub reset {
2418 my ($self) = @_;
2419
2420 my $lock = cf::lock_acquire "map_data:$self->{path}";
2421
2422 return if $self->players;
2423
2424 cf::trace "resetting map ", $self->path, "\n";
2425
2426 $self->in_memory (cf::MAP_SWAPPED);
2427
2428 # need to save uniques path
2429 unless ($self->{deny_save}) {
2430 my $uniq = $self->uniq_path; utf8::encode $uniq;
2431
2432 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2433 if $uniq;
2434 }
2435
2436 delete $cf::MAP{$self->path};
2202 2437
2203 $self->deactivate; 2438 $self->deactivate;
2204 $_->clear_links_to ($self) for values %cf::MAP; 2439 $_->clear_links_to ($self) for values %cf::MAP;
2205 $self->clear; 2440 $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 2441
2251 $self->unlink_save; 2442 $self->unlink_save;
2252 $self->destroy; 2443 $self->destroy;
2253} 2444}
2254 2445
2262 2453
2263 delete $cf::MAP{$self->path}; 2454 delete $cf::MAP{$self->path};
2264 2455
2265 $self->unlink_save; 2456 $self->unlink_save;
2266 2457
2267 bless $self, "cf::map"; 2458 bless $self, "cf::map::wrap";
2268 delete $self->{deny_reset}; 2459 delete $self->{deny_reset};
2269 $self->{deny_save} = 1; 2460 $self->{deny_save} = 1;
2270 $self->reset_timeout (1); 2461 $self->reset_timeout (1);
2271 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2462 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2272 2463
2329 : normalise $_ 2520 : normalise $_
2330 } @{ aio_readdir $UNIQUEDIR or [] } 2521 } @{ aio_readdir $UNIQUEDIR or [] }
2331 ] 2522 ]
2332} 2523}
2333 2524
2525=item cf::map::static_maps
2526
2527Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2528file in the shared directory excluding F</styles> and F</editor>). May
2529block.
2530
2531=cut
2532
2533sub static_maps() {
2534 my @dirs = "";
2535 my @maps;
2536
2537 while (@dirs) {
2538 my $dir = shift @dirs;
2539
2540 next if $dir eq "/styles" || $dir eq "/editor";
2541
2542 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2543 or return;
2544
2545 for (@$files) {
2546 s/\.map$// or next;
2547 utf8::decode $_;
2548 push @maps, "$dir/$_";
2549 }
2550
2551 push @dirs, map "$dir/$_", @$dirs;
2552 }
2553
2554 \@maps
2555}
2556
2334=back 2557=back
2335 2558
2336=head3 cf::object 2559=head3 cf::object
2337 2560
2338=cut 2561=cut
2403 2626
2404our $SAY_CHANNEL = { 2627our $SAY_CHANNEL = {
2405 id => "say", 2628 id => "say",
2406 title => "Map", 2629 title => "Map",
2407 reply => "say ", 2630 reply => "say ",
2408 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2631 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2409}; 2632};
2410 2633
2411our $CHAT_CHANNEL = { 2634our $CHAT_CHANNEL = {
2412 id => "chat", 2635 id => "chat",
2413 title => "Chat", 2636 title => "Chat",
2470 2693
2471Freezes the player and moves him/her to a special map (C<{link}>). 2694Freezes the player and moves him/her to a special map (C<{link}>).
2472 2695
2473The player should be reasonably safe there for short amounts of time (e.g. 2696The 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, 2697for 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 2698though, as the player cannot control the character while it is on the link
2476map. 2699map.
2477 2700
2478Will never block. 2701Will never block.
2479 2702
2480=item $player_object->leave_link ($map, $x, $y) 2703=item $player_object->leave_link ($map, $x, $y)
2501sub cf::object::player::enter_link { 2724sub cf::object::player::enter_link {
2502 my ($self) = @_; 2725 my ($self) = @_;
2503 2726
2504 $self->deactivate_recursive; 2727 $self->deactivate_recursive;
2505 2728
2729 ++$self->{_link_recursion};
2730
2506 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2731 return if UNIVERSAL::isa $self->map, "ext::map_link";
2507 2732
2508 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2733 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2509 if $self->map && $self->map->{path} ne "{link}"; 2734 if $self->map && $self->map->{path} ne "{link}";
2510 2735
2511 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2736 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2512} 2737}
2513 2738
2514sub cf::object::player::leave_link { 2739sub cf::object::player::leave_link {
2515 my ($self, $map, $x, $y) = @_; 2740 my ($self, $map, $x, $y) = @_;
2516 2741
2533 ($x, $y) = (-1, -1) 2758 ($x, $y) = (-1, -1)
2534 unless (defined $x) && (defined $y); 2759 unless (defined $x) && (defined $y);
2535 2760
2536 # use -1 or undef as default coordinates, not 0, 0 2761 # use -1 or undef as default coordinates, not 0, 0
2537 ($x, $y) = ($map->enter_x, $map->enter_y) 2762 ($x, $y) = ($map->enter_x, $map->enter_y)
2538 if $x <=0 && $y <= 0; 2763 if $x <= 0 && $y <= 0;
2539 2764
2540 $map->load; 2765 $map->load;
2541 $map->load_neighbours; 2766 $map->load_neighbours;
2542 2767
2543 return unless $self->contr->active; 2768 return unless $self->contr->active;
2544 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2545 $self->activate_recursive;
2546 2769
2547 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2770 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2548 $self->enter_map ($map, $x, $y); 2771 if ($self->enter_map ($map, $x, $y)) {
2549} 2772 # entering was successful
2773 delete $self->{_link_recursion};
2774 # only activate afterwards, to support waiting in hooks
2775 $self->activate_recursive;
2776 }
2550 2777
2778}
2779
2551=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2780=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2552 2781
2553Moves the player to the given map-path and coordinates by first freezing 2782Moves the player to the given map-path and coordinates by first freezing
2554her, loading and preparing them map, calling the provided $check callback 2783her, loading and preparing them map, calling the provided $check callback
2555that has to return the map if sucecssful, and then unfreezes the player on 2784that 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 2785the new (success) or old (failed) map position. In either case, $done will
2563 2792
2564our $GOTOGEN; 2793our $GOTOGEN;
2565 2794
2566sub cf::object::player::goto { 2795sub cf::object::player::goto {
2567 my ($self, $path, $x, $y, $check, $done) = @_; 2796 my ($self, $path, $x, $y, $check, $done) = @_;
2797
2798 if ($self->{_link_recursion} >= $MAX_LINKS) {
2799 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2800 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2801 ($path, $x, $y) = @$EMERGENCY_POSITION;
2802 }
2568 2803
2569 # do generation counting so two concurrent goto's will be executed in-order 2804 # do generation counting so two concurrent goto's will be executed in-order
2570 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2805 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2571 2806
2572 $self->enter_link; 2807 $self->enter_link;
2592 ($path, $x, $y) = (undef, undef, undef); 2827 ($path, $x, $y) = (undef, undef, undef);
2593 } 2828 }
2594 } 2829 }
2595 2830
2596 my $map = eval { 2831 my $map = eval {
2597 my $map = defined $path ? cf::map::find $path : undef; 2832 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2598 2833
2599 if ($map) { 2834 if ($map) {
2600 $map = $map->customise_for ($self); 2835 $map = $map->customise_for ($self);
2601 $map = $check->($map) if $check && $map; 2836 $map = $check->($map, $x, $y, $self) if $check && $map;
2602 } else { 2837 } else {
2603 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2838 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2604 } 2839 }
2605 2840
2606 $map 2841 $map
2614 if ($gen == $self->{_goto_generation}) { 2849 if ($gen == $self->{_goto_generation}) {
2615 delete $self->{_goto_generation}; 2850 delete $self->{_goto_generation};
2616 $self->leave_link ($map, $x, $y); 2851 $self->leave_link ($map, $x, $y);
2617 } 2852 }
2618 2853
2619 $done->() if $done; 2854 $done->($self) if $done;
2620 })->prio (1); 2855 })->prio (1);
2621} 2856}
2622 2857
2623=item $player_object->enter_exit ($exit_object) 2858=item $player_object->enter_exit ($exit_object)
2624 2859
2700 2935
2701 prepare_random_map $exit 2936 prepare_random_map $exit
2702 if $exit->slaying eq "/!"; 2937 if $exit->slaying eq "/!";
2703 } 2938 }
2704 2939
2705 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2940 my $map = cf::map::normalise $exit->slaying, $exit->map;
2706 my $x = $exit->stats->hp; 2941 my $x = $exit->stats->hp;
2707 my $y = $exit->stats->sp; 2942 my $y = $exit->stats->sp;
2708 2943
2709 $self->goto ($map, $x, $y); 2944 $self->goto ($map, $x, $y);
2710 2945
2717 $self->message ("Something went wrong deep within the deliantra server. " 2952 $self->message ("Something went wrong deep within the deliantra server. "
2718 . "I'll try to bring you back to the map you were before. " 2953 . "I'll try to bring you back to the map you were before. "
2719 . "Please report this to the dungeon master!", 2954 . "Please report this to the dungeon master!",
2720 cf::NDI_UNIQUE | cf::NDI_RED); 2955 cf::NDI_UNIQUE | cf::NDI_RED);
2721 2956
2722 warn "ERROR in enter_exit: $@"; 2957 error "ERROR in enter_exit: $@";
2723 $self->leave_link; 2958 $self->leave_link;
2724 } 2959 }
2725 })->prio (1); 2960 })->prio (1);
2726} 2961}
2727 2962
2739sub cf::client::send_drawinfo { 2974sub cf::client::send_drawinfo {
2740 my ($self, $text, $flags) = @_; 2975 my ($self, $text, $flags) = @_;
2741 2976
2742 utf8::encode $text; 2977 utf8::encode $text;
2743 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2978 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2979}
2980
2981=item $client->send_big_packet ($pkt)
2982
2983Like C<send_packet>, but tries to compress large packets, and fragments
2984them as required.
2985
2986=cut
2987
2988our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2989
2990sub cf::client::send_big_packet {
2991 my ($self, $pkt) = @_;
2992
2993 # try lzf for large packets
2994 $pkt = "lzf " . Compress::LZF::compress $pkt
2995 if 1024 <= length $pkt and $self->{can_lzf};
2996
2997 # split very large packets
2998 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2999 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3000 $pkt = "frag";
3001 }
3002
3003 $self->send_packet ($pkt);
2744} 3004}
2745 3005
2746=item $client->send_msg ($channel, $msg, $color, [extra...]) 3006=item $client->send_msg ($channel, $msg, $color, [extra...])
2747 3007
2748Send a drawinfo or msg packet to the client, formatting the msg for the 3008Send a drawinfo or msg packet to the client, formatting the msg for the
2752 3012
2753=cut 3013=cut
2754 3014
2755# non-persistent channels (usually the info channel) 3015# non-persistent channels (usually the info channel)
2756our %CHANNEL = ( 3016our %CHANNEL = (
3017 "c/motd" => {
3018 id => "infobox",
3019 title => "MOTD",
3020 reply => undef,
3021 tooltip => "The message of the day",
3022 },
2757 "c/identify" => { 3023 "c/identify" => {
2758 id => "infobox", 3024 id => "infobox",
2759 title => "Identify", 3025 title => "Identify",
2760 reply => undef, 3026 reply => undef,
2761 tooltip => "Items recently identified", 3027 tooltip => "Items recently identified",
2763 "c/examine" => { 3029 "c/examine" => {
2764 id => "infobox", 3030 id => "infobox",
2765 title => "Examine", 3031 title => "Examine",
2766 reply => undef, 3032 reply => undef,
2767 tooltip => "Signs and other items you examined", 3033 tooltip => "Signs and other items you examined",
3034 },
3035 "c/shopinfo" => {
3036 id => "infobox",
3037 title => "Shop Info",
3038 reply => undef,
3039 tooltip => "What your bargaining skill tells you about the shop",
2768 }, 3040 },
2769 "c/book" => { 3041 "c/book" => {
2770 id => "infobox", 3042 id => "infobox",
2771 title => "Book", 3043 title => "Book",
2772 reply => undef, 3044 reply => undef,
2788 id => "infobox", 3060 id => "infobox",
2789 title => "Body Parts", 3061 title => "Body Parts",
2790 reply => undef, 3062 reply => undef,
2791 tooltip => "Shows which body parts you posess and are available", 3063 tooltip => "Shows which body parts you posess and are available",
2792 }, 3064 },
3065 "c/statistics" => {
3066 id => "infobox",
3067 title => "Statistics",
3068 reply => undef,
3069 tooltip => "Shows your primary statistics",
3070 },
2793 "c/skills" => { 3071 "c/skills" => {
2794 id => "infobox", 3072 id => "infobox",
2795 title => "Skills", 3073 title => "Skills",
2796 reply => undef, 3074 reply => undef,
2797 tooltip => "Shows your experience per skill and item power", 3075 tooltip => "Shows your experience per skill and item power",
3076 },
3077 "c/shopitems" => {
3078 id => "infobox",
3079 title => "Shop Items",
3080 reply => undef,
3081 tooltip => "Shows the items currently for sale in this shop",
3082 },
3083 "c/resistances" => {
3084 id => "infobox",
3085 title => "Resistances",
3086 reply => undef,
3087 tooltip => "Shows your resistances",
3088 },
3089 "c/pets" => {
3090 id => "infobox",
3091 title => "Pets",
3092 reply => undef,
3093 tooltip => "Shows information abotu your pets/a specific pet",
3094 },
3095 "c/perceiveself" => {
3096 id => "infobox",
3097 title => "Perceive Self",
3098 reply => undef,
3099 tooltip => "You gained detailed knowledge about yourself",
2798 }, 3100 },
2799 "c/uptime" => { 3101 "c/uptime" => {
2800 id => "infobox", 3102 id => "infobox",
2801 title => "Uptime", 3103 title => "Uptime",
2802 reply => undef, 3104 reply => undef,
2812 id => "party", 3114 id => "party",
2813 title => "Party", 3115 title => "Party",
2814 reply => "gsay ", 3116 reply => "gsay ",
2815 tooltip => "Messages and chat related to your party", 3117 tooltip => "Messages and chat related to your party",
2816 }, 3118 },
3119 "c/death" => {
3120 id => "death",
3121 title => "Death",
3122 reply => undef,
3123 tooltip => "Reason for and more info about your most recent death",
3124 },
3125 "c/say" => $SAY_CHANNEL,
3126 "c/chat" => $CHAT_CHANNEL,
2817); 3127);
2818 3128
2819sub cf::client::send_msg { 3129sub cf::client::send_msg {
2820 my ($self, $channel, $msg, $color, @extra) = @_; 3130 my ($self, $channel, $msg, $color, @extra) = @_;
2821 3131
2826 3136
2827 # check predefined channels, for the benefit of C 3137 # check predefined channels, for the benefit of C
2828 if ($CHANNEL{$channel}) { 3138 if ($CHANNEL{$channel}) {
2829 $channel = $CHANNEL{$channel}; 3139 $channel = $CHANNEL{$channel};
2830 3140
2831 $self->ext_msg (channel_info => $channel) 3141 $self->ext_msg (channel_info => $channel);
2832 if $self->can_msg;
2833
2834 $channel = $channel->{id}; 3142 $channel = $channel->{id};
2835 3143
2836 } elsif (ref $channel) { 3144 } elsif (ref $channel) {
2837 # send meta info to client, if not yet sent 3145 # send meta info to client, if not yet sent
2838 unless (exists $self->{channel}{$channel->{id}}) { 3146 unless (exists $self->{channel}{$channel->{id}}) {
2839 $self->{channel}{$channel->{id}} = $channel; 3147 $self->{channel}{$channel->{id}} = $channel;
2840 $self->ext_msg (channel_info => $channel) 3148 $self->ext_msg (channel_info => $channel);
2841 if $self->can_msg;
2842 } 3149 }
2843 3150
2844 $channel = $channel->{id}; 3151 $channel = $channel->{id};
2845 } 3152 }
2846 3153
2847 return unless @extra || length $msg; 3154 return unless @extra || length $msg;
2848 3155
2849 if ($self->can_msg) {
2850 # default colour, mask it out 3156 # default colour, mask it out
2851 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3157 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2852 if $color & cf::NDI_DEF; 3158 if $color & cf::NDI_DEF;
2853 3159
2854 my $pkt = "msg " 3160 my $pkt = "msg "
2855 . $self->{json_coder}->encode ( 3161 . $self->{json_coder}->encode (
2856 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3162 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2857 ); 3163 );
2858 3164
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); 3165 $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} 3166}
2896 3167
2897=item $client->ext_msg ($type, @msg) 3168=item $client->ext_msg ($type, @msg)
2898 3169
2899Sends an ext event to the client. 3170Sends an ext event to the client.
2902 3173
2903sub cf::client::ext_msg($$@) { 3174sub cf::client::ext_msg($$@) {
2904 my ($self, $type, @msg) = @_; 3175 my ($self, $type, @msg) = @_;
2905 3176
2906 if ($self->extcmd == 2) { 3177 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3178 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2908 } elsif ($self->extcmd == 1) { # TODO: remove 3179 } elsif ($self->extcmd == 1) { # TODO: remove
2909 push @msg, msgtype => "event_$type"; 3180 push @msg, msgtype => "event_$type";
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3181 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 } 3182 }
2912} 3183}
2913 3184
2914=item $client->ext_reply ($msgid, @msg) 3185=item $client->ext_reply ($msgid, @msg)
2915 3186
2919 3190
2920sub cf::client::ext_reply($$@) { 3191sub cf::client::ext_reply($$@) {
2921 my ($self, $id, @msg) = @_; 3192 my ($self, $id, @msg) = @_;
2922 3193
2923 if ($self->extcmd == 2) { 3194 if ($self->extcmd == 2) {
2924 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3195 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2925 } elsif ($self->extcmd == 1) { 3196 } elsif ($self->extcmd == 1) {
2926 #TODO: version 1, remove 3197 #TODO: version 1, remove
2927 unshift @msg, msgtype => "reply", msgid => $id; 3198 unshift @msg, msgtype => "reply", msgid => $id;
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3199 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2929 } 3200 }
2930} 3201}
2931 3202
2932=item $success = $client->query ($flags, "text", \&cb) 3203=item $success = $client->query ($flags, "text", \&cb)
2933 3204
3004 3275
3005 $ns->ext_reply ($reply, @reply) 3276 $ns->ext_reply ($reply, @reply)
3006 if $reply; 3277 if $reply;
3007 3278
3008 } else { 3279 } else {
3009 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3280 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3010 } 3281 }
3011 3282
3012 cf::override; 3283 cf::override;
3013 }, 3284 },
3014); 3285);
3034 3305
3035 $coro 3306 $coro
3036} 3307}
3037 3308
3038cf::client->attach ( 3309cf::client->attach (
3039 on_destroy => sub { 3310 on_client_destroy => sub {
3040 my ($ns) = @_; 3311 my ($ns) = @_;
3041 3312
3042 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3313 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3043 }, 3314 },
3044); 3315);
3060our $safe_hole = new Safe::Hole; 3331our $safe_hole = new Safe::Hole;
3061 3332
3062$SIG{FPE} = 'IGNORE'; 3333$SIG{FPE} = 'IGNORE';
3063 3334
3064$safe->permit_only (Opcode::opset qw( 3335$safe->permit_only (Opcode::opset qw(
3065 :base_core :base_mem :base_orig :base_math 3336 :base_core :base_mem :base_orig :base_math :base_loop
3066 grepstart grepwhile mapstart mapwhile 3337 grepstart grepwhile mapstart mapwhile
3067 sort time 3338 sort time
3068)); 3339));
3069 3340
3070# here we export the classes and methods available to script code 3341# here we export the classes and methods available to script code
3074The following functions and methods are available within a safe environment: 3345The following functions and methods are available within a safe environment:
3075 3346
3076 cf::object 3347 cf::object
3077 contr pay_amount pay_player map x y force_find force_add destroy 3348 contr pay_amount pay_player map x y force_find force_add destroy
3078 insert remove name archname title slaying race decrease split 3349 insert remove name archname title slaying race decrease split
3350 value
3079 3351
3080 cf::object::player 3352 cf::object::player
3081 player 3353 player
3082 3354
3083 cf::player 3355 cf::player
3089=cut 3361=cut
3090 3362
3091for ( 3363for (
3092 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3364 ["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 3365 insert remove inv nrof name archname title slaying race
3094 decrease split destroy change_exp)], 3366 decrease split destroy change_exp value msg lore send_msg)],
3095 ["cf::object::player" => qw(player)], 3367 ["cf::object::player" => qw(player)],
3096 ["cf::player" => qw(peaceful)], 3368 ["cf::player" => qw(peaceful send_msg)],
3097 ["cf::map" => qw(trigger)], 3369 ["cf::map" => qw(trigger)],
3098) { 3370) {
3099 no strict 'refs';
3100 my ($pkg, @funs) = @$_; 3371 my ($pkg, @funs) = @$_;
3101 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3372 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3102 for @funs; 3373 for @funs;
3103} 3374}
3104 3375
3119 3390
3120 my $qcode = $code; 3391 my $qcode = $code;
3121 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3392 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3122 $qcode =~ s/\n/\\n/g; 3393 $qcode =~ s/\n/\\n/g;
3123 3394
3395 %vars = (_dummy => 0) unless %vars;
3396
3397 my @res;
3124 local $_; 3398 local $_;
3125 local @safe::cf::_safe_eval_args = values %vars;
3126 3399
3127 my $eval = 3400 my $eval =
3128 "do {\n" 3401 "do {\n"
3129 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3402 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3130 . "#line 0 \"{$qcode}\"\n" 3403 . "#line 0 \"{$qcode}\"\n"
3131 . $code 3404 . $code
3132 . "\n}" 3405 . "\n}"
3133 ; 3406 ;
3134 3407
3408 if ($CFG{safe_eval}) {
3135 sub_generation_inc; 3409 sub_generation_inc;
3410 local @safe::cf::_safe_eval_args = values %vars;
3136 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3411 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3137 sub_generation_inc; 3412 sub_generation_inc;
3413 } else {
3414 local @cf::_safe_eval_args = values %vars;
3415 @res = wantarray ? eval eval : scalar eval $eval;
3416 }
3138 3417
3139 if ($@) { 3418 if ($@) {
3140 warn "$@"; 3419 warn "$@",
3141 warn "while executing safe code '$code'\n"; 3420 "while executing safe code '$code'\n",
3142 warn "with arguments " . (join " ", %vars) . "\n"; 3421 "with arguments " . (join " ", %vars) . "\n";
3143 } 3422 }
3144 3423
3145 wantarray ? @res : $res[0] 3424 wantarray ? @res : $res[0]
3146} 3425}
3147 3426
3161=cut 3440=cut
3162 3441
3163sub register_script_function { 3442sub register_script_function {
3164 my ($fun, $cb) = @_; 3443 my ($fun, $cb) = @_;
3165 3444
3166 no strict 'refs'; 3445 $fun = "safe::$fun" if $CFG{safe_eval};
3167 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3446 *$fun = $safe_hole->wrap ($cb);
3168} 3447}
3169 3448
3170=back 3449=back
3171 3450
3172=cut 3451=cut
3181 # for this (global event?) 3460 # for this (global event?)
3182 %ext::player_env::MUSIC_FACE_CACHE = (); 3461 %ext::player_env::MUSIC_FACE_CACHE = ();
3183 3462
3184 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3463 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3185 3464
3186 warn "loading facedata from $path\n"; 3465 trace "loading facedata from $path\n";
3187 3466
3188 my $facedata; 3467 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 3468
3194 $facedata->{version} == 2 3469 $facedata->{version} == 2
3195 or cf::cleanup "$path: version mismatch, cannot proceed."; 3470 or cf::cleanup "$path: version mismatch, cannot proceed.";
3196 3471
3197 # patch in the exptable 3472 # patch in the exptable
3473 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3198 $facedata->{resource}{"res/exp_table"} = { 3474 $facedata->{resource}{"res/exp_table"} = {
3199 type => FT_RSRC, 3475 type => FT_RSRC,
3200 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3476 data => $exp_table,
3477 hash => (Digest::MD5::md5 $exp_table),
3201 }; 3478 };
3202 cf::cede_to_tick; 3479 cf::cede_to_tick;
3203 3480
3204 { 3481 {
3205 my $faces = $facedata->{faceinfo}; 3482 my $faces = $facedata->{faceinfo};
3207 while (my ($face, $info) = each %$faces) { 3484 while (my ($face, $info) = each %$faces) {
3208 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3485 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3209 3486
3210 cf::face::set_visibility $idx, $info->{visibility}; 3487 cf::face::set_visibility $idx, $info->{visibility};
3211 cf::face::set_magicmap $idx, $info->{magicmap}; 3488 cf::face::set_magicmap $idx, $info->{magicmap};
3212 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3489 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3213 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3490 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3491 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3214 3492
3215 cf::cede_to_tick; 3493 cf::cede_to_tick;
3216 } 3494 }
3217 3495
3218 while (my ($face, $info) = each %$faces) { 3496 while (my ($face, $info) = each %$faces) {
3223 3501
3224 if (my $smooth = cf::face::find $info->{smooth}) { 3502 if (my $smooth = cf::face::find $info->{smooth}) {
3225 cf::face::set_smooth $idx, $smooth; 3503 cf::face::set_smooth $idx, $smooth;
3226 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3504 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3227 } else { 3505 } else {
3228 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3506 error "smooth face '$info->{smooth}' not found for face '$face'";
3229 } 3507 }
3230 3508
3231 cf::cede_to_tick; 3509 cf::cede_to_tick;
3232 } 3510 }
3233 } 3511 }
3242 3520
3243 cf::anim::invalidate_all; # d'oh 3521 cf::anim::invalidate_all; # d'oh
3244 } 3522 }
3245 3523
3246 { 3524 {
3247 # TODO: for gcfclient pleasure, we should give resources
3248 # that gcfclient doesn't grok a >10000 face index.
3249 my $res = $facedata->{resource}; 3525 my $res = $facedata->{resource};
3250 3526
3251 while (my ($name, $info) = each %$res) { 3527 while (my ($name, $info) = each %$res) {
3252 if (defined $info->{type}) { 3528 if (defined $info->{type}) {
3253 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3529 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3254 my $data;
3255 3530
3256 if ($info->{type} & 1) { 3531 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}; 3532 cf::face::set_type $idx, $info->{type};
3271 } else { 3533 } else {
3272 $RESOURCE{$name} = $info; 3534 $RESOURCE{$name} = $info; # unused
3273 } 3535 }
3274 3536
3275 cf::cede_to_tick; 3537 cf::cede_to_tick;
3276 } 3538 }
3277 } 3539 }
3278 3540
3279 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3541 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3280 3542
3281 1 3543 1
3282} 3544}
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 3545
3304register_exticmd fx_want => sub { 3546register_exticmd fx_want => sub {
3305 my ($ns, $want) = @_; 3547 my ($ns, $want) = @_;
3306 3548
3307 while (my ($k, $v) = each %$want) { 3549 while (my ($k, $v) = each %$want) {
3346sub reload_treasures { 3588sub reload_treasures {
3347 load_resource_file "$DATADIR/treasures" 3589 load_resource_file "$DATADIR/treasures"
3348 or die "unable to load treasurelists\n"; 3590 or die "unable to load treasurelists\n";
3349} 3591}
3350 3592
3593sub reload_sound {
3594 trace "loading sound config from $DATADIR/sound\n";
3595
3596 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3597
3598 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3599 my $sound = $soundconf->{compat}[$_]
3600 or next;
3601
3602 my $face = cf::face::find "sound/$sound->[1]";
3603 cf::sound::set $sound->[0] => $face;
3604 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3605 }
3606
3607 while (my ($k, $v) = each %{$soundconf->{event}}) {
3608 my $face = cf::face::find "sound/$v";
3609 cf::sound::set $k => $face;
3610 }
3611}
3612
3351sub reload_resources { 3613sub reload_resources {
3352 warn "reloading resource files...\n"; 3614 trace "reloading resource files...\n";
3353 3615
3616 reload_exp_table;
3617 reload_materials;
3354 reload_facedata; 3618 reload_facedata;
3619 reload_sound;
3355 reload_archetypes; 3620 reload_archetypes;
3356 reload_regions; 3621 reload_regions;
3357 reload_treasures; 3622 reload_treasures;
3358 3623
3359 warn "finished reloading resource files\n"; 3624 trace "finished reloading resource files\n";
3360} 3625}
3361 3626
3362sub reload_config { 3627sub reload_config {
3363 open my $fh, "<:utf8", "$CONFDIR/config" 3628 trace "reloading config file...\n";
3364 or return;
3365 3629
3366 local $/; 3630 my $config = load_file "$CONFDIR/config";
3367 *CFG = YAML::Load <$fh>; 3631 utf8::decode $config;
3632 *CFG = decode_yaml $config;
3368 3633
3369 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3634 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3370 3635
3371 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3636 $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}; 3637 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3373 3638
3374 if (exists $CFG{mlockall}) { 3639 if (exists $CFG{mlockall}) {
3397 3662
3398 seek $fh, 0, 0; 3663 seek $fh, 0, 0;
3399 print $fh $$; 3664 print $fh $$;
3400} 3665}
3401 3666
3667sub main_loop {
3668 trace "EV::loop starting\n";
3669 if (1) {
3670 EV::loop;
3671 }
3672 trace "EV::loop returned\n";
3673 goto &main_loop unless $REALLY_UNLOOP;
3674}
3675
3402sub main { 3676sub main {
3403 cf::init_globals; # initialise logging 3677 cf::init_globals; # initialise logging
3404 3678
3405 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3679 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3406 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3680 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3407 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3681 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3408 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3682 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 3683
3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3684 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3417 3685
3418 # we must not ever block the main coroutine 3686 # we must not ever block the main coroutine
3419 local $Coro::idle = sub { 3687 local $Coro::idle = sub {
3425 }; 3693 };
3426 3694
3427 evthread_start IO::AIO::poll_fileno; 3695 evthread_start IO::AIO::poll_fileno;
3428 3696
3429 cf::sync_job { 3697 cf::sync_job {
3698 cf::incloader::init ();
3699
3700 cf::init_anim;
3701 cf::init_attackmess;
3702 cf::init_dynamic;
3703
3704 cf::load_settings;
3705
3430 reload_resources; 3706 reload_resources;
3431 reload_config; 3707 reload_config;
3432 db_init; 3708 db_init;
3433 3709
3434 cf::load_settings;
3435 cf::load_materials;
3436 cf::init_uuid; 3710 cf::init_uuid;
3437 cf::init_signals; 3711 cf::init_signals;
3438 cf::init_commands;
3439 cf::init_skills; 3712 cf::init_skills;
3440 3713
3441 cf::init_beforeplay; 3714 cf::init_beforeplay;
3442 3715
3443 atomic; 3716 atomic;
3445 load_extensions; 3718 load_extensions;
3446 3719
3447 utime time, time, $RUNTIMEFILE; 3720 utime time, time, $RUNTIMEFILE;
3448 3721
3449 # no (long-running) fork's whatsoever before this point(!) 3722 # no (long-running) fork's whatsoever before this point(!)
3723 use POSIX ();
3450 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3724 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3451 3725
3452 (pop @POST_INIT)->(0) while @POST_INIT; 3726 cf::_post_init 0;
3453 }; 3727 };
3454 3728
3455 EV::loop; 3729 cf::object::thawer::errors_are_fatal 0;
3730 info "parse errors in files are no longer fatal from this point on.\n";
3731
3732 my $free_main; $free_main = EV::idle sub {
3733 undef $free_main;
3734 undef &main; # free gobs of memory :)
3735 };
3736
3737 goto &main_loop;
3456} 3738}
3457 3739
3458############################################################################# 3740#############################################################################
3459# initialisation and cleanup 3741# initialisation and cleanup
3460 3742
3461# install some emergency cleanup handlers 3743# install some emergency cleanup handlers
3462BEGIN { 3744BEGIN {
3463 our %SIGWATCHER = (); 3745 our %SIGWATCHER = ();
3464 for my $signal (qw(INT HUP TERM)) { 3746 for my $signal (qw(INT HUP TERM)) {
3465 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3747 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3466 cf::cleanup "SIG$signal"; 3748 cf::cleanup "SIG$signal";
3467 }; 3749 };
3468 } 3750 }
3469} 3751}
3470 3752
3471sub write_runtime_sync { 3753sub write_runtime_sync {
3754 my $t0 = AE::time;
3755
3472 # first touch the runtime file to show we are still running: 3756 # first touch the runtime file to show we are still running:
3473 # the fsync below can take a very very long time. 3757 # the fsync below can take a very very long time.
3474 3758
3475 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3759 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3476 3760
3477 my $guard = cf::lock_acquire "write_runtime"; 3761 my $guard = cf::lock_acquire "write_runtime";
3478 3762
3479 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3763 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3480 or return; 3764 or return;
3481 3765
3482 my $value = $cf::RUNTIME + 90 + 10; 3766 my $value = $cf::RUNTIME + 90 + 10;
3483 # 10 is the runtime save interval, for a monotonic clock 3767 # 10 is the runtime save interval, for a monotonic clock
3484 # 60 allows for the watchdog to kill the server. 3768 # 60 allows for the watchdog to kill the server.
3497 or return; 3781 or return;
3498 3782
3499 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3783 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3500 and return; 3784 and return;
3501 3785
3502 warn "runtime file written.\n"; 3786 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3503 3787
3504 1 3788 1
3505} 3789}
3506 3790
3507our $uuid_lock; 3791our $uuid_lock;
3519 or return; 3803 or return;
3520 3804
3521 my $value = uuid_seq uuid_cur; 3805 my $value = uuid_seq uuid_cur;
3522 3806
3523 unless ($value) { 3807 unless ($value) {
3524 warn "cowardly refusing to write zero uuid value!\n"; 3808 info "cowardly refusing to write zero uuid value!\n";
3525 return; 3809 return;
3526 } 3810 }
3527 3811
3528 my $value = uuid_str $value + $uuid_skip; 3812 my $value = uuid_str $value + $uuid_skip;
3529 $uuid_skip = 0; 3813 $uuid_skip = 0;
3539 or return; 3823 or return;
3540 3824
3541 aio_rename "$uuid~", $uuid 3825 aio_rename "$uuid~", $uuid
3542 and return; 3826 and return;
3543 3827
3544 warn "uuid file written ($value).\n"; 3828 trace "uuid file written ($value).\n";
3545 3829
3546 1 3830 1
3547 3831
3548} 3832}
3549 3833
3555} 3839}
3556 3840
3557sub emergency_save() { 3841sub emergency_save() {
3558 my $freeze_guard = cf::freeze_mainloop; 3842 my $freeze_guard = cf::freeze_mainloop;
3559 3843
3560 warn "enter emergency perl save\n"; 3844 info "emergency_perl_save: enter\n";
3845
3846 # this is a trade-off: we want to be very quick here, so
3847 # save all maps without fsync, and later call a global sync
3848 # (which in turn might be very very slow)
3849 local $USE_FSYNC = 0;
3561 3850
3562 cf::sync_job { 3851 cf::sync_job {
3852 cf::write_runtime_sync; # external watchdog should not bark
3853
3563 # use a peculiar iteration method to avoid tripping on perl 3854 # use a peculiar iteration method to avoid tripping on perl
3564 # refcount bugs in for. also avoids problems with players 3855 # refcount bugs in for. also avoids problems with players
3565 # and maps saved/destroyed asynchronously. 3856 # and maps saved/destroyed asynchronously.
3566 warn "begin emergency player save\n"; 3857 info "emergency_perl_save: begin player save\n";
3567 for my $login (keys %cf::PLAYER) { 3858 for my $login (keys %cf::PLAYER) {
3568 my $pl = $cf::PLAYER{$login} or next; 3859 my $pl = $cf::PLAYER{$login} or next;
3569 $pl->valid or next; 3860 $pl->valid or next;
3570 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3861 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3571 $pl->save; 3862 $pl->save;
3572 } 3863 }
3573 warn "end emergency player save\n"; 3864 info "emergency_perl_save: end player save\n";
3574 3865
3575 warn "begin emergency map save\n"; 3866 cf::write_runtime_sync; # external watchdog should not bark
3867
3868 info "emergency_perl_save: begin map save\n";
3576 for my $path (keys %cf::MAP) { 3869 for my $path (keys %cf::MAP) {
3577 my $map = $cf::MAP{$path} or next; 3870 my $map = $cf::MAP{$path} or next;
3578 $map->valid or next; 3871 $map->valid or next;
3579 $map->save; 3872 $map->save;
3580 } 3873 }
3581 warn "end emergency map save\n"; 3874 info "emergency_perl_save: end map save\n";
3582 3875
3583 warn "begin emergency database checkpoint\n"; 3876 cf::write_runtime_sync; # external watchdog should not bark
3877
3878 info "emergency_perl_save: begin database checkpoint\n";
3584 BDB::db_env_txn_checkpoint $DB_ENV; 3879 BDB::db_env_txn_checkpoint $DB_ENV;
3585 warn "end emergency database checkpoint\n"; 3880 info "emergency_perl_save: end database checkpoint\n";
3586 3881
3587 warn "begin write uuid\n"; 3882 info "emergency_perl_save: begin write uuid\n";
3588 write_uuid_sync 1; 3883 write_uuid_sync 1;
3589 warn "end write uuid\n"; 3884 info "emergency_perl_save: end write uuid\n";
3885
3886 cf::write_runtime_sync; # external watchdog should not bark
3887
3888 trace "emergency_perl_save: syncing database to disk";
3889 BDB::db_env_txn_checkpoint $DB_ENV;
3890
3891 info "emergency_perl_save: starting sync\n";
3892 IO::AIO::aio_sync sub {
3893 info "emergency_perl_save: finished sync\n";
3894 };
3895
3896 cf::write_runtime_sync; # external watchdog should not bark
3897
3898 trace "emergency_perl_save: flushing outstanding aio requests";
3899 while (IO::AIO::nreqs || BDB::nreqs) {
3900 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3901 }
3902
3903 cf::write_runtime_sync; # external watchdog should not bark
3590 }; 3904 };
3591 3905
3592 warn "leave emergency perl save\n"; 3906 info "emergency_perl_save: leave\n";
3593} 3907}
3594 3908
3595sub post_cleanup { 3909sub post_cleanup {
3596 my ($make_core) = @_; 3910 my ($make_core) = @_;
3597 3911
3912 IO::AIO::flush;
3913
3598 warn Carp::longmess "post_cleanup backtrace" 3914 error Carp::longmess "post_cleanup backtrace"
3599 if $make_core; 3915 if $make_core;
3600 3916
3601 my $fh = pidfile; 3917 my $fh = pidfile;
3602 unlink $PIDFILE if <$fh> == $$; 3918 unlink $PIDFILE if <$fh> == $$;
3603} 3919}
3623 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3939 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3624 for my $name (keys %$leaf_symtab) { 3940 for my $name (keys %$leaf_symtab) {
3625 _gv_clear *{"$pkg$name"}; 3941 _gv_clear *{"$pkg$name"};
3626# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3942# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3627 } 3943 }
3628 warn "cleared package $pkg\n";#d#
3629} 3944}
3630 3945
3631sub do_reload_perl() { 3946sub do_reload_perl() {
3632 # can/must only be called in main 3947 # can/must only be called in main
3633 if ($Coro::current != $Coro::main) { 3948 unless (in_main) {
3634 warn "can only reload from main coroutine"; 3949 error "can only reload from main coroutine";
3635 return; 3950 return;
3636 } 3951 }
3637 3952
3638 return if $RELOAD++; 3953 return if $RELOAD++;
3639 3954
3955 my $t1 = AE::time;
3956
3640 while ($RELOAD) { 3957 while ($RELOAD) {
3641 warn "reloading..."; 3958 cf::get_slot 0.1, -1, "reload_perl";
3959 info "perl_reload: reloading...";
3642 3960
3643 warn "entering sync_job"; 3961 trace "perl_reload: entering sync_job";
3644 3962
3645 cf::sync_job { 3963 cf::sync_job {
3646 cf::write_runtime_sync; # external watchdog should not bark
3647 cf::emergency_save; 3964 #cf::emergency_save;
3648 cf::write_runtime_sync; # external watchdog should not bark
3649 3965
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"; 3966 trace "perl_reload: cancelling all extension coros";
3661 $_->cancel for values %EXT_CORO; 3967 $_->cancel for values %EXT_CORO;
3662 %EXT_CORO = (); 3968 %EXT_CORO = ();
3663 3969
3664 warn "removing commands"; 3970 trace "perl_reload: removing commands";
3665 %COMMAND = (); 3971 %COMMAND = ();
3666 3972
3667 warn "removing ext/exti commands"; 3973 trace "perl_reload: removing ext/exti commands";
3668 %EXTCMD = (); 3974 %EXTCMD = ();
3669 %EXTICMD = (); 3975 %EXTICMD = ();
3670 3976
3671 warn "unloading/nuking all extensions"; 3977 trace "perl_reload: unloading/nuking all extensions";
3672 for my $pkg (@EXTS) { 3978 for my $pkg (@EXTS) {
3673 warn "... unloading $pkg"; 3979 trace "... unloading $pkg";
3674 3980
3675 if (my $cb = $pkg->can ("unload")) { 3981 if (my $cb = $pkg->can ("unload")) {
3676 eval { 3982 eval {
3677 $cb->($pkg); 3983 $cb->($pkg);
3678 1 3984 1
3679 } or warn "$pkg unloaded, but with errors: $@"; 3985 } or error "$pkg unloaded, but with errors: $@";
3680 } 3986 }
3681 3987
3682 warn "... clearing $pkg"; 3988 trace "... clearing $pkg";
3683 clear_package $pkg; 3989 clear_package $pkg;
3684 } 3990 }
3685 3991
3686 warn "unloading all perl modules loaded from $LIBDIR"; 3992 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3687 while (my ($k, $v) = each %INC) { 3993 while (my ($k, $v) = each %INC) {
3688 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3994 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3689 3995
3690 warn "... unloading $k"; 3996 trace "... unloading $k";
3691 delete $INC{$k}; 3997 delete $INC{$k};
3692 3998
3693 $k =~ s/\.pm$//; 3999 $k =~ s/\.pm$//;
3694 $k =~ s/\//::/g; 4000 $k =~ s/\//::/g;
3695 4001
3698 } 4004 }
3699 4005
3700 clear_package $k; 4006 clear_package $k;
3701 } 4007 }
3702 4008
3703 warn "getting rid of safe::, as good as possible"; 4009 trace "perl_reload: getting rid of safe::, as good as possible";
3704 clear_package "safe::$_" 4010 clear_package "safe::$_"
3705 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4011 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3706 4012
3707 warn "unloading cf.pm \"a bit\""; 4013 trace "perl_reload: unloading cf.pm \"a bit\"";
3708 delete $INC{"cf.pm"}; 4014 delete $INC{"cf.pm"};
3709 delete $INC{"cf/pod.pm"}; 4015 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3710 4016
3711 # don't, removes xs symbols, too, 4017 # don't, removes xs symbols, too,
3712 # and global variables created in xs 4018 # and global variables created in xs
3713 #clear_package __PACKAGE__; 4019 #clear_package __PACKAGE__;
3714 4020
3715 warn "unload completed, starting to reload now"; 4021 info "perl_reload: unload completed, starting to reload now";
3716 4022
3717 warn "reloading cf.pm"; 4023 trace "perl_reload: reloading cf.pm";
3718 require cf; 4024 require cf;
3719 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4025 cf::_connect_to_perl_1;
3720 4026
3721 warn "loading config and database again"; 4027 trace "perl_reload: loading config and database again";
3722 cf::reload_config; 4028 cf::reload_config;
3723 4029
3724 warn "loading extensions"; 4030 trace "perl_reload: loading extensions";
3725 cf::load_extensions; 4031 cf::load_extensions;
3726 4032
4033 if ($REATTACH_ON_RELOAD) {
3727 warn "reattaching attachments to objects/players"; 4034 trace "perl_reload: reattaching attachments to objects/players";
3728 _global_reattach; # objects, sockets 4035 _global_reattach; # objects, sockets
3729 warn "reattaching attachments to maps"; 4036 trace "perl_reload: reattaching attachments to maps";
3730 reattach $_ for values %MAP; 4037 reattach $_ for values %MAP;
3731 warn "reattaching attachments to players"; 4038 trace "perl_reload: reattaching attachments to players";
3732 reattach $_ for values %PLAYER; 4039 reattach $_ for values %PLAYER;
4040 }
3733 4041
3734 warn "running post_load"; 4042 cf::_post_init 1;
3735 (pop @POST_INIT)->(1) while @POST_INIT;
3736 4043
3737 warn "leaving sync_job"; 4044 trace "perl_reload: leaving sync_job";
3738 4045
3739 1 4046 1
3740 } or do { 4047 } or do {
3741 warn $@; 4048 error $@;
3742 cf::cleanup "error while reloading, exiting."; 4049 cf::cleanup "perl_reload: error, exiting.";
3743 }; 4050 };
3744 4051
3745 warn "reloaded";
3746 --$RELOAD; 4052 --$RELOAD;
3747 } 4053 }
4054
4055 $t1 = AE::time - $t1;
4056 info "perl_reload: completed in ${t1}s\n";
3748}; 4057};
3749 4058
3750our $RELOAD_WATCHER; # used only during reload 4059our $RELOAD_WATCHER; # used only during reload
3751 4060
3752sub reload_perl() { 4061sub reload_perl() {
3753 # doing reload synchronously and two reloads happen back-to-back, 4062 # doing reload synchronously and two reloads happen back-to-back,
3754 # coro crashes during coro_state_free->destroy here. 4063 # coro crashes during coro_state_free->destroy here.
3755 4064
4065 $RELOAD_WATCHER ||= cf::async {
4066 Coro::AIO::aio_wait cache_extensions;
4067
3756 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 4068 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3757 do_reload_perl; 4069 do_reload_perl;
3758 undef $RELOAD_WATCHER; 4070 undef $RELOAD_WATCHER;
4071 };
3759 }; 4072 };
3760} 4073}
3761 4074
3762register_command "reload" => sub { 4075register_command "reload" => sub {
3763 my ($who, $arg) = @_; 4076 my ($who, $arg) = @_;
3769 reload_perl; 4082 reload_perl;
3770 }; 4083 };
3771 } 4084 }
3772}; 4085};
3773 4086
3774unshift @INC, $LIBDIR; 4087#############################################################################
3775 4088
3776my $bug_warning = 0; 4089my $bug_warning = 0;
3777 4090
3778our @WAIT_FOR_TICK; 4091our @WAIT_FOR_TICK;
3779our @WAIT_FOR_TICK_BEGIN; 4092our @WAIT_FOR_TICK_BEGIN;
3780 4093
3781sub wait_for_tick { 4094sub wait_for_tick() {
3782 return if tick_inhibit || $Coro::current == $Coro::main; 4095 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3783 4096
3784 my $signal = new Coro::Signal; 4097 my $signal = new Coro::Signal;
3785 push @WAIT_FOR_TICK, $signal; 4098 push @WAIT_FOR_TICK, $signal;
3786 $signal->wait; 4099 $signal->wait;
3787} 4100}
3788 4101
3789sub wait_for_tick_begin { 4102sub wait_for_tick_begin() {
3790 return if tick_inhibit || $Coro::current == $Coro::main; 4103 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3791 4104
3792 my $signal = new Coro::Signal; 4105 my $signal = new Coro::Signal;
3793 push @WAIT_FOR_TICK_BEGIN, $signal; 4106 push @WAIT_FOR_TICK_BEGIN, $signal;
3794 $signal->wait; 4107 $signal->wait;
3795} 4108}
3801 return; 4114 return;
3802 } 4115 }
3803 4116
3804 cf::server_tick; # one server iteration 4117 cf::server_tick; # one server iteration
3805 4118
4119 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4120
3806 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4121 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3807 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4122 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3808 Coro::async_pool { 4123 Coro::async_pool {
3809 $Coro::current->{desc} = "runtime saver"; 4124 $Coro::current->{desc} = "runtime saver";
3810 write_runtime_sync 4125 write_runtime_sync
3811 or warn "ERROR: unable to write runtime file: $!"; 4126 or error "ERROR: unable to write runtime file: $!";
3812 }; 4127 };
3813 } 4128 }
3814 4129
3815 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4130 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3816 $sig->send; 4131 $sig->send;
3824 4139
3825 if (0) { 4140 if (0) {
3826 if ($NEXT_TICK) { 4141 if ($NEXT_TICK) {
3827 my $jitter = $TICK_START - $NEXT_TICK; 4142 my $jitter = $TICK_START - $NEXT_TICK;
3828 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4143 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3829 warn "jitter $JITTER\n";#d# 4144 debug "jitter $JITTER\n";#d#
3830 } 4145 }
3831 } 4146 }
3832} 4147}
3833 4148
3834{ 4149{
3835 # configure BDB 4150 # configure BDB
3836 4151
3837 BDB::min_parallel 8; 4152 BDB::min_parallel 16;
3838 BDB::max_poll_reqs $TICK * 0.1; 4153 BDB::max_poll_reqs $TICK * 0.1;
3839 $AnyEvent::BDB::WATCHER->priority (1); 4154 $AnyEvent::BDB::WATCHER->priority (1);
3840 4155
3841 unless ($DB_ENV) { 4156 unless ($DB_ENV) {
3842 $DB_ENV = BDB::db_env_create; 4157 $DB_ENV = BDB::db_env_create;
3879 IO::AIO::min_parallel 8; 4194 IO::AIO::min_parallel 8;
3880 IO::AIO::max_poll_time $TICK * 0.1; 4195 IO::AIO::max_poll_time $TICK * 0.1;
3881 undef $AnyEvent::AIO::WATCHER; 4196 undef $AnyEvent::AIO::WATCHER;
3882} 4197}
3883 4198
3884my $_log_backtrace; 4199our $_log_backtrace;
4200our $_log_backtrace_last;
3885 4201
3886sub _log_backtrace { 4202sub _log_backtrace {
3887 my ($msg, @addr) = @_; 4203 my ($msg, @addr) = @_;
3888 4204
3889 $msg =~ s/\n//; 4205 $msg =~ s/\n$//;
3890 4206
4207 if ($_log_backtrace_last eq $msg) {
4208 LOG llevInfo, "[ABT] $msg\n";
4209 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3891 # limit the # of concurrent backtraces 4210 # limit the # of concurrent backtraces
3892 if ($_log_backtrace < 2) { 4211 } elsif ($_log_backtrace < 2) {
4212 $_log_backtrace_last = $msg;
3893 ++$_log_backtrace; 4213 ++$_log_backtrace;
3894 my $perl_bt = Carp::longmess $msg; 4214 my $perl_bt = Carp::longmess $msg;
3895 async { 4215 async {
3896 $Coro::current->{desc} = "abt $msg"; 4216 $Coro::current->{desc} = "abt $msg";
3897 4217
3917 LOG llevInfo, "[ABT] $_\n" for @bt; 4237 LOG llevInfo, "[ABT] $_\n" for @bt;
3918 --$_log_backtrace; 4238 --$_log_backtrace;
3919 }; 4239 };
3920 } else { 4240 } else {
3921 LOG llevInfo, "[ABT] $msg\n"; 4241 LOG llevInfo, "[ABT] $msg\n";
3922 LOG llevInfo, "[ABT] [suppressed]\n"; 4242 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3923 } 4243 }
3924} 4244}
3925 4245
3926# load additional modules 4246# load additional modules
3927use cf::pod; 4247require "cf/$_.pm" for @EXTRA_MODULES;
4248cf::_connect_to_perl_2;
3928 4249
3929END { cf::emergency_save } 4250END { cf::emergency_save }
3930 4251
39311 42521
3932 4253

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines