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.430 by root, Sun May 4 14:12:37 2008 UTC vs.
Revision 1.557 by root, Tue Oct 5 21:40:05 2010 UTC

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

Diff Legend

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