ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.436 by root, Sun Jun 15 20:32:51 2008 UTC vs.
Revision 1.554 by root, Sat Jun 26 22:10:18 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines