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.436 by root, Sun Jun 15 20:32:51 2008 UTC vs.
Revision 1.559 by root, Sat Feb 26 12:50:27 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 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 utf8; 25use common::sense;
25use strict;
26 26
27use Symbol; 27use Symbol;
28use List::Util; 28use List::Util;
29use Socket; 29use Socket;
30use EV; 30use EV;
31use Opcode; 31use Opcode;
32use Safe; 32use Safe;
33use Safe::Hole; 33use Safe::Hole;
34use Storable (); 34use Storable ();
35use Carp ();
35 36
37use Guard ();
36use Coro (); 38use Coro ();
37use Coro::State; 39use Coro::State;
38use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
39use Coro::AnyEvent; 42use Coro::AnyEvent;
40use Coro::Timer; 43use Coro::Timer;
41use Coro::Signal; 44use Coro::Signal;
42use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
43use Coro::AnyEvent; 47use Coro::AnyEvent;
44use Coro::AIO; 48use Coro::AIO;
45use Coro::BDB; 49use Coro::BDB 1.6;
46use Coro::Storable; 50use Coro::Storable;
47use Coro::Util (); 51use Coro::Util ();
48 52
49use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
50use BDB (); 54use BDB ();
51use Data::Dumper; 55use Data::Dumper;
52use Digest::MD5;
53use Fcntl; 56use Fcntl;
54use YAML (); 57use YAML::XS ();
55use IO::AIO (); 58use IO::AIO ();
56use Time::HiRes; 59use Time::HiRes;
57use Compress::LZF; 60use Compress::LZF;
58use Digest::MD5 (); 61use Digest::MD5 ();
59 62
61 64
62# configure various modules to our taste 65# configure various modules to our taste
63# 66#
64$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
65Coro::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";
66Compress::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
67 75
68$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" };
69 78
70sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
71 82
72our %COMMAND = (); 83our %COMMAND = ();
73our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
74 85
75our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
76our %EXTCMD = (); 87our %EXTCMD = ();
77our %EXTICMD = (); 88our %EXTICMD = ();
78our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
79our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
80 91
81our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
82our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
83 96
84our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
85our $DATADIR = datadir; 99our $DATADIR = datadir;
86our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
87our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
88our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
89our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
90our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
91our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
92our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
93our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
94our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime";
112
95our %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;
96 120
97our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
99our $NEXT_TICK; 123our $NEXT_TICK;
100our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
101 125
102our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
103our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
104our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
105our $DB_ENV; 129our $DB_ENV;
106 130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
107our %CFG; 133our %CFG;
108 134
109our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
110our $RUNTIME; 136our $RUNTIME;
111our $NOW; 137our $NOW;
120our $LOAD; # a number between 0 (idle) and 1 (too many objects) 146our $LOAD; # a number between 0 (idle) and 1 (too many objects)
121our $LOADAVG; # same thing, but with alpha-smoothing 147our $LOADAVG; # same thing, but with alpha-smoothing
122our $JITTER; # average jitter 148our $JITTER; # average jitter
123our $TICK_START; # for load detecting purposes 149our $TICK_START; # for load detecting purposes
124 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 :)
155
125binmode STDOUT; 156binmode STDOUT;
126binmode STDERR; 157binmode STDERR;
127 158
128# read virtual server time, if available 159# read virtual server time, if available
129unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 160unless ($RUNTIME || !-e $RUNTIMEFILE) {
130 open my $fh, "<", "$LOCALDIR/runtime" 161 open my $fh, "<", $RUNTIMEFILE
131 or die "unable to read runtime file: $!"; 162 or die "unable to read $RUNTIMEFILE file: $!";
132 $RUNTIME = <$fh> + 0.; 163 $RUNTIME = <$fh> + 0.;
133} 164}
165
166eval "sub TICK() { $TICK } 1" or die;
134 167
135mkdir $_ 168mkdir $_
136 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 169 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
137 170
138our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
139 172
140sub 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::"} };
141 189
142############################################################################# 190#############################################################################
143 191
144=head2 GLOBAL VARIABLES 192=head2 GLOBAL VARIABLES
145 193
187from wherever your confdir points to. 235from wherever your confdir points to.
188 236
189=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
190 238
191These 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
192returns 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
193per 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.
194 242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
247
195=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
196 249
197This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
198C<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
199that call. 252that call.
200 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
201=back 260=back
202 261
203=cut 262=cut
204 263
205BEGIN { 264sub error(@) { LOG llevError, join "", @_ }
206 *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 {
207 my $msg = join "", @_; 271 my $msg = join "", @_;
208 272
209 $msg .= "\n" 273 $msg .= "\n"
210 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
211 275
212 $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;
213 277
214 LOG llevError, $msg; 278 LOG llevWarn, $msg;
215 }; 279};
216}
217 280
218$Coro::State::DIEHOOK = sub { 281$Coro::State::DIEHOOK = sub {
219 return unless $^S eq 0; # "eq", not "==" 282 return unless $^S eq 0; # "eq", not "=="
220 283
221 if ($Coro::current == $Coro::main) {#d# 284 error Carp::longmess $_[0];
285
286 if (in_main) {#d#
222 warn "DIEHOOK called in main context, Coro bug?\n";#d# 287 error "DIEHOOK called in main context, Coro bug?\n";#d#
223 return;#d# 288 return;#d#
224 }#d# 289 }#d#
225 290
226 # kill coroutine otherwise 291 # kill coroutine otherwise
227 warn Carp::longmess $_[0];
228 Coro::terminate 292 Coro::terminate
229}; 293};
230
231$SIG{__DIE__} = sub { }; #d#?
232 294
233@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 295@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
234@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 296@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
235@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 297@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
236@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 298@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
243for my $pkg (qw( 305for my $pkg (qw(
244 cf::global cf::attachable 306 cf::global cf::attachable
245 cf::object cf::object::player 307 cf::object cf::object::player
246 cf::client cf::player 308 cf::client cf::player
247 cf::arch cf::living 309 cf::arch cf::living
310 cf::map cf::mapspace
248 cf::map cf::party cf::region 311 cf::party cf::region
249)) { 312)) {
250 no strict 'refs';
251 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
252} 314}
253 315
254$EV::DIED = sub { 316$EV::DIED = sub {
255 warn "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
256}; 318};
257 319
258############################################################################# 320#############################################################################
259 321
260=head2 UTILITY FUNCTIONS 322=head2 UTILITY FUNCTIONS
297our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 359our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
298 360
299sub encode_json($) { $json_coder->encode ($_[0]) } 361sub encode_json($) { $json_coder->encode ($_[0]) }
300sub decode_json($) { $json_coder->decode ($_[0]) } 362sub decode_json($) { $json_coder->decode ($_[0]) }
301 363
364=item $ref = cf::yaml_load $scalar
365
366Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
367
368=cut
369
370sub fork_call(&@);
371
372sub yaml_load($) {
373 fork_call { YAML::XS::Load $_[0] } @_
374}
375
376=item cf::post_init { BLOCK }
377
378Execute the given codeblock, I<after> all extensions have been (re-)loaded,
379but I<before> the server starts ticking again.
380
381The codeblock will have a single boolean argument to indicate whether this
382is a reload or not.
383
384=cut
385
386sub post_init(&) {
387 push @POST_INIT, shift;
388}
389
390sub _post_init {
391 trace "running post_init jobs";
392
393 # run them in parallel...
394
395 my @join;
396
397 while () {
398 push @join, map &Coro::async ($_, 0), @POST_INIT;
399 @POST_INIT = ();
400
401 @join or last;
402
403 (pop @join)->join;
404 }
405}
406
302=item cf::lock_wait $string 407=item cf::lock_wait $string
303 408
304Wait until the given lock is available. See cf::lock_acquire. 409Wait until the given lock is available. See cf::lock_acquire.
305 410
306=item my $lock = cf::lock_acquire $string 411=item my $lock = cf::lock_acquire $string
307 412
308Wait until the given lock is available and then acquires it and returns 413Wait until the given lock is available and then acquires it and returns
309a Coro::guard object. If the guard object gets destroyed (goes out of scope, 414a L<Guard> object. If the guard object gets destroyed (goes out of scope,
310for example when the coroutine gets canceled), the lock is automatically 415for example when the coroutine gets canceled), the lock is automatically
311returned. 416returned.
312 417
313Locks are *not* recursive, locking from the same coro twice results in a 418Locks are *not* recursive, locking from the same coro twice results in a
314deadlocked coro. 419deadlocked coro.
320 425
321Return true if the lock is currently active, i.e. somebody has locked it. 426Return true if the lock is currently active, i.e. somebody has locked it.
322 427
323=cut 428=cut
324 429
325our %LOCK; 430our $LOCKS = new Coro::SemaphoreSet;
326our %LOCKER;#d#
327 431
328sub lock_wait($) { 432sub lock_wait($) {
329 my ($key) = @_; 433 $LOCKS->wait ($_[0]);
330
331 if ($LOCKER{$key} == $Coro::current) {#d#
332 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
333 return;#d#
334 }#d#
335
336 # wait for lock, if any
337 while ($LOCK{$key}) {
338 push @{ $LOCK{$key} }, $Coro::current;
339 Coro::schedule;
340 }
341} 434}
342 435
343sub lock_acquire($) { 436sub lock_acquire($) {
344 my ($key) = @_; 437 $LOCKS->guard ($_[0])
345
346 # wait, to be sure we are not locked
347 lock_wait $key;
348
349 $LOCK{$key} = [];
350 $LOCKER{$key} = $Coro::current;#d#
351
352 Coro::guard {
353 delete $LOCKER{$key};#d#
354 # wake up all waiters, to be on the safe side
355 $_->ready for @{ delete $LOCK{$key} };
356 }
357} 438}
358 439
359sub lock_active($) { 440sub lock_active($) {
360 my ($key) = @_; 441 $LOCKS->count ($_[0]) < 1
361
362 ! ! $LOCK{$key}
363} 442}
364 443
365sub freeze_mainloop { 444sub freeze_mainloop {
366 tick_inhibit_inc; 445 tick_inhibit_inc;
367 446
368 Coro::guard \&tick_inhibit_dec; 447 &Guard::guard (\&tick_inhibit_dec);
369} 448}
370 449
371=item cf::periodic $interval, $cb 450=item cf::periodic $interval, $cb
372 451
373Like EV::periodic, but randomly selects a starting point so that the actions 452Like EV::periodic, but randomly selects a starting point so that the actions
374get spread over timer. 453get spread over time.
375 454
376=cut 455=cut
377 456
378sub periodic($$) { 457sub periodic($$) {
379 my ($interval, $cb) = @_; 458 my ($interval, $cb) = @_;
396 475
397=cut 476=cut
398 477
399our @SLOT_QUEUE; 478our @SLOT_QUEUE;
400our $SLOT_QUEUE; 479our $SLOT_QUEUE;
480our $SLOT_DECAY = 0.9;
401 481
402$SLOT_QUEUE->cancel if $SLOT_QUEUE; 482$SLOT_QUEUE->cancel if $SLOT_QUEUE;
403$SLOT_QUEUE = Coro::async { 483$SLOT_QUEUE = Coro::async {
404 $Coro::current->desc ("timeslot manager"); 484 $Coro::current->desc ("timeslot manager");
405 485
406 my $signal = new Coro::Signal; 486 my $signal = new Coro::Signal;
487 my $busy;
407 488
408 while () { 489 while () {
409 next_job: 490 next_job:
491
410 my $avail = cf::till_tick; 492 my $avail = cf::till_tick;
411 if ($avail > 0.01) { 493
412 for (0 .. $#SLOT_QUEUE) { 494 for (0 .. $#SLOT_QUEUE) {
413 if ($SLOT_QUEUE[$_][0] < $avail) { 495 if ($SLOT_QUEUE[$_][0] <= $avail) {
496 $busy = 0;
414 my $job = splice @SLOT_QUEUE, $_, 1, (); 497 my $job = splice @SLOT_QUEUE, $_, 1, ();
415 $job->[2]->send; 498 $job->[2]->send;
416 Coro::cede; 499 Coro::cede;
417 goto next_job; 500 goto next_job;
418 } 501 } else {
502 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
419 } 503 }
420 } 504 }
421 505
422 if (@SLOT_QUEUE) { 506 if (@SLOT_QUEUE) {
423 # we do not use wait_for_tick() as it returns immediately when tick is inactive 507 # we do not use wait_for_tick() as it returns immediately when tick is inactive
424 push @cf::WAIT_FOR_TICK, $signal; 508 push @cf::WAIT_FOR_TICK, $signal;
425 $signal->wait; 509 $signal->wait;
426 } else { 510 } else {
511 $busy = 0;
427 Coro::schedule; 512 Coro::schedule;
428 } 513 }
429 } 514 }
430}; 515};
431 516
432sub get_slot($;$$) { 517sub get_slot($;$$) {
433 return if tick_inhibit || $Coro::current == $Coro::main; 518 return if tick_inhibit || $Coro::current == $Coro::main;
434 519
435 my ($time, $pri, $name) = @_; 520 my ($time, $pri, $name) = @_;
436 521
437 $time = $TICK * .6 if $time > $TICK * .6; 522 $time = clamp $time, 0.01, $TICK * .6;
523
438 my $sig = new Coro::Signal; 524 my $sig = new Coro::Signal;
439 525
440 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 526 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
441 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 527 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
442 $SLOT_QUEUE->ready; 528 $SLOT_QUEUE->ready;
468=cut 554=cut
469 555
470sub sync_job(&) { 556sub sync_job(&) {
471 my ($job) = @_; 557 my ($job) = @_;
472 558
473 if ($Coro::current == $Coro::main) { 559 if (in_main) {
474 my $time = EV::time; 560 my $time = AE::time;
475 561
476 # this is the main coro, too bad, we have to block 562 # this is the main coro, too bad, we have to block
477 # till the operation succeeds, freezing the server :/ 563 # till the operation succeeds, freezing the server :/
478 564
479 LOG llevError, Carp::longmess "sync job";#d# 565 #LOG llevError, Carp::longmess "sync job";#d#
480 566
481 my $freeze_guard = freeze_mainloop; 567 my $freeze_guard = freeze_mainloop;
482 568
483 my $busy = 1; 569 my $busy = 1;
484 my @res; 570 my @res;
485 571
486 (async { 572 (async {
487 $Coro::current->desc ("sync job coro"); 573 $Coro::current->desc ("sync job coro");
488 @res = eval { $job->() }; 574 @res = eval { $job->() };
489 warn $@ if $@; 575 error $@ if $@;
490 undef $busy; 576 undef $busy;
491 })->prio (Coro::PRIO_MAX); 577 })->prio (Coro::PRIO_MAX);
492 578
493 while ($busy) { 579 while ($busy) {
494 if (Coro::nready) { 580 if (Coro::nready) {
496 } else { 582 } else {
497 EV::loop EV::LOOP_ONESHOT; 583 EV::loop EV::LOOP_ONESHOT;
498 } 584 }
499 } 585 }
500 586
501 my $time = EV::time - $time; 587 my $time = AE::time - $time;
502 588
503 $TICK_START += $time; # do not account sync jobs to server load 589 $TICK_START += $time; # do not account sync jobs to server load
504 590
505 wantarray ? @res : $res[0] 591 wantarray ? @res : $res[0]
506 } else { 592 } else {
528 $EXT_CORO{$coro+0} = $coro; 614 $EXT_CORO{$coro+0} = $coro;
529 615
530 $coro 616 $coro
531} 617}
532 618
533=item fork_call { }, $args 619=item fork_call { }, @args
534 620
535Executes the given code block with the given arguments in a seperate 621Executes the given code block with the given arguments in a seperate
536process, returning the results. Everything must be serialisable with 622process, returning the results. Everything must be serialisable with
537Coro::Storable. May, of course, block. Note that the executed sub may 623Coro::Storable. May, of course, block. Note that the executed sub may
538never block itself or use any form of event handling. 624never block itself or use any form of event handling.
539 625
540=cut 626=cut
541 627
628sub post_fork {
629 reset_signals;
630}
631
542sub fork_call(&@) { 632sub fork_call(&@) {
543 my ($cb, @args) = @_; 633 my ($cb, @args) = @_;
544 634
545 # we seemingly have to make a local copy of the whole thing, 635 # we seemingly have to make a local copy of the whole thing,
546 # otherwise perl prematurely frees the stuff :/ 636 # otherwise perl prematurely frees the stuff :/
547 # TODO: investigate and fix (likely this will be rather laborious) 637 # TODO: investigate and fix (likely this will be rather laborious)
548 638
549 my @res = Coro::Util::fork_eval { 639 my @res = Coro::Util::fork_eval {
550 reset_signals; 640 cf::post_fork;
551 &$cb 641 &$cb
552 }, @args; 642 } @args;
553 643
554 wantarray ? @res : $res[-1] 644 wantarray ? @res : $res[-1]
645}
646
647sub objinfo {
648 (
649 "counter value" => cf::object::object_count,
650 "objects created" => cf::object::create_count,
651 "objects destroyed" => cf::object::destroy_count,
652 "freelist size" => cf::object::free_count,
653 "allocated objects" => cf::object::objects_size,
654 "active objects" => cf::object::actives_size,
655 )
555} 656}
556 657
557=item $coin = coin_from_name $name 658=item $coin = coin_from_name $name
558 659
559=cut 660=cut
596within each server. 697within each server.
597 698
598=cut 699=cut
599 700
600sub db_table($) { 701sub db_table($) {
702 cf::error "db_get called from main context"
703 if $Coro::current == $Coro::main;
704
601 my ($name) = @_; 705 my ($name) = @_;
602 my $db = BDB::db_create $DB_ENV; 706 my $db = BDB::db_create $DB_ENV;
603 707
604 eval { 708 eval {
605 $db->set_flags (BDB::CHKSUM); 709 $db->set_flags (BDB::CHKSUM);
615} 719}
616 720
617our $DB; 721our $DB;
618 722
619sub db_init { 723sub db_init {
620 cf::sync_job {
621 $DB ||= db_table "db"; 724 $DB ||= db_table "db";
622 };
623} 725}
624 726
625sub db_get($$) { 727sub db_get($$) {
626 my $key = "$_[0]/$_[1]"; 728 my $key = "$_[0]/$_[1]";
627 729
628 cf::sync_job { 730 cf::error "db_get called from main context"
731 if $Coro::current == $Coro::main;
732
629 BDB::db_get $DB, undef, $key, my $data; 733 BDB::db_get $DB, undef, $key, my $data;
630 734
631 $! ? () 735 $! ? ()
632 : $data 736 : $data
633 }
634} 737}
635 738
636sub db_put($$$) { 739sub db_put($$$) {
637 BDB::dbreq_pri 4; 740 BDB::dbreq_pri 4;
638 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 741 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
694 797
695 my $t1 = Time::HiRes::time; 798 my $t1 = Time::HiRes::time;
696 my $data = $process->(\@data); 799 my $data = $process->(\@data);
697 my $t2 = Time::HiRes::time; 800 my $t2 = Time::HiRes::time;
698 801
699 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 802 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
700 803
701 db_put cache => "$id/data", $data; 804 db_put cache => "$id/data", $data;
702 db_put cache => "$id/md5" , $md5; 805 db_put cache => "$id/md5" , $md5;
703 db_put cache => "$id/meta", $meta; 806 db_put cache => "$id/meta", $meta;
704 807
714 817
715=cut 818=cut
716 819
717sub datalog($@) { 820sub datalog($@) {
718 my ($type, %kv) = @_; 821 my ($type, %kv) = @_;
719 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 822 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
720} 823}
721 824
722=back 825=back
723 826
724=cut 827=cut
725 828
726############################################################################# 829#############################################################################
727 830
728=head2 ATTACHABLE OBJECTS 831=head2 ATTACHABLE OBJECTS
729 832
730Many objects in crossfire are so-called attachable objects. That means you can 833Many objects in deliantra are so-called attachable objects. That means you can
731attach callbacks/event handlers (a collection of which is called an "attachment") 834attach callbacks/event handlers (a collection of which is called an "attachment")
732to it. All such attachable objects support the following methods. 835to it. All such attachable objects support the following methods.
733 836
734In the following description, CLASS can be any of C<global>, C<object> 837In the following description, CLASS can be any of C<global>, C<object>
735C<player>, C<client> or C<map> (i.e. the attachable objects in 838C<player>, C<client> or C<map> (i.e. the attachable objects in
785=item cf::CLASS::attachment $name, ... 888=item cf::CLASS::attachment $name, ...
786 889
787Register an attachment by C<$name> through which attachable objects of the 890Register an attachment by C<$name> through which attachable objects of the
788given CLASS can refer to this attachment. 891given CLASS can refer to this attachment.
789 892
790Some classes such as crossfire maps and objects can specify attachments 893Some classes such as deliantra maps and objects can specify attachments
791that are attached at load/instantiate time, thus the need for a name. 894that are attached at load/instantiate time, thus the need for a name.
792 895
793These calls expect any number of the following handler/hook descriptions: 896These calls expect any number of the following handler/hook descriptions:
794 897
795=over 4 898=over 4
919 1022
920 } elsif (exists $cb_id{$type}) { 1023 } elsif (exists $cb_id{$type}) {
921 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1024 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
922 1025
923 } elsif (ref $type) { 1026 } elsif (ref $type) {
924 warn "attaching objects not supported, ignoring.\n"; 1027 error "attaching objects not supported, ignoring.\n";
925 1028
926 } else { 1029 } else {
927 shift @arg; 1030 shift @arg;
928 warn "attach argument '$type' not supported, ignoring.\n"; 1031 error "attach argument '$type' not supported, ignoring.\n";
929 } 1032 }
930 } 1033 }
931} 1034}
932 1035
933sub _object_attach { 1036sub _object_attach {
943 _attach $registry, $klass, @attach; 1046 _attach $registry, $klass, @attach;
944 } 1047 }
945 1048
946 $obj->{$name} = \%arg; 1049 $obj->{$name} = \%arg;
947 } else { 1050 } else {
948 warn "object uses attachment '$name' which is not available, postponing.\n"; 1051 info "object uses attachment '$name' which is not available, postponing.\n";
949 } 1052 }
950 1053
951 $obj->{_attachment}{$name} = undef; 1054 $obj->{_attachment}{$name} = undef;
952} 1055}
953 1056
1012 1115
1013 for (@$callbacks) { 1116 for (@$callbacks) {
1014 eval { &{$_->[1]} }; 1117 eval { &{$_->[1]} };
1015 1118
1016 if ($@) { 1119 if ($@) {
1017 warn "$@";
1018 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1120 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1019 override; 1121 override;
1020 } 1122 }
1021 1123
1022 return 1 if $override; 1124 return 1 if $override;
1023 } 1125 }
1086 1188
1087sub reattach { 1189sub reattach {
1088 # basically do the same as instantiate, without calling instantiate 1190 # basically do the same as instantiate, without calling instantiate
1089 my ($obj) = @_; 1191 my ($obj) = @_;
1090 1192
1193 # no longer needed after getting rid of delete_package?
1091 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1194 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1092 1195
1093 my $registry = $obj->registry; 1196 my $registry = $obj->registry;
1094 1197
1095 @$registry = (); 1198 @$registry = ();
1096 1199
1101 for (@$attach) { 1204 for (@$attach) {
1102 my ($klass, @attach) = @$_; 1205 my ($klass, @attach) = @$_;
1103 _attach $registry, $klass, @attach; 1206 _attach $registry, $klass, @attach;
1104 } 1207 }
1105 } else { 1208 } else {
1106 warn "object uses attachment '$name' that is not available, postponing.\n"; 1209 info "object uses attachment '$name' that is not available, postponing.\n";
1107 } 1210 }
1108 } 1211 }
1109} 1212}
1110 1213
1111cf::attachable->attach ( 1214cf::attachable->attach (
1138 my ($filename, $rdata, $objs) = @_; 1241 my ($filename, $rdata, $objs) = @_;
1139 1242
1140 sync_job { 1243 sync_job {
1141 if (length $$rdata) { 1244 if (length $$rdata) {
1142 utf8::decode (my $decname = $filename); 1245 utf8::decode (my $decname = $filename);
1143 warn sprintf "saving %s (%d,%d)\n", 1246 trace sprintf "saving %s (%d,%d)\n",
1144 $decname, length $$rdata, scalar @$objs; 1247 $decname, length $$rdata, scalar @$objs
1248 if $VERBOSE_IO;
1145 1249
1146 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1250 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1147 aio_chmod $fh, SAVE_MODE; 1251 aio_chmod $fh, SAVE_MODE;
1148 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1252 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1149 aio_fsync $fh if $cf::USE_FSYNC; 1253 if ($cf::USE_FSYNC) {
1254 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;
1255 aio_fsync $fh;
1256 }
1150 aio_close $fh; 1257 aio_close $fh;
1151 1258
1152 if (@$objs) { 1259 if (@$objs) {
1153 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1260 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1154 aio_chmod $fh, SAVE_MODE; 1261 aio_chmod $fh, SAVE_MODE;
1155 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1262 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1156 aio_write $fh, 0, (length $data), $data, 0; 1263 aio_write $fh, 0, (length $data), $data, 0;
1157 aio_fsync $fh if $cf::USE_FSYNC; 1264 if ($cf::USE_FSYNC) {
1265 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;
1266 aio_fsync $fh;
1267 }
1158 aio_close $fh; 1268 aio_close $fh;
1159 aio_rename "$filename.pst~", "$filename.pst"; 1269 aio_rename "$filename.pst~", "$filename.pst";
1160 } 1270 }
1161 } else { 1271 } else {
1162 aio_unlink "$filename.pst"; 1272 aio_unlink "$filename.pst";
1163 } 1273 }
1164 1274
1165 aio_rename "$filename~", $filename; 1275 aio_rename "$filename~", $filename;
1276
1277 $filename =~ s%/[^/]+$%%;
1278 aio_pathsync $filename if $cf::USE_FSYNC;
1166 } else { 1279 } else {
1167 warn "FATAL: $filename~: $!\n"; 1280 error "unable to save objects: $filename~: $!\n";
1168 } 1281 }
1169 } else { 1282 } else {
1170 aio_unlink $filename; 1283 aio_unlink $filename;
1171 aio_unlink "$filename.pst"; 1284 aio_unlink "$filename.pst";
1172 } 1285 }
1196 my $st = eval { Coro::Storable::thaw $av }; 1309 my $st = eval { Coro::Storable::thaw $av };
1197 $av = $st->{objs}; 1310 $av = $st->{objs};
1198 } 1311 }
1199 1312
1200 utf8::decode (my $decname = $filename); 1313 utf8::decode (my $decname = $filename);
1201 warn sprintf "loading %s (%d,%d)\n", 1314 trace sprintf "loading %s (%d,%d)\n",
1202 $decname, length $data, scalar @{$av || []}; 1315 $decname, length $data, scalar @{$av || []}
1316 if $VERBOSE_IO;
1203 1317
1204 ($data, $av) 1318 ($data, $av)
1205} 1319}
1206 1320
1207=head2 COMMAND CALLBACKS 1321=head2 COMMAND CALLBACKS
1263 my ($name, $cb) = @_; 1377 my ($name, $cb) = @_;
1264 1378
1265 $EXTICMD{$name} = $cb; 1379 $EXTICMD{$name} = $cb;
1266} 1380}
1267 1381
1382use File::Glob ();
1383
1268cf::player->attach ( 1384cf::player->attach (
1269 on_command => sub { 1385 on_unknown_command => sub {
1270 my ($pl, $name, $params) = @_; 1386 my ($pl, $name, $params) = @_;
1271 1387
1272 my $cb = $COMMAND{$name} 1388 my $cb = $COMMAND{$name}
1273 or return; 1389 or return;
1274 1390
1297 1413
1298 $pl->ext_reply ($reply, @reply) 1414 $pl->ext_reply ($reply, @reply)
1299 if $reply; 1415 if $reply;
1300 1416
1301 } else { 1417 } else {
1302 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1418 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1303 } 1419 }
1304 1420
1305 cf::override; 1421 cf::override;
1306 }, 1422 },
1307); 1423);
1308 1424
1425# "readahead" all extensions
1426sub cache_extensions {
1427 my $grp = IO::AIO::aio_group;
1428
1429 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1430 for (grep /\.ext$/, @{$_[0]}) {
1431 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1432 }
1433 };
1434
1435 $grp
1436}
1437
1309sub load_extensions { 1438sub load_extensions {
1439 info "loading extensions...";
1440
1310 cf::sync_job { 1441 cf::sync_job {
1311 my %todo; 1442 my %todo;
1312 1443
1313 for my $path (<$LIBDIR/*.ext>) { 1444 for my $path (<$LIBDIR/*.ext>) {
1314 next unless -r $path; 1445 next unless -r $path;
1332 1463
1333 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1464 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1334 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1465 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1335 1466
1336 $ext{source} = 1467 $ext{source} =
1337 "package $pkg; use strict; use utf8;\n" 1468 "package $pkg; use common::sense;\n"
1338 . "#line 1 \"$path\"\n{\n" 1469 . "#line 1 \"$path\"\n{\n"
1339 . $source 1470 . $source
1340 . "\n};\n1"; 1471 . "\n};\n1";
1341 1472
1342 $todo{$base} = \%ext; 1473 $todo{$base} = \%ext;
1343 } 1474 }
1344 1475
1476 my $pass = 0;
1345 my %done; 1477 my %done;
1346 while (%todo) { 1478 while (%todo) {
1347 my $progress; 1479 my $progress;
1348 1480
1481 ++$pass;
1482
1483 ext:
1349 while (my ($k, $v) = each %todo) { 1484 while (my ($k, $v) = each %todo) {
1350 for (split /,\s*/, $v->{meta}{depends}) { 1485 for (split /,\s*/, $v->{meta}{depends}) {
1351 goto skip 1486 next ext
1352 unless exists $done{$_}; 1487 unless exists $done{$_};
1353 } 1488 }
1354 1489
1355 warn "... loading '$k' into '$v->{pkg}'\n"; 1490 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1356 1491
1357 unless (eval $v->{source}) { 1492 my $active = eval $v->{source};
1493
1494 if (length $@) {
1358 my $msg = $@ ? "$v->{path}: $@\n" 1495 error "$v->{path}: $@\n";
1359 : "$v->{base}: extension inactive.\n";
1360 1496
1361 if (exists $v->{meta}{mandatory}) {
1362 warn $msg;
1363 cf::cleanup "mandatory extension failed to load, exiting."; 1497 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1364 } 1498 if exists $v->{meta}{mandatory};
1365 1499
1366 warn $msg; 1500 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1501 delete $todo{$k};
1502 } else {
1503 $done{$k} = delete $todo{$k};
1504 push @EXTS, $v->{pkg};
1505 $progress = 1;
1506
1507 info "$v->{base}: extension inactive.\n"
1508 unless $active;
1367 } 1509 }
1368
1369 $done{$k} = delete $todo{$k};
1370 push @EXTS, $v->{pkg};
1371 $progress = 1;
1372 } 1510 }
1373 1511
1374 skip: 1512 unless ($progress) {
1375 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1513 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1376 unless $progress; 1514
1515 while (my ($k, $v) = each %todo) {
1516 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1517 if exists $v->{meta}{mandatory};
1518 }
1519 }
1377 } 1520 }
1378 }; 1521 };
1379} 1522}
1380 1523
1381############################################################################# 1524#############################################################################
1382 1525
1383=back 1526=back
1384 1527
1385=head2 CORE EXTENSIONS 1528=head2 CORE EXTENSIONS
1386 1529
1387Functions and methods that extend core crossfire objects. 1530Functions and methods that extend core deliantra objects.
1388 1531
1389=cut 1532=cut
1390 1533
1391package cf::player; 1534package cf::player;
1392 1535
1435 1578
1436sub exists($) { 1579sub exists($) {
1437 my ($login) = @_; 1580 my ($login) = @_;
1438 1581
1439 $cf::PLAYER{$login} 1582 $cf::PLAYER{$login}
1440 or cf::sync_job { !aio_stat path $login } 1583 or !aio_stat path $login
1441} 1584}
1442 1585
1443sub find($) { 1586sub find($) {
1444 return $cf::PLAYER{$_[0]} || do { 1587 return $cf::PLAYER{$_[0]} || do {
1445 my $login = $_[0]; 1588 my $login = $_[0];
1465 $cf::PLAYER{$login} = $pl 1608 $cf::PLAYER{$login} = $pl
1466 } 1609 }
1467 } 1610 }
1468} 1611}
1469 1612
1613cf::player->attach (
1614 on_load => sub {
1615 my ($pl, $path) = @_;
1616
1617 # restore slots saved in save, below
1618 my $slots = delete $pl->{_slots};
1619
1620 $pl->ob->current_weapon ($slots->[0]);
1621 $pl->combat_ob ($slots->[1]);
1622 $pl->ranged_ob ($slots->[2]);
1623 },
1624);
1625
1470sub save($) { 1626sub save($) {
1471 my ($pl) = @_; 1627 my ($pl) = @_;
1472 1628
1473 return if $pl->{deny_save}; 1629 return if $pl->{deny_save};
1474 1630
1479 1635
1480 aio_mkdir playerdir $pl, 0770; 1636 aio_mkdir playerdir $pl, 0770;
1481 $pl->{last_save} = $cf::RUNTIME; 1637 $pl->{last_save} = $cf::RUNTIME;
1482 1638
1483 cf::get_slot 0.01; 1639 cf::get_slot 0.01;
1640
1641 # save slots, to be restored later
1642 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1484 1643
1485 $pl->save_pl ($path); 1644 $pl->save_pl ($path);
1486 cf::cede_to_tick; 1645 cf::cede_to_tick;
1487} 1646}
1488 1647
1520 my ($pl) = @_; 1679 my ($pl) = @_;
1521 1680
1522 my $name = $pl->ob->name; 1681 my $name = $pl->ob->name;
1523 1682
1524 $pl->{deny_save} = 1; 1683 $pl->{deny_save} = 1;
1525 $pl->password ("*"); # this should lock out the player until we nuked the dir 1684 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1526 1685
1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1686 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1528 $pl->deactivate; 1687 $pl->deactivate;
1688
1529 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1689 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1530 $pl->ob->check_score;
1531 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1690 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1691 ext::highscore::check ($pl->ob);
1692
1532 $pl->ns->destroy if $pl->ns; 1693 $pl->ns->destroy if $pl->ns;
1533 1694
1534 my $path = playerdir $pl; 1695 my $path = playerdir $pl;
1535 my $temp = "$path~$cf::RUNTIME~deleting~"; 1696 my $temp = "$path~$cf::RUNTIME~deleting~";
1536 aio_rename $path, $temp; 1697 aio_rename $path, $temp;
1590 \@logins 1751 \@logins
1591} 1752}
1592 1753
1593=item $player->maps 1754=item $player->maps
1594 1755
1756=item cf::player::maps $login
1757
1595Returns an arrayref of map paths that are private for this 1758Returns an arrayref of map paths that are private for this
1596player. May block. 1759player. May block.
1597 1760
1598=cut 1761=cut
1599 1762
1616 } 1779 }
1617 1780
1618 \@paths 1781 \@paths
1619} 1782}
1620 1783
1621=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1784=item $protocol_xml = $player->expand_cfpod ($cfpod)
1622 1785
1623Expand crossfire pod fragments into protocol xml. 1786Expand deliantra pod fragments into protocol xml.
1624
1625=cut
1626
1627use re 'eval';
1628
1629my $group;
1630my $interior; $interior = qr{
1631 # match a pod interior sequence sans C<< >>
1632 (?:
1633 \ (.*?)\ (?{ $group = $^N })
1634 | < (??{$interior}) >
1635 )
1636}x;
1637
1638sub expand_cfpod {
1639 my ($self, $pod) = @_;
1640
1641 my $xml;
1642
1643 while () {
1644 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1645 $group = $1;
1646
1647 $group =~ s/&/&amp;/g;
1648 $group =~ s/</&lt;/g;
1649
1650 $xml .= $group;
1651 } elsif ($pod =~ m%\G
1652 ([BCGHITU])
1653 <
1654 (?:
1655 ([^<>]*) (?{ $group = $^N })
1656 | < $interior >
1657 )
1658 >
1659 %gcsx
1660 ) {
1661 my ($code, $data) = ($1, $group);
1662
1663 if ($code eq "B") {
1664 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1665 } elsif ($code eq "I") {
1666 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1667 } elsif ($code eq "U") {
1668 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1669 } elsif ($code eq "C") {
1670 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1671 } elsif ($code eq "T") {
1672 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1673 } elsif ($code eq "G") {
1674 my ($male, $female) = split /\|/, $data;
1675 $data = $self->gender ? $female : $male;
1676 $xml .= expand_cfpod ($self, $data);
1677 } elsif ($code eq "H") {
1678 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1679 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1680 "")
1681 [$self->{hintmode}];
1682 } else {
1683 $xml .= "error processing '$code($data)' directive";
1684 }
1685 } else {
1686 if ($pod =~ /\G(.+)/) {
1687 warn "parse error while expanding $pod (at $1)";
1688 }
1689 last;
1690 }
1691 }
1692
1693 for ($xml) {
1694 # create single paragraphs (very hackish)
1695 s/(?<=\S)\n(?=\w)/ /g;
1696
1697 # compress some whitespace
1698 s/\s+\n/\n/g; # ws line-ends
1699 s/\n\n+/\n/g; # double lines
1700 s/^\n+//; # beginning lines
1701 s/\n+$//; # ending lines
1702 }
1703
1704 $xml
1705}
1706
1707no re 'eval';
1708
1709sub hintmode {
1710 $_[0]{hintmode} = $_[1] if @_ > 1;
1711 $_[0]{hintmode}
1712}
1713 1787
1714=item $player->ext_reply ($msgid, @msg) 1788=item $player->ext_reply ($msgid, @msg)
1715 1789
1716Sends an ext reply to the player. 1790Sends an ext reply to the player.
1717 1791
1749 1823
1750=cut 1824=cut
1751 1825
1752sub find_by_path($) { 1826sub find_by_path($) {
1753 my ($path) = @_; 1827 my ($path) = @_;
1828
1829 $path =~ s/^~[^\/]*//; # skip ~login
1754 1830
1755 my ($match, $specificity); 1831 my ($match, $specificity);
1756 1832
1757 for my $region (list) { 1833 for my $region (list) {
1758 if ($region->{match} && $path =~ $region->{match}) { 1834 if ($region->{match} && $path =~ $region->{match}) {
1787sub generate_random_map { 1863sub generate_random_map {
1788 my ($self, $rmp) = @_; 1864 my ($self, $rmp) = @_;
1789 1865
1790 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1866 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1791 1867
1792 # mit "rum" bekleckern, nicht
1793 $self->_create_random_map ( 1868 $self->_create_random_map ($rmp);
1794 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1795 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1796 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1797 $rmp->{exit_on_final_map},
1798 $rmp->{xsize}, $rmp->{ysize},
1799 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1800 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1801 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1802 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1803 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1804 (cf::region::find $rmp->{region}), $rmp->{custom}
1805 )
1806} 1869}
1807 1870
1808=item cf::map->register ($regex, $prio) 1871=item cf::map->register ($regex, $prio)
1809 1872
1810Register a handler for the map path matching the given regex at the 1873Register a handler for the map path matching the given regex at the
1815 1878
1816sub register { 1879sub register {
1817 my (undef, $regex, $prio) = @_; 1880 my (undef, $regex, $prio) = @_;
1818 my $pkg = caller; 1881 my $pkg = caller;
1819 1882
1820 no strict;
1821 push @{"$pkg\::ISA"}, __PACKAGE__; 1883 push @{"$pkg\::ISA"}, __PACKAGE__;
1822 1884
1823 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1885 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1824} 1886}
1825 1887
1826# also paths starting with '/' 1888# also paths starting with '/'
1827$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1889$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1828 1890
1829sub thawer_merge { 1891sub thawer_merge {
1830 my ($self, $merge) = @_; 1892 my ($self, $merge) = @_;
1831 1893
1832 # we have to keep some variables in memory intact 1894 # we have to keep some variables in memory intact
1837} 1899}
1838 1900
1839sub normalise { 1901sub normalise {
1840 my ($path, $base) = @_; 1902 my ($path, $base) = @_;
1841 1903
1842 $path = "$path"; # make sure its a string 1904 $path = "$path"; # make sure it's a string
1843 1905
1844 $path =~ s/\.map$//; 1906 $path =~ s/\.map$//;
1845 1907
1846 # map plan: 1908 # map plan:
1847 # 1909 #
1862 $base =~ s{[^/]+/?$}{}; 1924 $base =~ s{[^/]+/?$}{};
1863 $path = "$base/$path"; 1925 $path = "$base/$path";
1864 } 1926 }
1865 1927
1866 for ($path) { 1928 for ($path) {
1867 redo if s{//}{/};
1868 redo if s{/\.?/}{/}; 1929 redo if s{/\.?/}{/};
1869 redo if s{/[^/]+/\.\./}{/}; 1930 redo if s{/[^/]+/\.\./}{/};
1870 } 1931 }
1871 1932
1872 $path 1933 $path
1886 $self->init; # pass $1 etc. 1947 $self->init; # pass $1 etc.
1887 return $self; 1948 return $self;
1888 } 1949 }
1889 } 1950 }
1890 1951
1891 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1952 Carp::cluck "unable to resolve path '$path' (base '$base')";
1892 () 1953 ()
1893} 1954}
1894 1955
1895sub init { 1956sub init {
1896 my ($self) = @_; 1957 my ($self) = @_;
1928sub uniq_path { 1989sub uniq_path {
1929 my ($self) = @_; 1990 my ($self) = @_;
1930 1991
1931 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1992 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1932 "$UNIQUEDIR/$path" 1993 "$UNIQUEDIR/$path"
1933}
1934
1935# and all this just because we cannot iterate over
1936# all maps in C++...
1937sub change_all_map_light {
1938 my ($change) = @_;
1939
1940 $_->change_map_light ($change)
1941 for grep $_->outdoor, values %cf::MAP;
1942} 1994}
1943 1995
1944sub decay_objects { 1996sub decay_objects {
1945 my ($self) = @_; 1997 my ($self) = @_;
1946 1998
2028 2080
2029sub find; 2081sub find;
2030sub find { 2082sub find {
2031 my ($path, $origin) = @_; 2083 my ($path, $origin) = @_;
2032 2084
2085 cf::cede_to_tick;
2086
2033 $path = normalise $path, $origin && $origin->path; 2087 $path = normalise $path, $origin && $origin->path;
2034 2088
2035 cf::lock_wait "map_data:$path";#d#remove 2089 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2036 cf::lock_wait "map_find:$path"; 2090 my $guard2 = cf::lock_acquire "map_find:$path";
2037 2091
2038 $cf::MAP{$path} || do { 2092 $cf::MAP{$path} || do {
2039 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2040 my $guard2 = cf::lock_acquire "map_find:$path";
2041
2042 my $map = new_from_path cf::map $path 2093 my $map = new_from_path cf::map $path
2043 or return; 2094 or return;
2044 2095
2045 $map->{last_save} = $cf::RUNTIME; 2096 $map->{last_save} = $cf::RUNTIME;
2046 2097
2058 2109
2059 $cf::MAP{$path} = $map 2110 $cf::MAP{$path} = $map
2060 } 2111 }
2061} 2112}
2062 2113
2063sub pre_load { } 2114sub pre_load { }
2064sub post_load { } 2115#sub post_load { } # XS
2065 2116
2066sub load { 2117sub load {
2067 my ($self) = @_; 2118 my ($self) = @_;
2068 2119
2069 local $self->{deny_reset} = 1; # loading can take a long time 2120 local $self->{deny_reset} = 1; # loading can take a long time
2086 my $f = new_from_file cf::object::thawer $self->{load_path}; 2137 my $f = new_from_file cf::object::thawer $self->{load_path};
2087 $f->skip_block; 2138 $f->skip_block;
2088 $self->_load_objects ($f) 2139 $self->_load_objects ($f)
2089 or return; 2140 or return;
2090 2141
2091 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2142 $self->post_load_original
2092 if delete $self->{load_original}; 2143 if delete $self->{load_original};
2093 2144
2094 if (my $uniq = $self->uniq_path) { 2145 if (my $uniq = $self->uniq_path) {
2095 utf8::encode $uniq; 2146 utf8::encode $uniq;
2096 unless (aio_stat $uniq) { 2147 unless (aio_stat $uniq) {
2114 unless ($self->{deny_activate}) { 2165 unless ($self->{deny_activate}) {
2115 $self->decay_objects; 2166 $self->decay_objects;
2116 $self->fix_auto_apply; 2167 $self->fix_auto_apply;
2117 $self->update_buttons; 2168 $self->update_buttons;
2118 cf::cede_to_tick; 2169 cf::cede_to_tick;
2119 $self->set_darkness_map;
2120 cf::cede_to_tick;
2121 $self->activate; 2170 $self->activate;
2122 } 2171 }
2123 2172
2124 $self->{last_save} = $cf::RUNTIME; 2173 $self->{last_save} = $cf::RUNTIME;
2125 $self->last_access ($cf::RUNTIME); 2174 $self->last_access ($cf::RUNTIME);
2126 2175
2127 $self->in_memory (cf::MAP_ACTIVE); 2176 $self->in_memory (cf::MAP_ACTIVE);
2128 } 2177 }
2129 2178
2130 $self->post_load; 2179 $self->post_load;
2131}
2132 2180
2181 1
2182}
2183
2184# customize the map for a given player, i.e.
2185# return the _real_ map. used by e.g. per-player
2186# maps to change the path to ~playername/mappath
2133sub customise_for { 2187sub customise_for {
2134 my ($self, $ob) = @_; 2188 my ($self, $ob) = @_;
2135 2189
2136 return find "~" . $ob->name . "/" . $self->{path} 2190 return find "~" . $ob->name . "/" . $self->{path}
2137 if $self->per_player; 2191 if $self->per_player;
2153 or next; 2207 or next;
2154 $neigh = find $neigh, $map 2208 $neigh = find $neigh, $map
2155 or next; 2209 or next;
2156 $neigh->load; 2210 $neigh->load;
2157 2211
2212 # now find the diagonal neighbours
2158 push @neigh, 2213 push @neigh,
2159 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2214 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2160 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2215 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2161 } 2216 }
2162 2217
2169} 2224}
2170 2225
2171sub find_sync { 2226sub find_sync {
2172 my ($path, $origin) = @_; 2227 my ($path, $origin) = @_;
2173 2228
2174 cf::sync_job { find $path, $origin } 2229 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2230 if $Coro::current == $Coro::main;
2231
2232 find $path, $origin
2175} 2233}
2176 2234
2177sub do_load_sync { 2235sub do_load_sync {
2178 my ($map) = @_; 2236 my ($map) = @_;
2179 2237
2180 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2238 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2181 if $Coro::current == $Coro::main; 2239 if $Coro::current == $Coro::main;
2182 2240
2183 cf::sync_job { $map->load }; 2241 $map->load;
2184} 2242}
2185 2243
2186our %MAP_PREFETCH; 2244our %MAP_PREFETCH;
2187our $MAP_PREFETCHER = undef; 2245our $MAP_PREFETCHER = undef;
2188 2246
2214 $MAP_PREFETCHER->prio (6); 2272 $MAP_PREFETCHER->prio (6);
2215 2273
2216 () 2274 ()
2217} 2275}
2218 2276
2277# common code, used by both ->save and ->swapout
2219sub save { 2278sub _save {
2220 my ($self) = @_; 2279 my ($self) = @_;
2221
2222 my $lock = cf::lock_acquire "map_data:$self->{path}";
2223 2280
2224 $self->{last_save} = $cf::RUNTIME; 2281 $self->{last_save} = $cf::RUNTIME;
2225 2282
2226 return unless $self->dirty; 2283 return unless $self->dirty;
2227 2284
2247 } else { 2304 } else {
2248 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2305 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2249 } 2306 }
2250} 2307}
2251 2308
2309sub save {
2310 my ($self) = @_;
2311
2312 my $lock = cf::lock_acquire "map_data:$self->{path}";
2313
2314 $self->_save;
2315}
2316
2252sub swap_out { 2317sub swap_out {
2253 my ($self) = @_; 2318 my ($self) = @_;
2254 2319
2255 # save first because save cedes
2256 $self->save;
2257
2258 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2320 my $lock = cf::lock_acquire "map_data:$self->{path}";
2259 2321
2260 return if $self->players;
2261 return if $self->in_memory != cf::MAP_ACTIVE; 2322 return if $self->in_memory != cf::MAP_ACTIVE;
2262 return if $self->{deny_save}; 2323 return if $self->{deny_save};
2324 return if $self->players;
2263 2325
2326 # first deactivate the map and "unlink" it from the core
2327 $self->deactivate;
2328 $_->clear_links_to ($self) for values %cf::MAP;
2264 $self->in_memory (cf::MAP_SWAPPED); 2329 $self->in_memory (cf::MAP_SWAPPED);
2330
2331 # then atomically save
2332 $self->_save;
2333
2334 # then free the map
2335 $self->clear;
2336}
2337
2338sub reset_at {
2339 my ($self) = @_;
2340
2341 # TODO: safety, remove and allow resettable per-player maps
2342 return 1e99 if $self->{deny_reset};
2343
2344 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2345 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2346
2347 $time + $to
2348}
2349
2350sub should_reset {
2351 my ($self) = @_;
2352
2353 $self->reset_at <= $cf::RUNTIME
2354}
2355
2356sub reset {
2357 my ($self) = @_;
2358
2359 my $lock = cf::lock_acquire "map_data:$self->{path}";
2360
2361 return if $self->players;
2362
2363 cf::trace "resetting map ", $self->path, "\n";
2364
2365 $self->in_memory (cf::MAP_SWAPPED);
2366
2367 # need to save uniques path
2368 unless ($self->{deny_save}) {
2369 my $uniq = $self->uniq_path; utf8::encode $uniq;
2370
2371 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2372 if $uniq;
2373 }
2374
2375 delete $cf::MAP{$self->path};
2265 2376
2266 $self->deactivate; 2377 $self->deactivate;
2267 $_->clear_links_to ($self) for values %cf::MAP; 2378 $_->clear_links_to ($self) for values %cf::MAP;
2268 $self->clear; 2379 $self->clear;
2269}
2270
2271sub reset_at {
2272 my ($self) = @_;
2273
2274 # TODO: safety, remove and allow resettable per-player maps
2275 return 1e99 if $self->{deny_reset};
2276
2277 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2278 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2279
2280 $time + $to
2281}
2282
2283sub should_reset {
2284 my ($self) = @_;
2285
2286 $self->reset_at <= $cf::RUNTIME
2287}
2288
2289sub reset {
2290 my ($self) = @_;
2291
2292 my $lock = cf::lock_acquire "map_data:$self->{path}";
2293
2294 return if $self->players;
2295
2296 warn "resetting map ", $self->path;
2297
2298 $self->in_memory (cf::MAP_SWAPPED);
2299
2300 # need to save uniques path
2301 unless ($self->{deny_save}) {
2302 my $uniq = $self->uniq_path; utf8::encode $uniq;
2303
2304 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2305 if $uniq;
2306 }
2307
2308 delete $cf::MAP{$self->path};
2309
2310 $self->deactivate;
2311 $_->clear_links_to ($self) for values %cf::MAP;
2312 $self->clear;
2313 2380
2314 $self->unlink_save; 2381 $self->unlink_save;
2315 $self->destroy; 2382 $self->destroy;
2316} 2383}
2317 2384
2325 2392
2326 delete $cf::MAP{$self->path}; 2393 delete $cf::MAP{$self->path};
2327 2394
2328 $self->unlink_save; 2395 $self->unlink_save;
2329 2396
2330 bless $self, "cf::map"; 2397 bless $self, "cf::map::wrap";
2331 delete $self->{deny_reset}; 2398 delete $self->{deny_reset};
2332 $self->{deny_save} = 1; 2399 $self->{deny_save} = 1;
2333 $self->reset_timeout (1); 2400 $self->reset_timeout (1);
2334 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2401 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2335 2402
2392 : normalise $_ 2459 : normalise $_
2393 } @{ aio_readdir $UNIQUEDIR or [] } 2460 } @{ aio_readdir $UNIQUEDIR or [] }
2394 ] 2461 ]
2395} 2462}
2396 2463
2464=item cf::map::static_maps
2465
2466Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2467file in the shared directory excluding F</styles> and F</editor>). May
2468block.
2469
2470=cut
2471
2472sub static_maps() {
2473 my @dirs = "";
2474 my @maps;
2475
2476 while (@dirs) {
2477 my $dir = shift @dirs;
2478
2479 next if $dir eq "/styles" || $dir eq "/editor";
2480
2481 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2482 or return;
2483
2484 for (@$files) {
2485 s/\.map$// or next;
2486 utf8::decode $_;
2487 push @maps, "$dir/$_";
2488 }
2489
2490 push @dirs, map "$dir/$_", @$dirs;
2491 }
2492
2493 \@maps
2494}
2495
2397=back 2496=back
2398 2497
2399=head3 cf::object 2498=head3 cf::object
2400 2499
2401=cut 2500=cut
2466 2565
2467our $SAY_CHANNEL = { 2566our $SAY_CHANNEL = {
2468 id => "say", 2567 id => "say",
2469 title => "Map", 2568 title => "Map",
2470 reply => "say ", 2569 reply => "say ",
2471 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2570 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2472}; 2571};
2473 2572
2474our $CHAT_CHANNEL = { 2573our $CHAT_CHANNEL = {
2475 id => "chat", 2574 id => "chat",
2476 title => "Chat", 2575 title => "Chat",
2531 2630
2532=item $player_object->enter_link 2631=item $player_object->enter_link
2533 2632
2534Freezes the player and moves him/her to a special map (C<{link}>). 2633Freezes the player and moves him/her to a special map (C<{link}>).
2535 2634
2536The player should be reasonably safe there for short amounts of time. You 2635The player should be reasonably safe there for short amounts of time (e.g.
2537I<MUST> call C<leave_link> as soon as possible, though. 2636for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2637though, as the player cannot control the character while it is on the link
2638map.
2538 2639
2539Will never block. 2640Will never block.
2540 2641
2541=item $player_object->leave_link ($map, $x, $y) 2642=item $player_object->leave_link ($map, $x, $y)
2542 2643
2562sub cf::object::player::enter_link { 2663sub cf::object::player::enter_link {
2563 my ($self) = @_; 2664 my ($self) = @_;
2564 2665
2565 $self->deactivate_recursive; 2666 $self->deactivate_recursive;
2566 2667
2668 ++$self->{_link_recursion};
2669
2567 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2670 return if UNIVERSAL::isa $self->map, "ext::map_link";
2568 2671
2569 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2672 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2570 if $self->map && $self->map->{path} ne "{link}"; 2673 if $self->map && $self->map->{path} ne "{link}";
2571 2674
2572 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2675 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2573} 2676}
2574 2677
2575sub cf::object::player::leave_link { 2678sub cf::object::player::leave_link {
2576 my ($self, $map, $x, $y) = @_; 2679 my ($self, $map, $x, $y) = @_;
2577 2680
2594 ($x, $y) = (-1, -1) 2697 ($x, $y) = (-1, -1)
2595 unless (defined $x) && (defined $y); 2698 unless (defined $x) && (defined $y);
2596 2699
2597 # use -1 or undef as default coordinates, not 0, 0 2700 # use -1 or undef as default coordinates, not 0, 0
2598 ($x, $y) = ($map->enter_x, $map->enter_y) 2701 ($x, $y) = ($map->enter_x, $map->enter_y)
2599 if $x <=0 && $y <= 0; 2702 if $x <= 0 && $y <= 0;
2600 2703
2601 $map->load; 2704 $map->load;
2602 $map->load_neighbours; 2705 $map->load_neighbours;
2603 2706
2604 return unless $self->contr->active; 2707 return unless $self->contr->active;
2605 $self->activate_recursive;
2606 2708
2607 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2709 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2608 $self->enter_map ($map, $x, $y); 2710 if ($self->enter_map ($map, $x, $y)) {
2609} 2711 # entering was successful
2712 delete $self->{_link_recursion};
2713 # only activate afterwards, to support waiting in hooks
2714 $self->activate_recursive;
2715 }
2610 2716
2717}
2718
2611=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2719=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2612 2720
2613Moves the player to the given map-path and coordinates by first freezing 2721Moves the player to the given map-path and coordinates by first freezing
2614her, loading and preparing them map, calling the provided $check callback 2722her, loading and preparing them map, calling the provided $check callback
2615that has to return the map if sucecssful, and then unfreezes the player on 2723that has to return the map if sucecssful, and then unfreezes the player on
2616the new (success) or old (failed) map position. In either case, $done will 2724the new (success) or old (failed) map position. In either case, $done will
2623 2731
2624our $GOTOGEN; 2732our $GOTOGEN;
2625 2733
2626sub cf::object::player::goto { 2734sub cf::object::player::goto {
2627 my ($self, $path, $x, $y, $check, $done) = @_; 2735 my ($self, $path, $x, $y, $check, $done) = @_;
2736
2737 if ($self->{_link_recursion} >= $MAX_LINKS) {
2738 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2739 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2740 ($path, $x, $y) = @$EMERGENCY_POSITION;
2741 }
2628 2742
2629 # do generation counting so two concurrent goto's will be executed in-order 2743 # do generation counting so two concurrent goto's will be executed in-order
2630 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2744 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2631 2745
2632 $self->enter_link; 2746 $self->enter_link;
2656 my $map = eval { 2770 my $map = eval {
2657 my $map = defined $path ? cf::map::find $path : undef; 2771 my $map = defined $path ? cf::map::find $path : undef;
2658 2772
2659 if ($map) { 2773 if ($map) {
2660 $map = $map->customise_for ($self); 2774 $map = $map->customise_for ($self);
2661 $map = $check->($map) if $check && $map; 2775 $map = $check->($map, $x, $y, $self) if $check && $map;
2662 } else { 2776 } else {
2663 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2777 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2664 } 2778 }
2665 2779
2666 $map 2780 $map
2674 if ($gen == $self->{_goto_generation}) { 2788 if ($gen == $self->{_goto_generation}) {
2675 delete $self->{_goto_generation}; 2789 delete $self->{_goto_generation};
2676 $self->leave_link ($map, $x, $y); 2790 $self->leave_link ($map, $x, $y);
2677 } 2791 }
2678 2792
2679 $done->() if $done; 2793 $done->($self) if $done;
2680 })->prio (1); 2794 })->prio (1);
2681} 2795}
2682 2796
2683=item $player_object->enter_exit ($exit_object) 2797=item $player_object->enter_exit ($exit_object)
2684 2798
2772 $self->contr->savebed ($map, $x, $y) 2886 $self->contr->savebed ($map, $x, $y)
2773 if $exit->flag (cf::FLAG_DAMNED); 2887 if $exit->flag (cf::FLAG_DAMNED);
2774 2888
2775 1 2889 1
2776 }) { 2890 }) {
2777 $self->message ("Something went wrong deep within the crossfire server. " 2891 $self->message ("Something went wrong deep within the deliantra server. "
2778 . "I'll try to bring you back to the map you were before. " 2892 . "I'll try to bring you back to the map you were before. "
2779 . "Please report this to the dungeon master!", 2893 . "Please report this to the dungeon master!",
2780 cf::NDI_UNIQUE | cf::NDI_RED); 2894 cf::NDI_UNIQUE | cf::NDI_RED);
2781 2895
2782 warn "ERROR in enter_exit: $@"; 2896 error "ERROR in enter_exit: $@";
2783 $self->leave_link; 2897 $self->leave_link;
2784 } 2898 }
2785 })->prio (1); 2899 })->prio (1);
2786} 2900}
2787 2901
2799sub cf::client::send_drawinfo { 2913sub cf::client::send_drawinfo {
2800 my ($self, $text, $flags) = @_; 2914 my ($self, $text, $flags) = @_;
2801 2915
2802 utf8::encode $text; 2916 utf8::encode $text;
2803 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2917 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2918}
2919
2920=item $client->send_big_packet ($pkt)
2921
2922Like C<send_packet>, but tries to compress large packets, and fragments
2923them as required.
2924
2925=cut
2926
2927our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2928
2929sub cf::client::send_big_packet {
2930 my ($self, $pkt) = @_;
2931
2932 # try lzf for large packets
2933 $pkt = "lzf " . Compress::LZF::compress $pkt
2934 if 1024 <= length $pkt and $self->{can_lzf};
2935
2936 # split very large packets
2937 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2938 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2939 $pkt = "frag";
2940 }
2941
2942 $self->send_packet ($pkt);
2804} 2943}
2805 2944
2806=item $client->send_msg ($channel, $msg, $color, [extra...]) 2945=item $client->send_msg ($channel, $msg, $color, [extra...])
2807 2946
2808Send a drawinfo or msg packet to the client, formatting the msg for the 2947Send a drawinfo or msg packet to the client, formatting the msg for the
2812 2951
2813=cut 2952=cut
2814 2953
2815# non-persistent channels (usually the info channel) 2954# non-persistent channels (usually the info channel)
2816our %CHANNEL = ( 2955our %CHANNEL = (
2956 "c/motd" => {
2957 id => "infobox",
2958 title => "MOTD",
2959 reply => undef,
2960 tooltip => "The message of the day",
2961 },
2817 "c/identify" => { 2962 "c/identify" => {
2818 id => "infobox", 2963 id => "infobox",
2819 title => "Identify", 2964 title => "Identify",
2820 reply => undef, 2965 reply => undef,
2821 tooltip => "Items recently identified", 2966 tooltip => "Items recently identified",
2823 "c/examine" => { 2968 "c/examine" => {
2824 id => "infobox", 2969 id => "infobox",
2825 title => "Examine", 2970 title => "Examine",
2826 reply => undef, 2971 reply => undef,
2827 tooltip => "Signs and other items you examined", 2972 tooltip => "Signs and other items you examined",
2973 },
2974 "c/shopinfo" => {
2975 id => "infobox",
2976 title => "Shop Info",
2977 reply => undef,
2978 tooltip => "What your bargaining skill tells you about the shop",
2828 }, 2979 },
2829 "c/book" => { 2980 "c/book" => {
2830 id => "infobox", 2981 id => "infobox",
2831 title => "Book", 2982 title => "Book",
2832 reply => undef, 2983 reply => undef,
2848 id => "infobox", 2999 id => "infobox",
2849 title => "Body Parts", 3000 title => "Body Parts",
2850 reply => undef, 3001 reply => undef,
2851 tooltip => "Shows which body parts you posess and are available", 3002 tooltip => "Shows which body parts you posess and are available",
2852 }, 3003 },
3004 "c/statistics" => {
3005 id => "infobox",
3006 title => "Statistics",
3007 reply => undef,
3008 tooltip => "Shows your primary statistics",
3009 },
3010 "c/skills" => {
3011 id => "infobox",
3012 title => "Skills",
3013 reply => undef,
3014 tooltip => "Shows your experience per skill and item power",
3015 },
3016 "c/shopitems" => {
3017 id => "infobox",
3018 title => "Shop Items",
3019 reply => undef,
3020 tooltip => "Shows the items currently for sale in this shop",
3021 },
3022 "c/resistances" => {
3023 id => "infobox",
3024 title => "Resistances",
3025 reply => undef,
3026 tooltip => "Shows your resistances",
3027 },
3028 "c/pets" => {
3029 id => "infobox",
3030 title => "Pets",
3031 reply => undef,
3032 tooltip => "Shows information abotu your pets/a specific pet",
3033 },
3034 "c/perceiveself" => {
3035 id => "infobox",
3036 title => "Perceive Self",
3037 reply => undef,
3038 tooltip => "You gained detailed knowledge about yourself",
3039 },
2853 "c/uptime" => { 3040 "c/uptime" => {
2854 id => "infobox", 3041 id => "infobox",
2855 title => "Uptime", 3042 title => "Uptime",
2856 reply => undef, 3043 reply => undef,
2857 tooltip => "How long the server has been running since last restart", 3044 tooltip => "How long the server has been running since last restart",
2866 id => "party", 3053 id => "party",
2867 title => "Party", 3054 title => "Party",
2868 reply => "gsay ", 3055 reply => "gsay ",
2869 tooltip => "Messages and chat related to your party", 3056 tooltip => "Messages and chat related to your party",
2870 }, 3057 },
3058 "c/death" => {
3059 id => "death",
3060 title => "Death",
3061 reply => undef,
3062 tooltip => "Reason for and more info about your most recent death",
3063 },
3064 "c/say" => $SAY_CHANNEL,
3065 "c/chat" => $CHAT_CHANNEL,
2871); 3066);
2872 3067
2873sub cf::client::send_msg { 3068sub cf::client::send_msg {
2874 my ($self, $channel, $msg, $color, @extra) = @_; 3069 my ($self, $channel, $msg, $color, @extra) = @_;
2875 3070
2876 $msg = $self->pl->expand_cfpod ($msg); 3071 $msg = $self->pl->expand_cfpod ($msg)
3072 unless $color & cf::NDI_VERBATIM;
2877 3073
2878 $color &= cf::NDI_CLIENT_MASK; # just in case... 3074 $color &= cf::NDI_CLIENT_MASK; # just in case...
2879 3075
2880 # check predefined channels, for the benefit of C 3076 # check predefined channels, for the benefit of C
2881 if ($CHANNEL{$channel}) { 3077 if ($CHANNEL{$channel}) {
2882 $channel = $CHANNEL{$channel}; 3078 $channel = $CHANNEL{$channel};
2883 3079
2884 $self->ext_msg (channel_info => $channel) 3080 $self->ext_msg (channel_info => $channel);
2885 if $self->can_msg;
2886
2887 $channel = $channel->{id}; 3081 $channel = $channel->{id};
2888 3082
2889 } elsif (ref $channel) { 3083 } elsif (ref $channel) {
2890 # send meta info to client, if not yet sent 3084 # send meta info to client, if not yet sent
2891 unless (exists $self->{channel}{$channel->{id}}) { 3085 unless (exists $self->{channel}{$channel->{id}}) {
2892 $self->{channel}{$channel->{id}} = $channel; 3086 $self->{channel}{$channel->{id}} = $channel;
2893 $self->ext_msg (channel_info => $channel) 3087 $self->ext_msg (channel_info => $channel);
2894 if $self->can_msg;
2895 } 3088 }
2896 3089
2897 $channel = $channel->{id}; 3090 $channel = $channel->{id};
2898 } 3091 }
2899 3092
2900 return unless @extra || length $msg; 3093 return unless @extra || length $msg;
2901 3094
2902 if ($self->can_msg) {
2903 # default colour, mask it out 3095 # default colour, mask it out
2904 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3096 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2905 if $color & cf::NDI_DEF; 3097 if $color & cf::NDI_DEF;
2906 3098
2907 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3099 my $pkt = "msg "
3100 . $self->{json_coder}->encode (
2908 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3101 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2909 } else { 3102 );
2910 if ($color >= 0) {
2911 # replace some tags by gcfclient-compatible ones
2912 for ($msg) {
2913 1 while
2914 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2915 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2916 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2917 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2918 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2919 }
2920 3103
2921 $color &= cf::NDI_COLOR_MASK; 3104 $self->send_big_packet ($pkt);
2922
2923 utf8::encode $msg;
2924
2925 if (0 && $msg =~ /\[/) {
2926 # COMMAND/INFO
2927 $self->send_packet ("drawextinfo $color 10 8 $msg")
2928 } else {
2929 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2930 $self->send_packet ("drawinfo $color $msg")
2931 }
2932 }
2933 }
2934} 3105}
2935 3106
2936=item $client->ext_msg ($type, @msg) 3107=item $client->ext_msg ($type, @msg)
2937 3108
2938Sends an ext event to the client. 3109Sends an ext event to the client.
2941 3112
2942sub cf::client::ext_msg($$@) { 3113sub cf::client::ext_msg($$@) {
2943 my ($self, $type, @msg) = @_; 3114 my ($self, $type, @msg) = @_;
2944 3115
2945 if ($self->extcmd == 2) { 3116 if ($self->extcmd == 2) {
2946 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3117 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2947 } elsif ($self->extcmd == 1) { # TODO: remove 3118 } elsif ($self->extcmd == 1) { # TODO: remove
2948 push @msg, msgtype => "event_$type"; 3119 push @msg, msgtype => "event_$type";
2949 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3120 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2950 } 3121 }
2951} 3122}
2952 3123
2953=item $client->ext_reply ($msgid, @msg) 3124=item $client->ext_reply ($msgid, @msg)
2954 3125
2958 3129
2959sub cf::client::ext_reply($$@) { 3130sub cf::client::ext_reply($$@) {
2960 my ($self, $id, @msg) = @_; 3131 my ($self, $id, @msg) = @_;
2961 3132
2962 if ($self->extcmd == 2) { 3133 if ($self->extcmd == 2) {
2963 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3134 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2964 } elsif ($self->extcmd == 1) { 3135 } elsif ($self->extcmd == 1) {
2965 #TODO: version 1, remove 3136 #TODO: version 1, remove
2966 unshift @msg, msgtype => "reply", msgid => $id; 3137 unshift @msg, msgtype => "reply", msgid => $id;
2967 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3138 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2968 } 3139 }
2969} 3140}
2970 3141
2971=item $success = $client->query ($flags, "text", \&cb) 3142=item $success = $client->query ($flags, "text", \&cb)
2972 3143
3043 3214
3044 $ns->ext_reply ($reply, @reply) 3215 $ns->ext_reply ($reply, @reply)
3045 if $reply; 3216 if $reply;
3046 3217
3047 } else { 3218 } else {
3048 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3219 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3049 } 3220 }
3050 3221
3051 cf::override; 3222 cf::override;
3052 }, 3223 },
3053); 3224);
3073 3244
3074 $coro 3245 $coro
3075} 3246}
3076 3247
3077cf::client->attach ( 3248cf::client->attach (
3078 on_destroy => sub { 3249 on_client_destroy => sub {
3079 my ($ns) = @_; 3250 my ($ns) = @_;
3080 3251
3081 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3252 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3082 }, 3253 },
3083); 3254);
3099our $safe_hole = new Safe::Hole; 3270our $safe_hole = new Safe::Hole;
3100 3271
3101$SIG{FPE} = 'IGNORE'; 3272$SIG{FPE} = 'IGNORE';
3102 3273
3103$safe->permit_only (Opcode::opset qw( 3274$safe->permit_only (Opcode::opset qw(
3104 :base_core :base_mem :base_orig :base_math 3275 :base_core :base_mem :base_orig :base_math :base_loop
3105 grepstart grepwhile mapstart mapwhile 3276 grepstart grepwhile mapstart mapwhile
3106 sort time 3277 sort time
3107)); 3278));
3108 3279
3109# here we export the classes and methods available to script code 3280# here we export the classes and methods available to script code
3113The following functions and methods are available within a safe environment: 3284The following functions and methods are available within a safe environment:
3114 3285
3115 cf::object 3286 cf::object
3116 contr pay_amount pay_player map x y force_find force_add destroy 3287 contr pay_amount pay_player map x y force_find force_add destroy
3117 insert remove name archname title slaying race decrease split 3288 insert remove name archname title slaying race decrease split
3289 value
3118 3290
3119 cf::object::player 3291 cf::object::player
3120 player 3292 player
3121 3293
3122 cf::player 3294 cf::player
3128=cut 3300=cut
3129 3301
3130for ( 3302for (
3131 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3303 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3132 insert remove inv nrof name archname title slaying race 3304 insert remove inv nrof name archname title slaying race
3133 decrease split destroy)], 3305 decrease split destroy change_exp value msg lore send_msg)],
3134 ["cf::object::player" => qw(player)], 3306 ["cf::object::player" => qw(player)],
3135 ["cf::player" => qw(peaceful)], 3307 ["cf::player" => qw(peaceful send_msg)],
3136 ["cf::map" => qw(trigger)], 3308 ["cf::map" => qw(trigger)],
3137) { 3309) {
3138 no strict 'refs';
3139 my ($pkg, @funs) = @$_; 3310 my ($pkg, @funs) = @$_;
3140 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3311 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3141 for @funs; 3312 for @funs;
3142} 3313}
3143 3314
3158 3329
3159 my $qcode = $code; 3330 my $qcode = $code;
3160 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3331 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3161 $qcode =~ s/\n/\\n/g; 3332 $qcode =~ s/\n/\\n/g;
3162 3333
3334 %vars = (_dummy => 0) unless %vars;
3335
3336 my @res;
3163 local $_; 3337 local $_;
3164 local @safe::cf::_safe_eval_args = values %vars;
3165 3338
3166 my $eval = 3339 my $eval =
3167 "do {\n" 3340 "do {\n"
3168 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3341 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3169 . "#line 0 \"{$qcode}\"\n" 3342 . "#line 0 \"{$qcode}\"\n"
3170 . $code 3343 . $code
3171 . "\n}" 3344 . "\n}"
3172 ; 3345 ;
3173 3346
3347 if ($CFG{safe_eval}) {
3174 sub_generation_inc; 3348 sub_generation_inc;
3349 local @safe::cf::_safe_eval_args = values %vars;
3175 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3350 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3176 sub_generation_inc; 3351 sub_generation_inc;
3352 } else {
3353 local @cf::_safe_eval_args = values %vars;
3354 @res = wantarray ? eval eval : scalar eval $eval;
3355 }
3177 3356
3178 if ($@) { 3357 if ($@) {
3179 warn "$@"; 3358 warn "$@",
3180 warn "while executing safe code '$code'\n"; 3359 "while executing safe code '$code'\n",
3181 warn "with arguments " . (join " ", %vars) . "\n"; 3360 "with arguments " . (join " ", %vars) . "\n";
3182 } 3361 }
3183 3362
3184 wantarray ? @res : $res[0] 3363 wantarray ? @res : $res[0]
3185} 3364}
3186 3365
3200=cut 3379=cut
3201 3380
3202sub register_script_function { 3381sub register_script_function {
3203 my ($fun, $cb) = @_; 3382 my ($fun, $cb) = @_;
3204 3383
3205 no strict 'refs'; 3384 $fun = "safe::$fun" if $CFG{safe_eval};
3206 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3385 *$fun = $safe_hole->wrap ($cb);
3207} 3386}
3208 3387
3209=back 3388=back
3210 3389
3211=cut 3390=cut
3220 # for this (global event?) 3399 # for this (global event?)
3221 %ext::player_env::MUSIC_FACE_CACHE = (); 3400 %ext::player_env::MUSIC_FACE_CACHE = ();
3222 3401
3223 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3402 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3224 3403
3225 warn "loading facedata from $path\n"; 3404 trace "loading facedata from $path\n";
3226 3405
3227 my $facedata;
3228 0 < aio_load $path, $facedata 3406 0 < aio_load $path, my $facedata
3229 or die "$path: $!"; 3407 or die "$path: $!";
3230 3408
3231 $facedata = Coro::Storable::thaw $facedata; 3409 $facedata = Coro::Storable::thaw $facedata;
3232 3410
3233 $facedata->{version} == 2 3411 $facedata->{version} == 2
3234 or cf::cleanup "$path: version mismatch, cannot proceed."; 3412 or cf::cleanup "$path: version mismatch, cannot proceed.";
3235 3413
3236 # patch in the exptable 3414 # patch in the exptable
3415 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3237 $facedata->{resource}{"res/exp_table"} = { 3416 $facedata->{resource}{"res/exp_table"} = {
3238 type => FT_RSRC, 3417 type => FT_RSRC,
3239 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3418 data => $exp_table,
3419 hash => (Digest::MD5::md5 $exp_table),
3240 }; 3420 };
3241 cf::cede_to_tick; 3421 cf::cede_to_tick;
3242 3422
3243 { 3423 {
3244 my $faces = $facedata->{faceinfo}; 3424 my $faces = $facedata->{faceinfo};
3246 while (my ($face, $info) = each %$faces) { 3426 while (my ($face, $info) = each %$faces) {
3247 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3427 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3248 3428
3249 cf::face::set_visibility $idx, $info->{visibility}; 3429 cf::face::set_visibility $idx, $info->{visibility};
3250 cf::face::set_magicmap $idx, $info->{magicmap}; 3430 cf::face::set_magicmap $idx, $info->{magicmap};
3251 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3431 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3252 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3432 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3433 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3253 3434
3254 cf::cede_to_tick; 3435 cf::cede_to_tick;
3255 } 3436 }
3256 3437
3257 while (my ($face, $info) = each %$faces) { 3438 while (my ($face, $info) = each %$faces) {
3262 3443
3263 if (my $smooth = cf::face::find $info->{smooth}) { 3444 if (my $smooth = cf::face::find $info->{smooth}) {
3264 cf::face::set_smooth $idx, $smooth; 3445 cf::face::set_smooth $idx, $smooth;
3265 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3446 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3266 } else { 3447 } else {
3267 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3448 error "smooth face '$info->{smooth}' not found for face '$face'";
3268 } 3449 }
3269 3450
3270 cf::cede_to_tick; 3451 cf::cede_to_tick;
3271 } 3452 }
3272 } 3453 }
3281 3462
3282 cf::anim::invalidate_all; # d'oh 3463 cf::anim::invalidate_all; # d'oh
3283 } 3464 }
3284 3465
3285 { 3466 {
3286 # TODO: for gcfclient pleasure, we should give resources
3287 # that gcfclient doesn't grok a >10000 face index.
3288 my $res = $facedata->{resource}; 3467 my $res = $facedata->{resource};
3289 3468
3290 while (my ($name, $info) = each %$res) { 3469 while (my ($name, $info) = each %$res) {
3291 if (defined $info->{type}) { 3470 if (defined $info->{type}) {
3292 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3471 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3293 my $data;
3294 3472
3295 if ($info->{type} & 1) { 3473 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3296 # prepend meta info
3297
3298 my $meta = $enc->encode ({
3299 name => $name,
3300 %{ $info->{meta} || {} },
3301 });
3302
3303 $data = pack "(w/a*)*", $meta, $info->{data};
3304 } else {
3305 $data = $info->{data};
3306 }
3307
3308 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3309 cf::face::set_type $idx, $info->{type}; 3474 cf::face::set_type $idx, $info->{type};
3310 } else { 3475 } else {
3311 $RESOURCE{$name} = $info; 3476 $RESOURCE{$name} = $info; # unused
3312 } 3477 }
3313 3478
3314 cf::cede_to_tick; 3479 cf::cede_to_tick;
3315 } 3480 }
3316 } 3481 }
3317 3482
3318 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3483 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3319 3484
3320 1 3485 1
3321} 3486}
3322
3323cf::global->attach (on_resource_update => sub {
3324 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3325 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3326
3327 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3328 my $sound = $soundconf->{compat}[$_]
3329 or next;
3330
3331 my $face = cf::face::find "sound/$sound->[1]";
3332 cf::sound::set $sound->[0] => $face;
3333 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3334 }
3335
3336 while (my ($k, $v) = each %{$soundconf->{event}}) {
3337 my $face = cf::face::find "sound/$v";
3338 cf::sound::set $k => $face;
3339 }
3340 }
3341});
3342 3487
3343register_exticmd fx_want => sub { 3488register_exticmd fx_want => sub {
3344 my ($ns, $want) = @_; 3489 my ($ns, $want) = @_;
3345 3490
3346 while (my ($k, $v) = each %$want) { 3491 while (my ($k, $v) = each %$want) {
3385sub reload_treasures { 3530sub reload_treasures {
3386 load_resource_file "$DATADIR/treasures" 3531 load_resource_file "$DATADIR/treasures"
3387 or die "unable to load treasurelists\n"; 3532 or die "unable to load treasurelists\n";
3388} 3533}
3389 3534
3535sub reload_sound {
3536 trace "loading sound config from $DATADIR/sound\n";
3537
3538 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3539 or die "$DATADIR/sound $!";
3540
3541 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3542
3543 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3544 my $sound = $soundconf->{compat}[$_]
3545 or next;
3546
3547 my $face = cf::face::find "sound/$sound->[1]";
3548 cf::sound::set $sound->[0] => $face;
3549 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3550 }
3551
3552 while (my ($k, $v) = each %{$soundconf->{event}}) {
3553 my $face = cf::face::find "sound/$v";
3554 cf::sound::set $k => $face;
3555 }
3556}
3557
3390sub reload_resources { 3558sub reload_resources {
3391 warn "reloading resource files...\n"; 3559 trace "reloading resource files...\n";
3392 3560
3561 reload_exp_table;
3562 reload_materials;
3393 reload_facedata; 3563 reload_facedata;
3564 reload_sound;
3394 reload_archetypes; 3565 reload_archetypes;
3395 reload_regions; 3566 reload_regions;
3396 reload_treasures; 3567 reload_treasures;
3397 3568
3398 warn "finished reloading resource files\n"; 3569 trace "finished reloading resource files\n";
3399}
3400
3401sub init {
3402 my $guard = freeze_mainloop;
3403
3404 evthread_start IO::AIO::poll_fileno;
3405
3406 reload_resources;
3407} 3570}
3408 3571
3409sub reload_config { 3572sub reload_config {
3410 open my $fh, "<:utf8", "$CONFDIR/config" 3573 trace "reloading config file...\n";
3411 or return;
3412 3574
3413 local $/; 3575 0 < aio_load "$CONFDIR/config", my $config
3414 *CFG = YAML::Load <$fh>; 3576 or die "$CONFDIR/config: $!";
3415 3577
3578 utf8::decode $config;
3579 *CFG = yaml_load $config;
3580
3416 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3581 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3417 3582
3418 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3583 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3419 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3584 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3420 3585
3421 if (exists $CFG{mlockall}) { 3586 if (exists $CFG{mlockall}) {
3425 }; 3590 };
3426 warn $@ if $@; 3591 warn $@ if $@;
3427 } 3592 }
3428} 3593}
3429 3594
3595sub pidfile() {
3596 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3597 or die "$PIDFILE: $!";
3598 flock $fh, &Fcntl::LOCK_EX
3599 or die "$PIDFILE: flock: $!";
3600 $fh
3601}
3602
3603# make sure only one server instance is running at any one time
3604sub atomic {
3605 my $fh = pidfile;
3606
3607 my $pid = <$fh>;
3608 kill 9, $pid if $pid > 0;
3609
3610 seek $fh, 0, 0;
3611 print $fh $$;
3612}
3613
3614sub main_loop {
3615 trace "EV::loop starting\n";
3616 if (1) {
3617 EV::loop;
3618 }
3619 trace "EV::loop returned\n";
3620 goto &main_loop unless $REALLY_UNLOOP;
3621}
3622
3430sub main { 3623sub main {
3624 cf::init_globals; # initialise logging
3625
3626 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3627 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3628 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3629 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3630
3631 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3632
3431 # we must not ever block the main coroutine 3633 # we must not ever block the main coroutine
3432 local $Coro::idle = sub { 3634 local $Coro::idle = sub {
3433 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3635 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3434 (async { 3636 (async {
3435 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3637 $Coro::current->{desc} = "IDLE BUG HANDLER";
3436 EV::loop EV::LOOP_ONESHOT; 3638 EV::loop EV::LOOP_ONESHOT;
3437 })->prio (Coro::PRIO_MAX); 3639 })->prio (Coro::PRIO_MAX);
3438 }; 3640 };
3439 3641
3440 { 3642 evthread_start IO::AIO::poll_fileno;
3441 my $guard = freeze_mainloop; 3643
3644 cf::sync_job {
3645 cf::incloader::init ();
3646
3647 cf::init_anim;
3648 cf::init_attackmess;
3649 cf::init_dynamic;
3650
3651 cf::load_settings;
3652
3653 reload_resources;
3442 reload_config; 3654 reload_config;
3443 db_init; 3655 db_init;
3656
3657 cf::init_uuid;
3658 cf::init_signals;
3659 cf::init_skills;
3660
3661 cf::init_beforeplay;
3662
3663 atomic;
3664
3444 load_extensions; 3665 load_extensions;
3445 3666
3446 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3667 utime time, time, $RUNTIMEFILE;
3668
3669 # no (long-running) fork's whatsoever before this point(!)
3670 use POSIX ();
3671 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3672
3673 cf::_post_init 0;
3447 } 3674 };
3448 3675
3449 EV::loop; 3676 cf::object::thawer::errors_are_fatal 0;
3677 info "parse errors in files are no longer fatal from this point on.\n";
3678
3679 my $free_main; $free_main = EV::idle sub {
3680 undef $free_main;
3681 undef &main; # free gobs of memory :)
3682 };
3683
3684 goto &main_loop;
3450} 3685}
3451 3686
3452############################################################################# 3687#############################################################################
3453# initialisation and cleanup 3688# initialisation and cleanup
3454 3689
3455# install some emergency cleanup handlers 3690# install some emergency cleanup handlers
3456BEGIN { 3691BEGIN {
3457 our %SIGWATCHER = (); 3692 our %SIGWATCHER = ();
3458 for my $signal (qw(INT HUP TERM)) { 3693 for my $signal (qw(INT HUP TERM)) {
3459 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3694 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3460 cf::cleanup "SIG$signal"; 3695 cf::cleanup "SIG$signal";
3461 }; 3696 };
3462 } 3697 }
3463} 3698}
3464 3699
3465sub write_runtime_sync { 3700sub write_runtime_sync {
3466 my $runtime = "$LOCALDIR/runtime"; 3701 my $t0 = AE::time;
3467 3702
3468 # first touch the runtime file to show we are still running: 3703 # first touch the runtime file to show we are still running:
3469 # the fsync below can take a very very long time. 3704 # the fsync below can take a very very long time.
3470 3705
3471 IO::AIO::aio_utime $runtime, undef, undef; 3706 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3472 3707
3473 my $guard = cf::lock_acquire "write_runtime"; 3708 my $guard = cf::lock_acquire "write_runtime";
3474 3709
3475 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3710 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3476 or return; 3711 or return;
3477 3712
3478 my $value = $cf::RUNTIME + 90 + 10; 3713 my $value = $cf::RUNTIME + 90 + 10;
3479 # 10 is the runtime save interval, for a monotonic clock 3714 # 10 is the runtime save interval, for a monotonic clock
3480 # 60 allows for the watchdog to kill the server. 3715 # 60 allows for the watchdog to kill the server.
3490 aio_utime $fh, undef, undef; 3725 aio_utime $fh, undef, undef;
3491 3726
3492 close $fh 3727 close $fh
3493 or return; 3728 or return;
3494 3729
3495 aio_rename "$runtime~", $runtime 3730 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3496 and return; 3731 and return;
3497 3732
3498 warn "runtime file written.\n"; 3733 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3499 3734
3500 1 3735 1
3501} 3736}
3502 3737
3503our $uuid_lock; 3738our $uuid_lock;
3512 my $uuid = "$LOCALDIR/uuid"; 3747 my $uuid = "$LOCALDIR/uuid";
3513 3748
3514 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3749 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3515 or return; 3750 or return;
3516 3751
3517 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3752 my $value = uuid_seq uuid_cur;
3753
3754 unless ($value) {
3755 info "cowardly refusing to write zero uuid value!\n";
3756 return;
3757 }
3758
3759 my $value = uuid_str $value + $uuid_skip;
3518 $uuid_skip = 0; 3760 $uuid_skip = 0;
3519 3761
3520 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3762 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3521 and return; 3763 and return;
3522 3764
3528 or return; 3770 or return;
3529 3771
3530 aio_rename "$uuid~", $uuid 3772 aio_rename "$uuid~", $uuid
3531 and return; 3773 and return;
3532 3774
3533 warn "uuid file written ($value).\n"; 3775 trace "uuid file written ($value).\n";
3534 3776
3535 1 3777 1
3536 3778
3537} 3779}
3538 3780
3544} 3786}
3545 3787
3546sub emergency_save() { 3788sub emergency_save() {
3547 my $freeze_guard = cf::freeze_mainloop; 3789 my $freeze_guard = cf::freeze_mainloop;
3548 3790
3549 warn "enter emergency perl save\n"; 3791 info "emergency_perl_save: enter\n";
3792
3793 # this is a trade-off: we want to be very quick here, so
3794 # save all maps without fsync, and later call a global sync
3795 # (which in turn might be very very slow)
3796 local $USE_FSYNC = 0;
3550 3797
3551 cf::sync_job { 3798 cf::sync_job {
3799 cf::write_runtime_sync; # external watchdog should not bark
3800
3552 # use a peculiar iteration method to avoid tripping on perl 3801 # use a peculiar iteration method to avoid tripping on perl
3553 # refcount bugs in for. also avoids problems with players 3802 # refcount bugs in for. also avoids problems with players
3554 # and maps saved/destroyed asynchronously. 3803 # and maps saved/destroyed asynchronously.
3555 warn "begin emergency player save\n"; 3804 info "emergency_perl_save: begin player save\n";
3556 for my $login (keys %cf::PLAYER) { 3805 for my $login (keys %cf::PLAYER) {
3557 my $pl = $cf::PLAYER{$login} or next; 3806 my $pl = $cf::PLAYER{$login} or next;
3558 $pl->valid or next; 3807 $pl->valid or next;
3559 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3808 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3560 $pl->save; 3809 $pl->save;
3561 } 3810 }
3562 warn "end emergency player save\n"; 3811 info "emergency_perl_save: end player save\n";
3563 3812
3564 warn "begin emergency map save\n"; 3813 cf::write_runtime_sync; # external watchdog should not bark
3814
3815 info "emergency_perl_save: begin map save\n";
3565 for my $path (keys %cf::MAP) { 3816 for my $path (keys %cf::MAP) {
3566 my $map = $cf::MAP{$path} or next; 3817 my $map = $cf::MAP{$path} or next;
3567 $map->valid or next; 3818 $map->valid or next;
3568 $map->save; 3819 $map->save;
3569 } 3820 }
3570 warn "end emergency map save\n"; 3821 info "emergency_perl_save: end map save\n";
3571 3822
3572 warn "begin emergency database checkpoint\n"; 3823 cf::write_runtime_sync; # external watchdog should not bark
3824
3825 info "emergency_perl_save: begin database checkpoint\n";
3573 BDB::db_env_txn_checkpoint $DB_ENV; 3826 BDB::db_env_txn_checkpoint $DB_ENV;
3574 warn "end emergency database checkpoint\n"; 3827 info "emergency_perl_save: end database checkpoint\n";
3575 3828
3576 warn "begin write uuid\n"; 3829 info "emergency_perl_save: begin write uuid\n";
3577 write_uuid_sync 1; 3830 write_uuid_sync 1;
3578 warn "end write uuid\n"; 3831 info "emergency_perl_save: end write uuid\n";
3832
3833 cf::write_runtime_sync; # external watchdog should not bark
3834
3835 trace "emergency_perl_save: syncing database to disk";
3836 BDB::db_env_txn_checkpoint $DB_ENV;
3837
3838 info "emergency_perl_save: starting sync\n";
3839 IO::AIO::aio_sync sub {
3840 info "emergency_perl_save: finished sync\n";
3841 };
3842
3843 cf::write_runtime_sync; # external watchdog should not bark
3844
3845 trace "emergency_perl_save: flushing outstanding aio requests";
3846 while (IO::AIO::nreqs || BDB::nreqs) {
3847 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3848 }
3849
3850 cf::write_runtime_sync; # external watchdog should not bark
3579 }; 3851 };
3580 3852
3581 warn "leave emergency perl save\n"; 3853 info "emergency_perl_save: leave\n";
3582} 3854}
3583 3855
3584sub post_cleanup { 3856sub post_cleanup {
3585 my ($make_core) = @_; 3857 my ($make_core) = @_;
3586 3858
3859 IO::AIO::flush;
3860
3587 warn Carp::longmess "post_cleanup backtrace" 3861 error Carp::longmess "post_cleanup backtrace"
3588 if $make_core; 3862 if $make_core;
3863
3864 my $fh = pidfile;
3865 unlink $PIDFILE if <$fh> == $$;
3866}
3867
3868# a safer delete_package, copied from Symbol
3869sub clear_package($) {
3870 my $pkg = shift;
3871
3872 # expand to full symbol table name if needed
3873 unless ($pkg =~ /^main::.*::$/) {
3874 $pkg = "main$pkg" if $pkg =~ /^::/;
3875 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3876 $pkg .= '::' unless $pkg =~ /::$/;
3877 }
3878
3879 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3880 my $stem_symtab = *{$stem}{HASH};
3881
3882 defined $stem_symtab and exists $stem_symtab->{$leaf}
3883 or return;
3884
3885 # clear all symbols
3886 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3887 for my $name (keys %$leaf_symtab) {
3888 _gv_clear *{"$pkg$name"};
3889# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3890 }
3589} 3891}
3590 3892
3591sub do_reload_perl() { 3893sub do_reload_perl() {
3592 # can/must only be called in main 3894 # can/must only be called in main
3593 if ($Coro::current != $Coro::main) { 3895 unless (in_main) {
3594 warn "can only reload from main coroutine"; 3896 error "can only reload from main coroutine";
3595 return; 3897 return;
3596 } 3898 }
3597 3899
3598 warn "reloading..."; 3900 return if $RELOAD++;
3599 3901
3600 warn "entering sync_job"; 3902 my $t1 = AE::time;
3601 3903
3904 while ($RELOAD) {
3905 cf::get_slot 0.1, -1, "reload_perl";
3906 info "perl_reload: reloading...";
3907
3908 trace "perl_reload: entering sync_job";
3909
3602 cf::sync_job { 3910 cf::sync_job {
3603 cf::write_runtime_sync; # external watchdog should not bark
3604 cf::emergency_save; 3911 #cf::emergency_save;
3605 cf::write_runtime_sync; # external watchdog should not bark
3606 3912
3607 warn "syncing database to disk";
3608 BDB::db_env_txn_checkpoint $DB_ENV;
3609
3610 # if anything goes wrong in here, we should simply crash as we already saved
3611
3612 warn "flushing outstanding aio requests";
3613 for (;;) {
3614 BDB::flush;
3615 IO::AIO::flush;
3616 Coro::cede_notself;
3617 last unless IO::AIO::nreqs || BDB::nreqs;
3618 warn "iterate...";
3619 }
3620
3621 ++$RELOAD;
3622
3623 warn "cancelling all extension coros"; 3913 trace "perl_reload: cancelling all extension coros";
3624 $_->cancel for values %EXT_CORO; 3914 $_->cancel for values %EXT_CORO;
3625 %EXT_CORO = (); 3915 %EXT_CORO = ();
3626 3916
3627 warn "removing commands"; 3917 trace "perl_reload: removing commands";
3628 %COMMAND = (); 3918 %COMMAND = ();
3629 3919
3630 warn "removing ext/exti commands"; 3920 trace "perl_reload: removing ext/exti commands";
3631 %EXTCMD = (); 3921 %EXTCMD = ();
3632 %EXTICMD = (); 3922 %EXTICMD = ();
3633 3923
3634 warn "unloading/nuking all extensions"; 3924 trace "perl_reload: unloading/nuking all extensions";
3635 for my $pkg (@EXTS) { 3925 for my $pkg (@EXTS) {
3636 warn "... unloading $pkg"; 3926 trace "... unloading $pkg";
3637 3927
3638 if (my $cb = $pkg->can ("unload")) { 3928 if (my $cb = $pkg->can ("unload")) {
3639 eval { 3929 eval {
3640 $cb->($pkg); 3930 $cb->($pkg);
3641 1 3931 1
3642 } or warn "$pkg unloaded, but with errors: $@"; 3932 } or error "$pkg unloaded, but with errors: $@";
3933 }
3934
3935 trace "... clearing $pkg";
3936 clear_package $pkg;
3643 } 3937 }
3644 3938
3645 warn "... nuking $pkg";
3646 Symbol::delete_package $pkg;
3647 }
3648
3649 warn "unloading all perl modules loaded from $LIBDIR"; 3939 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3650 while (my ($k, $v) = each %INC) { 3940 while (my ($k, $v) = each %INC) {
3651 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3941 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3652 3942
3653 warn "... unloading $k"; 3943 trace "... unloading $k";
3654 delete $INC{$k}; 3944 delete $INC{$k};
3655 3945
3656 $k =~ s/\.pm$//; 3946 $k =~ s/\.pm$//;
3657 $k =~ s/\//::/g; 3947 $k =~ s/\//::/g;
3658 3948
3659 if (my $cb = $k->can ("unload_module")) { 3949 if (my $cb = $k->can ("unload_module")) {
3660 $cb->(); 3950 $cb->();
3951 }
3952
3953 clear_package $k;
3661 } 3954 }
3662 3955
3663 Symbol::delete_package $k;
3664 }
3665
3666 warn "getting rid of safe::, as good as possible"; 3956 trace "perl_reload: getting rid of safe::, as good as possible";
3667 Symbol::delete_package "safe::$_" 3957 clear_package "safe::$_"
3668 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3958 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3669 3959
3670 warn "unloading cf.pm \"a bit\""; 3960 trace "perl_reload: unloading cf.pm \"a bit\"";
3671 delete $INC{"cf.pm"}; 3961 delete $INC{"cf.pm"};
3672 delete $INC{"cf/pod.pm"}; 3962 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3673 3963
3674 # don't, removes xs symbols, too, 3964 # don't, removes xs symbols, too,
3675 # and global variables created in xs 3965 # and global variables created in xs
3676 #Symbol::delete_package __PACKAGE__; 3966 #clear_package __PACKAGE__;
3677 3967
3678 warn "unload completed, starting to reload now"; 3968 info "perl_reload: unload completed, starting to reload now";
3679 3969
3680 warn "reloading cf.pm"; 3970 trace "perl_reload: reloading cf.pm";
3681 require cf; 3971 require cf;
3682 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3972 cf::_connect_to_perl_1;
3683 3973
3684 warn "loading config and database again"; 3974 trace "perl_reload: loading config and database again";
3685 cf::reload_config; 3975 cf::reload_config;
3686 3976
3687 warn "loading extensions"; 3977 trace "perl_reload: loading extensions";
3688 cf::load_extensions; 3978 cf::load_extensions;
3689 3979
3980 if ($REATTACH_ON_RELOAD) {
3690 warn "reattaching attachments to objects/players"; 3981 trace "perl_reload: reattaching attachments to objects/players";
3691 _global_reattach; # objects, sockets 3982 _global_reattach; # objects, sockets
3692 warn "reattaching attachments to maps"; 3983 trace "perl_reload: reattaching attachments to maps";
3693 reattach $_ for values %MAP; 3984 reattach $_ for values %MAP;
3694 warn "reattaching attachments to players"; 3985 trace "perl_reload: reattaching attachments to players";
3695 reattach $_ for values %PLAYER; 3986 reattach $_ for values %PLAYER;
3987 }
3696 3988
3697 warn "leaving sync_job"; 3989 cf::_post_init 1;
3698 3990
3991 trace "perl_reload: leaving sync_job";
3992
3699 1 3993 1
3700 } or do { 3994 } or do {
3701 warn $@; 3995 error $@;
3702 cf::cleanup "error while reloading, exiting."; 3996 cf::cleanup "perl_reload: error, exiting.";
3997 };
3998
3999 --$RELOAD;
3703 }; 4000 }
3704 4001
3705 warn "reloaded"; 4002 $t1 = AE::time - $t1;
4003 info "perl_reload: completed in ${t1}s\n";
3706}; 4004};
3707 4005
3708our $RELOAD_WATCHER; # used only during reload 4006our $RELOAD_WATCHER; # used only during reload
3709 4007
3710sub reload_perl() { 4008sub reload_perl() {
3711 # doing reload synchronously and two reloads happen back-to-back, 4009 # doing reload synchronously and two reloads happen back-to-back,
3712 # coro crashes during coro_state_free->destroy here. 4010 # coro crashes during coro_state_free->destroy here.
3713 4011
4012 $RELOAD_WATCHER ||= cf::async {
4013 Coro::AIO::aio_wait cache_extensions;
4014
3714 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4015 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3715 do_reload_perl; 4016 do_reload_perl;
3716 undef $RELOAD_WATCHER; 4017 undef $RELOAD_WATCHER;
4018 };
3717 }; 4019 };
3718} 4020}
3719 4021
3720register_command "reload" => sub { 4022register_command "reload" => sub {
3721 my ($who, $arg) = @_; 4023 my ($who, $arg) = @_;
3727 reload_perl; 4029 reload_perl;
3728 }; 4030 };
3729 } 4031 }
3730}; 4032};
3731 4033
3732unshift @INC, $LIBDIR; 4034#############################################################################
3733 4035
3734my $bug_warning = 0; 4036my $bug_warning = 0;
3735 4037
3736our @WAIT_FOR_TICK; 4038our @WAIT_FOR_TICK;
3737our @WAIT_FOR_TICK_BEGIN; 4039our @WAIT_FOR_TICK_BEGIN;
3738 4040
3739sub wait_for_tick { 4041sub wait_for_tick() {
3740 return if tick_inhibit || $Coro::current == $Coro::main; 4042 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3741 4043
3742 my $signal = new Coro::Signal; 4044 my $signal = new Coro::Signal;
3743 push @WAIT_FOR_TICK, $signal; 4045 push @WAIT_FOR_TICK, $signal;
3744 $signal->wait; 4046 $signal->wait;
3745} 4047}
3746 4048
3747sub wait_for_tick_begin { 4049sub wait_for_tick_begin() {
3748 return if tick_inhibit || $Coro::current == $Coro::main; 4050 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3749 4051
3750 my $signal = new Coro::Signal; 4052 my $signal = new Coro::Signal;
3751 push @WAIT_FOR_TICK_BEGIN, $signal; 4053 push @WAIT_FOR_TICK_BEGIN, $signal;
3752 $signal->wait; 4054 $signal->wait;
3753} 4055}
3759 return; 4061 return;
3760 } 4062 }
3761 4063
3762 cf::server_tick; # one server iteration 4064 cf::server_tick; # one server iteration
3763 4065
4066 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4067
3764 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4068 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3765 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4069 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3766 Coro::async_pool { 4070 Coro::async_pool {
3767 $Coro::current->{desc} = "runtime saver"; 4071 $Coro::current->{desc} = "runtime saver";
3768 write_runtime_sync 4072 write_runtime_sync
3769 or warn "ERROR: unable to write runtime file: $!"; 4073 or error "ERROR: unable to write runtime file: $!";
3770 }; 4074 };
3771 } 4075 }
3772 4076
3773 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4077 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3774 $sig->send; 4078 $sig->send;
3782 4086
3783 if (0) { 4087 if (0) {
3784 if ($NEXT_TICK) { 4088 if ($NEXT_TICK) {
3785 my $jitter = $TICK_START - $NEXT_TICK; 4089 my $jitter = $TICK_START - $NEXT_TICK;
3786 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4090 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3787 warn "jitter $JITTER\n";#d# 4091 debug "jitter $JITTER\n";#d#
3788 } 4092 }
3789 } 4093 }
3790} 4094}
3791 4095
3792{ 4096{
3793 # configure BDB 4097 # configure BDB
3794 4098
3795 BDB::min_parallel 8; 4099 BDB::min_parallel 16;
3796 BDB::max_poll_reqs $TICK * 0.1; 4100 BDB::max_poll_reqs $TICK * 0.1;
3797 $AnyEvent::BDB::WATCHER->priority (1); 4101 $AnyEvent::BDB::WATCHER->priority (1);
3798 4102
3799 unless ($DB_ENV) { 4103 unless ($DB_ENV) {
3800 $DB_ENV = BDB::db_env_create; 4104 $DB_ENV = BDB::db_env_create;
3801 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4105 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3802 | BDB::LOG_AUTOREMOVE, 1); 4106 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4107 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3803 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4108 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3804 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4109 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3805 4110
3806 cf::sync_job { 4111 cf::sync_job {
3807 eval { 4112 eval {
3836 IO::AIO::min_parallel 8; 4141 IO::AIO::min_parallel 8;
3837 IO::AIO::max_poll_time $TICK * 0.1; 4142 IO::AIO::max_poll_time $TICK * 0.1;
3838 undef $AnyEvent::AIO::WATCHER; 4143 undef $AnyEvent::AIO::WATCHER;
3839} 4144}
3840 4145
3841my $_log_backtrace; 4146our $_log_backtrace;
4147our $_log_backtrace_last;
3842 4148
3843sub _log_backtrace { 4149sub _log_backtrace {
3844 my ($msg, @addr) = @_; 4150 my ($msg, @addr) = @_;
3845 4151
3846 $msg =~ s/\n//; 4152 $msg =~ s/\n$//;
3847 4153
4154 if ($_log_backtrace_last eq $msg) {
4155 LOG llevInfo, "[ABT] $msg\n";
4156 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3848 # limit the # of concurrent backtraces 4157 # limit the # of concurrent backtraces
3849 if ($_log_backtrace < 2) { 4158 } elsif ($_log_backtrace < 2) {
4159 $_log_backtrace_last = $msg;
3850 ++$_log_backtrace; 4160 ++$_log_backtrace;
4161 my $perl_bt = Carp::longmess $msg;
3851 async { 4162 async {
3852 $Coro::current->{desc} = "abt $msg"; 4163 $Coro::current->{desc} = "abt $msg";
3853 4164
3854 my @bt = fork_call { 4165 my @bt = fork_call {
3855 @addr = map { sprintf "%x", $_ } @addr; 4166 @addr = map { sprintf "%x", $_ } @addr;
3866 } 4177 }
3867 4178
3868 @funcs 4179 @funcs
3869 }; 4180 };
3870 4181
3871 LOG llevInfo, "[ABT] $msg\n"; 4182 LOG llevInfo, "[ABT] $perl_bt\n";
4183 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3872 LOG llevInfo, "[ABT] $_\n" for @bt; 4184 LOG llevInfo, "[ABT] $_\n" for @bt;
3873 --$_log_backtrace; 4185 --$_log_backtrace;
3874 }; 4186 };
3875 } else { 4187 } else {
3876 LOG llevInfo, "[ABT] $msg\n"; 4188 LOG llevInfo, "[ABT] $msg\n";
3877 LOG llevInfo, "[ABT] [suppressed]\n"; 4189 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3878 } 4190 }
3879} 4191}
3880 4192
3881# load additional modules 4193# load additional modules
3882use cf::pod; 4194require "cf/$_.pm" for @EXTRA_MODULES;
4195cf::_connect_to_perl_2;
3883 4196
3884END { cf::emergency_save } 4197END { cf::emergency_save }
3885 4198
38861 41991
3887 4200

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines