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.435 by root, Thu May 29 03:33:20 2008 UTC vs.
Revision 1.551 by root, Sun May 16 13:48:07 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}) {
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->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1795 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1869 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1796 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1870 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1797 $rmp->{exit_on_final_map}, 1871 $rmp->{exit_on_final_map},
1798 $rmp->{xsize}, $rmp->{ysize}, 1872 $rmp->{xsize}, $rmp->{ysize},
1799 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1873 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1800 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1874 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1815 1889
1816sub register { 1890sub register {
1817 my (undef, $regex, $prio) = @_; 1891 my (undef, $regex, $prio) = @_;
1818 my $pkg = caller; 1892 my $pkg = caller;
1819 1893
1820 no strict;
1821 push @{"$pkg\::ISA"}, __PACKAGE__; 1894 push @{"$pkg\::ISA"}, __PACKAGE__;
1822 1895
1823 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1896 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1824} 1897}
1825 1898
1826# also paths starting with '/' 1899# also paths starting with '/'
1827$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1900$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1828 1901
1829sub thawer_merge { 1902sub thawer_merge {
1830 my ($self, $merge) = @_; 1903 my ($self, $merge) = @_;
1831 1904
1832 # we have to keep some variables in memory intact 1905 # we have to keep some variables in memory intact
1837} 1910}
1838 1911
1839sub normalise { 1912sub normalise {
1840 my ($path, $base) = @_; 1913 my ($path, $base) = @_;
1841 1914
1842 $path = "$path"; # make sure its a string 1915 $path = "$path"; # make sure it's a string
1843 1916
1844 $path =~ s/\.map$//; 1917 $path =~ s/\.map$//;
1845 1918
1846 # map plan: 1919 # map plan:
1847 # 1920 #
1862 $base =~ s{[^/]+/?$}{}; 1935 $base =~ s{[^/]+/?$}{};
1863 $path = "$base/$path"; 1936 $path = "$base/$path";
1864 } 1937 }
1865 1938
1866 for ($path) { 1939 for ($path) {
1867 redo if s{//}{/};
1868 redo if s{/\.?/}{/}; 1940 redo if s{/\.?/}{/};
1869 redo if s{/[^/]+/\.\./}{/}; 1941 redo if s{/[^/]+/\.\./}{/};
1870 } 1942 }
1871 1943
1872 $path 1944 $path
1886 $self->init; # pass $1 etc. 1958 $self->init; # pass $1 etc.
1887 return $self; 1959 return $self;
1888 } 1960 }
1889 } 1961 }
1890 1962
1891 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1963 Carp::cluck "unable to resolve path '$path' (base '$base')";
1892 () 1964 ()
1893} 1965}
1894 1966
1895sub init { 1967sub init {
1896 my ($self) = @_; 1968 my ($self) = @_;
1928sub uniq_path { 2000sub uniq_path {
1929 my ($self) = @_; 2001 my ($self) = @_;
1930 2002
1931 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2003 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1932 "$UNIQUEDIR/$path" 2004 "$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} 2005}
1943 2006
1944sub decay_objects { 2007sub decay_objects {
1945 my ($self) = @_; 2008 my ($self) = @_;
1946 2009
2028 2091
2029sub find; 2092sub find;
2030sub find { 2093sub find {
2031 my ($path, $origin) = @_; 2094 my ($path, $origin) = @_;
2032 2095
2096 cf::cede_to_tick;
2097
2033 $path = normalise $path, $origin && $origin->path; 2098 $path = normalise $path, $origin && $origin->path;
2034 2099
2035 cf::lock_wait "map_data:$path";#d#remove 2100 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2036 cf::lock_wait "map_find:$path"; 2101 my $guard2 = cf::lock_acquire "map_find:$path";
2037 2102
2038 $cf::MAP{$path} || do { 2103 $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 2104 my $map = new_from_path cf::map $path
2043 or return; 2105 or return;
2044 2106
2045 $map->{last_save} = $cf::RUNTIME; 2107 $map->{last_save} = $cf::RUNTIME;
2046 2108
2058 2120
2059 $cf::MAP{$path} = $map 2121 $cf::MAP{$path} = $map
2060 } 2122 }
2061} 2123}
2062 2124
2063sub pre_load { } 2125sub pre_load { }
2064sub post_load { } 2126#sub post_load { } # XS
2065 2127
2066sub load { 2128sub load {
2067 my ($self) = @_; 2129 my ($self) = @_;
2068 2130
2069 local $self->{deny_reset} = 1; # loading can take a long time 2131 local $self->{deny_reset} = 1; # loading can take a long time
2086 my $f = new_from_file cf::object::thawer $self->{load_path}; 2148 my $f = new_from_file cf::object::thawer $self->{load_path};
2087 $f->skip_block; 2149 $f->skip_block;
2088 $self->_load_objects ($f) 2150 $self->_load_objects ($f)
2089 or return; 2151 or return;
2090 2152
2091 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2153 $self->post_load_original
2092 if delete $self->{load_original}; 2154 if delete $self->{load_original};
2093 2155
2094 if (my $uniq = $self->uniq_path) { 2156 if (my $uniq = $self->uniq_path) {
2095 utf8::encode $uniq; 2157 utf8::encode $uniq;
2096 unless (aio_stat $uniq) { 2158 unless (aio_stat $uniq) {
2114 unless ($self->{deny_activate}) { 2176 unless ($self->{deny_activate}) {
2115 $self->decay_objects; 2177 $self->decay_objects;
2116 $self->fix_auto_apply; 2178 $self->fix_auto_apply;
2117 $self->update_buttons; 2179 $self->update_buttons;
2118 cf::cede_to_tick; 2180 cf::cede_to_tick;
2119 $self->set_darkness_map;
2120 cf::cede_to_tick;
2121 $self->activate; 2181 $self->activate;
2122 } 2182 }
2123 2183
2124 $self->{last_save} = $cf::RUNTIME; 2184 $self->{last_save} = $cf::RUNTIME;
2125 $self->last_access ($cf::RUNTIME); 2185 $self->last_access ($cf::RUNTIME);
2128 } 2188 }
2129 2189
2130 $self->post_load; 2190 $self->post_load;
2131} 2191}
2132 2192
2193# customize the map for a given player, i.e.
2194# return the _real_ map. used by e.g. per-player
2195# maps to change the path to ~playername/mappath
2133sub customise_for { 2196sub customise_for {
2134 my ($self, $ob) = @_; 2197 my ($self, $ob) = @_;
2135 2198
2136 return find "~" . $ob->name . "/" . $self->{path} 2199 return find "~" . $ob->name . "/" . $self->{path}
2137 if $self->per_player; 2200 if $self->per_player;
2153 or next; 2216 or next;
2154 $neigh = find $neigh, $map 2217 $neigh = find $neigh, $map
2155 or next; 2218 or next;
2156 $neigh->load; 2219 $neigh->load;
2157 2220
2221 # now find the diagonal neighbours
2158 push @neigh, 2222 push @neigh,
2159 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2223 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2160 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2224 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2161 } 2225 }
2162 2226
2169} 2233}
2170 2234
2171sub find_sync { 2235sub find_sync {
2172 my ($path, $origin) = @_; 2236 my ($path, $origin) = @_;
2173 2237
2174 cf::sync_job { find $path, $origin } 2238 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2239 if $Coro::current == $Coro::main;
2240
2241 find $path, $origin
2175} 2242}
2176 2243
2177sub do_load_sync { 2244sub do_load_sync {
2178 my ($map) = @_; 2245 my ($map) = @_;
2179 2246
2180 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2247 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2181 if $Coro::current == $Coro::main; 2248 if $Coro::current == $Coro::main;
2182 2249
2183 cf::sync_job { $map->load }; 2250 $map->load;
2184} 2251}
2185 2252
2186our %MAP_PREFETCH; 2253our %MAP_PREFETCH;
2187our $MAP_PREFETCHER = undef; 2254our $MAP_PREFETCHER = undef;
2188 2255
2214 $MAP_PREFETCHER->prio (6); 2281 $MAP_PREFETCHER->prio (6);
2215 2282
2216 () 2283 ()
2217} 2284}
2218 2285
2286# common code, used by both ->save and ->swapout
2219sub save { 2287sub _save {
2220 my ($self) = @_; 2288 my ($self) = @_;
2221
2222 my $lock = cf::lock_acquire "map_data:$self->{path}";
2223 2289
2224 $self->{last_save} = $cf::RUNTIME; 2290 $self->{last_save} = $cf::RUNTIME;
2225 2291
2226 return unless $self->dirty; 2292 return unless $self->dirty;
2227 2293
2247 } else { 2313 } else {
2248 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2314 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2249 } 2315 }
2250} 2316}
2251 2317
2318sub save {
2319 my ($self) = @_;
2320
2321 my $lock = cf::lock_acquire "map_data:$self->{path}";
2322
2323 $self->_save;
2324}
2325
2252sub swap_out { 2326sub swap_out {
2253 my ($self) = @_; 2327 my ($self) = @_;
2254 2328
2255 # save first because save cedes
2256 $self->save;
2257
2258 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2329 my $lock = cf::lock_acquire "map_data:$self->{path}";
2259 2330
2260 return if $self->players;
2261 return if $self->in_memory != cf::MAP_ACTIVE; 2331 return if $self->in_memory != cf::MAP_ACTIVE;
2262 return if $self->{deny_save}; 2332 return if $self->{deny_save};
2333 return if $self->players;
2263 2334
2335 # first deactivate the map and "unlink" it from the core
2336 $self->deactivate;
2337 $_->clear_links_to ($self) for values %cf::MAP;
2264 $self->in_memory (cf::MAP_SWAPPED); 2338 $self->in_memory (cf::MAP_SWAPPED);
2339
2340 # then atomically save
2341 $self->_save;
2342
2343 # then free the map
2344 $self->clear;
2345}
2346
2347sub reset_at {
2348 my ($self) = @_;
2349
2350 # TODO: safety, remove and allow resettable per-player maps
2351 return 1e99 if $self->{deny_reset};
2352
2353 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2354 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2355
2356 $time + $to
2357}
2358
2359sub should_reset {
2360 my ($self) = @_;
2361
2362 $self->reset_at <= $cf::RUNTIME
2363}
2364
2365sub reset {
2366 my ($self) = @_;
2367
2368 my $lock = cf::lock_acquire "map_data:$self->{path}";
2369
2370 return if $self->players;
2371
2372 cf::trace "resetting map ", $self->path, "\n";
2373
2374 $self->in_memory (cf::MAP_SWAPPED);
2375
2376 # need to save uniques path
2377 unless ($self->{deny_save}) {
2378 my $uniq = $self->uniq_path; utf8::encode $uniq;
2379
2380 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2381 if $uniq;
2382 }
2383
2384 delete $cf::MAP{$self->path};
2265 2385
2266 $self->deactivate; 2386 $self->deactivate;
2267 $_->clear_links_to ($self) for values %cf::MAP; 2387 $_->clear_links_to ($self) for values %cf::MAP;
2268 $self->clear; 2388 $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 2389
2314 $self->unlink_save; 2390 $self->unlink_save;
2315 $self->destroy; 2391 $self->destroy;
2316} 2392}
2317 2393
2325 2401
2326 delete $cf::MAP{$self->path}; 2402 delete $cf::MAP{$self->path};
2327 2403
2328 $self->unlink_save; 2404 $self->unlink_save;
2329 2405
2330 bless $self, "cf::map"; 2406 bless $self, "cf::map::wrap";
2331 delete $self->{deny_reset}; 2407 delete $self->{deny_reset};
2332 $self->{deny_save} = 1; 2408 $self->{deny_save} = 1;
2333 $self->reset_timeout (1); 2409 $self->reset_timeout (1);
2334 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2410 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2335 2411
2392 : normalise $_ 2468 : normalise $_
2393 } @{ aio_readdir $UNIQUEDIR or [] } 2469 } @{ aio_readdir $UNIQUEDIR or [] }
2394 ] 2470 ]
2395} 2471}
2396 2472
2473=item cf::map::static_maps
2474
2475Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2476file in the shared directory excluding F</styles> and F</editor>). May
2477block.
2478
2479=cut
2480
2481sub static_maps() {
2482 my @dirs = "";
2483 my @maps;
2484
2485 while (@dirs) {
2486 my $dir = shift @dirs;
2487
2488 next if $dir eq "/styles" || $dir eq "/editor";
2489
2490 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2491 or return;
2492
2493 for (@$files) {
2494 s/\.map$// or next;
2495 utf8::decode $_;
2496 push @maps, "$dir/$_";
2497 }
2498
2499 push @dirs, map "$dir/$_", @$dirs;
2500 }
2501
2502 \@maps
2503}
2504
2397=back 2505=back
2398 2506
2399=head3 cf::object 2507=head3 cf::object
2400 2508
2401=cut 2509=cut
2466 2574
2467our $SAY_CHANNEL = { 2575our $SAY_CHANNEL = {
2468 id => "say", 2576 id => "say",
2469 title => "Map", 2577 title => "Map",
2470 reply => "say ", 2578 reply => "say ",
2471 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2579 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2472}; 2580};
2473 2581
2474our $CHAT_CHANNEL = { 2582our $CHAT_CHANNEL = {
2475 id => "chat", 2583 id => "chat",
2476 title => "Chat", 2584 title => "Chat",
2531 2639
2532=item $player_object->enter_link 2640=item $player_object->enter_link
2533 2641
2534Freezes the player and moves him/her to a special map (C<{link}>). 2642Freezes the player and moves him/her to a special map (C<{link}>).
2535 2643
2536The player should be reasonably safe there for short amounts of time. You 2644The player should be reasonably safe there for short amounts of time (e.g.
2537I<MUST> call C<leave_link> as soon as possible, though. 2645for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2646though, as the player cannot control the character while it is on the link
2647map.
2538 2648
2539Will never block. 2649Will never block.
2540 2650
2541=item $player_object->leave_link ($map, $x, $y) 2651=item $player_object->leave_link ($map, $x, $y)
2542 2652
2562sub cf::object::player::enter_link { 2672sub cf::object::player::enter_link {
2563 my ($self) = @_; 2673 my ($self) = @_;
2564 2674
2565 $self->deactivate_recursive; 2675 $self->deactivate_recursive;
2566 2676
2677 ++$self->{_link_recursion};
2678
2567 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2679 return if UNIVERSAL::isa $self->map, "ext::map_link";
2568 2680
2569 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2681 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2570 if $self->map && $self->map->{path} ne "{link}"; 2682 if $self->map && $self->map->{path} ne "{link}";
2571 2683
2572 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2684 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2573} 2685}
2574 2686
2575sub cf::object::player::leave_link { 2687sub cf::object::player::leave_link {
2576 my ($self, $map, $x, $y) = @_; 2688 my ($self, $map, $x, $y) = @_;
2577 2689
2594 ($x, $y) = (-1, -1) 2706 ($x, $y) = (-1, -1)
2595 unless (defined $x) && (defined $y); 2707 unless (defined $x) && (defined $y);
2596 2708
2597 # use -1 or undef as default coordinates, not 0, 0 2709 # use -1 or undef as default coordinates, not 0, 0
2598 ($x, $y) = ($map->enter_x, $map->enter_y) 2710 ($x, $y) = ($map->enter_x, $map->enter_y)
2599 if $x <=0 && $y <= 0; 2711 if $x <= 0 && $y <= 0;
2600 2712
2601 $map->load; 2713 $map->load;
2602 $map->load_neighbours; 2714 $map->load_neighbours;
2603 2715
2604 return unless $self->contr->active; 2716 return unless $self->contr->active;
2605 $self->activate_recursive;
2606 2717
2607 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2718 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2608 $self->enter_map ($map, $x, $y); 2719 if ($self->enter_map ($map, $x, $y)) {
2609} 2720 # entering was successful
2721 delete $self->{_link_recursion};
2722 # only activate afterwards, to support waiting in hooks
2723 $self->activate_recursive;
2724 }
2610 2725
2726}
2727
2611=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2728=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2612 2729
2613Moves the player to the given map-path and coordinates by first freezing 2730Moves the player to the given map-path and coordinates by first freezing
2614her, loading and preparing them map, calling the provided $check callback 2731her, loading and preparing them map, calling the provided $check callback
2615that has to return the map if sucecssful, and then unfreezes the player on 2732that 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 2733the new (success) or old (failed) map position. In either case, $done will
2617be called at the end of this process. 2734be called at the end of this process.
2618 2735
2736Note that $check will be called with a potentially non-loaded map, so if
2737it needs a loaded map it has to call C<< ->load >>.
2738
2619=cut 2739=cut
2620 2740
2621our $GOTOGEN; 2741our $GOTOGEN;
2622 2742
2623sub cf::object::player::goto { 2743sub cf::object::player::goto {
2624 my ($self, $path, $x, $y, $check, $done) = @_; 2744 my ($self, $path, $x, $y, $check, $done) = @_;
2745
2746 if ($self->{_link_recursion} >= $MAX_LINKS) {
2747 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2748 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2749 ($path, $x, $y) = @$EMERGENCY_POSITION;
2750 }
2625 2751
2626 # do generation counting so two concurrent goto's will be executed in-order 2752 # do generation counting so two concurrent goto's will be executed in-order
2627 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2753 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2628 2754
2629 $self->enter_link; 2755 $self->enter_link;
2653 my $map = eval { 2779 my $map = eval {
2654 my $map = defined $path ? cf::map::find $path : undef; 2780 my $map = defined $path ? cf::map::find $path : undef;
2655 2781
2656 if ($map) { 2782 if ($map) {
2657 $map = $map->customise_for ($self); 2783 $map = $map->customise_for ($self);
2658 $map = $check->($map) if $check && $map; 2784 $map = $check->($map, $x, $y, $self) if $check && $map;
2659 } else { 2785 } else {
2660 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2786 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2661 } 2787 }
2662 2788
2663 $map 2789 $map
2671 if ($gen == $self->{_goto_generation}) { 2797 if ($gen == $self->{_goto_generation}) {
2672 delete $self->{_goto_generation}; 2798 delete $self->{_goto_generation};
2673 $self->leave_link ($map, $x, $y); 2799 $self->leave_link ($map, $x, $y);
2674 } 2800 }
2675 2801
2676 $done->() if $done; 2802 $done->($self) if $done;
2677 })->prio (1); 2803 })->prio (1);
2678} 2804}
2679 2805
2680=item $player_object->enter_exit ($exit_object) 2806=item $player_object->enter_exit ($exit_object)
2681 2807
2769 $self->contr->savebed ($map, $x, $y) 2895 $self->contr->savebed ($map, $x, $y)
2770 if $exit->flag (cf::FLAG_DAMNED); 2896 if $exit->flag (cf::FLAG_DAMNED);
2771 2897
2772 1 2898 1
2773 }) { 2899 }) {
2774 $self->message ("Something went wrong deep within the crossfire server. " 2900 $self->message ("Something went wrong deep within the deliantra server. "
2775 . "I'll try to bring you back to the map you were before. " 2901 . "I'll try to bring you back to the map you were before. "
2776 . "Please report this to the dungeon master!", 2902 . "Please report this to the dungeon master!",
2777 cf::NDI_UNIQUE | cf::NDI_RED); 2903 cf::NDI_UNIQUE | cf::NDI_RED);
2778 2904
2779 warn "ERROR in enter_exit: $@"; 2905 error "ERROR in enter_exit: $@";
2780 $self->leave_link; 2906 $self->leave_link;
2781 } 2907 }
2782 })->prio (1); 2908 })->prio (1);
2783} 2909}
2784 2910
2796sub cf::client::send_drawinfo { 2922sub cf::client::send_drawinfo {
2797 my ($self, $text, $flags) = @_; 2923 my ($self, $text, $flags) = @_;
2798 2924
2799 utf8::encode $text; 2925 utf8::encode $text;
2800 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2926 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2927}
2928
2929=item $client->send_big_packet ($pkt)
2930
2931Like C<send_packet>, but tries to compress large packets, and fragments
2932them as required.
2933
2934=cut
2935
2936our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2937
2938sub cf::client::send_big_packet {
2939 my ($self, $pkt) = @_;
2940
2941 # try lzf for large packets
2942 $pkt = "lzf " . Compress::LZF::compress $pkt
2943 if 1024 <= length $pkt and $self->{can_lzf};
2944
2945 # split very large packets
2946 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2947 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2948 $pkt = "frag";
2949 }
2950
2951 $self->send_packet ($pkt);
2801} 2952}
2802 2953
2803=item $client->send_msg ($channel, $msg, $color, [extra...]) 2954=item $client->send_msg ($channel, $msg, $color, [extra...])
2804 2955
2805Send a drawinfo or msg packet to the client, formatting the msg for the 2956Send a drawinfo or msg packet to the client, formatting the msg for the
2809 2960
2810=cut 2961=cut
2811 2962
2812# non-persistent channels (usually the info channel) 2963# non-persistent channels (usually the info channel)
2813our %CHANNEL = ( 2964our %CHANNEL = (
2965 "c/motd" => {
2966 id => "infobox",
2967 title => "MOTD",
2968 reply => undef,
2969 tooltip => "The message of the day",
2970 },
2814 "c/identify" => { 2971 "c/identify" => {
2815 id => "infobox", 2972 id => "infobox",
2816 title => "Identify", 2973 title => "Identify",
2817 reply => undef, 2974 reply => undef,
2818 tooltip => "Items recently identified", 2975 tooltip => "Items recently identified",
2820 "c/examine" => { 2977 "c/examine" => {
2821 id => "infobox", 2978 id => "infobox",
2822 title => "Examine", 2979 title => "Examine",
2823 reply => undef, 2980 reply => undef,
2824 tooltip => "Signs and other items you examined", 2981 tooltip => "Signs and other items you examined",
2982 },
2983 "c/shopinfo" => {
2984 id => "infobox",
2985 title => "Shop Info",
2986 reply => undef,
2987 tooltip => "What your bargaining skill tells you about the shop",
2825 }, 2988 },
2826 "c/book" => { 2989 "c/book" => {
2827 id => "infobox", 2990 id => "infobox",
2828 title => "Book", 2991 title => "Book",
2829 reply => undef, 2992 reply => undef,
2845 id => "infobox", 3008 id => "infobox",
2846 title => "Body Parts", 3009 title => "Body Parts",
2847 reply => undef, 3010 reply => undef,
2848 tooltip => "Shows which body parts you posess and are available", 3011 tooltip => "Shows which body parts you posess and are available",
2849 }, 3012 },
3013 "c/statistics" => {
3014 id => "infobox",
3015 title => "Statistics",
3016 reply => undef,
3017 tooltip => "Shows your primary statistics",
3018 },
3019 "c/skills" => {
3020 id => "infobox",
3021 title => "Skills",
3022 reply => undef,
3023 tooltip => "Shows your experience per skill and item power",
3024 },
3025 "c/shopitems" => {
3026 id => "infobox",
3027 title => "Shop Items",
3028 reply => undef,
3029 tooltip => "Shows the items currently for sale in this shop",
3030 },
3031 "c/resistances" => {
3032 id => "infobox",
3033 title => "Resistances",
3034 reply => undef,
3035 tooltip => "Shows your resistances",
3036 },
3037 "c/pets" => {
3038 id => "infobox",
3039 title => "Pets",
3040 reply => undef,
3041 tooltip => "Shows information abotu your pets/a specific pet",
3042 },
3043 "c/perceiveself" => {
3044 id => "infobox",
3045 title => "Perceive Self",
3046 reply => undef,
3047 tooltip => "You gained detailed knowledge about yourself",
3048 },
2850 "c/uptime" => { 3049 "c/uptime" => {
2851 id => "infobox", 3050 id => "infobox",
2852 title => "Uptime", 3051 title => "Uptime",
2853 reply => undef, 3052 reply => undef,
2854 tooltip => "How long the server has been running since last restart", 3053 tooltip => "How long the server has been running since last restart",
2863 id => "party", 3062 id => "party",
2864 title => "Party", 3063 title => "Party",
2865 reply => "gsay ", 3064 reply => "gsay ",
2866 tooltip => "Messages and chat related to your party", 3065 tooltip => "Messages and chat related to your party",
2867 }, 3066 },
3067 "c/death" => {
3068 id => "death",
3069 title => "Death",
3070 reply => undef,
3071 tooltip => "Reason for and more info about your most recent death",
3072 },
3073 "c/say" => $SAY_CHANNEL,
3074 "c/chat" => $CHAT_CHANNEL,
2868); 3075);
2869 3076
2870sub cf::client::send_msg { 3077sub cf::client::send_msg {
2871 my ($self, $channel, $msg, $color, @extra) = @_; 3078 my ($self, $channel, $msg, $color, @extra) = @_;
2872 3079
2873 $msg = $self->pl->expand_cfpod ($msg); 3080 $msg = $self->pl->expand_cfpod ($msg)
3081 unless $color & cf::NDI_VERBATIM;
2874 3082
2875 $color &= cf::NDI_CLIENT_MASK; # just in case... 3083 $color &= cf::NDI_CLIENT_MASK; # just in case...
2876 3084
2877 # check predefined channels, for the benefit of C 3085 # check predefined channels, for the benefit of C
2878 if ($CHANNEL{$channel}) { 3086 if ($CHANNEL{$channel}) {
2879 $channel = $CHANNEL{$channel}; 3087 $channel = $CHANNEL{$channel};
2880 3088
2881 $self->ext_msg (channel_info => $channel) 3089 $self->ext_msg (channel_info => $channel);
2882 if $self->can_msg;
2883
2884 $channel = $channel->{id}; 3090 $channel = $channel->{id};
2885 3091
2886 } elsif (ref $channel) { 3092 } elsif (ref $channel) {
2887 # send meta info to client, if not yet sent 3093 # send meta info to client, if not yet sent
2888 unless (exists $self->{channel}{$channel->{id}}) { 3094 unless (exists $self->{channel}{$channel->{id}}) {
2889 $self->{channel}{$channel->{id}} = $channel; 3095 $self->{channel}{$channel->{id}} = $channel;
2890 $self->ext_msg (channel_info => $channel) 3096 $self->ext_msg (channel_info => $channel);
2891 if $self->can_msg;
2892 } 3097 }
2893 3098
2894 $channel = $channel->{id}; 3099 $channel = $channel->{id};
2895 } 3100 }
2896 3101
2897 return unless @extra || length $msg; 3102 return unless @extra || length $msg;
2898 3103
2899 if ($self->can_msg) {
2900 # default colour, mask it out 3104 # default colour, mask it out
2901 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3105 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2902 if $color & cf::NDI_DEF; 3106 if $color & cf::NDI_DEF;
2903 3107
2904 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3108 my $pkt = "msg "
3109 . $self->{json_coder}->encode (
2905 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3110 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2906 } else { 3111 );
2907 if ($color >= 0) {
2908 # replace some tags by gcfclient-compatible ones
2909 for ($msg) {
2910 1 while
2911 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2912 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2913 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2914 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2915 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2916 }
2917 3112
2918 $color &= cf::NDI_COLOR_MASK; 3113 $self->send_big_packet ($pkt);
2919
2920 utf8::encode $msg;
2921
2922 if (0 && $msg =~ /\[/) {
2923 # COMMAND/INFO
2924 $self->send_packet ("drawextinfo $color 10 8 $msg")
2925 } else {
2926 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2927 $self->send_packet ("drawinfo $color $msg")
2928 }
2929 }
2930 }
2931} 3114}
2932 3115
2933=item $client->ext_msg ($type, @msg) 3116=item $client->ext_msg ($type, @msg)
2934 3117
2935Sends an ext event to the client. 3118Sends an ext event to the client.
2938 3121
2939sub cf::client::ext_msg($$@) { 3122sub cf::client::ext_msg($$@) {
2940 my ($self, $type, @msg) = @_; 3123 my ($self, $type, @msg) = @_;
2941 3124
2942 if ($self->extcmd == 2) { 3125 if ($self->extcmd == 2) {
2943 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3126 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2944 } elsif ($self->extcmd == 1) { # TODO: remove 3127 } elsif ($self->extcmd == 1) { # TODO: remove
2945 push @msg, msgtype => "event_$type"; 3128 push @msg, msgtype => "event_$type";
2946 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3129 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2947 } 3130 }
2948} 3131}
2949 3132
2950=item $client->ext_reply ($msgid, @msg) 3133=item $client->ext_reply ($msgid, @msg)
2951 3134
2955 3138
2956sub cf::client::ext_reply($$@) { 3139sub cf::client::ext_reply($$@) {
2957 my ($self, $id, @msg) = @_; 3140 my ($self, $id, @msg) = @_;
2958 3141
2959 if ($self->extcmd == 2) { 3142 if ($self->extcmd == 2) {
2960 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3143 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2961 } elsif ($self->extcmd == 1) { 3144 } elsif ($self->extcmd == 1) {
2962 #TODO: version 1, remove 3145 #TODO: version 1, remove
2963 unshift @msg, msgtype => "reply", msgid => $id; 3146 unshift @msg, msgtype => "reply", msgid => $id;
2964 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3147 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2965 } 3148 }
2966} 3149}
2967 3150
2968=item $success = $client->query ($flags, "text", \&cb) 3151=item $success = $client->query ($flags, "text", \&cb)
2969 3152
3040 3223
3041 $ns->ext_reply ($reply, @reply) 3224 $ns->ext_reply ($reply, @reply)
3042 if $reply; 3225 if $reply;
3043 3226
3044 } else { 3227 } else {
3045 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3228 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3046 } 3229 }
3047 3230
3048 cf::override; 3231 cf::override;
3049 }, 3232 },
3050); 3233);
3070 3253
3071 $coro 3254 $coro
3072} 3255}
3073 3256
3074cf::client->attach ( 3257cf::client->attach (
3075 on_destroy => sub { 3258 on_client_destroy => sub {
3076 my ($ns) = @_; 3259 my ($ns) = @_;
3077 3260
3078 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3261 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3079 }, 3262 },
3080); 3263);
3096our $safe_hole = new Safe::Hole; 3279our $safe_hole = new Safe::Hole;
3097 3280
3098$SIG{FPE} = 'IGNORE'; 3281$SIG{FPE} = 'IGNORE';
3099 3282
3100$safe->permit_only (Opcode::opset qw( 3283$safe->permit_only (Opcode::opset qw(
3101 :base_core :base_mem :base_orig :base_math 3284 :base_core :base_mem :base_orig :base_math :base_loop
3102 grepstart grepwhile mapstart mapwhile 3285 grepstart grepwhile mapstart mapwhile
3103 sort time 3286 sort time
3104)); 3287));
3105 3288
3106# here we export the classes and methods available to script code 3289# here we export the classes and methods available to script code
3110The following functions and methods are available within a safe environment: 3293The following functions and methods are available within a safe environment:
3111 3294
3112 cf::object 3295 cf::object
3113 contr pay_amount pay_player map x y force_find force_add destroy 3296 contr pay_amount pay_player map x y force_find force_add destroy
3114 insert remove name archname title slaying race decrease split 3297 insert remove name archname title slaying race decrease split
3298 value
3115 3299
3116 cf::object::player 3300 cf::object::player
3117 player 3301 player
3118 3302
3119 cf::player 3303 cf::player
3125=cut 3309=cut
3126 3310
3127for ( 3311for (
3128 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3312 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3129 insert remove inv nrof name archname title slaying race 3313 insert remove inv nrof name archname title slaying race
3130 decrease split destroy)], 3314 decrease split destroy change_exp value msg lore send_msg)],
3131 ["cf::object::player" => qw(player)], 3315 ["cf::object::player" => qw(player)],
3132 ["cf::player" => qw(peaceful)], 3316 ["cf::player" => qw(peaceful send_msg)],
3133 ["cf::map" => qw(trigger)], 3317 ["cf::map" => qw(trigger)],
3134) { 3318) {
3135 no strict 'refs';
3136 my ($pkg, @funs) = @$_; 3319 my ($pkg, @funs) = @$_;
3137 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3320 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3138 for @funs; 3321 for @funs;
3139} 3322}
3140 3323
3155 3338
3156 my $qcode = $code; 3339 my $qcode = $code;
3157 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3340 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3158 $qcode =~ s/\n/\\n/g; 3341 $qcode =~ s/\n/\\n/g;
3159 3342
3343 %vars = (_dummy => 0) unless %vars;
3344
3345 my @res;
3160 local $_; 3346 local $_;
3161 local @safe::cf::_safe_eval_args = values %vars;
3162 3347
3163 my $eval = 3348 my $eval =
3164 "do {\n" 3349 "do {\n"
3165 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3350 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3166 . "#line 0 \"{$qcode}\"\n" 3351 . "#line 0 \"{$qcode}\"\n"
3167 . $code 3352 . $code
3168 . "\n}" 3353 . "\n}"
3169 ; 3354 ;
3170 3355
3356 if ($CFG{safe_eval}) {
3171 sub_generation_inc; 3357 sub_generation_inc;
3358 local @safe::cf::_safe_eval_args = values %vars;
3172 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3359 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3173 sub_generation_inc; 3360 sub_generation_inc;
3361 } else {
3362 local @cf::_safe_eval_args = values %vars;
3363 @res = wantarray ? eval eval : scalar eval $eval;
3364 }
3174 3365
3175 if ($@) { 3366 if ($@) {
3176 warn "$@"; 3367 warn "$@",
3177 warn "while executing safe code '$code'\n"; 3368 "while executing safe code '$code'\n",
3178 warn "with arguments " . (join " ", %vars) . "\n"; 3369 "with arguments " . (join " ", %vars) . "\n";
3179 } 3370 }
3180 3371
3181 wantarray ? @res : $res[0] 3372 wantarray ? @res : $res[0]
3182} 3373}
3183 3374
3197=cut 3388=cut
3198 3389
3199sub register_script_function { 3390sub register_script_function {
3200 my ($fun, $cb) = @_; 3391 my ($fun, $cb) = @_;
3201 3392
3202 no strict 'refs'; 3393 $fun = "safe::$fun" if $CFG{safe_eval};
3203 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3394 *$fun = $safe_hole->wrap ($cb);
3204} 3395}
3205 3396
3206=back 3397=back
3207 3398
3208=cut 3399=cut
3217 # for this (global event?) 3408 # for this (global event?)
3218 %ext::player_env::MUSIC_FACE_CACHE = (); 3409 %ext::player_env::MUSIC_FACE_CACHE = ();
3219 3410
3220 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3411 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3221 3412
3222 warn "loading facedata from $path\n"; 3413 trace "loading facedata from $path\n";
3223 3414
3224 my $facedata;
3225 0 < aio_load $path, $facedata 3415 0 < aio_load $path, my $facedata
3226 or die "$path: $!"; 3416 or die "$path: $!";
3227 3417
3228 $facedata = Coro::Storable::thaw $facedata; 3418 $facedata = Coro::Storable::thaw $facedata;
3229 3419
3230 $facedata->{version} == 2 3420 $facedata->{version} == 2
3231 or cf::cleanup "$path: version mismatch, cannot proceed."; 3421 or cf::cleanup "$path: version mismatch, cannot proceed.";
3232 3422
3233 # patch in the exptable 3423 # patch in the exptable
3424 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3234 $facedata->{resource}{"res/exp_table"} = { 3425 $facedata->{resource}{"res/exp_table"} = {
3235 type => FT_RSRC, 3426 type => FT_RSRC,
3236 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3427 data => $exp_table,
3428 hash => (Digest::MD5::md5 $exp_table),
3237 }; 3429 };
3238 cf::cede_to_tick; 3430 cf::cede_to_tick;
3239 3431
3240 { 3432 {
3241 my $faces = $facedata->{faceinfo}; 3433 my $faces = $facedata->{faceinfo};
3243 while (my ($face, $info) = each %$faces) { 3435 while (my ($face, $info) = each %$faces) {
3244 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3436 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3245 3437
3246 cf::face::set_visibility $idx, $info->{visibility}; 3438 cf::face::set_visibility $idx, $info->{visibility};
3247 cf::face::set_magicmap $idx, $info->{magicmap}; 3439 cf::face::set_magicmap $idx, $info->{magicmap};
3248 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3440 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3249 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3441 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3250 3442
3251 cf::cede_to_tick; 3443 cf::cede_to_tick;
3252 } 3444 }
3253 3445
3254 while (my ($face, $info) = each %$faces) { 3446 while (my ($face, $info) = each %$faces) {
3259 3451
3260 if (my $smooth = cf::face::find $info->{smooth}) { 3452 if (my $smooth = cf::face::find $info->{smooth}) {
3261 cf::face::set_smooth $idx, $smooth; 3453 cf::face::set_smooth $idx, $smooth;
3262 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3454 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3263 } else { 3455 } else {
3264 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3456 error "smooth face '$info->{smooth}' not found for face '$face'";
3265 } 3457 }
3266 3458
3267 cf::cede_to_tick; 3459 cf::cede_to_tick;
3268 } 3460 }
3269 } 3461 }
3278 3470
3279 cf::anim::invalidate_all; # d'oh 3471 cf::anim::invalidate_all; # d'oh
3280 } 3472 }
3281 3473
3282 { 3474 {
3283 # TODO: for gcfclient pleasure, we should give resources
3284 # that gcfclient doesn't grok a >10000 face index.
3285 my $res = $facedata->{resource}; 3475 my $res = $facedata->{resource};
3286 3476
3287 while (my ($name, $info) = each %$res) { 3477 while (my ($name, $info) = each %$res) {
3288 if (defined $info->{type}) { 3478 if (defined $info->{type}) {
3289 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3479 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3290 my $data;
3291 3480
3292 if ($info->{type} & 1) { 3481 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3293 # prepend meta info
3294
3295 my $meta = $enc->encode ({
3296 name => $name,
3297 %{ $info->{meta} || {} },
3298 });
3299
3300 $data = pack "(w/a*)*", $meta, $info->{data};
3301 } else {
3302 $data = $info->{data};
3303 }
3304
3305 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3306 cf::face::set_type $idx, $info->{type}; 3482 cf::face::set_type $idx, $info->{type};
3307 } else { 3483 } else {
3308 $RESOURCE{$name} = $info; 3484 $RESOURCE{$name} = $info; # unused
3309 } 3485 }
3310 3486
3311 cf::cede_to_tick; 3487 cf::cede_to_tick;
3312 } 3488 }
3313 } 3489 }
3314 3490
3315 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3491 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3316 3492
3317 1 3493 1
3318} 3494}
3319
3320cf::global->attach (on_resource_update => sub {
3321 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3322 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3323
3324 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3325 my $sound = $soundconf->{compat}[$_]
3326 or next;
3327
3328 my $face = cf::face::find "sound/$sound->[1]";
3329 cf::sound::set $sound->[0] => $face;
3330 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3331 }
3332
3333 while (my ($k, $v) = each %{$soundconf->{event}}) {
3334 my $face = cf::face::find "sound/$v";
3335 cf::sound::set $k => $face;
3336 }
3337 }
3338});
3339 3495
3340register_exticmd fx_want => sub { 3496register_exticmd fx_want => sub {
3341 my ($ns, $want) = @_; 3497 my ($ns, $want) = @_;
3342 3498
3343 while (my ($k, $v) = each %$want) { 3499 while (my ($k, $v) = each %$want) {
3382sub reload_treasures { 3538sub reload_treasures {
3383 load_resource_file "$DATADIR/treasures" 3539 load_resource_file "$DATADIR/treasures"
3384 or die "unable to load treasurelists\n"; 3540 or die "unable to load treasurelists\n";
3385} 3541}
3386 3542
3543sub reload_sound {
3544 trace "loading sound config from $DATADIR/sound\n";
3545
3546 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3547 or die "$DATADIR/sound $!";
3548
3549 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3550
3551 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3552 my $sound = $soundconf->{compat}[$_]
3553 or next;
3554
3555 my $face = cf::face::find "sound/$sound->[1]";
3556 cf::sound::set $sound->[0] => $face;
3557 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3558 }
3559
3560 while (my ($k, $v) = each %{$soundconf->{event}}) {
3561 my $face = cf::face::find "sound/$v";
3562 cf::sound::set $k => $face;
3563 }
3564}
3565
3387sub reload_resources { 3566sub reload_resources {
3388 warn "reloading resource files...\n"; 3567 trace "reloading resource files...\n";
3389 3568
3569 reload_exp_table;
3570 reload_materials;
3390 reload_facedata; 3571 reload_facedata;
3572 reload_sound;
3391 reload_archetypes; 3573 reload_archetypes;
3392 reload_regions; 3574 reload_regions;
3393 reload_treasures; 3575 reload_treasures;
3394 3576
3395 warn "finished reloading resource files\n"; 3577 trace "finished reloading resource files\n";
3396}
3397
3398sub init {
3399 my $guard = freeze_mainloop;
3400
3401 evthread_start IO::AIO::poll_fileno;
3402
3403 reload_resources;
3404} 3578}
3405 3579
3406sub reload_config { 3580sub reload_config {
3407 open my $fh, "<:utf8", "$CONFDIR/config" 3581 trace "reloading config file...\n";
3408 or return;
3409 3582
3410 local $/; 3583 0 < aio_load "$CONFDIR/config", my $config
3411 *CFG = YAML::Load <$fh>; 3584 or die "$CONFDIR/config: $!";
3412 3585
3586 utf8::decode $config;
3587 *CFG = yaml_load $config;
3588
3413 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3589 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3414 3590
3415 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3591 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3416 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3592 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3417 3593
3418 if (exists $CFG{mlockall}) { 3594 if (exists $CFG{mlockall}) {
3422 }; 3598 };
3423 warn $@ if $@; 3599 warn $@ if $@;
3424 } 3600 }
3425} 3601}
3426 3602
3603sub pidfile() {
3604 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3605 or die "$PIDFILE: $!";
3606 flock $fh, &Fcntl::LOCK_EX
3607 or die "$PIDFILE: flock: $!";
3608 $fh
3609}
3610
3611# make sure only one server instance is running at any one time
3612sub atomic {
3613 my $fh = pidfile;
3614
3615 my $pid = <$fh>;
3616 kill 9, $pid if $pid > 0;
3617
3618 seek $fh, 0, 0;
3619 print $fh $$;
3620}
3621
3622sub main_loop {
3623 trace "EV::loop starting\n";
3624 if (1) {
3625 EV::loop;
3626 }
3627 trace "EV::loop returned\n";
3628 goto &main_loop unless $REALLY_UNLOOP;
3629}
3630
3427sub main { 3631sub main {
3632 cf::init_globals; # initialise logging
3633
3634 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3635 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3636 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3637 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3638
3639 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3640
3428 # we must not ever block the main coroutine 3641 # we must not ever block the main coroutine
3429 local $Coro::idle = sub { 3642 local $Coro::idle = sub {
3430 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3643 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3431 (async { 3644 (async {
3432 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3645 $Coro::current->{desc} = "IDLE BUG HANDLER";
3433 EV::loop EV::LOOP_ONESHOT; 3646 EV::loop EV::LOOP_ONESHOT;
3434 })->prio (Coro::PRIO_MAX); 3647 })->prio (Coro::PRIO_MAX);
3435 }; 3648 };
3436 3649
3437 { 3650 evthread_start IO::AIO::poll_fileno;
3438 my $guard = freeze_mainloop; 3651
3652 cf::sync_job {
3653 cf::incloader::init ();
3654
3655 cf::init_anim;
3656 cf::init_attackmess;
3657 cf::init_dynamic;
3658
3659 cf::load_settings;
3660
3661 reload_resources;
3439 reload_config; 3662 reload_config;
3440 db_init; 3663 db_init;
3664
3665 cf::init_uuid;
3666 cf::init_signals;
3667 cf::init_skills;
3668
3669 cf::init_beforeplay;
3670
3671 atomic;
3672
3441 load_extensions; 3673 load_extensions;
3442 3674
3443 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3675 utime time, time, $RUNTIMEFILE;
3676
3677 # no (long-running) fork's whatsoever before this point(!)
3678 use POSIX ();
3679 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3680
3681 cf::_post_init 0;
3444 } 3682 };
3445 3683
3446 EV::loop; 3684 cf::object::thawer::errors_are_fatal 0;
3685 info "parse errors in files are no longer fatal from this point on.\n";
3686
3687 my $free_main; $free_main = EV::idle sub {
3688 undef $free_main;
3689 undef &main; # free gobs of memory :)
3690 };
3691
3692 goto &main_loop;
3447} 3693}
3448 3694
3449############################################################################# 3695#############################################################################
3450# initialisation and cleanup 3696# initialisation and cleanup
3451 3697
3452# install some emergency cleanup handlers 3698# install some emergency cleanup handlers
3453BEGIN { 3699BEGIN {
3454 our %SIGWATCHER = (); 3700 our %SIGWATCHER = ();
3455 for my $signal (qw(INT HUP TERM)) { 3701 for my $signal (qw(INT HUP TERM)) {
3456 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3702 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3457 cf::cleanup "SIG$signal"; 3703 cf::cleanup "SIG$signal";
3458 }; 3704 };
3459 } 3705 }
3460} 3706}
3461 3707
3462sub write_runtime_sync { 3708sub write_runtime_sync {
3463 my $runtime = "$LOCALDIR/runtime"; 3709 my $t0 = AE::time;
3464 3710
3465 # first touch the runtime file to show we are still running: 3711 # first touch the runtime file to show we are still running:
3466 # the fsync below can take a very very long time. 3712 # the fsync below can take a very very long time.
3467 3713
3468 IO::AIO::aio_utime $runtime, undef, undef; 3714 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3469 3715
3470 my $guard = cf::lock_acquire "write_runtime"; 3716 my $guard = cf::lock_acquire "write_runtime";
3471 3717
3472 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3718 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3473 or return; 3719 or return;
3474 3720
3475 my $value = $cf::RUNTIME + 90 + 10; 3721 my $value = $cf::RUNTIME + 90 + 10;
3476 # 10 is the runtime save interval, for a monotonic clock 3722 # 10 is the runtime save interval, for a monotonic clock
3477 # 60 allows for the watchdog to kill the server. 3723 # 60 allows for the watchdog to kill the server.
3487 aio_utime $fh, undef, undef; 3733 aio_utime $fh, undef, undef;
3488 3734
3489 close $fh 3735 close $fh
3490 or return; 3736 or return;
3491 3737
3492 aio_rename "$runtime~", $runtime 3738 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3493 and return; 3739 and return;
3494 3740
3495 warn "runtime file written.\n"; 3741 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3496 3742
3497 1 3743 1
3498} 3744}
3499 3745
3500our $uuid_lock; 3746our $uuid_lock;
3509 my $uuid = "$LOCALDIR/uuid"; 3755 my $uuid = "$LOCALDIR/uuid";
3510 3756
3511 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3757 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3512 or return; 3758 or return;
3513 3759
3514 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3760 my $value = uuid_seq uuid_cur;
3761
3762 unless ($value) {
3763 info "cowardly refusing to write zero uuid value!\n";
3764 return;
3765 }
3766
3767 my $value = uuid_str $value + $uuid_skip;
3515 $uuid_skip = 0; 3768 $uuid_skip = 0;
3516 3769
3517 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3770 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3518 and return; 3771 and return;
3519 3772
3525 or return; 3778 or return;
3526 3779
3527 aio_rename "$uuid~", $uuid 3780 aio_rename "$uuid~", $uuid
3528 and return; 3781 and return;
3529 3782
3530 warn "uuid file written ($value).\n"; 3783 trace "uuid file written ($value).\n";
3531 3784
3532 1 3785 1
3533 3786
3534} 3787}
3535 3788
3541} 3794}
3542 3795
3543sub emergency_save() { 3796sub emergency_save() {
3544 my $freeze_guard = cf::freeze_mainloop; 3797 my $freeze_guard = cf::freeze_mainloop;
3545 3798
3546 warn "enter emergency perl save\n"; 3799 info "emergency_perl_save: enter\n";
3800
3801 # this is a trade-off: we want to be very quick here, so
3802 # save all maps without fsync, and later call a global sync
3803 # (which in turn might be very very slow)
3804 local $USE_FSYNC = 0;
3547 3805
3548 cf::sync_job { 3806 cf::sync_job {
3807 cf::write_runtime_sync; # external watchdog should not bark
3808
3549 # use a peculiar iteration method to avoid tripping on perl 3809 # use a peculiar iteration method to avoid tripping on perl
3550 # refcount bugs in for. also avoids problems with players 3810 # refcount bugs in for. also avoids problems with players
3551 # and maps saved/destroyed asynchronously. 3811 # and maps saved/destroyed asynchronously.
3552 warn "begin emergency player save\n"; 3812 info "emergency_perl_save: begin player save\n";
3553 for my $login (keys %cf::PLAYER) { 3813 for my $login (keys %cf::PLAYER) {
3554 my $pl = $cf::PLAYER{$login} or next; 3814 my $pl = $cf::PLAYER{$login} or next;
3555 $pl->valid or next; 3815 $pl->valid or next;
3556 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3816 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3557 $pl->save; 3817 $pl->save;
3558 } 3818 }
3559 warn "end emergency player save\n"; 3819 info "emergency_perl_save: end player save\n";
3560 3820
3561 warn "begin emergency map save\n"; 3821 cf::write_runtime_sync; # external watchdog should not bark
3822
3823 info "emergency_perl_save: begin map save\n";
3562 for my $path (keys %cf::MAP) { 3824 for my $path (keys %cf::MAP) {
3563 my $map = $cf::MAP{$path} or next; 3825 my $map = $cf::MAP{$path} or next;
3564 $map->valid or next; 3826 $map->valid or next;
3565 $map->save; 3827 $map->save;
3566 } 3828 }
3567 warn "end emergency map save\n"; 3829 info "emergency_perl_save: end map save\n";
3568 3830
3569 warn "begin emergency database checkpoint\n"; 3831 cf::write_runtime_sync; # external watchdog should not bark
3832
3833 info "emergency_perl_save: begin database checkpoint\n";
3570 BDB::db_env_txn_checkpoint $DB_ENV; 3834 BDB::db_env_txn_checkpoint $DB_ENV;
3571 warn "end emergency database checkpoint\n"; 3835 info "emergency_perl_save: end database checkpoint\n";
3572 3836
3573 warn "begin write uuid\n"; 3837 info "emergency_perl_save: begin write uuid\n";
3574 write_uuid_sync 1; 3838 write_uuid_sync 1;
3575 warn "end write uuid\n"; 3839 info "emergency_perl_save: end write uuid\n";
3840
3841 cf::write_runtime_sync; # external watchdog should not bark
3842
3843 trace "emergency_perl_save: syncing database to disk";
3844 BDB::db_env_txn_checkpoint $DB_ENV;
3845
3846 info "emergency_perl_save: starting sync\n";
3847 IO::AIO::aio_sync sub {
3848 info "emergency_perl_save: finished sync\n";
3849 };
3850
3851 cf::write_runtime_sync; # external watchdog should not bark
3852
3853 trace "emergency_perl_save: flushing outstanding aio requests";
3854 while (IO::AIO::nreqs || BDB::nreqs) {
3855 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3856 }
3857
3858 cf::write_runtime_sync; # external watchdog should not bark
3576 }; 3859 };
3577 3860
3578 warn "leave emergency perl save\n"; 3861 info "emergency_perl_save: leave\n";
3579} 3862}
3580 3863
3581sub post_cleanup { 3864sub post_cleanup {
3582 my ($make_core) = @_; 3865 my ($make_core) = @_;
3583 3866
3867 IO::AIO::flush;
3868
3584 warn Carp::longmess "post_cleanup backtrace" 3869 error Carp::longmess "post_cleanup backtrace"
3585 if $make_core; 3870 if $make_core;
3871
3872 my $fh = pidfile;
3873 unlink $PIDFILE if <$fh> == $$;
3874}
3875
3876# a safer delete_package, copied from Symbol
3877sub clear_package($) {
3878 my $pkg = shift;
3879
3880 # expand to full symbol table name if needed
3881 unless ($pkg =~ /^main::.*::$/) {
3882 $pkg = "main$pkg" if $pkg =~ /^::/;
3883 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3884 $pkg .= '::' unless $pkg =~ /::$/;
3885 }
3886
3887 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3888 my $stem_symtab = *{$stem}{HASH};
3889
3890 defined $stem_symtab and exists $stem_symtab->{$leaf}
3891 or return;
3892
3893 # clear all symbols
3894 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3895 for my $name (keys %$leaf_symtab) {
3896 _gv_clear *{"$pkg$name"};
3897# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3898 }
3586} 3899}
3587 3900
3588sub do_reload_perl() { 3901sub do_reload_perl() {
3589 # can/must only be called in main 3902 # can/must only be called in main
3590 if ($Coro::current != $Coro::main) { 3903 unless (in_main) {
3591 warn "can only reload from main coroutine"; 3904 error "can only reload from main coroutine";
3592 return; 3905 return;
3593 } 3906 }
3594 3907
3595 warn "reloading..."; 3908 return if $RELOAD++;
3596 3909
3597 warn "entering sync_job"; 3910 my $t1 = AE::time;
3598 3911
3912 while ($RELOAD) {
3913 cf::get_slot 0.1, -1, "reload_perl";
3914 info "perl_reload: reloading...";
3915
3916 trace "perl_reload: entering sync_job";
3917
3599 cf::sync_job { 3918 cf::sync_job {
3600 cf::write_runtime_sync; # external watchdog should not bark
3601 cf::emergency_save; 3919 #cf::emergency_save;
3602 cf::write_runtime_sync; # external watchdog should not bark
3603 3920
3604 warn "syncing database to disk";
3605 BDB::db_env_txn_checkpoint $DB_ENV;
3606
3607 # if anything goes wrong in here, we should simply crash as we already saved
3608
3609 warn "flushing outstanding aio requests";
3610 for (;;) {
3611 BDB::flush;
3612 IO::AIO::flush;
3613 Coro::cede_notself;
3614 last unless IO::AIO::nreqs || BDB::nreqs;
3615 warn "iterate...";
3616 }
3617
3618 ++$RELOAD;
3619
3620 warn "cancelling all extension coros"; 3921 trace "perl_reload: cancelling all extension coros";
3621 $_->cancel for values %EXT_CORO; 3922 $_->cancel for values %EXT_CORO;
3622 %EXT_CORO = (); 3923 %EXT_CORO = ();
3623 3924
3624 warn "removing commands"; 3925 trace "perl_reload: removing commands";
3625 %COMMAND = (); 3926 %COMMAND = ();
3626 3927
3627 warn "removing ext/exti commands"; 3928 trace "perl_reload: removing ext/exti commands";
3628 %EXTCMD = (); 3929 %EXTCMD = ();
3629 %EXTICMD = (); 3930 %EXTICMD = ();
3630 3931
3631 warn "unloading/nuking all extensions"; 3932 trace "perl_reload: unloading/nuking all extensions";
3632 for my $pkg (@EXTS) { 3933 for my $pkg (@EXTS) {
3633 warn "... unloading $pkg"; 3934 trace "... unloading $pkg";
3634 3935
3635 if (my $cb = $pkg->can ("unload")) { 3936 if (my $cb = $pkg->can ("unload")) {
3636 eval { 3937 eval {
3637 $cb->($pkg); 3938 $cb->($pkg);
3638 1 3939 1
3639 } or warn "$pkg unloaded, but with errors: $@"; 3940 } or error "$pkg unloaded, but with errors: $@";
3941 }
3942
3943 trace "... clearing $pkg";
3944 clear_package $pkg;
3640 } 3945 }
3641 3946
3642 warn "... nuking $pkg";
3643 Symbol::delete_package $pkg;
3644 }
3645
3646 warn "unloading all perl modules loaded from $LIBDIR"; 3947 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3647 while (my ($k, $v) = each %INC) { 3948 while (my ($k, $v) = each %INC) {
3648 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3949 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3649 3950
3650 warn "... unloading $k"; 3951 trace "... unloading $k";
3651 delete $INC{$k}; 3952 delete $INC{$k};
3652 3953
3653 $k =~ s/\.pm$//; 3954 $k =~ s/\.pm$//;
3654 $k =~ s/\//::/g; 3955 $k =~ s/\//::/g;
3655 3956
3656 if (my $cb = $k->can ("unload_module")) { 3957 if (my $cb = $k->can ("unload_module")) {
3657 $cb->(); 3958 $cb->();
3959 }
3960
3961 clear_package $k;
3658 } 3962 }
3659 3963
3660 Symbol::delete_package $k;
3661 }
3662
3663 warn "getting rid of safe::, as good as possible"; 3964 trace "perl_reload: getting rid of safe::, as good as possible";
3664 Symbol::delete_package "safe::$_" 3965 clear_package "safe::$_"
3665 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3966 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3666 3967
3667 warn "unloading cf.pm \"a bit\""; 3968 trace "perl_reload: unloading cf.pm \"a bit\"";
3668 delete $INC{"cf.pm"}; 3969 delete $INC{"cf.pm"};
3669 delete $INC{"cf/pod.pm"}; 3970 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3670 3971
3671 # don't, removes xs symbols, too, 3972 # don't, removes xs symbols, too,
3672 # and global variables created in xs 3973 # and global variables created in xs
3673 #Symbol::delete_package __PACKAGE__; 3974 #clear_package __PACKAGE__;
3674 3975
3675 warn "unload completed, starting to reload now"; 3976 info "perl_reload: unload completed, starting to reload now";
3676 3977
3677 warn "reloading cf.pm"; 3978 trace "perl_reload: reloading cf.pm";
3678 require cf; 3979 require cf;
3679 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3980 cf::_connect_to_perl_1;
3680 3981
3681 warn "loading config and database again"; 3982 trace "perl_reload: loading config and database again";
3682 cf::reload_config; 3983 cf::reload_config;
3683 3984
3684 warn "loading extensions"; 3985 trace "perl_reload: loading extensions";
3685 cf::load_extensions; 3986 cf::load_extensions;
3686 3987
3988 if ($REATTACH_ON_RELOAD) {
3687 warn "reattaching attachments to objects/players"; 3989 trace "perl_reload: reattaching attachments to objects/players";
3688 _global_reattach; # objects, sockets 3990 _global_reattach; # objects, sockets
3689 warn "reattaching attachments to maps"; 3991 trace "perl_reload: reattaching attachments to maps";
3690 reattach $_ for values %MAP; 3992 reattach $_ for values %MAP;
3691 warn "reattaching attachments to players"; 3993 trace "perl_reload: reattaching attachments to players";
3692 reattach $_ for values %PLAYER; 3994 reattach $_ for values %PLAYER;
3995 }
3693 3996
3694 warn "leaving sync_job"; 3997 cf::_post_init 1;
3695 3998
3999 trace "perl_reload: leaving sync_job";
4000
3696 1 4001 1
3697 } or do { 4002 } or do {
3698 warn $@; 4003 error $@;
3699 cf::cleanup "error while reloading, exiting."; 4004 cf::cleanup "perl_reload: error, exiting.";
4005 };
4006
4007 --$RELOAD;
3700 }; 4008 }
3701 4009
3702 warn "reloaded"; 4010 $t1 = AE::time - $t1;
4011 info "perl_reload: completed in ${t1}s\n";
3703}; 4012};
3704 4013
3705our $RELOAD_WATCHER; # used only during reload 4014our $RELOAD_WATCHER; # used only during reload
3706 4015
3707sub reload_perl() { 4016sub reload_perl() {
3708 # doing reload synchronously and two reloads happen back-to-back, 4017 # doing reload synchronously and two reloads happen back-to-back,
3709 # coro crashes during coro_state_free->destroy here. 4018 # coro crashes during coro_state_free->destroy here.
3710 4019
4020 $RELOAD_WATCHER ||= cf::async {
4021 Coro::AIO::aio_wait cache_extensions;
4022
3711 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4023 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3712 do_reload_perl; 4024 do_reload_perl;
3713 undef $RELOAD_WATCHER; 4025 undef $RELOAD_WATCHER;
4026 };
3714 }; 4027 };
3715} 4028}
3716 4029
3717register_command "reload" => sub { 4030register_command "reload" => sub {
3718 my ($who, $arg) = @_; 4031 my ($who, $arg) = @_;
3724 reload_perl; 4037 reload_perl;
3725 }; 4038 };
3726 } 4039 }
3727}; 4040};
3728 4041
3729unshift @INC, $LIBDIR; 4042#############################################################################
3730 4043
3731my $bug_warning = 0; 4044my $bug_warning = 0;
3732 4045
3733our @WAIT_FOR_TICK; 4046our @WAIT_FOR_TICK;
3734our @WAIT_FOR_TICK_BEGIN; 4047our @WAIT_FOR_TICK_BEGIN;
3735 4048
3736sub wait_for_tick { 4049sub wait_for_tick() {
3737 return if tick_inhibit || $Coro::current == $Coro::main; 4050 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3738 4051
3739 my $signal = new Coro::Signal; 4052 my $signal = new Coro::Signal;
3740 push @WAIT_FOR_TICK, $signal; 4053 push @WAIT_FOR_TICK, $signal;
3741 $signal->wait; 4054 $signal->wait;
3742} 4055}
3743 4056
3744sub wait_for_tick_begin { 4057sub wait_for_tick_begin() {
3745 return if tick_inhibit || $Coro::current == $Coro::main; 4058 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3746 4059
3747 my $signal = new Coro::Signal; 4060 my $signal = new Coro::Signal;
3748 push @WAIT_FOR_TICK_BEGIN, $signal; 4061 push @WAIT_FOR_TICK_BEGIN, $signal;
3749 $signal->wait; 4062 $signal->wait;
3750} 4063}
3756 return; 4069 return;
3757 } 4070 }
3758 4071
3759 cf::server_tick; # one server iteration 4072 cf::server_tick; # one server iteration
3760 4073
4074 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4075
3761 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4076 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3762 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4077 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3763 Coro::async_pool { 4078 Coro::async_pool {
3764 $Coro::current->{desc} = "runtime saver"; 4079 $Coro::current->{desc} = "runtime saver";
3765 write_runtime_sync 4080 write_runtime_sync
3766 or warn "ERROR: unable to write runtime file: $!"; 4081 or error "ERROR: unable to write runtime file: $!";
3767 }; 4082 };
3768 } 4083 }
3769 4084
3770 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4085 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3771 $sig->send; 4086 $sig->send;
3779 4094
3780 if (0) { 4095 if (0) {
3781 if ($NEXT_TICK) { 4096 if ($NEXT_TICK) {
3782 my $jitter = $TICK_START - $NEXT_TICK; 4097 my $jitter = $TICK_START - $NEXT_TICK;
3783 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4098 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3784 warn "jitter $JITTER\n";#d# 4099 debug "jitter $JITTER\n";#d#
3785 } 4100 }
3786 } 4101 }
3787} 4102}
3788 4103
3789{ 4104{
3790 # configure BDB 4105 # configure BDB
3791 4106
3792 BDB::min_parallel 8; 4107 BDB::min_parallel 16;
3793 BDB::max_poll_reqs $TICK * 0.1; 4108 BDB::max_poll_reqs $TICK * 0.1;
3794 $AnyEvent::BDB::WATCHER->priority (1); 4109 $AnyEvent::BDB::WATCHER->priority (1);
3795 4110
3796 unless ($DB_ENV) { 4111 unless ($DB_ENV) {
3797 $DB_ENV = BDB::db_env_create; 4112 $DB_ENV = BDB::db_env_create;
3798 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4113 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3799 | BDB::LOG_AUTOREMOVE, 1); 4114 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4115 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3800 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4116 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3801 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4117 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3802 4118
3803 cf::sync_job { 4119 cf::sync_job {
3804 eval { 4120 eval {
3843 $msg =~ s/\n//; 4159 $msg =~ s/\n//;
3844 4160
3845 # limit the # of concurrent backtraces 4161 # limit the # of concurrent backtraces
3846 if ($_log_backtrace < 2) { 4162 if ($_log_backtrace < 2) {
3847 ++$_log_backtrace; 4163 ++$_log_backtrace;
4164 my $perl_bt = Carp::longmess $msg;
3848 async { 4165 async {
3849 $Coro::current->{desc} = "abt $msg"; 4166 $Coro::current->{desc} = "abt $msg";
3850 4167
3851 my @bt = fork_call { 4168 my @bt = fork_call {
3852 @addr = map { sprintf "%x", $_ } @addr; 4169 @addr = map { sprintf "%x", $_ } @addr;
3863 } 4180 }
3864 4181
3865 @funcs 4182 @funcs
3866 }; 4183 };
3867 4184
3868 LOG llevInfo, "[ABT] $msg\n"; 4185 LOG llevInfo, "[ABT] $perl_bt\n";
4186 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3869 LOG llevInfo, "[ABT] $_\n" for @bt; 4187 LOG llevInfo, "[ABT] $_\n" for @bt;
3870 --$_log_backtrace; 4188 --$_log_backtrace;
3871 }; 4189 };
3872 } else { 4190 } else {
3873 LOG llevInfo, "[ABT] $msg\n"; 4191 LOG llevInfo, "[ABT] $msg\n";
3874 LOG llevInfo, "[ABT] [suppressed]\n"; 4192 LOG llevInfo, "[ABT] [suppressed]\n";
3875 } 4193 }
3876} 4194}
3877 4195
3878# load additional modules 4196# load additional modules
3879use cf::pod; 4197require "cf/$_.pm" for @EXTRA_MODULES;
4198cf::_connect_to_perl_2;
3880 4199
3881END { cf::emergency_save } 4200END { cf::emergency_save }
3882 4201
38831 42021
3884 4203

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines