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.554 by root, Sat Jun 26 22:10:18 2010 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;
87our $DATADIR = datadir; 98our $DATADIR = datadir;
88our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
89our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
90our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
91our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
92our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
94our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
95our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
96our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
97our %RESOURCE; 111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
98 118
99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
101our $NEXT_TICK; 121our $NEXT_TICK;
102our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
103 123
104our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
105our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
106our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
107our $DB_ENV; 127our $DB_ENV;
108 128
129our @EXTRA_MODULES = qw(pod match mapscript incloader);
130
109our %CFG; 131our %CFG;
110 132
111our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
112our $RUNTIME; 134our $RUNTIME;
113our $NOW; 135our $NOW;
122our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
123our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter 146our $JITTER; # average jitter
125our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
126 148
149our @POST_INIT;
150
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
153
127binmode STDOUT; 154binmode STDOUT;
128binmode STDERR; 155binmode STDERR;
129 156
130# read virtual server time, if available 157# read virtual server time, if available
131unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
132 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
133 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
134 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
135} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
136 165
137mkdir $_ 166mkdir $_
138 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
139 168
140our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
141 170
142sub cf::map::normalise; 171sub cf::map::normalise;
172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
143 187
144############################################################################# 188#############################################################################
145 189
146=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
147 191
189from wherever your confdir points to. 233from wherever your confdir points to.
190 234
191=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
192 236
193These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 237These 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 238returns 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. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
196 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
197=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
198 247
199This array contains the results of the last C<invoke ()> call. When 248This 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 249C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
201that call. 250that call.
202 251
252=item %cf::REFLECT
253
254Contains, for each (C++) class name, a hash reference with information
255about object members (methods, scalars, arrays and flags) and other
256metadata, which is useful for introspection.
257
203=back 258=back
204 259
205=cut 260=cut
206 261
207BEGIN { 262sub error(@) { LOG llevError, join "", @_ }
208 *CORE::GLOBAL::warn = sub { 263sub warn (@) { LOG llevWarn , join "", @_ }
264sub info (@) { LOG llevInfo , join "", @_ }
265sub debug(@) { LOG llevDebug, join "", @_ }
266sub trace(@) { LOG llevTrace, join "", @_ }
267
268$Coro::State::WARNHOOK = sub {
209 my $msg = join "", @_; 269 my $msg = join "", @_;
210 270
211 $msg .= "\n" 271 $msg .= "\n"
212 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
213 273
214 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 274 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
215 275
216 LOG llevError, $msg; 276 LOG llevWarn, $msg;
217 }; 277};
218}
219 278
220$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
221 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
222 281
223 if ($Coro::current == $Coro::main) {#d# 282 error Carp::longmess $_[0];
283
284 if (in_main) {#d#
224 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
225 return;#d# 286 return;#d#
226 }#d# 287 }#d#
227 288
228 # kill coroutine otherwise 289 # kill coroutine otherwise
229 warn Carp::longmess $_[0];
230 Coro::terminate 290 Coro::terminate
231}; 291};
232
233$SIG{__DIE__} = sub { }; #d#?
234 292
235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 296@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
252)) { 310)) {
253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
254} 312}
255 313
256$EV::DIED = sub { 314$EV::DIED = sub {
257 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
258}; 316};
259 317
260############################################################################# 318#############################################################################
261 319
262=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
299our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 357our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
300 358
301sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
302sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
303 361
362=item $ref = cf::yaml_load $scalar
363
364Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365
366=cut
367
368sub fork_call(&@);
369
370sub yaml_load($) {
371 fork_call { YAML::XS::Load $_[0] } @_
372}
373
374=item cf::post_init { BLOCK }
375
376Execute the given codeblock, I<after> all extensions have been (re-)loaded,
377but I<before> the server starts ticking again.
378
379The codeblock will have a single boolean argument to indicate whether this
380is a reload or not.
381
382=cut
383
384sub post_init(&) {
385 push @POST_INIT, shift;
386}
387
388sub _post_init {
389 trace "running post_init jobs";
390
391 # run them in parallel...
392
393 my @join;
394
395 while () {
396 push @join, map &Coro::async ($_, 0), @POST_INIT;
397 @POST_INIT = ();
398
399 @join or last;
400
401 (pop @join)->join;
402 }
403}
404
304=item cf::lock_wait $string 405=item cf::lock_wait $string
305 406
306Wait until the given lock is available. See cf::lock_acquire. 407Wait until the given lock is available. See cf::lock_acquire.
307 408
308=item my $lock = cf::lock_acquire $string 409=item my $lock = cf::lock_acquire $string
309 410
310Wait until the given lock is available and then acquires it and returns 411Wait 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, 412a L<Guard> object. If the guard object gets destroyed (goes out of scope,
312for example when the coroutine gets canceled), the lock is automatically 413for example when the coroutine gets canceled), the lock is automatically
313returned. 414returned.
314 415
315Locks are *not* recursive, locking from the same coro twice results in a 416Locks are *not* recursive, locking from the same coro twice results in a
316deadlocked coro. 417deadlocked coro.
322 423
323Return true if the lock is currently active, i.e. somebody has locked it. 424Return true if the lock is currently active, i.e. somebody has locked it.
324 425
325=cut 426=cut
326 427
327our %LOCK; 428our $LOCKS = new Coro::SemaphoreSet;
328our %LOCKER;#d#
329 429
330sub lock_wait($) { 430sub lock_wait($) {
331 my ($key) = @_; 431 $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} 432}
344 433
345sub lock_acquire($) { 434sub lock_acquire($) {
346 my ($key) = @_; 435 $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} 436}
360 437
361sub lock_active($) { 438sub lock_active($) {
362 my ($key) = @_; 439 $LOCKS->count ($_[0]) < 1
363
364 ! ! $LOCK{$key}
365} 440}
366 441
367sub freeze_mainloop { 442sub freeze_mainloop {
368 tick_inhibit_inc; 443 tick_inhibit_inc;
369 444
370 Coro::guard \&tick_inhibit_dec; 445 &Guard::guard (\&tick_inhibit_dec);
371} 446}
372 447
373=item cf::periodic $interval, $cb 448=item cf::periodic $interval, $cb
374 449
375Like EV::periodic, but randomly selects a starting point so that the actions 450Like EV::periodic, but randomly selects a starting point so that the actions
376get spread over timer. 451get spread over time.
377 452
378=cut 453=cut
379 454
380sub periodic($$) { 455sub periodic($$) {
381 my ($interval, $cb) = @_; 456 my ($interval, $cb) = @_;
398 473
399=cut 474=cut
400 475
401our @SLOT_QUEUE; 476our @SLOT_QUEUE;
402our $SLOT_QUEUE; 477our $SLOT_QUEUE;
478our $SLOT_DECAY = 0.9;
403 479
404$SLOT_QUEUE->cancel if $SLOT_QUEUE; 480$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async { 481$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager"); 482 $Coro::current->desc ("timeslot manager");
407 483
408 my $signal = new Coro::Signal; 484 my $signal = new Coro::Signal;
485 my $busy;
409 486
410 while () { 487 while () {
411 next_job: 488 next_job:
489
412 my $avail = cf::till_tick; 490 my $avail = cf::till_tick;
413 if ($avail > 0.01) { 491
414 for (0 .. $#SLOT_QUEUE) { 492 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) { 493 if ($SLOT_QUEUE[$_][0] <= $avail) {
494 $busy = 0;
416 my $job = splice @SLOT_QUEUE, $_, 1, (); 495 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send; 496 $job->[2]->send;
418 Coro::cede; 497 Coro::cede;
419 goto next_job; 498 goto next_job;
420 } 499 } else {
500 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
421 } 501 }
422 } 502 }
423 503
424 if (@SLOT_QUEUE) { 504 if (@SLOT_QUEUE) {
425 # we do not use wait_for_tick() as it returns immediately when tick is inactive 505 # we do not use wait_for_tick() as it returns immediately when tick is inactive
426 push @cf::WAIT_FOR_TICK, $signal; 506 push @cf::WAIT_FOR_TICK, $signal;
427 $signal->wait; 507 $signal->wait;
428 } else { 508 } else {
509 $busy = 0;
429 Coro::schedule; 510 Coro::schedule;
430 } 511 }
431 } 512 }
432}; 513};
433 514
434sub get_slot($;$$) { 515sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main; 516 return if tick_inhibit || $Coro::current == $Coro::main;
436 517
437 my ($time, $pri, $name) = @_; 518 my ($time, $pri, $name) = @_;
438 519
439 $time = $TICK * .6 if $time > $TICK * .6; 520 $time = clamp $time, 0.01, $TICK * .6;
521
440 my $sig = new Coro::Signal; 522 my $sig = new Coro::Signal;
441 523
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 524 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 525 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready; 526 $SLOT_QUEUE->ready;
470=cut 552=cut
471 553
472sub sync_job(&) { 554sub sync_job(&) {
473 my ($job) = @_; 555 my ($job) = @_;
474 556
475 if ($Coro::current == $Coro::main) { 557 if (in_main) {
476 my $time = EV::time; 558 my $time = AE::time;
477 559
478 # this is the main coro, too bad, we have to block 560 # this is the main coro, too bad, we have to block
479 # till the operation succeeds, freezing the server :/ 561 # till the operation succeeds, freezing the server :/
480 562
481 LOG llevError, Carp::longmess "sync job";#d# 563 #LOG llevError, Carp::longmess "sync job";#d#
482 564
483 my $freeze_guard = freeze_mainloop; 565 my $freeze_guard = freeze_mainloop;
484 566
485 my $busy = 1; 567 my $busy = 1;
486 my @res; 568 my @res;
487 569
488 (async { 570 (async {
489 $Coro::current->desc ("sync job coro"); 571 $Coro::current->desc ("sync job coro");
490 @res = eval { $job->() }; 572 @res = eval { $job->() };
491 warn $@ if $@; 573 error $@ if $@;
492 undef $busy; 574 undef $busy;
493 })->prio (Coro::PRIO_MAX); 575 })->prio (Coro::PRIO_MAX);
494 576
495 while ($busy) { 577 while ($busy) {
496 if (Coro::nready) { 578 if (Coro::nready) {
498 } else { 580 } else {
499 EV::loop EV::LOOP_ONESHOT; 581 EV::loop EV::LOOP_ONESHOT;
500 } 582 }
501 } 583 }
502 584
503 my $time = EV::time - $time; 585 my $time = AE::time - $time;
504 586
505 $TICK_START += $time; # do not account sync jobs to server load 587 $TICK_START += $time; # do not account sync jobs to server load
506 588
507 wantarray ? @res : $res[0] 589 wantarray ? @res : $res[0]
508 } else { 590 } else {
530 $EXT_CORO{$coro+0} = $coro; 612 $EXT_CORO{$coro+0} = $coro;
531 613
532 $coro 614 $coro
533} 615}
534 616
535=item fork_call { }, $args 617=item fork_call { }, @args
536 618
537Executes the given code block with the given arguments in a seperate 619Executes the given code block with the given arguments in a seperate
538process, returning the results. Everything must be serialisable with 620process, returning the results. Everything must be serialisable with
539Coro::Storable. May, of course, block. Note that the executed sub may 621Coro::Storable. May, of course, block. Note that the executed sub may
540never block itself or use any form of event handling. 622never block itself or use any form of event handling.
541 623
542=cut 624=cut
543 625
626sub post_fork {
627 reset_signals;
628}
629
544sub fork_call(&@) { 630sub fork_call(&@) {
545 my ($cb, @args) = @_; 631 my ($cb, @args) = @_;
546 632
547 # we seemingly have to make a local copy of the whole thing, 633 # we seemingly have to make a local copy of the whole thing,
548 # otherwise perl prematurely frees the stuff :/ 634 # otherwise perl prematurely frees the stuff :/
549 # TODO: investigate and fix (likely this will be rather laborious) 635 # TODO: investigate and fix (likely this will be rather laborious)
550 636
551 my @res = Coro::Util::fork_eval { 637 my @res = Coro::Util::fork_eval {
552 reset_signals; 638 cf::post_fork;
553 &$cb 639 &$cb
554 }, @args; 640 } @args;
555 641
556 wantarray ? @res : $res[-1] 642 wantarray ? @res : $res[-1]
643}
644
645sub objinfo {
646 (
647 "counter value" => cf::object::object_count,
648 "objects created" => cf::object::create_count,
649 "objects destroyed" => cf::object::destroy_count,
650 "freelist size" => cf::object::free_count,
651 "allocated objects" => cf::object::objects_size,
652 "active objects" => cf::object::actives_size,
653 )
557} 654}
558 655
559=item $coin = coin_from_name $name 656=item $coin = coin_from_name $name
560 657
561=cut 658=cut
598within each server. 695within each server.
599 696
600=cut 697=cut
601 698
602sub db_table($) { 699sub db_table($) {
700 cf::error "db_get called from main context"
701 if $Coro::current == $Coro::main;
702
603 my ($name) = @_; 703 my ($name) = @_;
604 my $db = BDB::db_create $DB_ENV; 704 my $db = BDB::db_create $DB_ENV;
605 705
606 eval { 706 eval {
607 $db->set_flags (BDB::CHKSUM); 707 $db->set_flags (BDB::CHKSUM);
617} 717}
618 718
619our $DB; 719our $DB;
620 720
621sub db_init { 721sub db_init {
622 cf::sync_job {
623 $DB ||= db_table "db"; 722 $DB ||= db_table "db";
624 };
625} 723}
626 724
627sub db_get($$) { 725sub db_get($$) {
628 my $key = "$_[0]/$_[1]"; 726 my $key = "$_[0]/$_[1]";
629 727
630 cf::sync_job { 728 cf::error "db_get called from main context"
729 if $Coro::current == $Coro::main;
730
631 BDB::db_get $DB, undef, $key, my $data; 731 BDB::db_get $DB, undef, $key, my $data;
632 732
633 $! ? () 733 $! ? ()
634 : $data 734 : $data
635 }
636} 735}
637 736
638sub db_put($$$) { 737sub db_put($$$) {
639 BDB::dbreq_pri 4; 738 BDB::dbreq_pri 4;
640 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 739 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
696 795
697 my $t1 = Time::HiRes::time; 796 my $t1 = Time::HiRes::time;
698 my $data = $process->(\@data); 797 my $data = $process->(\@data);
699 my $t2 = Time::HiRes::time; 798 my $t2 = Time::HiRes::time;
700 799
701 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 800 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
702 801
703 db_put cache => "$id/data", $data; 802 db_put cache => "$id/data", $data;
704 db_put cache => "$id/md5" , $md5; 803 db_put cache => "$id/md5" , $md5;
705 db_put cache => "$id/meta", $meta; 804 db_put cache => "$id/meta", $meta;
706 805
716 815
717=cut 816=cut
718 817
719sub datalog($@) { 818sub datalog($@) {
720 my ($type, %kv) = @_; 819 my ($type, %kv) = @_;
721 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 820 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
722} 821}
723 822
724=back 823=back
725 824
726=cut 825=cut
727 826
728############################################################################# 827#############################################################################
729 828
730=head2 ATTACHABLE OBJECTS 829=head2 ATTACHABLE OBJECTS
731 830
732Many objects in crossfire are so-called attachable objects. That means you can 831Many objects in deliantra are so-called attachable objects. That means you can
733attach callbacks/event handlers (a collection of which is called an "attachment") 832attach callbacks/event handlers (a collection of which is called an "attachment")
734to it. All such attachable objects support the following methods. 833to it. All such attachable objects support the following methods.
735 834
736In the following description, CLASS can be any of C<global>, C<object> 835In 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 836C<player>, C<client> or C<map> (i.e. the attachable objects in
787=item cf::CLASS::attachment $name, ... 886=item cf::CLASS::attachment $name, ...
788 887
789Register an attachment by C<$name> through which attachable objects of the 888Register an attachment by C<$name> through which attachable objects of the
790given CLASS can refer to this attachment. 889given CLASS can refer to this attachment.
791 890
792Some classes such as crossfire maps and objects can specify attachments 891Some classes such as deliantra maps and objects can specify attachments
793that are attached at load/instantiate time, thus the need for a name. 892that are attached at load/instantiate time, thus the need for a name.
794 893
795These calls expect any number of the following handler/hook descriptions: 894These calls expect any number of the following handler/hook descriptions:
796 895
797=over 4 896=over 4
921 1020
922 } elsif (exists $cb_id{$type}) { 1021 } elsif (exists $cb_id{$type}) {
923 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1022 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
924 1023
925 } elsif (ref $type) { 1024 } elsif (ref $type) {
926 warn "attaching objects not supported, ignoring.\n"; 1025 error "attaching objects not supported, ignoring.\n";
927 1026
928 } else { 1027 } else {
929 shift @arg; 1028 shift @arg;
930 warn "attach argument '$type' not supported, ignoring.\n"; 1029 error "attach argument '$type' not supported, ignoring.\n";
931 } 1030 }
932 } 1031 }
933} 1032}
934 1033
935sub _object_attach { 1034sub _object_attach {
945 _attach $registry, $klass, @attach; 1044 _attach $registry, $klass, @attach;
946 } 1045 }
947 1046
948 $obj->{$name} = \%arg; 1047 $obj->{$name} = \%arg;
949 } else { 1048 } else {
950 warn "object uses attachment '$name' which is not available, postponing.\n"; 1049 info "object uses attachment '$name' which is not available, postponing.\n";
951 } 1050 }
952 1051
953 $obj->{_attachment}{$name} = undef; 1052 $obj->{_attachment}{$name} = undef;
954} 1053}
955 1054
1014 1113
1015 for (@$callbacks) { 1114 for (@$callbacks) {
1016 eval { &{$_->[1]} }; 1115 eval { &{$_->[1]} };
1017 1116
1018 if ($@) { 1117 if ($@) {
1019 warn "$@";
1020 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1118 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1021 override; 1119 override;
1022 } 1120 }
1023 1121
1024 return 1 if $override; 1122 return 1 if $override;
1025 } 1123 }
1104 for (@$attach) { 1202 for (@$attach) {
1105 my ($klass, @attach) = @$_; 1203 my ($klass, @attach) = @$_;
1106 _attach $registry, $klass, @attach; 1204 _attach $registry, $klass, @attach;
1107 } 1205 }
1108 } else { 1206 } else {
1109 warn "object uses attachment '$name' that is not available, postponing.\n"; 1207 info "object uses attachment '$name' that is not available, postponing.\n";
1110 } 1208 }
1111 } 1209 }
1112} 1210}
1113 1211
1114cf::attachable->attach ( 1212cf::attachable->attach (
1141 my ($filename, $rdata, $objs) = @_; 1239 my ($filename, $rdata, $objs) = @_;
1142 1240
1143 sync_job { 1241 sync_job {
1144 if (length $$rdata) { 1242 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename); 1243 utf8::decode (my $decname = $filename);
1146 warn sprintf "saving %s (%d,%d)\n", 1244 trace sprintf "saving %s (%d,%d)\n",
1147 $decname, length $$rdata, scalar @$objs; 1245 $decname, length $$rdata, scalar @$objs
1246 if $VERBOSE_IO;
1148 1247
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1248 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1249 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1250 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 aio_fsync $fh if $cf::USE_FSYNC; 1251 if ($cf::USE_FSYNC) {
1252 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;
1253 aio_fsync $fh;
1254 }
1153 aio_close $fh; 1255 aio_close $fh;
1154 1256
1155 if (@$objs) { 1257 if (@$objs) {
1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1258 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1259 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1260 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1261 aio_write $fh, 0, (length $data), $data, 0;
1160 aio_fsync $fh if $cf::USE_FSYNC; 1262 if ($cf::USE_FSYNC) {
1263 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;
1264 aio_fsync $fh;
1265 }
1161 aio_close $fh; 1266 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1267 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1268 }
1164 } else { 1269 } else {
1165 aio_unlink "$filename.pst"; 1270 aio_unlink "$filename.pst";
1166 } 1271 }
1167 1272
1168 aio_rename "$filename~", $filename; 1273 aio_rename "$filename~", $filename;
1274
1275 $filename =~ s%/[^/]+$%%;
1276 aio_pathsync $filename if $cf::USE_FSYNC;
1169 } else { 1277 } else {
1170 warn "FATAL: $filename~: $!\n"; 1278 error "unable to save objects: $filename~: $!\n";
1171 } 1279 }
1172 } else { 1280 } else {
1173 aio_unlink $filename; 1281 aio_unlink $filename;
1174 aio_unlink "$filename.pst"; 1282 aio_unlink "$filename.pst";
1175 } 1283 }
1199 my $st = eval { Coro::Storable::thaw $av }; 1307 my $st = eval { Coro::Storable::thaw $av };
1200 $av = $st->{objs}; 1308 $av = $st->{objs};
1201 } 1309 }
1202 1310
1203 utf8::decode (my $decname = $filename); 1311 utf8::decode (my $decname = $filename);
1204 warn sprintf "loading %s (%d,%d)\n", 1312 trace sprintf "loading %s (%d,%d)\n",
1205 $decname, length $data, scalar @{$av || []}; 1313 $decname, length $data, scalar @{$av || []}
1314 if $VERBOSE_IO;
1206 1315
1207 ($data, $av) 1316 ($data, $av)
1208} 1317}
1209 1318
1210=head2 COMMAND CALLBACKS 1319=head2 COMMAND CALLBACKS
1266 my ($name, $cb) = @_; 1375 my ($name, $cb) = @_;
1267 1376
1268 $EXTICMD{$name} = $cb; 1377 $EXTICMD{$name} = $cb;
1269} 1378}
1270 1379
1380use File::Glob ();
1381
1271cf::player->attach ( 1382cf::player->attach (
1272 on_command => sub { 1383 on_unknown_command => sub {
1273 my ($pl, $name, $params) = @_; 1384 my ($pl, $name, $params) = @_;
1274 1385
1275 my $cb = $COMMAND{$name} 1386 my $cb = $COMMAND{$name}
1276 or return; 1387 or return;
1277 1388
1300 1411
1301 $pl->ext_reply ($reply, @reply) 1412 $pl->ext_reply ($reply, @reply)
1302 if $reply; 1413 if $reply;
1303 1414
1304 } else { 1415 } else {
1305 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1416 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1306 } 1417 }
1307 1418
1308 cf::override; 1419 cf::override;
1309 }, 1420 },
1310); 1421);
1311 1422
1423# "readahead" all extensions
1424sub cache_extensions {
1425 my $grp = IO::AIO::aio_group;
1426
1427 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1428 for (grep /\.ext$/, @{$_[0]}) {
1429 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1430 }
1431 };
1432
1433 $grp
1434}
1435
1312sub load_extensions { 1436sub load_extensions {
1437 info "loading extensions...";
1438
1313 cf::sync_job { 1439 cf::sync_job {
1314 my %todo; 1440 my %todo;
1315 1441
1316 for my $path (<$LIBDIR/*.ext>) { 1442 for my $path (<$LIBDIR/*.ext>) {
1317 next unless -r $path; 1443 next unless -r $path;
1335 1461
1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1462 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1463 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1338 1464
1339 $ext{source} = 1465 $ext{source} =
1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1466 "package $pkg; use common::sense;\n"
1341 . "#line 1 \"$path\"\n{\n" 1467 . "#line 1 \"$path\"\n{\n"
1342 . $source 1468 . $source
1343 . "\n};\n1"; 1469 . "\n};\n1";
1344 1470
1345 $todo{$base} = \%ext; 1471 $todo{$base} = \%ext;
1346 } 1472 }
1347 1473
1474 my $pass = 0;
1348 my %done; 1475 my %done;
1349 while (%todo) { 1476 while (%todo) {
1350 my $progress; 1477 my $progress;
1351 1478
1479 ++$pass;
1480
1481 ext:
1352 while (my ($k, $v) = each %todo) { 1482 while (my ($k, $v) = each %todo) {
1353 for (split /,\s*/, $v->{meta}{depends}) { 1483 for (split /,\s*/, $v->{meta}{depends}) {
1354 goto skip 1484 next ext
1355 unless exists $done{$_}; 1485 unless exists $done{$_};
1356 } 1486 }
1357 1487
1358 warn "... loading '$k' into '$v->{pkg}'\n"; 1488 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1359 1489
1360 unless (eval $v->{source}) { 1490 my $active = eval $v->{source};
1491
1492 if (length $@) {
1361 my $msg = $@ ? "$v->{path}: $@\n" 1493 error "$v->{path}: $@\n";
1362 : "$v->{base}: extension inactive.\n";
1363 1494
1364 if (exists $v->{meta}{mandatory}) {
1365 warn $msg;
1366 cf::cleanup "mandatory extension failed to load, exiting."; 1495 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1367 } 1496 if exists $v->{meta}{mandatory};
1368 1497
1369 warn $msg; 1498 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1499 delete $todo{$k};
1500 } else {
1501 $done{$k} = delete $todo{$k};
1502 push @EXTS, $v->{pkg};
1503 $progress = 1;
1504
1505 info "$v->{base}: extension inactive.\n"
1506 unless $active;
1370 } 1507 }
1371
1372 $done{$k} = delete $todo{$k};
1373 push @EXTS, $v->{pkg};
1374 $progress = 1;
1375 } 1508 }
1376 1509
1377 skip: 1510 unless ($progress) {
1378 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1511 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1379 unless $progress; 1512
1513 while (my ($k, $v) = each %todo) {
1514 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1515 if exists $v->{meta}{mandatory};
1516 }
1517 }
1380 } 1518 }
1381 }; 1519 };
1382} 1520}
1383 1521
1384############################################################################# 1522#############################################################################
1385 1523
1386=back 1524=back
1387 1525
1388=head2 CORE EXTENSIONS 1526=head2 CORE EXTENSIONS
1389 1527
1390Functions and methods that extend core crossfire objects. 1528Functions and methods that extend core deliantra objects.
1391 1529
1392=cut 1530=cut
1393 1531
1394package cf::player; 1532package cf::player;
1395 1533
1438 1576
1439sub exists($) { 1577sub exists($) {
1440 my ($login) = @_; 1578 my ($login) = @_;
1441 1579
1442 $cf::PLAYER{$login} 1580 $cf::PLAYER{$login}
1443 or cf::sync_job { !aio_stat path $login } 1581 or !aio_stat path $login
1444} 1582}
1445 1583
1446sub find($) { 1584sub find($) {
1447 return $cf::PLAYER{$_[0]} || do { 1585 return $cf::PLAYER{$_[0]} || do {
1448 my $login = $_[0]; 1586 my $login = $_[0];
1468 $cf::PLAYER{$login} = $pl 1606 $cf::PLAYER{$login} = $pl
1469 } 1607 }
1470 } 1608 }
1471} 1609}
1472 1610
1611cf::player->attach (
1612 on_load => sub {
1613 my ($pl, $path) = @_;
1614
1615 # restore slots saved in save, below
1616 my $slots = delete $pl->{_slots};
1617
1618 $pl->ob->current_weapon ($slots->[0]);
1619 $pl->combat_ob ($slots->[1]);
1620 $pl->ranged_ob ($slots->[2]);
1621 },
1622);
1623
1473sub save($) { 1624sub save($) {
1474 my ($pl) = @_; 1625 my ($pl) = @_;
1475 1626
1476 return if $pl->{deny_save}; 1627 return if $pl->{deny_save};
1477 1628
1482 1633
1483 aio_mkdir playerdir $pl, 0770; 1634 aio_mkdir playerdir $pl, 0770;
1484 $pl->{last_save} = $cf::RUNTIME; 1635 $pl->{last_save} = $cf::RUNTIME;
1485 1636
1486 cf::get_slot 0.01; 1637 cf::get_slot 0.01;
1638
1639 # save slots, to be restored later
1640 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1487 1641
1488 $pl->save_pl ($path); 1642 $pl->save_pl ($path);
1489 cf::cede_to_tick; 1643 cf::cede_to_tick;
1490} 1644}
1491 1645
1525 my $name = $pl->ob->name; 1679 my $name = $pl->ob->name;
1526 1680
1527 $pl->{deny_save} = 1; 1681 $pl->{deny_save} = 1;
1528 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1682 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1529 1683
1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1684 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1531 $pl->deactivate; 1685 $pl->deactivate;
1686
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1687 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1534 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1688 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1689 ext::highscore::check ($pl->ob);
1690
1535 $pl->ns->destroy if $pl->ns; 1691 $pl->ns->destroy if $pl->ns;
1536 1692
1537 my $path = playerdir $pl; 1693 my $path = playerdir $pl;
1538 my $temp = "$path~$cf::RUNTIME~deleting~"; 1694 my $temp = "$path~$cf::RUNTIME~deleting~";
1539 aio_rename $path, $temp; 1695 aio_rename $path, $temp;
1593 \@logins 1749 \@logins
1594} 1750}
1595 1751
1596=item $player->maps 1752=item $player->maps
1597 1753
1754=item cf::player::maps $login
1755
1598Returns an arrayref of map paths that are private for this 1756Returns an arrayref of map paths that are private for this
1599player. May block. 1757player. May block.
1600 1758
1601=cut 1759=cut
1602 1760
1619 } 1777 }
1620 1778
1621 \@paths 1779 \@paths
1622} 1780}
1623 1781
1624=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1782=item $protocol_xml = $player->expand_cfpod ($cfpod)
1625 1783
1626Expand crossfire pod fragments into protocol xml. 1784Expand 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 1785
1719=item $player->ext_reply ($msgid, @msg) 1786=item $player->ext_reply ($msgid, @msg)
1720 1787
1721Sends an ext reply to the player. 1788Sends an ext reply to the player.
1722 1789
1754 1821
1755=cut 1822=cut
1756 1823
1757sub find_by_path($) { 1824sub find_by_path($) {
1758 my ($path) = @_; 1825 my ($path) = @_;
1826
1827 $path =~ s/^~[^\/]*//; # skip ~login
1759 1828
1760 my ($match, $specificity); 1829 my ($match, $specificity);
1761 1830
1762 for my $region (list) { 1831 for my $region (list) {
1763 if ($region->{match} && $path =~ $region->{match}) { 1832 if ($region->{match} && $path =~ $region->{match}) {
1794 1863
1795 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1864 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1796 1865
1797 # mit "rum" bekleckern, nicht 1866 # mit "rum" bekleckern, nicht
1798 $self->_create_random_map ( 1867 $self->_create_random_map (
1799 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1868 $rmp,
1869 $rmp->{wall_name}, $rmp->{monsterstyle},
1800 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1870 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1801 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1871 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{this_map},
1802 $rmp->{exit_on_final_map}, 1872 $rmp->{exit_on_final_map},
1803 $rmp->{xsize}, $rmp->{ysize}, 1873 $rmp->{xsize}, $rmp->{ysize},
1804 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1874 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1805 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1875 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1806 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1876 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1807 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1877 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1808 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1878 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1809 (cf::region::find $rmp->{region}), $rmp->{custom} 1879 (cf::region::find $rmp->{region})
1810 ) 1880 )
1811} 1881}
1812 1882
1813=item cf::map->register ($regex, $prio) 1883=item cf::map->register ($regex, $prio)
1814 1884
1820 1890
1821sub register { 1891sub register {
1822 my (undef, $regex, $prio) = @_; 1892 my (undef, $regex, $prio) = @_;
1823 my $pkg = caller; 1893 my $pkg = caller;
1824 1894
1825 no strict;
1826 push @{"$pkg\::ISA"}, __PACKAGE__; 1895 push @{"$pkg\::ISA"}, __PACKAGE__;
1827 1896
1828 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1897 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1829} 1898}
1830 1899
1831# also paths starting with '/' 1900# also paths starting with '/'
1832$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1901$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1833 1902
1834sub thawer_merge { 1903sub thawer_merge {
1835 my ($self, $merge) = @_; 1904 my ($self, $merge) = @_;
1836 1905
1837 # we have to keep some variables in memory intact 1906 # we have to keep some variables in memory intact
1842} 1911}
1843 1912
1844sub normalise { 1913sub normalise {
1845 my ($path, $base) = @_; 1914 my ($path, $base) = @_;
1846 1915
1847 $path = "$path"; # make sure its a string 1916 $path = "$path"; # make sure it's a string
1848 1917
1849 $path =~ s/\.map$//; 1918 $path =~ s/\.map$//;
1850 1919
1851 # map plan: 1920 # map plan:
1852 # 1921 #
1867 $base =~ s{[^/]+/?$}{}; 1936 $base =~ s{[^/]+/?$}{};
1868 $path = "$base/$path"; 1937 $path = "$base/$path";
1869 } 1938 }
1870 1939
1871 for ($path) { 1940 for ($path) {
1872 redo if s{//}{/};
1873 redo if s{/\.?/}{/}; 1941 redo if s{/\.?/}{/};
1874 redo if s{/[^/]+/\.\./}{/}; 1942 redo if s{/[^/]+/\.\./}{/};
1875 } 1943 }
1876 1944
1877 $path 1945 $path
1891 $self->init; # pass $1 etc. 1959 $self->init; # pass $1 etc.
1892 return $self; 1960 return $self;
1893 } 1961 }
1894 } 1962 }
1895 1963
1896 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1964 Carp::cluck "unable to resolve path '$path' (base '$base')";
1897 () 1965 ()
1898} 1966}
1899 1967
1900sub init { 1968sub init {
1901 my ($self) = @_; 1969 my ($self) = @_;
1933sub uniq_path { 2001sub uniq_path {
1934 my ($self) = @_; 2002 my ($self) = @_;
1935 2003
1936 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2004 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1937 "$UNIQUEDIR/$path" 2005 "$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} 2006}
1948 2007
1949sub decay_objects { 2008sub decay_objects {
1950 my ($self) = @_; 2009 my ($self) = @_;
1951 2010
2033 2092
2034sub find; 2093sub find;
2035sub find { 2094sub find {
2036 my ($path, $origin) = @_; 2095 my ($path, $origin) = @_;
2037 2096
2097 cf::cede_to_tick;
2098
2038 $path = normalise $path, $origin && $origin->path; 2099 $path = normalise $path, $origin && $origin->path;
2039 2100
2040 cf::lock_wait "map_data:$path";#d#remove 2101 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2041 cf::lock_wait "map_find:$path"; 2102 my $guard2 = cf::lock_acquire "map_find:$path";
2042 2103
2043 $cf::MAP{$path} || do { 2104 $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 2105 my $map = new_from_path cf::map $path
2048 or return; 2106 or return;
2049 2107
2050 $map->{last_save} = $cf::RUNTIME; 2108 $map->{last_save} = $cf::RUNTIME;
2051 2109
2063 2121
2064 $cf::MAP{$path} = $map 2122 $cf::MAP{$path} = $map
2065 } 2123 }
2066} 2124}
2067 2125
2068sub pre_load { } 2126sub pre_load { }
2069sub post_load { } 2127#sub post_load { } # XS
2070 2128
2071sub load { 2129sub load {
2072 my ($self) = @_; 2130 my ($self) = @_;
2073 2131
2074 local $self->{deny_reset} = 1; # loading can take a long time 2132 local $self->{deny_reset} = 1; # loading can take a long time
2119 unless ($self->{deny_activate}) { 2177 unless ($self->{deny_activate}) {
2120 $self->decay_objects; 2178 $self->decay_objects;
2121 $self->fix_auto_apply; 2179 $self->fix_auto_apply;
2122 $self->update_buttons; 2180 $self->update_buttons;
2123 cf::cede_to_tick; 2181 cf::cede_to_tick;
2124 $self->set_darkness_map;
2125 cf::cede_to_tick;
2126 $self->activate; 2182 $self->activate;
2127 } 2183 }
2128 2184
2129 $self->{last_save} = $cf::RUNTIME; 2185 $self->{last_save} = $cf::RUNTIME;
2130 $self->last_access ($cf::RUNTIME); 2186 $self->last_access ($cf::RUNTIME);
2131 2187
2132 $self->in_memory (cf::MAP_ACTIVE); 2188 $self->in_memory (cf::MAP_ACTIVE);
2133 } 2189 }
2134 2190
2135 $self->post_load; 2191 $self->post_load;
2136}
2137 2192
2193 1
2194}
2195
2196# customize the map for a given player, i.e.
2197# return the _real_ map. used by e.g. per-player
2198# maps to change the path to ~playername/mappath
2138sub customise_for { 2199sub customise_for {
2139 my ($self, $ob) = @_; 2200 my ($self, $ob) = @_;
2140 2201
2141 return find "~" . $ob->name . "/" . $self->{path} 2202 return find "~" . $ob->name . "/" . $self->{path}
2142 if $self->per_player; 2203 if $self->per_player;
2158 or next; 2219 or next;
2159 $neigh = find $neigh, $map 2220 $neigh = find $neigh, $map
2160 or next; 2221 or next;
2161 $neigh->load; 2222 $neigh->load;
2162 2223
2224 # now find the diagonal neighbours
2163 push @neigh, 2225 push @neigh,
2164 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2226 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2165 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2227 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2166 } 2228 }
2167 2229
2174} 2236}
2175 2237
2176sub find_sync { 2238sub find_sync {
2177 my ($path, $origin) = @_; 2239 my ($path, $origin) = @_;
2178 2240
2179 cf::sync_job { find $path, $origin } 2241 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2242 if $Coro::current == $Coro::main;
2243
2244 find $path, $origin
2180} 2245}
2181 2246
2182sub do_load_sync { 2247sub do_load_sync {
2183 my ($map) = @_; 2248 my ($map) = @_;
2184 2249
2185 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2250 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2186 if $Coro::current == $Coro::main; 2251 if $Coro::current == $Coro::main;
2187 2252
2188 cf::sync_job { $map->load }; 2253 $map->load;
2189} 2254}
2190 2255
2191our %MAP_PREFETCH; 2256our %MAP_PREFETCH;
2192our $MAP_PREFETCHER = undef; 2257our $MAP_PREFETCHER = undef;
2193 2258
2219 $MAP_PREFETCHER->prio (6); 2284 $MAP_PREFETCHER->prio (6);
2220 2285
2221 () 2286 ()
2222} 2287}
2223 2288
2289# common code, used by both ->save and ->swapout
2224sub save { 2290sub _save {
2225 my ($self) = @_; 2291 my ($self) = @_;
2226
2227 my $lock = cf::lock_acquire "map_data:$self->{path}";
2228 2292
2229 $self->{last_save} = $cf::RUNTIME; 2293 $self->{last_save} = $cf::RUNTIME;
2230 2294
2231 return unless $self->dirty; 2295 return unless $self->dirty;
2232 2296
2252 } else { 2316 } else {
2253 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2317 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2254 } 2318 }
2255} 2319}
2256 2320
2321sub save {
2322 my ($self) = @_;
2323
2324 my $lock = cf::lock_acquire "map_data:$self->{path}";
2325
2326 $self->_save;
2327}
2328
2257sub swap_out { 2329sub swap_out {
2258 my ($self) = @_; 2330 my ($self) = @_;
2259 2331
2260 # save first because save cedes
2261 $self->save;
2262
2263 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2332 my $lock = cf::lock_acquire "map_data:$self->{path}";
2264 2333
2265 return if $self->players;
2266 return if $self->in_memory != cf::MAP_ACTIVE; 2334 return if $self->in_memory != cf::MAP_ACTIVE;
2267 return if $self->{deny_save}; 2335 return if $self->{deny_save};
2336 return if $self->players;
2268 2337
2338 # first deactivate the map and "unlink" it from the core
2339 $self->deactivate;
2340 $_->clear_links_to ($self) for values %cf::MAP;
2269 $self->in_memory (cf::MAP_SWAPPED); 2341 $self->in_memory (cf::MAP_SWAPPED);
2342
2343 # then atomically save
2344 $self->_save;
2345
2346 # then free the map
2347 $self->clear;
2348}
2349
2350sub reset_at {
2351 my ($self) = @_;
2352
2353 # TODO: safety, remove and allow resettable per-player maps
2354 return 1e99 if $self->{deny_reset};
2355
2356 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2357 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2358
2359 $time + $to
2360}
2361
2362sub should_reset {
2363 my ($self) = @_;
2364
2365 $self->reset_at <= $cf::RUNTIME
2366}
2367
2368sub reset {
2369 my ($self) = @_;
2370
2371 my $lock = cf::lock_acquire "map_data:$self->{path}";
2372
2373 return if $self->players;
2374
2375 cf::trace "resetting map ", $self->path, "\n";
2376
2377 $self->in_memory (cf::MAP_SWAPPED);
2378
2379 # need to save uniques path
2380 unless ($self->{deny_save}) {
2381 my $uniq = $self->uniq_path; utf8::encode $uniq;
2382
2383 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2384 if $uniq;
2385 }
2386
2387 delete $cf::MAP{$self->path};
2270 2388
2271 $self->deactivate; 2389 $self->deactivate;
2272 $_->clear_links_to ($self) for values %cf::MAP; 2390 $_->clear_links_to ($self) for values %cf::MAP;
2273 $self->clear; 2391 $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 2392
2319 $self->unlink_save; 2393 $self->unlink_save;
2320 $self->destroy; 2394 $self->destroy;
2321} 2395}
2322 2396
2330 2404
2331 delete $cf::MAP{$self->path}; 2405 delete $cf::MAP{$self->path};
2332 2406
2333 $self->unlink_save; 2407 $self->unlink_save;
2334 2408
2335 bless $self, "cf::map"; 2409 bless $self, "cf::map::wrap";
2336 delete $self->{deny_reset}; 2410 delete $self->{deny_reset};
2337 $self->{deny_save} = 1; 2411 $self->{deny_save} = 1;
2338 $self->reset_timeout (1); 2412 $self->reset_timeout (1);
2339 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2413 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2340 2414
2397 : normalise $_ 2471 : normalise $_
2398 } @{ aio_readdir $UNIQUEDIR or [] } 2472 } @{ aio_readdir $UNIQUEDIR or [] }
2399 ] 2473 ]
2400} 2474}
2401 2475
2476=item cf::map::static_maps
2477
2478Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2479file in the shared directory excluding F</styles> and F</editor>). May
2480block.
2481
2482=cut
2483
2484sub static_maps() {
2485 my @dirs = "";
2486 my @maps;
2487
2488 while (@dirs) {
2489 my $dir = shift @dirs;
2490
2491 next if $dir eq "/styles" || $dir eq "/editor";
2492
2493 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2494 or return;
2495
2496 for (@$files) {
2497 s/\.map$// or next;
2498 utf8::decode $_;
2499 push @maps, "$dir/$_";
2500 }
2501
2502 push @dirs, map "$dir/$_", @$dirs;
2503 }
2504
2505 \@maps
2506}
2507
2402=back 2508=back
2403 2509
2404=head3 cf::object 2510=head3 cf::object
2405 2511
2406=cut 2512=cut
2471 2577
2472our $SAY_CHANNEL = { 2578our $SAY_CHANNEL = {
2473 id => "say", 2579 id => "say",
2474 title => "Map", 2580 title => "Map",
2475 reply => "say ", 2581 reply => "say ",
2476 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2582 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2477}; 2583};
2478 2584
2479our $CHAT_CHANNEL = { 2585our $CHAT_CHANNEL = {
2480 id => "chat", 2586 id => "chat",
2481 title => "Chat", 2587 title => "Chat",
2536 2642
2537=item $player_object->enter_link 2643=item $player_object->enter_link
2538 2644
2539Freezes the player and moves him/her to a special map (C<{link}>). 2645Freezes the player and moves him/her to a special map (C<{link}>).
2540 2646
2541The player should be reasonably safe there for short amounts of time. You 2647The player should be reasonably safe there for short amounts of time (e.g.
2542I<MUST> call C<leave_link> as soon as possible, though. 2648for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2649though, as the player cannot control the character while it is on the link
2650map.
2543 2651
2544Will never block. 2652Will never block.
2545 2653
2546=item $player_object->leave_link ($map, $x, $y) 2654=item $player_object->leave_link ($map, $x, $y)
2547 2655
2567sub cf::object::player::enter_link { 2675sub cf::object::player::enter_link {
2568 my ($self) = @_; 2676 my ($self) = @_;
2569 2677
2570 $self->deactivate_recursive; 2678 $self->deactivate_recursive;
2571 2679
2680 ++$self->{_link_recursion};
2681
2572 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2682 return if UNIVERSAL::isa $self->map, "ext::map_link";
2573 2683
2574 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2684 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2575 if $self->map && $self->map->{path} ne "{link}"; 2685 if $self->map && $self->map->{path} ne "{link}";
2576 2686
2577 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2687 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2578} 2688}
2579 2689
2580sub cf::object::player::leave_link { 2690sub cf::object::player::leave_link {
2581 my ($self, $map, $x, $y) = @_; 2691 my ($self, $map, $x, $y) = @_;
2582 2692
2599 ($x, $y) = (-1, -1) 2709 ($x, $y) = (-1, -1)
2600 unless (defined $x) && (defined $y); 2710 unless (defined $x) && (defined $y);
2601 2711
2602 # use -1 or undef as default coordinates, not 0, 0 2712 # use -1 or undef as default coordinates, not 0, 0
2603 ($x, $y) = ($map->enter_x, $map->enter_y) 2713 ($x, $y) = ($map->enter_x, $map->enter_y)
2604 if $x <=0 && $y <= 0; 2714 if $x <= 0 && $y <= 0;
2605 2715
2606 $map->load; 2716 $map->load;
2607 $map->load_neighbours; 2717 $map->load_neighbours;
2608 2718
2609 return unless $self->contr->active; 2719 return unless $self->contr->active;
2610 $self->activate_recursive;
2611 2720
2612 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2721 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2613 $self->enter_map ($map, $x, $y); 2722 if ($self->enter_map ($map, $x, $y)) {
2614} 2723 # entering was successful
2724 delete $self->{_link_recursion};
2725 # only activate afterwards, to support waiting in hooks
2726 $self->activate_recursive;
2727 }
2615 2728
2729}
2730
2616=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2731=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2617 2732
2618Moves the player to the given map-path and coordinates by first freezing 2733Moves the player to the given map-path and coordinates by first freezing
2619her, loading and preparing them map, calling the provided $check callback 2734her, loading and preparing them map, calling the provided $check callback
2620that has to return the map if sucecssful, and then unfreezes the player on 2735that 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 2736the new (success) or old (failed) map position. In either case, $done will
2628 2743
2629our $GOTOGEN; 2744our $GOTOGEN;
2630 2745
2631sub cf::object::player::goto { 2746sub cf::object::player::goto {
2632 my ($self, $path, $x, $y, $check, $done) = @_; 2747 my ($self, $path, $x, $y, $check, $done) = @_;
2748
2749 if ($self->{_link_recursion} >= $MAX_LINKS) {
2750 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2751 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2752 ($path, $x, $y) = @$EMERGENCY_POSITION;
2753 }
2633 2754
2634 # do generation counting so two concurrent goto's will be executed in-order 2755 # do generation counting so two concurrent goto's will be executed in-order
2635 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2756 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2636 2757
2637 $self->enter_link; 2758 $self->enter_link;
2661 my $map = eval { 2782 my $map = eval {
2662 my $map = defined $path ? cf::map::find $path : undef; 2783 my $map = defined $path ? cf::map::find $path : undef;
2663 2784
2664 if ($map) { 2785 if ($map) {
2665 $map = $map->customise_for ($self); 2786 $map = $map->customise_for ($self);
2666 $map = $check->($map) if $check && $map; 2787 $map = $check->($map, $x, $y, $self) if $check && $map;
2667 } else { 2788 } else {
2668 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2789 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2669 } 2790 }
2670 2791
2671 $map 2792 $map
2679 if ($gen == $self->{_goto_generation}) { 2800 if ($gen == $self->{_goto_generation}) {
2680 delete $self->{_goto_generation}; 2801 delete $self->{_goto_generation};
2681 $self->leave_link ($map, $x, $y); 2802 $self->leave_link ($map, $x, $y);
2682 } 2803 }
2683 2804
2684 $done->() if $done; 2805 $done->($self) if $done;
2685 })->prio (1); 2806 })->prio (1);
2686} 2807}
2687 2808
2688=item $player_object->enter_exit ($exit_object) 2809=item $player_object->enter_exit ($exit_object)
2689 2810
2777 $self->contr->savebed ($map, $x, $y) 2898 $self->contr->savebed ($map, $x, $y)
2778 if $exit->flag (cf::FLAG_DAMNED); 2899 if $exit->flag (cf::FLAG_DAMNED);
2779 2900
2780 1 2901 1
2781 }) { 2902 }) {
2782 $self->message ("Something went wrong deep within the crossfire server. " 2903 $self->message ("Something went wrong deep within the deliantra server. "
2783 . "I'll try to bring you back to the map you were before. " 2904 . "I'll try to bring you back to the map you were before. "
2784 . "Please report this to the dungeon master!", 2905 . "Please report this to the dungeon master!",
2785 cf::NDI_UNIQUE | cf::NDI_RED); 2906 cf::NDI_UNIQUE | cf::NDI_RED);
2786 2907
2787 warn "ERROR in enter_exit: $@"; 2908 error "ERROR in enter_exit: $@";
2788 $self->leave_link; 2909 $self->leave_link;
2789 } 2910 }
2790 })->prio (1); 2911 })->prio (1);
2791} 2912}
2792 2913
2804sub cf::client::send_drawinfo { 2925sub cf::client::send_drawinfo {
2805 my ($self, $text, $flags) = @_; 2926 my ($self, $text, $flags) = @_;
2806 2927
2807 utf8::encode $text; 2928 utf8::encode $text;
2808 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2929 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2930}
2931
2932=item $client->send_big_packet ($pkt)
2933
2934Like C<send_packet>, but tries to compress large packets, and fragments
2935them as required.
2936
2937=cut
2938
2939our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2940
2941sub cf::client::send_big_packet {
2942 my ($self, $pkt) = @_;
2943
2944 # try lzf for large packets
2945 $pkt = "lzf " . Compress::LZF::compress $pkt
2946 if 1024 <= length $pkt and $self->{can_lzf};
2947
2948 # split very large packets
2949 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2950 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2951 $pkt = "frag";
2952 }
2953
2954 $self->send_packet ($pkt);
2809} 2955}
2810 2956
2811=item $client->send_msg ($channel, $msg, $color, [extra...]) 2957=item $client->send_msg ($channel, $msg, $color, [extra...])
2812 2958
2813Send a drawinfo or msg packet to the client, formatting the msg for the 2959Send a drawinfo or msg packet to the client, formatting the msg for the
2817 2963
2818=cut 2964=cut
2819 2965
2820# non-persistent channels (usually the info channel) 2966# non-persistent channels (usually the info channel)
2821our %CHANNEL = ( 2967our %CHANNEL = (
2968 "c/motd" => {
2969 id => "infobox",
2970 title => "MOTD",
2971 reply => undef,
2972 tooltip => "The message of the day",
2973 },
2822 "c/identify" => { 2974 "c/identify" => {
2823 id => "infobox", 2975 id => "infobox",
2824 title => "Identify", 2976 title => "Identify",
2825 reply => undef, 2977 reply => undef,
2826 tooltip => "Items recently identified", 2978 tooltip => "Items recently identified",
2828 "c/examine" => { 2980 "c/examine" => {
2829 id => "infobox", 2981 id => "infobox",
2830 title => "Examine", 2982 title => "Examine",
2831 reply => undef, 2983 reply => undef,
2832 tooltip => "Signs and other items you examined", 2984 tooltip => "Signs and other items you examined",
2985 },
2986 "c/shopinfo" => {
2987 id => "infobox",
2988 title => "Shop Info",
2989 reply => undef,
2990 tooltip => "What your bargaining skill tells you about the shop",
2833 }, 2991 },
2834 "c/book" => { 2992 "c/book" => {
2835 id => "infobox", 2993 id => "infobox",
2836 title => "Book", 2994 title => "Book",
2837 reply => undef, 2995 reply => undef,
2853 id => "infobox", 3011 id => "infobox",
2854 title => "Body Parts", 3012 title => "Body Parts",
2855 reply => undef, 3013 reply => undef,
2856 tooltip => "Shows which body parts you posess and are available", 3014 tooltip => "Shows which body parts you posess and are available",
2857 }, 3015 },
3016 "c/statistics" => {
3017 id => "infobox",
3018 title => "Statistics",
3019 reply => undef,
3020 tooltip => "Shows your primary statistics",
3021 },
3022 "c/skills" => {
3023 id => "infobox",
3024 title => "Skills",
3025 reply => undef,
3026 tooltip => "Shows your experience per skill and item power",
3027 },
3028 "c/shopitems" => {
3029 id => "infobox",
3030 title => "Shop Items",
3031 reply => undef,
3032 tooltip => "Shows the items currently for sale in this shop",
3033 },
3034 "c/resistances" => {
3035 id => "infobox",
3036 title => "Resistances",
3037 reply => undef,
3038 tooltip => "Shows your resistances",
3039 },
3040 "c/pets" => {
3041 id => "infobox",
3042 title => "Pets",
3043 reply => undef,
3044 tooltip => "Shows information abotu your pets/a specific pet",
3045 },
3046 "c/perceiveself" => {
3047 id => "infobox",
3048 title => "Perceive Self",
3049 reply => undef,
3050 tooltip => "You gained detailed knowledge about yourself",
3051 },
2858 "c/uptime" => { 3052 "c/uptime" => {
2859 id => "infobox", 3053 id => "infobox",
2860 title => "Uptime", 3054 title => "Uptime",
2861 reply => undef, 3055 reply => undef,
2862 tooltip => "How long the server has been running since last restart", 3056 tooltip => "How long the server has been running since last restart",
2871 id => "party", 3065 id => "party",
2872 title => "Party", 3066 title => "Party",
2873 reply => "gsay ", 3067 reply => "gsay ",
2874 tooltip => "Messages and chat related to your party", 3068 tooltip => "Messages and chat related to your party",
2875 }, 3069 },
3070 "c/death" => {
3071 id => "death",
3072 title => "Death",
3073 reply => undef,
3074 tooltip => "Reason for and more info about your most recent death",
3075 },
3076 "c/say" => $SAY_CHANNEL,
3077 "c/chat" => $CHAT_CHANNEL,
2876); 3078);
2877 3079
2878sub cf::client::send_msg { 3080sub cf::client::send_msg {
2879 my ($self, $channel, $msg, $color, @extra) = @_; 3081 my ($self, $channel, $msg, $color, @extra) = @_;
2880 3082
2881 $msg = $self->pl->expand_cfpod ($msg); 3083 $msg = $self->pl->expand_cfpod ($msg)
3084 unless $color & cf::NDI_VERBATIM;
2882 3085
2883 $color &= cf::NDI_CLIENT_MASK; # just in case... 3086 $color &= cf::NDI_CLIENT_MASK; # just in case...
2884 3087
2885 # check predefined channels, for the benefit of C 3088 # check predefined channels, for the benefit of C
2886 if ($CHANNEL{$channel}) { 3089 if ($CHANNEL{$channel}) {
2887 $channel = $CHANNEL{$channel}; 3090 $channel = $CHANNEL{$channel};
2888 3091
2889 $self->ext_msg (channel_info => $channel) 3092 $self->ext_msg (channel_info => $channel);
2890 if $self->can_msg;
2891
2892 $channel = $channel->{id}; 3093 $channel = $channel->{id};
2893 3094
2894 } elsif (ref $channel) { 3095 } elsif (ref $channel) {
2895 # send meta info to client, if not yet sent 3096 # send meta info to client, if not yet sent
2896 unless (exists $self->{channel}{$channel->{id}}) { 3097 unless (exists $self->{channel}{$channel->{id}}) {
2897 $self->{channel}{$channel->{id}} = $channel; 3098 $self->{channel}{$channel->{id}} = $channel;
2898 $self->ext_msg (channel_info => $channel) 3099 $self->ext_msg (channel_info => $channel);
2899 if $self->can_msg;
2900 } 3100 }
2901 3101
2902 $channel = $channel->{id}; 3102 $channel = $channel->{id};
2903 } 3103 }
2904 3104
2905 return unless @extra || length $msg; 3105 return unless @extra || length $msg;
2906 3106
2907 if ($self->can_msg) {
2908 # default colour, mask it out 3107 # default colour, mask it out
2909 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3108 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2910 if $color & cf::NDI_DEF; 3109 if $color & cf::NDI_DEF;
2911 3110
2912 my $pkt = "msg " 3111 my $pkt = "msg "
2913 . $self->{json_coder}->encode ( 3112 . $self->{json_coder}->encode (
2914 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3113 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2915 ); 3114 );
2916 3115
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); 3116 $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} 3117}
2954 3118
2955=item $client->ext_msg ($type, @msg) 3119=item $client->ext_msg ($type, @msg)
2956 3120
2957Sends an ext event to the client. 3121Sends an ext event to the client.
2960 3124
2961sub cf::client::ext_msg($$@) { 3125sub cf::client::ext_msg($$@) {
2962 my ($self, $type, @msg) = @_; 3126 my ($self, $type, @msg) = @_;
2963 3127
2964 if ($self->extcmd == 2) { 3128 if ($self->extcmd == 2) {
2965 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3129 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2966 } elsif ($self->extcmd == 1) { # TODO: remove 3130 } elsif ($self->extcmd == 1) { # TODO: remove
2967 push @msg, msgtype => "event_$type"; 3131 push @msg, msgtype => "event_$type";
2968 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3132 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2969 } 3133 }
2970} 3134}
2971 3135
2972=item $client->ext_reply ($msgid, @msg) 3136=item $client->ext_reply ($msgid, @msg)
2973 3137
2977 3141
2978sub cf::client::ext_reply($$@) { 3142sub cf::client::ext_reply($$@) {
2979 my ($self, $id, @msg) = @_; 3143 my ($self, $id, @msg) = @_;
2980 3144
2981 if ($self->extcmd == 2) { 3145 if ($self->extcmd == 2) {
2982 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3146 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2983 } elsif ($self->extcmd == 1) { 3147 } elsif ($self->extcmd == 1) {
2984 #TODO: version 1, remove 3148 #TODO: version 1, remove
2985 unshift @msg, msgtype => "reply", msgid => $id; 3149 unshift @msg, msgtype => "reply", msgid => $id;
2986 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3150 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2987 } 3151 }
2988} 3152}
2989 3153
2990=item $success = $client->query ($flags, "text", \&cb) 3154=item $success = $client->query ($flags, "text", \&cb)
2991 3155
3062 3226
3063 $ns->ext_reply ($reply, @reply) 3227 $ns->ext_reply ($reply, @reply)
3064 if $reply; 3228 if $reply;
3065 3229
3066 } else { 3230 } else {
3067 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3231 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3068 } 3232 }
3069 3233
3070 cf::override; 3234 cf::override;
3071 }, 3235 },
3072); 3236);
3092 3256
3093 $coro 3257 $coro
3094} 3258}
3095 3259
3096cf::client->attach ( 3260cf::client->attach (
3097 on_destroy => sub { 3261 on_client_destroy => sub {
3098 my ($ns) = @_; 3262 my ($ns) = @_;
3099 3263
3100 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3264 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3101 }, 3265 },
3102); 3266);
3118our $safe_hole = new Safe::Hole; 3282our $safe_hole = new Safe::Hole;
3119 3283
3120$SIG{FPE} = 'IGNORE'; 3284$SIG{FPE} = 'IGNORE';
3121 3285
3122$safe->permit_only (Opcode::opset qw( 3286$safe->permit_only (Opcode::opset qw(
3123 :base_core :base_mem :base_orig :base_math 3287 :base_core :base_mem :base_orig :base_math :base_loop
3124 grepstart grepwhile mapstart mapwhile 3288 grepstart grepwhile mapstart mapwhile
3125 sort time 3289 sort time
3126)); 3290));
3127 3291
3128# here we export the classes and methods available to script code 3292# here we export the classes and methods available to script code
3132The following functions and methods are available within a safe environment: 3296The following functions and methods are available within a safe environment:
3133 3297
3134 cf::object 3298 cf::object
3135 contr pay_amount pay_player map x y force_find force_add destroy 3299 contr pay_amount pay_player map x y force_find force_add destroy
3136 insert remove name archname title slaying race decrease split 3300 insert remove name archname title slaying race decrease split
3301 value
3137 3302
3138 cf::object::player 3303 cf::object::player
3139 player 3304 player
3140 3305
3141 cf::player 3306 cf::player
3147=cut 3312=cut
3148 3313
3149for ( 3314for (
3150 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3315 ["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 3316 insert remove inv nrof name archname title slaying race
3152 decrease split destroy change_exp)], 3317 decrease split destroy change_exp value msg lore send_msg)],
3153 ["cf::object::player" => qw(player)], 3318 ["cf::object::player" => qw(player)],
3154 ["cf::player" => qw(peaceful)], 3319 ["cf::player" => qw(peaceful send_msg)],
3155 ["cf::map" => qw(trigger)], 3320 ["cf::map" => qw(trigger)],
3156) { 3321) {
3157 no strict 'refs';
3158 my ($pkg, @funs) = @$_; 3322 my ($pkg, @funs) = @$_;
3159 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3323 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3160 for @funs; 3324 for @funs;
3161} 3325}
3162 3326
3177 3341
3178 my $qcode = $code; 3342 my $qcode = $code;
3179 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3343 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3180 $qcode =~ s/\n/\\n/g; 3344 $qcode =~ s/\n/\\n/g;
3181 3345
3346 %vars = (_dummy => 0) unless %vars;
3347
3348 my @res;
3182 local $_; 3349 local $_;
3183 local @safe::cf::_safe_eval_args = values %vars;
3184 3350
3185 my $eval = 3351 my $eval =
3186 "do {\n" 3352 "do {\n"
3187 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3353 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3188 . "#line 0 \"{$qcode}\"\n" 3354 . "#line 0 \"{$qcode}\"\n"
3189 . $code 3355 . $code
3190 . "\n}" 3356 . "\n}"
3191 ; 3357 ;
3192 3358
3359 if ($CFG{safe_eval}) {
3193 sub_generation_inc; 3360 sub_generation_inc;
3361 local @safe::cf::_safe_eval_args = values %vars;
3194 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3362 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3195 sub_generation_inc; 3363 sub_generation_inc;
3364 } else {
3365 local @cf::_safe_eval_args = values %vars;
3366 @res = wantarray ? eval eval : scalar eval $eval;
3367 }
3196 3368
3197 if ($@) { 3369 if ($@) {
3198 warn "$@"; 3370 warn "$@",
3199 warn "while executing safe code '$code'\n"; 3371 "while executing safe code '$code'\n",
3200 warn "with arguments " . (join " ", %vars) . "\n"; 3372 "with arguments " . (join " ", %vars) . "\n";
3201 } 3373 }
3202 3374
3203 wantarray ? @res : $res[0] 3375 wantarray ? @res : $res[0]
3204} 3376}
3205 3377
3219=cut 3391=cut
3220 3392
3221sub register_script_function { 3393sub register_script_function {
3222 my ($fun, $cb) = @_; 3394 my ($fun, $cb) = @_;
3223 3395
3224 no strict 'refs'; 3396 $fun = "safe::$fun" if $CFG{safe_eval};
3225 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3397 *$fun = $safe_hole->wrap ($cb);
3226} 3398}
3227 3399
3228=back 3400=back
3229 3401
3230=cut 3402=cut
3239 # for this (global event?) 3411 # for this (global event?)
3240 %ext::player_env::MUSIC_FACE_CACHE = (); 3412 %ext::player_env::MUSIC_FACE_CACHE = ();
3241 3413
3242 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3414 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3243 3415
3244 warn "loading facedata from $path\n"; 3416 trace "loading facedata from $path\n";
3245 3417
3246 my $facedata;
3247 0 < aio_load $path, $facedata 3418 0 < aio_load $path, my $facedata
3248 or die "$path: $!"; 3419 or die "$path: $!";
3249 3420
3250 $facedata = Coro::Storable::thaw $facedata; 3421 $facedata = Coro::Storable::thaw $facedata;
3251 3422
3252 $facedata->{version} == 2 3423 $facedata->{version} == 2
3253 or cf::cleanup "$path: version mismatch, cannot proceed."; 3424 or cf::cleanup "$path: version mismatch, cannot proceed.";
3254 3425
3255 # patch in the exptable 3426 # patch in the exptable
3427 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3256 $facedata->{resource}{"res/exp_table"} = { 3428 $facedata->{resource}{"res/exp_table"} = {
3257 type => FT_RSRC, 3429 type => FT_RSRC,
3258 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3430 data => $exp_table,
3431 hash => (Digest::MD5::md5 $exp_table),
3259 }; 3432 };
3260 cf::cede_to_tick; 3433 cf::cede_to_tick;
3261 3434
3262 { 3435 {
3263 my $faces = $facedata->{faceinfo}; 3436 my $faces = $facedata->{faceinfo};
3265 while (my ($face, $info) = each %$faces) { 3438 while (my ($face, $info) = each %$faces) {
3266 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3439 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3267 3440
3268 cf::face::set_visibility $idx, $info->{visibility}; 3441 cf::face::set_visibility $idx, $info->{visibility};
3269 cf::face::set_magicmap $idx, $info->{magicmap}; 3442 cf::face::set_magicmap $idx, $info->{magicmap};
3270 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3443 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3271 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3444 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3272 3445
3273 cf::cede_to_tick; 3446 cf::cede_to_tick;
3274 } 3447 }
3275 3448
3276 while (my ($face, $info) = each %$faces) { 3449 while (my ($face, $info) = each %$faces) {
3281 3454
3282 if (my $smooth = cf::face::find $info->{smooth}) { 3455 if (my $smooth = cf::face::find $info->{smooth}) {
3283 cf::face::set_smooth $idx, $smooth; 3456 cf::face::set_smooth $idx, $smooth;
3284 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3457 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3285 } else { 3458 } else {
3286 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3459 error "smooth face '$info->{smooth}' not found for face '$face'";
3287 } 3460 }
3288 3461
3289 cf::cede_to_tick; 3462 cf::cede_to_tick;
3290 } 3463 }
3291 } 3464 }
3300 3473
3301 cf::anim::invalidate_all; # d'oh 3474 cf::anim::invalidate_all; # d'oh
3302 } 3475 }
3303 3476
3304 { 3477 {
3305 # TODO: for gcfclient pleasure, we should give resources
3306 # that gcfclient doesn't grok a >10000 face index.
3307 my $res = $facedata->{resource}; 3478 my $res = $facedata->{resource};
3308 3479
3309 while (my ($name, $info) = each %$res) { 3480 while (my ($name, $info) = each %$res) {
3310 if (defined $info->{type}) { 3481 if (defined $info->{type}) {
3311 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3482 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3312 my $data;
3313 3483
3314 if ($info->{type} & 1) { 3484 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}; 3485 cf::face::set_type $idx, $info->{type};
3329 } else { 3486 } else {
3330 $RESOURCE{$name} = $info; 3487 $RESOURCE{$name} = $info; # unused
3331 } 3488 }
3332 3489
3333 cf::cede_to_tick; 3490 cf::cede_to_tick;
3334 } 3491 }
3335 } 3492 }
3336 3493
3337 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3494 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3338 3495
3339 1 3496 1
3340} 3497}
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 3498
3362register_exticmd fx_want => sub { 3499register_exticmd fx_want => sub {
3363 my ($ns, $want) = @_; 3500 my ($ns, $want) = @_;
3364 3501
3365 while (my ($k, $v) = each %$want) { 3502 while (my ($k, $v) = each %$want) {
3404sub reload_treasures { 3541sub reload_treasures {
3405 load_resource_file "$DATADIR/treasures" 3542 load_resource_file "$DATADIR/treasures"
3406 or die "unable to load treasurelists\n"; 3543 or die "unable to load treasurelists\n";
3407} 3544}
3408 3545
3546sub reload_sound {
3547 trace "loading sound config from $DATADIR/sound\n";
3548
3549 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3550 or die "$DATADIR/sound $!";
3551
3552 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3553
3554 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3555 my $sound = $soundconf->{compat}[$_]
3556 or next;
3557
3558 my $face = cf::face::find "sound/$sound->[1]";
3559 cf::sound::set $sound->[0] => $face;
3560 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3561 }
3562
3563 while (my ($k, $v) = each %{$soundconf->{event}}) {
3564 my $face = cf::face::find "sound/$v";
3565 cf::sound::set $k => $face;
3566 }
3567}
3568
3409sub reload_resources { 3569sub reload_resources {
3410 warn "reloading resource files...\n"; 3570 trace "reloading resource files...\n";
3411 3571
3572 reload_exp_table;
3573 reload_materials;
3412 reload_facedata; 3574 reload_facedata;
3575 reload_sound;
3413 reload_archetypes; 3576 reload_archetypes;
3414 reload_regions; 3577 reload_regions;
3415 reload_treasures; 3578 reload_treasures;
3416 3579
3417 warn "finished reloading resource files\n"; 3580 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} 3581}
3427 3582
3428sub reload_config { 3583sub reload_config {
3429 open my $fh, "<:utf8", "$CONFDIR/config" 3584 trace "reloading config file...\n";
3430 or return;
3431 3585
3432 local $/; 3586 0 < aio_load "$CONFDIR/config", my $config
3433 *CFG = YAML::Load <$fh>; 3587 or die "$CONFDIR/config: $!";
3434 3588
3589 utf8::decode $config;
3590 *CFG = yaml_load $config;
3591
3435 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3592 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3436 3593
3437 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3594 $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}; 3595 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3439 3596
3440 if (exists $CFG{mlockall}) { 3597 if (exists $CFG{mlockall}) {
3444 }; 3601 };
3445 warn $@ if $@; 3602 warn $@ if $@;
3446 } 3603 }
3447} 3604}
3448 3605
3606sub pidfile() {
3607 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3608 or die "$PIDFILE: $!";
3609 flock $fh, &Fcntl::LOCK_EX
3610 or die "$PIDFILE: flock: $!";
3611 $fh
3612}
3613
3614# make sure only one server instance is running at any one time
3615sub atomic {
3616 my $fh = pidfile;
3617
3618 my $pid = <$fh>;
3619 kill 9, $pid if $pid > 0;
3620
3621 seek $fh, 0, 0;
3622 print $fh $$;
3623}
3624
3625sub main_loop {
3626 trace "EV::loop starting\n";
3627 if (1) {
3628 EV::loop;
3629 }
3630 trace "EV::loop returned\n";
3631 goto &main_loop unless $REALLY_UNLOOP;
3632}
3633
3449sub main { 3634sub main {
3635 cf::init_globals; # initialise logging
3636
3637 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3638 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3639 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3640 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3641
3642 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3643
3450 # we must not ever block the main coroutine 3644 # we must not ever block the main coroutine
3451 local $Coro::idle = sub { 3645 local $Coro::idle = sub {
3452 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3646 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3453 (async { 3647 (async {
3454 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3648 $Coro::current->{desc} = "IDLE BUG HANDLER";
3455 EV::loop EV::LOOP_ONESHOT; 3649 EV::loop EV::LOOP_ONESHOT;
3456 })->prio (Coro::PRIO_MAX); 3650 })->prio (Coro::PRIO_MAX);
3457 }; 3651 };
3458 3652
3459 { 3653 evthread_start IO::AIO::poll_fileno;
3460 my $guard = freeze_mainloop; 3654
3655 cf::sync_job {
3656 cf::incloader::init ();
3657
3658 cf::init_anim;
3659 cf::init_attackmess;
3660 cf::init_dynamic;
3661
3662 cf::load_settings;
3663
3664 reload_resources;
3461 reload_config; 3665 reload_config;
3462 db_init; 3666 db_init;
3667
3668 cf::init_uuid;
3669 cf::init_signals;
3670 cf::init_skills;
3671
3672 cf::init_beforeplay;
3673
3674 atomic;
3675
3463 load_extensions; 3676 load_extensions;
3464 3677
3465 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3678 utime time, time, $RUNTIMEFILE;
3679
3680 # no (long-running) fork's whatsoever before this point(!)
3681 use POSIX ();
3682 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3683
3684 cf::_post_init 0;
3466 } 3685 };
3467 3686
3468 EV::loop; 3687 cf::object::thawer::errors_are_fatal 0;
3688 info "parse errors in files are no longer fatal from this point on.\n";
3689
3690 my $free_main; $free_main = EV::idle sub {
3691 undef $free_main;
3692 undef &main; # free gobs of memory :)
3693 };
3694
3695 goto &main_loop;
3469} 3696}
3470 3697
3471############################################################################# 3698#############################################################################
3472# initialisation and cleanup 3699# initialisation and cleanup
3473 3700
3474# install some emergency cleanup handlers 3701# install some emergency cleanup handlers
3475BEGIN { 3702BEGIN {
3476 our %SIGWATCHER = (); 3703 our %SIGWATCHER = ();
3477 for my $signal (qw(INT HUP TERM)) { 3704 for my $signal (qw(INT HUP TERM)) {
3478 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3705 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3479 cf::cleanup "SIG$signal"; 3706 cf::cleanup "SIG$signal";
3480 }; 3707 };
3481 } 3708 }
3482} 3709}
3483 3710
3484sub write_runtime_sync { 3711sub write_runtime_sync {
3485 my $runtime = "$LOCALDIR/runtime"; 3712 my $t0 = AE::time;
3486 3713
3487 # first touch the runtime file to show we are still running: 3714 # first touch the runtime file to show we are still running:
3488 # the fsync below can take a very very long time. 3715 # the fsync below can take a very very long time.
3489 3716
3490 IO::AIO::aio_utime $runtime, undef, undef; 3717 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3491 3718
3492 my $guard = cf::lock_acquire "write_runtime"; 3719 my $guard = cf::lock_acquire "write_runtime";
3493 3720
3494 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3721 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3495 or return; 3722 or return;
3496 3723
3497 my $value = $cf::RUNTIME + 90 + 10; 3724 my $value = $cf::RUNTIME + 90 + 10;
3498 # 10 is the runtime save interval, for a monotonic clock 3725 # 10 is the runtime save interval, for a monotonic clock
3499 # 60 allows for the watchdog to kill the server. 3726 # 60 allows for the watchdog to kill the server.
3509 aio_utime $fh, undef, undef; 3736 aio_utime $fh, undef, undef;
3510 3737
3511 close $fh 3738 close $fh
3512 or return; 3739 or return;
3513 3740
3514 aio_rename "$runtime~", $runtime 3741 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3515 and return; 3742 and return;
3516 3743
3517 warn "runtime file written.\n"; 3744 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3518 3745
3519 1 3746 1
3520} 3747}
3521 3748
3522our $uuid_lock; 3749our $uuid_lock;
3531 my $uuid = "$LOCALDIR/uuid"; 3758 my $uuid = "$LOCALDIR/uuid";
3532 3759
3533 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3760 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3534 or return; 3761 or return;
3535 3762
3536 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3763 my $value = uuid_seq uuid_cur;
3764
3765 unless ($value) {
3766 info "cowardly refusing to write zero uuid value!\n";
3767 return;
3768 }
3769
3770 my $value = uuid_str $value + $uuid_skip;
3537 $uuid_skip = 0; 3771 $uuid_skip = 0;
3538 3772
3539 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3773 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3540 and return; 3774 and return;
3541 3775
3547 or return; 3781 or return;
3548 3782
3549 aio_rename "$uuid~", $uuid 3783 aio_rename "$uuid~", $uuid
3550 and return; 3784 and return;
3551 3785
3552 warn "uuid file written ($value).\n"; 3786 trace "uuid file written ($value).\n";
3553 3787
3554 1 3788 1
3555 3789
3556} 3790}
3557 3791
3563} 3797}
3564 3798
3565sub emergency_save() { 3799sub emergency_save() {
3566 my $freeze_guard = cf::freeze_mainloop; 3800 my $freeze_guard = cf::freeze_mainloop;
3567 3801
3568 warn "enter emergency perl save\n"; 3802 info "emergency_perl_save: enter\n";
3803
3804 # this is a trade-off: we want to be very quick here, so
3805 # save all maps without fsync, and later call a global sync
3806 # (which in turn might be very very slow)
3807 local $USE_FSYNC = 0;
3569 3808
3570 cf::sync_job { 3809 cf::sync_job {
3810 cf::write_runtime_sync; # external watchdog should not bark
3811
3571 # use a peculiar iteration method to avoid tripping on perl 3812 # use a peculiar iteration method to avoid tripping on perl
3572 # refcount bugs in for. also avoids problems with players 3813 # refcount bugs in for. also avoids problems with players
3573 # and maps saved/destroyed asynchronously. 3814 # and maps saved/destroyed asynchronously.
3574 warn "begin emergency player save\n"; 3815 info "emergency_perl_save: begin player save\n";
3575 for my $login (keys %cf::PLAYER) { 3816 for my $login (keys %cf::PLAYER) {
3576 my $pl = $cf::PLAYER{$login} or next; 3817 my $pl = $cf::PLAYER{$login} or next;
3577 $pl->valid or next; 3818 $pl->valid or next;
3578 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3819 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3579 $pl->save; 3820 $pl->save;
3580 } 3821 }
3581 warn "end emergency player save\n"; 3822 info "emergency_perl_save: end player save\n";
3582 3823
3583 warn "begin emergency map save\n"; 3824 cf::write_runtime_sync; # external watchdog should not bark
3825
3826 info "emergency_perl_save: begin map save\n";
3584 for my $path (keys %cf::MAP) { 3827 for my $path (keys %cf::MAP) {
3585 my $map = $cf::MAP{$path} or next; 3828 my $map = $cf::MAP{$path} or next;
3586 $map->valid or next; 3829 $map->valid or next;
3587 $map->save; 3830 $map->save;
3588 } 3831 }
3589 warn "end emergency map save\n"; 3832 info "emergency_perl_save: end map save\n";
3590 3833
3591 warn "begin emergency database checkpoint\n"; 3834 cf::write_runtime_sync; # external watchdog should not bark
3835
3836 info "emergency_perl_save: begin database checkpoint\n";
3592 BDB::db_env_txn_checkpoint $DB_ENV; 3837 BDB::db_env_txn_checkpoint $DB_ENV;
3593 warn "end emergency database checkpoint\n"; 3838 info "emergency_perl_save: end database checkpoint\n";
3594 3839
3595 warn "begin write uuid\n"; 3840 info "emergency_perl_save: begin write uuid\n";
3596 write_uuid_sync 1; 3841 write_uuid_sync 1;
3597 warn "end write uuid\n"; 3842 info "emergency_perl_save: end write uuid\n";
3843
3844 cf::write_runtime_sync; # external watchdog should not bark
3845
3846 trace "emergency_perl_save: syncing database to disk";
3847 BDB::db_env_txn_checkpoint $DB_ENV;
3848
3849 info "emergency_perl_save: starting sync\n";
3850 IO::AIO::aio_sync sub {
3851 info "emergency_perl_save: finished sync\n";
3852 };
3853
3854 cf::write_runtime_sync; # external watchdog should not bark
3855
3856 trace "emergency_perl_save: flushing outstanding aio requests";
3857 while (IO::AIO::nreqs || BDB::nreqs) {
3858 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3859 }
3860
3861 cf::write_runtime_sync; # external watchdog should not bark
3598 }; 3862 };
3599 3863
3600 warn "leave emergency perl save\n"; 3864 info "emergency_perl_save: leave\n";
3601} 3865}
3602 3866
3603sub post_cleanup { 3867sub post_cleanup {
3604 my ($make_core) = @_; 3868 my ($make_core) = @_;
3605 3869
3870 IO::AIO::flush;
3871
3606 warn Carp::longmess "post_cleanup backtrace" 3872 error Carp::longmess "post_cleanup backtrace"
3607 if $make_core; 3873 if $make_core;
3874
3875 my $fh = pidfile;
3876 unlink $PIDFILE if <$fh> == $$;
3608} 3877}
3609 3878
3610# a safer delete_package, copied from Symbol 3879# a safer delete_package, copied from Symbol
3611sub clear_package($) { 3880sub clear_package($) {
3612 my $pkg = shift; 3881 my $pkg = shift;
3628 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3897 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3629 for my $name (keys %$leaf_symtab) { 3898 for my $name (keys %$leaf_symtab) {
3630 _gv_clear *{"$pkg$name"}; 3899 _gv_clear *{"$pkg$name"};
3631# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3900# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3632 } 3901 }
3633 warn "cleared package #$pkg\n";#d#
3634} 3902}
3635
3636our $RELOAD; # how many times to reload
3637 3903
3638sub do_reload_perl() { 3904sub do_reload_perl() {
3639 # can/must only be called in main 3905 # can/must only be called in main
3640 if ($Coro::current != $Coro::main) { 3906 unless (in_main) {
3641 warn "can only reload from main coroutine"; 3907 error "can only reload from main coroutine";
3642 return; 3908 return;
3643 } 3909 }
3644 3910
3645 return if $RELOAD++; 3911 return if $RELOAD++;
3646 3912
3913 my $t1 = AE::time;
3914
3647 while ($RELOAD) { 3915 while ($RELOAD) {
3648 warn "reloading..."; 3916 cf::get_slot 0.1, -1, "reload_perl";
3917 info "perl_reload: reloading...";
3649 3918
3650 warn "entering sync_job"; 3919 trace "perl_reload: entering sync_job";
3651 3920
3652 cf::sync_job { 3921 cf::sync_job {
3653 cf::write_runtime_sync; # external watchdog should not bark
3654 cf::emergency_save; 3922 #cf::emergency_save;
3655 cf::write_runtime_sync; # external watchdog should not bark
3656 3923
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"; 3924 trace "perl_reload: cancelling all extension coros";
3668 $_->cancel for values %EXT_CORO; 3925 $_->cancel for values %EXT_CORO;
3669 %EXT_CORO = (); 3926 %EXT_CORO = ();
3670 3927
3671 warn "removing commands"; 3928 trace "perl_reload: removing commands";
3672 %COMMAND = (); 3929 %COMMAND = ();
3673 3930
3674 warn "removing ext/exti commands"; 3931 trace "perl_reload: removing ext/exti commands";
3675 %EXTCMD = (); 3932 %EXTCMD = ();
3676 %EXTICMD = (); 3933 %EXTICMD = ();
3677 3934
3678 warn "unloading/nuking all extensions"; 3935 trace "perl_reload: unloading/nuking all extensions";
3679 for my $pkg (@EXTS) { 3936 for my $pkg (@EXTS) {
3680 warn "... unloading $pkg"; 3937 trace "... unloading $pkg";
3681 3938
3682 if (my $cb = $pkg->can ("unload")) { 3939 if (my $cb = $pkg->can ("unload")) {
3683 eval { 3940 eval {
3684 $cb->($pkg); 3941 $cb->($pkg);
3685 1 3942 1
3686 } or warn "$pkg unloaded, but with errors: $@"; 3943 } or error "$pkg unloaded, but with errors: $@";
3687 } 3944 }
3688 3945
3689 warn "... clearing $pkg"; 3946 trace "... clearing $pkg";
3690 clear_package $pkg; 3947 clear_package $pkg;
3691 } 3948 }
3692 3949
3693 warn "unloading all perl modules loaded from $LIBDIR"; 3950 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3694 while (my ($k, $v) = each %INC) { 3951 while (my ($k, $v) = each %INC) {
3695 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3952 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3696 3953
3697 warn "... unloading $k"; 3954 trace "... unloading $k";
3698 delete $INC{$k}; 3955 delete $INC{$k};
3699 3956
3700 $k =~ s/\.pm$//; 3957 $k =~ s/\.pm$//;
3701 $k =~ s/\//::/g; 3958 $k =~ s/\//::/g;
3702 3959
3705 } 3962 }
3706 3963
3707 clear_package $k; 3964 clear_package $k;
3708 } 3965 }
3709 3966
3710 warn "getting rid of safe::, as good as possible"; 3967 trace "perl_reload: getting rid of safe::, as good as possible";
3711 clear_package "safe::$_" 3968 clear_package "safe::$_"
3712 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3969 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3713 3970
3714 warn "unloading cf.pm \"a bit\""; 3971 trace "perl_reload: unloading cf.pm \"a bit\"";
3715 delete $INC{"cf.pm"}; 3972 delete $INC{"cf.pm"};
3716 delete $INC{"cf/pod.pm"}; 3973 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3717 3974
3718 # don't, removes xs symbols, too, 3975 # don't, removes xs symbols, too,
3719 # and global variables created in xs 3976 # and global variables created in xs
3720 #clear_package __PACKAGE__; 3977 #clear_package __PACKAGE__;
3721 3978
3722 warn "unload completed, starting to reload now"; 3979 info "perl_reload: unload completed, starting to reload now";
3723 3980
3724 warn "reloading cf.pm"; 3981 trace "perl_reload: reloading cf.pm";
3725 require cf; 3982 require cf;
3726 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3983 cf::_connect_to_perl_1;
3727 3984
3728 warn "loading config and database again"; 3985 trace "perl_reload: loading config and database again";
3729 cf::reload_config; 3986 cf::reload_config;
3730 3987
3731 warn "loading extensions"; 3988 trace "perl_reload: loading extensions";
3732 cf::load_extensions; 3989 cf::load_extensions;
3733 3990
3991 if ($REATTACH_ON_RELOAD) {
3734 warn "reattaching attachments to objects/players"; 3992 trace "perl_reload: reattaching attachments to objects/players";
3735 _global_reattach; # objects, sockets 3993 _global_reattach; # objects, sockets
3736 warn "reattaching attachments to maps"; 3994 trace "perl_reload: reattaching attachments to maps";
3737 reattach $_ for values %MAP; 3995 reattach $_ for values %MAP;
3738 warn "reattaching attachments to players"; 3996 trace "perl_reload: reattaching attachments to players";
3739 reattach $_ for values %PLAYER; 3997 reattach $_ for values %PLAYER;
3998 }
3740 3999
3741 warn "leaving sync_job"; 4000 cf::_post_init 1;
4001
4002 trace "perl_reload: leaving sync_job";
3742 4003
3743 1 4004 1
3744 } or do { 4005 } or do {
3745 warn $@; 4006 error $@;
3746 cf::cleanup "error while reloading, exiting."; 4007 cf::cleanup "perl_reload: error, exiting.";
3747 }; 4008 };
3748 4009
3749 warn "reloaded";
3750 --$RELOAD; 4010 --$RELOAD;
3751 } 4011 }
4012
4013 $t1 = AE::time - $t1;
4014 info "perl_reload: completed in ${t1}s\n";
3752}; 4015};
3753 4016
3754our $RELOAD_WATCHER; # used only during reload 4017our $RELOAD_WATCHER; # used only during reload
3755 4018
3756sub reload_perl() { 4019sub reload_perl() {
3757 # doing reload synchronously and two reloads happen back-to-back, 4020 # doing reload synchronously and two reloads happen back-to-back,
3758 # coro crashes during coro_state_free->destroy here. 4021 # coro crashes during coro_state_free->destroy here.
3759 4022
4023 $RELOAD_WATCHER ||= cf::async {
4024 Coro::AIO::aio_wait cache_extensions;
4025
3760 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4026 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3761 do_reload_perl; 4027 do_reload_perl;
3762 undef $RELOAD_WATCHER; 4028 undef $RELOAD_WATCHER;
4029 };
3763 }; 4030 };
3764} 4031}
3765 4032
3766register_command "reload" => sub { 4033register_command "reload" => sub {
3767 my ($who, $arg) = @_; 4034 my ($who, $arg) = @_;
3773 reload_perl; 4040 reload_perl;
3774 }; 4041 };
3775 } 4042 }
3776}; 4043};
3777 4044
3778unshift @INC, $LIBDIR; 4045#############################################################################
3779 4046
3780my $bug_warning = 0; 4047my $bug_warning = 0;
3781 4048
3782our @WAIT_FOR_TICK; 4049our @WAIT_FOR_TICK;
3783our @WAIT_FOR_TICK_BEGIN; 4050our @WAIT_FOR_TICK_BEGIN;
3784 4051
3785sub wait_for_tick { 4052sub wait_for_tick() {
3786 return if tick_inhibit || $Coro::current == $Coro::main; 4053 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3787 4054
3788 my $signal = new Coro::Signal; 4055 my $signal = new Coro::Signal;
3789 push @WAIT_FOR_TICK, $signal; 4056 push @WAIT_FOR_TICK, $signal;
3790 $signal->wait; 4057 $signal->wait;
3791} 4058}
3792 4059
3793sub wait_for_tick_begin { 4060sub wait_for_tick_begin() {
3794 return if tick_inhibit || $Coro::current == $Coro::main; 4061 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3795 4062
3796 my $signal = new Coro::Signal; 4063 my $signal = new Coro::Signal;
3797 push @WAIT_FOR_TICK_BEGIN, $signal; 4064 push @WAIT_FOR_TICK_BEGIN, $signal;
3798 $signal->wait; 4065 $signal->wait;
3799} 4066}
3805 return; 4072 return;
3806 } 4073 }
3807 4074
3808 cf::server_tick; # one server iteration 4075 cf::server_tick; # one server iteration
3809 4076
4077 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4078
3810 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4079 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3811 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4080 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3812 Coro::async_pool { 4081 Coro::async_pool {
3813 $Coro::current->{desc} = "runtime saver"; 4082 $Coro::current->{desc} = "runtime saver";
3814 write_runtime_sync 4083 write_runtime_sync
3815 or warn "ERROR: unable to write runtime file: $!"; 4084 or error "ERROR: unable to write runtime file: $!";
3816 }; 4085 };
3817 } 4086 }
3818 4087
3819 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4088 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3820 $sig->send; 4089 $sig->send;
3828 4097
3829 if (0) { 4098 if (0) {
3830 if ($NEXT_TICK) { 4099 if ($NEXT_TICK) {
3831 my $jitter = $TICK_START - $NEXT_TICK; 4100 my $jitter = $TICK_START - $NEXT_TICK;
3832 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4101 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3833 warn "jitter $JITTER\n";#d# 4102 debug "jitter $JITTER\n";#d#
3834 } 4103 }
3835 } 4104 }
3836} 4105}
3837 4106
3838{ 4107{
3839 # configure BDB 4108 # configure BDB
3840 4109
3841 BDB::min_parallel 8; 4110 BDB::min_parallel 16;
3842 BDB::max_poll_reqs $TICK * 0.1; 4111 BDB::max_poll_reqs $TICK * 0.1;
3843 $AnyEvent::BDB::WATCHER->priority (1); 4112 $AnyEvent::BDB::WATCHER->priority (1);
3844 4113
3845 unless ($DB_ENV) { 4114 unless ($DB_ENV) {
3846 $DB_ENV = BDB::db_env_create; 4115 $DB_ENV = BDB::db_env_create;
3883 IO::AIO::min_parallel 8; 4152 IO::AIO::min_parallel 8;
3884 IO::AIO::max_poll_time $TICK * 0.1; 4153 IO::AIO::max_poll_time $TICK * 0.1;
3885 undef $AnyEvent::AIO::WATCHER; 4154 undef $AnyEvent::AIO::WATCHER;
3886} 4155}
3887 4156
3888my $_log_backtrace; 4157our $_log_backtrace;
4158our $_log_backtrace_last;
3889 4159
3890sub _log_backtrace { 4160sub _log_backtrace {
3891 my ($msg, @addr) = @_; 4161 my ($msg, @addr) = @_;
3892 4162
3893 $msg =~ s/\n//; 4163 $msg =~ s/\n$//;
3894 4164
4165 if ($_log_backtrace_last eq $msg) {
4166 LOG llevInfo, "[ABT] $msg\n";
4167 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3895 # limit the # of concurrent backtraces 4168 # limit the # of concurrent backtraces
3896 if ($_log_backtrace < 2) { 4169 } elsif ($_log_backtrace < 2) {
4170 $_log_backtrace_last = $msg;
3897 ++$_log_backtrace; 4171 ++$_log_backtrace;
4172 my $perl_bt = Carp::longmess $msg;
3898 async { 4173 async {
3899 $Coro::current->{desc} = "abt $msg"; 4174 $Coro::current->{desc} = "abt $msg";
3900 4175
3901 my @bt = fork_call { 4176 my @bt = fork_call {
3902 @addr = map { sprintf "%x", $_ } @addr; 4177 @addr = map { sprintf "%x", $_ } @addr;
3913 } 4188 }
3914 4189
3915 @funcs 4190 @funcs
3916 }; 4191 };
3917 4192
3918 LOG llevInfo, "[ABT] $msg\n"; 4193 LOG llevInfo, "[ABT] $perl_bt\n";
4194 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3919 LOG llevInfo, "[ABT] $_\n" for @bt; 4195 LOG llevInfo, "[ABT] $_\n" for @bt;
3920 --$_log_backtrace; 4196 --$_log_backtrace;
3921 }; 4197 };
3922 } else { 4198 } else {
3923 LOG llevInfo, "[ABT] $msg\n"; 4199 LOG llevInfo, "[ABT] $msg\n";
3924 LOG llevInfo, "[ABT] [suppressed]\n"; 4200 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3925 } 4201 }
3926} 4202}
3927 4203
3928# load additional modules 4204# load additional modules
3929use cf::pod; 4205require "cf/$_.pm" for @EXTRA_MODULES;
4206cf::_connect_to_perl_2;
3930 4207
3931END { cf::emergency_save } 4208END { cf::emergency_save }
3932 4209
39331 42101
3934 4211

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines