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

Diff Legend

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