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.398 by root, Wed Dec 5 11:08:34 2007 UTC vs.
Revision 1.541 by root, Tue May 4 23:33:16 2010 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
3use utf8; 25use common::sense;
4use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use EV; 30use EV;
10use Opcode; 31use Opcode;
11use Safe; 32use Safe;
12use Safe::Hole; 33use Safe::Hole;
13use Storable (); 34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 4.1 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
18use Coro::EV; 41use Coro::EV;
42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
24use Coro::Util (); 51use Coro::Util ();
25 52
26use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
27use BDB (); 54use BDB ();
28use Data::Dumper; 55use Data::Dumper;
29use Digest::MD5;
30use Fcntl; 56use Fcntl;
31use YAML::Syck (); 57use YAML::XS ();
32use IO::AIO 2.51 (); 58use IO::AIO ();
33use Time::HiRes; 59use Time::HiRes;
34use Compress::LZF; 60use Compress::LZF;
35use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
36 64
37# configure various modules to our taste 65# configure various modules to our taste
38# 66#
39$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
40Coro::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";
41Compress::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
42 75
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 76# strictly for debugging
44$YAML::Syck::ImplicitUnicode = 1; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45
46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
47 78
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
49 82
50our %COMMAND = (); 83our %COMMAND = ();
51our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
52 85
53our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
54our %EXTCMD = (); 87our %EXTCMD = ();
55our %EXTICMD = (); 88our %EXTICMD = ();
56our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
57our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
58 91
59our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
60our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
61 96
62our $CONFDIR = confdir; 97our $CONFDIR = confdir;
63our $DATADIR = datadir; 98our $DATADIR = datadir;
64our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
65our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
66our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
67our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
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;
73 118
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER;
76our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 121our $NEXT_TICK;
79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
81 123
82our $BDB_POLL_WATCHER;
83our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
84our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
85our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
86our $DB_ENV; 127our $DB_ENV;
87 128
129our @EXTRA_MODULES = qw(pod match mapscript);
130
88our %CFG; 131our %CFG;
89 132
90our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
91our $RUNTIME; 134our $RUNTIME;
135our $NOW;
92 136
93our (%PLAYER, %PLAYER_LOADING); # all users 137our (%PLAYER, %PLAYER_LOADING); # all users
94our (%MAP, %MAP_LOADING ); # all maps 138our (%MAP, %MAP_LOADING ); # all maps
95our $LINK_MAP; # the special {link} map, which is always available 139our $LINK_MAP; # the special {link} map, which is always available
96 140
97# used to convert map paths into valid unix filenames by replacing / by ∕ 141# used to convert map paths into valid unix filenames by replacing / by ∕
98our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 142our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
99 143
100our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
101our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
146our $JITTER; # average jitter
102our $tick_start; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
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 :)
103 153
104binmode STDOUT; 154binmode STDOUT;
105binmode STDERR; 155binmode STDERR;
106 156
107# read virtual server time, if available 157# read virtual server time, if available
108unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
109 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
110 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
111 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
112} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
113 165
114mkdir $_ 166mkdir $_
115 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
116 168
117our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
118 170
119sub 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::"} };
120 187
121############################################################################# 188#############################################################################
122 189
123=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
124 191
171returns 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 process
172per 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.
173 240
174=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
175 242
176This array contains the results of the last C<invoke ()> call. When 243This array contains the results of the last C<invoke ()> call. When
177C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
178that call. 245that call.
179 246
247=item %cf::REFLECT
248
249Contains, for each (C++) class name, a hash reference with information
250about object members (methods, scalars, arrays and flags) and other
251metadata, which is useful for introspection.
252
180=back 253=back
181 254
182=cut 255=cut
183 256
184BEGIN { 257sub error(@) { LOG llevError, join "", @_ }
185 *CORE::GLOBAL::warn = sub { 258sub warn (@) { LOG llevWarn , join "", @_ }
259sub info (@) { LOG llevInfo , join "", @_ }
260sub debug(@) { LOG llevDebug, join "", @_ }
261sub trace(@) { LOG llevTrace, join "", @_ }
262
263$Coro::State::WARNHOOK = sub {
186 my $msg = join "", @_; 264 my $msg = join "", @_;
187 265
188 $msg .= "\n" 266 $msg .= "\n"
189 unless $msg =~ /\n$/; 267 unless $msg =~ /\n$/;
190 268
191 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 269 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
192 270
193 LOG llevError, $msg; 271 LOG llevWarn, $msg;
194 }; 272};
195} 273
274$Coro::State::DIEHOOK = sub {
275 return unless $^S eq 0; # "eq", not "=="
276
277 error Carp::longmess $_[0];
278
279 if (in_main) {#d#
280 error "DIEHOOK called in main context, Coro bug?\n";#d#
281 return;#d#
282 }#d#
283
284 # kill coroutine otherwise
285 Coro::terminate
286};
196 287
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 288@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 289@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 290@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 291@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
207for my $pkg (qw( 298for my $pkg (qw(
208 cf::global cf::attachable 299 cf::global cf::attachable
209 cf::object cf::object::player 300 cf::object cf::object::player
210 cf::client cf::player 301 cf::client cf::player
211 cf::arch cf::living 302 cf::arch cf::living
303 cf::map cf::mapspace
212 cf::map cf::party cf::region 304 cf::party cf::region
213)) { 305)) {
214 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 306 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 307}
217 308
218$EV::DIED = sub { 309$EV::DIED = sub {
219 warn "error in event callback: @_"; 310 Carp::cluck "error in event callback: @_";
220}; 311};
221 312
222############################################################################# 313#############################################################################
223 314
224=head2 UTILITY FUNCTIONS 315=head2 UTILITY FUNCTIONS
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 352our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 353
263sub encode_json($) { $json_coder->encode ($_[0]) } 354sub encode_json($) { $json_coder->encode ($_[0]) }
264sub decode_json($) { $json_coder->decode ($_[0]) } 355sub decode_json($) { $json_coder->decode ($_[0]) }
265 356
357=item cf::post_init { BLOCK }
358
359Execute the given codeblock, I<after> all extensions have been (re-)loaded,
360but I<before> the server starts ticking again.
361
362The cdoeblock will have a single boolean argument to indicate whether this
363is a reload or not.
364
365=cut
366
367sub post_init(&) {
368 push @POST_INIT, shift;
369}
370
266=item cf::lock_wait $string 371=item cf::lock_wait $string
267 372
268Wait until the given lock is available. See cf::lock_acquire. 373Wait until the given lock is available. See cf::lock_acquire.
269 374
270=item my $lock = cf::lock_acquire $string 375=item my $lock = cf::lock_acquire $string
271 376
272Wait until the given lock is available and then acquires it and returns 377Wait until the given lock is available and then acquires it and returns
273a Coro::guard object. If the guard object gets destroyed (goes out of scope, 378a L<Guard> object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 379for example when the coroutine gets canceled), the lock is automatically
275returned. 380returned.
276 381
277Locks are *not* recursive, locking from the same coro twice results in a 382Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro. 383deadlocked coro.
284 389
285Return true if the lock is currently active, i.e. somebody has locked it. 390Return true if the lock is currently active, i.e. somebody has locked it.
286 391
287=cut 392=cut
288 393
289our %LOCK; 394our $LOCKS = new Coro::SemaphoreSet;
290our %LOCKER;#d#
291 395
292sub lock_wait($) { 396sub lock_wait($) {
293 my ($key) = @_; 397 $LOCKS->wait ($_[0]);
294
295 if ($LOCKER{$key} == $Coro::current) {#d#
296 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
297 return;#d#
298 }#d#
299
300 # wait for lock, if any
301 while ($LOCK{$key}) {
302 push @{ $LOCK{$key} }, $Coro::current;
303 Coro::schedule;
304 }
305} 398}
306 399
307sub lock_acquire($) { 400sub lock_acquire($) {
308 my ($key) = @_; 401 $LOCKS->guard ($_[0])
309
310 # wait, to be sure we are not locked
311 lock_wait $key;
312
313 $LOCK{$key} = [];
314 $LOCKER{$key} = $Coro::current;#d#
315
316 Coro::guard {
317 delete $LOCKER{$key};#d#
318 # wake up all waiters, to be on the safe side
319 $_->ready for @{ delete $LOCK{$key} };
320 }
321} 402}
322 403
323sub lock_active($) { 404sub lock_active($) {
324 my ($key) = @_; 405 $LOCKS->count ($_[0]) < 1
325
326 ! ! $LOCK{$key}
327} 406}
328 407
329sub freeze_mainloop { 408sub freeze_mainloop {
330 return unless $TICK_WATCHER->is_active; 409 tick_inhibit_inc;
331 410
332 my $guard = Coro::guard { 411 &Guard::guard (\&tick_inhibit_dec);
333 $TICK_WATCHER->start;
334 };
335 $TICK_WATCHER->stop;
336 $guard
337} 412}
338 413
339=item cf::periodic $interval, $cb 414=item cf::periodic $interval, $cb
340 415
341Like EV::periodic, but randomly selects a starting point so that the actions 416Like EV::periodic, but randomly selects a starting point so that the actions
342get spread over timer. 417get spread over time.
343 418
344=cut 419=cut
345 420
346sub periodic($$) { 421sub periodic($$) {
347 my ($interval, $cb) = @_; 422 my ($interval, $cb) = @_;
364 439
365=cut 440=cut
366 441
367our @SLOT_QUEUE; 442our @SLOT_QUEUE;
368our $SLOT_QUEUE; 443our $SLOT_QUEUE;
444our $SLOT_DECAY = 0.9;
369 445
370$SLOT_QUEUE->cancel if $SLOT_QUEUE; 446$SLOT_QUEUE->cancel if $SLOT_QUEUE;
371$SLOT_QUEUE = Coro::async { 447$SLOT_QUEUE = Coro::async {
372 $Coro::current->desc ("timeslot manager"); 448 $Coro::current->desc ("timeslot manager");
373 449
374 my $signal = new Coro::Signal; 450 my $signal = new Coro::Signal;
451 my $busy;
375 452
376 while () { 453 while () {
377 next_job: 454 next_job:
455
378 my $avail = cf::till_tick; 456 my $avail = cf::till_tick;
379 if ($avail > 0.01) { 457
380 for (0 .. $#SLOT_QUEUE) { 458 for (0 .. $#SLOT_QUEUE) {
381 if ($SLOT_QUEUE[$_][0] < $avail) { 459 if ($SLOT_QUEUE[$_][0] <= $avail) {
460 $busy = 0;
382 my $job = splice @SLOT_QUEUE, $_, 1, (); 461 my $job = splice @SLOT_QUEUE, $_, 1, ();
383 $job->[2]->send; 462 $job->[2]->send;
384 Coro::cede; 463 Coro::cede;
385 goto next_job; 464 goto next_job;
386 } 465 } else {
466 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
387 } 467 }
388 } 468 }
389 469
390 if (@SLOT_QUEUE) { 470 if (@SLOT_QUEUE) {
391 # we do not use wait_for_tick() as it returns immediately when tick is inactive 471 # we do not use wait_for_tick() as it returns immediately when tick is inactive
392 push @cf::WAIT_FOR_TICK, $signal; 472 push @cf::WAIT_FOR_TICK, $signal;
393 $signal->wait; 473 $signal->wait;
394 } else { 474 } else {
475 $busy = 0;
395 Coro::schedule; 476 Coro::schedule;
396 } 477 }
397 } 478 }
398}; 479};
399 480
400sub get_slot($;$$) { 481sub get_slot($;$$) {
482 return if tick_inhibit || $Coro::current == $Coro::main;
483
401 my ($time, $pri, $name) = @_; 484 my ($time, $pri, $name) = @_;
402 485
403 $time = $TICK * .6 if $time > $TICK * .6; 486 $time = clamp $time, 0.01, $TICK * .6;
487
404 my $sig = new Coro::Signal; 488 my $sig = new Coro::Signal;
405 489
406 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 490 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
407 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 491 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
408 $SLOT_QUEUE->ready; 492 $SLOT_QUEUE->ready;
434=cut 518=cut
435 519
436sub sync_job(&) { 520sub sync_job(&) {
437 my ($job) = @_; 521 my ($job) = @_;
438 522
439 if ($Coro::current == $Coro::main) { 523 if (in_main) {
440 my $time = EV::time; 524 my $time = AE::time;
441 525
442 # this is the main coro, too bad, we have to block 526 # this is the main coro, too bad, we have to block
443 # till the operation succeeds, freezing the server :/ 527 # till the operation succeeds, freezing the server :/
444 528
445 LOG llevError, Carp::longmess "sync job";#d# 529 #LOG llevError, Carp::longmess "sync job";#d#
446 530
447 # TODO: use suspend/resume instead
448 # (but this is cancel-safe)
449 my $freeze_guard = freeze_mainloop; 531 my $freeze_guard = freeze_mainloop;
450 532
451 my $busy = 1; 533 my $busy = 1;
452 my @res; 534 my @res;
453 535
454 (async { 536 (async {
455 $Coro::current->desc ("sync job coro"); 537 $Coro::current->desc ("sync job coro");
456 @res = eval { $job->() }; 538 @res = eval { $job->() };
457 warn $@ if $@; 539 error $@ if $@;
458 undef $busy; 540 undef $busy;
459 })->prio (Coro::PRIO_MAX); 541 })->prio (Coro::PRIO_MAX);
460 542
461 while ($busy) { 543 while ($busy) {
462 if (Coro::nready) { 544 if (Coro::nready) {
464 } else { 546 } else {
465 EV::loop EV::LOOP_ONESHOT; 547 EV::loop EV::LOOP_ONESHOT;
466 } 548 }
467 } 549 }
468 550
469 $time = EV::time - $time; 551 my $time = AE::time - $time;
470 552
471 LOG llevError | logBacktrace, Carp::longmess "long sync job"
472 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
473
474 $tick_start += $time; # do not account sync jobs to server load 553 $TICK_START += $time; # do not account sync jobs to server load
475 554
476 wantarray ? @res : $res[0] 555 wantarray ? @res : $res[0]
477 } else { 556 } else {
478 # we are in another coroutine, how wonderful, everything just works 557 # we are in another coroutine, how wonderful, everything just works
479 558
523 }, @args; 602 }, @args;
524 603
525 wantarray ? @res : $res[-1] 604 wantarray ? @res : $res[-1]
526} 605}
527 606
607sub objinfo {
608 (
609 "counter value" => cf::object::object_count,
610 "objects created" => cf::object::create_count,
611 "objects destroyed" => cf::object::destroy_count,
612 "freelist size" => cf::object::free_count,
613 "allocated objects" => cf::object::objects_size,
614 "active objects" => cf::object::actives_size,
615 )
616}
617
618=item $coin = coin_from_name $name
619
620=cut
621
622our %coin_alias = (
623 "silver" => "silvercoin",
624 "silvercoin" => "silvercoin",
625 "silvercoins" => "silvercoin",
626 "gold" => "goldcoin",
627 "goldcoin" => "goldcoin",
628 "goldcoins" => "goldcoin",
629 "platinum" => "platinacoin",
630 "platinumcoin" => "platinacoin",
631 "platinumcoins" => "platinacoin",
632 "platina" => "platinacoin",
633 "platinacoin" => "platinacoin",
634 "platinacoins" => "platinacoin",
635 "royalty" => "royalty",
636 "royalties" => "royalty",
637);
638
639sub coin_from_name($) {
640 $coin_alias{$_[0]}
641 ? cf::arch::find $coin_alias{$_[0]}
642 : undef
643}
644
528=item $value = cf::db_get $family => $key 645=item $value = cf::db_get $family => $key
529 646
530Returns a single value from the environment database. 647Returns a single value from the environment database.
531 648
532=item cf::db_put $family => $key => $value 649=item cf::db_put $family => $key => $value
540within each server. 657within each server.
541 658
542=cut 659=cut
543 660
544sub db_table($) { 661sub db_table($) {
662 cf::error "db_get called from main context"
663 if $Coro::current == $Coro::main;
664
545 my ($name) = @_; 665 my ($name) = @_;
546 my $db = BDB::db_create $DB_ENV; 666 my $db = BDB::db_create $DB_ENV;
547 667
548 eval { 668 eval {
549 $db->set_flags (BDB::CHKSUM); 669 $db->set_flags (BDB::CHKSUM);
559} 679}
560 680
561our $DB; 681our $DB;
562 682
563sub db_init { 683sub db_init {
564 cf::sync_job {
565 $DB ||= db_table "db"; 684 $DB ||= db_table "db";
566 };
567} 685}
568 686
569sub db_get($$) { 687sub db_get($$) {
570 my $key = "$_[0]/$_[1]"; 688 my $key = "$_[0]/$_[1]";
571 689
572 cf::sync_job { 690 cf::error "db_get called from main context"
691 if $Coro::current == $Coro::main;
692
573 BDB::db_get $DB, undef, $key, my $data; 693 BDB::db_get $DB, undef, $key, my $data;
574 694
575 $! ? () 695 $! ? ()
576 : $data 696 : $data
577 }
578} 697}
579 698
580sub db_put($$$) { 699sub db_put($$$) {
581 BDB::dbreq_pri 4; 700 BDB::dbreq_pri 4;
582 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 701 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
638 757
639 my $t1 = Time::HiRes::time; 758 my $t1 = Time::HiRes::time;
640 my $data = $process->(\@data); 759 my $data = $process->(\@data);
641 my $t2 = Time::HiRes::time; 760 my $t2 = Time::HiRes::time;
642 761
643 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 762 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
644 763
645 db_put cache => "$id/data", $data; 764 db_put cache => "$id/data", $data;
646 db_put cache => "$id/md5" , $md5; 765 db_put cache => "$id/md5" , $md5;
647 db_put cache => "$id/meta", $meta; 766 db_put cache => "$id/meta", $meta;
648 767
658 777
659=cut 778=cut
660 779
661sub datalog($@) { 780sub datalog($@) {
662 my ($type, %kv) = @_; 781 my ($type, %kv) = @_;
663 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 782 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
664} 783}
665 784
666=back 785=back
667 786
668=cut 787=cut
669 788
670############################################################################# 789#############################################################################
671 790
672=head2 ATTACHABLE OBJECTS 791=head2 ATTACHABLE OBJECTS
673 792
674Many objects in crossfire are so-called attachable objects. That means you can 793Many objects in deliantra are so-called attachable objects. That means you can
675attach callbacks/event handlers (a collection of which is called an "attachment") 794attach callbacks/event handlers (a collection of which is called an "attachment")
676to it. All such attachable objects support the following methods. 795to it. All such attachable objects support the following methods.
677 796
678In the following description, CLASS can be any of C<global>, C<object> 797In the following description, CLASS can be any of C<global>, C<object>
679C<player>, C<client> or C<map> (i.e. the attachable objects in 798C<player>, C<client> or C<map> (i.e. the attachable objects in
729=item cf::CLASS::attachment $name, ... 848=item cf::CLASS::attachment $name, ...
730 849
731Register an attachment by C<$name> through which attachable objects of the 850Register an attachment by C<$name> through which attachable objects of the
732given CLASS can refer to this attachment. 851given CLASS can refer to this attachment.
733 852
734Some classes such as crossfire maps and objects can specify attachments 853Some classes such as deliantra maps and objects can specify attachments
735that are attached at load/instantiate time, thus the need for a name. 854that are attached at load/instantiate time, thus the need for a name.
736 855
737These calls expect any number of the following handler/hook descriptions: 856These calls expect any number of the following handler/hook descriptions:
738 857
739=over 4 858=over 4
863 982
864 } elsif (exists $cb_id{$type}) { 983 } elsif (exists $cb_id{$type}) {
865 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 984 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
866 985
867 } elsif (ref $type) { 986 } elsif (ref $type) {
868 warn "attaching objects not supported, ignoring.\n"; 987 error "attaching objects not supported, ignoring.\n";
869 988
870 } else { 989 } else {
871 shift @arg; 990 shift @arg;
872 warn "attach argument '$type' not supported, ignoring.\n"; 991 error "attach argument '$type' not supported, ignoring.\n";
873 } 992 }
874 } 993 }
875} 994}
876 995
877sub _object_attach { 996sub _object_attach {
887 _attach $registry, $klass, @attach; 1006 _attach $registry, $klass, @attach;
888 } 1007 }
889 1008
890 $obj->{$name} = \%arg; 1009 $obj->{$name} = \%arg;
891 } else { 1010 } else {
892 warn "object uses attachment '$name' which is not available, postponing.\n"; 1011 info "object uses attachment '$name' which is not available, postponing.\n";
893 } 1012 }
894 1013
895 $obj->{_attachment}{$name} = undef; 1014 $obj->{_attachment}{$name} = undef;
896} 1015}
897 1016
956 1075
957 for (@$callbacks) { 1076 for (@$callbacks) {
958 eval { &{$_->[1]} }; 1077 eval { &{$_->[1]} };
959 1078
960 if ($@) { 1079 if ($@) {
961 warn "$@";
962 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1080 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
963 override; 1081 override;
964 } 1082 }
965 1083
966 return 1 if $override; 1084 return 1 if $override;
967 } 1085 }
968 1086
969 0 1087 0
970} 1088}
971 1089
972=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1090=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
973 1091
974=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1092=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
975 1093
976Generate an object-specific event with the given arguments. 1094Generate an object-specific event with the given arguments.
977 1095
1030 1148
1031sub reattach { 1149sub reattach {
1032 # basically do the same as instantiate, without calling instantiate 1150 # basically do the same as instantiate, without calling instantiate
1033 my ($obj) = @_; 1151 my ($obj) = @_;
1034 1152
1153 # no longer needed after getting rid of delete_package?
1035 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1154 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1036 1155
1037 my $registry = $obj->registry; 1156 my $registry = $obj->registry;
1038 1157
1039 @$registry = (); 1158 @$registry = ();
1040 1159
1045 for (@$attach) { 1164 for (@$attach) {
1046 my ($klass, @attach) = @$_; 1165 my ($klass, @attach) = @$_;
1047 _attach $registry, $klass, @attach; 1166 _attach $registry, $klass, @attach;
1048 } 1167 }
1049 } else { 1168 } else {
1050 warn "object uses attachment '$name' that is not available, postponing.\n"; 1169 info "object uses attachment '$name' that is not available, postponing.\n";
1051 } 1170 }
1052 } 1171 }
1053} 1172}
1054 1173
1055cf::attachable->attach ( 1174cf::attachable->attach (
1082 my ($filename, $rdata, $objs) = @_; 1201 my ($filename, $rdata, $objs) = @_;
1083 1202
1084 sync_job { 1203 sync_job {
1085 if (length $$rdata) { 1204 if (length $$rdata) {
1086 utf8::decode (my $decname = $filename); 1205 utf8::decode (my $decname = $filename);
1087 warn sprintf "saving %s (%d,%d)\n", 1206 trace sprintf "saving %s (%d,%d)\n",
1088 $decname, length $$rdata, scalar @$objs; 1207 $decname, length $$rdata, scalar @$objs
1208 if $VERBOSE_IO;
1089 1209
1090 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1210 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1091 chmod SAVE_MODE, $fh; 1211 aio_chmod $fh, SAVE_MODE;
1092 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1212 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1093 aio_fsync $fh if $cf::USE_FSYNC; 1213 if ($cf::USE_FSYNC) {
1214 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;
1215 aio_fsync $fh;
1216 }
1094 close $fh; 1217 aio_close $fh;
1095 1218
1096 if (@$objs) { 1219 if (@$objs) {
1097 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1220 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1098 chmod SAVE_MODE, $fh; 1221 aio_chmod $fh, SAVE_MODE;
1099 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1222 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1100 aio_write $fh, 0, (length $data), $data, 0; 1223 aio_write $fh, 0, (length $data), $data, 0;
1101 aio_fsync $fh if $cf::USE_FSYNC; 1224 if ($cf::USE_FSYNC) {
1225 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;
1226 aio_fsync $fh;
1227 }
1102 close $fh; 1228 aio_close $fh;
1103 aio_rename "$filename.pst~", "$filename.pst"; 1229 aio_rename "$filename.pst~", "$filename.pst";
1104 } 1230 }
1105 } else { 1231 } else {
1106 aio_unlink "$filename.pst"; 1232 aio_unlink "$filename.pst";
1107 } 1233 }
1108 1234
1109 aio_rename "$filename~", $filename; 1235 aio_rename "$filename~", $filename;
1236
1237 $filename =~ s%/[^/]+$%%;
1238 aio_pathsync $filename if $cf::USE_FSYNC;
1110 } else { 1239 } else {
1111 warn "FATAL: $filename~: $!\n"; 1240 error "unable to save objects: $filename~: $!\n";
1112 } 1241 }
1113 } else { 1242 } else {
1114 aio_unlink $filename; 1243 aio_unlink $filename;
1115 aio_unlink "$filename.pst"; 1244 aio_unlink "$filename.pst";
1116 } 1245 }
1140 my $st = eval { Coro::Storable::thaw $av }; 1269 my $st = eval { Coro::Storable::thaw $av };
1141 $av = $st->{objs}; 1270 $av = $st->{objs};
1142 } 1271 }
1143 1272
1144 utf8::decode (my $decname = $filename); 1273 utf8::decode (my $decname = $filename);
1145 warn sprintf "loading %s (%d,%d)\n", 1274 trace sprintf "loading %s (%d,%d)\n",
1146 $decname, length $data, scalar @{$av || []}; 1275 $decname, length $data, scalar @{$av || []}
1276 if $VERBOSE_IO;
1147 1277
1148 ($data, $av) 1278 ($data, $av)
1149} 1279}
1150 1280
1151=head2 COMMAND CALLBACKS 1281=head2 COMMAND CALLBACKS
1207 my ($name, $cb) = @_; 1337 my ($name, $cb) = @_;
1208 1338
1209 $EXTICMD{$name} = $cb; 1339 $EXTICMD{$name} = $cb;
1210} 1340}
1211 1341
1342use File::Glob ();
1343
1212cf::player->attach ( 1344cf::player->attach (
1213 on_command => sub { 1345 on_unknown_command => sub {
1214 my ($pl, $name, $params) = @_; 1346 my ($pl, $name, $params) = @_;
1215 1347
1216 my $cb = $COMMAND{$name} 1348 my $cb = $COMMAND{$name}
1217 or return; 1349 or return;
1218 1350
1241 1373
1242 $pl->ext_reply ($reply, @reply) 1374 $pl->ext_reply ($reply, @reply)
1243 if $reply; 1375 if $reply;
1244 1376
1245 } else { 1377 } else {
1246 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1378 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1247 } 1379 }
1248 1380
1249 cf::override; 1381 cf::override;
1250 }, 1382 },
1251); 1383);
1252 1384
1385# "readahead" all extensions
1386sub cache_extensions {
1387 my $grp = IO::AIO::aio_group;
1388
1389 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1390 for (grep /\.ext$/, @{$_[0]}) {
1391 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1392 }
1393 };
1394
1395 $grp
1396}
1397
1253sub load_extensions { 1398sub load_extensions {
1399 info "loading extensions...";
1400
1254 cf::sync_job { 1401 cf::sync_job {
1255 my %todo; 1402 my %todo;
1256 1403
1257 for my $path (<$LIBDIR/*.ext>) { 1404 for my $path (<$LIBDIR/*.ext>) {
1258 next unless -r $path; 1405 next unless -r $path;
1276 1423
1277 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1424 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1278 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1425 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1279 1426
1280 $ext{source} = 1427 $ext{source} =
1281 "package $pkg; use strict; use utf8;\n" 1428 "package $pkg; use common::sense;\n"
1282 . "#line 1 \"$path\"\n{\n" 1429 . "#line 1 \"$path\"\n{\n"
1283 . $source 1430 . $source
1284 . "\n};\n1"; 1431 . "\n};\n1";
1285 1432
1286 $todo{$base} = \%ext; 1433 $todo{$base} = \%ext;
1287 } 1434 }
1288 1435
1436 my $pass = 0;
1289 my %done; 1437 my %done;
1290 while (%todo) { 1438 while (%todo) {
1291 my $progress; 1439 my $progress;
1292 1440
1441 ++$pass;
1442
1443 ext:
1293 while (my ($k, $v) = each %todo) { 1444 while (my ($k, $v) = each %todo) {
1294 for (split /,\s*/, $v->{meta}{depends}) { 1445 for (split /,\s*/, $v->{meta}{depends}) {
1295 goto skip 1446 next ext
1296 unless exists $done{$_}; 1447 unless exists $done{$_};
1297 } 1448 }
1298 1449
1299 warn "... loading '$k' into '$v->{pkg}'\n"; 1450 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1300 1451
1301 unless (eval $v->{source}) { 1452 my $active = eval $v->{source};
1453
1454 if (length $@) {
1302 my $msg = $@ ? "$v->{path}: $@\n" 1455 error "$v->{path}: $@\n";
1303 : "$v->{base}: extension inactive.\n"; 1456 undef $@; # work around perl 5.10.0 utf-8 caching bug
1304 1457
1458 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1305 if (exists $v->{meta}{mandatory}) { 1459 if exists $v->{meta}{mandatory};
1306 warn $msg; 1460
1307 warn "mandatory extension failed to load, exiting.\n"; 1461 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1308 exit 1; 1462 delete $todo{$k};
1309 } 1463 } else {
1310 1464 $done{$k} = delete $todo{$k};
1311 warn $msg; 1465 push @EXTS, $v->{pkg};
1466 $progress = 1;
1467
1468 info "$v->{base}: extension inactive.\n"
1469 unless $active;
1312 } 1470 }
1313
1314 $done{$k} = delete $todo{$k};
1315 push @EXTS, $v->{pkg};
1316 $progress = 1;
1317 } 1471 }
1318 1472
1319 skip: 1473 unless ($progress) {
1320 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1474 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1321 unless $progress; 1475
1476 while (my ($k, $v) = each %todo) {
1477 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1478 if exists $v->{meta}{mandatory};
1479 }
1480 }
1322 } 1481 }
1323 }; 1482 };
1324} 1483}
1325 1484
1326############################################################################# 1485#############################################################################
1327 1486
1328=back 1487=back
1329 1488
1330=head2 CORE EXTENSIONS 1489=head2 CORE EXTENSIONS
1331 1490
1332Functions and methods that extend core crossfire objects. 1491Functions and methods that extend core deliantra objects.
1333 1492
1334=cut 1493=cut
1335 1494
1336package cf::player; 1495package cf::player;
1337 1496
1380 1539
1381sub exists($) { 1540sub exists($) {
1382 my ($login) = @_; 1541 my ($login) = @_;
1383 1542
1384 $cf::PLAYER{$login} 1543 $cf::PLAYER{$login}
1385 or cf::sync_job { !aio_stat path $login } 1544 or !aio_stat path $login
1386} 1545}
1387 1546
1388sub find($) { 1547sub find($) {
1389 return $cf::PLAYER{$_[0]} || do { 1548 return $cf::PLAYER{$_[0]} || do {
1390 my $login = $_[0]; 1549 my $login = $_[0];
1402 my $f = new_from_file cf::object::thawer path $login 1561 my $f = new_from_file cf::object::thawer path $login
1403 or return; 1562 or return;
1404 1563
1405 my $pl = cf::player::load_pl $f 1564 my $pl = cf::player::load_pl $f
1406 or return; 1565 or return;
1566
1407 local $cf::PLAYER_LOADING{$login} = $pl; 1567 local $cf::PLAYER_LOADING{$login} = $pl;
1408 $f->resolve_delayed_derefs; 1568 $f->resolve_delayed_derefs;
1409 $cf::PLAYER{$login} = $pl 1569 $cf::PLAYER{$login} = $pl
1410 } 1570 }
1411 } 1571 }
1412} 1572}
1413 1573
1574cf::player->attach (
1575 on_load => sub {
1576 my ($pl, $path) = @_;
1577
1578 # restore slots saved in save, below
1579 my $slots = delete $pl->{_slots};
1580
1581 $pl->ob->current_weapon ($slots->[0]);
1582 $pl->combat_ob ($slots->[1]);
1583 $pl->ranged_ob ($slots->[2]);
1584 },
1585);
1586
1414sub save($) { 1587sub save($) {
1415 my ($pl) = @_; 1588 my ($pl) = @_;
1416 1589
1417 return if $pl->{deny_save}; 1590 return if $pl->{deny_save};
1418 1591
1421 1594
1422 return if $pl->{deny_save}; 1595 return if $pl->{deny_save};
1423 1596
1424 aio_mkdir playerdir $pl, 0770; 1597 aio_mkdir playerdir $pl, 0770;
1425 $pl->{last_save} = $cf::RUNTIME; 1598 $pl->{last_save} = $cf::RUNTIME;
1599
1600 cf::get_slot 0.01;
1601
1602 # save slots, to be restored later
1603 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1426 1604
1427 $pl->save_pl ($path); 1605 $pl->save_pl ($path);
1428 cf::cede_to_tick; 1606 cf::cede_to_tick;
1429} 1607}
1430 1608
1462 my ($pl) = @_; 1640 my ($pl) = @_;
1463 1641
1464 my $name = $pl->ob->name; 1642 my $name = $pl->ob->name;
1465 1643
1466 $pl->{deny_save} = 1; 1644 $pl->{deny_save} = 1;
1467 $pl->password ("*"); # this should lock out the player until we nuked the dir 1645 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1468 1646
1469 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1647 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1470 $pl->deactivate; 1648 $pl->deactivate;
1649 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1471 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1650 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1472 $pl->ns->destroy if $pl->ns; 1651 $pl->ns->destroy if $pl->ns;
1473 1652
1474 my $path = playerdir $pl; 1653 my $path = playerdir $pl;
1475 my $temp = "$path~$cf::RUNTIME~deleting~"; 1654 my $temp = "$path~$cf::RUNTIME~deleting~";
1514 1693
1515 for my $login (@$dirs) { 1694 for my $login (@$dirs) {
1516 my $path = path $login; 1695 my $path = path $login;
1517 1696
1518 # a .pst is a dead give-away for a valid player 1697 # a .pst is a dead give-away for a valid player
1519 unless (-e "$path.pst") { 1698 # if no pst file found, open and chekc for blocked users
1699 if (aio_stat "$path.pst") {
1520 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1700 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1521 aio_read $fh, 0, 512, my $buf, 0 or next; 1701 aio_read $fh, 0, 512, my $buf, 0 or next;
1522 $buf !~ /^password -------------$/m or next; # official not-valid tag 1702 $buf !~ /^password -------------$/m or next; # official not-valid tag
1523 } 1703 }
1524 1704
1528 1708
1529 \@logins 1709 \@logins
1530} 1710}
1531 1711
1532=item $player->maps 1712=item $player->maps
1713
1714=item cf::player::maps $login
1533 1715
1534Returns an arrayref of map paths that are private for this 1716Returns an arrayref of map paths that are private for this
1535player. May block. 1717player. May block.
1536 1718
1537=cut 1719=cut
1555 } 1737 }
1556 1738
1557 \@paths 1739 \@paths
1558} 1740}
1559 1741
1560=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1742=item $protocol_xml = $player->expand_cfpod ($cfpod)
1561 1743
1562Expand crossfire pod fragments into protocol xml. 1744Expand deliantra pod fragments into protocol xml.
1563
1564=cut
1565
1566use re 'eval';
1567
1568my $group;
1569my $interior; $interior = qr{
1570 # match a pod interior sequence sans C<< >>
1571 (?:
1572 \ (.*?)\ (?{ $group = $^N })
1573 | < (??{$interior}) >
1574 )
1575}x;
1576
1577sub expand_cfpod {
1578 my ($self, $pod) = @_;
1579
1580 my $xml;
1581
1582 while () {
1583 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1584 $group = $1;
1585
1586 $group =~ s/&/&amp;/g;
1587 $group =~ s/</&lt;/g;
1588
1589 $xml .= $group;
1590 } elsif ($pod =~ m%\G
1591 ([BCGHITU])
1592 <
1593 (?:
1594 ([^<>]*) (?{ $group = $^N })
1595 | < $interior >
1596 )
1597 >
1598 %gcsx
1599 ) {
1600 my ($code, $data) = ($1, $group);
1601
1602 if ($code eq "B") {
1603 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1604 } elsif ($code eq "I") {
1605 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1606 } elsif ($code eq "U") {
1607 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1608 } elsif ($code eq "C") {
1609 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1610 } elsif ($code eq "T") {
1611 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1612 } elsif ($code eq "G") {
1613 my ($male, $female) = split /\|/, $data;
1614 $data = $self->gender ? $female : $male;
1615 $xml .= expand_cfpod ($self, $data);
1616 } elsif ($code eq "H") {
1617 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1618 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1619 "")
1620 [$self->{hintmode}];
1621 } else {
1622 $xml .= "error processing '$code($data)' directive";
1623 }
1624 } else {
1625 if ($pod =~ /\G(.+)/) {
1626 warn "parse error while expanding $pod (at $1)";
1627 }
1628 last;
1629 }
1630 }
1631
1632 for ($xml) {
1633 # create single paragraphs (very hackish)
1634 s/(?<=\S)\n(?=\w)/ /g;
1635
1636 # compress some whitespace
1637 s/\s+\n/\n/g; # ws line-ends
1638 s/\n\n+/\n/g; # double lines
1639 s/^\n+//; # beginning lines
1640 s/\n+$//; # ending lines
1641 }
1642
1643 $xml
1644}
1645
1646no re 'eval';
1647
1648sub hintmode {
1649 $_[0]{hintmode} = $_[1] if @_ > 1;
1650 $_[0]{hintmode}
1651}
1652 1745
1653=item $player->ext_reply ($msgid, @msg) 1746=item $player->ext_reply ($msgid, @msg)
1654 1747
1655Sends an ext reply to the player. 1748Sends an ext reply to the player.
1656 1749
1688 1781
1689=cut 1782=cut
1690 1783
1691sub find_by_path($) { 1784sub find_by_path($) {
1692 my ($path) = @_; 1785 my ($path) = @_;
1786
1787 $path =~ s/^~[^\/]*//; # skip ~login
1693 1788
1694 my ($match, $specificity); 1789 my ($match, $specificity);
1695 1790
1696 for my $region (list) { 1791 for my $region (list) {
1697 if ($region->{match} && $path =~ $region->{match}) { 1792 if ($region->{match} && $path =~ $region->{match}) {
1723our $MAX_RESET = 3600; 1818our $MAX_RESET = 3600;
1724our $DEFAULT_RESET = 3000; 1819our $DEFAULT_RESET = 3000;
1725 1820
1726sub generate_random_map { 1821sub generate_random_map {
1727 my ($self, $rmp) = @_; 1822 my ($self, $rmp) = @_;
1823
1824 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1825
1728 # mit "rum" bekleckern, nicht 1826 # mit "rum" bekleckern, nicht
1729 $self->_create_random_map ( 1827 $self->_create_random_map (
1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1828 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1829 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1830 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1733 $rmp->{exit_on_final_map}, 1831 $rmp->{exit_on_final_map},
1734 $rmp->{xsize}, $rmp->{ysize}, 1832 $rmp->{xsize}, $rmp->{ysize},
1735 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1833 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1736 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1834 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1751 1849
1752sub register { 1850sub register {
1753 my (undef, $regex, $prio) = @_; 1851 my (undef, $regex, $prio) = @_;
1754 my $pkg = caller; 1852 my $pkg = caller;
1755 1853
1756 no strict;
1757 push @{"$pkg\::ISA"}, __PACKAGE__; 1854 push @{"$pkg\::ISA"}, __PACKAGE__;
1758 1855
1759 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1856 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1760} 1857}
1761 1858
1762# also paths starting with '/' 1859# also paths starting with '/'
1763$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1860$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1764 1861
1765sub thawer_merge { 1862sub thawer_merge {
1766 my ($self, $merge) = @_; 1863 my ($self, $merge) = @_;
1767 1864
1768 # we have to keep some variables in memory intact 1865 # we have to keep some variables in memory intact
1854 1951
1855# the temporary/swap location 1952# the temporary/swap location
1856sub save_path { 1953sub save_path {
1857 my ($self) = @_; 1954 my ($self) = @_;
1858 1955
1859 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1956 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1860 "$TMPDIR/$path.map" 1957 "$TMPDIR/$path.map"
1861} 1958}
1862 1959
1863# the unique path, undef == no special unique path 1960# the unique path, undef == no special unique path
1864sub uniq_path { 1961sub uniq_path {
1865 my ($self) = @_; 1962 my ($self) = @_;
1866 1963
1867 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1964 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1868 "$UNIQUEDIR/$path" 1965 "$UNIQUEDIR/$path"
1869}
1870
1871# and all this just because we cannot iterate over
1872# all maps in C++...
1873sub change_all_map_light {
1874 my ($change) = @_;
1875
1876 $_->change_map_light ($change)
1877 for grep $_->outdoor, values %cf::MAP;
1878} 1966}
1879 1967
1880sub decay_objects { 1968sub decay_objects {
1881 my ($self) = @_; 1969 my ($self) = @_;
1882 1970
1966sub find { 2054sub find {
1967 my ($path, $origin) = @_; 2055 my ($path, $origin) = @_;
1968 2056
1969 $path = normalise $path, $origin && $origin->path; 2057 $path = normalise $path, $origin && $origin->path;
1970 2058
1971 cf::lock_wait "map_data:$path";#d#remove 2059 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1972 cf::lock_wait "map_find:$path"; 2060 my $guard2 = cf::lock_acquire "map_find:$path";
1973 2061
1974 $cf::MAP{$path} || do { 2062 $cf::MAP{$path} || do {
1975 my $guard1 = cf::lock_acquire "map_find:$path";
1976 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1977
1978 my $map = new_from_path cf::map $path 2063 my $map = new_from_path cf::map $path
1979 or return; 2064 or return;
1980 2065
1981 $map->{last_save} = $cf::RUNTIME; 2066 $map->{last_save} = $cf::RUNTIME;
1982 2067
1984 or return; 2069 or return;
1985 2070
1986 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2071 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1987 # doing this can freeze the server in a sync job, obviously 2072 # doing this can freeze the server in a sync job, obviously
1988 #$cf::WAIT_FOR_TICK->wait; 2073 #$cf::WAIT_FOR_TICK->wait;
2074 undef $guard2;
1989 undef $guard1; 2075 undef $guard1;
1990 undef $guard2;
1991 $map->reset; 2076 $map->reset;
1992 return find $path; 2077 return find $path;
1993 } 2078 }
1994 2079
1995 $cf::MAP{$path} = $map 2080 $cf::MAP{$path} = $map
1996 } 2081 }
1997} 2082}
1998 2083
1999sub pre_load { } 2084sub pre_load { }
2000sub post_load { } 2085#sub post_load { } # XS
2001 2086
2002sub load { 2087sub load {
2003 my ($self) = @_; 2088 my ($self) = @_;
2004 2089
2005 local $self->{deny_reset} = 1; # loading can take a long time 2090 local $self->{deny_reset} = 1; # loading can take a long time
2022 my $f = new_from_file cf::object::thawer $self->{load_path}; 2107 my $f = new_from_file cf::object::thawer $self->{load_path};
2023 $f->skip_block; 2108 $f->skip_block;
2024 $self->_load_objects ($f) 2109 $self->_load_objects ($f)
2025 or return; 2110 or return;
2026 2111
2027 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2112 $self->post_load_original
2028 if delete $self->{load_original}; 2113 if delete $self->{load_original};
2029 2114
2030 if (my $uniq = $self->uniq_path) { 2115 if (my $uniq = $self->uniq_path) {
2031 utf8::encode $uniq; 2116 utf8::encode $uniq;
2032 unless (aio_stat $uniq) { 2117 unless (aio_stat $uniq) {
2050 unless ($self->{deny_activate}) { 2135 unless ($self->{deny_activate}) {
2051 $self->decay_objects; 2136 $self->decay_objects;
2052 $self->fix_auto_apply; 2137 $self->fix_auto_apply;
2053 $self->update_buttons; 2138 $self->update_buttons;
2054 cf::cede_to_tick; 2139 cf::cede_to_tick;
2055 $self->set_darkness_map;
2056 cf::cede_to_tick;
2057 $self->activate; 2140 $self->activate;
2058 } 2141 }
2059 2142
2060 $self->{last_save} = $cf::RUNTIME; 2143 $self->{last_save} = $cf::RUNTIME;
2061 $self->last_access ($cf::RUNTIME); 2144 $self->last_access ($cf::RUNTIME);
2062 2145
2063 $self->in_memory (cf::MAP_IN_MEMORY); 2146 $self->in_memory (cf::MAP_ACTIVE);
2064 } 2147 }
2065 2148
2066 $self->post_load; 2149 $self->post_load;
2067} 2150}
2068 2151
2152# customize the map for a given player, i.e.
2153# return the _real_ map. used by e.g. per-player
2154# maps to change the path to ~playername/mappath
2069sub customise_for { 2155sub customise_for {
2070 my ($self, $ob) = @_; 2156 my ($self, $ob) = @_;
2071 2157
2072 return find "~" . $ob->name . "/" . $self->{path} 2158 return find "~" . $ob->name . "/" . $self->{path}
2073 if $self->per_player; 2159 if $self->per_player;
2089 or next; 2175 or next;
2090 $neigh = find $neigh, $map 2176 $neigh = find $neigh, $map
2091 or next; 2177 or next;
2092 $neigh->load; 2178 $neigh->load;
2093 2179
2180 # now find the diagonal neighbours
2094 push @neigh, 2181 push @neigh,
2095 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2182 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2096 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2183 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2097 } 2184 }
2098 2185
2105} 2192}
2106 2193
2107sub find_sync { 2194sub find_sync {
2108 my ($path, $origin) = @_; 2195 my ($path, $origin) = @_;
2109 2196
2110 cf::sync_job { find $path, $origin } 2197 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2198 if $Coro::current == $Coro::main;
2199
2200 find $path, $origin
2111} 2201}
2112 2202
2113sub do_load_sync { 2203sub do_load_sync {
2114 my ($map) = @_; 2204 my ($map) = @_;
2115 2205
2116 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2206 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2117 if $Coro::current == $Coro::main; 2207 if $Coro::current == $Coro::main;
2118 2208
2119 cf::sync_job { $map->load }; 2209 $map->load;
2120} 2210}
2121 2211
2122our %MAP_PREFETCH; 2212our %MAP_PREFETCH;
2123our $MAP_PREFETCHER = undef; 2213our $MAP_PREFETCHER = undef;
2124 2214
2126 my ($path, $origin, $load) = @_; 2216 my ($path, $origin, $load) = @_;
2127 2217
2128 $path = normalise $path, $origin && $origin->{path}; 2218 $path = normalise $path, $origin && $origin->{path};
2129 2219
2130 if (my $map = $cf::MAP{$path}) { 2220 if (my $map = $cf::MAP{$path}) {
2131 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2221 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2132 } 2222 }
2133 2223
2134 $MAP_PREFETCH{$path} |= $load; 2224 $MAP_PREFETCH{$path} |= $load;
2135 2225
2136 $MAP_PREFETCHER ||= cf::async { 2226 $MAP_PREFETCHER ||= cf::async {
2150 $MAP_PREFETCHER->prio (6); 2240 $MAP_PREFETCHER->prio (6);
2151 2241
2152 () 2242 ()
2153} 2243}
2154 2244
2245# common code, used by both ->save and ->swapout
2155sub save { 2246sub _save {
2156 my ($self) = @_; 2247 my ($self) = @_;
2157
2158 my $lock = cf::lock_acquire "map_data:$self->{path}";
2159 2248
2160 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2161 2250
2162 return unless $self->dirty; 2251 return unless $self->dirty;
2163 2252
2172 2261
2173 cf::async { 2262 cf::async {
2174 $Coro::current->{desc} = "map player save"; 2263 $Coro::current->{desc} = "map player save";
2175 $_->contr->save for $self->players; 2264 $_->contr->save for $self->players;
2176 }; 2265 };
2266
2267 cf::get_slot 0.02;
2177 2268
2178 if ($uniq) { 2269 if ($uniq) {
2179 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2270 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2180 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2271 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2181 } else { 2272 } else {
2182 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2273 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2183 } 2274 }
2184} 2275}
2185 2276
2277sub save {
2278 my ($self) = @_;
2279
2280 my $lock = cf::lock_acquire "map_data:$self->{path}";
2281
2282 $self->_save;
2283}
2284
2186sub swap_out { 2285sub swap_out {
2187 my ($self) = @_; 2286 my ($self) = @_;
2188 2287
2189 # save first because save cedes
2190 $self->save;
2191
2192 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2288 my $lock = cf::lock_acquire "map_data:$self->{path}";
2193 2289
2290 return if $self->in_memory != cf::MAP_ACTIVE;
2291 return if $self->{deny_save};
2194 return if $self->players; 2292 return if $self->players;
2195 return if $self->in_memory != cf::MAP_IN_MEMORY;
2196 return if $self->{deny_save};
2197 2293
2294 # first deactivate the map and "unlink" it from the core
2295 $self->deactivate;
2296 $_->clear_links_to ($self) for values %cf::MAP;
2198 $self->in_memory (cf::MAP_SWAPPED); 2297 $self->in_memory (cf::MAP_SWAPPED);
2298
2299 # then atomically save
2300 $self->_save;
2301
2302 # then free the map
2303 $self->clear;
2304}
2305
2306sub reset_at {
2307 my ($self) = @_;
2308
2309 # TODO: safety, remove and allow resettable per-player maps
2310 return 1e99 if $self->{deny_reset};
2311
2312 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2313 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2314
2315 $time + $to
2316}
2317
2318sub should_reset {
2319 my ($self) = @_;
2320
2321 $self->reset_at <= $cf::RUNTIME
2322}
2323
2324sub reset {
2325 my ($self) = @_;
2326
2327 my $lock = cf::lock_acquire "map_data:$self->{path}";
2328
2329 return if $self->players;
2330
2331 cf::trace "resetting map ", $self->path, "\n";
2332
2333 $self->in_memory (cf::MAP_SWAPPED);
2334
2335 # need to save uniques path
2336 unless ($self->{deny_save}) {
2337 my $uniq = $self->uniq_path; utf8::encode $uniq;
2338
2339 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2340 if $uniq;
2341 }
2342
2343 delete $cf::MAP{$self->path};
2199 2344
2200 $self->deactivate; 2345 $self->deactivate;
2201 $_->clear_links_to ($self) for values %cf::MAP; 2346 $_->clear_links_to ($self) for values %cf::MAP;
2202 $self->clear; 2347 $self->clear;
2203}
2204
2205sub reset_at {
2206 my ($self) = @_;
2207
2208 # TODO: safety, remove and allow resettable per-player maps
2209 return 1e99 if $self->{deny_reset};
2210
2211 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2212 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2213
2214 $time + $to
2215}
2216
2217sub should_reset {
2218 my ($self) = @_;
2219
2220 $self->reset_at <= $cf::RUNTIME
2221}
2222
2223sub reset {
2224 my ($self) = @_;
2225
2226 my $lock = cf::lock_acquire "map_data:$self->{path}";
2227
2228 return if $self->players;
2229
2230 warn "resetting map ", $self->path;
2231
2232 $self->in_memory (cf::MAP_SWAPPED);
2233
2234 # need to save uniques path
2235 unless ($self->{deny_save}) {
2236 my $uniq = $self->uniq_path; utf8::encode $uniq;
2237
2238 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2239 if $uniq;
2240 }
2241
2242 delete $cf::MAP{$self->path};
2243
2244 $self->deactivate;
2245 $_->clear_links_to ($self) for values %cf::MAP;
2246 $self->clear;
2247 2348
2248 $self->unlink_save; 2349 $self->unlink_save;
2249 $self->destroy; 2350 $self->destroy;
2250} 2351}
2251 2352
2259 2360
2260 delete $cf::MAP{$self->path}; 2361 delete $cf::MAP{$self->path};
2261 2362
2262 $self->unlink_save; 2363 $self->unlink_save;
2263 2364
2264 bless $self, "cf::map"; 2365 bless $self, "cf::map::wrap";
2265 delete $self->{deny_reset}; 2366 delete $self->{deny_reset};
2266 $self->{deny_save} = 1; 2367 $self->{deny_save} = 1;
2267 $self->reset_timeout (1); 2368 $self->reset_timeout (1);
2268 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2369 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2269 2370
2318 2419
2319sub unique_maps() { 2420sub unique_maps() {
2320 [ 2421 [
2321 map { 2422 map {
2322 utf8::decode $_; 2423 utf8::decode $_;
2323 /\.map$/ 2424 s/\.map$//; # TODO future compatibility hack
2425 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2426 ? ()
2324 ? normalise $_ 2427 : normalise $_
2325 : ()
2326 } @{ aio_readdir $UNIQUEDIR or [] } 2428 } @{ aio_readdir $UNIQUEDIR or [] }
2327 ] 2429 ]
2328} 2430}
2329 2431
2330package cf; 2432=item cf::map::static_maps
2433
2434Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2435file in the shared directory excluding F</styles> and F</editor>). May
2436block.
2437
2438=cut
2439
2440sub static_maps() {
2441 my @dirs = "";
2442 my @maps;
2443
2444 while (@dirs) {
2445 my $dir = shift @dirs;
2446
2447 next if $dir eq "/styles" || $dir eq "/editor";
2448
2449 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2450 or return;
2451
2452 for (@$files) {
2453 s/\.map$// or next;
2454 utf8::decode $_;
2455 push @maps, "$dir/$_";
2456 }
2457
2458 push @dirs, map "$dir/$_", @$dirs;
2459 }
2460
2461 \@maps
2462}
2331 2463
2332=back 2464=back
2333 2465
2334=head3 cf::object 2466=head3 cf::object
2335 2467
2339 2471
2340=over 4 2472=over 4
2341 2473
2342=item $ob->inv_recursive 2474=item $ob->inv_recursive
2343 2475
2344Returns the inventory of the object _and_ their inventories, recursively. 2476Returns the inventory of the object I<and> their inventories, recursively,
2477but I<not> the object itself.
2345 2478
2346=cut 2479=cut
2347 2480
2348sub inv_recursive_; 2481sub inv_recursive_;
2349sub inv_recursive_ { 2482sub inv_recursive_ {
2354 inv_recursive_ inv $_[0] 2487 inv_recursive_ inv $_[0]
2355} 2488}
2356 2489
2357=item $ref = $ob->ref 2490=item $ref = $ob->ref
2358 2491
2359creates and returns a persistent reference to an objetc that can be stored as a string. 2492Creates and returns a persistent reference to an object that can be stored as a string.
2360 2493
2361=item $ob = cf::object::deref ($refstring) 2494=item $ob = cf::object::deref ($refstring)
2362 2495
2363returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2496returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2364even if the object actually exists. May block. 2497even if the object actually exists. May block.
2396can be C<undef>. Does the right thing when the player is currently in a 2529can be C<undef>. Does the right thing when the player is currently in a
2397dialogue with the given NPC character. 2530dialogue with the given NPC character.
2398 2531
2399=cut 2532=cut
2400 2533
2534our $SAY_CHANNEL = {
2535 id => "say",
2536 title => "Map",
2537 reply => "say ",
2538 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2539};
2540
2541our $CHAT_CHANNEL = {
2542 id => "chat",
2543 title => "Chat",
2544 reply => "chat ",
2545 tooltip => "Player chat and shouts, global to the server.",
2546};
2547
2401# rough implementation of a future "reply" method that works 2548# rough implementation of a future "reply" method that works
2402# with dialog boxes. 2549# with dialog boxes.
2403#TODO: the first argument must go, split into a $npc->reply_to ( method 2550#TODO: the first argument must go, split into a $npc->reply_to ( method
2404sub cf::object::player::reply($$$;$) { 2551sub cf::object::player::reply($$$;$) {
2405 my ($self, $npc, $msg, $flags) = @_; 2552 my ($self, $npc, $msg, $flags) = @_;
2416 my $dialog = $pl->{npc_dialog}; 2563 my $dialog = $pl->{npc_dialog};
2417 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2564 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2418 2565
2419 } else { 2566 } else {
2420 $msg = $npc->name . " says: $msg" if $npc; 2567 $msg = $npc->name . " says: $msg" if $npc;
2421 $self->message ($msg, $flags); 2568 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2422 } 2569 }
2423 } 2570 }
2424} 2571}
2425 2572
2426=item $object->send_msg ($channel, $msg, $color, [extra...]) 2573=item $object->send_msg ($channel, $msg, $color, [extra...])
2451 2598
2452=item $player_object->enter_link 2599=item $player_object->enter_link
2453 2600
2454Freezes the player and moves him/her to a special map (C<{link}>). 2601Freezes the player and moves him/her to a special map (C<{link}>).
2455 2602
2456The player should be reasonably safe there for short amounts of time. You 2603The player should be reasonably safe there for short amounts of time (e.g.
2457I<MUST> call C<leave_link> as soon as possible, though. 2604for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2605though, as the player cannot control the character while it is on the link
2606map.
2458 2607
2459Will never block. 2608Will never block.
2460 2609
2461=item $player_object->leave_link ($map, $x, $y) 2610=item $player_object->leave_link ($map, $x, $y)
2462 2611
2482sub cf::object::player::enter_link { 2631sub cf::object::player::enter_link {
2483 my ($self) = @_; 2632 my ($self) = @_;
2484 2633
2485 $self->deactivate_recursive; 2634 $self->deactivate_recursive;
2486 2635
2636 ++$self->{_link_recursion};
2637
2487 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2638 return if UNIVERSAL::isa $self->map, "ext::map_link";
2488 2639
2489 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2640 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2490 if $self->map && $self->map->{path} ne "{link}"; 2641 if $self->map && $self->map->{path} ne "{link}";
2491 2642
2492 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2643 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2493} 2644}
2494 2645
2495sub cf::object::player::leave_link { 2646sub cf::object::player::leave_link {
2496 my ($self, $map, $x, $y) = @_; 2647 my ($self, $map, $x, $y) = @_;
2497 2648
2514 ($x, $y) = (-1, -1) 2665 ($x, $y) = (-1, -1)
2515 unless (defined $x) && (defined $y); 2666 unless (defined $x) && (defined $y);
2516 2667
2517 # use -1 or undef as default coordinates, not 0, 0 2668 # use -1 or undef as default coordinates, not 0, 0
2518 ($x, $y) = ($map->enter_x, $map->enter_y) 2669 ($x, $y) = ($map->enter_x, $map->enter_y)
2519 if $x <=0 && $y <= 0; 2670 if $x <= 0 && $y <= 0;
2520 2671
2521 $map->load; 2672 $map->load;
2522 $map->load_neighbours; 2673 $map->load_neighbours;
2523 2674
2524 return unless $self->contr->active; 2675 return unless $self->contr->active;
2525 $self->activate_recursive;
2526 2676
2527 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2677 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2528 $self->enter_map ($map, $x, $y); 2678 if ($self->enter_map ($map, $x, $y)) {
2529} 2679 # entering was successful
2680 delete $self->{_link_recursion};
2681 # only activate afterwards, to support waiting in hooks
2682 $self->activate_recursive;
2683 }
2530 2684
2685}
2686
2531=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2687=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2532 2688
2533Moves the player to the given map-path and coordinates by first freezing 2689Moves the player to the given map-path and coordinates by first freezing
2534her, loading and preparing them map, calling the provided $check callback 2690her, loading and preparing them map, calling the provided $check callback
2535that has to return the map if sucecssful, and then unfreezes the player on 2691that has to return the map if sucecssful, and then unfreezes the player on
2536the new (success) or old (failed) map position. In either case, $done will 2692the new (success) or old (failed) map position. In either case, $done will
2537be called at the end of this process. 2693be called at the end of this process.
2538 2694
2695Note that $check will be called with a potentially non-loaded map, so if
2696it needs a loaded map it has to call C<< ->load >>.
2697
2539=cut 2698=cut
2540 2699
2541our $GOTOGEN; 2700our $GOTOGEN;
2542 2701
2543sub cf::object::player::goto { 2702sub cf::object::player::goto {
2544 my ($self, $path, $x, $y, $check, $done) = @_; 2703 my ($self, $path, $x, $y, $check, $done) = @_;
2704
2705 if ($self->{_link_recursion} >= $MAX_LINKS) {
2706 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2707 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2708 ($path, $x, $y) = @$EMERGENCY_POSITION;
2709 }
2545 2710
2546 # do generation counting so two concurrent goto's will be executed in-order 2711 # do generation counting so two concurrent goto's will be executed in-order
2547 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2712 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2548 2713
2549 $self->enter_link; 2714 $self->enter_link;
2573 my $map = eval { 2738 my $map = eval {
2574 my $map = defined $path ? cf::map::find $path : undef; 2739 my $map = defined $path ? cf::map::find $path : undef;
2575 2740
2576 if ($map) { 2741 if ($map) {
2577 $map = $map->customise_for ($self); 2742 $map = $map->customise_for ($self);
2578 $map = $check->($map) if $check && $map; 2743 $map = $check->($map, $x, $y, $self) if $check && $map;
2579 } else { 2744 } else {
2580 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2745 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2581 } 2746 }
2582 2747
2583 $map 2748 $map
2591 if ($gen == $self->{_goto_generation}) { 2756 if ($gen == $self->{_goto_generation}) {
2592 delete $self->{_goto_generation}; 2757 delete $self->{_goto_generation};
2593 $self->leave_link ($map, $x, $y); 2758 $self->leave_link ($map, $x, $y);
2594 } 2759 }
2595 2760
2596 $done->() if $done; 2761 $done->($self) if $done;
2597 })->prio (1); 2762 })->prio (1);
2598} 2763}
2599 2764
2600=item $player_object->enter_exit ($exit_object) 2765=item $player_object->enter_exit ($exit_object)
2601 2766
2621} 2786}
2622 2787
2623sub prepare_random_map { 2788sub prepare_random_map {
2624 my ($exit) = @_; 2789 my ($exit) = @_;
2625 2790
2626 my $guard = cf::lock_acquire "exit_prepare:$exit";
2627
2628 # all this does is basically replace the /! path by 2791 # all this does is basically replace the /! path by
2629 # a new random map path (?random/...) with a seed 2792 # a new random map path (?random/...) with a seed
2630 # that depends on the exit object 2793 # that depends on the exit object
2631 2794
2632 my $rmp = parse_random_map_params $exit->msg; 2795 my $rmp = parse_random_map_params $exit->msg;
2634 if ($exit->map) { 2797 if ($exit->map) {
2635 $rmp->{region} = $exit->region->name; 2798 $rmp->{region} = $exit->region->name;
2636 $rmp->{origin_map} = $exit->map->path; 2799 $rmp->{origin_map} = $exit->map->path;
2637 $rmp->{origin_x} = $exit->x; 2800 $rmp->{origin_x} = $exit->x;
2638 $rmp->{origin_y} = $exit->y; 2801 $rmp->{origin_y} = $exit->y;
2802
2803 $exit->map->touch;
2639 } 2804 }
2640 2805
2641 $rmp->{random_seed} ||= $exit->random_seed; 2806 $rmp->{random_seed} ||= $exit->random_seed;
2642 2807
2643 my $data = cf::encode_json $rmp; 2808 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2644 my $md5 = Digest::MD5::md5_hex $data; 2809 my $md5 = Digest::MD5::md5_hex $data;
2645 my $meta = "$RANDOMDIR/$md5.meta"; 2810 my $meta = "$RANDOMDIR/$md5.meta";
2646 2811
2647 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2812 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2648 aio_write $fh, 0, (length $data), $data, 0; 2813 aio_write $fh, 0, (length $data), $data, 0;
2649 undef $fh; 2814 undef $fh;
2650 aio_rename "$meta~", $meta; 2815 aio_rename "$meta~", $meta;
2651 2816
2817 my $slaying = "?random/$md5";
2818
2819 if ($exit->valid) {
2652 $exit->slaying ("?random/$md5"); 2820 $exit->slaying ("?random/$md5");
2653 $exit->msg (undef); 2821 $exit->msg (undef);
2822 }
2654 } 2823 }
2655} 2824}
2656 2825
2657sub cf::object::player::enter_exit { 2826sub cf::object::player::enter_exit {
2658 my ($self, $exit) = @_; 2827 my ($self, $exit) = @_;
2659 2828
2660 return unless $self->type == cf::PLAYER; 2829 return unless $self->type == cf::PLAYER;
2661 2830
2662 if ($exit->slaying eq "/!") {
2663 #TODO: this should de-fi-ni-te-ly not be a sync-job
2664 # the problem is that $exit might not survive long enough
2665 # so it needs to be done right now, right here
2666 cf::sync_job { prepare_random_map $exit };
2667 }
2668
2669 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2670 my $hp = $exit->stats->hp;
2671 my $sp = $exit->stats->sp;
2672
2673 $self->enter_link; 2831 $self->enter_link;
2674 2832
2675 # if exit is damned, update players death & WoR home-position
2676 $self->contr->savebed ($slaying, $hp, $sp)
2677 if $exit->flag (FLAG_DAMNED);
2678
2679 (async { 2833 (async {
2680 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2834 $Coro::current->{desc} = "enter_exit";
2681 2835
2682 $self->deactivate_recursive; # just to be sure
2683 unless (eval { 2836 unless (eval {
2837 $self->deactivate_recursive; # just to be sure
2838
2839 # random map handling
2840 {
2841 my $guard = cf::lock_acquire "exit_prepare:$exit";
2842
2843 prepare_random_map $exit
2844 if $exit->slaying eq "/!";
2845 }
2846
2847 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2848 my $x = $exit->stats->hp;
2849 my $y = $exit->stats->sp;
2850
2684 $self->goto ($slaying, $hp, $sp); 2851 $self->goto ($map, $x, $y);
2685 2852
2853 # if exit is damned, update players death & WoR home-position
2854 $self->contr->savebed ($map, $x, $y)
2855 if $exit->flag (cf::FLAG_DAMNED);
2856
2686 1; 2857 1
2687 }) { 2858 }) {
2688 $self->message ("Something went wrong deep within the crossfire server. " 2859 $self->message ("Something went wrong deep within the deliantra server. "
2689 . "I'll try to bring you back to the map you were before. " 2860 . "I'll try to bring you back to the map you were before. "
2690 . "Please report this to the dungeon master!", 2861 . "Please report this to the dungeon master!",
2691 cf::NDI_UNIQUE | cf::NDI_RED); 2862 cf::NDI_UNIQUE | cf::NDI_RED);
2692 2863
2693 warn "ERROR in enter_exit: $@"; 2864 error "ERROR in enter_exit: $@";
2694 $self->leave_link; 2865 $self->leave_link;
2695 } 2866 }
2696 })->prio (1); 2867 })->prio (1);
2697} 2868}
2698 2869
2710sub cf::client::send_drawinfo { 2881sub cf::client::send_drawinfo {
2711 my ($self, $text, $flags) = @_; 2882 my ($self, $text, $flags) = @_;
2712 2883
2713 utf8::encode $text; 2884 utf8::encode $text;
2714 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2885 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2886}
2887
2888=item $client->send_big_packet ($pkt)
2889
2890Like C<send_packet>, but tries to compress large packets, and fragments
2891them as required.
2892
2893=cut
2894
2895our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2896
2897sub cf::client::send_big_packet {
2898 my ($self, $pkt) = @_;
2899
2900 # try lzf for large packets
2901 $pkt = "lzf " . Compress::LZF::compress $pkt
2902 if 1024 <= length $pkt and $self->{can_lzf};
2903
2904 # split very large packets
2905 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2906 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2907 $pkt = "frag";
2908 }
2909
2910 $self->send_packet ($pkt);
2715} 2911}
2716 2912
2717=item $client->send_msg ($channel, $msg, $color, [extra...]) 2913=item $client->send_msg ($channel, $msg, $color, [extra...])
2718 2914
2719Send a drawinfo or msg packet to the client, formatting the msg for the 2915Send a drawinfo or msg packet to the client, formatting the msg for the
2723 2919
2724=cut 2920=cut
2725 2921
2726# non-persistent channels (usually the info channel) 2922# non-persistent channels (usually the info channel)
2727our %CHANNEL = ( 2923our %CHANNEL = (
2924 "c/motd" => {
2925 id => "infobox",
2926 title => "MOTD",
2927 reply => undef,
2928 tooltip => "The message of the day",
2929 },
2728 "c/identify" => { 2930 "c/identify" => {
2729 id => "infobox", 2931 id => "infobox",
2730 title => "Identify", 2932 title => "Identify",
2731 reply => undef, 2933 reply => undef,
2732 tooltip => "Items recently identified", 2934 tooltip => "Items recently identified",
2734 "c/examine" => { 2936 "c/examine" => {
2735 id => "infobox", 2937 id => "infobox",
2736 title => "Examine", 2938 title => "Examine",
2737 reply => undef, 2939 reply => undef,
2738 tooltip => "Signs and other items you examined", 2940 tooltip => "Signs and other items you examined",
2941 },
2942 "c/shopinfo" => {
2943 id => "infobox",
2944 title => "Shop Info",
2945 reply => undef,
2946 tooltip => "What your bargaining skill tells you about the shop",
2739 }, 2947 },
2740 "c/book" => { 2948 "c/book" => {
2741 id => "infobox", 2949 id => "infobox",
2742 title => "Book", 2950 title => "Book",
2743 reply => undef, 2951 reply => undef,
2759 id => "infobox", 2967 id => "infobox",
2760 title => "Body Parts", 2968 title => "Body Parts",
2761 reply => undef, 2969 reply => undef,
2762 tooltip => "Shows which body parts you posess and are available", 2970 tooltip => "Shows which body parts you posess and are available",
2763 }, 2971 },
2972 "c/statistics" => {
2973 id => "infobox",
2974 title => "Statistics",
2975 reply => undef,
2976 tooltip => "Shows your primary statistics",
2977 },
2978 "c/skills" => {
2979 id => "infobox",
2980 title => "Skills",
2981 reply => undef,
2982 tooltip => "Shows your experience per skill and item power",
2983 },
2984 "c/shopitems" => {
2985 id => "infobox",
2986 title => "Shop Items",
2987 reply => undef,
2988 tooltip => "Shows the items currently for sale in this shop",
2989 },
2990 "c/resistances" => {
2991 id => "infobox",
2992 title => "Resistances",
2993 reply => undef,
2994 tooltip => "Shows your resistances",
2995 },
2996 "c/pets" => {
2997 id => "infobox",
2998 title => "Pets",
2999 reply => undef,
3000 tooltip => "Shows information abotu your pets/a specific pet",
3001 },
3002 "c/perceiveself" => {
3003 id => "infobox",
3004 title => "Perceive Self",
3005 reply => undef,
3006 tooltip => "You gained detailed knowledge about yourself",
3007 },
2764 "c/uptime" => { 3008 "c/uptime" => {
2765 id => "infobox", 3009 id => "infobox",
2766 title => "Uptime", 3010 title => "Uptime",
2767 reply => undef, 3011 reply => undef,
2768 tooltip => "How long the server has been running since last restart", 3012 tooltip => "How long the server has been running since last restart",
2771 id => "infobox", 3015 id => "infobox",
2772 title => "Map Info", 3016 title => "Map Info",
2773 reply => undef, 3017 reply => undef,
2774 tooltip => "Information related to the maps", 3018 tooltip => "Information related to the maps",
2775 }, 3019 },
3020 "c/party" => {
3021 id => "party",
3022 title => "Party",
3023 reply => "gsay ",
3024 tooltip => "Messages and chat related to your party",
3025 },
3026 "c/death" => {
3027 id => "death",
3028 title => "Death",
3029 reply => undef,
3030 tooltip => "Reason for and more info about your most recent death",
3031 },
3032 "c/say" => $SAY_CHANNEL,
3033 "c/chat" => $CHAT_CHANNEL,
2776); 3034);
2777 3035
2778sub cf::client::send_msg { 3036sub cf::client::send_msg {
2779 my ($self, $channel, $msg, $color, @extra) = @_; 3037 my ($self, $channel, $msg, $color, @extra) = @_;
2780 3038
2781 $msg = $self->pl->expand_cfpod ($msg); 3039 $msg = $self->pl->expand_cfpod ($msg)
3040 unless $color & cf::NDI_VERBATIM;
2782 3041
2783 $color &= cf::NDI_CLIENT_MASK; # just in case... 3042 $color &= cf::NDI_CLIENT_MASK; # just in case...
2784 3043
2785 # check predefined channels, for the benefit of C 3044 # check predefined channels, for the benefit of C
2786 if ($CHANNEL{$channel}) { 3045 if ($CHANNEL{$channel}) {
2787 $channel = $CHANNEL{$channel}; 3046 $channel = $CHANNEL{$channel};
2788 3047
2789 $self->ext_msg (channel_info => $channel) 3048 $self->ext_msg (channel_info => $channel);
2790 if $self->can_msg;
2791
2792 $channel = $channel->{id}; 3049 $channel = $channel->{id};
2793 3050
2794 } elsif (ref $channel) { 3051 } elsif (ref $channel) {
2795 # send meta info to client, if not yet sent 3052 # send meta info to client, if not yet sent
2796 unless (exists $self->{channel}{$channel->{id}}) { 3053 unless (exists $self->{channel}{$channel->{id}}) {
2797 $self->{channel}{$channel->{id}} = $channel; 3054 $self->{channel}{$channel->{id}} = $channel;
2798 $self->ext_msg (channel_info => $channel) 3055 $self->ext_msg (channel_info => $channel);
2799 if $self->can_msg;
2800 } 3056 }
2801 3057
2802 $channel = $channel->{id}; 3058 $channel = $channel->{id};
2803 } 3059 }
2804 3060
2805 return unless @extra || length $msg; 3061 return unless @extra || length $msg;
2806 3062
2807 if ($self->can_msg) {
2808 # default colour, mask it out 3063 # default colour, mask it out
2809 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3064 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2810 if $color & cf::NDI_DEF; 3065 if $color & cf::NDI_DEF;
2811 3066
2812 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3067 my $pkt = "msg "
3068 . $self->{json_coder}->encode (
2813 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3069 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2814 } else { 3070 );
2815 if ($color >= 0) {
2816 # replace some tags by gcfclient-compatible ones
2817 for ($msg) {
2818 1 while
2819 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2820 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2821 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2822 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2823 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2824 }
2825 3071
2826 $color &= cf::NDI_COLOR_MASK; 3072 $self->send_big_packet ($pkt);
2827
2828 utf8::encode $msg;
2829
2830 if (0 && $msg =~ /\[/) {
2831 # COMMAND/INFO
2832 $self->send_packet ("drawextinfo $color 10 8 $msg")
2833 } else {
2834 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2835 $self->send_packet ("drawinfo $color $msg")
2836 }
2837 }
2838 }
2839} 3073}
2840 3074
2841=item $client->ext_msg ($type, @msg) 3075=item $client->ext_msg ($type, @msg)
2842 3076
2843Sends an ext event to the client. 3077Sends an ext event to the client.
2846 3080
2847sub cf::client::ext_msg($$@) { 3081sub cf::client::ext_msg($$@) {
2848 my ($self, $type, @msg) = @_; 3082 my ($self, $type, @msg) = @_;
2849 3083
2850 if ($self->extcmd == 2) { 3084 if ($self->extcmd == 2) {
2851 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3085 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2852 } elsif ($self->extcmd == 1) { # TODO: remove 3086 } elsif ($self->extcmd == 1) { # TODO: remove
2853 push @msg, msgtype => "event_$type"; 3087 push @msg, msgtype => "event_$type";
2854 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3088 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2855 } 3089 }
2856} 3090}
2857 3091
2858=item $client->ext_reply ($msgid, @msg) 3092=item $client->ext_reply ($msgid, @msg)
2859 3093
2863 3097
2864sub cf::client::ext_reply($$@) { 3098sub cf::client::ext_reply($$@) {
2865 my ($self, $id, @msg) = @_; 3099 my ($self, $id, @msg) = @_;
2866 3100
2867 if ($self->extcmd == 2) { 3101 if ($self->extcmd == 2) {
2868 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3102 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2869 } elsif ($self->extcmd == 1) { 3103 } elsif ($self->extcmd == 1) {
2870 #TODO: version 1, remove 3104 #TODO: version 1, remove
2871 unshift @msg, msgtype => "reply", msgid => $id; 3105 unshift @msg, msgtype => "reply", msgid => $id;
2872 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3106 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2873 } 3107 }
2874} 3108}
2875 3109
2876=item $success = $client->query ($flags, "text", \&cb) 3110=item $success = $client->query ($flags, "text", \&cb)
2877 3111
2948 3182
2949 $ns->ext_reply ($reply, @reply) 3183 $ns->ext_reply ($reply, @reply)
2950 if $reply; 3184 if $reply;
2951 3185
2952 } else { 3186 } else {
2953 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3187 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2954 } 3188 }
2955 3189
2956 cf::override; 3190 cf::override;
2957 }, 3191 },
2958); 3192);
2978 3212
2979 $coro 3213 $coro
2980} 3214}
2981 3215
2982cf::client->attach ( 3216cf::client->attach (
2983 on_destroy => sub { 3217 on_client_destroy => sub {
2984 my ($ns) = @_; 3218 my ($ns) = @_;
2985 3219
2986 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3220 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2987 }, 3221 },
2988); 3222);
3004our $safe_hole = new Safe::Hole; 3238our $safe_hole = new Safe::Hole;
3005 3239
3006$SIG{FPE} = 'IGNORE'; 3240$SIG{FPE} = 'IGNORE';
3007 3241
3008$safe->permit_only (Opcode::opset qw( 3242$safe->permit_only (Opcode::opset qw(
3009 :base_core :base_mem :base_orig :base_math 3243 :base_core :base_mem :base_orig :base_math :base_loop
3010 grepstart grepwhile mapstart mapwhile 3244 grepstart grepwhile mapstart mapwhile
3011 sort time 3245 sort time
3012)); 3246));
3013 3247
3014# here we export the classes and methods available to script code 3248# here we export the classes and methods available to script code
3017 3251
3018The following functions and methods are available within a safe environment: 3252The following functions and methods are available within a safe environment:
3019 3253
3020 cf::object 3254 cf::object
3021 contr pay_amount pay_player map x y force_find force_add destroy 3255 contr pay_amount pay_player map x y force_find force_add destroy
3022 insert remove name archname title slaying race decrease_ob_nr 3256 insert remove name archname title slaying race decrease split
3257 value
3023 3258
3024 cf::object::player 3259 cf::object::player
3025 player 3260 player
3026 3261
3027 cf::player 3262 cf::player
3032 3267
3033=cut 3268=cut
3034 3269
3035for ( 3270for (
3036 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3271 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3037 insert remove inv name archname title slaying race 3272 insert remove inv nrof name archname title slaying race
3038 decrease_ob_nr destroy)], 3273 decrease split destroy change_exp value msg lore send_msg)],
3039 ["cf::object::player" => qw(player)], 3274 ["cf::object::player" => qw(player)],
3040 ["cf::player" => qw(peaceful)], 3275 ["cf::player" => qw(peaceful send_msg)],
3041 ["cf::map" => qw(trigger)], 3276 ["cf::map" => qw(trigger)],
3042) { 3277) {
3043 no strict 'refs';
3044 my ($pkg, @funs) = @$_; 3278 my ($pkg, @funs) = @$_;
3045 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3279 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3046 for @funs; 3280 for @funs;
3047} 3281}
3048 3282
3063 3297
3064 my $qcode = $code; 3298 my $qcode = $code;
3065 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3299 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3066 $qcode =~ s/\n/\\n/g; 3300 $qcode =~ s/\n/\\n/g;
3067 3301
3302 %vars = (_dummy => 0) unless %vars;
3303
3304 my @res;
3068 local $_; 3305 local $_;
3069 local @safe::cf::_safe_eval_args = values %vars;
3070 3306
3071 my $eval = 3307 my $eval =
3072 "do {\n" 3308 "do {\n"
3073 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3309 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3074 . "#line 0 \"{$qcode}\"\n" 3310 . "#line 0 \"{$qcode}\"\n"
3075 . $code 3311 . $code
3076 . "\n}" 3312 . "\n}"
3077 ; 3313 ;
3078 3314
3315 if ($CFG{safe_eval}) {
3079 sub_generation_inc; 3316 sub_generation_inc;
3317 local @safe::cf::_safe_eval_args = values %vars;
3080 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3318 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3081 sub_generation_inc; 3319 sub_generation_inc;
3320 } else {
3321 local @cf::_safe_eval_args = values %vars;
3322 @res = wantarray ? eval eval : scalar eval $eval;
3323 }
3082 3324
3083 if ($@) { 3325 if ($@) {
3084 warn "$@"; 3326 warn "$@",
3085 warn "while executing safe code '$code'\n"; 3327 "while executing safe code '$code'\n",
3086 warn "with arguments " . (join " ", %vars) . "\n"; 3328 "with arguments " . (join " ", %vars) . "\n";
3087 } 3329 }
3088 3330
3089 wantarray ? @res : $res[0] 3331 wantarray ? @res : $res[0]
3090} 3332}
3091 3333
3105=cut 3347=cut
3106 3348
3107sub register_script_function { 3349sub register_script_function {
3108 my ($fun, $cb) = @_; 3350 my ($fun, $cb) = @_;
3109 3351
3110 no strict 'refs'; 3352 $fun = "safe::$fun" if $CFG{safe_eval};
3111 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3353 *$fun = $safe_hole->wrap ($cb);
3112} 3354}
3113 3355
3114=back 3356=back
3115 3357
3116=cut 3358=cut
3117 3359
3118############################################################################# 3360#############################################################################
3119# the server's init and main functions 3361# the server's init and main functions
3362
3363# async inc loader. yay.
3364sub inc_loader {
3365 my $mod = $_[1];
3366
3367 if (in_main && !tick_inhibit) {
3368 Carp::cluck "ERROR: attempted synchronous perl module load ($mod)";
3369 } else {
3370 debug "loading perl module $mod\n";
3371 }
3372
3373 # 1. find real file
3374 for my $dir (@ORIG_INC) {
3375 ref $dir and next;
3376 0 <= Coro::AIO::aio_load "$dir/$mod", my $data
3377 or next;
3378
3379 $data = "#line 1 $dir/$mod\n$data";
3380
3381 open my $fh, "<", \$data or die;
3382
3383 return $fh;
3384 }
3385
3386 ()
3387}
3388
3389sub init_inc {
3390 # save original @INC
3391 @ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC;
3392
3393 # make sure we can do scalar-opens
3394 open my $dummy, "<", \my $dummy2;
3395
3396 # execute some stuff so perl load's some of the core modules
3397 /Ü/ =~ /ü/i;
3398 eval { &Storable::nstore_fd };
3399
3400 @INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc.
3401
3402 debug "module loading will be asynchronous from this point on.";
3403}
3120 3404
3121sub load_facedata($) { 3405sub load_facedata($) {
3122 my ($path) = @_; 3406 my ($path) = @_;
3123 3407
3124 # HACK to clear player env face cache, we need some signal framework 3408 # HACK to clear player env face cache, we need some signal framework
3125 # for this (global event?) 3409 # for this (global event?)
3126 %ext::player_env::MUSIC_FACE_CACHE = (); 3410 %ext::player_env::MUSIC_FACE_CACHE = ();
3127 3411
3128 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3412 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3129 3413
3130 warn "loading facedata from $path\n"; 3414 trace "loading facedata from $path\n";
3131 3415
3132 my $facedata; 3416 my $facedata;
3133 0 < aio_load $path, $facedata 3417 0 < aio_load $path, $facedata
3134 or die "$path: $!"; 3418 or die "$path: $!";
3135 3419
3137 3421
3138 $facedata->{version} == 2 3422 $facedata->{version} == 2
3139 or cf::cleanup "$path: version mismatch, cannot proceed."; 3423 or cf::cleanup "$path: version mismatch, cannot proceed.";
3140 3424
3141 # patch in the exptable 3425 # patch in the exptable
3426 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3142 $facedata->{resource}{"res/exp_table"} = { 3427 $facedata->{resource}{"res/exp_table"} = {
3143 type => FT_RSRC, 3428 type => FT_RSRC,
3144 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3429 data => $exp_table,
3430 hash => (Digest::MD5::md5 $exp_table),
3145 }; 3431 };
3146 cf::cede_to_tick; 3432 cf::cede_to_tick;
3147 3433
3148 { 3434 {
3149 my $faces = $facedata->{faceinfo}; 3435 my $faces = $facedata->{faceinfo};
3150 3436
3151 while (my ($face, $info) = each %$faces) { 3437 while (my ($face, $info) = each %$faces) {
3152 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3438 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3439
3153 cf::face::set_visibility $idx, $info->{visibility}; 3440 cf::face::set_visibility $idx, $info->{visibility};
3154 cf::face::set_magicmap $idx, $info->{magicmap}; 3441 cf::face::set_magicmap $idx, $info->{magicmap};
3155 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3442 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3156 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3443 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3157 3444
3158 cf::cede_to_tick; 3445 cf::cede_to_tick;
3159 } 3446 }
3160 3447
3161 while (my ($face, $info) = each %$faces) { 3448 while (my ($face, $info) = each %$faces) {
3162 next unless $info->{smooth}; 3449 next unless $info->{smooth};
3450
3163 my $idx = cf::face::find $face 3451 my $idx = cf::face::find $face
3164 or next; 3452 or next;
3453
3165 if (my $smooth = cf::face::find $info->{smooth}) { 3454 if (my $smooth = cf::face::find $info->{smooth}) {
3166 cf::face::set_smooth $idx, $smooth; 3455 cf::face::set_smooth $idx, $smooth;
3167 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3456 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3168 } else { 3457 } else {
3169 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3458 error "smooth face '$info->{smooth}' not found for face '$face'";
3170 } 3459 }
3171 3460
3172 cf::cede_to_tick; 3461 cf::cede_to_tick;
3173 } 3462 }
3174 } 3463 }
3183 3472
3184 cf::anim::invalidate_all; # d'oh 3473 cf::anim::invalidate_all; # d'oh
3185 } 3474 }
3186 3475
3187 { 3476 {
3188 # TODO: for gcfclient pleasure, we should give resources
3189 # that gcfclient doesn't grok a >10000 face index.
3190 my $res = $facedata->{resource}; 3477 my $res = $facedata->{resource};
3191 3478
3192 my $soundconf = delete $res->{"res/sound.conf"};
3193
3194 while (my ($name, $info) = each %$res) { 3479 while (my ($name, $info) = each %$res) {
3480 if (defined $info->{type}) {
3195 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3481 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3196 my $data;
3197 3482
3198 if ($info->{type} & 1) { 3483 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3199 # prepend meta info 3484 cf::face::set_type $idx, $info->{type};
3200
3201 my $meta = $enc->encode ({
3202 name => $name,
3203 %{ $info->{meta} || {} },
3204 });
3205
3206 $data = pack "(w/a*)*", $meta, $info->{data};
3207 } else { 3485 } else {
3208 $data = $info->{data}; 3486 $RESOURCE{$name} = $info; # unused
3209 } 3487 }
3210 3488
3211 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3212 cf::face::set_type $idx, $info->{type};
3213
3214 cf::cede_to_tick; 3489 cf::cede_to_tick;
3215 } 3490 }
3216
3217 if ($soundconf) {
3218 $soundconf = $enc->decode (delete $soundconf->{data});
3219
3220 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3221 my $sound = $soundconf->{compat}[$_]
3222 or next;
3223
3224 my $face = cf::face::find "sound/$sound->[1]";
3225 cf::sound::set $sound->[0] => $face;
3226 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3227 }
3228
3229 while (my ($k, $v) = each %{$soundconf->{event}}) {
3230 my $face = cf::face::find "sound/$v";
3231 cf::sound::set $k => $face;
3232 }
3233 }
3234 } 3491 }
3492
3493 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3235 3494
3236 1 3495 1
3237} 3496}
3238 3497
3239register_exticmd fx_want => sub { 3498register_exticmd fx_want => sub {
3241 3500
3242 while (my ($k, $v) = each %$want) { 3501 while (my ($k, $v) = each %$want) {
3243 $ns->fx_want ($k, $v); 3502 $ns->fx_want ($k, $v);
3244 } 3503 }
3245}; 3504};
3505
3506sub load_resource_file($) {
3507 my $guard = lock_acquire "load_resource_file";
3508
3509 my $status = load_resource_file_ $_[0];
3510 get_slot 0.1, 100;
3511 cf::arch::commit_load;
3512
3513 $status
3514}
3246 3515
3247sub reload_regions { 3516sub reload_regions {
3248 # HACK to clear player env face cache, we need some signal framework 3517 # HACK to clear player env face cache, we need some signal framework
3249 # for this (global event?) 3518 # for this (global event?)
3250 %ext::player_env::MUSIC_FACE_CACHE = (); 3519 %ext::player_env::MUSIC_FACE_CACHE = ();
3264} 3533}
3265 3534
3266sub reload_archetypes { 3535sub reload_archetypes {
3267 load_resource_file "$DATADIR/archetypes" 3536 load_resource_file "$DATADIR/archetypes"
3268 or die "unable to load archetypes\n"; 3537 or die "unable to load archetypes\n";
3269 #d# NEED to laod twice to resolve forward references
3270 # this really needs to be done in an extra post-pass
3271 # (which needs to be synchronous, so solve it differently)
3272 load_resource_file "$DATADIR/archetypes"
3273 or die "unable to load archetypes\n";
3274} 3538}
3275 3539
3276sub reload_treasures { 3540sub reload_treasures {
3277 load_resource_file "$DATADIR/treasures" 3541 load_resource_file "$DATADIR/treasures"
3278 or die "unable to load treasurelists\n"; 3542 or die "unable to load treasurelists\n";
3279} 3543}
3280 3544
3545sub reload_sound {
3546 trace "loading sound config from $DATADIR/sound\n";
3547
3548 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3549 or die "$DATADIR/sound $!";
3550
3551 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3552
3553 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3554 my $sound = $soundconf->{compat}[$_]
3555 or next;
3556
3557 my $face = cf::face::find "sound/$sound->[1]";
3558 cf::sound::set $sound->[0] => $face;
3559 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3560 }
3561
3562 while (my ($k, $v) = each %{$soundconf->{event}}) {
3563 my $face = cf::face::find "sound/$v";
3564 cf::sound::set $k => $face;
3565 }
3566}
3567
3281sub reload_resources { 3568sub reload_resources {
3282 warn "reloading resource files...\n"; 3569 trace "reloading resource files...\n";
3283 3570
3571 reload_facedata;
3572 reload_sound;
3573 reload_archetypes;
3284 reload_regions; 3574 reload_regions;
3285 reload_facedata;
3286 #reload_archetypes;#d#
3287 reload_archetypes;
3288 reload_treasures; 3575 reload_treasures;
3289 3576
3290 warn "finished reloading resource files\n"; 3577 trace "finished reloading resource files\n";
3291}
3292
3293sub init {
3294 reload_resources;
3295} 3578}
3296 3579
3297sub reload_config { 3580sub reload_config {
3581 trace "reloading config file...\n";
3582
3298 open my $fh, "<:utf8", "$CONFDIR/config" 3583 open my $fh, "<:utf8", "$CONFDIR/config"
3299 or return; 3584 or return;
3300 3585
3301 local $/; 3586 local $/;
3302 *CFG = YAML::Syck::Load <$fh>; 3587 *CFG = YAML::XS::Load scalar <$fh>;
3303 3588
3304 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3589 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3305 3590
3306 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3591 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3307 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3592 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3308 3593
3309 if (exists $CFG{mlockall}) { 3594 if (exists $CFG{mlockall}) {
3311 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3596 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3312 and die "WARNING: m(un)lockall failed: $!\n"; 3597 and die "WARNING: m(un)lockall failed: $!\n";
3313 }; 3598 };
3314 warn $@ if $@; 3599 warn $@ if $@;
3315 } 3600 }
3601
3602 trace "finished reloading resource files\n";
3603}
3604
3605sub pidfile() {
3606 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3607 or die "$PIDFILE: $!";
3608 flock $fh, &Fcntl::LOCK_EX
3609 or die "$PIDFILE: flock: $!";
3610 $fh
3611}
3612
3613# make sure only one server instance is running at any one time
3614sub atomic {
3615 my $fh = pidfile;
3616
3617 my $pid = <$fh>;
3618 kill 9, $pid if $pid > 0;
3619
3620 seek $fh, 0, 0;
3621 print $fh $$;
3622}
3623
3624sub main_loop {
3625 trace "EV::loop starting\n";
3626 if (1) {
3627 EV::loop;
3628 }
3629 trace "EV::loop returned\n";
3630 goto &main_loop unless $REALLY_UNLOOP;
3316} 3631}
3317 3632
3318sub main { 3633sub main {
3634 cf::init_globals; # initialise logging
3635
3636 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3637 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3638 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3639 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3640
3641 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3642
3319 # we must not ever block the main coroutine 3643 # we must not ever block the main coroutine
3320 local $Coro::idle = sub { 3644 local $Coro::idle = sub {
3321 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3645 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3322 (async { 3646 (async {
3323 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3647 $Coro::current->{desc} = "IDLE BUG HANDLER";
3324 EV::loop EV::LOOP_ONESHOT; 3648 EV::loop EV::LOOP_ONESHOT;
3325 })->prio (Coro::PRIO_MAX); 3649 })->prio (Coro::PRIO_MAX);
3326 }; 3650 };
3327 3651
3652 evthread_start IO::AIO::poll_fileno;
3653
3654 cf::sync_job {
3655 init_inc;
3656
3657 cf::init_experience;
3658 cf::init_anim;
3659 cf::init_attackmess;
3660 cf::init_dynamic;
3661
3662 cf::load_settings;
3663 cf::load_materials;
3664
3665 reload_resources;
3328 reload_config; 3666 reload_config;
3329 db_init; 3667 db_init;
3668
3669 cf::init_uuid;
3670 cf::init_signals;
3671 cf::init_skills;
3672
3673 cf::init_beforeplay;
3674
3675 atomic;
3676
3330 load_extensions; 3677 load_extensions;
3331 3678
3332 $TICK_WATCHER->start; 3679 utime time, time, $RUNTIMEFILE;
3333 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3680
3334 EV::loop; 3681 # no (long-running) fork's whatsoever before this point(!)
3682 use POSIX ();
3683 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3684
3685 (pop @POST_INIT)->(0) while @POST_INIT;
3686 };
3687
3688 cf::object::thawer::errors_are_fatal 0;
3689 info "parse errors in files are no longer fatal from this point on.\n";
3690
3691 my $free_main; $free_main = EV::idle sub {
3692 undef $free_main;
3693 undef &main; # free gobs of memory :)
3694 };
3695
3696 goto &main_loop;
3335} 3697}
3336 3698
3337############################################################################# 3699#############################################################################
3338# initialisation and cleanup 3700# initialisation and cleanup
3339 3701
3340# install some emergency cleanup handlers 3702# install some emergency cleanup handlers
3341BEGIN { 3703BEGIN {
3342 our %SIGWATCHER = (); 3704 our %SIGWATCHER = ();
3343 for my $signal (qw(INT HUP TERM)) { 3705 for my $signal (qw(INT HUP TERM)) {
3344 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3706 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3345 cf::cleanup "SIG$signal"; 3707 cf::cleanup "SIG$signal";
3346 }; 3708 };
3347 } 3709 }
3348} 3710}
3349 3711
3350sub write_runtime { 3712sub write_runtime_sync {
3351 my $runtime = "$LOCALDIR/runtime"; 3713 my $t0 = AE::time;
3352 3714
3353 # first touch the runtime file to show we are still running: 3715 # first touch the runtime file to show we are still running:
3354 # the fsync below can take a very very long time. 3716 # the fsync below can take a very very long time.
3355 3717
3356 IO::AIO::aio_utime $runtime, undef, undef; 3718 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3357 3719
3358 my $guard = cf::lock_acquire "write_runtime"; 3720 my $guard = cf::lock_acquire "write_runtime";
3359 3721
3360 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3722 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3361 or return; 3723 or return;
3362 3724
3363 my $value = $cf::RUNTIME + 90 + 10; 3725 my $value = $cf::RUNTIME + 90 + 10;
3364 # 10 is the runtime save interval, for a monotonic clock 3726 # 10 is the runtime save interval, for a monotonic clock
3365 # 60 allows for the watchdog to kill the server. 3727 # 60 allows for the watchdog to kill the server.
3375 aio_utime $fh, undef, undef; 3737 aio_utime $fh, undef, undef;
3376 3738
3377 close $fh 3739 close $fh
3378 or return; 3740 or return;
3379 3741
3380 aio_rename "$runtime~", $runtime 3742 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3381 and return; 3743 and return;
3382 3744
3383 warn "runtime file written.\n"; 3745 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3384 3746
3385 1 3747 1
3748}
3749
3750our $uuid_lock;
3751our $uuid_skip;
3752
3753sub write_uuid_sync($) {
3754 $uuid_skip ||= $_[0];
3755
3756 return if $uuid_lock;
3757 local $uuid_lock = 1;
3758
3759 my $uuid = "$LOCALDIR/uuid";
3760
3761 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3762 or return;
3763
3764 my $value = uuid_seq uuid_cur;
3765
3766 unless ($value) {
3767 info "cowardly refusing to write zero uuid value!\n";
3768 return;
3769 }
3770
3771 my $value = uuid_str $value + $uuid_skip;
3772 $uuid_skip = 0;
3773
3774 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3775 and return;
3776
3777 # always fsync - this file is important
3778 aio_fsync $fh
3779 and return;
3780
3781 close $fh
3782 or return;
3783
3784 aio_rename "$uuid~", $uuid
3785 and return;
3786
3787 trace "uuid file written ($value).\n";
3788
3789 1
3790
3791}
3792
3793sub write_uuid($$) {
3794 my ($skip, $sync) = @_;
3795
3796 $sync ? write_uuid_sync $skip
3797 : async { write_uuid_sync $skip };
3386} 3798}
3387 3799
3388sub emergency_save() { 3800sub emergency_save() {
3389 my $freeze_guard = cf::freeze_mainloop; 3801 my $freeze_guard = cf::freeze_mainloop;
3390 3802
3391 warn "enter emergency perl save\n"; 3803 info "emergency_perl_save: enter\n";
3804
3805 # this is a trade-off: we want to be very quick here, so
3806 # save all maps without fsync, and later call a global sync
3807 # (which in turn might be very very slow)
3808 local $USE_FSYNC = 0;
3392 3809
3393 cf::sync_job { 3810 cf::sync_job {
3811 cf::write_runtime_sync; # external watchdog should not bark
3812
3394 # use a peculiar iteration method to avoid tripping on perl 3813 # use a peculiar iteration method to avoid tripping on perl
3395 # refcount bugs in for. also avoids problems with players 3814 # refcount bugs in for. also avoids problems with players
3396 # and maps saved/destroyed asynchronously. 3815 # and maps saved/destroyed asynchronously.
3397 warn "begin emergency player save\n"; 3816 info "emergency_perl_save: begin player save\n";
3398 for my $login (keys %cf::PLAYER) { 3817 for my $login (keys %cf::PLAYER) {
3399 my $pl = $cf::PLAYER{$login} or next; 3818 my $pl = $cf::PLAYER{$login} or next;
3400 $pl->valid or next; 3819 $pl->valid or next;
3401 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3820 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3402 $pl->save; 3821 $pl->save;
3403 } 3822 }
3404 warn "end emergency player save\n"; 3823 info "emergency_perl_save: end player save\n";
3405 3824
3406 warn "begin emergency map save\n"; 3825 cf::write_runtime_sync; # external watchdog should not bark
3826
3827 info "emergency_perl_save: begin map save\n";
3407 for my $path (keys %cf::MAP) { 3828 for my $path (keys %cf::MAP) {
3408 my $map = $cf::MAP{$path} or next; 3829 my $map = $cf::MAP{$path} or next;
3409 $map->valid or next; 3830 $map->valid or next;
3410 $map->save; 3831 $map->save;
3411 } 3832 }
3412 warn "end emergency map save\n"; 3833 info "emergency_perl_save: end map save\n";
3413 3834
3414 warn "begin emergency database checkpoint\n"; 3835 cf::write_runtime_sync; # external watchdog should not bark
3836
3837 info "emergency_perl_save: begin database checkpoint\n";
3415 BDB::db_env_txn_checkpoint $DB_ENV; 3838 BDB::db_env_txn_checkpoint $DB_ENV;
3416 warn "end emergency database checkpoint\n"; 3839 info "emergency_perl_save: end database checkpoint\n";
3840
3841 info "emergency_perl_save: begin write uuid\n";
3842 write_uuid_sync 1;
3843 info "emergency_perl_save: end write uuid\n";
3844
3845 cf::write_runtime_sync; # external watchdog should not bark
3846
3847 trace "emergency_perl_save: syncing database to disk";
3848 BDB::db_env_txn_checkpoint $DB_ENV;
3849
3850 info "emergency_perl_save: starting sync\n";
3851 IO::AIO::aio_sync sub {
3852 info "emergency_perl_save: finished sync\n";
3853 };
3854
3855 cf::write_runtime_sync; # external watchdog should not bark
3856
3857 trace "emergency_perl_save: flushing outstanding aio requests";
3858 while (IO::AIO::nreqs || BDB::nreqs) {
3859 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3860 }
3861
3862 cf::write_runtime_sync; # external watchdog should not bark
3417 }; 3863 };
3418 3864
3419 warn "leave emergency perl save\n"; 3865 info "emergency_perl_save: leave\n";
3420} 3866}
3421 3867
3422sub post_cleanup { 3868sub post_cleanup {
3423 my ($make_core) = @_; 3869 my ($make_core) = @_;
3424 3870
3871 IO::AIO::flush;
3872
3425 warn Carp::longmess "post_cleanup backtrace" 3873 error Carp::longmess "post_cleanup backtrace"
3426 if $make_core; 3874 if $make_core;
3875
3876 my $fh = pidfile;
3877 unlink $PIDFILE if <$fh> == $$;
3878}
3879
3880# a safer delete_package, copied from Symbol
3881sub clear_package($) {
3882 my $pkg = shift;
3883
3884 # expand to full symbol table name if needed
3885 unless ($pkg =~ /^main::.*::$/) {
3886 $pkg = "main$pkg" if $pkg =~ /^::/;
3887 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3888 $pkg .= '::' unless $pkg =~ /::$/;
3889 }
3890
3891 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3892 my $stem_symtab = *{$stem}{HASH};
3893
3894 defined $stem_symtab and exists $stem_symtab->{$leaf}
3895 or return;
3896
3897 # clear all symbols
3898 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3899 for my $name (keys %$leaf_symtab) {
3900 _gv_clear *{"$pkg$name"};
3901# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3902 }
3427} 3903}
3428 3904
3429sub do_reload_perl() { 3905sub do_reload_perl() {
3430 # can/must only be called in main 3906 # can/must only be called in main
3431 if ($Coro::current != $Coro::main) { 3907 if (in_main) {
3432 warn "can only reload from main coroutine"; 3908 error "can only reload from main coroutine";
3433 return; 3909 return;
3434 } 3910 }
3435 3911
3912 return if $RELOAD++;
3913
3914 my $t1 = AE::time;
3915
3916 while ($RELOAD) {
3436 warn "reloading..."; 3917 info "reloading...";
3437 3918
3438 warn "entering sync_job"; 3919 trace "entering sync_job";
3439 3920
3440 cf::sync_job { 3921 cf::sync_job {
3441 cf::write_runtime; # external watchdog should not bark
3442 cf::emergency_save; 3922 cf::emergency_save;
3443 cf::write_runtime; # external watchdog should not bark
3444 3923
3445 warn "syncing database to disk";
3446 BDB::db_env_txn_checkpoint $DB_ENV;
3447
3448 # if anything goes wrong in here, we should simply crash as we already saved
3449
3450 warn "flushing outstanding aio requests";
3451 for (;;) {
3452 BDB::flush;
3453 IO::AIO::flush;
3454 Coro::cede_notself;
3455 last unless IO::AIO::nreqs || BDB::nreqs;
3456 warn "iterate...";
3457 }
3458
3459 ++$RELOAD;
3460
3461 warn "cancelling all extension coros"; 3924 trace "cancelling all extension coros";
3462 $_->cancel for values %EXT_CORO; 3925 $_->cancel for values %EXT_CORO;
3463 %EXT_CORO = (); 3926 %EXT_CORO = ();
3464 3927
3465 warn "removing commands"; 3928 trace "removing commands";
3466 %COMMAND = (); 3929 %COMMAND = ();
3467 3930
3468 warn "removing ext/exti commands"; 3931 trace "removing ext/exti commands";
3469 %EXTCMD = (); 3932 %EXTCMD = ();
3470 %EXTICMD = (); 3933 %EXTICMD = ();
3471 3934
3472 warn "unloading/nuking all extensions"; 3935 trace "unloading/nuking all extensions";
3473 for my $pkg (@EXTS) { 3936 for my $pkg (@EXTS) {
3474 warn "... unloading $pkg"; 3937 trace "... unloading $pkg";
3475 3938
3476 if (my $cb = $pkg->can ("unload")) { 3939 if (my $cb = $pkg->can ("unload")) {
3477 eval { 3940 eval {
3478 $cb->($pkg); 3941 $cb->($pkg);
3479 1 3942 1
3480 } or warn "$pkg unloaded, but with errors: $@"; 3943 } or error "$pkg unloaded, but with errors: $@";
3944 }
3945
3946 trace "... clearing $pkg";
3947 clear_package $pkg;
3481 } 3948 }
3482 3949
3483 warn "... nuking $pkg";
3484 Symbol::delete_package $pkg;
3485 }
3486
3487 warn "unloading all perl modules loaded from $LIBDIR"; 3950 trace "unloading all perl modules loaded from $LIBDIR";
3488 while (my ($k, $v) = each %INC) { 3951 while (my ($k, $v) = each %INC) {
3489 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3952 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3490 3953
3491 warn "... unloading $k"; 3954 trace "... unloading $k";
3492 delete $INC{$k}; 3955 delete $INC{$k};
3493 3956
3494 $k =~ s/\.pm$//; 3957 $k =~ s/\.pm$//;
3495 $k =~ s/\//::/g; 3958 $k =~ s/\//::/g;
3496 3959
3497 if (my $cb = $k->can ("unload_module")) { 3960 if (my $cb = $k->can ("unload_module")) {
3498 $cb->(); 3961 $cb->();
3962 }
3963
3964 clear_package $k;
3499 } 3965 }
3500 3966
3501 Symbol::delete_package $k;
3502 }
3503
3504 warn "getting rid of safe::, as good as possible"; 3967 trace "getting rid of safe::, as good as possible";
3505 Symbol::delete_package "safe::$_" 3968 clear_package "safe::$_"
3506 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3969 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3507 3970
3508 warn "unloading cf.pm \"a bit\""; 3971 trace "unloading cf.pm \"a bit\"";
3509 delete $INC{"cf.pm"}; 3972 delete $INC{"cf.pm"};
3510 delete $INC{"cf/pod.pm"}; 3973 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3511 3974
3512 # don't, removes xs symbols, too, 3975 # don't, removes xs symbols, too,
3513 # and global variables created in xs 3976 # and global variables created in xs
3514 #Symbol::delete_package __PACKAGE__; 3977 #clear_package __PACKAGE__;
3515 3978
3516 warn "unload completed, starting to reload now"; 3979 info "unload completed, starting to reload now";
3517 3980
3518 warn "reloading cf.pm"; 3981 trace "reloading cf.pm";
3519 require cf; 3982 require cf;
3520 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3983 cf::_connect_to_perl_1;
3521 3984
3522 warn "loading config and database again"; 3985 trace "loading config and database again";
3523 cf::reload_config; 3986 cf::reload_config;
3524 3987
3525 warn "loading extensions"; 3988 trace "loading extensions";
3526 cf::load_extensions; 3989 cf::load_extensions;
3527 3990
3991 if ($REATTACH_ON_RELOAD) {
3528 warn "reattaching attachments to objects/players"; 3992 trace "reattaching attachments to objects/players";
3529 _global_reattach; # objects, sockets 3993 _global_reattach; # objects, sockets
3530 warn "reattaching attachments to maps"; 3994 trace "reattaching attachments to maps";
3531 reattach $_ for values %MAP; 3995 reattach $_ for values %MAP;
3532 warn "reattaching attachments to players"; 3996 trace "reattaching attachments to players";
3533 reattach $_ for values %PLAYER; 3997 reattach $_ for values %PLAYER;
3998 }
3534 3999
4000 trace "running post_init jobs";
4001 (pop @POST_INIT)->(1) while @POST_INIT;
4002
3535 warn "leaving sync_job"; 4003 trace "leaving sync_job";
3536 4004
3537 1 4005 1
3538 } or do { 4006 } or do {
3539 warn $@; 4007 error $@;
3540 warn "error while reloading, exiting."; 4008 cf::cleanup "error while reloading, exiting.";
3541 exit 1; 4009 };
4010
4011 info "reloaded";
4012 --$RELOAD;
3542 }; 4013 }
3543 4014
3544 warn "reloaded"; 4015 $t1 = AE::time - $t1;
4016 info "reload completed in ${t1}s\n";
3545}; 4017};
3546 4018
3547our $RELOAD_WATCHER; # used only during reload 4019our $RELOAD_WATCHER; # used only during reload
3548 4020
3549sub reload_perl() { 4021sub reload_perl() {
3550 # doing reload synchronously and two reloads happen back-to-back, 4022 # doing reload synchronously and two reloads happen back-to-back,
3551 # coro crashes during coro_state_free->destroy here. 4023 # coro crashes during coro_state_free->destroy here.
3552 4024
4025 $RELOAD_WATCHER ||= cf::async {
4026 Coro::AIO::aio_wait cache_extensions;
4027
3553 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4028 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
4029 do_reload_perl;
3554 undef $RELOAD_WATCHER; 4030 undef $RELOAD_WATCHER;
3555 do_reload_perl; 4031 };
3556 }; 4032 };
3557} 4033}
3558 4034
3559register_command "reload" => sub { 4035register_command "reload" => sub {
3560 my ($who, $arg) = @_; 4036 my ($who, $arg) = @_;
3566 reload_perl; 4042 reload_perl;
3567 }; 4043 };
3568 } 4044 }
3569}; 4045};
3570 4046
3571unshift @INC, $LIBDIR; 4047#############################################################################
3572 4048
3573my $bug_warning = 0; 4049my $bug_warning = 0;
3574 4050
3575our @WAIT_FOR_TICK; 4051our @WAIT_FOR_TICK;
3576our @WAIT_FOR_TICK_BEGIN; 4052our @WAIT_FOR_TICK_BEGIN;
3577 4053
3578sub wait_for_tick { 4054sub wait_for_tick {
3579 return unless $TICK_WATCHER->is_active;
3580 return if $Coro::current == $Coro::main; 4055 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3581 4056
3582 my $signal = new Coro::Signal; 4057 my $signal = new Coro::Signal;
3583 push @WAIT_FOR_TICK, $signal; 4058 push @WAIT_FOR_TICK, $signal;
3584 $signal->wait; 4059 $signal->wait;
3585} 4060}
3586 4061
3587sub wait_for_tick_begin { 4062sub wait_for_tick_begin {
3588 return unless $TICK_WATCHER->is_active;
3589 return if $Coro::current == $Coro::main; 4063 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3590 4064
3591 my $signal = new Coro::Signal; 4065 my $signal = new Coro::Signal;
3592 push @WAIT_FOR_TICK_BEGIN, $signal; 4066 push @WAIT_FOR_TICK_BEGIN, $signal;
3593 $signal->wait; 4067 $signal->wait;
3594} 4068}
3595 4069
3596$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 4070sub tick {
3597 if ($Coro::current != $Coro::main) { 4071 if ($Coro::current != $Coro::main) {
3598 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4072 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3599 unless ++$bug_warning > 10; 4073 unless ++$bug_warning > 10;
3600 return; 4074 return;
3601 } 4075 }
3602 4076
3603 $NOW = $tick_start = EV::now;
3604
3605 cf::server_tick; # one server iteration 4077 cf::server_tick; # one server iteration
3606 4078
3607 $RUNTIME += $TICK; 4079 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3608 $NEXT_TICK += $TICK;
3609 4080
3610 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4081 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3611 $NEXT_RUNTIME_WRITE = $NOW + 10; 4082 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3612 Coro::async_pool { 4083 Coro::async_pool {
3613 $Coro::current->{desc} = "runtime saver"; 4084 $Coro::current->{desc} = "runtime saver";
3614 write_runtime 4085 write_runtime_sync
3615 or warn "ERROR: unable to write runtime file: $!"; 4086 or error "ERROR: unable to write runtime file: $!";
3616 }; 4087 };
3617 } 4088 }
3618 4089
3619 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4090 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3620 $sig->send; 4091 $sig->send;
3621 } 4092 }
3622 while (my $sig = shift @WAIT_FOR_TICK) { 4093 while (my $sig = shift @WAIT_FOR_TICK) {
3623 $sig->send; 4094 $sig->send;
3624 } 4095 }
3625 4096
3626 $LOAD = ($NOW - $tick_start) / $TICK; 4097 $LOAD = ($NOW - $TICK_START) / $TICK;
3627 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4098 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3628 4099
3629 _post_tick; 4100 if (0) {
3630}; 4101 if ($NEXT_TICK) {
3631$TICK_WATCHER->priority (EV::MAXPRI); 4102 my $jitter = $TICK_START - $NEXT_TICK;
4103 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4104 debug "jitter $JITTER\n";#d#
4105 }
4106 }
4107}
3632 4108
3633{ 4109{
4110 # configure BDB
4111
3634 BDB::min_parallel 8; 4112 BDB::min_parallel 16;
3635 BDB::max_poll_time $TICK * 0.1; 4113 BDB::max_poll_reqs $TICK * 0.1;
3636 $BDB_POLL_WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb; 4114 $AnyEvent::BDB::WATCHER->priority (1);
3637
3638 BDB::set_sync_prepare {
3639 my $status;
3640 my $current = $Coro::current;
3641 (
3642 sub {
3643 $status = $!;
3644 $current->ready; undef $current;
3645 },
3646 sub {
3647 Coro::schedule while defined $current;
3648 $! = $status;
3649 },
3650 )
3651 };
3652 4115
3653 unless ($DB_ENV) { 4116 unless ($DB_ENV) {
3654 $DB_ENV = BDB::db_env_create; 4117 $DB_ENV = BDB::db_env_create;
3655 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4118 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3656 | BDB::LOG_AUTOREMOVE, 1); 4119 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4120 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3657 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4121 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3658 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4122 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3659 4123
3660 cf::sync_job { 4124 cf::sync_job {
3661 eval { 4125 eval {
3683 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4147 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3684 }; 4148 };
3685} 4149}
3686 4150
3687{ 4151{
4152 # configure IO::AIO
4153
3688 IO::AIO::min_parallel 8; 4154 IO::AIO::min_parallel 8;
3689
3690 undef $Coro::AIO::WATCHER;
3691 IO::AIO::max_poll_time $TICK * 0.1; 4155 IO::AIO::max_poll_time $TICK * 0.1;
3692 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb; 4156 undef $AnyEvent::AIO::WATCHER;
3693} 4157}
3694 4158
3695my $_log_backtrace; 4159my $_log_backtrace;
3696 4160
3697sub _log_backtrace { 4161sub _log_backtrace {
3700 $msg =~ s/\n//; 4164 $msg =~ s/\n//;
3701 4165
3702 # limit the # of concurrent backtraces 4166 # limit the # of concurrent backtraces
3703 if ($_log_backtrace < 2) { 4167 if ($_log_backtrace < 2) {
3704 ++$_log_backtrace; 4168 ++$_log_backtrace;
4169 my $perl_bt = Carp::longmess $msg;
3705 async { 4170 async {
3706 $Coro::current->{desc} = "abt $msg"; 4171 $Coro::current->{desc} = "abt $msg";
3707 4172
3708 my @bt = fork_call { 4173 my @bt = fork_call {
3709 @addr = map { sprintf "%x", $_ } @addr; 4174 @addr = map { sprintf "%x", $_ } @addr;
3720 } 4185 }
3721 4186
3722 @funcs 4187 @funcs
3723 }; 4188 };
3724 4189
3725 LOG llevInfo, "[ABT] $msg\n"; 4190 LOG llevInfo, "[ABT] $perl_bt\n";
4191 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3726 LOG llevInfo, "[ABT] $_\n" for @bt; 4192 LOG llevInfo, "[ABT] $_\n" for @bt;
3727 --$_log_backtrace; 4193 --$_log_backtrace;
3728 }; 4194 };
3729 } else { 4195 } else {
3730 LOG llevInfo, "[ABT] $msg\n"; 4196 LOG llevInfo, "[ABT] $msg\n";
3731 LOG llevInfo, "[ABT] [suppressed]\n"; 4197 LOG llevInfo, "[ABT] [suppressed]\n";
3732 } 4198 }
3733} 4199}
3734 4200
3735# load additional modules 4201# load additional modules
3736use cf::pod; 4202require "cf/$_.pm" for @EXTRA_MODULES;
4203cf::_connect_to_perl_2;
3737 4204
3738END { cf::emergency_save } 4205END { cf::emergency_save }
3739 4206
37401 42071
3741 4208

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines