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

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines