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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines