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.521 by root, Fri Apr 16 23:28:42 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
1307 warn "mandatory extension failed to load, exiting.\n"; 1442 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1308 exit 1; 1443 delete $todo{$k};
1309 } 1444 } else {
1310 1445 $done{$k} = delete $todo{$k};
1311 warn $msg; 1446 push @EXTS, $v->{pkg};
1447 $progress = 1;
1448
1449 warn "$v->{base}: extension inactive.\n"
1450 unless $active;
1312 } 1451 }
1313
1314 $done{$k} = delete $todo{$k};
1315 push @EXTS, $v->{pkg};
1316 $progress = 1;
1317 } 1452 }
1318 1453
1319 skip: 1454 unless ($progress) {
1320 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1455 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1321 unless $progress; 1456
1457 while (my ($k, $v) = each %todo) {
1458 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1459 if exists $v->{meta}{mandatory};
1460 }
1461 }
1322 } 1462 }
1323 }; 1463 };
1324} 1464}
1325 1465
1326############################################################################# 1466#############################################################################
1327 1467
1328=back 1468=back
1329 1469
1330=head2 CORE EXTENSIONS 1470=head2 CORE EXTENSIONS
1331 1471
1332Functions and methods that extend core crossfire objects. 1472Functions and methods that extend core deliantra objects.
1333 1473
1334=cut 1474=cut
1335 1475
1336package cf::player; 1476package cf::player;
1337 1477
1380 1520
1381sub exists($) { 1521sub exists($) {
1382 my ($login) = @_; 1522 my ($login) = @_;
1383 1523
1384 $cf::PLAYER{$login} 1524 $cf::PLAYER{$login}
1385 or cf::sync_job { !aio_stat path $login } 1525 or !aio_stat path $login
1386} 1526}
1387 1527
1388sub find($) { 1528sub find($) {
1389 return $cf::PLAYER{$_[0]} || do { 1529 return $cf::PLAYER{$_[0]} || do {
1390 my $login = $_[0]; 1530 my $login = $_[0];
1402 my $f = new_from_file cf::object::thawer path $login 1542 my $f = new_from_file cf::object::thawer path $login
1403 or return; 1543 or return;
1404 1544
1405 my $pl = cf::player::load_pl $f 1545 my $pl = cf::player::load_pl $f
1406 or return; 1546 or return;
1547
1407 local $cf::PLAYER_LOADING{$login} = $pl; 1548 local $cf::PLAYER_LOADING{$login} = $pl;
1408 $f->resolve_delayed_derefs; 1549 $f->resolve_delayed_derefs;
1409 $cf::PLAYER{$login} = $pl 1550 $cf::PLAYER{$login} = $pl
1410 } 1551 }
1411 } 1552 }
1412} 1553}
1413 1554
1555cf::player->attach (
1556 on_load => sub {
1557 my ($pl, $path) = @_;
1558
1559 # restore slots saved in save, below
1560 my $slots = delete $pl->{_slots};
1561
1562 $pl->ob->current_weapon ($slots->[0]);
1563 $pl->combat_ob ($slots->[1]);
1564 $pl->ranged_ob ($slots->[2]);
1565 },
1566);
1567
1414sub save($) { 1568sub save($) {
1415 my ($pl) = @_; 1569 my ($pl) = @_;
1416 1570
1417 return if $pl->{deny_save}; 1571 return if $pl->{deny_save};
1418 1572
1421 1575
1422 return if $pl->{deny_save}; 1576 return if $pl->{deny_save};
1423 1577
1424 aio_mkdir playerdir $pl, 0770; 1578 aio_mkdir playerdir $pl, 0770;
1425 $pl->{last_save} = $cf::RUNTIME; 1579 $pl->{last_save} = $cf::RUNTIME;
1580
1581 cf::get_slot 0.01;
1582
1583 # save slots, to be restored later
1584 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1426 1585
1427 $pl->save_pl ($path); 1586 $pl->save_pl ($path);
1428 cf::cede_to_tick; 1587 cf::cede_to_tick;
1429} 1588}
1430 1589
1462 my ($pl) = @_; 1621 my ($pl) = @_;
1463 1622
1464 my $name = $pl->ob->name; 1623 my $name = $pl->ob->name;
1465 1624
1466 $pl->{deny_save} = 1; 1625 $pl->{deny_save} = 1;
1467 $pl->password ("*"); # this should lock out the player until we nuked the dir 1626 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1468 1627
1469 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1628 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1470 $pl->deactivate; 1629 $pl->deactivate;
1630 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1631 $pl->ob->check_score;
1471 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1632 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1472 $pl->ns->destroy if $pl->ns; 1633 $pl->ns->destroy if $pl->ns;
1473 1634
1474 my $path = playerdir $pl; 1635 my $path = playerdir $pl;
1475 my $temp = "$path~$cf::RUNTIME~deleting~"; 1636 my $temp = "$path~$cf::RUNTIME~deleting~";
1514 1675
1515 for my $login (@$dirs) { 1676 for my $login (@$dirs) {
1516 my $path = path $login; 1677 my $path = path $login;
1517 1678
1518 # a .pst is a dead give-away for a valid player 1679 # a .pst is a dead give-away for a valid player
1519 unless (-e "$path.pst") { 1680 # if no pst file found, open and chekc for blocked users
1681 if (aio_stat "$path.pst") {
1520 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1682 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1521 aio_read $fh, 0, 512, my $buf, 0 or next; 1683 aio_read $fh, 0, 512, my $buf, 0 or next;
1522 $buf !~ /^password -------------$/m or next; # official not-valid tag 1684 $buf !~ /^password -------------$/m or next; # official not-valid tag
1523 } 1685 }
1524 1686
1555 } 1717 }
1556 1718
1557 \@paths 1719 \@paths
1558} 1720}
1559 1721
1560=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1722=item $protocol_xml = $player->expand_cfpod ($cfpod)
1561 1723
1562Expand crossfire pod fragments into protocol xml. 1724Expand 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 1725
1653=item $player->ext_reply ($msgid, @msg) 1726=item $player->ext_reply ($msgid, @msg)
1654 1727
1655Sends an ext reply to the player. 1728Sends an ext reply to the player.
1656 1729
1723our $MAX_RESET = 3600; 1796our $MAX_RESET = 3600;
1724our $DEFAULT_RESET = 3000; 1797our $DEFAULT_RESET = 3000;
1725 1798
1726sub generate_random_map { 1799sub generate_random_map {
1727 my ($self, $rmp) = @_; 1800 my ($self, $rmp) = @_;
1801
1802 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1803
1728 # mit "rum" bekleckern, nicht 1804 # mit "rum" bekleckern, nicht
1729 $self->_create_random_map ( 1805 $self->_create_random_map (
1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1806 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1807 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1808 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1733 $rmp->{exit_on_final_map}, 1809 $rmp->{exit_on_final_map},
1734 $rmp->{xsize}, $rmp->{ysize}, 1810 $rmp->{xsize}, $rmp->{ysize},
1735 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1811 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1736 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1812 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1854 1930
1855# the temporary/swap location 1931# the temporary/swap location
1856sub save_path { 1932sub save_path {
1857 my ($self) = @_; 1933 my ($self) = @_;
1858 1934
1859 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1935 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1860 "$TMPDIR/$path.map" 1936 "$TMPDIR/$path.map"
1861} 1937}
1862 1938
1863# the unique path, undef == no special unique path 1939# the unique path, undef == no special unique path
1864sub uniq_path { 1940sub uniq_path {
1865 my ($self) = @_; 1941 my ($self) = @_;
1866 1942
1867 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1943 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1868 "$UNIQUEDIR/$path" 1944 "$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} 1945}
1879 1946
1880sub decay_objects { 1947sub decay_objects {
1881 my ($self) = @_; 1948 my ($self) = @_;
1882 1949
1966sub find { 2033sub find {
1967 my ($path, $origin) = @_; 2034 my ($path, $origin) = @_;
1968 2035
1969 $path = normalise $path, $origin && $origin->path; 2036 $path = normalise $path, $origin && $origin->path;
1970 2037
1971 cf::lock_wait "map_data:$path";#d#remove 2038 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1972 cf::lock_wait "map_find:$path"; 2039 my $guard2 = cf::lock_acquire "map_find:$path";
1973 2040
1974 $cf::MAP{$path} || do { 2041 $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 2042 my $map = new_from_path cf::map $path
1979 or return; 2043 or return;
1980 2044
1981 $map->{last_save} = $cf::RUNTIME; 2045 $map->{last_save} = $cf::RUNTIME;
1982 2046
1984 or return; 2048 or return;
1985 2049
1986 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2050 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1987 # doing this can freeze the server in a sync job, obviously 2051 # doing this can freeze the server in a sync job, obviously
1988 #$cf::WAIT_FOR_TICK->wait; 2052 #$cf::WAIT_FOR_TICK->wait;
2053 undef $guard2;
1989 undef $guard1; 2054 undef $guard1;
1990 undef $guard2;
1991 $map->reset; 2055 $map->reset;
1992 return find $path; 2056 return find $path;
1993 } 2057 }
1994 2058
1995 $cf::MAP{$path} = $map 2059 $cf::MAP{$path} = $map
1996 } 2060 }
1997} 2061}
1998 2062
1999sub pre_load { } 2063sub pre_load { }
2000sub post_load { } 2064#sub post_load { } # XS
2001 2065
2002sub load { 2066sub load {
2003 my ($self) = @_; 2067 my ($self) = @_;
2004 2068
2005 local $self->{deny_reset} = 1; # loading can take a long time 2069 local $self->{deny_reset} = 1; # loading can take a long time
2022 my $f = new_from_file cf::object::thawer $self->{load_path}; 2086 my $f = new_from_file cf::object::thawer $self->{load_path};
2023 $f->skip_block; 2087 $f->skip_block;
2024 $self->_load_objects ($f) 2088 $self->_load_objects ($f)
2025 or return; 2089 or return;
2026 2090
2027 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2091 $self->post_load_original
2028 if delete $self->{load_original}; 2092 if delete $self->{load_original};
2029 2093
2030 if (my $uniq = $self->uniq_path) { 2094 if (my $uniq = $self->uniq_path) {
2031 utf8::encode $uniq; 2095 utf8::encode $uniq;
2032 unless (aio_stat $uniq) { 2096 unless (aio_stat $uniq) {
2050 unless ($self->{deny_activate}) { 2114 unless ($self->{deny_activate}) {
2051 $self->decay_objects; 2115 $self->decay_objects;
2052 $self->fix_auto_apply; 2116 $self->fix_auto_apply;
2053 $self->update_buttons; 2117 $self->update_buttons;
2054 cf::cede_to_tick; 2118 cf::cede_to_tick;
2055 $self->set_darkness_map;
2056 cf::cede_to_tick;
2057 $self->activate; 2119 $self->activate;
2058 } 2120 }
2059 2121
2060 $self->{last_save} = $cf::RUNTIME; 2122 $self->{last_save} = $cf::RUNTIME;
2061 $self->last_access ($cf::RUNTIME); 2123 $self->last_access ($cf::RUNTIME);
2062 2124
2063 $self->in_memory (cf::MAP_IN_MEMORY); 2125 $self->in_memory (cf::MAP_ACTIVE);
2064 } 2126 }
2065 2127
2066 $self->post_load; 2128 $self->post_load;
2067} 2129}
2068 2130
2131# customize the map for a given player, i.e.
2132# return the _real_ map. used by e.g. per-player
2133# maps to change the path to ~playername/mappath
2069sub customise_for { 2134sub customise_for {
2070 my ($self, $ob) = @_; 2135 my ($self, $ob) = @_;
2071 2136
2072 return find "~" . $ob->name . "/" . $self->{path} 2137 return find "~" . $ob->name . "/" . $self->{path}
2073 if $self->per_player; 2138 if $self->per_player;
2126 my ($path, $origin, $load) = @_; 2191 my ($path, $origin, $load) = @_;
2127 2192
2128 $path = normalise $path, $origin && $origin->{path}; 2193 $path = normalise $path, $origin && $origin->{path};
2129 2194
2130 if (my $map = $cf::MAP{$path}) { 2195 if (my $map = $cf::MAP{$path}) {
2131 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2196 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2132 } 2197 }
2133 2198
2134 $MAP_PREFETCH{$path} |= $load; 2199 $MAP_PREFETCH{$path} |= $load;
2135 2200
2136 $MAP_PREFETCHER ||= cf::async { 2201 $MAP_PREFETCHER ||= cf::async {
2150 $MAP_PREFETCHER->prio (6); 2215 $MAP_PREFETCHER->prio (6);
2151 2216
2152 () 2217 ()
2153} 2218}
2154 2219
2220# common code, used by both ->save and ->swapout
2155sub save { 2221sub _save {
2156 my ($self) = @_; 2222 my ($self) = @_;
2157
2158 my $lock = cf::lock_acquire "map_data:$self->{path}";
2159 2223
2160 $self->{last_save} = $cf::RUNTIME; 2224 $self->{last_save} = $cf::RUNTIME;
2161 2225
2162 return unless $self->dirty; 2226 return unless $self->dirty;
2163 2227
2172 2236
2173 cf::async { 2237 cf::async {
2174 $Coro::current->{desc} = "map player save"; 2238 $Coro::current->{desc} = "map player save";
2175 $_->contr->save for $self->players; 2239 $_->contr->save for $self->players;
2176 }; 2240 };
2241
2242 cf::get_slot 0.02;
2177 2243
2178 if ($uniq) { 2244 if ($uniq) {
2179 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2180 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2246 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2181 } else { 2247 } else {
2182 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2248 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2183 } 2249 }
2184} 2250}
2185 2251
2252sub save {
2253 my ($self) = @_;
2254
2255 my $lock = cf::lock_acquire "map_data:$self->{path}";
2256
2257 $self->_save;
2258}
2259
2186sub swap_out { 2260sub swap_out {
2187 my ($self) = @_; 2261 my ($self) = @_;
2188 2262
2189 # save first because save cedes
2190 $self->save;
2191
2192 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2193 2264
2265 return if $self->in_memory != cf::MAP_ACTIVE;
2266 return if $self->{deny_save};
2194 return if $self->players; 2267 return if $self->players;
2195 return if $self->in_memory != cf::MAP_IN_MEMORY;
2196 return if $self->{deny_save};
2197 2268
2198 $self->in_memory (cf::MAP_SWAPPED); 2269 # first deactivate the map and "unlink" it from the core
2199
2200 $self->deactivate; 2270 $self->deactivate;
2201 $_->clear_links_to ($self) for values %cf::MAP; 2271 $_->clear_links_to ($self) for values %cf::MAP;
2272 $self->in_memory (cf::MAP_SWAPPED);
2273
2274 # then atomically save
2275 $self->_save;
2276
2277 # then free the map
2202 $self->clear; 2278 $self->clear;
2203} 2279}
2204 2280
2205sub reset_at { 2281sub reset_at {
2206 my ($self) = @_; 2282 my ($self) = @_;
2225 2301
2226 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2302 my $lock = cf::lock_acquire "map_data:$self->{path}";
2227 2303
2228 return if $self->players; 2304 return if $self->players;
2229 2305
2230 warn "resetting map ", $self->path; 2306 warn "resetting map ", $self->path, "\n";
2231 2307
2232 $self->in_memory (cf::MAP_SWAPPED); 2308 $self->in_memory (cf::MAP_SWAPPED);
2233 2309
2234 # need to save uniques path 2310 # need to save uniques path
2235 unless ($self->{deny_save}) { 2311 unless ($self->{deny_save}) {
2318 2394
2319sub unique_maps() { 2395sub unique_maps() {
2320 [ 2396 [
2321 map { 2397 map {
2322 utf8::decode $_; 2398 utf8::decode $_;
2323 /\.map$/ 2399 s/\.map$//; # TODO future compatibility hack
2400 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2401 ? ()
2324 ? normalise $_ 2402 : normalise $_
2325 : ()
2326 } @{ aio_readdir $UNIQUEDIR or [] } 2403 } @{ aio_readdir $UNIQUEDIR or [] }
2327 ] 2404 ]
2328} 2405}
2329 2406
2330package cf; 2407=item cf::map::static_maps
2408
2409Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2410file in the shared directory excluding F</styles> and F</editor>). May
2411block.
2412
2413=cut
2414
2415sub static_maps() {
2416 my @dirs = "";
2417 my @maps;
2418
2419 while (@dirs) {
2420 my $dir = shift @dirs;
2421
2422 next if $dir eq "/styles" || $dir eq "/editor";
2423
2424 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2425 or return;
2426
2427 for (@$files) {
2428 s/\.map$// or next;
2429 utf8::decode $_;
2430 push @maps, "$dir/$_";
2431 }
2432
2433 push @dirs, map "$dir/$_", @$dirs;
2434 }
2435
2436 \@maps
2437}
2331 2438
2332=back 2439=back
2333 2440
2334=head3 cf::object 2441=head3 cf::object
2335 2442
2339 2446
2340=over 4 2447=over 4
2341 2448
2342=item $ob->inv_recursive 2449=item $ob->inv_recursive
2343 2450
2344Returns the inventory of the object _and_ their inventories, recursively. 2451Returns the inventory of the object I<and> their inventories, recursively,
2452but I<not> the object itself.
2345 2453
2346=cut 2454=cut
2347 2455
2348sub inv_recursive_; 2456sub inv_recursive_;
2349sub inv_recursive_ { 2457sub inv_recursive_ {
2354 inv_recursive_ inv $_[0] 2462 inv_recursive_ inv $_[0]
2355} 2463}
2356 2464
2357=item $ref = $ob->ref 2465=item $ref = $ob->ref
2358 2466
2359creates and returns a persistent reference to an objetc that can be stored as a string. 2467Creates and returns a persistent reference to an object that can be stored as a string.
2360 2468
2361=item $ob = cf::object::deref ($refstring) 2469=item $ob = cf::object::deref ($refstring)
2362 2470
2363returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2471returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2364even if the object actually exists. May block. 2472even if the object actually exists. May block.
2396can be C<undef>. Does the right thing when the player is currently in a 2504can be C<undef>. Does the right thing when the player is currently in a
2397dialogue with the given NPC character. 2505dialogue with the given NPC character.
2398 2506
2399=cut 2507=cut
2400 2508
2509our $SAY_CHANNEL = {
2510 id => "say",
2511 title => "Map",
2512 reply => "say ",
2513 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2514};
2515
2516our $CHAT_CHANNEL = {
2517 id => "chat",
2518 title => "Chat",
2519 reply => "chat ",
2520 tooltip => "Player chat and shouts, global to the server.",
2521};
2522
2401# rough implementation of a future "reply" method that works 2523# rough implementation of a future "reply" method that works
2402# with dialog boxes. 2524# with dialog boxes.
2403#TODO: the first argument must go, split into a $npc->reply_to ( method 2525#TODO: the first argument must go, split into a $npc->reply_to ( method
2404sub cf::object::player::reply($$$;$) { 2526sub cf::object::player::reply($$$;$) {
2405 my ($self, $npc, $msg, $flags) = @_; 2527 my ($self, $npc, $msg, $flags) = @_;
2416 my $dialog = $pl->{npc_dialog}; 2538 my $dialog = $pl->{npc_dialog};
2417 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2539 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2418 2540
2419 } else { 2541 } else {
2420 $msg = $npc->name . " says: $msg" if $npc; 2542 $msg = $npc->name . " says: $msg" if $npc;
2421 $self->message ($msg, $flags); 2543 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2422 } 2544 }
2423 } 2545 }
2424} 2546}
2425 2547
2426=item $object->send_msg ($channel, $msg, $color, [extra...]) 2548=item $object->send_msg ($channel, $msg, $color, [extra...])
2451 2573
2452=item $player_object->enter_link 2574=item $player_object->enter_link
2453 2575
2454Freezes the player and moves him/her to a special map (C<{link}>). 2576Freezes the player and moves him/her to a special map (C<{link}>).
2455 2577
2456The player should be reasonably safe there for short amounts of time. You 2578The player should be reasonably safe there for short amounts of time (e.g.
2457I<MUST> call C<leave_link> as soon as possible, though. 2579for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2580though, as the palyer cannot control the character while it is on the link
2581map.
2458 2582
2459Will never block. 2583Will never block.
2460 2584
2461=item $player_object->leave_link ($map, $x, $y) 2585=item $player_object->leave_link ($map, $x, $y)
2462 2586
2487 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2611 return if UNIVERSAL::isa $self->map, "ext::map_link";
2488 2612
2489 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2613 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2490 if $self->map && $self->map->{path} ne "{link}"; 2614 if $self->map && $self->map->{path} ne "{link}";
2491 2615
2492 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2616 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2493} 2617}
2494 2618
2495sub cf::object::player::leave_link { 2619sub cf::object::player::leave_link {
2496 my ($self, $map, $x, $y) = @_; 2620 my ($self, $map, $x, $y) = @_;
2497 2621
2514 ($x, $y) = (-1, -1) 2638 ($x, $y) = (-1, -1)
2515 unless (defined $x) && (defined $y); 2639 unless (defined $x) && (defined $y);
2516 2640
2517 # use -1 or undef as default coordinates, not 0, 0 2641 # use -1 or undef as default coordinates, not 0, 0
2518 ($x, $y) = ($map->enter_x, $map->enter_y) 2642 ($x, $y) = ($map->enter_x, $map->enter_y)
2519 if $x <=0 && $y <= 0; 2643 if $x <= 0 && $y <= 0;
2520 2644
2521 $map->load; 2645 $map->load;
2522 $map->load_neighbours; 2646 $map->load_neighbours;
2523 2647
2524 return unless $self->contr->active; 2648 return unless $self->contr->active;
2525 $self->activate_recursive;
2526 2649
2527 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2650 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2528 $self->enter_map ($map, $x, $y); 2651 $self->enter_map ($map, $x, $y);
2652
2653 # only activate afterwards, to support waiting in hooks
2654 $self->activate_recursive;
2529} 2655}
2530 2656
2531=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2657=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2532 2658
2533Moves the player to the given map-path and coordinates by first freezing 2659Moves the player to the given map-path and coordinates by first freezing
2534her, loading and preparing them map, calling the provided $check callback 2660her, loading and preparing them map, calling the provided $check callback
2535that has to return the map if sucecssful, and then unfreezes the player on 2661that 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 2662the new (success) or old (failed) map position. In either case, $done will
2537be called at the end of this process. 2663be called at the end of this process.
2664
2665Note that $check will be called with a potentially non-loaded map, so if
2666it needs a loaded map it has to call C<< ->load >>.
2538 2667
2539=cut 2668=cut
2540 2669
2541our $GOTOGEN; 2670our $GOTOGEN;
2542 2671
2621} 2750}
2622 2751
2623sub prepare_random_map { 2752sub prepare_random_map {
2624 my ($exit) = @_; 2753 my ($exit) = @_;
2625 2754
2626 my $guard = cf::lock_acquire "exit_prepare:$exit";
2627
2628 # all this does is basically replace the /! path by 2755 # all this does is basically replace the /! path by
2629 # a new random map path (?random/...) with a seed 2756 # a new random map path (?random/...) with a seed
2630 # that depends on the exit object 2757 # that depends on the exit object
2631 2758
2632 my $rmp = parse_random_map_params $exit->msg; 2759 my $rmp = parse_random_map_params $exit->msg;
2634 if ($exit->map) { 2761 if ($exit->map) {
2635 $rmp->{region} = $exit->region->name; 2762 $rmp->{region} = $exit->region->name;
2636 $rmp->{origin_map} = $exit->map->path; 2763 $rmp->{origin_map} = $exit->map->path;
2637 $rmp->{origin_x} = $exit->x; 2764 $rmp->{origin_x} = $exit->x;
2638 $rmp->{origin_y} = $exit->y; 2765 $rmp->{origin_y} = $exit->y;
2766
2767 $exit->map->touch;
2639 } 2768 }
2640 2769
2641 $rmp->{random_seed} ||= $exit->random_seed; 2770 $rmp->{random_seed} ||= $exit->random_seed;
2642 2771
2643 my $data = cf::encode_json $rmp; 2772 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2644 my $md5 = Digest::MD5::md5_hex $data; 2773 my $md5 = Digest::MD5::md5_hex $data;
2645 my $meta = "$RANDOMDIR/$md5.meta"; 2774 my $meta = "$RANDOMDIR/$md5.meta";
2646 2775
2647 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2776 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2648 aio_write $fh, 0, (length $data), $data, 0; 2777 aio_write $fh, 0, (length $data), $data, 0;
2649 undef $fh; 2778 undef $fh;
2650 aio_rename "$meta~", $meta; 2779 aio_rename "$meta~", $meta;
2651 2780
2781 my $slaying = "?random/$md5";
2782
2783 if ($exit->valid) {
2652 $exit->slaying ("?random/$md5"); 2784 $exit->slaying ("?random/$md5");
2653 $exit->msg (undef); 2785 $exit->msg (undef);
2786 }
2654 } 2787 }
2655} 2788}
2656 2789
2657sub cf::object::player::enter_exit { 2790sub cf::object::player::enter_exit {
2658 my ($self, $exit) = @_; 2791 my ($self, $exit) = @_;
2659 2792
2660 return unless $self->type == cf::PLAYER; 2793 return unless $self->type == cf::PLAYER;
2661 2794
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; 2795 $self->enter_link;
2674 2796
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 { 2797 (async {
2680 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2798 $Coro::current->{desc} = "enter_exit";
2681 2799
2682 $self->deactivate_recursive; # just to be sure
2683 unless (eval { 2800 unless (eval {
2801 $self->deactivate_recursive; # just to be sure
2802
2803 # random map handling
2804 {
2805 my $guard = cf::lock_acquire "exit_prepare:$exit";
2806
2807 prepare_random_map $exit
2808 if $exit->slaying eq "/!";
2809 }
2810
2811 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2812 my $x = $exit->stats->hp;
2813 my $y = $exit->stats->sp;
2814
2684 $self->goto ($slaying, $hp, $sp); 2815 $self->goto ($map, $x, $y);
2685 2816
2817 # if exit is damned, update players death & WoR home-position
2818 $self->contr->savebed ($map, $x, $y)
2819 if $exit->flag (cf::FLAG_DAMNED);
2820
2686 1; 2821 1
2687 }) { 2822 }) {
2688 $self->message ("Something went wrong deep within the crossfire server. " 2823 $self->message ("Something went wrong deep within the deliantra server. "
2689 . "I'll try to bring you back to the map you were before. " 2824 . "I'll try to bring you back to the map you were before. "
2690 . "Please report this to the dungeon master!", 2825 . "Please report this to the dungeon master!",
2691 cf::NDI_UNIQUE | cf::NDI_RED); 2826 cf::NDI_UNIQUE | cf::NDI_RED);
2692 2827
2693 warn "ERROR in enter_exit: $@"; 2828 warn "ERROR in enter_exit: $@";
2710sub cf::client::send_drawinfo { 2845sub cf::client::send_drawinfo {
2711 my ($self, $text, $flags) = @_; 2846 my ($self, $text, $flags) = @_;
2712 2847
2713 utf8::encode $text; 2848 utf8::encode $text;
2714 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2849 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2850}
2851
2852=item $client->send_big_packet ($pkt)
2853
2854Like C<send_packet>, but tries to compress large packets, and fragments
2855them as required.
2856
2857=cut
2858
2859our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2860
2861sub cf::client::send_big_packet {
2862 my ($self, $pkt) = @_;
2863
2864 # try lzf for large packets
2865 $pkt = "lzf " . Compress::LZF::compress $pkt
2866 if 1024 <= length $pkt and $self->{can_lzf};
2867
2868 # split very large packets
2869 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2870 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2871 $pkt = "frag";
2872 }
2873
2874 $self->send_packet ($pkt);
2715} 2875}
2716 2876
2717=item $client->send_msg ($channel, $msg, $color, [extra...]) 2877=item $client->send_msg ($channel, $msg, $color, [extra...])
2718 2878
2719Send a drawinfo or msg packet to the client, formatting the msg for the 2879Send a drawinfo or msg packet to the client, formatting the msg for the
2723 2883
2724=cut 2884=cut
2725 2885
2726# non-persistent channels (usually the info channel) 2886# non-persistent channels (usually the info channel)
2727our %CHANNEL = ( 2887our %CHANNEL = (
2888 "c/motd" => {
2889 id => "infobox",
2890 title => "MOTD",
2891 reply => undef,
2892 tooltip => "The message of the day",
2893 },
2728 "c/identify" => { 2894 "c/identify" => {
2729 id => "infobox", 2895 id => "infobox",
2730 title => "Identify", 2896 title => "Identify",
2731 reply => undef, 2897 reply => undef,
2732 tooltip => "Items recently identified", 2898 tooltip => "Items recently identified",
2734 "c/examine" => { 2900 "c/examine" => {
2735 id => "infobox", 2901 id => "infobox",
2736 title => "Examine", 2902 title => "Examine",
2737 reply => undef, 2903 reply => undef,
2738 tooltip => "Signs and other items you examined", 2904 tooltip => "Signs and other items you examined",
2905 },
2906 "c/shopinfo" => {
2907 id => "infobox",
2908 title => "Shop Info",
2909 reply => undef,
2910 tooltip => "What your bargaining skill tells you about the shop",
2739 }, 2911 },
2740 "c/book" => { 2912 "c/book" => {
2741 id => "infobox", 2913 id => "infobox",
2742 title => "Book", 2914 title => "Book",
2743 reply => undef, 2915 reply => undef,
2759 id => "infobox", 2931 id => "infobox",
2760 title => "Body Parts", 2932 title => "Body Parts",
2761 reply => undef, 2933 reply => undef,
2762 tooltip => "Shows which body parts you posess and are available", 2934 tooltip => "Shows which body parts you posess and are available",
2763 }, 2935 },
2936 "c/statistics" => {
2937 id => "infobox",
2938 title => "Statistics",
2939 reply => undef,
2940 tooltip => "Shows your primary statistics",
2941 },
2942 "c/skills" => {
2943 id => "infobox",
2944 title => "Skills",
2945 reply => undef,
2946 tooltip => "Shows your experience per skill and item power",
2947 },
2948 "c/shopitems" => {
2949 id => "infobox",
2950 title => "Shop Items",
2951 reply => undef,
2952 tooltip => "Shows the items currently for sale in this shop",
2953 },
2954 "c/resistances" => {
2955 id => "infobox",
2956 title => "Resistances",
2957 reply => undef,
2958 tooltip => "Shows your resistances",
2959 },
2960 "c/pets" => {
2961 id => "infobox",
2962 title => "Pets",
2963 reply => undef,
2964 tooltip => "Shows information abotu your pets/a specific pet",
2965 },
2966 "c/perceiveself" => {
2967 id => "infobox",
2968 title => "Perceive Self",
2969 reply => undef,
2970 tooltip => "You gained detailed knowledge about yourself",
2971 },
2764 "c/uptime" => { 2972 "c/uptime" => {
2765 id => "infobox", 2973 id => "infobox",
2766 title => "Uptime", 2974 title => "Uptime",
2767 reply => undef, 2975 reply => undef,
2768 tooltip => "How long the server has been running since last restart", 2976 tooltip => "How long the server has been running since last restart",
2771 id => "infobox", 2979 id => "infobox",
2772 title => "Map Info", 2980 title => "Map Info",
2773 reply => undef, 2981 reply => undef,
2774 tooltip => "Information related to the maps", 2982 tooltip => "Information related to the maps",
2775 }, 2983 },
2984 "c/party" => {
2985 id => "party",
2986 title => "Party",
2987 reply => "gsay ",
2988 tooltip => "Messages and chat related to your party",
2989 },
2990 "c/death" => {
2991 id => "death",
2992 title => "Death",
2993 reply => undef,
2994 tooltip => "Reason for and more info about your most recent death",
2995 },
2996 "c/say" => $SAY_CHANNEL,
2997 "c/chat" => $CHAT_CHANNEL,
2776); 2998);
2777 2999
2778sub cf::client::send_msg { 3000sub cf::client::send_msg {
2779 my ($self, $channel, $msg, $color, @extra) = @_; 3001 my ($self, $channel, $msg, $color, @extra) = @_;
2780 3002
2781 $msg = $self->pl->expand_cfpod ($msg); 3003 $msg = $self->pl->expand_cfpod ($msg)
3004 unless $color & cf::NDI_VERBATIM;
2782 3005
2783 $color &= cf::NDI_CLIENT_MASK; # just in case... 3006 $color &= cf::NDI_CLIENT_MASK; # just in case...
2784 3007
2785 # check predefined channels, for the benefit of C 3008 # check predefined channels, for the benefit of C
2786 if ($CHANNEL{$channel}) { 3009 if ($CHANNEL{$channel}) {
2787 $channel = $CHANNEL{$channel}; 3010 $channel = $CHANNEL{$channel};
2788 3011
2789 $self->ext_msg (channel_info => $channel) 3012 $self->ext_msg (channel_info => $channel);
2790 if $self->can_msg;
2791
2792 $channel = $channel->{id}; 3013 $channel = $channel->{id};
2793 3014
2794 } elsif (ref $channel) { 3015 } elsif (ref $channel) {
2795 # send meta info to client, if not yet sent 3016 # send meta info to client, if not yet sent
2796 unless (exists $self->{channel}{$channel->{id}}) { 3017 unless (exists $self->{channel}{$channel->{id}}) {
2797 $self->{channel}{$channel->{id}} = $channel; 3018 $self->{channel}{$channel->{id}} = $channel;
2798 $self->ext_msg (channel_info => $channel) 3019 $self->ext_msg (channel_info => $channel);
2799 if $self->can_msg;
2800 } 3020 }
2801 3021
2802 $channel = $channel->{id}; 3022 $channel = $channel->{id};
2803 } 3023 }
2804 3024
2805 return unless @extra || length $msg; 3025 return unless @extra || length $msg;
2806 3026
2807 if ($self->can_msg) {
2808 # default colour, mask it out 3027 # default colour, mask it out
2809 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3028 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2810 if $color & cf::NDI_DEF; 3029 if $color & cf::NDI_DEF;
2811 3030
2812 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3031 my $pkt = "msg "
3032 . $self->{json_coder}->encode (
2813 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3033 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2814 } else { 3034 );
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 3035
2826 $color &= cf::NDI_COLOR_MASK; 3036 $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} 3037}
2840 3038
2841=item $client->ext_msg ($type, @msg) 3039=item $client->ext_msg ($type, @msg)
2842 3040
2843Sends an ext event to the client. 3041Sends an ext event to the client.
2846 3044
2847sub cf::client::ext_msg($$@) { 3045sub cf::client::ext_msg($$@) {
2848 my ($self, $type, @msg) = @_; 3046 my ($self, $type, @msg) = @_;
2849 3047
2850 if ($self->extcmd == 2) { 3048 if ($self->extcmd == 2) {
2851 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3049 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2852 } elsif ($self->extcmd == 1) { # TODO: remove 3050 } elsif ($self->extcmd == 1) { # TODO: remove
2853 push @msg, msgtype => "event_$type"; 3051 push @msg, msgtype => "event_$type";
2854 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3052 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2855 } 3053 }
2856} 3054}
2857 3055
2858=item $client->ext_reply ($msgid, @msg) 3056=item $client->ext_reply ($msgid, @msg)
2859 3057
2863 3061
2864sub cf::client::ext_reply($$@) { 3062sub cf::client::ext_reply($$@) {
2865 my ($self, $id, @msg) = @_; 3063 my ($self, $id, @msg) = @_;
2866 3064
2867 if ($self->extcmd == 2) { 3065 if ($self->extcmd == 2) {
2868 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3066 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2869 } elsif ($self->extcmd == 1) { 3067 } elsif ($self->extcmd == 1) {
2870 #TODO: version 1, remove 3068 #TODO: version 1, remove
2871 unshift @msg, msgtype => "reply", msgid => $id; 3069 unshift @msg, msgtype => "reply", msgid => $id;
2872 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3070 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2873 } 3071 }
2874} 3072}
2875 3073
2876=item $success = $client->query ($flags, "text", \&cb) 3074=item $success = $client->query ($flags, "text", \&cb)
2877 3075
2978 3176
2979 $coro 3177 $coro
2980} 3178}
2981 3179
2982cf::client->attach ( 3180cf::client->attach (
2983 on_destroy => sub { 3181 on_client_destroy => sub {
2984 my ($ns) = @_; 3182 my ($ns) = @_;
2985 3183
2986 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3184 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2987 }, 3185 },
2988); 3186);
3004our $safe_hole = new Safe::Hole; 3202our $safe_hole = new Safe::Hole;
3005 3203
3006$SIG{FPE} = 'IGNORE'; 3204$SIG{FPE} = 'IGNORE';
3007 3205
3008$safe->permit_only (Opcode::opset qw( 3206$safe->permit_only (Opcode::opset qw(
3009 :base_core :base_mem :base_orig :base_math 3207 :base_core :base_mem :base_orig :base_math :base_loop
3010 grepstart grepwhile mapstart mapwhile 3208 grepstart grepwhile mapstart mapwhile
3011 sort time 3209 sort time
3012)); 3210));
3013 3211
3014# here we export the classes and methods available to script code 3212# here we export the classes and methods available to script code
3017 3215
3018The following functions and methods are available within a safe environment: 3216The following functions and methods are available within a safe environment:
3019 3217
3020 cf::object 3218 cf::object
3021 contr pay_amount pay_player map x y force_find force_add destroy 3219 contr pay_amount pay_player map x y force_find force_add destroy
3022 insert remove name archname title slaying race decrease_ob_nr 3220 insert remove name archname title slaying race decrease split
3221 value
3023 3222
3024 cf::object::player 3223 cf::object::player
3025 player 3224 player
3026 3225
3027 cf::player 3226 cf::player
3032 3231
3033=cut 3232=cut
3034 3233
3035for ( 3234for (
3036 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3235 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3037 insert remove inv name archname title slaying race 3236 insert remove inv nrof name archname title slaying race
3038 decrease_ob_nr destroy)], 3237 decrease split destroy change_exp value msg lore send_msg)],
3039 ["cf::object::player" => qw(player)], 3238 ["cf::object::player" => qw(player)],
3040 ["cf::player" => qw(peaceful)], 3239 ["cf::player" => qw(peaceful send_msg)],
3041 ["cf::map" => qw(trigger)], 3240 ["cf::map" => qw(trigger)],
3042) { 3241) {
3043 no strict 'refs'; 3242 no strict 'refs';
3044 my ($pkg, @funs) = @$_; 3243 my ($pkg, @funs) = @$_;
3045 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3244 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3063 3262
3064 my $qcode = $code; 3263 my $qcode = $code;
3065 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3264 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3066 $qcode =~ s/\n/\\n/g; 3265 $qcode =~ s/\n/\\n/g;
3067 3266
3267 %vars = (_dummy => 0) unless %vars;
3268
3269 my @res;
3068 local $_; 3270 local $_;
3069 local @safe::cf::_safe_eval_args = values %vars;
3070 3271
3071 my $eval = 3272 my $eval =
3072 "do {\n" 3273 "do {\n"
3073 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3274 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3074 . "#line 0 \"{$qcode}\"\n" 3275 . "#line 0 \"{$qcode}\"\n"
3075 . $code 3276 . $code
3076 . "\n}" 3277 . "\n}"
3077 ; 3278 ;
3078 3279
3280 if ($CFG{safe_eval}) {
3079 sub_generation_inc; 3281 sub_generation_inc;
3282 local @safe::cf::_safe_eval_args = values %vars;
3080 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3283 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3081 sub_generation_inc; 3284 sub_generation_inc;
3285 } else {
3286 local @cf::_safe_eval_args = values %vars;
3287 @res = wantarray ? eval eval : scalar eval $eval;
3288 }
3082 3289
3083 if ($@) { 3290 if ($@) {
3084 warn "$@"; 3291 warn "$@";
3085 warn "while executing safe code '$code'\n"; 3292 warn "while executing safe code '$code'\n";
3086 warn "with arguments " . (join " ", %vars) . "\n"; 3293 warn "with arguments " . (join " ", %vars) . "\n";
3105=cut 3312=cut
3106 3313
3107sub register_script_function { 3314sub register_script_function {
3108 my ($fun, $cb) = @_; 3315 my ($fun, $cb) = @_;
3109 3316
3110 no strict 'refs'; 3317 $fun = "safe::$fun" if $CFG{safe_eval};
3111 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3318 *$fun = $safe_hole->wrap ($cb);
3112} 3319}
3113 3320
3114=back 3321=back
3115 3322
3116=cut 3323=cut
3137 3344
3138 $facedata->{version} == 2 3345 $facedata->{version} == 2
3139 or cf::cleanup "$path: version mismatch, cannot proceed."; 3346 or cf::cleanup "$path: version mismatch, cannot proceed.";
3140 3347
3141 # patch in the exptable 3348 # patch in the exptable
3349 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3142 $facedata->{resource}{"res/exp_table"} = { 3350 $facedata->{resource}{"res/exp_table"} = {
3143 type => FT_RSRC, 3351 type => FT_RSRC,
3144 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3352 data => $exp_table,
3353 hash => (Digest::MD5::md5 $exp_table),
3145 }; 3354 };
3146 cf::cede_to_tick; 3355 cf::cede_to_tick;
3147 3356
3148 { 3357 {
3149 my $faces = $facedata->{faceinfo}; 3358 my $faces = $facedata->{faceinfo};
3150 3359
3151 while (my ($face, $info) = each %$faces) { 3360 while (my ($face, $info) = each %$faces) {
3152 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3361 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3362
3153 cf::face::set_visibility $idx, $info->{visibility}; 3363 cf::face::set_visibility $idx, $info->{visibility};
3154 cf::face::set_magicmap $idx, $info->{magicmap}; 3364 cf::face::set_magicmap $idx, $info->{magicmap};
3155 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3365 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3156 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3366 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3157 3367
3158 cf::cede_to_tick; 3368 cf::cede_to_tick;
3159 } 3369 }
3160 3370
3161 while (my ($face, $info) = each %$faces) { 3371 while (my ($face, $info) = each %$faces) {
3162 next unless $info->{smooth}; 3372 next unless $info->{smooth};
3373
3163 my $idx = cf::face::find $face 3374 my $idx = cf::face::find $face
3164 or next; 3375 or next;
3376
3165 if (my $smooth = cf::face::find $info->{smooth}) { 3377 if (my $smooth = cf::face::find $info->{smooth}) {
3166 cf::face::set_smooth $idx, $smooth; 3378 cf::face::set_smooth $idx, $smooth;
3167 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3379 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3168 } else { 3380 } else {
3169 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3381 warn "smooth face '$info->{smooth}' not found for face '$face'";
3183 3395
3184 cf::anim::invalidate_all; # d'oh 3396 cf::anim::invalidate_all; # d'oh
3185 } 3397 }
3186 3398
3187 { 3399 {
3188 # TODO: for gcfclient pleasure, we should give resources
3189 # that gcfclient doesn't grok a >10000 face index.
3190 my $res = $facedata->{resource}; 3400 my $res = $facedata->{resource};
3191 3401
3192 my $soundconf = delete $res->{"res/sound.conf"};
3193
3194 while (my ($name, $info) = each %$res) { 3402 while (my ($name, $info) = each %$res) {
3403 if (defined $info->{type}) {
3195 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3404 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3196 my $data;
3197 3405
3198 if ($info->{type} & 1) { 3406 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3199 # prepend meta info 3407 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 { 3408 } else {
3208 $data = $info->{data}; 3409 $RESOURCE{$name} = $info;
3209 } 3410 }
3210 3411
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; 3412 cf::cede_to_tick;
3215 } 3413 }
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 } 3414 }
3415
3416 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3235 3417
3236 1 3418 1
3237} 3419}
3420
3421cf::global->attach (on_resource_update => sub {
3422 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3423 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3424
3425 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3426 my $sound = $soundconf->{compat}[$_]
3427 or next;
3428
3429 my $face = cf::face::find "sound/$sound->[1]";
3430 cf::sound::set $sound->[0] => $face;
3431 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3432 }
3433
3434 while (my ($k, $v) = each %{$soundconf->{event}}) {
3435 my $face = cf::face::find "sound/$v";
3436 cf::sound::set $k => $face;
3437 }
3438 }
3439});
3238 3440
3239register_exticmd fx_want => sub { 3441register_exticmd fx_want => sub {
3240 my ($ns, $want) = @_; 3442 my ($ns, $want) = @_;
3241 3443
3242 while (my ($k, $v) = each %$want) { 3444 while (my ($k, $v) = each %$want) {
3243 $ns->fx_want ($k, $v); 3445 $ns->fx_want ($k, $v);
3244 } 3446 }
3245}; 3447};
3448
3449sub load_resource_file($) {
3450 my $guard = lock_acquire "load_resource_file";
3451
3452 my $status = load_resource_file_ $_[0];
3453 get_slot 0.1, 100;
3454 cf::arch::commit_load;
3455
3456 $status
3457}
3246 3458
3247sub reload_regions { 3459sub reload_regions {
3248 # HACK to clear player env face cache, we need some signal framework 3460 # HACK to clear player env face cache, we need some signal framework
3249 # for this (global event?) 3461 # for this (global event?)
3250 %ext::player_env::MUSIC_FACE_CACHE = (); 3462 %ext::player_env::MUSIC_FACE_CACHE = ();
3264} 3476}
3265 3477
3266sub reload_archetypes { 3478sub reload_archetypes {
3267 load_resource_file "$DATADIR/archetypes" 3479 load_resource_file "$DATADIR/archetypes"
3268 or die "unable to load archetypes\n"; 3480 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} 3481}
3275 3482
3276sub reload_treasures { 3483sub reload_treasures {
3277 load_resource_file "$DATADIR/treasures" 3484 load_resource_file "$DATADIR/treasures"
3278 or die "unable to load treasurelists\n"; 3485 or die "unable to load treasurelists\n";
3279} 3486}
3280 3487
3281sub reload_resources { 3488sub reload_resources {
3282 warn "reloading resource files...\n"; 3489 warn "reloading resource files...\n";
3283 3490
3491 reload_facedata;
3492 reload_archetypes;
3284 reload_regions; 3493 reload_regions;
3285 reload_facedata;
3286 #reload_archetypes;#d#
3287 reload_archetypes;
3288 reload_treasures; 3494 reload_treasures;
3289 3495
3290 warn "finished reloading resource files\n"; 3496 warn "finished reloading resource files\n";
3291} 3497}
3292 3498
3293sub init {
3294 reload_resources;
3295}
3296
3297sub reload_config { 3499sub reload_config {
3500 warn "reloading config file...\n";
3501
3298 open my $fh, "<:utf8", "$CONFDIR/config" 3502 open my $fh, "<:utf8", "$CONFDIR/config"
3299 or return; 3503 or return;
3300 3504
3301 local $/; 3505 local $/;
3302 *CFG = YAML::Syck::Load <$fh>; 3506 *CFG = YAML::XS::Load scalar <$fh>;
3303 3507
3304 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3508 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3305 3509
3306 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3510 $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}; 3511 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3311 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3515 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3312 and die "WARNING: m(un)lockall failed: $!\n"; 3516 and die "WARNING: m(un)lockall failed: $!\n";
3313 }; 3517 };
3314 warn $@ if $@; 3518 warn $@ if $@;
3315 } 3519 }
3520
3521 warn "finished reloading resource files\n";
3522}
3523
3524sub pidfile() {
3525 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3526 or die "$PIDFILE: $!";
3527 flock $fh, &Fcntl::LOCK_EX
3528 or die "$PIDFILE: flock: $!";
3529 $fh
3530}
3531
3532# make sure only one server instance is running at any one time
3533sub atomic {
3534 my $fh = pidfile;
3535
3536 my $pid = <$fh>;
3537 kill 9, $pid if $pid > 0;
3538
3539 seek $fh, 0, 0;
3540 print $fh $$;
3541}
3542
3543sub main_loop {
3544 warn "EV::loop starting\n";
3545 if (1) {
3546 EV::loop;
3547 }
3548 warn "EV::loop returned\n";
3549 goto &main_loop unless $REALLY_UNLOOP;
3316} 3550}
3317 3551
3318sub main { 3552sub main {
3553 cf::init_globals; # initialise logging
3554
3555 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3556 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3557 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3558 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3559
3560 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3561
3319 # we must not ever block the main coroutine 3562 # we must not ever block the main coroutine
3320 local $Coro::idle = sub { 3563 local $Coro::idle = sub {
3321 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3564 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3322 (async { 3565 (async {
3323 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3566 $Coro::current->{desc} = "IDLE BUG HANDLER";
3324 EV::loop EV::LOOP_ONESHOT; 3567 EV::loop EV::LOOP_ONESHOT;
3325 })->prio (Coro::PRIO_MAX); 3568 })->prio (Coro::PRIO_MAX);
3326 }; 3569 };
3327 3570
3571 evthread_start IO::AIO::poll_fileno;
3572
3573 cf::sync_job {
3574 cf::init_experience;
3575 cf::init_anim;
3576 cf::init_attackmess;
3577 cf::init_dynamic;
3578
3579 cf::load_settings;
3580 cf::load_materials;
3581
3582 reload_resources;
3328 reload_config; 3583 reload_config;
3329 db_init; 3584 db_init;
3585
3586 cf::init_uuid;
3587 cf::init_signals;
3588 cf::init_skills;
3589
3590 cf::init_beforeplay;
3591
3592 atomic;
3593
3330 load_extensions; 3594 load_extensions;
3331 3595
3332 $TICK_WATCHER->start; 3596 utime time, time, $RUNTIMEFILE;
3333 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3597
3334 EV::loop; 3598 # no (long-running) fork's whatsoever before this point(!)
3599 use POSIX ();
3600 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3601
3602 (pop @POST_INIT)->(0) while @POST_INIT;
3603 };
3604
3605 cf::object::thawer::errors_are_fatal 0;
3606 warn "parse errors in files are no longer fatal from this point on.\n";
3607
3608 main_loop;
3335} 3609}
3336 3610
3337############################################################################# 3611#############################################################################
3338# initialisation and cleanup 3612# initialisation and cleanup
3339 3613
3340# install some emergency cleanup handlers 3614# install some emergency cleanup handlers
3341BEGIN { 3615BEGIN {
3342 our %SIGWATCHER = (); 3616 our %SIGWATCHER = ();
3343 for my $signal (qw(INT HUP TERM)) { 3617 for my $signal (qw(INT HUP TERM)) {
3344 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3618 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3345 cf::cleanup "SIG$signal"; 3619 cf::cleanup "SIG$signal";
3346 }; 3620 };
3347 } 3621 }
3348} 3622}
3349 3623
3350sub write_runtime { 3624sub write_runtime_sync {
3351 my $runtime = "$LOCALDIR/runtime"; 3625 my $t0 = AE::time;
3352 3626
3353 # first touch the runtime file to show we are still running: 3627 # first touch the runtime file to show we are still running:
3354 # the fsync below can take a very very long time. 3628 # the fsync below can take a very very long time.
3355 3629
3356 IO::AIO::aio_utime $runtime, undef, undef; 3630 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3357 3631
3358 my $guard = cf::lock_acquire "write_runtime"; 3632 my $guard = cf::lock_acquire "write_runtime";
3359 3633
3360 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3634 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3361 or return; 3635 or return;
3362 3636
3363 my $value = $cf::RUNTIME + 90 + 10; 3637 my $value = $cf::RUNTIME + 90 + 10;
3364 # 10 is the runtime save interval, for a monotonic clock 3638 # 10 is the runtime save interval, for a monotonic clock
3365 # 60 allows for the watchdog to kill the server. 3639 # 60 allows for the watchdog to kill the server.
3375 aio_utime $fh, undef, undef; 3649 aio_utime $fh, undef, undef;
3376 3650
3377 close $fh 3651 close $fh
3378 or return; 3652 or return;
3379 3653
3380 aio_rename "$runtime~", $runtime 3654 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3381 and return; 3655 and return;
3382 3656
3383 warn "runtime file written.\n"; 3657 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3384 3658
3385 1 3659 1
3660}
3661
3662our $uuid_lock;
3663our $uuid_skip;
3664
3665sub write_uuid_sync($) {
3666 $uuid_skip ||= $_[0];
3667
3668 return if $uuid_lock;
3669 local $uuid_lock = 1;
3670
3671 my $uuid = "$LOCALDIR/uuid";
3672
3673 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3674 or return;
3675
3676 my $value = uuid_seq uuid_cur;
3677
3678 unless ($value) {
3679 warn "cowardly refusing to write zero uuid value!\n";
3680 return;
3681 }
3682
3683 my $value = uuid_str $value + $uuid_skip;
3684 $uuid_skip = 0;
3685
3686 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3687 and return;
3688
3689 # always fsync - this file is important
3690 aio_fsync $fh
3691 and return;
3692
3693 close $fh
3694 or return;
3695
3696 aio_rename "$uuid~", $uuid
3697 and return;
3698
3699 warn "uuid file written ($value).\n";
3700
3701 1
3702
3703}
3704
3705sub write_uuid($$) {
3706 my ($skip, $sync) = @_;
3707
3708 $sync ? write_uuid_sync $skip
3709 : async { write_uuid_sync $skip };
3386} 3710}
3387 3711
3388sub emergency_save() { 3712sub emergency_save() {
3389 my $freeze_guard = cf::freeze_mainloop; 3713 my $freeze_guard = cf::freeze_mainloop;
3390 3714
3391 warn "enter emergency perl save\n"; 3715 warn "emergency_perl_save: enter\n";
3392 3716
3393 cf::sync_job { 3717 cf::sync_job {
3718 # this is a trade-off: we want to be very quick here, so
3719 # save all maps without fsync, and later call a global sync
3720 # (which in turn might be very very slow)
3721 local $USE_FSYNC = 0;
3722
3394 # use a peculiar iteration method to avoid tripping on perl 3723 # use a peculiar iteration method to avoid tripping on perl
3395 # refcount bugs in for. also avoids problems with players 3724 # refcount bugs in for. also avoids problems with players
3396 # and maps saved/destroyed asynchronously. 3725 # and maps saved/destroyed asynchronously.
3397 warn "begin emergency player save\n"; 3726 warn "emergency_perl_save: begin player save\n";
3398 for my $login (keys %cf::PLAYER) { 3727 for my $login (keys %cf::PLAYER) {
3399 my $pl = $cf::PLAYER{$login} or next; 3728 my $pl = $cf::PLAYER{$login} or next;
3400 $pl->valid or next; 3729 $pl->valid or next;
3401 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3730 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3402 $pl->save; 3731 $pl->save;
3403 } 3732 }
3404 warn "end emergency player save\n"; 3733 warn "emergency_perl_save: end player save\n";
3405 3734
3406 warn "begin emergency map save\n"; 3735 warn "emergency_perl_save: begin map save\n";
3407 for my $path (keys %cf::MAP) { 3736 for my $path (keys %cf::MAP) {
3408 my $map = $cf::MAP{$path} or next; 3737 my $map = $cf::MAP{$path} or next;
3409 $map->valid or next; 3738 $map->valid or next;
3410 $map->save; 3739 $map->save;
3411 } 3740 }
3412 warn "end emergency map save\n"; 3741 warn "emergency_perl_save: end map save\n";
3413 3742
3414 warn "begin emergency database checkpoint\n"; 3743 warn "emergency_perl_save: begin database checkpoint\n";
3415 BDB::db_env_txn_checkpoint $DB_ENV; 3744 BDB::db_env_txn_checkpoint $DB_ENV;
3416 warn "end emergency database checkpoint\n"; 3745 warn "emergency_perl_save: end database checkpoint\n";
3746
3747 warn "emergency_perl_save: begin write uuid\n";
3748 write_uuid_sync 1;
3749 warn "emergency_perl_save: end write uuid\n";
3417 }; 3750 };
3418 3751
3752 warn "emergency_perl_save: starting sync()\n";
3753 IO::AIO::aio_sync sub {
3754 warn "emergency_perl_save: finished sync()\n";
3755 };
3756
3419 warn "leave emergency perl save\n"; 3757 warn "emergency_perl_save: leave\n";
3420} 3758}
3421 3759
3422sub post_cleanup { 3760sub post_cleanup {
3423 my ($make_core) = @_; 3761 my ($make_core) = @_;
3424 3762
3425 warn Carp::longmess "post_cleanup backtrace" 3763 warn Carp::longmess "post_cleanup backtrace"
3426 if $make_core; 3764 if $make_core;
3765
3766 my $fh = pidfile;
3767 unlink $PIDFILE if <$fh> == $$;
3768}
3769
3770# a safer delete_package, copied from Symbol
3771sub clear_package($) {
3772 my $pkg = shift;
3773
3774 # expand to full symbol table name if needed
3775 unless ($pkg =~ /^main::.*::$/) {
3776 $pkg = "main$pkg" if $pkg =~ /^::/;
3777 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3778 $pkg .= '::' unless $pkg =~ /::$/;
3779 }
3780
3781 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3782 my $stem_symtab = *{$stem}{HASH};
3783
3784 defined $stem_symtab and exists $stem_symtab->{$leaf}
3785 or return;
3786
3787 # clear all symbols
3788 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3789 for my $name (keys %$leaf_symtab) {
3790 _gv_clear *{"$pkg$name"};
3791# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3792 }
3427} 3793}
3428 3794
3429sub do_reload_perl() { 3795sub do_reload_perl() {
3430 # can/must only be called in main 3796 # can/must only be called in main
3431 if ($Coro::current != $Coro::main) { 3797 if ($Coro::current != $Coro::main) {
3432 warn "can only reload from main coroutine"; 3798 warn "can only reload from main coroutine";
3433 return; 3799 return;
3434 } 3800 }
3435 3801
3802 return if $RELOAD++;
3803
3804 my $t1 = AE::time;
3805
3806 while ($RELOAD) {
3436 warn "reloading..."; 3807 warn "reloading...";
3437 3808
3438 warn "entering sync_job"; 3809 warn "entering sync_job";
3439 3810
3440 cf::sync_job { 3811 cf::sync_job {
3441 cf::write_runtime; # external watchdog should not bark 3812 cf::write_runtime_sync; # external watchdog should not bark
3442 cf::emergency_save; 3813 cf::emergency_save;
3443 cf::write_runtime; # external watchdog should not bark 3814 cf::write_runtime_sync; # external watchdog should not bark
3444 3815
3445 warn "syncing database to disk"; 3816 warn "syncing database to disk";
3446 BDB::db_env_txn_checkpoint $DB_ENV; 3817 BDB::db_env_txn_checkpoint $DB_ENV;
3447 3818
3448 # if anything goes wrong in here, we should simply crash as we already saved 3819 # if anything goes wrong in here, we should simply crash as we already saved
3449 3820
3450 warn "flushing outstanding aio requests"; 3821 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; 3822 while (IO::AIO::nreqs || BDB::nreqs) {
3456 warn "iterate..."; 3823 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 } 3824 }
3482 3825
3483 warn "... nuking $pkg"; 3826 warn "cancelling all extension coros";
3484 Symbol::delete_package $pkg; 3827 $_->cancel for values %EXT_CORO;
3485 } 3828 %EXT_CORO = ();
3486 3829
3487 warn "unloading all perl modules loaded from $LIBDIR"; 3830 warn "removing commands";
3488 while (my ($k, $v) = each %INC) { 3831 %COMMAND = ();
3489 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3490 3832
3833 warn "removing ext/exti commands";
3834 %EXTCMD = ();
3835 %EXTICMD = ();
3836
3837 warn "unloading/nuking all extensions";
3838 for my $pkg (@EXTS) {
3491 warn "... unloading $k"; 3839 warn "... unloading $pkg";
3492 delete $INC{$k};
3493 3840
3494 $k =~ s/\.pm$//;
3495 $k =~ s/\//::/g;
3496
3497 if (my $cb = $k->can ("unload_module")) { 3841 if (my $cb = $pkg->can ("unload")) {
3842 eval {
3498 $cb->(); 3843 $cb->($pkg);
3844 1
3845 } or warn "$pkg unloaded, but with errors: $@";
3846 }
3847
3848 warn "... clearing $pkg";
3849 clear_package $pkg;
3499 } 3850 }
3500 3851
3501 Symbol::delete_package $k; 3852 warn "unloading all perl modules loaded from $LIBDIR";
3853 while (my ($k, $v) = each %INC) {
3854 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3855
3856 warn "... unloading $k";
3857 delete $INC{$k};
3858
3859 $k =~ s/\.pm$//;
3860 $k =~ s/\//::/g;
3861
3862 if (my $cb = $k->can ("unload_module")) {
3863 $cb->();
3864 }
3865
3866 clear_package $k;
3502 } 3867 }
3503 3868
3504 warn "getting rid of safe::, as good as possible"; 3869 warn "getting rid of safe::, as good as possible";
3505 Symbol::delete_package "safe::$_" 3870 clear_package "safe::$_"
3506 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3871 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3507 3872
3508 warn "unloading cf.pm \"a bit\""; 3873 warn "unloading cf.pm \"a bit\"";
3509 delete $INC{"cf.pm"}; 3874 delete $INC{"cf.pm"};
3510 delete $INC{"cf/pod.pm"}; 3875 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3511 3876
3512 # don't, removes xs symbols, too, 3877 # don't, removes xs symbols, too,
3513 # and global variables created in xs 3878 # and global variables created in xs
3514 #Symbol::delete_package __PACKAGE__; 3879 #clear_package __PACKAGE__;
3515 3880
3516 warn "unload completed, starting to reload now"; 3881 warn "unload completed, starting to reload now";
3517 3882
3518 warn "reloading cf.pm"; 3883 warn "reloading cf.pm";
3519 require cf; 3884 require cf;
3520 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3885 cf::_connect_to_perl_1;
3521 3886
3522 warn "loading config and database again"; 3887 warn "loading config and database again";
3523 cf::reload_config; 3888 cf::reload_config;
3524 3889
3525 warn "loading extensions"; 3890 warn "loading extensions";
3526 cf::load_extensions; 3891 cf::load_extensions;
3527 3892
3893 if ($REATTACH_ON_RELOAD) {
3528 warn "reattaching attachments to objects/players"; 3894 warn "reattaching attachments to objects/players";
3529 _global_reattach; # objects, sockets 3895 _global_reattach; # objects, sockets
3530 warn "reattaching attachments to maps"; 3896 warn "reattaching attachments to maps";
3531 reattach $_ for values %MAP; 3897 reattach $_ for values %MAP;
3532 warn "reattaching attachments to players"; 3898 warn "reattaching attachments to players";
3533 reattach $_ for values %PLAYER; 3899 reattach $_ for values %PLAYER;
3900 }
3534 3901
3902 warn "running post_init jobs";
3903 (pop @POST_INIT)->(1) while @POST_INIT;
3904
3535 warn "leaving sync_job"; 3905 warn "leaving sync_job";
3536 3906
3537 1 3907 1
3538 } or do { 3908 } or do {
3539 warn $@; 3909 warn $@;
3540 warn "error while reloading, exiting."; 3910 cf::cleanup "error while reloading, exiting.";
3541 exit 1;
3542 }; 3911 };
3543 3912
3544 warn "reloaded"; 3913 warn "reloaded";
3914 --$RELOAD;
3915 }
3916
3917 $t1 = AE::time - $t1;
3918 warn "reload completed in ${t1}s\n";
3545}; 3919};
3546 3920
3547our $RELOAD_WATCHER; # used only during reload 3921our $RELOAD_WATCHER; # used only during reload
3548 3922
3549sub reload_perl() { 3923sub reload_perl() {
3550 # doing reload synchronously and two reloads happen back-to-back, 3924 # doing reload synchronously and two reloads happen back-to-back,
3551 # coro crashes during coro_state_free->destroy here. 3925 # coro crashes during coro_state_free->destroy here.
3552 3926
3927 $RELOAD_WATCHER ||= cf::async {
3928 Coro::AIO::aio_wait cache_extensions;
3929
3553 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3930 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3931 do_reload_perl;
3554 undef $RELOAD_WATCHER; 3932 undef $RELOAD_WATCHER;
3555 do_reload_perl; 3933 };
3556 }; 3934 };
3557} 3935}
3558 3936
3559register_command "reload" => sub { 3937register_command "reload" => sub {
3560 my ($who, $arg) = @_; 3938 my ($who, $arg) = @_;
3574 3952
3575our @WAIT_FOR_TICK; 3953our @WAIT_FOR_TICK;
3576our @WAIT_FOR_TICK_BEGIN; 3954our @WAIT_FOR_TICK_BEGIN;
3577 3955
3578sub wait_for_tick { 3956sub wait_for_tick {
3579 return unless $TICK_WATCHER->is_active;
3580 return if $Coro::current == $Coro::main; 3957 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3581 3958
3582 my $signal = new Coro::Signal; 3959 my $signal = new Coro::Signal;
3583 push @WAIT_FOR_TICK, $signal; 3960 push @WAIT_FOR_TICK, $signal;
3584 $signal->wait; 3961 $signal->wait;
3585} 3962}
3586 3963
3587sub wait_for_tick_begin { 3964sub wait_for_tick_begin {
3588 return unless $TICK_WATCHER->is_active;
3589 return if $Coro::current == $Coro::main; 3965 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3590 3966
3591 my $signal = new Coro::Signal; 3967 my $signal = new Coro::Signal;
3592 push @WAIT_FOR_TICK_BEGIN, $signal; 3968 push @WAIT_FOR_TICK_BEGIN, $signal;
3593 $signal->wait; 3969 $signal->wait;
3594} 3970}
3595 3971
3596$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3972sub tick {
3597 if ($Coro::current != $Coro::main) { 3973 if ($Coro::current != $Coro::main) {
3598 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3974 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3599 unless ++$bug_warning > 10; 3975 unless ++$bug_warning > 10;
3600 return; 3976 return;
3601 } 3977 }
3602 3978
3603 $NOW = $tick_start = EV::now;
3604
3605 cf::server_tick; # one server iteration 3979 cf::server_tick; # one server iteration
3606 3980
3607 $RUNTIME += $TICK; 3981 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3608 $NEXT_TICK += $TICK;
3609 3982
3610 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3983 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3611 $NEXT_RUNTIME_WRITE = $NOW + 10; 3984 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3612 Coro::async_pool { 3985 Coro::async_pool {
3613 $Coro::current->{desc} = "runtime saver"; 3986 $Coro::current->{desc} = "runtime saver";
3614 write_runtime 3987 write_runtime_sync
3615 or warn "ERROR: unable to write runtime file: $!"; 3988 or warn "ERROR: unable to write runtime file: $!";
3616 }; 3989 };
3617 } 3990 }
3618 3991
3619 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3992 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3621 } 3994 }
3622 while (my $sig = shift @WAIT_FOR_TICK) { 3995 while (my $sig = shift @WAIT_FOR_TICK) {
3623 $sig->send; 3996 $sig->send;
3624 } 3997 }
3625 3998
3626 $LOAD = ($NOW - $tick_start) / $TICK; 3999 $LOAD = ($NOW - $TICK_START) / $TICK;
3627 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4000 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3628 4001
3629 _post_tick; 4002 if (0) {
3630}; 4003 if ($NEXT_TICK) {
3631$TICK_WATCHER->priority (EV::MAXPRI); 4004 my $jitter = $TICK_START - $NEXT_TICK;
4005 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4006 warn "jitter $JITTER\n";#d#
4007 }
4008 }
4009}
3632 4010
3633{ 4011{
4012 # configure BDB
4013
3634 BDB::min_parallel 8; 4014 BDB::min_parallel 16;
3635 BDB::max_poll_time $TICK * 0.1; 4015 BDB::max_poll_reqs $TICK * 0.1;
3636 $BDB_POLL_WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb; 4016 $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 4017
3653 unless ($DB_ENV) { 4018 unless ($DB_ENV) {
3654 $DB_ENV = BDB::db_env_create; 4019 $DB_ENV = BDB::db_env_create;
3655 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4020 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3656 | BDB::LOG_AUTOREMOVE, 1); 4021 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4022 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3657 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4023 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3658 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4024 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3659 4025
3660 cf::sync_job { 4026 cf::sync_job {
3661 eval { 4027 eval {
3683 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4049 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3684 }; 4050 };
3685} 4051}
3686 4052
3687{ 4053{
4054 # configure IO::AIO
4055
3688 IO::AIO::min_parallel 8; 4056 IO::AIO::min_parallel 8;
3689
3690 undef $Coro::AIO::WATCHER;
3691 IO::AIO::max_poll_time $TICK * 0.1; 4057 IO::AIO::max_poll_time $TICK * 0.1;
3692 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb; 4058 undef $AnyEvent::AIO::WATCHER;
3693} 4059}
3694 4060
3695my $_log_backtrace; 4061my $_log_backtrace;
3696 4062
3697sub _log_backtrace { 4063sub _log_backtrace {
3700 $msg =~ s/\n//; 4066 $msg =~ s/\n//;
3701 4067
3702 # limit the # of concurrent backtraces 4068 # limit the # of concurrent backtraces
3703 if ($_log_backtrace < 2) { 4069 if ($_log_backtrace < 2) {
3704 ++$_log_backtrace; 4070 ++$_log_backtrace;
4071 my $perl_bt = Carp::longmess $msg;
3705 async { 4072 async {
3706 $Coro::current->{desc} = "abt $msg"; 4073 $Coro::current->{desc} = "abt $msg";
3707 4074
3708 my @bt = fork_call { 4075 my @bt = fork_call {
3709 @addr = map { sprintf "%x", $_ } @addr; 4076 @addr = map { sprintf "%x", $_ } @addr;
3720 } 4087 }
3721 4088
3722 @funcs 4089 @funcs
3723 }; 4090 };
3724 4091
3725 LOG llevInfo, "[ABT] $msg\n"; 4092 LOG llevInfo, "[ABT] $perl_bt\n";
4093 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3726 LOG llevInfo, "[ABT] $_\n" for @bt; 4094 LOG llevInfo, "[ABT] $_\n" for @bt;
3727 --$_log_backtrace; 4095 --$_log_backtrace;
3728 }; 4096 };
3729 } else { 4097 } else {
3730 LOG llevInfo, "[ABT] $msg\n"; 4098 LOG llevInfo, "[ABT] $msg\n";
3731 LOG llevInfo, "[ABT] [suppressed]\n"; 4099 LOG llevInfo, "[ABT] [suppressed]\n";
3732 } 4100 }
3733} 4101}
3734 4102
3735# load additional modules 4103# load additional modules
3736use cf::pod; 4104require "cf/$_.pm" for @EXTRA_MODULES;
4105cf::_connect_to_perl_2;
3737 4106
3738END { cf::emergency_save } 4107END { cf::emergency_save }
3739 4108
37401 41091
3741 4110

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines