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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines