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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines