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.520 by root, Fri Apr 16 02:37:50 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
170#############################################################################
171
172%REFLECT = ();
173for (@REFLECT) {
174 my $reflect = JSON::XS::decode_json $_;
175 $REFLECT{$reflect->{class}} = $reflect;
176}
177
178# this is decidedly evil
179$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
120 180
121############################################################################# 181#############################################################################
122 182
123=head2 GLOBAL VARIABLES 183=head2 GLOBAL VARIABLES
124 184
171returns directly I<after> the tick processing (and consequently, can only wake one process 231returns 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. 232per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
173 233
174=item @cf::INVOKE_RESULTS 234=item @cf::INVOKE_RESULTS
175 235
176This array contains the results of the last C<invoke ()> call. When 236This 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 237C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
178that call. 238that call.
179 239
240=item %cf::REFLECT
241
242Contains, for each (C++) class name, a hash reference with information
243about object members (methods, scalars, arrays and flags) and other
244metadata, which is useful for introspection.
245
180=back 246=back
181 247
182=cut 248=cut
183 249
184BEGIN { 250$Coro::State::WARNHOOK = sub {
185 *CORE::GLOBAL::warn = sub {
186 my $msg = join "", @_; 251 my $msg = join "", @_;
187 252
188 $msg .= "\n" 253 $msg .= "\n"
189 unless $msg =~ /\n$/; 254 unless $msg =~ /\n$/;
190 255
191 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 256 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
192 257
193 LOG llevError, $msg; 258 LOG llevError, $msg;
194 }; 259};
195} 260
261$Coro::State::DIEHOOK = sub {
262 return unless $^S eq 0; # "eq", not "=="
263
264 warn Carp::longmess $_[0];
265
266 if ($Coro::current == $Coro::main) {#d#
267 warn "DIEHOOK called in main context, Coro bug?\n";#d#
268 return;#d#
269 }#d#
270
271 # kill coroutine otherwise
272 Coro::terminate
273};
196 274
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 275@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 276@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 277@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 278@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
207for my $pkg (qw( 285for my $pkg (qw(
208 cf::global cf::attachable 286 cf::global cf::attachable
209 cf::object cf::object::player 287 cf::object cf::object::player
210 cf::client cf::player 288 cf::client cf::player
211 cf::arch cf::living 289 cf::arch cf::living
290 cf::map cf::mapspace
212 cf::map cf::party cf::region 291 cf::party cf::region
213)) { 292)) {
214 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 293 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 294}
217 295
218$EV::DIED = sub { 296$EV::DIED = sub {
219 warn "error in event callback: @_"; 297 Carp::cluck "error in event callback: @_";
220}; 298};
221 299
222############################################################################# 300#############################################################################
223 301
224=head2 UTILITY FUNCTIONS 302=head2 UTILITY FUNCTIONS
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 339our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 340
263sub encode_json($) { $json_coder->encode ($_[0]) } 341sub encode_json($) { $json_coder->encode ($_[0]) }
264sub decode_json($) { $json_coder->decode ($_[0]) } 342sub decode_json($) { $json_coder->decode ($_[0]) }
265 343
344=item cf::post_init { BLOCK }
345
346Execute the given codeblock, I<after> all extensions have been (re-)loaded,
347but I<before> the server starts ticking again.
348
349The cdoeblock will have a single boolean argument to indicate whether this
350is a reload or not.
351
352=cut
353
354sub post_init(&) {
355 push @POST_INIT, shift;
356}
357
266=item cf::lock_wait $string 358=item cf::lock_wait $string
267 359
268Wait until the given lock is available. See cf::lock_acquire. 360Wait until the given lock is available. See cf::lock_acquire.
269 361
270=item my $lock = cf::lock_acquire $string 362=item my $lock = cf::lock_acquire $string
271 363
272Wait until the given lock is available and then acquires it and returns 364Wait 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, 365a L<Guard> object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 366for example when the coroutine gets canceled), the lock is automatically
275returned. 367returned.
276 368
277Locks are *not* recursive, locking from the same coro twice results in a 369Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro. 370deadlocked coro.
284 376
285Return true if the lock is currently active, i.e. somebody has locked it. 377Return true if the lock is currently active, i.e. somebody has locked it.
286 378
287=cut 379=cut
288 380
289our %LOCK; 381our $LOCKS = new Coro::SemaphoreSet;
290our %LOCKER;#d#
291 382
292sub lock_wait($) { 383sub lock_wait($) {
293 my ($key) = @_; 384 $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} 385}
306 386
307sub lock_acquire($) { 387sub lock_acquire($) {
308 my ($key) = @_; 388 $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} 389}
322 390
323sub lock_active($) { 391sub lock_active($) {
324 my ($key) = @_; 392 $LOCKS->count ($_[0]) < 1
325
326 ! ! $LOCK{$key}
327} 393}
328 394
329sub freeze_mainloop { 395sub freeze_mainloop {
330 return unless $TICK_WATCHER->is_active; 396 tick_inhibit_inc;
331 397
332 my $guard = Coro::guard { 398 &Guard::guard (\&tick_inhibit_dec);
333 $TICK_WATCHER->start;
334 };
335 $TICK_WATCHER->stop;
336 $guard
337} 399}
338 400
339=item cf::periodic $interval, $cb 401=item cf::periodic $interval, $cb
340 402
341Like EV::periodic, but randomly selects a starting point so that the actions 403Like EV::periodic, but randomly selects a starting point so that the actions
342get spread over timer. 404get spread over time.
343 405
344=cut 406=cut
345 407
346sub periodic($$) { 408sub periodic($$) {
347 my ($interval, $cb) = @_; 409 my ($interval, $cb) = @_;
364 426
365=cut 427=cut
366 428
367our @SLOT_QUEUE; 429our @SLOT_QUEUE;
368our $SLOT_QUEUE; 430our $SLOT_QUEUE;
431our $SLOT_DECAY = 0.9;
369 432
370$SLOT_QUEUE->cancel if $SLOT_QUEUE; 433$SLOT_QUEUE->cancel if $SLOT_QUEUE;
371$SLOT_QUEUE = Coro::async { 434$SLOT_QUEUE = Coro::async {
372 $Coro::current->desc ("timeslot manager"); 435 $Coro::current->desc ("timeslot manager");
373 436
374 my $signal = new Coro::Signal; 437 my $signal = new Coro::Signal;
438 my $busy;
375 439
376 while () { 440 while () {
377 next_job: 441 next_job:
442
378 my $avail = cf::till_tick; 443 my $avail = cf::till_tick;
379 if ($avail > 0.01) { 444
380 for (0 .. $#SLOT_QUEUE) { 445 for (0 .. $#SLOT_QUEUE) {
381 if ($SLOT_QUEUE[$_][0] < $avail) { 446 if ($SLOT_QUEUE[$_][0] <= $avail) {
447 $busy = 0;
382 my $job = splice @SLOT_QUEUE, $_, 1, (); 448 my $job = splice @SLOT_QUEUE, $_, 1, ();
383 $job->[2]->send; 449 $job->[2]->send;
384 Coro::cede; 450 Coro::cede;
385 goto next_job; 451 goto next_job;
386 } 452 } else {
453 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
387 } 454 }
388 } 455 }
389 456
390 if (@SLOT_QUEUE) { 457 if (@SLOT_QUEUE) {
391 # we do not use wait_for_tick() as it returns immediately when tick is inactive 458 # we do not use wait_for_tick() as it returns immediately when tick is inactive
392 push @cf::WAIT_FOR_TICK, $signal; 459 push @cf::WAIT_FOR_TICK, $signal;
393 $signal->wait; 460 $signal->wait;
394 } else { 461 } else {
462 $busy = 0;
395 Coro::schedule; 463 Coro::schedule;
396 } 464 }
397 } 465 }
398}; 466};
399 467
400sub get_slot($;$$) { 468sub get_slot($;$$) {
469 return if tick_inhibit || $Coro::current == $Coro::main;
470
401 my ($time, $pri, $name) = @_; 471 my ($time, $pri, $name) = @_;
402 472
403 $time = $TICK * .6 if $time > $TICK * .6; 473 $time = clamp $time, 0.01, $TICK * .6;
474
404 my $sig = new Coro::Signal; 475 my $sig = new Coro::Signal;
405 476
406 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 477 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
407 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 478 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
408 $SLOT_QUEUE->ready; 479 $SLOT_QUEUE->ready;
435 506
436sub sync_job(&) { 507sub sync_job(&) {
437 my ($job) = @_; 508 my ($job) = @_;
438 509
439 if ($Coro::current == $Coro::main) { 510 if ($Coro::current == $Coro::main) {
440 my $time = EV::time; 511 my $time = AE::time;
441 512
442 # this is the main coro, too bad, we have to block 513 # this is the main coro, too bad, we have to block
443 # till the operation succeeds, freezing the server :/ 514 # till the operation succeeds, freezing the server :/
444 515
445 LOG llevError, Carp::longmess "sync job";#d# 516 LOG llevError, Carp::longmess "sync job";#d#
446 517
447 # TODO: use suspend/resume instead
448 # (but this is cancel-safe)
449 my $freeze_guard = freeze_mainloop; 518 my $freeze_guard = freeze_mainloop;
450 519
451 my $busy = 1; 520 my $busy = 1;
452 my @res; 521 my @res;
453 522
464 } else { 533 } else {
465 EV::loop EV::LOOP_ONESHOT; 534 EV::loop EV::LOOP_ONESHOT;
466 } 535 }
467 } 536 }
468 537
469 $time = EV::time - $time; 538 my $time = AE::time - $time;
470 539
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 540 $TICK_START += $time; # do not account sync jobs to server load
475 541
476 wantarray ? @res : $res[0] 542 wantarray ? @res : $res[0]
477 } else { 543 } else {
478 # we are in another coroutine, how wonderful, everything just works 544 # we are in another coroutine, how wonderful, everything just works
479 545
521 reset_signals; 587 reset_signals;
522 &$cb 588 &$cb
523 }, @args; 589 }, @args;
524 590
525 wantarray ? @res : $res[-1] 591 wantarray ? @res : $res[-1]
592}
593
594sub objinfo {
595 (
596 "counter value" => cf::object::object_count,
597 "objects created" => cf::object::create_count,
598 "objects destroyed" => cf::object::destroy_count,
599 "freelist size" => cf::object::free_count,
600 "allocated objects" => cf::object::objects_size,
601 "active objects" => cf::object::actives_size,
602 )
603}
604
605=item $coin = coin_from_name $name
606
607=cut
608
609our %coin_alias = (
610 "silver" => "silvercoin",
611 "silvercoin" => "silvercoin",
612 "silvercoins" => "silvercoin",
613 "gold" => "goldcoin",
614 "goldcoin" => "goldcoin",
615 "goldcoins" => "goldcoin",
616 "platinum" => "platinacoin",
617 "platinumcoin" => "platinacoin",
618 "platinumcoins" => "platinacoin",
619 "platina" => "platinacoin",
620 "platinacoin" => "platinacoin",
621 "platinacoins" => "platinacoin",
622 "royalty" => "royalty",
623 "royalties" => "royalty",
624);
625
626sub coin_from_name($) {
627 $coin_alias{$_[0]}
628 ? cf::arch::find $coin_alias{$_[0]}
629 : undef
526} 630}
527 631
528=item $value = cf::db_get $family => $key 632=item $value = cf::db_get $family => $key
529 633
530Returns a single value from the environment database. 634Returns a single value from the environment database.
669 773
670############################################################################# 774#############################################################################
671 775
672=head2 ATTACHABLE OBJECTS 776=head2 ATTACHABLE OBJECTS
673 777
674Many objects in crossfire are so-called attachable objects. That means you can 778Many objects in deliantra are so-called attachable objects. That means you can
675attach callbacks/event handlers (a collection of which is called an "attachment") 779attach callbacks/event handlers (a collection of which is called an "attachment")
676to it. All such attachable objects support the following methods. 780to it. All such attachable objects support the following methods.
677 781
678In the following description, CLASS can be any of C<global>, C<object> 782In 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 783C<player>, C<client> or C<map> (i.e. the attachable objects in
729=item cf::CLASS::attachment $name, ... 833=item cf::CLASS::attachment $name, ...
730 834
731Register an attachment by C<$name> through which attachable objects of the 835Register an attachment by C<$name> through which attachable objects of the
732given CLASS can refer to this attachment. 836given CLASS can refer to this attachment.
733 837
734Some classes such as crossfire maps and objects can specify attachments 838Some classes such as deliantra maps and objects can specify attachments
735that are attached at load/instantiate time, thus the need for a name. 839that are attached at load/instantiate time, thus the need for a name.
736 840
737These calls expect any number of the following handler/hook descriptions: 841These calls expect any number of the following handler/hook descriptions:
738 842
739=over 4 843=over 4
967 } 1071 }
968 1072
969 0 1073 0
970} 1074}
971 1075
972=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1076=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
973 1077
974=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1078=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
975 1079
976Generate an object-specific event with the given arguments. 1080Generate an object-specific event with the given arguments.
977 1081
1030 1134
1031sub reattach { 1135sub reattach {
1032 # basically do the same as instantiate, without calling instantiate 1136 # basically do the same as instantiate, without calling instantiate
1033 my ($obj) = @_; 1137 my ($obj) = @_;
1034 1138
1139 # no longer needed after getting rid of delete_package?
1035 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1140 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1036 1141
1037 my $registry = $obj->registry; 1142 my $registry = $obj->registry;
1038 1143
1039 @$registry = (); 1144 @$registry = ();
1040 1145
1086 utf8::decode (my $decname = $filename); 1191 utf8::decode (my $decname = $filename);
1087 warn sprintf "saving %s (%d,%d)\n", 1192 warn sprintf "saving %s (%d,%d)\n",
1088 $decname, length $$rdata, scalar @$objs; 1193 $decname, length $$rdata, scalar @$objs;
1089 1194
1090 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1195 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1091 chmod SAVE_MODE, $fh; 1196 aio_chmod $fh, SAVE_MODE;
1092 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1197 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1093 aio_fsync $fh if $cf::USE_FSYNC; 1198 if ($cf::USE_FSYNC) {
1199 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;
1200 aio_fsync $fh;
1201 }
1094 close $fh; 1202 aio_close $fh;
1095 1203
1096 if (@$objs) { 1204 if (@$objs) {
1097 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1205 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1098 chmod SAVE_MODE, $fh; 1206 aio_chmod $fh, SAVE_MODE;
1099 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1207 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1100 aio_write $fh, 0, (length $data), $data, 0; 1208 aio_write $fh, 0, (length $data), $data, 0;
1101 aio_fsync $fh if $cf::USE_FSYNC; 1209 if ($cf::USE_FSYNC) {
1210 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;
1211 aio_fsync $fh;
1212 }
1102 close $fh; 1213 aio_close $fh;
1103 aio_rename "$filename.pst~", "$filename.pst"; 1214 aio_rename "$filename.pst~", "$filename.pst";
1104 } 1215 }
1105 } else { 1216 } else {
1106 aio_unlink "$filename.pst"; 1217 aio_unlink "$filename.pst";
1107 } 1218 }
1108 1219
1109 aio_rename "$filename~", $filename; 1220 aio_rename "$filename~", $filename;
1221
1222 $filename =~ s%/[^/]+$%%;
1223 aio_pathsync $filename if $cf::USE_FSYNC;
1110 } else { 1224 } else {
1111 warn "FATAL: $filename~: $!\n"; 1225 warn "unable to save objects: $filename~: $!\n";
1112 } 1226 }
1113 } else { 1227 } else {
1114 aio_unlink $filename; 1228 aio_unlink $filename;
1115 aio_unlink "$filename.pst"; 1229 aio_unlink "$filename.pst";
1116 } 1230 }
1207 my ($name, $cb) = @_; 1321 my ($name, $cb) = @_;
1208 1322
1209 $EXTICMD{$name} = $cb; 1323 $EXTICMD{$name} = $cb;
1210} 1324}
1211 1325
1326use File::Glob ();
1327
1212cf::player->attach ( 1328cf::player->attach (
1213 on_command => sub { 1329 on_unknown_command => sub {
1214 my ($pl, $name, $params) = @_; 1330 my ($pl, $name, $params) = @_;
1215 1331
1216 my $cb = $COMMAND{$name} 1332 my $cb = $COMMAND{$name}
1217 or return; 1333 or return;
1218 1334
1248 1364
1249 cf::override; 1365 cf::override;
1250 }, 1366 },
1251); 1367);
1252 1368
1369# "readahead" all extensions
1370sub cache_extensions {
1371 my $grp = IO::AIO::aio_group;
1372
1373 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1374 for (grep /\.ext$/, @{$_[0]}) {
1375 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1376 }
1377 };
1378
1379 $grp
1380}
1381
1253sub load_extensions { 1382sub load_extensions {
1254 cf::sync_job { 1383 cf::sync_job {
1255 my %todo; 1384 my %todo;
1256 1385
1257 for my $path (<$LIBDIR/*.ext>) { 1386 for my $path (<$LIBDIR/*.ext>) {
1276 1405
1277 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1406 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1278 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1407 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1279 1408
1280 $ext{source} = 1409 $ext{source} =
1281 "package $pkg; use strict; use utf8;\n" 1410 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1282 . "#line 1 \"$path\"\n{\n" 1411 . "#line 1 \"$path\"\n{\n"
1283 . $source 1412 . $source
1284 . "\n};\n1"; 1413 . "\n};\n1";
1285 1414
1286 $todo{$base} = \%ext; 1415 $todo{$base} = \%ext;
1287 } 1416 }
1288 1417
1418 my $pass = 0;
1289 my %done; 1419 my %done;
1290 while (%todo) { 1420 while (%todo) {
1291 my $progress; 1421 my $progress;
1292 1422
1423 ++$pass;
1424
1425 ext:
1293 while (my ($k, $v) = each %todo) { 1426 while (my ($k, $v) = each %todo) {
1294 for (split /,\s*/, $v->{meta}{depends}) { 1427 for (split /,\s*/, $v->{meta}{depends}) {
1295 goto skip 1428 next ext
1296 unless exists $done{$_}; 1429 unless exists $done{$_};
1297 } 1430 }
1298 1431
1299 warn "... loading '$k' into '$v->{pkg}'\n"; 1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1300 1433
1301 unless (eval $v->{source}) { 1434 my $active = eval $v->{source};
1435
1436 if (length $@) {
1302 my $msg = $@ ? "$v->{path}: $@\n" 1437 warn "$v->{path}: $@\n";
1303 : "$v->{base}: extension inactive.\n";
1304 1438
1439 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1305 if (exists $v->{meta}{mandatory}) { 1440 if exists $v->{meta}{mandatory};
1306 warn $msg; 1441 } else {
1307 warn "mandatory extension failed to load, exiting.\n"; 1442 $done{$k} = delete $todo{$k};
1308 exit 1; 1443 push @EXTS, $v->{pkg};
1309 } 1444 $progress = 1;
1310 1445
1311 warn $msg; 1446 warn "$v->{base}: extension inactive.\n"
1447 unless $active;
1312 } 1448 }
1313
1314 $done{$k} = delete $todo{$k};
1315 push @EXTS, $v->{pkg};
1316 $progress = 1;
1317 } 1449 }
1318 1450
1319 skip: 1451 unless ($progress) {
1320 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1452 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1321 unless $progress; 1453
1454 while (my ($k, $v) = each %todo) {
1455 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1456 if exists $v->{meta}{mandatory};
1457 }
1458 }
1322 } 1459 }
1323 }; 1460 };
1324} 1461}
1325 1462
1326############################################################################# 1463#############################################################################
1327 1464
1328=back 1465=back
1329 1466
1330=head2 CORE EXTENSIONS 1467=head2 CORE EXTENSIONS
1331 1468
1332Functions and methods that extend core crossfire objects. 1469Functions and methods that extend core deliantra objects.
1333 1470
1334=cut 1471=cut
1335 1472
1336package cf::player; 1473package cf::player;
1337 1474
1380 1517
1381sub exists($) { 1518sub exists($) {
1382 my ($login) = @_; 1519 my ($login) = @_;
1383 1520
1384 $cf::PLAYER{$login} 1521 $cf::PLAYER{$login}
1385 or cf::sync_job { !aio_stat path $login } 1522 or !aio_stat path $login
1386} 1523}
1387 1524
1388sub find($) { 1525sub find($) {
1389 return $cf::PLAYER{$_[0]} || do { 1526 return $cf::PLAYER{$_[0]} || do {
1390 my $login = $_[0]; 1527 my $login = $_[0];
1402 my $f = new_from_file cf::object::thawer path $login 1539 my $f = new_from_file cf::object::thawer path $login
1403 or return; 1540 or return;
1404 1541
1405 my $pl = cf::player::load_pl $f 1542 my $pl = cf::player::load_pl $f
1406 or return; 1543 or return;
1544
1407 local $cf::PLAYER_LOADING{$login} = $pl; 1545 local $cf::PLAYER_LOADING{$login} = $pl;
1408 $f->resolve_delayed_derefs; 1546 $f->resolve_delayed_derefs;
1409 $cf::PLAYER{$login} = $pl 1547 $cf::PLAYER{$login} = $pl
1410 } 1548 }
1411 } 1549 }
1412} 1550}
1413 1551
1552cf::player->attach (
1553 on_load => sub {
1554 my ($pl, $path) = @_;
1555
1556 # restore slots saved in save, below
1557 my $slots = delete $pl->{_slots};
1558
1559 $pl->ob->current_weapon ($slots->[0]);
1560 $pl->combat_ob ($slots->[1]);
1561 $pl->ranged_ob ($slots->[2]);
1562 },
1563);
1564
1414sub save($) { 1565sub save($) {
1415 my ($pl) = @_; 1566 my ($pl) = @_;
1416 1567
1417 return if $pl->{deny_save}; 1568 return if $pl->{deny_save};
1418 1569
1421 1572
1422 return if $pl->{deny_save}; 1573 return if $pl->{deny_save};
1423 1574
1424 aio_mkdir playerdir $pl, 0770; 1575 aio_mkdir playerdir $pl, 0770;
1425 $pl->{last_save} = $cf::RUNTIME; 1576 $pl->{last_save} = $cf::RUNTIME;
1577
1578 cf::get_slot 0.01;
1579
1580 # save slots, to be restored later
1581 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1426 1582
1427 $pl->save_pl ($path); 1583 $pl->save_pl ($path);
1428 cf::cede_to_tick; 1584 cf::cede_to_tick;
1429} 1585}
1430 1586
1462 my ($pl) = @_; 1618 my ($pl) = @_;
1463 1619
1464 my $name = $pl->ob->name; 1620 my $name = $pl->ob->name;
1465 1621
1466 $pl->{deny_save} = 1; 1622 $pl->{deny_save} = 1;
1467 $pl->password ("*"); # this should lock out the player until we nuked the dir 1623 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1468 1624
1469 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1625 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1470 $pl->deactivate; 1626 $pl->deactivate;
1627 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1628 $pl->ob->check_score;
1471 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1629 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1472 $pl->ns->destroy if $pl->ns; 1630 $pl->ns->destroy if $pl->ns;
1473 1631
1474 my $path = playerdir $pl; 1632 my $path = playerdir $pl;
1475 my $temp = "$path~$cf::RUNTIME~deleting~"; 1633 my $temp = "$path~$cf::RUNTIME~deleting~";
1514 1672
1515 for my $login (@$dirs) { 1673 for my $login (@$dirs) {
1516 my $path = path $login; 1674 my $path = path $login;
1517 1675
1518 # a .pst is a dead give-away for a valid player 1676 # a .pst is a dead give-away for a valid player
1519 unless (-e "$path.pst") { 1677 # if no pst file found, open and chekc for blocked users
1678 if (aio_stat "$path.pst") {
1520 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1679 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1521 aio_read $fh, 0, 512, my $buf, 0 or next; 1680 aio_read $fh, 0, 512, my $buf, 0 or next;
1522 $buf !~ /^password -------------$/m or next; # official not-valid tag 1681 $buf !~ /^password -------------$/m or next; # official not-valid tag
1523 } 1682 }
1524 1683
1555 } 1714 }
1556 1715
1557 \@paths 1716 \@paths
1558} 1717}
1559 1718
1560=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1719=item $protocol_xml = $player->expand_cfpod ($cfpod)
1561 1720
1562Expand crossfire pod fragments into protocol xml. 1721Expand 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 1722
1653=item $player->ext_reply ($msgid, @msg) 1723=item $player->ext_reply ($msgid, @msg)
1654 1724
1655Sends an ext reply to the player. 1725Sends an ext reply to the player.
1656 1726
1723our $MAX_RESET = 3600; 1793our $MAX_RESET = 3600;
1724our $DEFAULT_RESET = 3000; 1794our $DEFAULT_RESET = 3000;
1725 1795
1726sub generate_random_map { 1796sub generate_random_map {
1727 my ($self, $rmp) = @_; 1797 my ($self, $rmp) = @_;
1798
1799 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1800
1728 # mit "rum" bekleckern, nicht 1801 # mit "rum" bekleckern, nicht
1729 $self->_create_random_map ( 1802 $self->_create_random_map (
1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1803 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1804 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1805 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1733 $rmp->{exit_on_final_map}, 1806 $rmp->{exit_on_final_map},
1734 $rmp->{xsize}, $rmp->{ysize}, 1807 $rmp->{xsize}, $rmp->{ysize},
1735 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1808 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1736 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1809 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1854 1927
1855# the temporary/swap location 1928# the temporary/swap location
1856sub save_path { 1929sub save_path {
1857 my ($self) = @_; 1930 my ($self) = @_;
1858 1931
1859 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1932 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1860 "$TMPDIR/$path.map" 1933 "$TMPDIR/$path.map"
1861} 1934}
1862 1935
1863# the unique path, undef == no special unique path 1936# the unique path, undef == no special unique path
1864sub uniq_path { 1937sub uniq_path {
1865 my ($self) = @_; 1938 my ($self) = @_;
1866 1939
1867 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1940 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1868 "$UNIQUEDIR/$path" 1941 "$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} 1942}
1879 1943
1880sub decay_objects { 1944sub decay_objects {
1881 my ($self) = @_; 1945 my ($self) = @_;
1882 1946
1966sub find { 2030sub find {
1967 my ($path, $origin) = @_; 2031 my ($path, $origin) = @_;
1968 2032
1969 $path = normalise $path, $origin && $origin->path; 2033 $path = normalise $path, $origin && $origin->path;
1970 2034
1971 cf::lock_wait "map_data:$path";#d#remove 2035 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1972 cf::lock_wait "map_find:$path"; 2036 my $guard2 = cf::lock_acquire "map_find:$path";
1973 2037
1974 $cf::MAP{$path} || do { 2038 $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 2039 my $map = new_from_path cf::map $path
1979 or return; 2040 or return;
1980 2041
1981 $map->{last_save} = $cf::RUNTIME; 2042 $map->{last_save} = $cf::RUNTIME;
1982 2043
1984 or return; 2045 or return;
1985 2046
1986 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2047 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1987 # doing this can freeze the server in a sync job, obviously 2048 # doing this can freeze the server in a sync job, obviously
1988 #$cf::WAIT_FOR_TICK->wait; 2049 #$cf::WAIT_FOR_TICK->wait;
2050 undef $guard2;
1989 undef $guard1; 2051 undef $guard1;
1990 undef $guard2;
1991 $map->reset; 2052 $map->reset;
1992 return find $path; 2053 return find $path;
1993 } 2054 }
1994 2055
1995 $cf::MAP{$path} = $map 2056 $cf::MAP{$path} = $map
1996 } 2057 }
1997} 2058}
1998 2059
1999sub pre_load { } 2060sub pre_load { }
2000sub post_load { } 2061#sub post_load { } # XS
2001 2062
2002sub load { 2063sub load {
2003 my ($self) = @_; 2064 my ($self) = @_;
2004 2065
2005 local $self->{deny_reset} = 1; # loading can take a long time 2066 local $self->{deny_reset} = 1; # loading can take a long time
2022 my $f = new_from_file cf::object::thawer $self->{load_path}; 2083 my $f = new_from_file cf::object::thawer $self->{load_path};
2023 $f->skip_block; 2084 $f->skip_block;
2024 $self->_load_objects ($f) 2085 $self->_load_objects ($f)
2025 or return; 2086 or return;
2026 2087
2027 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2088 $self->post_load_original
2028 if delete $self->{load_original}; 2089 if delete $self->{load_original};
2029 2090
2030 if (my $uniq = $self->uniq_path) { 2091 if (my $uniq = $self->uniq_path) {
2031 utf8::encode $uniq; 2092 utf8::encode $uniq;
2032 unless (aio_stat $uniq) { 2093 unless (aio_stat $uniq) {
2050 unless ($self->{deny_activate}) { 2111 unless ($self->{deny_activate}) {
2051 $self->decay_objects; 2112 $self->decay_objects;
2052 $self->fix_auto_apply; 2113 $self->fix_auto_apply;
2053 $self->update_buttons; 2114 $self->update_buttons;
2054 cf::cede_to_tick; 2115 cf::cede_to_tick;
2055 $self->set_darkness_map;
2056 cf::cede_to_tick;
2057 $self->activate; 2116 $self->activate;
2058 } 2117 }
2059 2118
2060 $self->{last_save} = $cf::RUNTIME; 2119 $self->{last_save} = $cf::RUNTIME;
2061 $self->last_access ($cf::RUNTIME); 2120 $self->last_access ($cf::RUNTIME);
2062 2121
2063 $self->in_memory (cf::MAP_IN_MEMORY); 2122 $self->in_memory (cf::MAP_ACTIVE);
2064 } 2123 }
2065 2124
2066 $self->post_load; 2125 $self->post_load;
2067} 2126}
2068 2127
2128# customize the map for a given player, i.e.
2129# return the _real_ map. used by e.g. per-player
2130# maps to change the path to ~playername/mappath
2069sub customise_for { 2131sub customise_for {
2070 my ($self, $ob) = @_; 2132 my ($self, $ob) = @_;
2071 2133
2072 return find "~" . $ob->name . "/" . $self->{path} 2134 return find "~" . $ob->name . "/" . $self->{path}
2073 if $self->per_player; 2135 if $self->per_player;
2126 my ($path, $origin, $load) = @_; 2188 my ($path, $origin, $load) = @_;
2127 2189
2128 $path = normalise $path, $origin && $origin->{path}; 2190 $path = normalise $path, $origin && $origin->{path};
2129 2191
2130 if (my $map = $cf::MAP{$path}) { 2192 if (my $map = $cf::MAP{$path}) {
2131 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2193 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2132 } 2194 }
2133 2195
2134 $MAP_PREFETCH{$path} |= $load; 2196 $MAP_PREFETCH{$path} |= $load;
2135 2197
2136 $MAP_PREFETCHER ||= cf::async { 2198 $MAP_PREFETCHER ||= cf::async {
2150 $MAP_PREFETCHER->prio (6); 2212 $MAP_PREFETCHER->prio (6);
2151 2213
2152 () 2214 ()
2153} 2215}
2154 2216
2217# common code, used by both ->save and ->swapout
2155sub save { 2218sub _save {
2156 my ($self) = @_; 2219 my ($self) = @_;
2157
2158 my $lock = cf::lock_acquire "map_data:$self->{path}";
2159 2220
2160 $self->{last_save} = $cf::RUNTIME; 2221 $self->{last_save} = $cf::RUNTIME;
2161 2222
2162 return unless $self->dirty; 2223 return unless $self->dirty;
2163 2224
2172 2233
2173 cf::async { 2234 cf::async {
2174 $Coro::current->{desc} = "map player save"; 2235 $Coro::current->{desc} = "map player save";
2175 $_->contr->save for $self->players; 2236 $_->contr->save for $self->players;
2176 }; 2237 };
2238
2239 cf::get_slot 0.02;
2177 2240
2178 if ($uniq) { 2241 if ($uniq) {
2179 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2242 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2180 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2243 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2181 } else { 2244 } else {
2182 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2183 } 2246 }
2184} 2247}
2185 2248
2249sub save {
2250 my ($self) = @_;
2251
2252 my $lock = cf::lock_acquire "map_data:$self->{path}";
2253
2254 $self->_save;
2255}
2256
2186sub swap_out { 2257sub swap_out {
2187 my ($self) = @_; 2258 my ($self) = @_;
2188 2259
2189 # save first because save cedes
2190 $self->save;
2191
2192 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2193 2261
2262 return if $self->in_memory != cf::MAP_ACTIVE;
2263 return if $self->{deny_save};
2194 return if $self->players; 2264 return if $self->players;
2195 return if $self->in_memory != cf::MAP_IN_MEMORY;
2196 return if $self->{deny_save};
2197 2265
2198 $self->in_memory (cf::MAP_SWAPPED); 2266 # first deactivate the map and "unlink" it from the core
2199
2200 $self->deactivate; 2267 $self->deactivate;
2201 $_->clear_links_to ($self) for values %cf::MAP; 2268 $_->clear_links_to ($self) for values %cf::MAP;
2269 $self->in_memory (cf::MAP_SWAPPED);
2270
2271 # then atomically save
2272 $self->_save;
2273
2274 # then free the map
2202 $self->clear; 2275 $self->clear;
2203} 2276}
2204 2277
2205sub reset_at { 2278sub reset_at {
2206 my ($self) = @_; 2279 my ($self) = @_;
2225 2298
2226 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2299 my $lock = cf::lock_acquire "map_data:$self->{path}";
2227 2300
2228 return if $self->players; 2301 return if $self->players;
2229 2302
2230 warn "resetting map ", $self->path; 2303 warn "resetting map ", $self->path, "\n";
2231 2304
2232 $self->in_memory (cf::MAP_SWAPPED); 2305 $self->in_memory (cf::MAP_SWAPPED);
2233 2306
2234 # need to save uniques path 2307 # need to save uniques path
2235 unless ($self->{deny_save}) { 2308 unless ($self->{deny_save}) {
2318 2391
2319sub unique_maps() { 2392sub unique_maps() {
2320 [ 2393 [
2321 map { 2394 map {
2322 utf8::decode $_; 2395 utf8::decode $_;
2323 /\.map$/ 2396 s/\.map$//; # TODO future compatibility hack
2397 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2398 ? ()
2324 ? normalise $_ 2399 : normalise $_
2325 : ()
2326 } @{ aio_readdir $UNIQUEDIR or [] } 2400 } @{ aio_readdir $UNIQUEDIR or [] }
2327 ] 2401 ]
2328} 2402}
2329 2403
2330package cf; 2404=item cf::map::static_maps
2405
2406Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2407file in the shared directory excluding F</styles> and F</editor>). May
2408block.
2409
2410=cut
2411
2412sub static_maps() {
2413 my @dirs = "";
2414 my @maps;
2415
2416 while (@dirs) {
2417 my $dir = shift @dirs;
2418
2419 next if $dir eq "/styles" || $dir eq "/editor";
2420
2421 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2422 or return;
2423
2424 for (@$files) {
2425 s/\.map$// or next;
2426 utf8::decode $_;
2427 push @maps, "$dir/$_";
2428 }
2429
2430 push @dirs, map "$dir/$_", @$dirs;
2431 }
2432
2433 \@maps
2434}
2331 2435
2332=back 2436=back
2333 2437
2334=head3 cf::object 2438=head3 cf::object
2335 2439
2339 2443
2340=over 4 2444=over 4
2341 2445
2342=item $ob->inv_recursive 2446=item $ob->inv_recursive
2343 2447
2344Returns the inventory of the object _and_ their inventories, recursively. 2448Returns the inventory of the object I<and> their inventories, recursively,
2449but I<not> the object itself.
2345 2450
2346=cut 2451=cut
2347 2452
2348sub inv_recursive_; 2453sub inv_recursive_;
2349sub inv_recursive_ { 2454sub inv_recursive_ {
2354 inv_recursive_ inv $_[0] 2459 inv_recursive_ inv $_[0]
2355} 2460}
2356 2461
2357=item $ref = $ob->ref 2462=item $ref = $ob->ref
2358 2463
2359creates and returns a persistent reference to an objetc that can be stored as a string. 2464Creates and returns a persistent reference to an object that can be stored as a string.
2360 2465
2361=item $ob = cf::object::deref ($refstring) 2466=item $ob = cf::object::deref ($refstring)
2362 2467
2363returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2468returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2364even if the object actually exists. May block. 2469even if the object actually exists. May block.
2396can be C<undef>. Does the right thing when the player is currently in a 2501can be C<undef>. Does the right thing when the player is currently in a
2397dialogue with the given NPC character. 2502dialogue with the given NPC character.
2398 2503
2399=cut 2504=cut
2400 2505
2506our $SAY_CHANNEL = {
2507 id => "say",
2508 title => "Map",
2509 reply => "say ",
2510 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2511};
2512
2513our $CHAT_CHANNEL = {
2514 id => "chat",
2515 title => "Chat",
2516 reply => "chat ",
2517 tooltip => "Player chat and shouts, global to the server.",
2518};
2519
2401# rough implementation of a future "reply" method that works 2520# rough implementation of a future "reply" method that works
2402# with dialog boxes. 2521# with dialog boxes.
2403#TODO: the first argument must go, split into a $npc->reply_to ( method 2522#TODO: the first argument must go, split into a $npc->reply_to ( method
2404sub cf::object::player::reply($$$;$) { 2523sub cf::object::player::reply($$$;$) {
2405 my ($self, $npc, $msg, $flags) = @_; 2524 my ($self, $npc, $msg, $flags) = @_;
2416 my $dialog = $pl->{npc_dialog}; 2535 my $dialog = $pl->{npc_dialog};
2417 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2536 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2418 2537
2419 } else { 2538 } else {
2420 $msg = $npc->name . " says: $msg" if $npc; 2539 $msg = $npc->name . " says: $msg" if $npc;
2421 $self->message ($msg, $flags); 2540 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2422 } 2541 }
2423 } 2542 }
2424} 2543}
2425 2544
2426=item $object->send_msg ($channel, $msg, $color, [extra...]) 2545=item $object->send_msg ($channel, $msg, $color, [extra...])
2451 2570
2452=item $player_object->enter_link 2571=item $player_object->enter_link
2453 2572
2454Freezes the player and moves him/her to a special map (C<{link}>). 2573Freezes the player and moves him/her to a special map (C<{link}>).
2455 2574
2456The player should be reasonably safe there for short amounts of time. You 2575The player should be reasonably safe there for short amounts of time (e.g.
2457I<MUST> call C<leave_link> as soon as possible, though. 2576for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2577though, as the palyer cannot control the character while it is on the link
2578map.
2458 2579
2459Will never block. 2580Will never block.
2460 2581
2461=item $player_object->leave_link ($map, $x, $y) 2582=item $player_object->leave_link ($map, $x, $y)
2462 2583
2487 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2608 return if UNIVERSAL::isa $self->map, "ext::map_link";
2488 2609
2489 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2610 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2490 if $self->map && $self->map->{path} ne "{link}"; 2611 if $self->map && $self->map->{path} ne "{link}";
2491 2612
2492 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2613 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2493} 2614}
2494 2615
2495sub cf::object::player::leave_link { 2616sub cf::object::player::leave_link {
2496 my ($self, $map, $x, $y) = @_; 2617 my ($self, $map, $x, $y) = @_;
2497 2618
2514 ($x, $y) = (-1, -1) 2635 ($x, $y) = (-1, -1)
2515 unless (defined $x) && (defined $y); 2636 unless (defined $x) && (defined $y);
2516 2637
2517 # use -1 or undef as default coordinates, not 0, 0 2638 # use -1 or undef as default coordinates, not 0, 0
2518 ($x, $y) = ($map->enter_x, $map->enter_y) 2639 ($x, $y) = ($map->enter_x, $map->enter_y)
2519 if $x <=0 && $y <= 0; 2640 if $x <= 0 && $y <= 0;
2520 2641
2521 $map->load; 2642 $map->load;
2522 $map->load_neighbours; 2643 $map->load_neighbours;
2523 2644
2524 return unless $self->contr->active; 2645 return unless $self->contr->active;
2525 $self->activate_recursive;
2526 2646
2527 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2647 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2528 $self->enter_map ($map, $x, $y); 2648 $self->enter_map ($map, $x, $y);
2649
2650 # only activate afterwards, to support waiting in hooks
2651 $self->activate_recursive;
2529} 2652}
2530 2653
2531=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2654=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2532 2655
2533Moves the player to the given map-path and coordinates by first freezing 2656Moves the player to the given map-path and coordinates by first freezing
2534her, loading and preparing them map, calling the provided $check callback 2657her, loading and preparing them map, calling the provided $check callback
2535that has to return the map if sucecssful, and then unfreezes the player on 2658that 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 2659the new (success) or old (failed) map position. In either case, $done will
2537be called at the end of this process. 2660be called at the end of this process.
2661
2662Note that $check will be called with a potentially non-loaded map, so if
2663it needs a loaded map it has to call C<< ->load >>.
2538 2664
2539=cut 2665=cut
2540 2666
2541our $GOTOGEN; 2667our $GOTOGEN;
2542 2668
2621} 2747}
2622 2748
2623sub prepare_random_map { 2749sub prepare_random_map {
2624 my ($exit) = @_; 2750 my ($exit) = @_;
2625 2751
2626 my $guard = cf::lock_acquire "exit_prepare:$exit";
2627
2628 # all this does is basically replace the /! path by 2752 # all this does is basically replace the /! path by
2629 # a new random map path (?random/...) with a seed 2753 # a new random map path (?random/...) with a seed
2630 # that depends on the exit object 2754 # that depends on the exit object
2631 2755
2632 my $rmp = parse_random_map_params $exit->msg; 2756 my $rmp = parse_random_map_params $exit->msg;
2634 if ($exit->map) { 2758 if ($exit->map) {
2635 $rmp->{region} = $exit->region->name; 2759 $rmp->{region} = $exit->region->name;
2636 $rmp->{origin_map} = $exit->map->path; 2760 $rmp->{origin_map} = $exit->map->path;
2637 $rmp->{origin_x} = $exit->x; 2761 $rmp->{origin_x} = $exit->x;
2638 $rmp->{origin_y} = $exit->y; 2762 $rmp->{origin_y} = $exit->y;
2763
2764 $exit->map->touch;
2639 } 2765 }
2640 2766
2641 $rmp->{random_seed} ||= $exit->random_seed; 2767 $rmp->{random_seed} ||= $exit->random_seed;
2642 2768
2643 my $data = cf::encode_json $rmp; 2769 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2644 my $md5 = Digest::MD5::md5_hex $data; 2770 my $md5 = Digest::MD5::md5_hex $data;
2645 my $meta = "$RANDOMDIR/$md5.meta"; 2771 my $meta = "$RANDOMDIR/$md5.meta";
2646 2772
2647 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2773 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2648 aio_write $fh, 0, (length $data), $data, 0; 2774 aio_write $fh, 0, (length $data), $data, 0;
2649 undef $fh; 2775 undef $fh;
2650 aio_rename "$meta~", $meta; 2776 aio_rename "$meta~", $meta;
2651 2777
2778 my $slaying = "?random/$md5";
2779
2780 if ($exit->valid) {
2652 $exit->slaying ("?random/$md5"); 2781 $exit->slaying ("?random/$md5");
2653 $exit->msg (undef); 2782 $exit->msg (undef);
2783 }
2654 } 2784 }
2655} 2785}
2656 2786
2657sub cf::object::player::enter_exit { 2787sub cf::object::player::enter_exit {
2658 my ($self, $exit) = @_; 2788 my ($self, $exit) = @_;
2659 2789
2660 return unless $self->type == cf::PLAYER; 2790 return unless $self->type == cf::PLAYER;
2661 2791
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; 2792 $self->enter_link;
2674 2793
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 { 2794 (async {
2680 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2795 $Coro::current->{desc} = "enter_exit";
2681 2796
2682 $self->deactivate_recursive; # just to be sure
2683 unless (eval { 2797 unless (eval {
2798 $self->deactivate_recursive; # just to be sure
2799
2800 # random map handling
2801 {
2802 my $guard = cf::lock_acquire "exit_prepare:$exit";
2803
2804 prepare_random_map $exit
2805 if $exit->slaying eq "/!";
2806 }
2807
2808 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2809 my $x = $exit->stats->hp;
2810 my $y = $exit->stats->sp;
2811
2684 $self->goto ($slaying, $hp, $sp); 2812 $self->goto ($map, $x, $y);
2685 2813
2814 # if exit is damned, update players death & WoR home-position
2815 $self->contr->savebed ($map, $x, $y)
2816 if $exit->flag (cf::FLAG_DAMNED);
2817
2686 1; 2818 1
2687 }) { 2819 }) {
2688 $self->message ("Something went wrong deep within the crossfire server. " 2820 $self->message ("Something went wrong deep within the deliantra server. "
2689 . "I'll try to bring you back to the map you were before. " 2821 . "I'll try to bring you back to the map you were before. "
2690 . "Please report this to the dungeon master!", 2822 . "Please report this to the dungeon master!",
2691 cf::NDI_UNIQUE | cf::NDI_RED); 2823 cf::NDI_UNIQUE | cf::NDI_RED);
2692 2824
2693 warn "ERROR in enter_exit: $@"; 2825 warn "ERROR in enter_exit: $@";
2710sub cf::client::send_drawinfo { 2842sub cf::client::send_drawinfo {
2711 my ($self, $text, $flags) = @_; 2843 my ($self, $text, $flags) = @_;
2712 2844
2713 utf8::encode $text; 2845 utf8::encode $text;
2714 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2846 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2847}
2848
2849=item $client->send_big_packet ($pkt)
2850
2851Like C<send_packet>, but tries to compress large packets, and fragments
2852them as required.
2853
2854=cut
2855
2856our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2857
2858sub cf::client::send_big_packet {
2859 my ($self, $pkt) = @_;
2860
2861 # try lzf for large packets
2862 $pkt = "lzf " . Compress::LZF::compress $pkt
2863 if 1024 <= length $pkt and $self->{can_lzf};
2864
2865 # split very large packets
2866 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2867 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2868 $pkt = "frag";
2869 }
2870
2871 $self->send_packet ($pkt);
2715} 2872}
2716 2873
2717=item $client->send_msg ($channel, $msg, $color, [extra...]) 2874=item $client->send_msg ($channel, $msg, $color, [extra...])
2718 2875
2719Send a drawinfo or msg packet to the client, formatting the msg for the 2876Send a drawinfo or msg packet to the client, formatting the msg for the
2723 2880
2724=cut 2881=cut
2725 2882
2726# non-persistent channels (usually the info channel) 2883# non-persistent channels (usually the info channel)
2727our %CHANNEL = ( 2884our %CHANNEL = (
2885 "c/motd" => {
2886 id => "infobox",
2887 title => "MOTD",
2888 reply => undef,
2889 tooltip => "The message of the day",
2890 },
2728 "c/identify" => { 2891 "c/identify" => {
2729 id => "infobox", 2892 id => "infobox",
2730 title => "Identify", 2893 title => "Identify",
2731 reply => undef, 2894 reply => undef,
2732 tooltip => "Items recently identified", 2895 tooltip => "Items recently identified",
2734 "c/examine" => { 2897 "c/examine" => {
2735 id => "infobox", 2898 id => "infobox",
2736 title => "Examine", 2899 title => "Examine",
2737 reply => undef, 2900 reply => undef,
2738 tooltip => "Signs and other items you examined", 2901 tooltip => "Signs and other items you examined",
2902 },
2903 "c/shopinfo" => {
2904 id => "infobox",
2905 title => "Shop Info",
2906 reply => undef,
2907 tooltip => "What your bargaining skill tells you about the shop",
2739 }, 2908 },
2740 "c/book" => { 2909 "c/book" => {
2741 id => "infobox", 2910 id => "infobox",
2742 title => "Book", 2911 title => "Book",
2743 reply => undef, 2912 reply => undef,
2759 id => "infobox", 2928 id => "infobox",
2760 title => "Body Parts", 2929 title => "Body Parts",
2761 reply => undef, 2930 reply => undef,
2762 tooltip => "Shows which body parts you posess and are available", 2931 tooltip => "Shows which body parts you posess and are available",
2763 }, 2932 },
2933 "c/statistics" => {
2934 id => "infobox",
2935 title => "Statistics",
2936 reply => undef,
2937 tooltip => "Shows your primary statistics",
2938 },
2939 "c/skills" => {
2940 id => "infobox",
2941 title => "Skills",
2942 reply => undef,
2943 tooltip => "Shows your experience per skill and item power",
2944 },
2945 "c/shopitems" => {
2946 id => "infobox",
2947 title => "Shop Items",
2948 reply => undef,
2949 tooltip => "Shows the items currently for sale in this shop",
2950 },
2951 "c/resistances" => {
2952 id => "infobox",
2953 title => "Resistances",
2954 reply => undef,
2955 tooltip => "Shows your resistances",
2956 },
2957 "c/pets" => {
2958 id => "infobox",
2959 title => "Pets",
2960 reply => undef,
2961 tooltip => "Shows information abotu your pets/a specific pet",
2962 },
2963 "c/perceiveself" => {
2964 id => "infobox",
2965 title => "Perceive Self",
2966 reply => undef,
2967 tooltip => "You gained detailed knowledge about yourself",
2968 },
2764 "c/uptime" => { 2969 "c/uptime" => {
2765 id => "infobox", 2970 id => "infobox",
2766 title => "Uptime", 2971 title => "Uptime",
2767 reply => undef, 2972 reply => undef,
2768 tooltip => "How long the server has been running since last restart", 2973 tooltip => "How long the server has been running since last restart",
2771 id => "infobox", 2976 id => "infobox",
2772 title => "Map Info", 2977 title => "Map Info",
2773 reply => undef, 2978 reply => undef,
2774 tooltip => "Information related to the maps", 2979 tooltip => "Information related to the maps",
2775 }, 2980 },
2981 "c/party" => {
2982 id => "party",
2983 title => "Party",
2984 reply => "gsay ",
2985 tooltip => "Messages and chat related to your party",
2986 },
2987 "c/death" => {
2988 id => "death",
2989 title => "Death",
2990 reply => undef,
2991 tooltip => "Reason for and more info about your most recent death",
2992 },
2993 "c/say" => $SAY_CHANNEL,
2994 "c/chat" => $CHAT_CHANNEL,
2776); 2995);
2777 2996
2778sub cf::client::send_msg { 2997sub cf::client::send_msg {
2779 my ($self, $channel, $msg, $color, @extra) = @_; 2998 my ($self, $channel, $msg, $color, @extra) = @_;
2780 2999
2781 $msg = $self->pl->expand_cfpod ($msg); 3000 $msg = $self->pl->expand_cfpod ($msg)
3001 unless $color & cf::NDI_VERBATIM;
2782 3002
2783 $color &= cf::NDI_CLIENT_MASK; # just in case... 3003 $color &= cf::NDI_CLIENT_MASK; # just in case...
2784 3004
2785 # check predefined channels, for the benefit of C 3005 # check predefined channels, for the benefit of C
2786 if ($CHANNEL{$channel}) { 3006 if ($CHANNEL{$channel}) {
2787 $channel = $CHANNEL{$channel}; 3007 $channel = $CHANNEL{$channel};
2788 3008
2789 $self->ext_msg (channel_info => $channel) 3009 $self->ext_msg (channel_info => $channel);
2790 if $self->can_msg;
2791
2792 $channel = $channel->{id}; 3010 $channel = $channel->{id};
2793 3011
2794 } elsif (ref $channel) { 3012 } elsif (ref $channel) {
2795 # send meta info to client, if not yet sent 3013 # send meta info to client, if not yet sent
2796 unless (exists $self->{channel}{$channel->{id}}) { 3014 unless (exists $self->{channel}{$channel->{id}}) {
2797 $self->{channel}{$channel->{id}} = $channel; 3015 $self->{channel}{$channel->{id}} = $channel;
2798 $self->ext_msg (channel_info => $channel) 3016 $self->ext_msg (channel_info => $channel);
2799 if $self->can_msg;
2800 } 3017 }
2801 3018
2802 $channel = $channel->{id}; 3019 $channel = $channel->{id};
2803 } 3020 }
2804 3021
2805 return unless @extra || length $msg; 3022 return unless @extra || length $msg;
2806 3023
2807 if ($self->can_msg) {
2808 # default colour, mask it out 3024 # default colour, mask it out
2809 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3025 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2810 if $color & cf::NDI_DEF; 3026 if $color & cf::NDI_DEF;
2811 3027
2812 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3028 my $pkt = "msg "
3029 . $self->{json_coder}->encode (
2813 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3030 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2814 } else { 3031 );
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 3032
2826 $color &= cf::NDI_COLOR_MASK; 3033 $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} 3034}
2840 3035
2841=item $client->ext_msg ($type, @msg) 3036=item $client->ext_msg ($type, @msg)
2842 3037
2843Sends an ext event to the client. 3038Sends an ext event to the client.
2846 3041
2847sub cf::client::ext_msg($$@) { 3042sub cf::client::ext_msg($$@) {
2848 my ($self, $type, @msg) = @_; 3043 my ($self, $type, @msg) = @_;
2849 3044
2850 if ($self->extcmd == 2) { 3045 if ($self->extcmd == 2) {
2851 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3046 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2852 } elsif ($self->extcmd == 1) { # TODO: remove 3047 } elsif ($self->extcmd == 1) { # TODO: remove
2853 push @msg, msgtype => "event_$type"; 3048 push @msg, msgtype => "event_$type";
2854 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3049 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2855 } 3050 }
2856} 3051}
2857 3052
2858=item $client->ext_reply ($msgid, @msg) 3053=item $client->ext_reply ($msgid, @msg)
2859 3054
2863 3058
2864sub cf::client::ext_reply($$@) { 3059sub cf::client::ext_reply($$@) {
2865 my ($self, $id, @msg) = @_; 3060 my ($self, $id, @msg) = @_;
2866 3061
2867 if ($self->extcmd == 2) { 3062 if ($self->extcmd == 2) {
2868 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3063 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2869 } elsif ($self->extcmd == 1) { 3064 } elsif ($self->extcmd == 1) {
2870 #TODO: version 1, remove 3065 #TODO: version 1, remove
2871 unshift @msg, msgtype => "reply", msgid => $id; 3066 unshift @msg, msgtype => "reply", msgid => $id;
2872 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3067 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2873 } 3068 }
2874} 3069}
2875 3070
2876=item $success = $client->query ($flags, "text", \&cb) 3071=item $success = $client->query ($flags, "text", \&cb)
2877 3072
2978 3173
2979 $coro 3174 $coro
2980} 3175}
2981 3176
2982cf::client->attach ( 3177cf::client->attach (
2983 on_destroy => sub { 3178 on_client_destroy => sub {
2984 my ($ns) = @_; 3179 my ($ns) = @_;
2985 3180
2986 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3181 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2987 }, 3182 },
2988); 3183);
3004our $safe_hole = new Safe::Hole; 3199our $safe_hole = new Safe::Hole;
3005 3200
3006$SIG{FPE} = 'IGNORE'; 3201$SIG{FPE} = 'IGNORE';
3007 3202
3008$safe->permit_only (Opcode::opset qw( 3203$safe->permit_only (Opcode::opset qw(
3009 :base_core :base_mem :base_orig :base_math 3204 :base_core :base_mem :base_orig :base_math :base_loop
3010 grepstart grepwhile mapstart mapwhile 3205 grepstart grepwhile mapstart mapwhile
3011 sort time 3206 sort time
3012)); 3207));
3013 3208
3014# here we export the classes and methods available to script code 3209# here we export the classes and methods available to script code
3017 3212
3018The following functions and methods are available within a safe environment: 3213The following functions and methods are available within a safe environment:
3019 3214
3020 cf::object 3215 cf::object
3021 contr pay_amount pay_player map x y force_find force_add destroy 3216 contr pay_amount pay_player map x y force_find force_add destroy
3022 insert remove name archname title slaying race decrease_ob_nr 3217 insert remove name archname title slaying race decrease split
3218 value
3023 3219
3024 cf::object::player 3220 cf::object::player
3025 player 3221 player
3026 3222
3027 cf::player 3223 cf::player
3032 3228
3033=cut 3229=cut
3034 3230
3035for ( 3231for (
3036 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3232 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3037 insert remove inv name archname title slaying race 3233 insert remove inv nrof name archname title slaying race
3038 decrease_ob_nr destroy)], 3234 decrease split destroy change_exp value msg lore send_msg)],
3039 ["cf::object::player" => qw(player)], 3235 ["cf::object::player" => qw(player)],
3040 ["cf::player" => qw(peaceful)], 3236 ["cf::player" => qw(peaceful send_msg)],
3041 ["cf::map" => qw(trigger)], 3237 ["cf::map" => qw(trigger)],
3042) { 3238) {
3043 no strict 'refs'; 3239 no strict 'refs';
3044 my ($pkg, @funs) = @$_; 3240 my ($pkg, @funs) = @$_;
3045 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3241 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3063 3259
3064 my $qcode = $code; 3260 my $qcode = $code;
3065 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3261 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3066 $qcode =~ s/\n/\\n/g; 3262 $qcode =~ s/\n/\\n/g;
3067 3263
3264 %vars = (_dummy => 0) unless %vars;
3265
3266 my @res;
3068 local $_; 3267 local $_;
3069 local @safe::cf::_safe_eval_args = values %vars;
3070 3268
3071 my $eval = 3269 my $eval =
3072 "do {\n" 3270 "do {\n"
3073 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3271 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3074 . "#line 0 \"{$qcode}\"\n" 3272 . "#line 0 \"{$qcode}\"\n"
3075 . $code 3273 . $code
3076 . "\n}" 3274 . "\n}"
3077 ; 3275 ;
3078 3276
3277 if ($CFG{safe_eval}) {
3079 sub_generation_inc; 3278 sub_generation_inc;
3279 local @safe::cf::_safe_eval_args = values %vars;
3080 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3280 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3081 sub_generation_inc; 3281 sub_generation_inc;
3282 } else {
3283 local @cf::_safe_eval_args = values %vars;
3284 @res = wantarray ? eval eval : scalar eval $eval;
3285 }
3082 3286
3083 if ($@) { 3287 if ($@) {
3084 warn "$@"; 3288 warn "$@";
3085 warn "while executing safe code '$code'\n"; 3289 warn "while executing safe code '$code'\n";
3086 warn "with arguments " . (join " ", %vars) . "\n"; 3290 warn "with arguments " . (join " ", %vars) . "\n";
3105=cut 3309=cut
3106 3310
3107sub register_script_function { 3311sub register_script_function {
3108 my ($fun, $cb) = @_; 3312 my ($fun, $cb) = @_;
3109 3313
3110 no strict 'refs'; 3314 $fun = "safe::$fun" if $CFG{safe_eval};
3111 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3315 *$fun = $safe_hole->wrap ($cb);
3112} 3316}
3113 3317
3114=back 3318=back
3115 3319
3116=cut 3320=cut
3137 3341
3138 $facedata->{version} == 2 3342 $facedata->{version} == 2
3139 or cf::cleanup "$path: version mismatch, cannot proceed."; 3343 or cf::cleanup "$path: version mismatch, cannot proceed.";
3140 3344
3141 # patch in the exptable 3345 # patch in the exptable
3346 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3142 $facedata->{resource}{"res/exp_table"} = { 3347 $facedata->{resource}{"res/exp_table"} = {
3143 type => FT_RSRC, 3348 type => FT_RSRC,
3144 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3349 data => $exp_table,
3350 hash => (Digest::MD5::md5 $exp_table),
3145 }; 3351 };
3146 cf::cede_to_tick; 3352 cf::cede_to_tick;
3147 3353
3148 { 3354 {
3149 my $faces = $facedata->{faceinfo}; 3355 my $faces = $facedata->{faceinfo};
3150 3356
3151 while (my ($face, $info) = each %$faces) { 3357 while (my ($face, $info) = each %$faces) {
3152 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3358 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3359
3153 cf::face::set_visibility $idx, $info->{visibility}; 3360 cf::face::set_visibility $idx, $info->{visibility};
3154 cf::face::set_magicmap $idx, $info->{magicmap}; 3361 cf::face::set_magicmap $idx, $info->{magicmap};
3155 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3362 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3156 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3363 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3157 3364
3158 cf::cede_to_tick; 3365 cf::cede_to_tick;
3159 } 3366 }
3160 3367
3161 while (my ($face, $info) = each %$faces) { 3368 while (my ($face, $info) = each %$faces) {
3162 next unless $info->{smooth}; 3369 next unless $info->{smooth};
3370
3163 my $idx = cf::face::find $face 3371 my $idx = cf::face::find $face
3164 or next; 3372 or next;
3373
3165 if (my $smooth = cf::face::find $info->{smooth}) { 3374 if (my $smooth = cf::face::find $info->{smooth}) {
3166 cf::face::set_smooth $idx, $smooth; 3375 cf::face::set_smooth $idx, $smooth;
3167 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3376 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3168 } else { 3377 } else {
3169 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3378 warn "smooth face '$info->{smooth}' not found for face '$face'";
3183 3392
3184 cf::anim::invalidate_all; # d'oh 3393 cf::anim::invalidate_all; # d'oh
3185 } 3394 }
3186 3395
3187 { 3396 {
3188 # TODO: for gcfclient pleasure, we should give resources
3189 # that gcfclient doesn't grok a >10000 face index.
3190 my $res = $facedata->{resource}; 3397 my $res = $facedata->{resource};
3191 3398
3192 my $soundconf = delete $res->{"res/sound.conf"};
3193
3194 while (my ($name, $info) = each %$res) { 3399 while (my ($name, $info) = each %$res) {
3400 if (defined $info->{type}) {
3195 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3401 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3196 my $data;
3197 3402
3198 if ($info->{type} & 1) { 3403 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3199 # prepend meta info 3404 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 { 3405 } else {
3208 $data = $info->{data}; 3406 $RESOURCE{$name} = $info;
3209 } 3407 }
3210 3408
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; 3409 cf::cede_to_tick;
3215 } 3410 }
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 } 3411 }
3412
3413 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3235 3414
3236 1 3415 1
3237} 3416}
3417
3418cf::global->attach (on_resource_update => sub {
3419 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3420 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3421
3422 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3423 my $sound = $soundconf->{compat}[$_]
3424 or next;
3425
3426 my $face = cf::face::find "sound/$sound->[1]";
3427 cf::sound::set $sound->[0] => $face;
3428 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3429 }
3430
3431 while (my ($k, $v) = each %{$soundconf->{event}}) {
3432 my $face = cf::face::find "sound/$v";
3433 cf::sound::set $k => $face;
3434 }
3435 }
3436});
3238 3437
3239register_exticmd fx_want => sub { 3438register_exticmd fx_want => sub {
3240 my ($ns, $want) = @_; 3439 my ($ns, $want) = @_;
3241 3440
3242 while (my ($k, $v) = each %$want) { 3441 while (my ($k, $v) = each %$want) {
3243 $ns->fx_want ($k, $v); 3442 $ns->fx_want ($k, $v);
3244 } 3443 }
3245}; 3444};
3445
3446sub load_resource_file($) {
3447 my $guard = lock_acquire "load_resource_file";
3448
3449 my $status = load_resource_file_ $_[0];
3450 get_slot 0.1, 100;
3451 cf::arch::commit_load;
3452
3453 $status
3454}
3246 3455
3247sub reload_regions { 3456sub reload_regions {
3248 # HACK to clear player env face cache, we need some signal framework 3457 # HACK to clear player env face cache, we need some signal framework
3249 # for this (global event?) 3458 # for this (global event?)
3250 %ext::player_env::MUSIC_FACE_CACHE = (); 3459 %ext::player_env::MUSIC_FACE_CACHE = ();
3264} 3473}
3265 3474
3266sub reload_archetypes { 3475sub reload_archetypes {
3267 load_resource_file "$DATADIR/archetypes" 3476 load_resource_file "$DATADIR/archetypes"
3268 or die "unable to load archetypes\n"; 3477 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} 3478}
3275 3479
3276sub reload_treasures { 3480sub reload_treasures {
3277 load_resource_file "$DATADIR/treasures" 3481 load_resource_file "$DATADIR/treasures"
3278 or die "unable to load treasurelists\n"; 3482 or die "unable to load treasurelists\n";
3279} 3483}
3280 3484
3281sub reload_resources { 3485sub reload_resources {
3282 warn "reloading resource files...\n"; 3486 warn "reloading resource files...\n";
3283 3487
3488 reload_facedata;
3489 reload_archetypes;
3284 reload_regions; 3490 reload_regions;
3285 reload_facedata;
3286 #reload_archetypes;#d#
3287 reload_archetypes;
3288 reload_treasures; 3491 reload_treasures;
3289 3492
3290 warn "finished reloading resource files\n"; 3493 warn "finished reloading resource files\n";
3291} 3494}
3292 3495
3293sub init {
3294 reload_resources;
3295}
3296
3297sub reload_config { 3496sub reload_config {
3497 warn "reloading config file...\n";
3498
3298 open my $fh, "<:utf8", "$CONFDIR/config" 3499 open my $fh, "<:utf8", "$CONFDIR/config"
3299 or return; 3500 or return;
3300 3501
3301 local $/; 3502 local $/;
3302 *CFG = YAML::Syck::Load <$fh>; 3503 *CFG = YAML::XS::Load scalar <$fh>;
3303 3504
3304 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3505 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3305 3506
3306 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3507 $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}; 3508 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3311 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3512 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3312 and die "WARNING: m(un)lockall failed: $!\n"; 3513 and die "WARNING: m(un)lockall failed: $!\n";
3313 }; 3514 };
3314 warn $@ if $@; 3515 warn $@ if $@;
3315 } 3516 }
3517
3518 warn "finished reloading resource files\n";
3519}
3520
3521sub pidfile() {
3522 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3523 or die "$PIDFILE: $!";
3524 flock $fh, &Fcntl::LOCK_EX
3525 or die "$PIDFILE: flock: $!";
3526 $fh
3527}
3528
3529# make sure only one server instance is running at any one time
3530sub atomic {
3531 my $fh = pidfile;
3532
3533 my $pid = <$fh>;
3534 kill 9, $pid if $pid > 0;
3535
3536 seek $fh, 0, 0;
3537 print $fh $$;
3538}
3539
3540sub main_loop {
3541 warn "EV::loop starting\n";
3542 if (1) {
3543 EV::loop;
3544 }
3545 warn "EV::loop returned\n";
3546 goto &main_loop unless $REALLY_UNLOOP;
3316} 3547}
3317 3548
3318sub main { 3549sub main {
3550 cf::init_globals; # initialise logging
3551
3552 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3553 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3554 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3555 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3556
3557 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3558
3319 # we must not ever block the main coroutine 3559 # we must not ever block the main coroutine
3320 local $Coro::idle = sub { 3560 local $Coro::idle = sub {
3321 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3561 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3322 (async { 3562 (async {
3323 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3563 $Coro::current->{desc} = "IDLE BUG HANDLER";
3324 EV::loop EV::LOOP_ONESHOT; 3564 EV::loop EV::LOOP_ONESHOT;
3325 })->prio (Coro::PRIO_MAX); 3565 })->prio (Coro::PRIO_MAX);
3326 }; 3566 };
3327 3567
3568 evthread_start IO::AIO::poll_fileno;
3569
3570 cf::sync_job {
3571 cf::init_experience;
3572 cf::init_anim;
3573 cf::init_attackmess;
3574 cf::init_dynamic;
3575
3576 cf::load_settings;
3577 cf::load_materials;
3578
3579 reload_resources;
3328 reload_config; 3580 reload_config;
3329 db_init; 3581 db_init;
3582
3583 cf::init_uuid;
3584 cf::init_signals;
3585 cf::init_skills;
3586
3587 cf::init_beforeplay;
3588
3589 atomic;
3590
3330 load_extensions; 3591 load_extensions;
3331 3592
3332 $TICK_WATCHER->start; 3593 utime time, time, $RUNTIMEFILE;
3333 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3594
3334 EV::loop; 3595 # no (long-running) fork's whatsoever before this point(!)
3596 use POSIX ();
3597 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3598
3599 (pop @POST_INIT)->(0) while @POST_INIT;
3600 };
3601
3602 cf::object::thawer::errors_are_fatal 0;
3603 warn "parse errors in files are no longer fatal from this point on.\n";
3604
3605 main_loop;
3335} 3606}
3336 3607
3337############################################################################# 3608#############################################################################
3338# initialisation and cleanup 3609# initialisation and cleanup
3339 3610
3340# install some emergency cleanup handlers 3611# install some emergency cleanup handlers
3341BEGIN { 3612BEGIN {
3342 our %SIGWATCHER = (); 3613 our %SIGWATCHER = ();
3343 for my $signal (qw(INT HUP TERM)) { 3614 for my $signal (qw(INT HUP TERM)) {
3344 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3615 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3345 cf::cleanup "SIG$signal"; 3616 cf::cleanup "SIG$signal";
3346 }; 3617 };
3347 } 3618 }
3348} 3619}
3349 3620
3350sub write_runtime { 3621sub write_runtime_sync {
3351 my $runtime = "$LOCALDIR/runtime"; 3622 my $t0 = AE::time;
3352 3623
3353 # first touch the runtime file to show we are still running: 3624 # first touch the runtime file to show we are still running:
3354 # the fsync below can take a very very long time. 3625 # the fsync below can take a very very long time.
3355 3626
3356 IO::AIO::aio_utime $runtime, undef, undef; 3627 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3357 3628
3358 my $guard = cf::lock_acquire "write_runtime"; 3629 my $guard = cf::lock_acquire "write_runtime";
3359 3630
3360 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3631 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3361 or return; 3632 or return;
3362 3633
3363 my $value = $cf::RUNTIME + 90 + 10; 3634 my $value = $cf::RUNTIME + 90 + 10;
3364 # 10 is the runtime save interval, for a monotonic clock 3635 # 10 is the runtime save interval, for a monotonic clock
3365 # 60 allows for the watchdog to kill the server. 3636 # 60 allows for the watchdog to kill the server.
3375 aio_utime $fh, undef, undef; 3646 aio_utime $fh, undef, undef;
3376 3647
3377 close $fh 3648 close $fh
3378 or return; 3649 or return;
3379 3650
3380 aio_rename "$runtime~", $runtime 3651 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3381 and return; 3652 and return;
3382 3653
3383 warn "runtime file written.\n"; 3654 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3384 3655
3385 1 3656 1
3657}
3658
3659our $uuid_lock;
3660our $uuid_skip;
3661
3662sub write_uuid_sync($) {
3663 $uuid_skip ||= $_[0];
3664
3665 return if $uuid_lock;
3666 local $uuid_lock = 1;
3667
3668 my $uuid = "$LOCALDIR/uuid";
3669
3670 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3671 or return;
3672
3673 my $value = uuid_seq uuid_cur;
3674
3675 unless ($value) {
3676 warn "cowardly refusing to write zero uuid value!\n";
3677 return;
3678 }
3679
3680 my $value = uuid_str $value + $uuid_skip;
3681 $uuid_skip = 0;
3682
3683 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3684 and return;
3685
3686 # always fsync - this file is important
3687 aio_fsync $fh
3688 and return;
3689
3690 close $fh
3691 or return;
3692
3693 aio_rename "$uuid~", $uuid
3694 and return;
3695
3696 warn "uuid file written ($value).\n";
3697
3698 1
3699
3700}
3701
3702sub write_uuid($$) {
3703 my ($skip, $sync) = @_;
3704
3705 $sync ? write_uuid_sync $skip
3706 : async { write_uuid_sync $skip };
3386} 3707}
3387 3708
3388sub emergency_save() { 3709sub emergency_save() {
3389 my $freeze_guard = cf::freeze_mainloop; 3710 my $freeze_guard = cf::freeze_mainloop;
3390 3711
3391 warn "enter emergency perl save\n"; 3712 warn "emergency_perl_save: enter\n";
3392 3713
3393 cf::sync_job { 3714 cf::sync_job {
3715 # this is a trade-off: we want to be very quick here, so
3716 # save all maps without fsync, and later call a global sync
3717 # (which in turn might be very very slow)
3718 local $USE_FSYNC = 0;
3719
3394 # use a peculiar iteration method to avoid tripping on perl 3720 # use a peculiar iteration method to avoid tripping on perl
3395 # refcount bugs in for. also avoids problems with players 3721 # refcount bugs in for. also avoids problems with players
3396 # and maps saved/destroyed asynchronously. 3722 # and maps saved/destroyed asynchronously.
3397 warn "begin emergency player save\n"; 3723 warn "emergency_perl_save: begin player save\n";
3398 for my $login (keys %cf::PLAYER) { 3724 for my $login (keys %cf::PLAYER) {
3399 my $pl = $cf::PLAYER{$login} or next; 3725 my $pl = $cf::PLAYER{$login} or next;
3400 $pl->valid or next; 3726 $pl->valid or next;
3401 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3727 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3402 $pl->save; 3728 $pl->save;
3403 } 3729 }
3404 warn "end emergency player save\n"; 3730 warn "emergency_perl_save: end player save\n";
3405 3731
3406 warn "begin emergency map save\n"; 3732 warn "emergency_perl_save: begin map save\n";
3407 for my $path (keys %cf::MAP) { 3733 for my $path (keys %cf::MAP) {
3408 my $map = $cf::MAP{$path} or next; 3734 my $map = $cf::MAP{$path} or next;
3409 $map->valid or next; 3735 $map->valid or next;
3410 $map->save; 3736 $map->save;
3411 } 3737 }
3412 warn "end emergency map save\n"; 3738 warn "emergency_perl_save: end map save\n";
3413 3739
3414 warn "begin emergency database checkpoint\n"; 3740 warn "emergency_perl_save: begin database checkpoint\n";
3415 BDB::db_env_txn_checkpoint $DB_ENV; 3741 BDB::db_env_txn_checkpoint $DB_ENV;
3416 warn "end emergency database checkpoint\n"; 3742 warn "emergency_perl_save: end database checkpoint\n";
3743
3744 warn "emergency_perl_save: begin write uuid\n";
3745 write_uuid_sync 1;
3746 warn "emergency_perl_save: end write uuid\n";
3417 }; 3747 };
3418 3748
3749 warn "emergency_perl_save: starting sync()\n";
3750 IO::AIO::aio_sync sub {
3751 warn "emergency_perl_save: finished sync()\n";
3752 };
3753
3419 warn "leave emergency perl save\n"; 3754 warn "emergency_perl_save: leave\n";
3420} 3755}
3421 3756
3422sub post_cleanup { 3757sub post_cleanup {
3423 my ($make_core) = @_; 3758 my ($make_core) = @_;
3424 3759
3425 warn Carp::longmess "post_cleanup backtrace" 3760 warn Carp::longmess "post_cleanup backtrace"
3426 if $make_core; 3761 if $make_core;
3762
3763 my $fh = pidfile;
3764 unlink $PIDFILE if <$fh> == $$;
3765}
3766
3767# a safer delete_package, copied from Symbol
3768sub clear_package($) {
3769 my $pkg = shift;
3770
3771 # expand to full symbol table name if needed
3772 unless ($pkg =~ /^main::.*::$/) {
3773 $pkg = "main$pkg" if $pkg =~ /^::/;
3774 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3775 $pkg .= '::' unless $pkg =~ /::$/;
3776 }
3777
3778 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3779 my $stem_symtab = *{$stem}{HASH};
3780
3781 defined $stem_symtab and exists $stem_symtab->{$leaf}
3782 or return;
3783
3784 # clear all symbols
3785 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3786 for my $name (keys %$leaf_symtab) {
3787 _gv_clear *{"$pkg$name"};
3788# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3789 }
3427} 3790}
3428 3791
3429sub do_reload_perl() { 3792sub do_reload_perl() {
3430 # can/must only be called in main 3793 # can/must only be called in main
3431 if ($Coro::current != $Coro::main) { 3794 if ($Coro::current != $Coro::main) {
3432 warn "can only reload from main coroutine"; 3795 warn "can only reload from main coroutine";
3433 return; 3796 return;
3434 } 3797 }
3435 3798
3799 return if $RELOAD++;
3800
3801 my $t1 = AE::time;
3802
3803 while ($RELOAD) {
3436 warn "reloading..."; 3804 warn "reloading...";
3437 3805
3438 warn "entering sync_job"; 3806 warn "entering sync_job";
3439 3807
3440 cf::sync_job { 3808 cf::sync_job {
3441 cf::write_runtime; # external watchdog should not bark 3809 cf::write_runtime_sync; # external watchdog should not bark
3442 cf::emergency_save; 3810 cf::emergency_save;
3443 cf::write_runtime; # external watchdog should not bark 3811 cf::write_runtime_sync; # external watchdog should not bark
3444 3812
3445 warn "syncing database to disk"; 3813 warn "syncing database to disk";
3446 BDB::db_env_txn_checkpoint $DB_ENV; 3814 BDB::db_env_txn_checkpoint $DB_ENV;
3447 3815
3448 # if anything goes wrong in here, we should simply crash as we already saved 3816 # if anything goes wrong in here, we should simply crash as we already saved
3449 3817
3450 warn "flushing outstanding aio requests"; 3818 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; 3819 while (IO::AIO::nreqs || BDB::nreqs) {
3456 warn "iterate..."; 3820 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 } 3821 }
3482 3822
3483 warn "... nuking $pkg"; 3823 warn "cancelling all extension coros";
3484 Symbol::delete_package $pkg; 3824 $_->cancel for values %EXT_CORO;
3485 } 3825 %EXT_CORO = ();
3486 3826
3487 warn "unloading all perl modules loaded from $LIBDIR"; 3827 warn "removing commands";
3488 while (my ($k, $v) = each %INC) { 3828 %COMMAND = ();
3489 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3490 3829
3830 warn "removing ext/exti commands";
3831 %EXTCMD = ();
3832 %EXTICMD = ();
3833
3834 warn "unloading/nuking all extensions";
3835 for my $pkg (@EXTS) {
3491 warn "... unloading $k"; 3836 warn "... unloading $pkg";
3492 delete $INC{$k};
3493 3837
3494 $k =~ s/\.pm$//;
3495 $k =~ s/\//::/g;
3496
3497 if (my $cb = $k->can ("unload_module")) { 3838 if (my $cb = $pkg->can ("unload")) {
3839 eval {
3498 $cb->(); 3840 $cb->($pkg);
3841 1
3842 } or warn "$pkg unloaded, but with errors: $@";
3843 }
3844
3845 warn "... clearing $pkg";
3846 clear_package $pkg;
3499 } 3847 }
3500 3848
3501 Symbol::delete_package $k; 3849 warn "unloading all perl modules loaded from $LIBDIR";
3850 while (my ($k, $v) = each %INC) {
3851 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3852
3853 warn "... unloading $k";
3854 delete $INC{$k};
3855
3856 $k =~ s/\.pm$//;
3857 $k =~ s/\//::/g;
3858
3859 if (my $cb = $k->can ("unload_module")) {
3860 $cb->();
3861 }
3862
3863 clear_package $k;
3502 } 3864 }
3503 3865
3504 warn "getting rid of safe::, as good as possible"; 3866 warn "getting rid of safe::, as good as possible";
3505 Symbol::delete_package "safe::$_" 3867 clear_package "safe::$_"
3506 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3868 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3507 3869
3508 warn "unloading cf.pm \"a bit\""; 3870 warn "unloading cf.pm \"a bit\"";
3509 delete $INC{"cf.pm"}; 3871 delete $INC{"cf.pm"};
3510 delete $INC{"cf/pod.pm"}; 3872 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3511 3873
3512 # don't, removes xs symbols, too, 3874 # don't, removes xs symbols, too,
3513 # and global variables created in xs 3875 # and global variables created in xs
3514 #Symbol::delete_package __PACKAGE__; 3876 #clear_package __PACKAGE__;
3515 3877
3516 warn "unload completed, starting to reload now"; 3878 warn "unload completed, starting to reload now";
3517 3879
3518 warn "reloading cf.pm"; 3880 warn "reloading cf.pm";
3519 require cf; 3881 require cf;
3520 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3882 cf::_connect_to_perl_1;
3521 3883
3522 warn "loading config and database again"; 3884 warn "loading config and database again";
3523 cf::reload_config; 3885 cf::reload_config;
3524 3886
3525 warn "loading extensions"; 3887 warn "loading extensions";
3526 cf::load_extensions; 3888 cf::load_extensions;
3527 3889
3890 if ($REATTACH_ON_RELOAD) {
3528 warn "reattaching attachments to objects/players"; 3891 warn "reattaching attachments to objects/players";
3529 _global_reattach; # objects, sockets 3892 _global_reattach; # objects, sockets
3530 warn "reattaching attachments to maps"; 3893 warn "reattaching attachments to maps";
3531 reattach $_ for values %MAP; 3894 reattach $_ for values %MAP;
3532 warn "reattaching attachments to players"; 3895 warn "reattaching attachments to players";
3533 reattach $_ for values %PLAYER; 3896 reattach $_ for values %PLAYER;
3897 }
3534 3898
3899 warn "running post_init jobs";
3900 (pop @POST_INIT)->(1) while @POST_INIT;
3901
3535 warn "leaving sync_job"; 3902 warn "leaving sync_job";
3536 3903
3537 1 3904 1
3538 } or do { 3905 } or do {
3539 warn $@; 3906 warn $@;
3540 warn "error while reloading, exiting."; 3907 cf::cleanup "error while reloading, exiting.";
3541 exit 1;
3542 }; 3908 };
3543 3909
3544 warn "reloaded"; 3910 warn "reloaded";
3911 --$RELOAD;
3912 }
3913
3914 $t1 = AE::time - $t1;
3915 warn "reload completed in ${t1}s\n";
3545}; 3916};
3546 3917
3547our $RELOAD_WATCHER; # used only during reload 3918our $RELOAD_WATCHER; # used only during reload
3548 3919
3549sub reload_perl() { 3920sub reload_perl() {
3550 # doing reload synchronously and two reloads happen back-to-back, 3921 # doing reload synchronously and two reloads happen back-to-back,
3551 # coro crashes during coro_state_free->destroy here. 3922 # coro crashes during coro_state_free->destroy here.
3552 3923
3924 $RELOAD_WATCHER ||= cf::async {
3925 Coro::AIO::aio_wait cache_extensions;
3926
3553 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3927 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3928 do_reload_perl;
3554 undef $RELOAD_WATCHER; 3929 undef $RELOAD_WATCHER;
3555 do_reload_perl; 3930 };
3556 }; 3931 };
3557} 3932}
3558 3933
3559register_command "reload" => sub { 3934register_command "reload" => sub {
3560 my ($who, $arg) = @_; 3935 my ($who, $arg) = @_;
3574 3949
3575our @WAIT_FOR_TICK; 3950our @WAIT_FOR_TICK;
3576our @WAIT_FOR_TICK_BEGIN; 3951our @WAIT_FOR_TICK_BEGIN;
3577 3952
3578sub wait_for_tick { 3953sub wait_for_tick {
3579 return unless $TICK_WATCHER->is_active;
3580 return if $Coro::current == $Coro::main; 3954 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3581 3955
3582 my $signal = new Coro::Signal; 3956 my $signal = new Coro::Signal;
3583 push @WAIT_FOR_TICK, $signal; 3957 push @WAIT_FOR_TICK, $signal;
3584 $signal->wait; 3958 $signal->wait;
3585} 3959}
3586 3960
3587sub wait_for_tick_begin { 3961sub wait_for_tick_begin {
3588 return unless $TICK_WATCHER->is_active;
3589 return if $Coro::current == $Coro::main; 3962 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3590 3963
3591 my $signal = new Coro::Signal; 3964 my $signal = new Coro::Signal;
3592 push @WAIT_FOR_TICK_BEGIN, $signal; 3965 push @WAIT_FOR_TICK_BEGIN, $signal;
3593 $signal->wait; 3966 $signal->wait;
3594} 3967}
3595 3968
3596$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3969sub tick {
3597 if ($Coro::current != $Coro::main) { 3970 if ($Coro::current != $Coro::main) {
3598 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3971 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3599 unless ++$bug_warning > 10; 3972 unless ++$bug_warning > 10;
3600 return; 3973 return;
3601 } 3974 }
3602 3975
3603 $NOW = $tick_start = EV::now;
3604
3605 cf::server_tick; # one server iteration 3976 cf::server_tick; # one server iteration
3606 3977
3607 $RUNTIME += $TICK; 3978 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3608 $NEXT_TICK += $TICK;
3609 3979
3610 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3980 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3611 $NEXT_RUNTIME_WRITE = $NOW + 10; 3981 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3612 Coro::async_pool { 3982 Coro::async_pool {
3613 $Coro::current->{desc} = "runtime saver"; 3983 $Coro::current->{desc} = "runtime saver";
3614 write_runtime 3984 write_runtime_sync
3615 or warn "ERROR: unable to write runtime file: $!"; 3985 or warn "ERROR: unable to write runtime file: $!";
3616 }; 3986 };
3617 } 3987 }
3618 3988
3619 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3989 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3621 } 3991 }
3622 while (my $sig = shift @WAIT_FOR_TICK) { 3992 while (my $sig = shift @WAIT_FOR_TICK) {
3623 $sig->send; 3993 $sig->send;
3624 } 3994 }
3625 3995
3626 $LOAD = ($NOW - $tick_start) / $TICK; 3996 $LOAD = ($NOW - $TICK_START) / $TICK;
3627 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3997 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3628 3998
3629 _post_tick; 3999 if (0) {
3630}; 4000 if ($NEXT_TICK) {
3631$TICK_WATCHER->priority (EV::MAXPRI); 4001 my $jitter = $TICK_START - $NEXT_TICK;
4002 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4003 warn "jitter $JITTER\n";#d#
4004 }
4005 }
4006}
3632 4007
3633{ 4008{
4009 # configure BDB
4010
3634 BDB::min_parallel 8; 4011 BDB::min_parallel 16;
3635 BDB::max_poll_time $TICK * 0.1; 4012 BDB::max_poll_reqs $TICK * 0.1;
3636 $BDB_POLL_WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb; 4013 $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 4014
3653 unless ($DB_ENV) { 4015 unless ($DB_ENV) {
3654 $DB_ENV = BDB::db_env_create; 4016 $DB_ENV = BDB::db_env_create;
3655 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4017 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3656 | BDB::LOG_AUTOREMOVE, 1); 4018 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4019 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3657 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4020 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3658 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4021 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3659 4022
3660 cf::sync_job { 4023 cf::sync_job {
3661 eval { 4024 eval {
3683 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4046 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3684 }; 4047 };
3685} 4048}
3686 4049
3687{ 4050{
4051 # configure IO::AIO
4052
3688 IO::AIO::min_parallel 8; 4053 IO::AIO::min_parallel 8;
3689
3690 undef $Coro::AIO::WATCHER;
3691 IO::AIO::max_poll_time $TICK * 0.1; 4054 IO::AIO::max_poll_time $TICK * 0.1;
3692 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb; 4055 undef $AnyEvent::AIO::WATCHER;
3693} 4056}
3694 4057
3695my $_log_backtrace; 4058my $_log_backtrace;
3696 4059
3697sub _log_backtrace { 4060sub _log_backtrace {
3700 $msg =~ s/\n//; 4063 $msg =~ s/\n//;
3701 4064
3702 # limit the # of concurrent backtraces 4065 # limit the # of concurrent backtraces
3703 if ($_log_backtrace < 2) { 4066 if ($_log_backtrace < 2) {
3704 ++$_log_backtrace; 4067 ++$_log_backtrace;
4068 my $perl_bt = Carp::longmess $msg;
3705 async { 4069 async {
3706 $Coro::current->{desc} = "abt $msg"; 4070 $Coro::current->{desc} = "abt $msg";
3707 4071
3708 my @bt = fork_call { 4072 my @bt = fork_call {
3709 @addr = map { sprintf "%x", $_ } @addr; 4073 @addr = map { sprintf "%x", $_ } @addr;
3720 } 4084 }
3721 4085
3722 @funcs 4086 @funcs
3723 }; 4087 };
3724 4088
3725 LOG llevInfo, "[ABT] $msg\n"; 4089 LOG llevInfo, "[ABT] $perl_bt\n";
4090 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3726 LOG llevInfo, "[ABT] $_\n" for @bt; 4091 LOG llevInfo, "[ABT] $_\n" for @bt;
3727 --$_log_backtrace; 4092 --$_log_backtrace;
3728 }; 4093 };
3729 } else { 4094 } else {
3730 LOG llevInfo, "[ABT] $msg\n"; 4095 LOG llevInfo, "[ABT] $msg\n";
3731 LOG llevInfo, "[ABT] [suppressed]\n"; 4096 LOG llevInfo, "[ABT] [suppressed]\n";
3732 } 4097 }
3733} 4098}
3734 4099
3735# load additional modules 4100# load additional modules
3736use cf::pod; 4101require "cf/$_.pm" for @EXTRA_MODULES;
4102cf::_connect_to_perl_2;
3737 4103
3738END { cf::emergency_save } 4104END { cf::emergency_save }
3739 4105
37401 41061
3741 4107

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines