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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines