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.407 by root, Sun Jan 13 09:53:53 2008 UTC vs.
Revision 1.523 by root, Sat Apr 17 02:39:46 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
25use 5.10.0;
3use utf8; 26use utf8;
4use strict; 27use strict qw(vars subs);
5 28
6use Symbol; 29use Symbol;
7use List::Util; 30use List::Util;
8use Socket; 31use Socket;
9use EV 1.86; 32use EV;
10use Opcode; 33use Opcode;
11use Safe; 34use Safe;
12use Safe::Hole; 35use Safe::Hole;
13use Storable (); 36use Storable ();
37use Carp ();
14 38
39use Guard ();
15use Coro 4.32 (); 40use Coro ();
16use Coro::State; 41use Coro::State;
17use Coro::Handle; 42use Coro::Handle;
18use Coro::EV; 43use Coro::EV;
44use Coro::AnyEvent;
19use Coro::Timer; 45use Coro::Timer;
20use Coro::Signal; 46use Coro::Signal;
21use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
22use Coro::AIO; 50use Coro::AIO;
23use Coro::BDB; 51use Coro::BDB 1.6;
24use Coro::Storable; 52use Coro::Storable;
25use Coro::Util (); 53use Coro::Util ();
26 54
27use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
28use BDB (); 56use BDB ();
29use Data::Dumper; 57use Data::Dumper;
30use Digest::MD5;
31use Fcntl; 58use Fcntl;
32use YAML::Syck (); 59use YAML::XS ();
33use IO::AIO 2.51 (); 60use IO::AIO ();
34use Time::HiRes; 61use Time::HiRes;
35use Compress::LZF; 62use Compress::LZF;
36use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
37 66
38# configure various modules to our taste 67# configure various modules to our taste
39# 68#
40$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
71
72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
73
74# make sure c-lzf reinitialises itself
75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
43 77
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 78# strictly for debugging
45$YAML::Syck::ImplicitUnicode = 1; 79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
46
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 80
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 82
51our %COMMAND = (); 83our %COMMAND = ();
52our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
… …
55our %EXTCMD = (); 87our %EXTCMD = ();
56our %EXTICMD = (); 88our %EXTICMD = ();
57our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
58our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
59 91
60our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
61our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
62 96
63our $CONFDIR = confdir; 97our $CONFDIR = confdir;
64our $DATADIR = datadir; 98our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
68our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
74our %RESOURCE; 111our %RESOURCE;
75 112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
115
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 118our $NEXT_TICK;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 119our $USE_FSYNC = 1; # use fsync to write maps - default on
82 120
83our $BDB_POLL_WATCHER;
84our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
87our $DB_ENV; 124our $DB_ENV;
88 125
126our @EXTRA_MODULES = qw(pod match mapscript);
127
89our %CFG; 128our %CFG;
90 129
91our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
92our $RUNTIME; 131our $RUNTIME;
93our $NOW; 132our $NOW;
… …
99# used to convert map paths into valid unix filenames by replacing / by ∕ 138# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 139our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 140
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
143our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
145
146our @POST_INIT;
147
148our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149our $REALLY_UNLOOP; # never set to true, please :)
105 150
106binmode STDOUT; 151binmode STDOUT;
107binmode STDERR; 152binmode STDERR;
108 153
109# read virtual server time, if available 154# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 155unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 156 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
114} 159}
160
161eval "sub TICK() { $TICK } 1" or die;
115 162
116mkdir $_ 163mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
118 165
119our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
120 167
121sub cf::map::normalise; 168sub cf::map::normalise;
169
170sub in_main() {
171 $Coro::current == $Coro::main
172}
173
174#############################################################################
175
176%REFLECT = ();
177for (@REFLECT) {
178 my $reflect = JSON::XS::decode_json $_;
179 $REFLECT{$reflect->{class}} = $reflect;
180}
181
182# this is decidedly evil
183$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
122 184
123############################################################################# 185#############################################################################
124 186
125=head2 GLOBAL VARIABLES 187=head2 GLOBAL VARIABLES
126 188
… …
173returns directly I<after> the tick processing (and consequently, can only wake one process 235returns directly I<after> the tick processing (and consequently, can only wake one process
174per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 236per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
175 237
176=item @cf::INVOKE_RESULTS 238=item @cf::INVOKE_RESULTS
177 239
178This array contains the results of the last C<invoke ()> call. When 240This array contains the results of the last C<invoke ()> call. When
179C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 241C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call. 242that call.
181 243
244=item %cf::REFLECT
245
246Contains, for each (C++) class name, a hash reference with information
247about object members (methods, scalars, arrays and flags) and other
248metadata, which is useful for introspection.
249
182=back 250=back
183 251
184=cut 252=cut
185 253
186BEGIN { 254$Coro::State::WARNHOOK = sub {
187 *CORE::GLOBAL::warn = sub {
188 my $msg = join "", @_; 255 my $msg = join "", @_;
189 256
190 $msg .= "\n" 257 $msg .= "\n"
191 unless $msg =~ /\n$/; 258 unless $msg =~ /\n$/;
192 259
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 260 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 261
195 LOG llevError, $msg; 262 LOG llevError, $msg;
196 }; 263};
197}
198 264
199$Coro::State::DIEHOOK = sub { 265$Coro::State::DIEHOOK = sub {
266 return unless $^S eq 0; # "eq", not "=="
267
200 warn Carp::longmess $_[0]; 268 warn Carp::longmess $_[0];
269
270 if (in_main) {#d#
271 warn "DIEHOOK called in main context, Coro bug?\n";#d#
272 return;#d#
273 }#d#
274
275 # kill coroutine otherwise
201 Coro::terminate; 276 Coro::terminate
202}; 277};
203 278
204@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 279@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
205@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 280@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
206@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 281@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
… …
214for my $pkg (qw( 289for my $pkg (qw(
215 cf::global cf::attachable 290 cf::global cf::attachable
216 cf::object cf::object::player 291 cf::object cf::object::player
217 cf::client cf::player 292 cf::client cf::player
218 cf::arch cf::living 293 cf::arch cf::living
294 cf::map cf::mapspace
219 cf::map cf::party cf::region 295 cf::party cf::region
220)) { 296)) {
221 no strict 'refs';
222 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 297 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
223} 298}
224 299
225$EV::DIED = sub { 300$EV::DIED = sub {
226 warn "error in event callback: @_"; 301 Carp::cluck "error in event callback: @_";
227}; 302};
228 303
229############################################################################# 304#############################################################################
230 305
231=head2 UTILITY FUNCTIONS 306=head2 UTILITY FUNCTIONS
… …
268our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 343our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
269 344
270sub encode_json($) { $json_coder->encode ($_[0]) } 345sub encode_json($) { $json_coder->encode ($_[0]) }
271sub decode_json($) { $json_coder->decode ($_[0]) } 346sub decode_json($) { $json_coder->decode ($_[0]) }
272 347
348=item cf::post_init { BLOCK }
349
350Execute the given codeblock, I<after> all extensions have been (re-)loaded,
351but I<before> the server starts ticking again.
352
353The cdoeblock will have a single boolean argument to indicate whether this
354is a reload or not.
355
356=cut
357
358sub post_init(&) {
359 push @POST_INIT, shift;
360}
361
273=item cf::lock_wait $string 362=item cf::lock_wait $string
274 363
275Wait until the given lock is available. See cf::lock_acquire. 364Wait until the given lock is available. See cf::lock_acquire.
276 365
277=item my $lock = cf::lock_acquire $string 366=item my $lock = cf::lock_acquire $string
278 367
279Wait until the given lock is available and then acquires it and returns 368Wait until the given lock is available and then acquires it and returns
280a Coro::guard object. If the guard object gets destroyed (goes out of scope, 369a L<Guard> object. If the guard object gets destroyed (goes out of scope,
281for example when the coroutine gets canceled), the lock is automatically 370for example when the coroutine gets canceled), the lock is automatically
282returned. 371returned.
283 372
284Locks are *not* recursive, locking from the same coro twice results in a 373Locks are *not* recursive, locking from the same coro twice results in a
285deadlocked coro. 374deadlocked coro.
… …
291 380
292Return true if the lock is currently active, i.e. somebody has locked it. 381Return true if the lock is currently active, i.e. somebody has locked it.
293 382
294=cut 383=cut
295 384
296our %LOCK; 385our $LOCKS = new Coro::SemaphoreSet;
297our %LOCKER;#d#
298 386
299sub lock_wait($) { 387sub lock_wait($) {
300 my ($key) = @_; 388 $LOCKS->wait ($_[0]);
301
302 if ($LOCKER{$key} == $Coro::current) {#d#
303 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
304 return;#d#
305 }#d#
306
307 # wait for lock, if any
308 while ($LOCK{$key}) {
309 push @{ $LOCK{$key} }, $Coro::current;
310 Coro::schedule;
311 }
312} 389}
313 390
314sub lock_acquire($) { 391sub lock_acquire($) {
315 my ($key) = @_; 392 $LOCKS->guard ($_[0])
316
317 # wait, to be sure we are not locked
318 lock_wait $key;
319
320 $LOCK{$key} = [];
321 $LOCKER{$key} = $Coro::current;#d#
322
323 Coro::guard {
324 delete $LOCKER{$key};#d#
325 # wake up all waiters, to be on the safe side
326 $_->ready for @{ delete $LOCK{$key} };
327 }
328} 393}
329 394
330sub lock_active($) { 395sub lock_active($) {
331 my ($key) = @_; 396 $LOCKS->count ($_[0]) < 1
332
333 ! ! $LOCK{$key}
334} 397}
335 398
336sub freeze_mainloop { 399sub freeze_mainloop {
337 return unless $TICK_WATCHER->is_active; 400 tick_inhibit_inc;
338 401
339 my $guard = Coro::guard { 402 &Guard::guard (\&tick_inhibit_dec);
340 $TICK_WATCHER->start;
341 };
342 $TICK_WATCHER->stop;
343 $guard
344} 403}
345 404
346=item cf::periodic $interval, $cb 405=item cf::periodic $interval, $cb
347 406
348Like EV::periodic, but randomly selects a starting point so that the actions 407Like EV::periodic, but randomly selects a starting point so that the actions
349get spread over timer. 408get spread over time.
350 409
351=cut 410=cut
352 411
353sub periodic($$) { 412sub periodic($$) {
354 my ($interval, $cb) = @_; 413 my ($interval, $cb) = @_;
… …
371 430
372=cut 431=cut
373 432
374our @SLOT_QUEUE; 433our @SLOT_QUEUE;
375our $SLOT_QUEUE; 434our $SLOT_QUEUE;
435our $SLOT_DECAY = 0.9;
376 436
377$SLOT_QUEUE->cancel if $SLOT_QUEUE; 437$SLOT_QUEUE->cancel if $SLOT_QUEUE;
378$SLOT_QUEUE = Coro::async { 438$SLOT_QUEUE = Coro::async {
379 $Coro::current->desc ("timeslot manager"); 439 $Coro::current->desc ("timeslot manager");
380 440
381 my $signal = new Coro::Signal; 441 my $signal = new Coro::Signal;
442 my $busy;
382 443
383 while () { 444 while () {
384 next_job: 445 next_job:
446
385 my $avail = cf::till_tick; 447 my $avail = cf::till_tick;
386 if ($avail > 0.01) { 448
387 for (0 .. $#SLOT_QUEUE) { 449 for (0 .. $#SLOT_QUEUE) {
388 if ($SLOT_QUEUE[$_][0] < $avail) { 450 if ($SLOT_QUEUE[$_][0] <= $avail) {
451 $busy = 0;
389 my $job = splice @SLOT_QUEUE, $_, 1, (); 452 my $job = splice @SLOT_QUEUE, $_, 1, ();
390 $job->[2]->send; 453 $job->[2]->send;
391 Coro::cede; 454 Coro::cede;
392 goto next_job; 455 goto next_job;
393 } 456 } else {
457 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
394 } 458 }
395 } 459 }
396 460
397 if (@SLOT_QUEUE) { 461 if (@SLOT_QUEUE) {
398 # we do not use wait_for_tick() as it returns immediately when tick is inactive 462 # we do not use wait_for_tick() as it returns immediately when tick is inactive
399 push @cf::WAIT_FOR_TICK, $signal; 463 push @cf::WAIT_FOR_TICK, $signal;
400 $signal->wait; 464 $signal->wait;
401 } else { 465 } else {
466 $busy = 0;
402 Coro::schedule; 467 Coro::schedule;
403 } 468 }
404 } 469 }
405}; 470};
406 471
407sub get_slot($;$$) { 472sub get_slot($;$$) {
473 return if tick_inhibit || $Coro::current == $Coro::main;
474
408 my ($time, $pri, $name) = @_; 475 my ($time, $pri, $name) = @_;
409 476
410 $time = $TICK * .6 if $time > $TICK * .6; 477 $time = clamp $time, 0.01, $TICK * .6;
478
411 my $sig = new Coro::Signal; 479 my $sig = new Coro::Signal;
412 480
413 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 481 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
414 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 482 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
415 $SLOT_QUEUE->ready; 483 $SLOT_QUEUE->ready;
… …
442 510
443sub sync_job(&) { 511sub sync_job(&) {
444 my ($job) = @_; 512 my ($job) = @_;
445 513
446 if ($Coro::current == $Coro::main) { 514 if ($Coro::current == $Coro::main) {
447 my $time = EV::time; 515 my $time = AE::time;
448 516
449 # this is the main coro, too bad, we have to block 517 # this is the main coro, too bad, we have to block
450 # till the operation succeeds, freezing the server :/ 518 # till the operation succeeds, freezing the server :/
451 519
452 LOG llevError, Carp::longmess "sync job";#d# 520 LOG llevError, Carp::longmess "sync job";#d#
453 521
454 # TODO: use suspend/resume instead
455 # (but this is cancel-safe)
456 my $freeze_guard = freeze_mainloop; 522 my $freeze_guard = freeze_mainloop;
457 523
458 my $busy = 1; 524 my $busy = 1;
459 my @res; 525 my @res;
460 526
… …
471 } else { 537 } else {
472 EV::loop EV::LOOP_ONESHOT; 538 EV::loop EV::LOOP_ONESHOT;
473 } 539 }
474 } 540 }
475 541
476 $time = EV::time - $time; 542 my $time = AE::time - $time;
477 543
478 LOG llevError | logBacktrace, Carp::longmess "long sync job"
479 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
480
481 $tick_start += $time; # do not account sync jobs to server load 544 $TICK_START += $time; # do not account sync jobs to server load
482 545
483 wantarray ? @res : $res[0] 546 wantarray ? @res : $res[0]
484 } else { 547 } else {
485 # we are in another coroutine, how wonderful, everything just works 548 # we are in another coroutine, how wonderful, everything just works
486 549
… …
528 reset_signals; 591 reset_signals;
529 &$cb 592 &$cb
530 }, @args; 593 }, @args;
531 594
532 wantarray ? @res : $res[-1] 595 wantarray ? @res : $res[-1]
596}
597
598sub objinfo {
599 (
600 "counter value" => cf::object::object_count,
601 "objects created" => cf::object::create_count,
602 "objects destroyed" => cf::object::destroy_count,
603 "freelist size" => cf::object::free_count,
604 "allocated objects" => cf::object::objects_size,
605 "active objects" => cf::object::actives_size,
606 )
607}
608
609=item $coin = coin_from_name $name
610
611=cut
612
613our %coin_alias = (
614 "silver" => "silvercoin",
615 "silvercoin" => "silvercoin",
616 "silvercoins" => "silvercoin",
617 "gold" => "goldcoin",
618 "goldcoin" => "goldcoin",
619 "goldcoins" => "goldcoin",
620 "platinum" => "platinacoin",
621 "platinumcoin" => "platinacoin",
622 "platinumcoins" => "platinacoin",
623 "platina" => "platinacoin",
624 "platinacoin" => "platinacoin",
625 "platinacoins" => "platinacoin",
626 "royalty" => "royalty",
627 "royalties" => "royalty",
628);
629
630sub coin_from_name($) {
631 $coin_alias{$_[0]}
632 ? cf::arch::find $coin_alias{$_[0]}
633 : undef
533} 634}
534 635
535=item $value = cf::db_get $family => $key 636=item $value = cf::db_get $family => $key
536 637
537Returns a single value from the environment database. 638Returns a single value from the environment database.
… …
676 777
677############################################################################# 778#############################################################################
678 779
679=head2 ATTACHABLE OBJECTS 780=head2 ATTACHABLE OBJECTS
680 781
681Many objects in crossfire are so-called attachable objects. That means you can 782Many objects in deliantra are so-called attachable objects. That means you can
682attach callbacks/event handlers (a collection of which is called an "attachment") 783attach callbacks/event handlers (a collection of which is called an "attachment")
683to it. All such attachable objects support the following methods. 784to it. All such attachable objects support the following methods.
684 785
685In the following description, CLASS can be any of C<global>, C<object> 786In the following description, CLASS can be any of C<global>, C<object>
686C<player>, C<client> or C<map> (i.e. the attachable objects in 787C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
736=item cf::CLASS::attachment $name, ... 837=item cf::CLASS::attachment $name, ...
737 838
738Register an attachment by C<$name> through which attachable objects of the 839Register an attachment by C<$name> through which attachable objects of the
739given CLASS can refer to this attachment. 840given CLASS can refer to this attachment.
740 841
741Some classes such as crossfire maps and objects can specify attachments 842Some classes such as deliantra maps and objects can specify attachments
742that are attached at load/instantiate time, thus the need for a name. 843that are attached at load/instantiate time, thus the need for a name.
743 844
744These calls expect any number of the following handler/hook descriptions: 845These calls expect any number of the following handler/hook descriptions:
745 846
746=over 4 847=over 4
… …
1037 1138
1038sub reattach { 1139sub reattach {
1039 # basically do the same as instantiate, without calling instantiate 1140 # basically do the same as instantiate, without calling instantiate
1040 my ($obj) = @_; 1141 my ($obj) = @_;
1041 1142
1143 # no longer needed after getting rid of delete_package?
1042 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1144 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1043 1145
1044 my $registry = $obj->registry; 1146 my $registry = $obj->registry;
1045 1147
1046 @$registry = (); 1148 @$registry = ();
1047 1149
… …
1093 utf8::decode (my $decname = $filename); 1195 utf8::decode (my $decname = $filename);
1094 warn sprintf "saving %s (%d,%d)\n", 1196 warn sprintf "saving %s (%d,%d)\n",
1095 $decname, length $$rdata, scalar @$objs; 1197 $decname, length $$rdata, scalar @$objs;
1096 1198
1097 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1098 chmod SAVE_MODE, $fh; 1200 aio_chmod $fh, SAVE_MODE;
1099 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1100 aio_fsync $fh if $cf::USE_FSYNC; 1202 if ($cf::USE_FSYNC) {
1203 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;
1204 aio_fsync $fh;
1205 }
1101 close $fh; 1206 aio_close $fh;
1102 1207
1103 if (@$objs) { 1208 if (@$objs) {
1104 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1209 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1105 chmod SAVE_MODE, $fh; 1210 aio_chmod $fh, SAVE_MODE;
1106 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1211 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1107 aio_write $fh, 0, (length $data), $data, 0; 1212 aio_write $fh, 0, (length $data), $data, 0;
1108 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 }
1109 close $fh; 1217 aio_close $fh;
1110 aio_rename "$filename.pst~", "$filename.pst"; 1218 aio_rename "$filename.pst~", "$filename.pst";
1111 } 1219 }
1112 } else { 1220 } else {
1113 aio_unlink "$filename.pst"; 1221 aio_unlink "$filename.pst";
1114 } 1222 }
1115 1223
1116 aio_rename "$filename~", $filename; 1224 aio_rename "$filename~", $filename;
1225
1226 $filename =~ s%/[^/]+$%%;
1227 aio_pathsync $filename if $cf::USE_FSYNC;
1117 } else { 1228 } else {
1118 warn "FATAL: $filename~: $!\n"; 1229 warn "unable to save objects: $filename~: $!\n";
1119 } 1230 }
1120 } else { 1231 } else {
1121 aio_unlink $filename; 1232 aio_unlink $filename;
1122 aio_unlink "$filename.pst"; 1233 aio_unlink "$filename.pst";
1123 } 1234 }
… …
1214 my ($name, $cb) = @_; 1325 my ($name, $cb) = @_;
1215 1326
1216 $EXTICMD{$name} = $cb; 1327 $EXTICMD{$name} = $cb;
1217} 1328}
1218 1329
1330use File::Glob ();
1331
1219cf::player->attach ( 1332cf::player->attach (
1220 on_command => sub { 1333 on_unknown_command => sub {
1221 my ($pl, $name, $params) = @_; 1334 my ($pl, $name, $params) = @_;
1222 1335
1223 my $cb = $COMMAND{$name} 1336 my $cb = $COMMAND{$name}
1224 or return; 1337 or return;
1225 1338
… …
1255 1368
1256 cf::override; 1369 cf::override;
1257 }, 1370 },
1258); 1371);
1259 1372
1373# "readahead" all extensions
1374sub cache_extensions {
1375 my $grp = IO::AIO::aio_group;
1376
1377 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1378 for (grep /\.ext$/, @{$_[0]}) {
1379 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1380 }
1381 };
1382
1383 $grp
1384}
1385
1260sub load_extensions { 1386sub load_extensions {
1261 cf::sync_job { 1387 cf::sync_job {
1262 my %todo; 1388 my %todo;
1263 1389
1264 for my $path (<$LIBDIR/*.ext>) { 1390 for my $path (<$LIBDIR/*.ext>) {
… …
1283 1409
1284 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1410 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1285 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1411 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1286 1412
1287 $ext{source} = 1413 $ext{source} =
1288 "package $pkg; use strict; use utf8;\n" 1414 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1289 . "#line 1 \"$path\"\n{\n" 1415 . "#line 1 \"$path\"\n{\n"
1290 . $source 1416 . $source
1291 . "\n};\n1"; 1417 . "\n};\n1";
1292 1418
1293 $todo{$base} = \%ext; 1419 $todo{$base} = \%ext;
1294 } 1420 }
1295 1421
1422 my $pass = 0;
1296 my %done; 1423 my %done;
1297 while (%todo) { 1424 while (%todo) {
1298 my $progress; 1425 my $progress;
1299 1426
1427 ++$pass;
1428
1429 ext:
1300 while (my ($k, $v) = each %todo) { 1430 while (my ($k, $v) = each %todo) {
1301 for (split /,\s*/, $v->{meta}{depends}) { 1431 for (split /,\s*/, $v->{meta}{depends}) {
1302 goto skip 1432 next ext
1303 unless exists $done{$_}; 1433 unless exists $done{$_};
1304 } 1434 }
1305 1435
1306 warn "... loading '$k' into '$v->{pkg}'\n"; 1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1307 1437
1308 unless (eval $v->{source}) { 1438 my $active = eval $v->{source};
1439
1440 if (length $@) {
1309 my $msg = $@ ? "$v->{path}: $@\n" 1441 warn "$v->{path}: $@\n";
1310 : "$v->{base}: extension inactive.\n";
1311 1442
1443 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1312 if (exists $v->{meta}{mandatory}) { 1444 if exists $v->{meta}{mandatory};
1313 warn $msg; 1445
1314 warn "mandatory extension failed to load, exiting.\n"; 1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1315 exit 1; 1447 delete $todo{$k};
1316 } 1448 } else {
1317 1449 $done{$k} = delete $todo{$k};
1318 warn $msg; 1450 push @EXTS, $v->{pkg};
1451 $progress = 1;
1452
1453 warn "$v->{base}: extension inactive.\n"
1454 unless $active;
1319 } 1455 }
1320
1321 $done{$k} = delete $todo{$k};
1322 push @EXTS, $v->{pkg};
1323 $progress = 1;
1324 } 1456 }
1325 1457
1326 skip: 1458 unless ($progress) {
1327 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1459 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1328 unless $progress; 1460
1461 while (my ($k, $v) = each %todo) {
1462 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1463 if exists $v->{meta}{mandatory};
1464 }
1465 }
1329 } 1466 }
1330 }; 1467 };
1331} 1468}
1332 1469
1333############################################################################# 1470#############################################################################
1334 1471
1335=back 1472=back
1336 1473
1337=head2 CORE EXTENSIONS 1474=head2 CORE EXTENSIONS
1338 1475
1339Functions and methods that extend core crossfire objects. 1476Functions and methods that extend core deliantra objects.
1340 1477
1341=cut 1478=cut
1342 1479
1343package cf::player; 1480package cf::player;
1344 1481
… …
1387 1524
1388sub exists($) { 1525sub exists($) {
1389 my ($login) = @_; 1526 my ($login) = @_;
1390 1527
1391 $cf::PLAYER{$login} 1528 $cf::PLAYER{$login}
1392 or cf::sync_job { !aio_stat path $login } 1529 or !aio_stat path $login
1393} 1530}
1394 1531
1395sub find($) { 1532sub find($) {
1396 return $cf::PLAYER{$_[0]} || do { 1533 return $cf::PLAYER{$_[0]} || do {
1397 my $login = $_[0]; 1534 my $login = $_[0];
… …
1409 my $f = new_from_file cf::object::thawer path $login 1546 my $f = new_from_file cf::object::thawer path $login
1410 or return; 1547 or return;
1411 1548
1412 my $pl = cf::player::load_pl $f 1549 my $pl = cf::player::load_pl $f
1413 or return; 1550 or return;
1551
1414 local $cf::PLAYER_LOADING{$login} = $pl; 1552 local $cf::PLAYER_LOADING{$login} = $pl;
1415 $f->resolve_delayed_derefs; 1553 $f->resolve_delayed_derefs;
1416 $cf::PLAYER{$login} = $pl 1554 $cf::PLAYER{$login} = $pl
1417 } 1555 }
1418 } 1556 }
1419} 1557}
1420 1558
1559cf::player->attach (
1560 on_load => sub {
1561 my ($pl, $path) = @_;
1562
1563 # restore slots saved in save, below
1564 my $slots = delete $pl->{_slots};
1565
1566 $pl->ob->current_weapon ($slots->[0]);
1567 $pl->combat_ob ($slots->[1]);
1568 $pl->ranged_ob ($slots->[2]);
1569 },
1570);
1571
1421sub save($) { 1572sub save($) {
1422 my ($pl) = @_; 1573 my ($pl) = @_;
1423 1574
1424 return if $pl->{deny_save}; 1575 return if $pl->{deny_save};
1425 1576
… …
1428 1579
1429 return if $pl->{deny_save}; 1580 return if $pl->{deny_save};
1430 1581
1431 aio_mkdir playerdir $pl, 0770; 1582 aio_mkdir playerdir $pl, 0770;
1432 $pl->{last_save} = $cf::RUNTIME; 1583 $pl->{last_save} = $cf::RUNTIME;
1584
1585 cf::get_slot 0.01;
1586
1587 # save slots, to be restored later
1588 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1433 1589
1434 $pl->save_pl ($path); 1590 $pl->save_pl ($path);
1435 cf::cede_to_tick; 1591 cf::cede_to_tick;
1436} 1592}
1437 1593
… …
1469 my ($pl) = @_; 1625 my ($pl) = @_;
1470 1626
1471 my $name = $pl->ob->name; 1627 my $name = $pl->ob->name;
1472 1628
1473 $pl->{deny_save} = 1; 1629 $pl->{deny_save} = 1;
1474 $pl->password ("*"); # this should lock out the player until we nuked the dir 1630 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1475 1631
1476 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1632 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1477 $pl->deactivate; 1633 $pl->deactivate;
1634 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1635 $pl->ob->check_score;
1478 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1636 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1479 $pl->ns->destroy if $pl->ns; 1637 $pl->ns->destroy if $pl->ns;
1480 1638
1481 my $path = playerdir $pl; 1639 my $path = playerdir $pl;
1482 my $temp = "$path~$cf::RUNTIME~deleting~"; 1640 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1521 1679
1522 for my $login (@$dirs) { 1680 for my $login (@$dirs) {
1523 my $path = path $login; 1681 my $path = path $login;
1524 1682
1525 # a .pst is a dead give-away for a valid player 1683 # a .pst is a dead give-away for a valid player
1526 unless (-e "$path.pst") { 1684 # if no pst file found, open and chekc for blocked users
1685 if (aio_stat "$path.pst") {
1527 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1686 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1528 aio_read $fh, 0, 512, my $buf, 0 or next; 1687 aio_read $fh, 0, 512, my $buf, 0 or next;
1529 $buf !~ /^password -------------$/m or next; # official not-valid tag 1688 $buf !~ /^password -------------$/m or next; # official not-valid tag
1530 } 1689 }
1531 1690
… …
1535 1694
1536 \@logins 1695 \@logins
1537} 1696}
1538 1697
1539=item $player->maps 1698=item $player->maps
1699
1700=item cf::player::maps $login
1540 1701
1541Returns an arrayref of map paths that are private for this 1702Returns an arrayref of map paths that are private for this
1542player. May block. 1703player. May block.
1543 1704
1544=cut 1705=cut
… …
1562 } 1723 }
1563 1724
1564 \@paths 1725 \@paths
1565} 1726}
1566 1727
1567=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1728=item $protocol_xml = $player->expand_cfpod ($cfpod)
1568 1729
1569Expand crossfire pod fragments into protocol xml. 1730Expand deliantra pod fragments into protocol xml.
1570
1571=cut
1572
1573use re 'eval';
1574
1575my $group;
1576my $interior; $interior = qr{
1577 # match a pod interior sequence sans C<< >>
1578 (?:
1579 \ (.*?)\ (?{ $group = $^N })
1580 | < (??{$interior}) >
1581 )
1582}x;
1583
1584sub expand_cfpod {
1585 my ($self, $pod) = @_;
1586
1587 my $xml;
1588
1589 while () {
1590 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1591 $group = $1;
1592
1593 $group =~ s/&/&amp;/g;
1594 $group =~ s/</&lt;/g;
1595
1596 $xml .= $group;
1597 } elsif ($pod =~ m%\G
1598 ([BCGHITU])
1599 <
1600 (?:
1601 ([^<>]*) (?{ $group = $^N })
1602 | < $interior >
1603 )
1604 >
1605 %gcsx
1606 ) {
1607 my ($code, $data) = ($1, $group);
1608
1609 if ($code eq "B") {
1610 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1611 } elsif ($code eq "I") {
1612 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1613 } elsif ($code eq "U") {
1614 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1615 } elsif ($code eq "C") {
1616 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1617 } elsif ($code eq "T") {
1618 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1619 } elsif ($code eq "G") {
1620 my ($male, $female) = split /\|/, $data;
1621 $data = $self->gender ? $female : $male;
1622 $xml .= expand_cfpod ($self, $data);
1623 } elsif ($code eq "H") {
1624 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1625 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1626 "")
1627 [$self->{hintmode}];
1628 } else {
1629 $xml .= "error processing '$code($data)' directive";
1630 }
1631 } else {
1632 if ($pod =~ /\G(.+)/) {
1633 warn "parse error while expanding $pod (at $1)";
1634 }
1635 last;
1636 }
1637 }
1638
1639 for ($xml) {
1640 # create single paragraphs (very hackish)
1641 s/(?<=\S)\n(?=\w)/ /g;
1642
1643 # compress some whitespace
1644 s/\s+\n/\n/g; # ws line-ends
1645 s/\n\n+/\n/g; # double lines
1646 s/^\n+//; # beginning lines
1647 s/\n+$//; # ending lines
1648 }
1649
1650 $xml
1651}
1652
1653no re 'eval';
1654
1655sub hintmode {
1656 $_[0]{hintmode} = $_[1] if @_ > 1;
1657 $_[0]{hintmode}
1658}
1659 1731
1660=item $player->ext_reply ($msgid, @msg) 1732=item $player->ext_reply ($msgid, @msg)
1661 1733
1662Sends an ext reply to the player. 1734Sends an ext reply to the player.
1663 1735
… …
1695 1767
1696=cut 1768=cut
1697 1769
1698sub find_by_path($) { 1770sub find_by_path($) {
1699 my ($path) = @_; 1771 my ($path) = @_;
1772
1773 $path =~ s/^~[^\/]*//; # skip ~login
1700 1774
1701 my ($match, $specificity); 1775 my ($match, $specificity);
1702 1776
1703 for my $region (list) { 1777 for my $region (list) {
1704 if ($region->{match} && $path =~ $region->{match}) { 1778 if ($region->{match} && $path =~ $region->{match}) {
… …
1730our $MAX_RESET = 3600; 1804our $MAX_RESET = 3600;
1731our $DEFAULT_RESET = 3000; 1805our $DEFAULT_RESET = 3000;
1732 1806
1733sub generate_random_map { 1807sub generate_random_map {
1734 my ($self, $rmp) = @_; 1808 my ($self, $rmp) = @_;
1809
1810 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1811
1735 # mit "rum" bekleckern, nicht 1812 # mit "rum" bekleckern, nicht
1736 $self->_create_random_map ( 1813 $self->_create_random_map (
1737 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1814 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1738 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1815 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1739 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1816 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1740 $rmp->{exit_on_final_map}, 1817 $rmp->{exit_on_final_map},
1741 $rmp->{xsize}, $rmp->{ysize}, 1818 $rmp->{xsize}, $rmp->{ysize},
1742 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1819 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1743 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1820 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1861 1938
1862# the temporary/swap location 1939# the temporary/swap location
1863sub save_path { 1940sub save_path {
1864 my ($self) = @_; 1941 my ($self) = @_;
1865 1942
1866 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1943 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1867 "$TMPDIR/$path.map" 1944 "$TMPDIR/$path.map"
1868} 1945}
1869 1946
1870# the unique path, undef == no special unique path 1947# the unique path, undef == no special unique path
1871sub uniq_path { 1948sub uniq_path {
1872 my ($self) = @_; 1949 my ($self) = @_;
1873 1950
1874 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1951 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1875 "$UNIQUEDIR/$path" 1952 "$UNIQUEDIR/$path"
1876}
1877
1878# and all this just because we cannot iterate over
1879# all maps in C++...
1880sub change_all_map_light {
1881 my ($change) = @_;
1882
1883 $_->change_map_light ($change)
1884 for grep $_->outdoor, values %cf::MAP;
1885} 1953}
1886 1954
1887sub decay_objects { 1955sub decay_objects {
1888 my ($self) = @_; 1956 my ($self) = @_;
1889 1957
… …
1973sub find { 2041sub find {
1974 my ($path, $origin) = @_; 2042 my ($path, $origin) = @_;
1975 2043
1976 $path = normalise $path, $origin && $origin->path; 2044 $path = normalise $path, $origin && $origin->path;
1977 2045
1978 cf::lock_wait "map_data:$path";#d#remove 2046 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1979 cf::lock_wait "map_find:$path"; 2047 my $guard2 = cf::lock_acquire "map_find:$path";
1980 2048
1981 $cf::MAP{$path} || do { 2049 $cf::MAP{$path} || do {
1982 my $guard1 = cf::lock_acquire "map_find:$path";
1983 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1984
1985 my $map = new_from_path cf::map $path 2050 my $map = new_from_path cf::map $path
1986 or return; 2051 or return;
1987 2052
1988 $map->{last_save} = $cf::RUNTIME; 2053 $map->{last_save} = $cf::RUNTIME;
1989 2054
… …
1991 or return; 2056 or return;
1992 2057
1993 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2058 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1994 # doing this can freeze the server in a sync job, obviously 2059 # doing this can freeze the server in a sync job, obviously
1995 #$cf::WAIT_FOR_TICK->wait; 2060 #$cf::WAIT_FOR_TICK->wait;
2061 undef $guard2;
1996 undef $guard1; 2062 undef $guard1;
1997 undef $guard2;
1998 $map->reset; 2063 $map->reset;
1999 return find $path; 2064 return find $path;
2000 } 2065 }
2001 2066
2002 $cf::MAP{$path} = $map 2067 $cf::MAP{$path} = $map
2003 } 2068 }
2004} 2069}
2005 2070
2006sub pre_load { } 2071sub pre_load { }
2007sub post_load { } 2072#sub post_load { } # XS
2008 2073
2009sub load { 2074sub load {
2010 my ($self) = @_; 2075 my ($self) = @_;
2011 2076
2012 local $self->{deny_reset} = 1; # loading can take a long time 2077 local $self->{deny_reset} = 1; # loading can take a long time
… …
2029 my $f = new_from_file cf::object::thawer $self->{load_path}; 2094 my $f = new_from_file cf::object::thawer $self->{load_path};
2030 $f->skip_block; 2095 $f->skip_block;
2031 $self->_load_objects ($f) 2096 $self->_load_objects ($f)
2032 or return; 2097 or return;
2033 2098
2034 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2099 $self->post_load_original
2035 if delete $self->{load_original}; 2100 if delete $self->{load_original};
2036 2101
2037 if (my $uniq = $self->uniq_path) { 2102 if (my $uniq = $self->uniq_path) {
2038 utf8::encode $uniq; 2103 utf8::encode $uniq;
2039 unless (aio_stat $uniq) { 2104 unless (aio_stat $uniq) {
… …
2057 unless ($self->{deny_activate}) { 2122 unless ($self->{deny_activate}) {
2058 $self->decay_objects; 2123 $self->decay_objects;
2059 $self->fix_auto_apply; 2124 $self->fix_auto_apply;
2060 $self->update_buttons; 2125 $self->update_buttons;
2061 cf::cede_to_tick; 2126 cf::cede_to_tick;
2062 $self->set_darkness_map;
2063 cf::cede_to_tick;
2064 $self->activate; 2127 $self->activate;
2065 } 2128 }
2066 2129
2067 $self->{last_save} = $cf::RUNTIME; 2130 $self->{last_save} = $cf::RUNTIME;
2068 $self->last_access ($cf::RUNTIME); 2131 $self->last_access ($cf::RUNTIME);
2069 2132
2070 $self->in_memory (cf::MAP_IN_MEMORY); 2133 $self->in_memory (cf::MAP_ACTIVE);
2071 } 2134 }
2072 2135
2073 $self->post_load; 2136 $self->post_load;
2074} 2137}
2075 2138
2139# customize the map for a given player, i.e.
2140# return the _real_ map. used by e.g. per-player
2141# maps to change the path to ~playername/mappath
2076sub customise_for { 2142sub customise_for {
2077 my ($self, $ob) = @_; 2143 my ($self, $ob) = @_;
2078 2144
2079 return find "~" . $ob->name . "/" . $self->{path} 2145 return find "~" . $ob->name . "/" . $self->{path}
2080 if $self->per_player; 2146 if $self->per_player;
… …
2133 my ($path, $origin, $load) = @_; 2199 my ($path, $origin, $load) = @_;
2134 2200
2135 $path = normalise $path, $origin && $origin->{path}; 2201 $path = normalise $path, $origin && $origin->{path};
2136 2202
2137 if (my $map = $cf::MAP{$path}) { 2203 if (my $map = $cf::MAP{$path}) {
2138 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2204 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2139 } 2205 }
2140 2206
2141 $MAP_PREFETCH{$path} |= $load; 2207 $MAP_PREFETCH{$path} |= $load;
2142 2208
2143 $MAP_PREFETCHER ||= cf::async { 2209 $MAP_PREFETCHER ||= cf::async {
… …
2157 $MAP_PREFETCHER->prio (6); 2223 $MAP_PREFETCHER->prio (6);
2158 2224
2159 () 2225 ()
2160} 2226}
2161 2227
2228# common code, used by both ->save and ->swapout
2162sub save { 2229sub _save {
2163 my ($self) = @_; 2230 my ($self) = @_;
2164
2165 my $lock = cf::lock_acquire "map_data:$self->{path}";
2166 2231
2167 $self->{last_save} = $cf::RUNTIME; 2232 $self->{last_save} = $cf::RUNTIME;
2168 2233
2169 return unless $self->dirty; 2234 return unless $self->dirty;
2170 2235
… …
2179 2244
2180 cf::async { 2245 cf::async {
2181 $Coro::current->{desc} = "map player save"; 2246 $Coro::current->{desc} = "map player save";
2182 $_->contr->save for $self->players; 2247 $_->contr->save for $self->players;
2183 }; 2248 };
2249
2250 cf::get_slot 0.02;
2184 2251
2185 if ($uniq) { 2252 if ($uniq) {
2186 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2253 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2187 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2254 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2188 } else { 2255 } else {
2189 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2256 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2190 } 2257 }
2191} 2258}
2192 2259
2260sub save {
2261 my ($self) = @_;
2262
2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2264
2265 $self->_save;
2266}
2267
2193sub swap_out { 2268sub swap_out {
2194 my ($self) = @_; 2269 my ($self) = @_;
2195 2270
2196 # save first because save cedes
2197 $self->save;
2198
2199 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2271 my $lock = cf::lock_acquire "map_data:$self->{path}";
2200 2272
2273 return if $self->in_memory != cf::MAP_ACTIVE;
2274 return if $self->{deny_save};
2201 return if $self->players; 2275 return if $self->players;
2202 return if $self->in_memory != cf::MAP_IN_MEMORY;
2203 return if $self->{deny_save};
2204 2276
2205 $self->in_memory (cf::MAP_SWAPPED); 2277 # first deactivate the map and "unlink" it from the core
2206
2207 $self->deactivate; 2278 $self->deactivate;
2208 $_->clear_links_to ($self) for values %cf::MAP; 2279 $_->clear_links_to ($self) for values %cf::MAP;
2280 $self->in_memory (cf::MAP_SWAPPED);
2281
2282 # then atomically save
2283 $self->_save;
2284
2285 # then free the map
2209 $self->clear; 2286 $self->clear;
2210} 2287}
2211 2288
2212sub reset_at { 2289sub reset_at {
2213 my ($self) = @_; 2290 my ($self) = @_;
… …
2232 2309
2233 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2234 2311
2235 return if $self->players; 2312 return if $self->players;
2236 2313
2237 warn "resetting map ", $self->path; 2314 warn "resetting map ", $self->path, "\n";
2238 2315
2239 $self->in_memory (cf::MAP_SWAPPED); 2316 $self->in_memory (cf::MAP_SWAPPED);
2240 2317
2241 # need to save uniques path 2318 # need to save uniques path
2242 unless ($self->{deny_save}) { 2319 unless ($self->{deny_save}) {
… …
2325 2402
2326sub unique_maps() { 2403sub unique_maps() {
2327 [ 2404 [
2328 map { 2405 map {
2329 utf8::decode $_; 2406 utf8::decode $_;
2330 /\.map$/ 2407 s/\.map$//; # TODO future compatibility hack
2408 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2409 ? ()
2331 ? normalise $_ 2410 : normalise $_
2332 : ()
2333 } @{ aio_readdir $UNIQUEDIR or [] } 2411 } @{ aio_readdir $UNIQUEDIR or [] }
2334 ] 2412 ]
2335} 2413}
2336 2414
2337package cf; 2415=item cf::map::static_maps
2416
2417Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2418file in the shared directory excluding F</styles> and F</editor>). May
2419block.
2420
2421=cut
2422
2423sub static_maps() {
2424 my @dirs = "";
2425 my @maps;
2426
2427 while (@dirs) {
2428 my $dir = shift @dirs;
2429
2430 next if $dir eq "/styles" || $dir eq "/editor";
2431
2432 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2433 or return;
2434
2435 for (@$files) {
2436 s/\.map$// or next;
2437 utf8::decode $_;
2438 push @maps, "$dir/$_";
2439 }
2440
2441 push @dirs, map "$dir/$_", @$dirs;
2442 }
2443
2444 \@maps
2445}
2338 2446
2339=back 2447=back
2340 2448
2341=head3 cf::object 2449=head3 cf::object
2342 2450
… …
2346 2454
2347=over 4 2455=over 4
2348 2456
2349=item $ob->inv_recursive 2457=item $ob->inv_recursive
2350 2458
2351Returns the inventory of the object _and_ their inventories, recursively. 2459Returns the inventory of the object I<and> their inventories, recursively,
2460but I<not> the object itself.
2352 2461
2353=cut 2462=cut
2354 2463
2355sub inv_recursive_; 2464sub inv_recursive_;
2356sub inv_recursive_ { 2465sub inv_recursive_ {
… …
2361 inv_recursive_ inv $_[0] 2470 inv_recursive_ inv $_[0]
2362} 2471}
2363 2472
2364=item $ref = $ob->ref 2473=item $ref = $ob->ref
2365 2474
2366creates and returns a persistent reference to an objetc that can be stored as a string. 2475Creates and returns a persistent reference to an object that can be stored as a string.
2367 2476
2368=item $ob = cf::object::deref ($refstring) 2477=item $ob = cf::object::deref ($refstring)
2369 2478
2370returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2479returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2371even if the object actually exists. May block. 2480even if the object actually exists. May block.
… …
2403can be C<undef>. Does the right thing when the player is currently in a 2512can be C<undef>. Does the right thing when the player is currently in a
2404dialogue with the given NPC character. 2513dialogue with the given NPC character.
2405 2514
2406=cut 2515=cut
2407 2516
2517our $SAY_CHANNEL = {
2518 id => "say",
2519 title => "Map",
2520 reply => "say ",
2521 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2522};
2523
2524our $CHAT_CHANNEL = {
2525 id => "chat",
2526 title => "Chat",
2527 reply => "chat ",
2528 tooltip => "Player chat and shouts, global to the server.",
2529};
2530
2408# rough implementation of a future "reply" method that works 2531# rough implementation of a future "reply" method that works
2409# with dialog boxes. 2532# with dialog boxes.
2410#TODO: the first argument must go, split into a $npc->reply_to ( method 2533#TODO: the first argument must go, split into a $npc->reply_to ( method
2411sub cf::object::player::reply($$$;$) { 2534sub cf::object::player::reply($$$;$) {
2412 my ($self, $npc, $msg, $flags) = @_; 2535 my ($self, $npc, $msg, $flags) = @_;
… …
2423 my $dialog = $pl->{npc_dialog}; 2546 my $dialog = $pl->{npc_dialog};
2424 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2547 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2425 2548
2426 } else { 2549 } else {
2427 $msg = $npc->name . " says: $msg" if $npc; 2550 $msg = $npc->name . " says: $msg" if $npc;
2428 $self->message ($msg, $flags); 2551 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2429 } 2552 }
2430 } 2553 }
2431} 2554}
2432 2555
2433=item $object->send_msg ($channel, $msg, $color, [extra...]) 2556=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2458 2581
2459=item $player_object->enter_link 2582=item $player_object->enter_link
2460 2583
2461Freezes the player and moves him/her to a special map (C<{link}>). 2584Freezes the player and moves him/her to a special map (C<{link}>).
2462 2585
2463The player should be reasonably safe there for short amounts of time. You 2586The player should be reasonably safe there for short amounts of time (e.g.
2464I<MUST> call C<leave_link> as soon as possible, though. 2587for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2588though, as the palyer cannot control the character while it is on the link
2589map.
2465 2590
2466Will never block. 2591Will never block.
2467 2592
2468=item $player_object->leave_link ($map, $x, $y) 2593=item $player_object->leave_link ($map, $x, $y)
2469 2594
… …
2494 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2619 return if UNIVERSAL::isa $self->map, "ext::map_link";
2495 2620
2496 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2497 if $self->map && $self->map->{path} ne "{link}"; 2622 if $self->map && $self->map->{path} ne "{link}";
2498 2623
2499 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2624 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2500} 2625}
2501 2626
2502sub cf::object::player::leave_link { 2627sub cf::object::player::leave_link {
2503 my ($self, $map, $x, $y) = @_; 2628 my ($self, $map, $x, $y) = @_;
2504 2629
… …
2521 ($x, $y) = (-1, -1) 2646 ($x, $y) = (-1, -1)
2522 unless (defined $x) && (defined $y); 2647 unless (defined $x) && (defined $y);
2523 2648
2524 # use -1 or undef as default coordinates, not 0, 0 2649 # use -1 or undef as default coordinates, not 0, 0
2525 ($x, $y) = ($map->enter_x, $map->enter_y) 2650 ($x, $y) = ($map->enter_x, $map->enter_y)
2526 if $x <=0 && $y <= 0; 2651 if $x <= 0 && $y <= 0;
2527 2652
2528 $map->load; 2653 $map->load;
2529 $map->load_neighbours; 2654 $map->load_neighbours;
2530 2655
2531 return unless $self->contr->active; 2656 return unless $self->contr->active;
2532 $self->activate_recursive;
2533 2657
2534 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2658 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2535 $self->enter_map ($map, $x, $y); 2659 $self->enter_map ($map, $x, $y);
2660
2661 # only activate afterwards, to support waiting in hooks
2662 $self->activate_recursive;
2536} 2663}
2537 2664
2538=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2665=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2539 2666
2540Moves the player to the given map-path and coordinates by first freezing 2667Moves the player to the given map-path and coordinates by first freezing
2541her, loading and preparing them map, calling the provided $check callback 2668her, loading and preparing them map, calling the provided $check callback
2542that has to return the map if sucecssful, and then unfreezes the player on 2669that has to return the map if sucecssful, and then unfreezes the player on
2543the new (success) or old (failed) map position. In either case, $done will 2670the new (success) or old (failed) map position. In either case, $done will
2544be called at the end of this process. 2671be called at the end of this process.
2672
2673Note that $check will be called with a potentially non-loaded map, so if
2674it needs a loaded map it has to call C<< ->load >>.
2545 2675
2546=cut 2676=cut
2547 2677
2548our $GOTOGEN; 2678our $GOTOGEN;
2549 2679
… …
2628} 2758}
2629 2759
2630sub prepare_random_map { 2760sub prepare_random_map {
2631 my ($exit) = @_; 2761 my ($exit) = @_;
2632 2762
2633 my $guard = cf::lock_acquire "exit_prepare:$exit";
2634
2635 # all this does is basically replace the /! path by 2763 # all this does is basically replace the /! path by
2636 # a new random map path (?random/...) with a seed 2764 # a new random map path (?random/...) with a seed
2637 # that depends on the exit object 2765 # that depends on the exit object
2638 2766
2639 my $rmp = parse_random_map_params $exit->msg; 2767 my $rmp = parse_random_map_params $exit->msg;
… …
2641 if ($exit->map) { 2769 if ($exit->map) {
2642 $rmp->{region} = $exit->region->name; 2770 $rmp->{region} = $exit->region->name;
2643 $rmp->{origin_map} = $exit->map->path; 2771 $rmp->{origin_map} = $exit->map->path;
2644 $rmp->{origin_x} = $exit->x; 2772 $rmp->{origin_x} = $exit->x;
2645 $rmp->{origin_y} = $exit->y; 2773 $rmp->{origin_y} = $exit->y;
2774
2775 $exit->map->touch;
2646 } 2776 }
2647 2777
2648 $rmp->{random_seed} ||= $exit->random_seed; 2778 $rmp->{random_seed} ||= $exit->random_seed;
2649 2779
2650 my $data = cf::encode_json $rmp; 2780 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2651 my $md5 = Digest::MD5::md5_hex $data; 2781 my $md5 = Digest::MD5::md5_hex $data;
2652 my $meta = "$RANDOMDIR/$md5.meta"; 2782 my $meta = "$RANDOMDIR/$md5.meta";
2653 2783
2654 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2784 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2655 aio_write $fh, 0, (length $data), $data, 0; 2785 aio_write $fh, 0, (length $data), $data, 0;
2656 undef $fh; 2786 undef $fh;
2657 aio_rename "$meta~", $meta; 2787 aio_rename "$meta~", $meta;
2658 2788
2789 my $slaying = "?random/$md5";
2790
2791 if ($exit->valid) {
2659 $exit->slaying ("?random/$md5"); 2792 $exit->slaying ("?random/$md5");
2660 $exit->msg (undef); 2793 $exit->msg (undef);
2794 }
2661 } 2795 }
2662} 2796}
2663 2797
2664sub cf::object::player::enter_exit { 2798sub cf::object::player::enter_exit {
2665 my ($self, $exit) = @_; 2799 my ($self, $exit) = @_;
2666 2800
2667 return unless $self->type == cf::PLAYER; 2801 return unless $self->type == cf::PLAYER;
2668 2802
2669 if ($exit->slaying eq "/!") {
2670 #TODO: this should de-fi-ni-te-ly not be a sync-job
2671 # the problem is that $exit might not survive long enough
2672 # so it needs to be done right now, right here
2673 cf::sync_job { prepare_random_map $exit };
2674 }
2675
2676 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2677 my $hp = $exit->stats->hp;
2678 my $sp = $exit->stats->sp;
2679
2680 $self->enter_link; 2803 $self->enter_link;
2681 2804
2682 # if exit is damned, update players death & WoR home-position
2683 $self->contr->savebed ($slaying, $hp, $sp)
2684 if $exit->flag (FLAG_DAMNED);
2685
2686 (async { 2805 (async {
2687 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2806 $Coro::current->{desc} = "enter_exit";
2688 2807
2689 $self->deactivate_recursive; # just to be sure
2690 unless (eval { 2808 unless (eval {
2809 $self->deactivate_recursive; # just to be sure
2810
2811 # random map handling
2812 {
2813 my $guard = cf::lock_acquire "exit_prepare:$exit";
2814
2815 prepare_random_map $exit
2816 if $exit->slaying eq "/!";
2817 }
2818
2819 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2820 my $x = $exit->stats->hp;
2821 my $y = $exit->stats->sp;
2822
2691 $self->goto ($slaying, $hp, $sp); 2823 $self->goto ($map, $x, $y);
2692 2824
2825 # if exit is damned, update players death & WoR home-position
2826 $self->contr->savebed ($map, $x, $y)
2827 if $exit->flag (cf::FLAG_DAMNED);
2828
2693 1; 2829 1
2694 }) { 2830 }) {
2695 $self->message ("Something went wrong deep within the crossfire server. " 2831 $self->message ("Something went wrong deep within the deliantra server. "
2696 . "I'll try to bring you back to the map you were before. " 2832 . "I'll try to bring you back to the map you were before. "
2697 . "Please report this to the dungeon master!", 2833 . "Please report this to the dungeon master!",
2698 cf::NDI_UNIQUE | cf::NDI_RED); 2834 cf::NDI_UNIQUE | cf::NDI_RED);
2699 2835
2700 warn "ERROR in enter_exit: $@"; 2836 warn "ERROR in enter_exit: $@";
… …
2717sub cf::client::send_drawinfo { 2853sub cf::client::send_drawinfo {
2718 my ($self, $text, $flags) = @_; 2854 my ($self, $text, $flags) = @_;
2719 2855
2720 utf8::encode $text; 2856 utf8::encode $text;
2721 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2857 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2858}
2859
2860=item $client->send_big_packet ($pkt)
2861
2862Like C<send_packet>, but tries to compress large packets, and fragments
2863them as required.
2864
2865=cut
2866
2867our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2868
2869sub cf::client::send_big_packet {
2870 my ($self, $pkt) = @_;
2871
2872 # try lzf for large packets
2873 $pkt = "lzf " . Compress::LZF::compress $pkt
2874 if 1024 <= length $pkt and $self->{can_lzf};
2875
2876 # split very large packets
2877 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2878 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2879 $pkt = "frag";
2880 }
2881
2882 $self->send_packet ($pkt);
2722} 2883}
2723 2884
2724=item $client->send_msg ($channel, $msg, $color, [extra...]) 2885=item $client->send_msg ($channel, $msg, $color, [extra...])
2725 2886
2726Send a drawinfo or msg packet to the client, formatting the msg for the 2887Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2730 2891
2731=cut 2892=cut
2732 2893
2733# non-persistent channels (usually the info channel) 2894# non-persistent channels (usually the info channel)
2734our %CHANNEL = ( 2895our %CHANNEL = (
2896 "c/motd" => {
2897 id => "infobox",
2898 title => "MOTD",
2899 reply => undef,
2900 tooltip => "The message of the day",
2901 },
2735 "c/identify" => { 2902 "c/identify" => {
2736 id => "infobox", 2903 id => "infobox",
2737 title => "Identify", 2904 title => "Identify",
2738 reply => undef, 2905 reply => undef,
2739 tooltip => "Items recently identified", 2906 tooltip => "Items recently identified",
… …
2741 "c/examine" => { 2908 "c/examine" => {
2742 id => "infobox", 2909 id => "infobox",
2743 title => "Examine", 2910 title => "Examine",
2744 reply => undef, 2911 reply => undef,
2745 tooltip => "Signs and other items you examined", 2912 tooltip => "Signs and other items you examined",
2913 },
2914 "c/shopinfo" => {
2915 id => "infobox",
2916 title => "Shop Info",
2917 reply => undef,
2918 tooltip => "What your bargaining skill tells you about the shop",
2746 }, 2919 },
2747 "c/book" => { 2920 "c/book" => {
2748 id => "infobox", 2921 id => "infobox",
2749 title => "Book", 2922 title => "Book",
2750 reply => undef, 2923 reply => undef,
… …
2766 id => "infobox", 2939 id => "infobox",
2767 title => "Body Parts", 2940 title => "Body Parts",
2768 reply => undef, 2941 reply => undef,
2769 tooltip => "Shows which body parts you posess and are available", 2942 tooltip => "Shows which body parts you posess and are available",
2770 }, 2943 },
2944 "c/statistics" => {
2945 id => "infobox",
2946 title => "Statistics",
2947 reply => undef,
2948 tooltip => "Shows your primary statistics",
2949 },
2950 "c/skills" => {
2951 id => "infobox",
2952 title => "Skills",
2953 reply => undef,
2954 tooltip => "Shows your experience per skill and item power",
2955 },
2956 "c/shopitems" => {
2957 id => "infobox",
2958 title => "Shop Items",
2959 reply => undef,
2960 tooltip => "Shows the items currently for sale in this shop",
2961 },
2962 "c/resistances" => {
2963 id => "infobox",
2964 title => "Resistances",
2965 reply => undef,
2966 tooltip => "Shows your resistances",
2967 },
2968 "c/pets" => {
2969 id => "infobox",
2970 title => "Pets",
2971 reply => undef,
2972 tooltip => "Shows information abotu your pets/a specific pet",
2973 },
2974 "c/perceiveself" => {
2975 id => "infobox",
2976 title => "Perceive Self",
2977 reply => undef,
2978 tooltip => "You gained detailed knowledge about yourself",
2979 },
2771 "c/uptime" => { 2980 "c/uptime" => {
2772 id => "infobox", 2981 id => "infobox",
2773 title => "Uptime", 2982 title => "Uptime",
2774 reply => undef, 2983 reply => undef,
2775 tooltip => "How long the server has been running since last restart", 2984 tooltip => "How long the server has been running since last restart",
… …
2778 id => "infobox", 2987 id => "infobox",
2779 title => "Map Info", 2988 title => "Map Info",
2780 reply => undef, 2989 reply => undef,
2781 tooltip => "Information related to the maps", 2990 tooltip => "Information related to the maps",
2782 }, 2991 },
2992 "c/party" => {
2993 id => "party",
2994 title => "Party",
2995 reply => "gsay ",
2996 tooltip => "Messages and chat related to your party",
2997 },
2998 "c/death" => {
2999 id => "death",
3000 title => "Death",
3001 reply => undef,
3002 tooltip => "Reason for and more info about your most recent death",
3003 },
3004 "c/say" => $SAY_CHANNEL,
3005 "c/chat" => $CHAT_CHANNEL,
2783); 3006);
2784 3007
2785sub cf::client::send_msg { 3008sub cf::client::send_msg {
2786 my ($self, $channel, $msg, $color, @extra) = @_; 3009 my ($self, $channel, $msg, $color, @extra) = @_;
2787 3010
2788 $msg = $self->pl->expand_cfpod ($msg); 3011 $msg = $self->pl->expand_cfpod ($msg)
3012 unless $color & cf::NDI_VERBATIM;
2789 3013
2790 $color &= cf::NDI_CLIENT_MASK; # just in case... 3014 $color &= cf::NDI_CLIENT_MASK; # just in case...
2791 3015
2792 # check predefined channels, for the benefit of C 3016 # check predefined channels, for the benefit of C
2793 if ($CHANNEL{$channel}) { 3017 if ($CHANNEL{$channel}) {
2794 $channel = $CHANNEL{$channel}; 3018 $channel = $CHANNEL{$channel};
2795 3019
2796 $self->ext_msg (channel_info => $channel) 3020 $self->ext_msg (channel_info => $channel);
2797 if $self->can_msg;
2798
2799 $channel = $channel->{id}; 3021 $channel = $channel->{id};
2800 3022
2801 } elsif (ref $channel) { 3023 } elsif (ref $channel) {
2802 # send meta info to client, if not yet sent 3024 # send meta info to client, if not yet sent
2803 unless (exists $self->{channel}{$channel->{id}}) { 3025 unless (exists $self->{channel}{$channel->{id}}) {
2804 $self->{channel}{$channel->{id}} = $channel; 3026 $self->{channel}{$channel->{id}} = $channel;
2805 $self->ext_msg (channel_info => $channel) 3027 $self->ext_msg (channel_info => $channel);
2806 if $self->can_msg;
2807 } 3028 }
2808 3029
2809 $channel = $channel->{id}; 3030 $channel = $channel->{id};
2810 } 3031 }
2811 3032
2812 return unless @extra || length $msg; 3033 return unless @extra || length $msg;
2813 3034
2814 if ($self->can_msg) {
2815 # default colour, mask it out 3035 # default colour, mask it out
2816 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3036 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2817 if $color & cf::NDI_DEF; 3037 if $color & cf::NDI_DEF;
2818 3038
2819 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3039 my $pkt = "msg "
3040 . $self->{json_coder}->encode (
2820 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3041 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2821 } else { 3042 );
2822 if ($color >= 0) {
2823 # replace some tags by gcfclient-compatible ones
2824 for ($msg) {
2825 1 while
2826 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2827 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2828 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2829 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2830 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2831 }
2832 3043
2833 $color &= cf::NDI_COLOR_MASK; 3044 $self->send_big_packet ($pkt);
2834
2835 utf8::encode $msg;
2836
2837 if (0 && $msg =~ /\[/) {
2838 # COMMAND/INFO
2839 $self->send_packet ("drawextinfo $color 10 8 $msg")
2840 } else {
2841 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2842 $self->send_packet ("drawinfo $color $msg")
2843 }
2844 }
2845 }
2846} 3045}
2847 3046
2848=item $client->ext_msg ($type, @msg) 3047=item $client->ext_msg ($type, @msg)
2849 3048
2850Sends an ext event to the client. 3049Sends an ext event to the client.
… …
2853 3052
2854sub cf::client::ext_msg($$@) { 3053sub cf::client::ext_msg($$@) {
2855 my ($self, $type, @msg) = @_; 3054 my ($self, $type, @msg) = @_;
2856 3055
2857 if ($self->extcmd == 2) { 3056 if ($self->extcmd == 2) {
2858 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3057 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2859 } elsif ($self->extcmd == 1) { # TODO: remove 3058 } elsif ($self->extcmd == 1) { # TODO: remove
2860 push @msg, msgtype => "event_$type"; 3059 push @msg, msgtype => "event_$type";
2861 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3060 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2862 } 3061 }
2863} 3062}
2864 3063
2865=item $client->ext_reply ($msgid, @msg) 3064=item $client->ext_reply ($msgid, @msg)
2866 3065
… …
2870 3069
2871sub cf::client::ext_reply($$@) { 3070sub cf::client::ext_reply($$@) {
2872 my ($self, $id, @msg) = @_; 3071 my ($self, $id, @msg) = @_;
2873 3072
2874 if ($self->extcmd == 2) { 3073 if ($self->extcmd == 2) {
2875 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2876 } elsif ($self->extcmd == 1) { 3075 } elsif ($self->extcmd == 1) {
2877 #TODO: version 1, remove 3076 #TODO: version 1, remove
2878 unshift @msg, msgtype => "reply", msgid => $id; 3077 unshift @msg, msgtype => "reply", msgid => $id;
2879 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3078 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2880 } 3079 }
2881} 3080}
2882 3081
2883=item $success = $client->query ($flags, "text", \&cb) 3082=item $success = $client->query ($flags, "text", \&cb)
2884 3083
… …
2985 3184
2986 $coro 3185 $coro
2987} 3186}
2988 3187
2989cf::client->attach ( 3188cf::client->attach (
2990 on_destroy => sub { 3189 on_client_destroy => sub {
2991 my ($ns) = @_; 3190 my ($ns) = @_;
2992 3191
2993 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3192 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2994 }, 3193 },
2995); 3194);
… …
3011our $safe_hole = new Safe::Hole; 3210our $safe_hole = new Safe::Hole;
3012 3211
3013$SIG{FPE} = 'IGNORE'; 3212$SIG{FPE} = 'IGNORE';
3014 3213
3015$safe->permit_only (Opcode::opset qw( 3214$safe->permit_only (Opcode::opset qw(
3016 :base_core :base_mem :base_orig :base_math 3215 :base_core :base_mem :base_orig :base_math :base_loop
3017 grepstart grepwhile mapstart mapwhile 3216 grepstart grepwhile mapstart mapwhile
3018 sort time 3217 sort time
3019)); 3218));
3020 3219
3021# here we export the classes and methods available to script code 3220# here we export the classes and methods available to script code
… …
3024 3223
3025The following functions and methods are available within a safe environment: 3224The following functions and methods are available within a safe environment:
3026 3225
3027 cf::object 3226 cf::object
3028 contr pay_amount pay_player map x y force_find force_add destroy 3227 contr pay_amount pay_player map x y force_find force_add destroy
3029 insert remove name archname title slaying race decrease_ob_nr 3228 insert remove name archname title slaying race decrease split
3229 value
3030 3230
3031 cf::object::player 3231 cf::object::player
3032 player 3232 player
3033 3233
3034 cf::player 3234 cf::player
… …
3039 3239
3040=cut 3240=cut
3041 3241
3042for ( 3242for (
3043 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3243 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3044 insert remove inv name archname title slaying race 3244 insert remove inv nrof name archname title slaying race
3045 decrease_ob_nr destroy)], 3245 decrease split destroy change_exp value msg lore send_msg)],
3046 ["cf::object::player" => qw(player)], 3246 ["cf::object::player" => qw(player)],
3047 ["cf::player" => qw(peaceful)], 3247 ["cf::player" => qw(peaceful send_msg)],
3048 ["cf::map" => qw(trigger)], 3248 ["cf::map" => qw(trigger)],
3049) { 3249) {
3050 no strict 'refs'; 3250 no strict 'refs';
3051 my ($pkg, @funs) = @$_; 3251 my ($pkg, @funs) = @$_;
3052 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3252 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3070 3270
3071 my $qcode = $code; 3271 my $qcode = $code;
3072 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3272 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3073 $qcode =~ s/\n/\\n/g; 3273 $qcode =~ s/\n/\\n/g;
3074 3274
3275 %vars = (_dummy => 0) unless %vars;
3276
3277 my @res;
3075 local $_; 3278 local $_;
3076 local @safe::cf::_safe_eval_args = values %vars;
3077 3279
3078 my $eval = 3280 my $eval =
3079 "do {\n" 3281 "do {\n"
3080 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3282 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3081 . "#line 0 \"{$qcode}\"\n" 3283 . "#line 0 \"{$qcode}\"\n"
3082 . $code 3284 . $code
3083 . "\n}" 3285 . "\n}"
3084 ; 3286 ;
3085 3287
3288 if ($CFG{safe_eval}) {
3086 sub_generation_inc; 3289 sub_generation_inc;
3290 local @safe::cf::_safe_eval_args = values %vars;
3087 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3291 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3088 sub_generation_inc; 3292 sub_generation_inc;
3293 } else {
3294 local @cf::_safe_eval_args = values %vars;
3295 @res = wantarray ? eval eval : scalar eval $eval;
3296 }
3089 3297
3090 if ($@) { 3298 if ($@) {
3091 warn "$@"; 3299 warn "$@";
3092 warn "while executing safe code '$code'\n"; 3300 warn "while executing safe code '$code'\n";
3093 warn "with arguments " . (join " ", %vars) . "\n"; 3301 warn "with arguments " . (join " ", %vars) . "\n";
… …
3112=cut 3320=cut
3113 3321
3114sub register_script_function { 3322sub register_script_function {
3115 my ($fun, $cb) = @_; 3323 my ($fun, $cb) = @_;
3116 3324
3117 no strict 'refs'; 3325 $fun = "safe::$fun" if $CFG{safe_eval};
3118 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3326 *$fun = $safe_hole->wrap ($cb);
3119} 3327}
3120 3328
3121=back 3329=back
3122 3330
3123=cut 3331=cut
… …
3144 3352
3145 $facedata->{version} == 2 3353 $facedata->{version} == 2
3146 or cf::cleanup "$path: version mismatch, cannot proceed."; 3354 or cf::cleanup "$path: version mismatch, cannot proceed.";
3147 3355
3148 # patch in the exptable 3356 # patch in the exptable
3357 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3149 $facedata->{resource}{"res/exp_table"} = { 3358 $facedata->{resource}{"res/exp_table"} = {
3150 type => FT_RSRC, 3359 type => FT_RSRC,
3151 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3360 data => $exp_table,
3361 hash => (Digest::MD5::md5 $exp_table),
3152 }; 3362 };
3153 cf::cede_to_tick; 3363 cf::cede_to_tick;
3154 3364
3155 { 3365 {
3156 my $faces = $facedata->{faceinfo}; 3366 my $faces = $facedata->{faceinfo};
… …
3158 while (my ($face, $info) = each %$faces) { 3368 while (my ($face, $info) = each %$faces) {
3159 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3369 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3160 3370
3161 cf::face::set_visibility $idx, $info->{visibility}; 3371 cf::face::set_visibility $idx, $info->{visibility};
3162 cf::face::set_magicmap $idx, $info->{magicmap}; 3372 cf::face::set_magicmap $idx, $info->{magicmap};
3163 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3373 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3164 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3374 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3165 3375
3166 cf::cede_to_tick; 3376 cf::cede_to_tick;
3167 } 3377 }
3168 3378
3169 while (my ($face, $info) = each %$faces) { 3379 while (my ($face, $info) = each %$faces) {
… …
3193 3403
3194 cf::anim::invalidate_all; # d'oh 3404 cf::anim::invalidate_all; # d'oh
3195 } 3405 }
3196 3406
3197 { 3407 {
3198 # TODO: for gcfclient pleasure, we should give resources
3199 # that gcfclient doesn't grok a >10000 face index.
3200 my $res = $facedata->{resource}; 3408 my $res = $facedata->{resource};
3201 3409
3202 while (my ($name, $info) = each %$res) { 3410 while (my ($name, $info) = each %$res) {
3203 if (defined $info->{type}) { 3411 if (defined $info->{type}) {
3204 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3412 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3205 my $data;
3206 3413
3207 if ($info->{type} & 1) { 3414 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3208 # prepend meta info
3209
3210 my $meta = $enc->encode ({
3211 name => $name,
3212 %{ $info->{meta} || {} },
3213 });
3214
3215 $data = pack "(w/a*)*", $meta, $info->{data};
3216 } else {
3217 $data = $info->{data};
3218 }
3219
3220 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3221 cf::face::set_type $idx, $info->{type}; 3415 cf::face::set_type $idx, $info->{type};
3222 } else { 3416 } else {
3223 $RESOURCE{$name} = $info; 3417 $RESOURCE{$name} = $info;
3224 } 3418 }
3225 3419
… …
3258 while (my ($k, $v) = each %$want) { 3452 while (my ($k, $v) = each %$want) {
3259 $ns->fx_want ($k, $v); 3453 $ns->fx_want ($k, $v);
3260 } 3454 }
3261}; 3455};
3262 3456
3457sub load_resource_file($) {
3458 my $guard = lock_acquire "load_resource_file";
3459
3460 my $status = load_resource_file_ $_[0];
3461 get_slot 0.1, 100;
3462 cf::arch::commit_load;
3463
3464 $status
3465}
3466
3263sub reload_regions { 3467sub reload_regions {
3264 # HACK to clear player env face cache, we need some signal framework 3468 # HACK to clear player env face cache, we need some signal framework
3265 # for this (global event?) 3469 # for this (global event?)
3266 %ext::player_env::MUSIC_FACE_CACHE = (); 3470 %ext::player_env::MUSIC_FACE_CACHE = ();
3267 3471
… …
3280} 3484}
3281 3485
3282sub reload_archetypes { 3486sub reload_archetypes {
3283 load_resource_file "$DATADIR/archetypes" 3487 load_resource_file "$DATADIR/archetypes"
3284 or die "unable to load archetypes\n"; 3488 or die "unable to load archetypes\n";
3285 #d# NEED to laod twice to resolve forward references
3286 # this really needs to be done in an extra post-pass
3287 # (which needs to be synchronous, so solve it differently)
3288 load_resource_file "$DATADIR/archetypes"
3289 or die "unable to load archetypes\n";
3290} 3489}
3291 3490
3292sub reload_treasures { 3491sub reload_treasures {
3293 load_resource_file "$DATADIR/treasures" 3492 load_resource_file "$DATADIR/treasures"
3294 or die "unable to load treasurelists\n"; 3493 or die "unable to load treasurelists\n";
3295} 3494}
3296 3495
3297sub reload_resources { 3496sub reload_resources {
3298 warn "reloading resource files...\n"; 3497 warn "reloading resource files...\n";
3299 3498
3499 reload_facedata;
3500 reload_archetypes;
3300 reload_regions; 3501 reload_regions;
3301 reload_facedata;
3302 #reload_archetypes;#d#
3303 reload_archetypes;
3304 reload_treasures; 3502 reload_treasures;
3305 3503
3306 warn "finished reloading resource files\n"; 3504 warn "finished reloading resource files\n";
3307} 3505}
3308 3506
3309sub init {
3310 reload_resources;
3311}
3312
3313sub reload_config { 3507sub reload_config {
3508 warn "reloading config file...\n";
3509
3314 open my $fh, "<:utf8", "$CONFDIR/config" 3510 open my $fh, "<:utf8", "$CONFDIR/config"
3315 or return; 3511 or return;
3316 3512
3317 local $/; 3513 local $/;
3318 *CFG = YAML::Syck::Load <$fh>; 3514 *CFG = YAML::XS::Load scalar <$fh>;
3319 3515
3320 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3516 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3321 3517
3322 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3518 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3323 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3519 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3327 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3523 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3328 and die "WARNING: m(un)lockall failed: $!\n"; 3524 and die "WARNING: m(un)lockall failed: $!\n";
3329 }; 3525 };
3330 warn $@ if $@; 3526 warn $@ if $@;
3331 } 3527 }
3528
3529 warn "finished reloading resource files\n";
3530}
3531
3532sub pidfile() {
3533 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3534 or die "$PIDFILE: $!";
3535 flock $fh, &Fcntl::LOCK_EX
3536 or die "$PIDFILE: flock: $!";
3537 $fh
3538}
3539
3540# make sure only one server instance is running at any one time
3541sub atomic {
3542 my $fh = pidfile;
3543
3544 my $pid = <$fh>;
3545 kill 9, $pid if $pid > 0;
3546
3547 seek $fh, 0, 0;
3548 print $fh $$;
3549}
3550
3551sub main_loop {
3552 warn "EV::loop starting\n";
3553 if (1) {
3554 EV::loop;
3555 }
3556 warn "EV::loop returned\n";
3557 goto &main_loop unless $REALLY_UNLOOP;
3332} 3558}
3333 3559
3334sub main { 3560sub main {
3561 cf::init_globals; # initialise logging
3562
3563 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3564 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3565 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3566 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3567
3568 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3569
3335 # we must not ever block the main coroutine 3570 # we must not ever block the main coroutine
3336 local $Coro::idle = sub { 3571 local $Coro::idle = sub {
3337 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3572 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3338 (async { 3573 (async {
3339 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3574 $Coro::current->{desc} = "IDLE BUG HANDLER";
3340 EV::loop EV::LOOP_ONESHOT; 3575 EV::loop EV::LOOP_ONESHOT;
3341 })->prio (Coro::PRIO_MAX); 3576 })->prio (Coro::PRIO_MAX);
3342 }; 3577 };
3343 3578
3579 evthread_start IO::AIO::poll_fileno;
3580
3581 cf::sync_job {
3582 cf::init_experience;
3583 cf::init_anim;
3584 cf::init_attackmess;
3585 cf::init_dynamic;
3586
3587 cf::load_settings;
3588 cf::load_materials;
3589
3590 reload_resources;
3344 reload_config; 3591 reload_config;
3345 db_init; 3592 db_init;
3593
3594 cf::init_uuid;
3595 cf::init_signals;
3596 cf::init_skills;
3597
3598 cf::init_beforeplay;
3599
3600 atomic;
3601
3346 load_extensions; 3602 load_extensions;
3347 3603
3348 $TICK_WATCHER->start; 3604 utime time, time, $RUNTIMEFILE;
3349 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3605
3350 EV::loop; 3606 # no (long-running) fork's whatsoever before this point(!)
3607 use POSIX ();
3608 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3609
3610 (pop @POST_INIT)->(0) while @POST_INIT;
3611 };
3612
3613 cf::object::thawer::errors_are_fatal 0;
3614 warn "parse errors in files are no longer fatal from this point on.\n";
3615
3616 main_loop;
3351} 3617}
3352 3618
3353############################################################################# 3619#############################################################################
3354# initialisation and cleanup 3620# initialisation and cleanup
3355 3621
3356# install some emergency cleanup handlers 3622# install some emergency cleanup handlers
3357BEGIN { 3623BEGIN {
3358 our %SIGWATCHER = (); 3624 our %SIGWATCHER = ();
3359 for my $signal (qw(INT HUP TERM)) { 3625 for my $signal (qw(INT HUP TERM)) {
3360 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3626 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3361 cf::cleanup "SIG$signal"; 3627 cf::cleanup "SIG$signal";
3362 }; 3628 };
3363 } 3629 }
3364} 3630}
3365 3631
3366sub write_runtime { 3632sub write_runtime_sync {
3367 my $runtime = "$LOCALDIR/runtime"; 3633 my $t0 = AE::time;
3368 3634
3369 # first touch the runtime file to show we are still running: 3635 # first touch the runtime file to show we are still running:
3370 # the fsync below can take a very very long time. 3636 # the fsync below can take a very very long time.
3371 3637
3372 IO::AIO::aio_utime $runtime, undef, undef; 3638 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3373 3639
3374 my $guard = cf::lock_acquire "write_runtime"; 3640 my $guard = cf::lock_acquire "write_runtime";
3375 3641
3376 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3642 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3377 or return; 3643 or return;
3378 3644
3379 my $value = $cf::RUNTIME + 90 + 10; 3645 my $value = $cf::RUNTIME + 90 + 10;
3380 # 10 is the runtime save interval, for a monotonic clock 3646 # 10 is the runtime save interval, for a monotonic clock
3381 # 60 allows for the watchdog to kill the server. 3647 # 60 allows for the watchdog to kill the server.
… …
3391 aio_utime $fh, undef, undef; 3657 aio_utime $fh, undef, undef;
3392 3658
3393 close $fh 3659 close $fh
3394 or return; 3660 or return;
3395 3661
3396 aio_rename "$runtime~", $runtime 3662 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3397 and return; 3663 and return;
3398 3664
3399 warn "runtime file written.\n"; 3665 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3400 3666
3401 1 3667 1
3668}
3669
3670our $uuid_lock;
3671our $uuid_skip;
3672
3673sub write_uuid_sync($) {
3674 $uuid_skip ||= $_[0];
3675
3676 return if $uuid_lock;
3677 local $uuid_lock = 1;
3678
3679 my $uuid = "$LOCALDIR/uuid";
3680
3681 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3682 or return;
3683
3684 my $value = uuid_seq uuid_cur;
3685
3686 unless ($value) {
3687 warn "cowardly refusing to write zero uuid value!\n";
3688 return;
3689 }
3690
3691 my $value = uuid_str $value + $uuid_skip;
3692 $uuid_skip = 0;
3693
3694 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3695 and return;
3696
3697 # always fsync - this file is important
3698 aio_fsync $fh
3699 and return;
3700
3701 close $fh
3702 or return;
3703
3704 aio_rename "$uuid~", $uuid
3705 and return;
3706
3707 warn "uuid file written ($value).\n";
3708
3709 1
3710
3711}
3712
3713sub write_uuid($$) {
3714 my ($skip, $sync) = @_;
3715
3716 $sync ? write_uuid_sync $skip
3717 : async { write_uuid_sync $skip };
3402} 3718}
3403 3719
3404sub emergency_save() { 3720sub emergency_save() {
3405 my $freeze_guard = cf::freeze_mainloop; 3721 my $freeze_guard = cf::freeze_mainloop;
3406 3722
3407 warn "enter emergency perl save\n"; 3723 warn "emergency_perl_save: enter\n";
3408 3724
3409 cf::sync_job { 3725 cf::sync_job {
3726 # this is a trade-off: we want to be very quick here, so
3727 # save all maps without fsync, and later call a global sync
3728 # (which in turn might be very very slow)
3729 local $USE_FSYNC = 0;
3730
3410 # use a peculiar iteration method to avoid tripping on perl 3731 # use a peculiar iteration method to avoid tripping on perl
3411 # refcount bugs in for. also avoids problems with players 3732 # refcount bugs in for. also avoids problems with players
3412 # and maps saved/destroyed asynchronously. 3733 # and maps saved/destroyed asynchronously.
3413 warn "begin emergency player save\n"; 3734 warn "emergency_perl_save: begin player save\n";
3414 for my $login (keys %cf::PLAYER) { 3735 for my $login (keys %cf::PLAYER) {
3415 my $pl = $cf::PLAYER{$login} or next; 3736 my $pl = $cf::PLAYER{$login} or next;
3416 $pl->valid or next; 3737 $pl->valid or next;
3417 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3738 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3418 $pl->save; 3739 $pl->save;
3419 } 3740 }
3420 warn "end emergency player save\n"; 3741 warn "emergency_perl_save: end player save\n";
3421 3742
3422 warn "begin emergency map save\n"; 3743 warn "emergency_perl_save: begin map save\n";
3423 for my $path (keys %cf::MAP) { 3744 for my $path (keys %cf::MAP) {
3424 my $map = $cf::MAP{$path} or next; 3745 my $map = $cf::MAP{$path} or next;
3425 $map->valid or next; 3746 $map->valid or next;
3426 $map->save; 3747 $map->save;
3427 } 3748 }
3428 warn "end emergency map save\n"; 3749 warn "emergency_perl_save: end map save\n";
3429 3750
3430 warn "begin emergency database checkpoint\n"; 3751 warn "emergency_perl_save: begin database checkpoint\n";
3431 BDB::db_env_txn_checkpoint $DB_ENV; 3752 BDB::db_env_txn_checkpoint $DB_ENV;
3432 warn "end emergency database checkpoint\n"; 3753 warn "emergency_perl_save: end database checkpoint\n";
3754
3755 warn "emergency_perl_save: begin write uuid\n";
3756 write_uuid_sync 1;
3757 warn "emergency_perl_save: end write uuid\n";
3433 }; 3758 };
3434 3759
3760 warn "emergency_perl_save: starting sync()\n";
3761 IO::AIO::aio_sync sub {
3762 warn "emergency_perl_save: finished sync()\n";
3763 };
3764
3435 warn "leave emergency perl save\n"; 3765 warn "emergency_perl_save: leave\n";
3436} 3766}
3437 3767
3438sub post_cleanup { 3768sub post_cleanup {
3439 my ($make_core) = @_; 3769 my ($make_core) = @_;
3440 3770
3441 warn Carp::longmess "post_cleanup backtrace" 3771 warn Carp::longmess "post_cleanup backtrace"
3442 if $make_core; 3772 if $make_core;
3773
3774 my $fh = pidfile;
3775 unlink $PIDFILE if <$fh> == $$;
3776}
3777
3778# a safer delete_package, copied from Symbol
3779sub clear_package($) {
3780 my $pkg = shift;
3781
3782 # expand to full symbol table name if needed
3783 unless ($pkg =~ /^main::.*::$/) {
3784 $pkg = "main$pkg" if $pkg =~ /^::/;
3785 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3786 $pkg .= '::' unless $pkg =~ /::$/;
3787 }
3788
3789 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3790 my $stem_symtab = *{$stem}{HASH};
3791
3792 defined $stem_symtab and exists $stem_symtab->{$leaf}
3793 or return;
3794
3795 # clear all symbols
3796 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3797 for my $name (keys %$leaf_symtab) {
3798 _gv_clear *{"$pkg$name"};
3799# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3800 }
3443} 3801}
3444 3802
3445sub do_reload_perl() { 3803sub do_reload_perl() {
3446 # can/must only be called in main 3804 # can/must only be called in main
3447 if ($Coro::current != $Coro::main) { 3805 if (in_main) {
3448 warn "can only reload from main coroutine"; 3806 warn "can only reload from main coroutine";
3449 return; 3807 return;
3450 } 3808 }
3451 3809
3810 return if $RELOAD++;
3811
3812 my $t1 = AE::time;
3813
3814 while ($RELOAD) {
3452 warn "reloading..."; 3815 warn "reloading...";
3453 3816
3454 warn "entering sync_job"; 3817 warn "entering sync_job";
3455 3818
3456 cf::sync_job { 3819 cf::sync_job {
3457 cf::write_runtime; # external watchdog should not bark 3820 cf::write_runtime_sync; # external watchdog should not bark
3458 cf::emergency_save; 3821 cf::emergency_save;
3459 cf::write_runtime; # external watchdog should not bark 3822 cf::write_runtime_sync; # external watchdog should not bark
3460 3823
3461 warn "syncing database to disk"; 3824 warn "syncing database to disk";
3462 BDB::db_env_txn_checkpoint $DB_ENV; 3825 BDB::db_env_txn_checkpoint $DB_ENV;
3463 3826
3464 # if anything goes wrong in here, we should simply crash as we already saved 3827 # if anything goes wrong in here, we should simply crash as we already saved
3465 3828
3466 warn "flushing outstanding aio requests"; 3829 warn "flushing outstanding aio requests";
3467 for (;;) {
3468 BDB::flush;
3469 IO::AIO::flush;
3470 Coro::cede_notself;
3471 last unless IO::AIO::nreqs || BDB::nreqs; 3830 while (IO::AIO::nreqs || BDB::nreqs) {
3472 warn "iterate..."; 3831 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3473 }
3474
3475 ++$RELOAD;
3476
3477 warn "cancelling all extension coros";
3478 $_->cancel for values %EXT_CORO;
3479 %EXT_CORO = ();
3480
3481 warn "removing commands";
3482 %COMMAND = ();
3483
3484 warn "removing ext/exti commands";
3485 %EXTCMD = ();
3486 %EXTICMD = ();
3487
3488 warn "unloading/nuking all extensions";
3489 for my $pkg (@EXTS) {
3490 warn "... unloading $pkg";
3491
3492 if (my $cb = $pkg->can ("unload")) {
3493 eval {
3494 $cb->($pkg);
3495 1
3496 } or warn "$pkg unloaded, but with errors: $@";
3497 } 3832 }
3498 3833
3499 warn "... nuking $pkg"; 3834 warn "cancelling all extension coros";
3500 Symbol::delete_package $pkg; 3835 $_->cancel for values %EXT_CORO;
3501 } 3836 %EXT_CORO = ();
3502 3837
3503 warn "unloading all perl modules loaded from $LIBDIR"; 3838 warn "removing commands";
3504 while (my ($k, $v) = each %INC) { 3839 %COMMAND = ();
3505 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3506 3840
3841 warn "removing ext/exti commands";
3842 %EXTCMD = ();
3843 %EXTICMD = ();
3844
3845 warn "unloading/nuking all extensions";
3846 for my $pkg (@EXTS) {
3507 warn "... unloading $k"; 3847 warn "... unloading $pkg";
3508 delete $INC{$k};
3509 3848
3510 $k =~ s/\.pm$//;
3511 $k =~ s/\//::/g;
3512
3513 if (my $cb = $k->can ("unload_module")) { 3849 if (my $cb = $pkg->can ("unload")) {
3850 eval {
3514 $cb->(); 3851 $cb->($pkg);
3852 1
3853 } or warn "$pkg unloaded, but with errors: $@";
3854 }
3855
3856 warn "... clearing $pkg";
3857 clear_package $pkg;
3515 } 3858 }
3516 3859
3517 Symbol::delete_package $k; 3860 warn "unloading all perl modules loaded from $LIBDIR";
3861 while (my ($k, $v) = each %INC) {
3862 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3863
3864 warn "... unloading $k";
3865 delete $INC{$k};
3866
3867 $k =~ s/\.pm$//;
3868 $k =~ s/\//::/g;
3869
3870 if (my $cb = $k->can ("unload_module")) {
3871 $cb->();
3872 }
3873
3874 clear_package $k;
3518 } 3875 }
3519 3876
3520 warn "getting rid of safe::, as good as possible"; 3877 warn "getting rid of safe::, as good as possible";
3521 Symbol::delete_package "safe::$_" 3878 clear_package "safe::$_"
3522 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3879 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3523 3880
3524 warn "unloading cf.pm \"a bit\""; 3881 warn "unloading cf.pm \"a bit\"";
3525 delete $INC{"cf.pm"}; 3882 delete $INC{"cf.pm"};
3526 delete $INC{"cf/pod.pm"}; 3883 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3527 3884
3528 # don't, removes xs symbols, too, 3885 # don't, removes xs symbols, too,
3529 # and global variables created in xs 3886 # and global variables created in xs
3530 #Symbol::delete_package __PACKAGE__; 3887 #clear_package __PACKAGE__;
3531 3888
3532 warn "unload completed, starting to reload now"; 3889 warn "unload completed, starting to reload now";
3533 3890
3534 warn "reloading cf.pm"; 3891 warn "reloading cf.pm";
3535 require cf; 3892 require cf;
3536 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3893 cf::_connect_to_perl_1;
3537 3894
3538 warn "loading config and database again"; 3895 warn "loading config and database again";
3539 cf::reload_config; 3896 cf::reload_config;
3540 3897
3541 warn "loading extensions"; 3898 warn "loading extensions";
3542 cf::load_extensions; 3899 cf::load_extensions;
3543 3900
3901 if ($REATTACH_ON_RELOAD) {
3544 warn "reattaching attachments to objects/players"; 3902 warn "reattaching attachments to objects/players";
3545 _global_reattach; # objects, sockets 3903 _global_reattach; # objects, sockets
3546 warn "reattaching attachments to maps"; 3904 warn "reattaching attachments to maps";
3547 reattach $_ for values %MAP; 3905 reattach $_ for values %MAP;
3548 warn "reattaching attachments to players"; 3906 warn "reattaching attachments to players";
3549 reattach $_ for values %PLAYER; 3907 reattach $_ for values %PLAYER;
3908 }
3550 3909
3910 warn "running post_init jobs";
3911 (pop @POST_INIT)->(1) while @POST_INIT;
3912
3551 warn "leaving sync_job"; 3913 warn "leaving sync_job";
3552 3914
3553 1 3915 1
3554 } or do { 3916 } or do {
3555 warn $@; 3917 warn $@;
3556 warn "error while reloading, exiting."; 3918 cf::cleanup "error while reloading, exiting.";
3557 exit 1;
3558 }; 3919 };
3559 3920
3560 warn "reloaded"; 3921 warn "reloaded";
3922 --$RELOAD;
3923 }
3924
3925 $t1 = AE::time - $t1;
3926 warn "reload completed in ${t1}s\n";
3561}; 3927};
3562 3928
3563our $RELOAD_WATCHER; # used only during reload 3929our $RELOAD_WATCHER; # used only during reload
3564 3930
3565sub reload_perl() { 3931sub reload_perl() {
3566 # doing reload synchronously and two reloads happen back-to-back, 3932 # doing reload synchronously and two reloads happen back-to-back,
3567 # coro crashes during coro_state_free->destroy here. 3933 # coro crashes during coro_state_free->destroy here.
3568 3934
3935 $RELOAD_WATCHER ||= cf::async {
3936 Coro::AIO::aio_wait cache_extensions;
3937
3569 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3938 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3939 do_reload_perl;
3570 undef $RELOAD_WATCHER; 3940 undef $RELOAD_WATCHER;
3571 do_reload_perl; 3941 };
3572 }; 3942 };
3573} 3943}
3574 3944
3575register_command "reload" => sub { 3945register_command "reload" => sub {
3576 my ($who, $arg) = @_; 3946 my ($who, $arg) = @_;
… …
3590 3960
3591our @WAIT_FOR_TICK; 3961our @WAIT_FOR_TICK;
3592our @WAIT_FOR_TICK_BEGIN; 3962our @WAIT_FOR_TICK_BEGIN;
3593 3963
3594sub wait_for_tick { 3964sub wait_for_tick {
3595 return unless $TICK_WATCHER->is_active;
3596 return if $Coro::current == $Coro::main; 3965 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3597 3966
3598 my $signal = new Coro::Signal; 3967 my $signal = new Coro::Signal;
3599 push @WAIT_FOR_TICK, $signal; 3968 push @WAIT_FOR_TICK, $signal;
3600 $signal->wait; 3969 $signal->wait;
3601} 3970}
3602 3971
3603sub wait_for_tick_begin { 3972sub wait_for_tick_begin {
3604 return unless $TICK_WATCHER->is_active;
3605 return if $Coro::current == $Coro::main; 3973 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3606 3974
3607 my $signal = new Coro::Signal; 3975 my $signal = new Coro::Signal;
3608 push @WAIT_FOR_TICK_BEGIN, $signal; 3976 push @WAIT_FOR_TICK_BEGIN, $signal;
3609 $signal->wait; 3977 $signal->wait;
3610} 3978}
3611 3979
3612$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3980sub tick {
3613 if ($Coro::current != $Coro::main) { 3981 if ($Coro::current != $Coro::main) {
3614 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3982 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3615 unless ++$bug_warning > 10; 3983 unless ++$bug_warning > 10;
3616 return; 3984 return;
3617 } 3985 }
3618 3986
3619 $NOW = $tick_start = EV::now;
3620
3621 cf::server_tick; # one server iteration 3987 cf::server_tick; # one server iteration
3622 3988
3623 $RUNTIME += $TICK; 3989 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3624 $NEXT_TICK = $_[0]->at;
3625 3990
3626 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3991 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3627 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3992 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3628 Coro::async_pool { 3993 Coro::async_pool {
3629 $Coro::current->{desc} = "runtime saver"; 3994 $Coro::current->{desc} = "runtime saver";
3630 write_runtime 3995 write_runtime_sync
3631 or warn "ERROR: unable to write runtime file: $!"; 3996 or warn "ERROR: unable to write runtime file: $!";
3632 }; 3997 };
3633 } 3998 }
3634 3999
3635 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4000 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3637 } 4002 }
3638 while (my $sig = shift @WAIT_FOR_TICK) { 4003 while (my $sig = shift @WAIT_FOR_TICK) {
3639 $sig->send; 4004 $sig->send;
3640 } 4005 }
3641 4006
3642 $LOAD = ($NOW - $tick_start) / $TICK; 4007 $LOAD = ($NOW - $TICK_START) / $TICK;
3643 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4008 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3644 4009
3645 _post_tick; 4010 if (0) {
3646}; 4011 if ($NEXT_TICK) {
3647$TICK_WATCHER->priority (EV::MAXPRI); 4012 my $jitter = $TICK_START - $NEXT_TICK;
4013 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4014 warn "jitter $JITTER\n";#d#
4015 }
4016 }
4017}
3648 4018
3649{ 4019{
3650 # configure BDB 4020 # configure BDB
3651 4021
3652 BDB::min_parallel 8; 4022 BDB::min_parallel 16;
3653 BDB::max_poll_reqs $TICK * 0.1; 4023 BDB::max_poll_reqs $TICK * 0.1;
3654 $Coro::BDB::WATCHER->priority (1); 4024 $AnyEvent::BDB::WATCHER->priority (1);
3655 4025
3656 unless ($DB_ENV) { 4026 unless ($DB_ENV) {
3657 $DB_ENV = BDB::db_env_create; 4027 $DB_ENV = BDB::db_env_create;
3658 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4028 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3659 | BDB::LOG_AUTOREMOVE, 1); 4029 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4030 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3660 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4031 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3661 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4032 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3662 4033
3663 cf::sync_job { 4034 cf::sync_job {
3664 eval { 4035 eval {
… …
3690{ 4061{
3691 # configure IO::AIO 4062 # configure IO::AIO
3692 4063
3693 IO::AIO::min_parallel 8; 4064 IO::AIO::min_parallel 8;
3694 IO::AIO::max_poll_time $TICK * 0.1; 4065 IO::AIO::max_poll_time $TICK * 0.1;
3695 $Coro::AIO::WATCHER->priority (1); 4066 undef $AnyEvent::AIO::WATCHER;
3696} 4067}
3697 4068
3698my $_log_backtrace; 4069my $_log_backtrace;
3699 4070
3700sub _log_backtrace { 4071sub _log_backtrace {
… …
3703 $msg =~ s/\n//; 4074 $msg =~ s/\n//;
3704 4075
3705 # limit the # of concurrent backtraces 4076 # limit the # of concurrent backtraces
3706 if ($_log_backtrace < 2) { 4077 if ($_log_backtrace < 2) {
3707 ++$_log_backtrace; 4078 ++$_log_backtrace;
4079 my $perl_bt = Carp::longmess $msg;
3708 async { 4080 async {
3709 $Coro::current->{desc} = "abt $msg"; 4081 $Coro::current->{desc} = "abt $msg";
3710 4082
3711 my @bt = fork_call { 4083 my @bt = fork_call {
3712 @addr = map { sprintf "%x", $_ } @addr; 4084 @addr = map { sprintf "%x", $_ } @addr;
… …
3723 } 4095 }
3724 4096
3725 @funcs 4097 @funcs
3726 }; 4098 };
3727 4099
3728 LOG llevInfo, "[ABT] $msg\n"; 4100 LOG llevInfo, "[ABT] $perl_bt\n";
4101 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3729 LOG llevInfo, "[ABT] $_\n" for @bt; 4102 LOG llevInfo, "[ABT] $_\n" for @bt;
3730 --$_log_backtrace; 4103 --$_log_backtrace;
3731 }; 4104 };
3732 } else { 4105 } else {
3733 LOG llevInfo, "[ABT] $msg\n"; 4106 LOG llevInfo, "[ABT] $msg\n";
3734 LOG llevInfo, "[ABT] [suppressed]\n"; 4107 LOG llevInfo, "[ABT] [suppressed]\n";
3735 } 4108 }
3736} 4109}
3737 4110
3738# load additional modules 4111# load additional modules
3739use cf::pod; 4112require "cf/$_.pm" for @EXTRA_MODULES;
4113cf::_connect_to_perl_2;
3740 4114
3741END { cf::emergency_save } 4115END { cf::emergency_save }
3742 4116
37431 41171
3744 4118

Diff Legend

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