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.450 by root, Mon Sep 22 01:33:09 2008 UTC vs.
Revision 1.568 by root, Tue May 3 17:12:14 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
81our %EXTCMD = (); 87our %EXTCMD = ();
82our %EXTICMD = (); 88our %EXTICMD = ();
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 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;
127 145
128our $LOAD; # a number between 0 (idle) and 1 (too many objects) 146our $LOAD; # a number between 0 (idle) and 1 (too many objects)
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
150
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 :)
132 155
133binmode STDOUT; 156binmode STDOUT;
134binmode STDERR; 157binmode STDERR;
135 158
136# read virtual server time, if available 159# read virtual server time, if available
138 open my $fh, "<", $RUNTIMEFILE 161 open my $fh, "<", $RUNTIMEFILE
139 or die "unable to read $RUNTIMEFILE file: $!"; 162 or die "unable to read $RUNTIMEFILE file: $!";
140 $RUNTIME = <$fh> + 0.; 163 $RUNTIME = <$fh> + 0.;
141} 164}
142 165
166eval "sub TICK() { $TICK } 1" or die;
167
143mkdir $_ 168mkdir $_
144 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 169 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
145 170
146our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
147 172
148sub 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::"} };
149 189
150############################################################################# 190#############################################################################
151 191
152=head2 GLOBAL VARIABLES 192=head2 GLOBAL VARIABLES
153 193
195from wherever your confdir points to. 235from wherever your confdir points to.
196 236
197=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
198 238
199These 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
200returns 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
201per 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.
202 242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
247
203=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
204 249
205This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
206C<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
207that call. 252that call.
208 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
209=back 260=back
210 261
211=cut 262=cut
212 263
213BEGIN { 264sub error(@) { LOG llevError, join "", @_ }
214 *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 {
215 my $msg = join "", @_; 271 my $msg = join "", @_;
216 272
217 $msg .= "\n" 273 $msg .= "\n"
218 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
219 275
220 $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;
221 277
222 LOG llevError, $msg; 278 LOG llevWarn, $msg;
223 }; 279};
224}
225 280
226$Coro::State::DIEHOOK = sub { 281$Coro::State::DIEHOOK = sub {
227 return unless $^S eq 0; # "eq", not "==" 282 return unless $^S eq 0; # "eq", not "=="
228 283
229 if ($Coro::current == $Coro::main) {#d# 284 error Carp::longmess $_[0];
285
286 if (in_main) {#d#
230 warn "DIEHOOK called in main context, Coro bug?\n";#d# 287 error "DIEHOOK called in main context, Coro bug?\n";#d#
231 return;#d# 288 return;#d#
232 }#d# 289 }#d#
233 290
234 # kill coroutine otherwise 291 # kill coroutine otherwise
235 warn Carp::longmess $_[0];
236 Coro::terminate 292 Coro::terminate
237}; 293};
238
239$SIG{__DIE__} = sub { }; #d#?
240 294
241@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 295@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
242@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 296@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
243@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 297@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
244@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 298@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
258)) { 312)) {
259 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
260} 314}
261 315
262$EV::DIED = sub { 316$EV::DIED = sub {
263 warn "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
264}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
265 324
266############################################################################# 325#############################################################################
267 326
268=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
269 328
290 $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;
291 $d 350 $d
292 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
293} 352}
294 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
295=item $ref = cf::decode_json $json 368=item $ref = cf::decode_json $json
296 369
297Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
298 371
299=item $json = cf::encode_json $ref 372=item $json = cf::encode_json $ref
305our $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
306 379
307sub encode_json($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
308sub decode_json($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
309 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
414=item cf::post_init { BLOCK }
415
416Execute the given codeblock, I<after> all extensions have been (re-)loaded,
417but I<before> the server starts ticking again.
418
419The codeblock will have a single boolean argument to indicate whether this
420is a reload or not.
421
422=cut
423
424sub post_init(&) {
425 push @POST_INIT, shift;
426}
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
310=item cf::lock_wait $string 445=item cf::lock_wait $string
311 446
312Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
313 448
314=item my $lock = cf::lock_acquire $string 449=item my $lock = cf::lock_acquire $string
315 450
316Wait 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
317a 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,
318for example when the coroutine gets canceled), the lock is automatically 453for example when the coroutine gets canceled), the lock is automatically
319returned. 454returned.
320 455
321Locks 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
322deadlocked coro. 457deadlocked coro.
328 463
329Return 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.
330 465
331=cut 466=cut
332 467
333our %LOCK; 468our $LOCKS = new Coro::SemaphoreSet;
334our %LOCKER;#d#
335 469
336sub lock_wait($) { 470sub lock_wait($) {
337 my ($key) = @_; 471 $LOCKS->wait ($_[0]);
338
339 if ($LOCKER{$key} == $Coro::current) {#d#
340 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
341 return;#d#
342 }#d#
343
344 # wait for lock, if any
345 while ($LOCK{$key}) {
346 push @{ $LOCK{$key} }, $Coro::current;
347 Coro::schedule;
348 }
349} 472}
350 473
351sub lock_acquire($) { 474sub lock_acquire($) {
352 my ($key) = @_; 475 $LOCKS->guard ($_[0])
353
354 # wait, to be sure we are not locked
355 lock_wait $key;
356
357 $LOCK{$key} = [];
358 $LOCKER{$key} = $Coro::current;#d#
359
360 Coro::guard {
361 delete $LOCKER{$key};#d#
362 # wake up all waiters, to be on the safe side
363 $_->ready for @{ delete $LOCK{$key} };
364 }
365} 476}
366 477
367sub lock_active($) { 478sub lock_active($) {
368 my ($key) = @_; 479 $LOCKS->count ($_[0]) < 1
369
370 ! ! $LOCK{$key}
371} 480}
372 481
373sub freeze_mainloop { 482sub freeze_mainloop {
374 tick_inhibit_inc; 483 tick_inhibit_inc;
375 484
376 Coro::guard \&tick_inhibit_dec; 485 &Guard::guard (\&tick_inhibit_dec);
377} 486}
378 487
379=item cf::periodic $interval, $cb 488=item cf::periodic $interval, $cb
380 489
381Like 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
382get spread over timer. 491get spread over time.
383 492
384=cut 493=cut
385 494
386sub periodic($$) { 495sub periodic($$) {
387 my ($interval, $cb) = @_; 496 my ($interval, $cb) = @_;
391 EV::periodic $start, $interval, 0, $cb 500 EV::periodic $start, $interval, 0, $cb
392} 501}
393 502
394=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
395 504
396Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
397This 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
398of 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.
399 512
400The 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
401used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
402 515
403Useful for short background jobs. 516Useful for short background jobs.
404 517
405=cut 518=cut
406 519
407our @SLOT_QUEUE; 520our @SLOT_QUEUE;
408our $SLOT_QUEUE; 521our $SLOT_QUEUE;
522our $SLOT_DECAY = 0.9;
409 523
410$SLOT_QUEUE->cancel if $SLOT_QUEUE; 524$SLOT_QUEUE->cancel if $SLOT_QUEUE;
411$SLOT_QUEUE = Coro::async { 525$SLOT_QUEUE = Coro::async {
412 $Coro::current->desc ("timeslot manager"); 526 $Coro::current->desc ("timeslot manager");
413 527
414 my $signal = new Coro::Signal; 528 my $signal = new Coro::Signal;
529 my $busy;
415 530
416 while () { 531 while () {
417 next_job: 532 next_job:
533
418 my $avail = cf::till_tick; 534 my $avail = cf::till_tick;
419 if ($avail > 0.01) { 535
420 for (0 .. $#SLOT_QUEUE) { 536 for (0 .. $#SLOT_QUEUE) {
421 if ($SLOT_QUEUE[$_][0] < $avail) { 537 if ($SLOT_QUEUE[$_][0] <= $avail) {
538 $busy = 0;
422 my $job = splice @SLOT_QUEUE, $_, 1, (); 539 my $job = splice @SLOT_QUEUE, $_, 1, ();
423 $job->[2]->send; 540 $job->[2]->send;
424 Coro::cede; 541 Coro::cede;
425 goto next_job; 542 goto next_job;
426 } 543 } else {
544 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
427 } 545 }
428 } 546 }
429 547
430 if (@SLOT_QUEUE) { 548 if (@SLOT_QUEUE) {
431 # 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
432 push @cf::WAIT_FOR_TICK, $signal; 550 push @cf::WAIT_FOR_TICK, $signal;
433 $signal->wait; 551 $signal->wait;
434 } else { 552 } else {
553 $busy = 0;
435 Coro::schedule; 554 Coro::schedule;
436 } 555 }
437 } 556 }
438}; 557};
439 558
440sub get_slot($;$$) { 559sub get_slot($;$$) {
441 return if tick_inhibit || $Coro::current == $Coro::main; 560 return if tick_inhibit || $Coro::current == $Coro::main;
442 561
443 my ($time, $pri, $name) = @_; 562 my ($time, $pri, $name) = @_;
444 563
445 $time = $TICK * .6 if $time > $TICK * .6; 564 $time = clamp $time, 0.01, $TICK * .6;
565
446 my $sig = new Coro::Signal; 566 my $sig = new Coro::Signal;
447 567
448 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 568 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
449 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 569 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
450 $SLOT_QUEUE->ready; 570 $SLOT_QUEUE->ready;
476=cut 596=cut
477 597
478sub sync_job(&) { 598sub sync_job(&) {
479 my ($job) = @_; 599 my ($job) = @_;
480 600
481 if ($Coro::current == $Coro::main) { 601 if (in_main) {
482 my $time = EV::time; 602 my $time = AE::time;
483 603
484 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
485 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
486 606
487 LOG llevError, Carp::longmess "sync job";#d# 607 #LOG llevError, Carp::longmess "sync job";#d#
488 608
489 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
490 610
491 my $busy = 1; 611 my $busy = 1;
492 my @res; 612 my @res;
493 613
494 (async { 614 (async {
495 $Coro::current->desc ("sync job coro"); 615 $Coro::current->desc ("sync job coro");
496 @res = eval { $job->() }; 616 @res = eval { $job->() };
497 warn $@ if $@; 617 error $@ if $@;
498 undef $busy; 618 undef $busy;
499 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
500 620
501 while ($busy) { 621 while ($busy) {
502 if (Coro::nready) { 622 if (Coro::nready) {
504 } else { 624 } else {
505 EV::loop EV::LOOP_ONESHOT; 625 EV::loop EV::LOOP_ONESHOT;
506 } 626 }
507 } 627 }
508 628
509 my $time = EV::time - $time; 629 my $time = AE::time - $time;
510 630
511 $TICK_START += $time; # do not account sync jobs to server load 631 $TICK_START += $time; # do not account sync jobs to server load
512 632
513 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
514 } else { 634 } else {
536 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
537 657
538 $coro 658 $coro
539} 659}
540 660
541=item fork_call { }, $args 661=item fork_call { }, @args
542 662
543Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
544process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
545Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
546never block itself or use any form of event handling. 666never block itself or use any form of event handling.
547 667
548=cut 668=cut
549 669
670sub post_fork {
671 reset_signals;
672}
673
550sub fork_call(&@) { 674sub fork_call(&@) {
551 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
552 676
553 # 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,
554 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
555 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
556 680
557 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
558 reset_signals; 682 cf::post_fork;
559 &$cb 683 &$cb
560 }, @args; 684 } @args;
561 685
562 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 )
563} 698}
564 699
565=item $coin = coin_from_name $name 700=item $coin = coin_from_name $name
566 701
567=cut 702=cut
604within each server. 739within each server.
605 740
606=cut 741=cut
607 742
608sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
609 my ($name) = @_; 747 my ($name) = @_;
610 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
611 749
612 eval { 750 eval {
613 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
623} 761}
624 762
625our $DB; 763our $DB;
626 764
627sub db_init { 765sub db_init {
628 cf::sync_job {
629 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
630 };
631} 767}
632 768
633sub db_get($$) { 769sub db_get($$) {
634 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
635 771
636 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
637 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
638 776
639 $! ? () 777 $! ? ()
640 : $data 778 : $data
641 }
642} 779}
643 780
644sub db_put($$$) { 781sub db_put($$$) {
645 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
646 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
674 811
675 my @data; 812 my @data;
676 my $md5; 813 my $md5;
677 814
678 for (0 .. $#$src) { 815 for (0 .. $#$src) {
679 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
680 or Carp::croak "$src->[$_]: $!";
681 } 817 }
682 818
683 # if processing is expensive, check 819 # if processing is expensive, check
684 # checksum first 820 # checksum first
685 if (1) { 821 if (1) {
702 838
703 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
704 my $data = $process->(\@data); 840 my $data = $process->(\@data);
705 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
706 842
707 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
708 844
709 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
710 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
711 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
712 848
722 858
723=cut 859=cut
724 860
725sub datalog($@) { 861sub datalog($@) {
726 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
727 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
728} 864}
729 865
730=back 866=back
731 867
732=cut 868=cut
927 1063
928 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
929 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
930 1066
931 } elsif (ref $type) { 1067 } elsif (ref $type) {
932 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
933 1069
934 } else { 1070 } else {
935 shift @arg; 1071 shift @arg;
936 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
937 } 1073 }
938 } 1074 }
939} 1075}
940 1076
941sub _object_attach { 1077sub _object_attach {
951 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
952 } 1088 }
953 1089
954 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
955 } else { 1091 } else {
956 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
957 } 1093 }
958 1094
959 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
960} 1096}
961 1097
1020 1156
1021 for (@$callbacks) { 1157 for (@$callbacks) {
1022 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
1023 1159
1024 if ($@) { 1160 if ($@) {
1025 warn "$@";
1026 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1027 override; 1162 override;
1028 } 1163 }
1029 1164
1030 return 1 if $override; 1165 return 1 if $override;
1031 } 1166 }
1110 for (@$attach) { 1245 for (@$attach) {
1111 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
1112 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
1113 } 1248 }
1114 } else { 1249 } else {
1115 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
1116 } 1251 }
1117 } 1252 }
1118} 1253}
1119 1254
1120cf::attachable->attach ( 1255cf::attachable->attach (
1147 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1148 1283
1149 sync_job { 1284 sync_job {
1150 if (length $$rdata) { 1285 if (length $$rdata) {
1151 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1152 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1153 $decname, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1154 1290
1155 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1156 aio_chmod $fh, SAVE_MODE; 1292 aio_chmod $fh, SAVE_MODE;
1157 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1158 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 }
1159 aio_close $fh; 1298 aio_close $fh;
1160 1299
1161 if (@$objs) { 1300 if (@$objs) {
1162 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) {
1163 aio_chmod $fh, SAVE_MODE; 1302 aio_chmod $fh, SAVE_MODE;
1164 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1303 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1165 aio_write $fh, 0, (length $data), $data, 0; 1304 aio_write $fh, 0, (length $data), $data, 0;
1166 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 }
1167 aio_close $fh; 1309 aio_close $fh;
1168 aio_rename "$filename.pst~", "$filename.pst"; 1310 aio_rename "$filename.pst~", "$filename.pst";
1169 } 1311 }
1170 } else { 1312 } else {
1171 aio_unlink "$filename.pst"; 1313 aio_unlink "$filename.pst";
1172 } 1314 }
1173 1315
1174 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1317
1318 $filename =~ s%/[^/]+$%%;
1319 aio_pathsync $filename if $cf::USE_FSYNC;
1175 } else { 1320 } else {
1176 warn "FATAL: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1177 } 1322 }
1178 } else { 1323 } else {
1179 aio_unlink $filename; 1324 aio_unlink $filename;
1180 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1181 } 1326 }
1205 my $st = eval { Coro::Storable::thaw $av }; 1350 my $st = eval { Coro::Storable::thaw $av };
1206 $av = $st->{objs}; 1351 $av = $st->{objs};
1207 } 1352 }
1208 1353
1209 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1210 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1211 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1212 1358
1213 ($data, $av) 1359 ($data, $av)
1214} 1360}
1215 1361
1216=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
1272 my ($name, $cb) = @_; 1418 my ($name, $cb) = @_;
1273 1419
1274 $EXTICMD{$name} = $cb; 1420 $EXTICMD{$name} = $cb;
1275} 1421}
1276 1422
1423use File::Glob ();
1424
1277cf::player->attach ( 1425cf::player->attach (
1278 on_command => sub { 1426 on_unknown_command => sub {
1279 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1280 1428
1281 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1282 or return; 1430 or return;
1283 1431
1306 1454
1307 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1308 if $reply; 1456 if $reply;
1309 1457
1310 } else { 1458 } else {
1311 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1312 } 1460 }
1313 1461
1314 cf::override; 1462 cf::override;
1315 }, 1463 },
1316); 1464);
1317 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
1318sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1319 cf::sync_job { 1482 cf::sync_job {
1320 my %todo; 1483 my %todo;
1321 1484
1322 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1323 next unless -r $path; 1486 next unless -r $path;
1341 1504
1342 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1343 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1344 1507
1345 $ext{source} = 1508 $ext{source} =
1346 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1347 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1348 . $source 1511 . $source
1349 . "\n};\n1"; 1512 . "\n};\n1";
1350 1513
1351 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
1352 } 1515 }
1353 1516
1517 my $pass = 0;
1354 my %done; 1518 my %done;
1355 while (%todo) { 1519 while (%todo) {
1356 my $progress; 1520 my $progress;
1357 1521
1522 ++$pass;
1523
1524 ext:
1358 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
1359 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1360 goto skip 1527 next ext
1361 unless exists $done{$_}; 1528 unless exists $done{$_};
1362 } 1529 }
1363 1530
1364 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1365 1532
1366 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
1367 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
1368 : "$v->{base}: extension inactive.\n";
1369 1537
1370 if (exists $v->{meta}{mandatory}) {
1371 warn $msg;
1372 cf::cleanup "mandatory extension failed to load, exiting."; 1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1373 } 1539 if exists $v->{meta}{mandatory};
1374 1540
1375 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;
1376 } 1550 }
1377
1378 $done{$k} = delete $todo{$k};
1379 push @EXTS, $v->{pkg};
1380 $progress = 1;
1381 } 1551 }
1382 1552
1383 skip: 1553 unless ($progress) {
1384 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1385 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 }
1386 } 1563 }
1387 }; 1564 };
1388} 1565}
1389 1566
1390############################################################################# 1567#############################################################################
1444 1621
1445sub exists($) { 1622sub exists($) {
1446 my ($login) = @_; 1623 my ($login) = @_;
1447 1624
1448 $cf::PLAYER{$login} 1625 $cf::PLAYER{$login}
1449 or cf::sync_job { !aio_stat path $login } 1626 or !aio_stat path $login
1450} 1627}
1451 1628
1452sub find($) { 1629sub find($) {
1453 return $cf::PLAYER{$_[0]} || do { 1630 return $cf::PLAYER{$_[0]} || do {
1454 my $login = $_[0]; 1631 my $login = $_[0];
1474 $cf::PLAYER{$login} = $pl 1651 $cf::PLAYER{$login} = $pl
1475 } 1652 }
1476 } 1653 }
1477} 1654}
1478 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
1479sub save($) { 1669sub save($) {
1480 my ($pl) = @_; 1670 my ($pl) = @_;
1481 1671
1482 return if $pl->{deny_save}; 1672 return if $pl->{deny_save};
1483 1673
1488 1678
1489 aio_mkdir playerdir $pl, 0770; 1679 aio_mkdir playerdir $pl, 0770;
1490 $pl->{last_save} = $cf::RUNTIME; 1680 $pl->{last_save} = $cf::RUNTIME;
1491 1681
1492 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];
1493 1686
1494 $pl->save_pl ($path); 1687 $pl->save_pl ($path);
1495 cf::cede_to_tick; 1688 cf::cede_to_tick;
1496} 1689}
1497 1690
1531 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1532 1725
1533 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1534 $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
1535 1728
1536 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1537 $pl->deactivate; 1730 $pl->deactivate;
1731
1538 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;
1539 $pl->ob->check_score;
1540 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1541 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1542 1737
1543 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1544 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1545 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
1599 \@logins 1794 \@logins
1600} 1795}
1601 1796
1602=item $player->maps 1797=item $player->maps
1603 1798
1799=item cf::player::maps $login
1800
1604Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1605player. May block. 1802player. May block.
1606 1803
1607=cut 1804=cut
1608 1805
1670=cut 1867=cut
1671 1868
1672sub find_by_path($) { 1869sub find_by_path($) {
1673 my ($path) = @_; 1870 my ($path) = @_;
1674 1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1873
1675 my ($match, $specificity); 1874 my ($match, $specificity);
1676 1875
1677 for my $region (list) { 1876 for my $region (list) {
1678 if ($region->{match} && $path =~ $region->{match}) { 1877 if ($region->{match} && $path =~ $region->{match}) {
1679 ($match, $specificity) = ($region, $region->specificity) 1878 ($match, $specificity) = ($region, $region->specificity)
1707sub generate_random_map { 1906sub generate_random_map {
1708 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1709 1908
1710 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
1711 1910
1712 # mit "rum" bekleckern, nicht
1713 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1714 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1715 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1716 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1717 $rmp->{exit_on_final_map},
1718 $rmp->{xsize}, $rmp->{ysize},
1719 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1720 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1721 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1722 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1723 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1724 (cf::region::find $rmp->{region}), $rmp->{custom}
1725 )
1726} 1912}
1727 1913
1728=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1729 1915
1730Register 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
1735 1921
1736sub register { 1922sub register {
1737 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1738 my $pkg = caller; 1924 my $pkg = caller;
1739 1925
1740 no strict;
1741 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1742 1927
1743 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1744} 1929}
1745 1930
1746# also paths starting with '/' 1931# also paths starting with '/'
1747$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1748 1933
1749sub thawer_merge { 1934sub thawer_merge {
1750 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1751 1936
1752 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
1757} 1942}
1758 1943
1759sub normalise { 1944sub normalise {
1760 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1761 1946
1762 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1763 1948
1764 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1765 1950
1766 # map plan: 1951 # map plan:
1767 # 1952 #
1782 $base =~ s{[^/]+/?$}{}; 1967 $base =~ s{[^/]+/?$}{};
1783 $path = "$base/$path"; 1968 $path = "$base/$path";
1784 } 1969 }
1785 1970
1786 for ($path) { 1971 for ($path) {
1787 redo if s{//}{/};
1788 redo if s{/\.?/}{/}; 1972 redo if s{/\.?/}{/};
1789 redo if s{/[^/]+/\.\./}{/}; 1973 redo if s{/[^/]+/\.\./}{/};
1790 } 1974 }
1791 1975
1792 $path 1976 $path
1806 $self->init; # pass $1 etc. 1990 $self->init; # pass $1 etc.
1807 return $self; 1991 return $self;
1808 } 1992 }
1809 } 1993 }
1810 1994
1811 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1995 Carp::cluck "unable to resolve path '$path' (base '$base')";
1812 () 1996 ()
1813} 1997}
1814 1998
1999# may re-bless or do other evil things
1815sub init { 2000sub init {
1816 my ($self) = @_; 2001 my ($self) = @_;
1817 2002
1818 $self 2003 $self
1819} 2004}
1850 2035
1851 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2036 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1852 "$UNIQUEDIR/$path" 2037 "$UNIQUEDIR/$path"
1853} 2038}
1854 2039
1855# and all this just because we cannot iterate over
1856# all maps in C++...
1857sub change_all_map_light {
1858 my ($change) = @_;
1859
1860 $_->change_map_light ($change)
1861 for grep $_->outdoor, values %cf::MAP;
1862}
1863
1864sub decay_objects { 2040sub decay_objects {
1865 my ($self) = @_; 2041 my ($self) = @_;
1866 2042
1867 return if $self->{deny_reset}; 2043 return if $self->{deny_reset};
1868 2044
1893 $self->{load_path} = $path; 2069 $self->{load_path} = $path;
1894 2070
1895 1 2071 1
1896} 2072}
1897 2073
2074# used to laod the header of an original map
1898sub load_header_orig { 2075sub load_header_orig {
1899 my ($self) = @_; 2076 my ($self) = @_;
1900 2077
1901 $self->load_header_from ($self->load_path) 2078 $self->load_header_from ($self->load_path)
1902} 2079}
1903 2080
2081# used to laod the header of an instantiated map
1904sub load_header_temp { 2082sub load_header_temp {
1905 my ($self) = @_; 2083 my ($self) = @_;
1906 2084
1907 $self->load_header_from ($self->save_path) 2085 $self->load_header_from ($self->save_path)
1908} 2086}
1909 2087
2088# called after loading the header from an instantiated map
1910sub prepare_temp { 2089sub prepare_temp {
1911 my ($self) = @_; 2090 my ($self) = @_;
1912 2091
1913 $self->last_access ((delete $self->{last_access}) 2092 $self->last_access ((delete $self->{last_access})
1914 || $cf::RUNTIME); #d# 2093 || $cf::RUNTIME); #d#
1915 # safety 2094 # safety
1916 $self->{instantiate_time} = $cf::RUNTIME 2095 $self->{instantiate_time} = $cf::RUNTIME
1917 if $self->{instantiate_time} > $cf::RUNTIME; 2096 if $self->{instantiate_time} > $cf::RUNTIME;
1918} 2097}
1919 2098
2099# called after loading the header from an original map
1920sub prepare_orig { 2100sub prepare_orig {
1921 my ($self) = @_; 2101 my ($self) = @_;
1922 2102
1923 $self->{load_original} = 1; 2103 $self->{load_original} = 1;
1924 $self->{instantiate_time} = $cf::RUNTIME; 2104 $self->{instantiate_time} = $cf::RUNTIME;
1948 2128
1949sub find; 2129sub find;
1950sub find { 2130sub find {
1951 my ($path, $origin) = @_; 2131 my ($path, $origin) = @_;
1952 2132
2133 cf::cede_to_tick;
2134
1953 $path = normalise $path, $origin && $origin->path; 2135 $path = normalise $path, $origin;
1954 2136
1955 cf::lock_wait "map_data:$path";#d#remove 2137 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1956 cf::lock_wait "map_find:$path"; 2138 my $guard2 = cf::lock_acquire "map_find:$path";
1957 2139
1958 $cf::MAP{$path} || do { 2140 $cf::MAP{$path} || do {
1959 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1960 my $guard2 = cf::lock_acquire "map_find:$path";
1961
1962 my $map = new_from_path cf::map $path 2141 my $map = new_from_path cf::map $path
1963 or return; 2142 or return;
1964 2143
1965 $map->{last_save} = $cf::RUNTIME; 2144 $map->{last_save} = $cf::RUNTIME;
1966 2145
1978 2157
1979 $cf::MAP{$path} = $map 2158 $cf::MAP{$path} = $map
1980 } 2159 }
1981} 2160}
1982 2161
1983sub pre_load { } 2162sub pre_load { }
1984sub post_load { } 2163#sub post_load { } # XS
1985 2164
1986sub load { 2165sub load {
1987 my ($self) = @_; 2166 my ($self) = @_;
1988 2167
1989 local $self->{deny_reset} = 1; # loading can take a long time 2168 local $self->{deny_reset} = 1; # loading can take a long time
2001 $self->alloc; 2180 $self->alloc;
2002 2181
2003 $self->pre_load; 2182 $self->pre_load;
2004 cf::cede_to_tick; 2183 cf::cede_to_tick;
2005 2184
2185 if (exists $self->{load_path}) {
2006 my $f = new_from_file cf::object::thawer $self->{load_path}; 2186 my $f = new_from_file cf::object::thawer $self->{load_path};
2007 $f->skip_block; 2187 $f->skip_block;
2008 $self->_load_objects ($f) 2188 $self->_load_objects ($f)
2009 or return; 2189 or return;
2010 2190
2011 $self->post_load_original 2191 $self->post_load_original
2012 if delete $self->{load_original}; 2192 if delete $self->{load_original};
2013 2193
2014 if (my $uniq = $self->uniq_path) { 2194 if (my $uniq = $self->uniq_path) {
2015 utf8::encode $uniq; 2195 utf8::encode $uniq;
2016 unless (aio_stat $uniq) { 2196 unless (aio_stat $uniq) {
2017 if (my $f = new_from_file cf::object::thawer $uniq) { 2197 if (my $f = new_from_file cf::object::thawer $uniq) {
2018 $self->clear_unique_items; 2198 $self->clear_unique_items;
2019 $self->_load_objects ($f); 2199 $self->_load_objects ($f);
2020 $f->resolve_delayed_derefs; 2200 $f->resolve_delayed_derefs;
2201 }
2021 } 2202 }
2022 } 2203 }
2023 }
2024 2204
2025 $f->resolve_delayed_derefs; 2205 $f->resolve_delayed_derefs;
2206 } else {
2207 $self->post_load_original
2208 if delete $self->{load_original};
2209 }
2026 2210
2027 cf::cede_to_tick; 2211 cf::cede_to_tick;
2028 # now do the right thing for maps 2212 # now do the right thing for maps
2029 $self->link_multipart_objects; 2213 $self->link_multipart_objects;
2030 $self->difficulty ($self->estimate_difficulty) 2214 $self->difficulty ($self->estimate_difficulty)
2034 unless ($self->{deny_activate}) { 2218 unless ($self->{deny_activate}) {
2035 $self->decay_objects; 2219 $self->decay_objects;
2036 $self->fix_auto_apply; 2220 $self->fix_auto_apply;
2037 $self->update_buttons; 2221 $self->update_buttons;
2038 cf::cede_to_tick; 2222 cf::cede_to_tick;
2039 $self->set_darkness_map; 2223 #$self->activate; # no longer activate maps automatically
2040 cf::cede_to_tick;
2041 $self->activate;
2042 } 2224 }
2043 2225
2044 $self->{last_save} = $cf::RUNTIME; 2226 $self->{last_save} = $cf::RUNTIME;
2045 $self->last_access ($cf::RUNTIME); 2227 $self->last_access ($cf::RUNTIME);
2046 2228
2047 $self->in_memory (cf::MAP_ACTIVE); 2229 $self->in_memory (cf::MAP_ACTIVE);
2048 } 2230 }
2049 2231
2050 $self->post_load; 2232 $self->post_load;
2051}
2052 2233
2234 1
2235}
2236
2237# customize the map for a given player, i.e.
2238# return the _real_ map. used by e.g. per-player
2239# maps to change the path to ~playername/mappath
2053sub customise_for { 2240sub customise_for {
2054 my ($self, $ob) = @_; 2241 my ($self, $ob) = @_;
2055 2242
2056 return find "~" . $ob->name . "/" . $self->{path} 2243 return find "~" . $ob->name . "/" . $self->{path}
2057 if $self->per_player; 2244 if $self->per_player;
2073 or next; 2260 or next;
2074 $neigh = find $neigh, $map 2261 $neigh = find $neigh, $map
2075 or next; 2262 or next;
2076 $neigh->load; 2263 $neigh->load;
2077 2264
2265 # now find the diagonal neighbours
2078 push @neigh, 2266 push @neigh,
2079 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2267 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2080 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2268 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2081 } 2269 }
2082 2270
2089} 2277}
2090 2278
2091sub find_sync { 2279sub find_sync {
2092 my ($path, $origin) = @_; 2280 my ($path, $origin) = @_;
2093 2281
2094 cf::sync_job { find $path, $origin } 2282 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2283 if $Coro::current == $Coro::main;
2284
2285 find $path, $origin
2095} 2286}
2096 2287
2097sub do_load_sync { 2288sub do_load_sync {
2098 my ($map) = @_; 2289 my ($map) = @_;
2099 2290
2100 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2291 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2101 if $Coro::current == $Coro::main; 2292 if $Coro::current == $Coro::main;
2102 2293
2103 cf::sync_job { $map->load }; 2294 $map->load;
2104} 2295}
2105 2296
2106our %MAP_PREFETCH; 2297our %MAP_PREFETCH;
2107our $MAP_PREFETCHER = undef; 2298our $MAP_PREFETCHER = undef;
2108 2299
2109sub find_async { 2300sub find_async {
2110 my ($path, $origin, $load) = @_; 2301 my ($path, $origin, $load) = @_;
2111 2302
2112 $path = normalise $path, $origin && $origin->{path}; 2303 $path = normalise $path, $origin;
2113 2304
2114 if (my $map = $cf::MAP{$path}) { 2305 if (my $map = $cf::MAP{$path}) {
2115 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2306 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2116 } 2307 }
2117 2308
2134 $MAP_PREFETCHER->prio (6); 2325 $MAP_PREFETCHER->prio (6);
2135 2326
2136 () 2327 ()
2137} 2328}
2138 2329
2330# common code, used by both ->save and ->swapout
2139sub save { 2331sub _save {
2140 my ($self) = @_; 2332 my ($self) = @_;
2141
2142 my $lock = cf::lock_acquire "map_data:$self->{path}";
2143 2333
2144 $self->{last_save} = $cf::RUNTIME; 2334 $self->{last_save} = $cf::RUNTIME;
2145 2335
2146 return unless $self->dirty; 2336 return unless $self->dirty;
2147 2337
2167 } else { 2357 } else {
2168 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2358 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2169 } 2359 }
2170} 2360}
2171 2361
2362sub save {
2363 my ($self) = @_;
2364
2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2366
2367 $self->_save;
2368}
2369
2172sub swap_out { 2370sub swap_out {
2173 my ($self) = @_; 2371 my ($self) = @_;
2174 2372
2175 # save first because save cedes
2176 $self->save;
2177
2178 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2373 my $lock = cf::lock_acquire "map_data:$self->{path}";
2179 2374
2180 return if $self->players;
2181 return if $self->in_memory != cf::MAP_ACTIVE; 2375 return if $self->in_memory != cf::MAP_ACTIVE;
2182 return if $self->{deny_save}; 2376 return if $self->{deny_save};
2377 return if $self->players;
2183 2378
2379 # first deactivate the map and "unlink" it from the core
2380 $self->deactivate;
2381 $_->clear_links_to ($self) for values %cf::MAP;
2184 $self->in_memory (cf::MAP_SWAPPED); 2382 $self->in_memory (cf::MAP_SWAPPED);
2383
2384 # then atomically save
2385 $self->_save;
2386
2387 # then free the map
2388 $self->clear;
2389}
2390
2391sub reset_at {
2392 my ($self) = @_;
2393
2394 # TODO: safety, remove and allow resettable per-player maps
2395 return 1e99 if $self->{deny_reset};
2396
2397 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2398 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2399
2400 $time + $to
2401}
2402
2403sub should_reset {
2404 my ($self) = @_;
2405
2406 $self->reset_at <= $cf::RUNTIME
2407}
2408
2409sub reset {
2410 my ($self) = @_;
2411
2412 my $lock = cf::lock_acquire "map_data:$self->{path}";
2413
2414 return if $self->players;
2415
2416 cf::trace "resetting map ", $self->path, "\n";
2417
2418 $self->in_memory (cf::MAP_SWAPPED);
2419
2420 # need to save uniques path
2421 unless ($self->{deny_save}) {
2422 my $uniq = $self->uniq_path; utf8::encode $uniq;
2423
2424 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2425 if $uniq;
2426 }
2427
2428 delete $cf::MAP{$self->path};
2185 2429
2186 $self->deactivate; 2430 $self->deactivate;
2187 $_->clear_links_to ($self) for values %cf::MAP; 2431 $_->clear_links_to ($self) for values %cf::MAP;
2188 $self->clear; 2432 $self->clear;
2189}
2190
2191sub reset_at {
2192 my ($self) = @_;
2193
2194 # TODO: safety, remove and allow resettable per-player maps
2195 return 1e99 if $self->{deny_reset};
2196
2197 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2198 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2199
2200 $time + $to
2201}
2202
2203sub should_reset {
2204 my ($self) = @_;
2205
2206 $self->reset_at <= $cf::RUNTIME
2207}
2208
2209sub reset {
2210 my ($self) = @_;
2211
2212 my $lock = cf::lock_acquire "map_data:$self->{path}";
2213
2214 return if $self->players;
2215
2216 warn "resetting map ", $self->path;
2217
2218 $self->in_memory (cf::MAP_SWAPPED);
2219
2220 # need to save uniques path
2221 unless ($self->{deny_save}) {
2222 my $uniq = $self->uniq_path; utf8::encode $uniq;
2223
2224 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2225 if $uniq;
2226 }
2227
2228 delete $cf::MAP{$self->path};
2229
2230 $self->deactivate;
2231 $_->clear_links_to ($self) for values %cf::MAP;
2232 $self->clear;
2233 2433
2234 $self->unlink_save; 2434 $self->unlink_save;
2235 $self->destroy; 2435 $self->destroy;
2236} 2436}
2237 2437
2245 2445
2246 delete $cf::MAP{$self->path}; 2446 delete $cf::MAP{$self->path};
2247 2447
2248 $self->unlink_save; 2448 $self->unlink_save;
2249 2449
2250 bless $self, "cf::map"; 2450 bless $self, "cf::map::wrap";
2251 delete $self->{deny_reset}; 2451 delete $self->{deny_reset};
2252 $self->{deny_save} = 1; 2452 $self->{deny_save} = 1;
2253 $self->reset_timeout (1); 2453 $self->reset_timeout (1);
2254 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2454 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2255 2455
2312 : normalise $_ 2512 : normalise $_
2313 } @{ aio_readdir $UNIQUEDIR or [] } 2513 } @{ aio_readdir $UNIQUEDIR or [] }
2314 ] 2514 ]
2315} 2515}
2316 2516
2517=item cf::map::static_maps
2518
2519Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2520file in the shared directory excluding F</styles> and F</editor>). May
2521block.
2522
2523=cut
2524
2525sub static_maps() {
2526 my @dirs = "";
2527 my @maps;
2528
2529 while (@dirs) {
2530 my $dir = shift @dirs;
2531
2532 next if $dir eq "/styles" || $dir eq "/editor";
2533
2534 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2535 or return;
2536
2537 for (@$files) {
2538 s/\.map$// or next;
2539 utf8::decode $_;
2540 push @maps, "$dir/$_";
2541 }
2542
2543 push @dirs, map "$dir/$_", @$dirs;
2544 }
2545
2546 \@maps
2547}
2548
2317=back 2549=back
2318 2550
2319=head3 cf::object 2551=head3 cf::object
2320 2552
2321=cut 2553=cut
2386 2618
2387our $SAY_CHANNEL = { 2619our $SAY_CHANNEL = {
2388 id => "say", 2620 id => "say",
2389 title => "Map", 2621 title => "Map",
2390 reply => "say ", 2622 reply => "say ",
2391 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2623 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2392}; 2624};
2393 2625
2394our $CHAT_CHANNEL = { 2626our $CHAT_CHANNEL = {
2395 id => "chat", 2627 id => "chat",
2396 title => "Chat", 2628 title => "Chat",
2453 2685
2454Freezes the player and moves him/her to a special map (C<{link}>). 2686Freezes the player and moves him/her to a special map (C<{link}>).
2455 2687
2456The player should be reasonably safe there for short amounts of time (e.g. 2688The player should be reasonably safe there for short amounts of time (e.g.
2457for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2689for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2458though, as the palyer cannot control the character while it is on the link 2690though, as the player cannot control the character while it is on the link
2459map. 2691map.
2460 2692
2461Will never block. 2693Will never block.
2462 2694
2463=item $player_object->leave_link ($map, $x, $y) 2695=item $player_object->leave_link ($map, $x, $y)
2484sub cf::object::player::enter_link { 2716sub cf::object::player::enter_link {
2485 my ($self) = @_; 2717 my ($self) = @_;
2486 2718
2487 $self->deactivate_recursive; 2719 $self->deactivate_recursive;
2488 2720
2721 ++$self->{_link_recursion};
2722
2489 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2723 return if UNIVERSAL::isa $self->map, "ext::map_link";
2490 2724
2491 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2725 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2492 if $self->map && $self->map->{path} ne "{link}"; 2726 if $self->map && $self->map->{path} ne "{link}";
2493 2727
2494 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2728 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2495} 2729}
2496 2730
2497sub cf::object::player::leave_link { 2731sub cf::object::player::leave_link {
2498 my ($self, $map, $x, $y) = @_; 2732 my ($self, $map, $x, $y) = @_;
2499 2733
2516 ($x, $y) = (-1, -1) 2750 ($x, $y) = (-1, -1)
2517 unless (defined $x) && (defined $y); 2751 unless (defined $x) && (defined $y);
2518 2752
2519 # use -1 or undef as default coordinates, not 0, 0 2753 # use -1 or undef as default coordinates, not 0, 0
2520 ($x, $y) = ($map->enter_x, $map->enter_y) 2754 ($x, $y) = ($map->enter_x, $map->enter_y)
2521 if $x <=0 && $y <= 0; 2755 if $x <= 0 && $y <= 0;
2522 2756
2523 $map->load; 2757 $map->load;
2524 $map->load_neighbours; 2758 $map->load_neighbours;
2525 2759
2526 return unless $self->contr->active; 2760 return unless $self->contr->active;
2527 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2528 $self->activate_recursive;
2529 2761
2530 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2762 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2531 $self->enter_map ($map, $x, $y); 2763 if ($self->enter_map ($map, $x, $y)) {
2532} 2764 # entering was successful
2765 delete $self->{_link_recursion};
2766 # only activate afterwards, to support waiting in hooks
2767 $self->activate_recursive;
2768 }
2533 2769
2770}
2771
2534=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2772=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2535 2773
2536Moves the player to the given map-path and coordinates by first freezing 2774Moves the player to the given map-path and coordinates by first freezing
2537her, loading and preparing them map, calling the provided $check callback 2775her, loading and preparing them map, calling the provided $check callback
2538that has to return the map if sucecssful, and then unfreezes the player on 2776that has to return the map if sucecssful, and then unfreezes the player on
2539the new (success) or old (failed) map position. In either case, $done will 2777the new (success) or old (failed) map position. In either case, $done will
2546 2784
2547our $GOTOGEN; 2785our $GOTOGEN;
2548 2786
2549sub cf::object::player::goto { 2787sub cf::object::player::goto {
2550 my ($self, $path, $x, $y, $check, $done) = @_; 2788 my ($self, $path, $x, $y, $check, $done) = @_;
2789
2790 if ($self->{_link_recursion} >= $MAX_LINKS) {
2791 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2792 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2793 ($path, $x, $y) = @$EMERGENCY_POSITION;
2794 }
2551 2795
2552 # do generation counting so two concurrent goto's will be executed in-order 2796 # do generation counting so two concurrent goto's will be executed in-order
2553 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2797 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2554 2798
2555 $self->enter_link; 2799 $self->enter_link;
2575 ($path, $x, $y) = (undef, undef, undef); 2819 ($path, $x, $y) = (undef, undef, undef);
2576 } 2820 }
2577 } 2821 }
2578 2822
2579 my $map = eval { 2823 my $map = eval {
2580 my $map = defined $path ? cf::map::find $path : undef; 2824 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2581 2825
2582 if ($map) { 2826 if ($map) {
2583 $map = $map->customise_for ($self); 2827 $map = $map->customise_for ($self);
2584 $map = $check->($map) if $check && $map; 2828 $map = $check->($map, $x, $y, $self) if $check && $map;
2585 } else { 2829 } else {
2586 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2830 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2587 } 2831 }
2588 2832
2589 $map 2833 $map
2597 if ($gen == $self->{_goto_generation}) { 2841 if ($gen == $self->{_goto_generation}) {
2598 delete $self->{_goto_generation}; 2842 delete $self->{_goto_generation};
2599 $self->leave_link ($map, $x, $y); 2843 $self->leave_link ($map, $x, $y);
2600 } 2844 }
2601 2845
2602 $done->() if $done; 2846 $done->($self) if $done;
2603 })->prio (1); 2847 })->prio (1);
2604} 2848}
2605 2849
2606=item $player_object->enter_exit ($exit_object) 2850=item $player_object->enter_exit ($exit_object)
2607 2851
2675 $Coro::current->{desc} = "enter_exit"; 2919 $Coro::current->{desc} = "enter_exit";
2676 2920
2677 unless (eval { 2921 unless (eval {
2678 $self->deactivate_recursive; # just to be sure 2922 $self->deactivate_recursive; # just to be sure
2679 2923
2680 # random map handling
2681 {
2682 my $guard = cf::lock_acquire "exit_prepare:$exit";
2683
2684 prepare_random_map $exit
2685 if $exit->slaying eq "/!";
2686 }
2687
2688 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2924 my $map = cf::map::normalise $exit->slaying, $exit->map;
2689 my $x = $exit->stats->hp; 2925 my $x = $exit->stats->hp;
2690 my $y = $exit->stats->sp; 2926 my $y = $exit->stats->sp;
2927
2928 # special map handling
2929 my $slaying = $exit->slaying;
2930
2931 # special map handling
2932 if ($slaying eq "/!") {
2933 my $guard = cf::lock_acquire "exit_prepare:$exit";
2934
2935 prepare_random_map $exit
2936 if $slaying eq "/!"; # need to re-check after getting the lock
2937
2938 } elsif ($slaying eq '!up') {
2939 $map = $exit->map->tile_path (cf::TILE_UP);
2940 $x = $exit->x;
2941 $y = $exit->y;
2942
2943 } elsif ($slaying eq '!down') {
2944 $map = $exit->map->tile_path (cf::TILE_DOWN);
2945 $x = $exit->x;
2946 $y = $exit->y;
2947 }
2691 2948
2692 $self->goto ($map, $x, $y); 2949 $self->goto ($map, $x, $y);
2693 2950
2694 # if exit is damned, update players death & WoR home-position 2951 # if exit is damned, update players death & WoR home-position
2695 $self->contr->savebed ($map, $x, $y) 2952 $self->contr->savebed ($map, $x, $y)
2700 $self->message ("Something went wrong deep within the deliantra server. " 2957 $self->message ("Something went wrong deep within the deliantra server. "
2701 . "I'll try to bring you back to the map you were before. " 2958 . "I'll try to bring you back to the map you were before. "
2702 . "Please report this to the dungeon master!", 2959 . "Please report this to the dungeon master!",
2703 cf::NDI_UNIQUE | cf::NDI_RED); 2960 cf::NDI_UNIQUE | cf::NDI_RED);
2704 2961
2705 warn "ERROR in enter_exit: $@"; 2962 error "ERROR in enter_exit: $@";
2706 $self->leave_link; 2963 $self->leave_link;
2707 } 2964 }
2708 })->prio (1); 2965 })->prio (1);
2709} 2966}
2710 2967
2722sub cf::client::send_drawinfo { 2979sub cf::client::send_drawinfo {
2723 my ($self, $text, $flags) = @_; 2980 my ($self, $text, $flags) = @_;
2724 2981
2725 utf8::encode $text; 2982 utf8::encode $text;
2726 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2983 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2984}
2985
2986=item $client->send_big_packet ($pkt)
2987
2988Like C<send_packet>, but tries to compress large packets, and fragments
2989them as required.
2990
2991=cut
2992
2993our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2994
2995sub cf::client::send_big_packet {
2996 my ($self, $pkt) = @_;
2997
2998 # try lzf for large packets
2999 $pkt = "lzf " . Compress::LZF::compress $pkt
3000 if 1024 <= length $pkt and $self->{can_lzf};
3001
3002 # split very large packets
3003 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3004 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3005 $pkt = "frag";
3006 }
3007
3008 $self->send_packet ($pkt);
2727} 3009}
2728 3010
2729=item $client->send_msg ($channel, $msg, $color, [extra...]) 3011=item $client->send_msg ($channel, $msg, $color, [extra...])
2730 3012
2731Send a drawinfo or msg packet to the client, formatting the msg for the 3013Send a drawinfo or msg packet to the client, formatting the msg for the
2735 3017
2736=cut 3018=cut
2737 3019
2738# non-persistent channels (usually the info channel) 3020# non-persistent channels (usually the info channel)
2739our %CHANNEL = ( 3021our %CHANNEL = (
3022 "c/motd" => {
3023 id => "infobox",
3024 title => "MOTD",
3025 reply => undef,
3026 tooltip => "The message of the day",
3027 },
2740 "c/identify" => { 3028 "c/identify" => {
2741 id => "infobox", 3029 id => "infobox",
2742 title => "Identify", 3030 title => "Identify",
2743 reply => undef, 3031 reply => undef,
2744 tooltip => "Items recently identified", 3032 tooltip => "Items recently identified",
2746 "c/examine" => { 3034 "c/examine" => {
2747 id => "infobox", 3035 id => "infobox",
2748 title => "Examine", 3036 title => "Examine",
2749 reply => undef, 3037 reply => undef,
2750 tooltip => "Signs and other items you examined", 3038 tooltip => "Signs and other items you examined",
3039 },
3040 "c/shopinfo" => {
3041 id => "infobox",
3042 title => "Shop Info",
3043 reply => undef,
3044 tooltip => "What your bargaining skill tells you about the shop",
2751 }, 3045 },
2752 "c/book" => { 3046 "c/book" => {
2753 id => "infobox", 3047 id => "infobox",
2754 title => "Book", 3048 title => "Book",
2755 reply => undef, 3049 reply => undef,
2771 id => "infobox", 3065 id => "infobox",
2772 title => "Body Parts", 3066 title => "Body Parts",
2773 reply => undef, 3067 reply => undef,
2774 tooltip => "Shows which body parts you posess and are available", 3068 tooltip => "Shows which body parts you posess and are available",
2775 }, 3069 },
3070 "c/statistics" => {
3071 id => "infobox",
3072 title => "Statistics",
3073 reply => undef,
3074 tooltip => "Shows your primary statistics",
3075 },
2776 "c/skills" => { 3076 "c/skills" => {
2777 id => "infobox", 3077 id => "infobox",
2778 title => "Skills", 3078 title => "Skills",
2779 reply => undef, 3079 reply => undef,
2780 tooltip => "Shows your experience per skill and item power", 3080 tooltip => "Shows your experience per skill and item power",
3081 },
3082 "c/shopitems" => {
3083 id => "infobox",
3084 title => "Shop Items",
3085 reply => undef,
3086 tooltip => "Shows the items currently for sale in this shop",
3087 },
3088 "c/resistances" => {
3089 id => "infobox",
3090 title => "Resistances",
3091 reply => undef,
3092 tooltip => "Shows your resistances",
3093 },
3094 "c/pets" => {
3095 id => "infobox",
3096 title => "Pets",
3097 reply => undef,
3098 tooltip => "Shows information abotu your pets/a specific pet",
3099 },
3100 "c/perceiveself" => {
3101 id => "infobox",
3102 title => "Perceive Self",
3103 reply => undef,
3104 tooltip => "You gained detailed knowledge about yourself",
2781 }, 3105 },
2782 "c/uptime" => { 3106 "c/uptime" => {
2783 id => "infobox", 3107 id => "infobox",
2784 title => "Uptime", 3108 title => "Uptime",
2785 reply => undef, 3109 reply => undef,
2795 id => "party", 3119 id => "party",
2796 title => "Party", 3120 title => "Party",
2797 reply => "gsay ", 3121 reply => "gsay ",
2798 tooltip => "Messages and chat related to your party", 3122 tooltip => "Messages and chat related to your party",
2799 }, 3123 },
3124 "c/death" => {
3125 id => "death",
3126 title => "Death",
3127 reply => undef,
3128 tooltip => "Reason for and more info about your most recent death",
3129 },
3130 "c/say" => $SAY_CHANNEL,
3131 "c/chat" => $CHAT_CHANNEL,
2800); 3132);
2801 3133
2802sub cf::client::send_msg { 3134sub cf::client::send_msg {
2803 my ($self, $channel, $msg, $color, @extra) = @_; 3135 my ($self, $channel, $msg, $color, @extra) = @_;
2804 3136
2809 3141
2810 # check predefined channels, for the benefit of C 3142 # check predefined channels, for the benefit of C
2811 if ($CHANNEL{$channel}) { 3143 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel}; 3144 $channel = $CHANNEL{$channel};
2813 3145
2814 $self->ext_msg (channel_info => $channel) 3146 $self->ext_msg (channel_info => $channel);
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id}; 3147 $channel = $channel->{id};
2818 3148
2819 } elsif (ref $channel) { 3149 } elsif (ref $channel) {
2820 # send meta info to client, if not yet sent 3150 # send meta info to client, if not yet sent
2821 unless (exists $self->{channel}{$channel->{id}}) { 3151 unless (exists $self->{channel}{$channel->{id}}) {
2822 $self->{channel}{$channel->{id}} = $channel; 3152 $self->{channel}{$channel->{id}} = $channel;
2823 $self->ext_msg (channel_info => $channel) 3153 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825 } 3154 }
2826 3155
2827 $channel = $channel->{id}; 3156 $channel = $channel->{id};
2828 } 3157 }
2829 3158
2830 return unless @extra || length $msg; 3159 return unless @extra || length $msg;
2831 3160
2832 if ($self->can_msg) {
2833 # default colour, mask it out 3161 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3162 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF; 3163 if $color & cf::NDI_DEF;
2836 3164
2837 my $pkt = "msg " 3165 my $pkt = "msg "
2838 . $self->{json_coder}->encode ( 3166 . $self->{json_coder}->encode (
2839 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3167 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2840 ); 3168 );
2841 3169
2842 # try lzf for large packets
2843 $pkt = "lzf " . Compress::LZF::compress $pkt
2844 if 1024 <= length $pkt and $self->{can_lzf};
2845
2846 # split very large packets
2847 if (8192 < length $pkt and $self->{can_lzf}) {
2848 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2849 $pkt = "frag";
2850 }
2851
2852 $self->send_packet ($pkt); 3170 $self->send_big_packet ($pkt);
2853 } else {
2854 if ($color >= 0) {
2855 # replace some tags by gcfclient-compatible ones
2856 for ($msg) {
2857 1 while
2858 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2859 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2860 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2861 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2862 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2863 }
2864
2865 $color &= cf::NDI_COLOR_MASK;
2866
2867 utf8::encode $msg;
2868
2869 if (0 && $msg =~ /\[/) {
2870 # COMMAND/INFO
2871 $self->send_packet ("drawextinfo $color 10 8 $msg")
2872 } else {
2873 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2874 $self->send_packet ("drawinfo $color $msg")
2875 }
2876 }
2877 }
2878} 3171}
2879 3172
2880=item $client->ext_msg ($type, @msg) 3173=item $client->ext_msg ($type, @msg)
2881 3174
2882Sends an ext event to the client. 3175Sends an ext event to the client.
2885 3178
2886sub cf::client::ext_msg($$@) { 3179sub cf::client::ext_msg($$@) {
2887 my ($self, $type, @msg) = @_; 3180 my ($self, $type, @msg) = @_;
2888 3181
2889 if ($self->extcmd == 2) { 3182 if ($self->extcmd == 2) {
2890 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3183 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2891 } elsif ($self->extcmd == 1) { # TODO: remove 3184 } elsif ($self->extcmd == 1) { # TODO: remove
2892 push @msg, msgtype => "event_$type"; 3185 push @msg, msgtype => "event_$type";
2893 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3186 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2894 } 3187 }
2895} 3188}
2896 3189
2897=item $client->ext_reply ($msgid, @msg) 3190=item $client->ext_reply ($msgid, @msg)
2898 3191
2902 3195
2903sub cf::client::ext_reply($$@) { 3196sub cf::client::ext_reply($$@) {
2904 my ($self, $id, @msg) = @_; 3197 my ($self, $id, @msg) = @_;
2905 3198
2906 if ($self->extcmd == 2) { 3199 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3200 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2908 } elsif ($self->extcmd == 1) { 3201 } elsif ($self->extcmd == 1) {
2909 #TODO: version 1, remove 3202 #TODO: version 1, remove
2910 unshift @msg, msgtype => "reply", msgid => $id; 3203 unshift @msg, msgtype => "reply", msgid => $id;
2911 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3204 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2912 } 3205 }
2913} 3206}
2914 3207
2915=item $success = $client->query ($flags, "text", \&cb) 3208=item $success = $client->query ($flags, "text", \&cb)
2916 3209
2987 3280
2988 $ns->ext_reply ($reply, @reply) 3281 $ns->ext_reply ($reply, @reply)
2989 if $reply; 3282 if $reply;
2990 3283
2991 } else { 3284 } else {
2992 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3285 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2993 } 3286 }
2994 3287
2995 cf::override; 3288 cf::override;
2996 }, 3289 },
2997); 3290);
3017 3310
3018 $coro 3311 $coro
3019} 3312}
3020 3313
3021cf::client->attach ( 3314cf::client->attach (
3022 on_destroy => sub { 3315 on_client_destroy => sub {
3023 my ($ns) = @_; 3316 my ($ns) = @_;
3024 3317
3025 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3318 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3026 }, 3319 },
3027); 3320);
3043our $safe_hole = new Safe::Hole; 3336our $safe_hole = new Safe::Hole;
3044 3337
3045$SIG{FPE} = 'IGNORE'; 3338$SIG{FPE} = 'IGNORE';
3046 3339
3047$safe->permit_only (Opcode::opset qw( 3340$safe->permit_only (Opcode::opset qw(
3048 :base_core :base_mem :base_orig :base_math 3341 :base_core :base_mem :base_orig :base_math :base_loop
3049 grepstart grepwhile mapstart mapwhile 3342 grepstart grepwhile mapstart mapwhile
3050 sort time 3343 sort time
3051)); 3344));
3052 3345
3053# here we export the classes and methods available to script code 3346# here we export the classes and methods available to script code
3057The following functions and methods are available within a safe environment: 3350The following functions and methods are available within a safe environment:
3058 3351
3059 cf::object 3352 cf::object
3060 contr pay_amount pay_player map x y force_find force_add destroy 3353 contr pay_amount pay_player map x y force_find force_add destroy
3061 insert remove name archname title slaying race decrease split 3354 insert remove name archname title slaying race decrease split
3355 value
3062 3356
3063 cf::object::player 3357 cf::object::player
3064 player 3358 player
3065 3359
3066 cf::player 3360 cf::player
3072=cut 3366=cut
3073 3367
3074for ( 3368for (
3075 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3369 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3076 insert remove inv nrof name archname title slaying race 3370 insert remove inv nrof name archname title slaying race
3077 decrease split destroy change_exp)], 3371 decrease split destroy change_exp value msg lore send_msg)],
3078 ["cf::object::player" => qw(player)], 3372 ["cf::object::player" => qw(player)],
3079 ["cf::player" => qw(peaceful)], 3373 ["cf::player" => qw(peaceful send_msg)],
3080 ["cf::map" => qw(trigger)], 3374 ["cf::map" => qw(trigger)],
3081) { 3375) {
3082 no strict 'refs';
3083 my ($pkg, @funs) = @$_; 3376 my ($pkg, @funs) = @$_;
3084 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3377 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3085 for @funs; 3378 for @funs;
3086} 3379}
3087 3380
3102 3395
3103 my $qcode = $code; 3396 my $qcode = $code;
3104 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3397 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3105 $qcode =~ s/\n/\\n/g; 3398 $qcode =~ s/\n/\\n/g;
3106 3399
3400 %vars = (_dummy => 0) unless %vars;
3401
3402 my @res;
3107 local $_; 3403 local $_;
3108 local @safe::cf::_safe_eval_args = values %vars;
3109 3404
3110 my $eval = 3405 my $eval =
3111 "do {\n" 3406 "do {\n"
3112 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3407 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3113 . "#line 0 \"{$qcode}\"\n" 3408 . "#line 0 \"{$qcode}\"\n"
3114 . $code 3409 . $code
3115 . "\n}" 3410 . "\n}"
3116 ; 3411 ;
3117 3412
3413 if ($CFG{safe_eval}) {
3118 sub_generation_inc; 3414 sub_generation_inc;
3415 local @safe::cf::_safe_eval_args = values %vars;
3119 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3416 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3120 sub_generation_inc; 3417 sub_generation_inc;
3418 } else {
3419 local @cf::_safe_eval_args = values %vars;
3420 @res = wantarray ? eval eval : scalar eval $eval;
3421 }
3121 3422
3122 if ($@) { 3423 if ($@) {
3123 warn "$@"; 3424 warn "$@",
3124 warn "while executing safe code '$code'\n"; 3425 "while executing safe code '$code'\n",
3125 warn "with arguments " . (join " ", %vars) . "\n"; 3426 "with arguments " . (join " ", %vars) . "\n";
3126 } 3427 }
3127 3428
3128 wantarray ? @res : $res[0] 3429 wantarray ? @res : $res[0]
3129} 3430}
3130 3431
3144=cut 3445=cut
3145 3446
3146sub register_script_function { 3447sub register_script_function {
3147 my ($fun, $cb) = @_; 3448 my ($fun, $cb) = @_;
3148 3449
3149 no strict 'refs'; 3450 $fun = "safe::$fun" if $CFG{safe_eval};
3150 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3451 *$fun = $safe_hole->wrap ($cb);
3151} 3452}
3152 3453
3153=back 3454=back
3154 3455
3155=cut 3456=cut
3164 # for this (global event?) 3465 # for this (global event?)
3165 %ext::player_env::MUSIC_FACE_CACHE = (); 3466 %ext::player_env::MUSIC_FACE_CACHE = ();
3166 3467
3167 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3468 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3168 3469
3169 warn "loading facedata from $path\n"; 3470 trace "loading facedata from $path\n";
3170 3471
3171 my $facedata; 3472 my $facedata = decode_storable load_file $path;
3172 0 < aio_load $path, $facedata
3173 or die "$path: $!";
3174
3175 $facedata = Coro::Storable::thaw $facedata;
3176 3473
3177 $facedata->{version} == 2 3474 $facedata->{version} == 2
3178 or cf::cleanup "$path: version mismatch, cannot proceed."; 3475 or cf::cleanup "$path: version mismatch, cannot proceed.";
3179 3476
3180 # patch in the exptable 3477 # patch in the exptable
3478 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3181 $facedata->{resource}{"res/exp_table"} = { 3479 $facedata->{resource}{"res/exp_table"} = {
3182 type => FT_RSRC, 3480 type => FT_RSRC,
3183 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3481 data => $exp_table,
3482 hash => (Digest::MD5::md5 $exp_table),
3184 }; 3483 };
3185 cf::cede_to_tick; 3484 cf::cede_to_tick;
3186 3485
3187 { 3486 {
3188 my $faces = $facedata->{faceinfo}; 3487 my $faces = $facedata->{faceinfo};
3190 while (my ($face, $info) = each %$faces) { 3489 while (my ($face, $info) = each %$faces) {
3191 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3490 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3192 3491
3193 cf::face::set_visibility $idx, $info->{visibility}; 3492 cf::face::set_visibility $idx, $info->{visibility};
3194 cf::face::set_magicmap $idx, $info->{magicmap}; 3493 cf::face::set_magicmap $idx, $info->{magicmap};
3195 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3494 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3196 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3495 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3496 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3197 3497
3198 cf::cede_to_tick; 3498 cf::cede_to_tick;
3199 } 3499 }
3200 3500
3201 while (my ($face, $info) = each %$faces) { 3501 while (my ($face, $info) = each %$faces) {
3206 3506
3207 if (my $smooth = cf::face::find $info->{smooth}) { 3507 if (my $smooth = cf::face::find $info->{smooth}) {
3208 cf::face::set_smooth $idx, $smooth; 3508 cf::face::set_smooth $idx, $smooth;
3209 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3509 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3210 } else { 3510 } else {
3211 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3511 error "smooth face '$info->{smooth}' not found for face '$face'";
3212 } 3512 }
3213 3513
3214 cf::cede_to_tick; 3514 cf::cede_to_tick;
3215 } 3515 }
3216 } 3516 }
3225 3525
3226 cf::anim::invalidate_all; # d'oh 3526 cf::anim::invalidate_all; # d'oh
3227 } 3527 }
3228 3528
3229 { 3529 {
3230 # TODO: for gcfclient pleasure, we should give resources
3231 # that gcfclient doesn't grok a >10000 face index.
3232 my $res = $facedata->{resource}; 3530 my $res = $facedata->{resource};
3233 3531
3234 while (my ($name, $info) = each %$res) { 3532 while (my ($name, $info) = each %$res) {
3235 if (defined $info->{type}) { 3533 if (defined $info->{type}) {
3236 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3534 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3237 my $data;
3238 3535
3239 if ($info->{type} & 1) { 3536 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3240 # prepend meta info
3241
3242 my $meta = $enc->encode ({
3243 name => $name,
3244 %{ $info->{meta} || {} },
3245 });
3246
3247 $data = pack "(w/a*)*", $meta, $info->{data};
3248 } else {
3249 $data = $info->{data};
3250 }
3251
3252 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3253 cf::face::set_type $idx, $info->{type}; 3537 cf::face::set_type $idx, $info->{type};
3254 } else { 3538 } else {
3255 $RESOURCE{$name} = $info; 3539 $RESOURCE{$name} = $info; # unused
3256 } 3540 }
3257 3541
3258 cf::cede_to_tick; 3542 cf::cede_to_tick;
3259 } 3543 }
3260 } 3544 }
3261 3545
3262 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3546 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3263 3547
3264 1 3548 1
3265} 3549}
3266
3267cf::global->attach (on_resource_update => sub {
3268 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3269 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3270
3271 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3272 my $sound = $soundconf->{compat}[$_]
3273 or next;
3274
3275 my $face = cf::face::find "sound/$sound->[1]";
3276 cf::sound::set $sound->[0] => $face;
3277 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3278 }
3279
3280 while (my ($k, $v) = each %{$soundconf->{event}}) {
3281 my $face = cf::face::find "sound/$v";
3282 cf::sound::set $k => $face;
3283 }
3284 }
3285});
3286 3550
3287register_exticmd fx_want => sub { 3551register_exticmd fx_want => sub {
3288 my ($ns, $want) = @_; 3552 my ($ns, $want) = @_;
3289 3553
3290 while (my ($k, $v) = each %$want) { 3554 while (my ($k, $v) = each %$want) {
3329sub reload_treasures { 3593sub reload_treasures {
3330 load_resource_file "$DATADIR/treasures" 3594 load_resource_file "$DATADIR/treasures"
3331 or die "unable to load treasurelists\n"; 3595 or die "unable to load treasurelists\n";
3332} 3596}
3333 3597
3598sub reload_sound {
3599 trace "loading sound config from $DATADIR/sound\n";
3600
3601 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3602
3603 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3604 my $sound = $soundconf->{compat}[$_]
3605 or next;
3606
3607 my $face = cf::face::find "sound/$sound->[1]";
3608 cf::sound::set $sound->[0] => $face;
3609 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3610 }
3611
3612 while (my ($k, $v) = each %{$soundconf->{event}}) {
3613 my $face = cf::face::find "sound/$v";
3614 cf::sound::set $k => $face;
3615 }
3616}
3617
3334sub reload_resources { 3618sub reload_resources {
3335 warn "reloading resource files...\n"; 3619 trace "reloading resource files...\n";
3336 3620
3621 reload_exp_table;
3622 reload_materials;
3337 reload_facedata; 3623 reload_facedata;
3624 reload_sound;
3338 reload_archetypes; 3625 reload_archetypes;
3339 reload_regions; 3626 reload_regions;
3340 reload_treasures; 3627 reload_treasures;
3341 3628
3342 warn "finished reloading resource files\n"; 3629 trace "finished reloading resource files\n";
3343}
3344
3345sub init {
3346 my $guard = freeze_mainloop;
3347
3348 evthread_start IO::AIO::poll_fileno;
3349
3350 reload_resources;
3351} 3630}
3352 3631
3353sub reload_config { 3632sub reload_config {
3354 open my $fh, "<:utf8", "$CONFDIR/config" 3633 trace "reloading config file...\n";
3355 or return;
3356 3634
3357 local $/; 3635 my $config = load_file "$CONFDIR/config";
3358 *CFG = YAML::Load <$fh>; 3636 utf8::decode $config;
3637 *CFG = decode_yaml $config;
3359 3638
3360 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3639 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3361 3640
3362 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3641 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3363 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3642 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3364 3643
3365 if (exists $CFG{mlockall}) { 3644 if (exists $CFG{mlockall}) {
3388 3667
3389 seek $fh, 0, 0; 3668 seek $fh, 0, 0;
3390 print $fh $$; 3669 print $fh $$;
3391} 3670}
3392 3671
3672sub main_loop {
3673 trace "EV::loop starting\n";
3674 if (1) {
3675 EV::loop;
3676 }
3677 trace "EV::loop returned\n";
3678 goto &main_loop unless $REALLY_UNLOOP;
3679}
3680
3393sub main { 3681sub main {
3394 atomic; 3682 cf::init_globals; # initialise logging
3683
3684 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3685 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3686 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3687 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3688
3689 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3395 3690
3396 # we must not ever block the main coroutine 3691 # we must not ever block the main coroutine
3397 local $Coro::idle = sub { 3692 local $Coro::idle = sub {
3398 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3693 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3399 (async { 3694 (async {
3400 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3695 $Coro::current->{desc} = "IDLE BUG HANDLER";
3401 EV::loop EV::LOOP_ONESHOT; 3696 EV::loop EV::LOOP_ONESHOT;
3402 })->prio (Coro::PRIO_MAX); 3697 })->prio (Coro::PRIO_MAX);
3403 }; 3698 };
3404 3699
3405 { 3700 evthread_start IO::AIO::poll_fileno;
3406 my $guard = freeze_mainloop; 3701
3702 cf::sync_job {
3703 cf::incloader::init ();
3704
3705 cf::init_anim;
3706 cf::init_attackmess;
3707 cf::init_dynamic;
3708
3709 cf::load_settings;
3710
3711 reload_resources;
3407 reload_config; 3712 reload_config;
3408 db_init; 3713 db_init;
3714
3715 cf::init_uuid;
3716 cf::init_signals;
3717 cf::init_skills;
3718
3719 cf::init_beforeplay;
3720
3721 atomic;
3722
3409 load_extensions; 3723 load_extensions;
3410 3724
3411 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3412 }
3413
3414 utime time, time, $RUNTIMEFILE; 3725 utime time, time, $RUNTIMEFILE;
3415 3726
3416 # no (long-running) fork's whatsoever before this point(!) 3727 # no (long-running) fork's whatsoever before this point(!)
3728 use POSIX ();
3417 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3729 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3418 3730
3419 EV::loop; 3731 cf::_post_init 0;
3732 };
3733
3734 cf::object::thawer::errors_are_fatal 0;
3735 info "parse errors in files are no longer fatal from this point on.\n";
3736
3737 my $free_main; $free_main = EV::idle sub {
3738 undef $free_main;
3739 undef &main; # free gobs of memory :)
3740 };
3741
3742 goto &main_loop;
3420} 3743}
3421 3744
3422############################################################################# 3745#############################################################################
3423# initialisation and cleanup 3746# initialisation and cleanup
3424 3747
3425# install some emergency cleanup handlers 3748# install some emergency cleanup handlers
3426BEGIN { 3749BEGIN {
3427 our %SIGWATCHER = (); 3750 our %SIGWATCHER = ();
3428 for my $signal (qw(INT HUP TERM)) { 3751 for my $signal (qw(INT HUP TERM)) {
3429 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3752 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3430 cf::cleanup "SIG$signal"; 3753 cf::cleanup "SIG$signal";
3431 }; 3754 };
3432 } 3755 }
3433} 3756}
3434 3757
3435sub write_runtime_sync { 3758sub write_runtime_sync {
3759 my $t0 = AE::time;
3760
3436 # first touch the runtime file to show we are still running: 3761 # first touch the runtime file to show we are still running:
3437 # the fsync below can take a very very long time. 3762 # the fsync below can take a very very long time.
3438 3763
3439 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3764 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3440 3765
3441 my $guard = cf::lock_acquire "write_runtime"; 3766 my $guard = cf::lock_acquire "write_runtime";
3442 3767
3443 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3768 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3444 or return; 3769 or return;
3445 3770
3446 my $value = $cf::RUNTIME + 90 + 10; 3771 my $value = $cf::RUNTIME + 90 + 10;
3447 # 10 is the runtime save interval, for a monotonic clock 3772 # 10 is the runtime save interval, for a monotonic clock
3448 # 60 allows for the watchdog to kill the server. 3773 # 60 allows for the watchdog to kill the server.
3461 or return; 3786 or return;
3462 3787
3463 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3788 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3464 and return; 3789 and return;
3465 3790
3466 warn "runtime file written.\n"; 3791 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3467 3792
3468 1 3793 1
3469} 3794}
3470 3795
3471our $uuid_lock; 3796our $uuid_lock;
3480 my $uuid = "$LOCALDIR/uuid"; 3805 my $uuid = "$LOCALDIR/uuid";
3481 3806
3482 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3807 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3483 or return; 3808 or return;
3484 3809
3485 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3810 my $value = uuid_seq uuid_cur;
3811
3812 unless ($value) {
3813 info "cowardly refusing to write zero uuid value!\n";
3814 return;
3815 }
3816
3817 my $value = uuid_str $value + $uuid_skip;
3486 $uuid_skip = 0; 3818 $uuid_skip = 0;
3487 3819
3488 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3820 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3489 and return; 3821 and return;
3490 3822
3496 or return; 3828 or return;
3497 3829
3498 aio_rename "$uuid~", $uuid 3830 aio_rename "$uuid~", $uuid
3499 and return; 3831 and return;
3500 3832
3501 warn "uuid file written ($value).\n"; 3833 trace "uuid file written ($value).\n";
3502 3834
3503 1 3835 1
3504 3836
3505} 3837}
3506 3838
3512} 3844}
3513 3845
3514sub emergency_save() { 3846sub emergency_save() {
3515 my $freeze_guard = cf::freeze_mainloop; 3847 my $freeze_guard = cf::freeze_mainloop;
3516 3848
3517 warn "enter emergency perl save\n"; 3849 info "emergency_perl_save: enter\n";
3850
3851 # this is a trade-off: we want to be very quick here, so
3852 # save all maps without fsync, and later call a global sync
3853 # (which in turn might be very very slow)
3854 local $USE_FSYNC = 0;
3518 3855
3519 cf::sync_job { 3856 cf::sync_job {
3857 cf::write_runtime_sync; # external watchdog should not bark
3858
3520 # use a peculiar iteration method to avoid tripping on perl 3859 # use a peculiar iteration method to avoid tripping on perl
3521 # refcount bugs in for. also avoids problems with players 3860 # refcount bugs in for. also avoids problems with players
3522 # and maps saved/destroyed asynchronously. 3861 # and maps saved/destroyed asynchronously.
3523 warn "begin emergency player save\n"; 3862 info "emergency_perl_save: begin player save\n";
3524 for my $login (keys %cf::PLAYER) { 3863 for my $login (keys %cf::PLAYER) {
3525 my $pl = $cf::PLAYER{$login} or next; 3864 my $pl = $cf::PLAYER{$login} or next;
3526 $pl->valid or next; 3865 $pl->valid or next;
3527 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3866 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3528 $pl->save; 3867 $pl->save;
3529 } 3868 }
3530 warn "end emergency player save\n"; 3869 info "emergency_perl_save: end player save\n";
3531 3870
3532 warn "begin emergency map save\n"; 3871 cf::write_runtime_sync; # external watchdog should not bark
3872
3873 info "emergency_perl_save: begin map save\n";
3533 for my $path (keys %cf::MAP) { 3874 for my $path (keys %cf::MAP) {
3534 my $map = $cf::MAP{$path} or next; 3875 my $map = $cf::MAP{$path} or next;
3535 $map->valid or next; 3876 $map->valid or next;
3536 $map->save; 3877 $map->save;
3537 } 3878 }
3538 warn "end emergency map save\n"; 3879 info "emergency_perl_save: end map save\n";
3539 3880
3540 warn "begin emergency database checkpoint\n"; 3881 cf::write_runtime_sync; # external watchdog should not bark
3882
3883 info "emergency_perl_save: begin database checkpoint\n";
3541 BDB::db_env_txn_checkpoint $DB_ENV; 3884 BDB::db_env_txn_checkpoint $DB_ENV;
3542 warn "end emergency database checkpoint\n"; 3885 info "emergency_perl_save: end database checkpoint\n";
3543 3886
3544 warn "begin write uuid\n"; 3887 info "emergency_perl_save: begin write uuid\n";
3545 write_uuid_sync 1; 3888 write_uuid_sync 1;
3546 warn "end write uuid\n"; 3889 info "emergency_perl_save: end write uuid\n";
3890
3891 cf::write_runtime_sync; # external watchdog should not bark
3892
3893 trace "emergency_perl_save: syncing database to disk";
3894 BDB::db_env_txn_checkpoint $DB_ENV;
3895
3896 info "emergency_perl_save: starting sync\n";
3897 IO::AIO::aio_sync sub {
3898 info "emergency_perl_save: finished sync\n";
3899 };
3900
3901 cf::write_runtime_sync; # external watchdog should not bark
3902
3903 trace "emergency_perl_save: flushing outstanding aio requests";
3904 while (IO::AIO::nreqs || BDB::nreqs) {
3905 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3906 }
3907
3908 cf::write_runtime_sync; # external watchdog should not bark
3547 }; 3909 };
3548 3910
3549 warn "leave emergency perl save\n"; 3911 info "emergency_perl_save: leave\n";
3550} 3912}
3551 3913
3552sub post_cleanup { 3914sub post_cleanup {
3553 my ($make_core) = @_; 3915 my ($make_core) = @_;
3554 3916
3917 IO::AIO::flush;
3918
3555 warn Carp::longmess "post_cleanup backtrace" 3919 error Carp::longmess "post_cleanup backtrace"
3556 if $make_core; 3920 if $make_core;
3557 3921
3558 my $fh = pidfile; 3922 my $fh = pidfile;
3559 unlink $PIDFILE if <$fh> == $$; 3923 unlink $PIDFILE if <$fh> == $$;
3560} 3924}
3580 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3944 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3581 for my $name (keys %$leaf_symtab) { 3945 for my $name (keys %$leaf_symtab) {
3582 _gv_clear *{"$pkg$name"}; 3946 _gv_clear *{"$pkg$name"};
3583# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3947# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3584 } 3948 }
3585 warn "cleared package #$pkg\n";#d#
3586} 3949}
3587
3588our $RELOAD; # how many times to reload
3589 3950
3590sub do_reload_perl() { 3951sub do_reload_perl() {
3591 # can/must only be called in main 3952 # can/must only be called in main
3592 if ($Coro::current != $Coro::main) { 3953 unless (in_main) {
3593 warn "can only reload from main coroutine"; 3954 error "can only reload from main coroutine";
3594 return; 3955 return;
3595 } 3956 }
3596 3957
3597 return if $RELOAD++; 3958 return if $RELOAD++;
3598 3959
3960 my $t1 = AE::time;
3961
3599 while ($RELOAD) { 3962 while ($RELOAD) {
3600 warn "reloading..."; 3963 cf::get_slot 0.1, -1, "reload_perl";
3964 info "perl_reload: reloading...";
3601 3965
3602 warn "entering sync_job"; 3966 trace "perl_reload: entering sync_job";
3603 3967
3604 cf::sync_job { 3968 cf::sync_job {
3605 cf::write_runtime_sync; # external watchdog should not bark
3606 cf::emergency_save; 3969 #cf::emergency_save;
3607 cf::write_runtime_sync; # external watchdog should not bark
3608 3970
3609 warn "syncing database to disk";
3610 BDB::db_env_txn_checkpoint $DB_ENV;
3611
3612 # if anything goes wrong in here, we should simply crash as we already saved
3613
3614 warn "flushing outstanding aio requests";
3615 while (IO::AIO::nreqs || BDB::nreqs) {
3616 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3617 }
3618
3619 warn "cancelling all extension coros"; 3971 trace "perl_reload: cancelling all extension coros";
3620 $_->cancel for values %EXT_CORO; 3972 $_->cancel for values %EXT_CORO;
3621 %EXT_CORO = (); 3973 %EXT_CORO = ();
3622 3974
3623 warn "removing commands"; 3975 trace "perl_reload: removing commands";
3624 %COMMAND = (); 3976 %COMMAND = ();
3625 3977
3626 warn "removing ext/exti commands"; 3978 trace "perl_reload: removing ext/exti commands";
3627 %EXTCMD = (); 3979 %EXTCMD = ();
3628 %EXTICMD = (); 3980 %EXTICMD = ();
3629 3981
3630 warn "unloading/nuking all extensions"; 3982 trace "perl_reload: unloading/nuking all extensions";
3631 for my $pkg (@EXTS) { 3983 for my $pkg (@EXTS) {
3632 warn "... unloading $pkg"; 3984 trace "... unloading $pkg";
3633 3985
3634 if (my $cb = $pkg->can ("unload")) { 3986 if (my $cb = $pkg->can ("unload")) {
3635 eval { 3987 eval {
3636 $cb->($pkg); 3988 $cb->($pkg);
3637 1 3989 1
3638 } or warn "$pkg unloaded, but with errors: $@"; 3990 } or error "$pkg unloaded, but with errors: $@";
3639 } 3991 }
3640 3992
3641 warn "... clearing $pkg"; 3993 trace "... clearing $pkg";
3642 clear_package $pkg; 3994 clear_package $pkg;
3643 } 3995 }
3644 3996
3645 warn "unloading all perl modules loaded from $LIBDIR"; 3997 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3646 while (my ($k, $v) = each %INC) { 3998 while (my ($k, $v) = each %INC) {
3647 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3999 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3648 4000
3649 warn "... unloading $k"; 4001 trace "... unloading $k";
3650 delete $INC{$k}; 4002 delete $INC{$k};
3651 4003
3652 $k =~ s/\.pm$//; 4004 $k =~ s/\.pm$//;
3653 $k =~ s/\//::/g; 4005 $k =~ s/\//::/g;
3654 4006
3657 } 4009 }
3658 4010
3659 clear_package $k; 4011 clear_package $k;
3660 } 4012 }
3661 4013
3662 warn "getting rid of safe::, as good as possible"; 4014 trace "perl_reload: getting rid of safe::, as good as possible";
3663 clear_package "safe::$_" 4015 clear_package "safe::$_"
3664 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4016 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3665 4017
3666 warn "unloading cf.pm \"a bit\""; 4018 trace "perl_reload: unloading cf.pm \"a bit\"";
3667 delete $INC{"cf.pm"}; 4019 delete $INC{"cf.pm"};
3668 delete $INC{"cf/pod.pm"}; 4020 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3669 4021
3670 # don't, removes xs symbols, too, 4022 # don't, removes xs symbols, too,
3671 # and global variables created in xs 4023 # and global variables created in xs
3672 #clear_package __PACKAGE__; 4024 #clear_package __PACKAGE__;
3673 4025
3674 warn "unload completed, starting to reload now"; 4026 info "perl_reload: unload completed, starting to reload now";
3675 4027
3676 warn "reloading cf.pm"; 4028 trace "perl_reload: reloading cf.pm";
3677 require cf; 4029 require cf;
3678 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4030 cf::_connect_to_perl_1;
3679 4031
3680 warn "loading config and database again"; 4032 trace "perl_reload: loading config and database again";
3681 cf::reload_config; 4033 cf::reload_config;
3682 4034
3683 warn "loading extensions"; 4035 trace "perl_reload: loading extensions";
3684 cf::load_extensions; 4036 cf::load_extensions;
3685 4037
4038 if ($REATTACH_ON_RELOAD) {
3686 warn "reattaching attachments to objects/players"; 4039 trace "perl_reload: reattaching attachments to objects/players";
3687 _global_reattach; # objects, sockets 4040 _global_reattach; # objects, sockets
3688 warn "reattaching attachments to maps"; 4041 trace "perl_reload: reattaching attachments to maps";
3689 reattach $_ for values %MAP; 4042 reattach $_ for values %MAP;
3690 warn "reattaching attachments to players"; 4043 trace "perl_reload: reattaching attachments to players";
3691 reattach $_ for values %PLAYER; 4044 reattach $_ for values %PLAYER;
4045 }
3692 4046
3693 warn "leaving sync_job"; 4047 cf::_post_init 1;
4048
4049 trace "perl_reload: leaving sync_job";
3694 4050
3695 1 4051 1
3696 } or do { 4052 } or do {
3697 warn $@; 4053 error $@;
3698 cf::cleanup "error while reloading, exiting."; 4054 cf::cleanup "perl_reload: error, exiting.";
3699 }; 4055 };
3700 4056
3701 warn "reloaded";
3702 --$RELOAD; 4057 --$RELOAD;
3703 } 4058 }
4059
4060 $t1 = AE::time - $t1;
4061 info "perl_reload: completed in ${t1}s\n";
3704}; 4062};
3705 4063
3706our $RELOAD_WATCHER; # used only during reload 4064our $RELOAD_WATCHER; # used only during reload
3707 4065
3708sub reload_perl() { 4066sub reload_perl() {
3709 # doing reload synchronously and two reloads happen back-to-back, 4067 # doing reload synchronously and two reloads happen back-to-back,
3710 # coro crashes during coro_state_free->destroy here. 4068 # coro crashes during coro_state_free->destroy here.
3711 4069
4070 $RELOAD_WATCHER ||= cf::async {
4071 Coro::AIO::aio_wait cache_extensions;
4072
3712 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4073 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3713 do_reload_perl; 4074 do_reload_perl;
3714 undef $RELOAD_WATCHER; 4075 undef $RELOAD_WATCHER;
4076 };
3715 }; 4077 };
3716} 4078}
3717 4079
3718register_command "reload" => sub { 4080register_command "reload" => sub {
3719 my ($who, $arg) = @_; 4081 my ($who, $arg) = @_;
3725 reload_perl; 4087 reload_perl;
3726 }; 4088 };
3727 } 4089 }
3728}; 4090};
3729 4091
3730unshift @INC, $LIBDIR; 4092#############################################################################
3731 4093
3732my $bug_warning = 0; 4094my $bug_warning = 0;
3733 4095
3734our @WAIT_FOR_TICK; 4096our @WAIT_FOR_TICK;
3735our @WAIT_FOR_TICK_BEGIN; 4097our @WAIT_FOR_TICK_BEGIN;
3736 4098
3737sub wait_for_tick { 4099sub wait_for_tick() {
3738 return if tick_inhibit || $Coro::current == $Coro::main; 4100 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3739 4101
3740 my $signal = new Coro::Signal; 4102 my $signal = new Coro::Signal;
3741 push @WAIT_FOR_TICK, $signal; 4103 push @WAIT_FOR_TICK, $signal;
3742 $signal->wait; 4104 $signal->wait;
3743} 4105}
3744 4106
3745sub wait_for_tick_begin { 4107sub wait_for_tick_begin() {
3746 return if tick_inhibit || $Coro::current == $Coro::main; 4108 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3747 4109
3748 my $signal = new Coro::Signal; 4110 my $signal = new Coro::Signal;
3749 push @WAIT_FOR_TICK_BEGIN, $signal; 4111 push @WAIT_FOR_TICK_BEGIN, $signal;
3750 $signal->wait; 4112 $signal->wait;
3751} 4113}
3757 return; 4119 return;
3758 } 4120 }
3759 4121
3760 cf::server_tick; # one server iteration 4122 cf::server_tick; # one server iteration
3761 4123
4124 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4125
3762 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4126 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3763 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4127 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3764 Coro::async_pool { 4128 Coro::async_pool {
3765 $Coro::current->{desc} = "runtime saver"; 4129 $Coro::current->{desc} = "runtime saver";
3766 write_runtime_sync 4130 write_runtime_sync
3767 or warn "ERROR: unable to write runtime file: $!"; 4131 or error "ERROR: unable to write runtime file: $!";
3768 }; 4132 };
3769 } 4133 }
3770 4134
3771 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4135 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3772 $sig->send; 4136 $sig->send;
3780 4144
3781 if (0) { 4145 if (0) {
3782 if ($NEXT_TICK) { 4146 if ($NEXT_TICK) {
3783 my $jitter = $TICK_START - $NEXT_TICK; 4147 my $jitter = $TICK_START - $NEXT_TICK;
3784 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4148 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3785 warn "jitter $JITTER\n";#d# 4149 debug "jitter $JITTER\n";#d#
3786 } 4150 }
3787 } 4151 }
3788} 4152}
3789 4153
3790{ 4154{
3791 # configure BDB 4155 # configure BDB
3792 4156
3793 BDB::min_parallel 8; 4157 BDB::min_parallel 16;
3794 BDB::max_poll_reqs $TICK * 0.1; 4158 BDB::max_poll_reqs $TICK * 0.1;
3795 $AnyEvent::BDB::WATCHER->priority (1); 4159 $AnyEvent::BDB::WATCHER->priority (1);
3796 4160
3797 unless ($DB_ENV) { 4161 unless ($DB_ENV) {
3798 $DB_ENV = BDB::db_env_create; 4162 $DB_ENV = BDB::db_env_create;
3835 IO::AIO::min_parallel 8; 4199 IO::AIO::min_parallel 8;
3836 IO::AIO::max_poll_time $TICK * 0.1; 4200 IO::AIO::max_poll_time $TICK * 0.1;
3837 undef $AnyEvent::AIO::WATCHER; 4201 undef $AnyEvent::AIO::WATCHER;
3838} 4202}
3839 4203
3840my $_log_backtrace; 4204our $_log_backtrace;
4205our $_log_backtrace_last;
3841 4206
3842sub _log_backtrace { 4207sub _log_backtrace {
3843 my ($msg, @addr) = @_; 4208 my ($msg, @addr) = @_;
3844 4209
3845 $msg =~ s/\n//; 4210 $msg =~ s/\n$//;
3846 4211
4212 if ($_log_backtrace_last eq $msg) {
4213 LOG llevInfo, "[ABT] $msg\n";
4214 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3847 # limit the # of concurrent backtraces 4215 # limit the # of concurrent backtraces
3848 if ($_log_backtrace < 2) { 4216 } elsif ($_log_backtrace < 2) {
4217 $_log_backtrace_last = $msg;
3849 ++$_log_backtrace; 4218 ++$_log_backtrace;
3850 my $perl_bt = Carp::longmess $msg; 4219 my $perl_bt = Carp::longmess $msg;
3851 async { 4220 async {
3852 $Coro::current->{desc} = "abt $msg"; 4221 $Coro::current->{desc} = "abt $msg";
3853 4222
3873 LOG llevInfo, "[ABT] $_\n" for @bt; 4242 LOG llevInfo, "[ABT] $_\n" for @bt;
3874 --$_log_backtrace; 4243 --$_log_backtrace;
3875 }; 4244 };
3876 } else { 4245 } else {
3877 LOG llevInfo, "[ABT] $msg\n"; 4246 LOG llevInfo, "[ABT] $msg\n";
3878 LOG llevInfo, "[ABT] [suppressed]\n"; 4247 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3879 } 4248 }
3880} 4249}
3881 4250
3882# load additional modules 4251# load additional modules
3883use cf::pod; 4252require "cf/$_.pm" for @EXTRA_MODULES;
4253cf::_connect_to_perl_2;
3884 4254
3885END { cf::emergency_save } 4255END { cf::emergency_save }
3886 4256
38871 42571
3888 4258

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines