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.396 by root, Wed Nov 14 08:09:46 2007 UTC vs.
Revision 1.512 by root, Sun Apr 11 04:52:07 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 (); 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;
73 112
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $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 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 115our $NEXT_TICK;
79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
81 117
82our $BDB_POLL_WATCHER;
83our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
84our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
85our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
86our $DB_ENV; 121our $DB_ENV;
87 122
123our @EXTRA_MODULES = qw(pod match mapscript);
124
88our %CFG; 125our %CFG;
89 126
90our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
91our $RUNTIME; 128our $RUNTIME;
129our $NOW;
92 130
93our (%PLAYER, %PLAYER_LOADING); # all users 131our (%PLAYER, %PLAYER_LOADING); # all users
94our (%MAP, %MAP_LOADING ); # all maps 132our (%MAP, %MAP_LOADING ); # all maps
95our $LINK_MAP; # the special {link} map, which is always available 133our $LINK_MAP; # the special {link} map, which is always available
96 134
97# used to convert map paths into valid unix filenames by replacing / by ∕ 135# used to convert map paths into valid unix filenames by replacing / by ∕
98our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 136our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
99 137
100our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
101our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
140our $JITTER; # average jitter
102our $tick_start; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
142
143our @POST_INIT;
144
145our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146our $REALLY_UNLOOP; # never set to true, please :)
103 147
104binmode STDOUT; 148binmode STDOUT;
105binmode STDERR; 149binmode STDERR;
106 150
107# read virtual server time, if available 151# read virtual server time, if available
108unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 152unless ($RUNTIME || !-e $RUNTIMEFILE) {
109 open my $fh, "<", "$LOCALDIR/runtime" 153 open my $fh, "<", $RUNTIMEFILE
110 or die "unable to read runtime file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
111 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
112} 156}
157
158eval "sub TICK() { $TICK } 1" or die;
113 159
114mkdir $_ 160mkdir $_
115 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
116 162
117our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
118 164
119sub cf::map::normalise; 165sub cf::map::normalise;
166
167#############################################################################
168
169%REFLECT = ();
170for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_;
172 $REFLECT{$reflect->{class}} = $reflect;
173}
174
175# this is decidedly evil
176$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
120 177
121############################################################################# 178#############################################################################
122 179
123=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
124 181
171returns directly I<after> the tick processing (and consequently, can only wake one process 228returns 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. 229per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
173 230
174=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
175 232
176This array contains the results of the last C<invoke ()> call. When 233This 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 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
178that call. 235that call.
179 236
237=item %cf::REFLECT
238
239Contains, for each (C++) class name, a hash reference with information
240about object members (methods, scalars, arrays and flags) and other
241metadata, which is useful for introspection.
242
180=back 243=back
181 244
182=cut 245=cut
183 246
184BEGIN { 247$Coro::State::WARNHOOK = sub {
185 *CORE::GLOBAL::warn = sub {
186 my $msg = join "", @_; 248 my $msg = join "", @_;
187 249
188 $msg .= "\n" 250 $msg .= "\n"
189 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
190 252
191 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
192 254
193 LOG llevError, $msg; 255 LOG llevError, $msg;
194 }; 256};
195} 257
258$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
262
263 if ($Coro::current == $Coro::main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d#
266 }#d#
267
268 # kill coroutine otherwise
269 Coro::terminate
270};
196 271
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
207for my $pkg (qw( 282for my $pkg (qw(
208 cf::global cf::attachable 283 cf::global cf::attachable
209 cf::object cf::object::player 284 cf::object cf::object::player
210 cf::client cf::player 285 cf::client cf::player
211 cf::arch cf::living 286 cf::arch cf::living
287 cf::map cf::mapspace
212 cf::map cf::party cf::region 288 cf::party cf::region
213)) { 289)) {
214 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 291}
217 292
218$EV::DIED = sub { 293$EV::DIED = sub {
219 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
220}; 295};
221 296
222############################################################################# 297#############################################################################
223 298
224=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 321 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 322 $d
248 } || "[unable to dump $_[0]: '$@']"; 323 } || "[unable to dump $_[0]: '$@']";
249} 324}
250 325
251=item $ref = cf::from_json $json 326=item $ref = cf::decode_json $json
252 327
253Converts a JSON string into the corresponding perl data structure. 328Converts a JSON string into the corresponding perl data structure.
254 329
255=item $json = cf::to_json $ref 330=item $json = cf::encode_json $ref
256 331
257Converts a perl data structure into its JSON representation. 332Converts a perl data structure into its JSON representation.
258 333
259=cut 334=cut
260 335
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 337
263sub to_json ($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 339sub decode_json($) { $json_coder->decode ($_[0]) }
340
341=item cf::post_init { BLOCK }
342
343Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again.
345
346The cdoeblock will have a single boolean argument to indicate whether this
347is a reload or not.
348
349=cut
350
351sub post_init(&) {
352 push @POST_INIT, shift;
353}
265 354
266=item cf::lock_wait $string 355=item cf::lock_wait $string
267 356
268Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
269 358
270=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
271 360
272Wait until the given lock is available and then acquires it and returns 361Wait 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, 362a L<Guard> object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
275returned. 364returned.
276 365
277Locks are *not* recursive, locking from the same coro twice results in a 366Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro. 367deadlocked coro.
284 373
285Return true if the lock is currently active, i.e. somebody has locked it. 374Return true if the lock is currently active, i.e. somebody has locked it.
286 375
287=cut 376=cut
288 377
289our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
290our %LOCKER;#d#
291 379
292sub lock_wait($) { 380sub lock_wait($) {
293 my ($key) = @_; 381 $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} 382}
306 383
307sub lock_acquire($) { 384sub lock_acquire($) {
308 my ($key) = @_; 385 $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} 386}
322 387
323sub lock_active($) { 388sub lock_active($) {
324 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
325
326 ! ! $LOCK{$key}
327} 390}
328 391
329sub freeze_mainloop { 392sub freeze_mainloop {
330 return unless $TICK_WATCHER->is_active; 393 tick_inhibit_inc;
331 394
332 my $guard = Coro::guard { 395 &Guard::guard (\&tick_inhibit_dec);
333 $TICK_WATCHER->start;
334 };
335 $TICK_WATCHER->stop;
336 $guard
337} 396}
338 397
339=item cf::periodic $interval, $cb 398=item cf::periodic $interval, $cb
340 399
341Like EV::periodic, but randomly selects a starting point so that the actions 400Like EV::periodic, but randomly selects a starting point so that the actions
364 423
365=cut 424=cut
366 425
367our @SLOT_QUEUE; 426our @SLOT_QUEUE;
368our $SLOT_QUEUE; 427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
369 429
370$SLOT_QUEUE->cancel if $SLOT_QUEUE; 430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
371$SLOT_QUEUE = Coro::async { 431$SLOT_QUEUE = Coro::async {
372 $Coro::current->desc ("timeslot manager"); 432 $Coro::current->desc ("timeslot manager");
373 433
374 my $signal = new Coro::Signal; 434 my $signal = new Coro::Signal;
435 my $busy;
375 436
376 while () { 437 while () {
377 next_job: 438 next_job:
439
378 my $avail = cf::till_tick; 440 my $avail = cf::till_tick;
379 if ($avail > 0.01) { 441
380 for (0 .. $#SLOT_QUEUE) { 442 for (0 .. $#SLOT_QUEUE) {
381 if ($SLOT_QUEUE[$_][0] < $avail) { 443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
382 my $job = splice @SLOT_QUEUE, $_, 1, (); 445 my $job = splice @SLOT_QUEUE, $_, 1, ();
383 $job->[2]->send; 446 $job->[2]->send;
384 Coro::cede; 447 Coro::cede;
385 goto next_job; 448 goto next_job;
386 } 449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
387 } 451 }
388 } 452 }
389 453
390 if (@SLOT_QUEUE) { 454 if (@SLOT_QUEUE) {
391 # we do not use wait_for_tick() as it returns immediately when tick is inactive 455 # we do not use wait_for_tick() as it returns immediately when tick is inactive
392 push @cf::WAIT_FOR_TICK, $signal; 456 push @cf::WAIT_FOR_TICK, $signal;
393 $signal->wait; 457 $signal->wait;
394 } else { 458 } else {
459 $busy = 0;
395 Coro::schedule; 460 Coro::schedule;
396 } 461 }
397 } 462 }
398}; 463};
399 464
400sub get_slot($;$$) { 465sub get_slot($;$$) {
466 return if tick_inhibit || $Coro::current == $Coro::main;
467
401 my ($time, $pri, $name) = @_; 468 my ($time, $pri, $name) = @_;
402 469
403 $time = $TICK * .6 if $time > $TICK * .6; 470 $time = clamp $time, 0.01, $TICK * .6;
471
404 my $sig = new Coro::Signal; 472 my $sig = new Coro::Signal;
405 473
406 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
407 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
408 $SLOT_QUEUE->ready; 476 $SLOT_QUEUE->ready;
435 503
436sub sync_job(&) { 504sub sync_job(&) {
437 my ($job) = @_; 505 my ($job) = @_;
438 506
439 if ($Coro::current == $Coro::main) { 507 if ($Coro::current == $Coro::main) {
440 my $time = EV::time; 508 my $time = AE::time;
441 509
442 # this is the main coro, too bad, we have to block 510 # this is the main coro, too bad, we have to block
443 # till the operation succeeds, freezing the server :/ 511 # till the operation succeeds, freezing the server :/
444 512
445 LOG llevError, Carp::longmess "sync job";#d# 513 LOG llevError, Carp::longmess "sync job";#d#
446 514
447 # TODO: use suspend/resume instead
448 # (but this is cancel-safe)
449 my $freeze_guard = freeze_mainloop; 515 my $freeze_guard = freeze_mainloop;
450 516
451 my $busy = 1; 517 my $busy = 1;
452 my @res; 518 my @res;
453 519
464 } else { 530 } else {
465 EV::loop EV::LOOP_ONESHOT; 531 EV::loop EV::LOOP_ONESHOT;
466 } 532 }
467 } 533 }
468 534
469 $time = EV::time - $time; 535 my $time = AE::time - $time;
470 536
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 537 $TICK_START += $time; # do not account sync jobs to server load
475 538
476 wantarray ? @res : $res[0] 539 wantarray ? @res : $res[0]
477 } else { 540 } else {
478 # we are in another coroutine, how wonderful, everything just works 541 # we are in another coroutine, how wonderful, everything just works
479 542
521 reset_signals; 584 reset_signals;
522 &$cb 585 &$cb
523 }, @args; 586 }, @args;
524 587
525 wantarray ? @res : $res[-1] 588 wantarray ? @res : $res[-1]
589}
590
591=item $coin = coin_from_name $name
592
593=cut
594
595our %coin_alias = (
596 "silver" => "silvercoin",
597 "silvercoin" => "silvercoin",
598 "silvercoins" => "silvercoin",
599 "gold" => "goldcoin",
600 "goldcoin" => "goldcoin",
601 "goldcoins" => "goldcoin",
602 "platinum" => "platinacoin",
603 "platinumcoin" => "platinacoin",
604 "platinumcoins" => "platinacoin",
605 "platina" => "platinacoin",
606 "platinacoin" => "platinacoin",
607 "platinacoins" => "platinacoin",
608 "royalty" => "royalty",
609 "royalties" => "royalty",
610);
611
612sub coin_from_name($) {
613 $coin_alias{$_[0]}
614 ? cf::arch::find $coin_alias{$_[0]}
615 : undef
526} 616}
527 617
528=item $value = cf::db_get $family => $key 618=item $value = cf::db_get $family => $key
529 619
530Returns a single value from the environment database. 620Returns a single value from the environment database.
669 759
670############################################################################# 760#############################################################################
671 761
672=head2 ATTACHABLE OBJECTS 762=head2 ATTACHABLE OBJECTS
673 763
674Many objects in crossfire are so-called attachable objects. That means you can 764Many objects in deliantra are so-called attachable objects. That means you can
675attach callbacks/event handlers (a collection of which is called an "attachment") 765attach callbacks/event handlers (a collection of which is called an "attachment")
676to it. All such attachable objects support the following methods. 766to it. All such attachable objects support the following methods.
677 767
678In the following description, CLASS can be any of C<global>, C<object> 768In 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 769C<player>, C<client> or C<map> (i.e. the attachable objects in
729=item cf::CLASS::attachment $name, ... 819=item cf::CLASS::attachment $name, ...
730 820
731Register an attachment by C<$name> through which attachable objects of the 821Register an attachment by C<$name> through which attachable objects of the
732given CLASS can refer to this attachment. 822given CLASS can refer to this attachment.
733 823
734Some classes such as crossfire maps and objects can specify attachments 824Some classes such as deliantra maps and objects can specify attachments
735that are attached at load/instantiate time, thus the need for a name. 825that are attached at load/instantiate time, thus the need for a name.
736 826
737These calls expect any number of the following handler/hook descriptions: 827These calls expect any number of the following handler/hook descriptions:
738 828
739=over 4 829=over 4
967 } 1057 }
968 1058
969 0 1059 0
970} 1060}
971 1061
972=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1062=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
973 1063
974=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1064=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
975 1065
976Generate an object-specific event with the given arguments. 1066Generate an object-specific event with the given arguments.
977 1067
1030 1120
1031sub reattach { 1121sub reattach {
1032 # basically do the same as instantiate, without calling instantiate 1122 # basically do the same as instantiate, without calling instantiate
1033 my ($obj) = @_; 1123 my ($obj) = @_;
1034 1124
1125 # no longer needed after getting rid of delete_package?
1035 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1126 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1036 1127
1037 my $registry = $obj->registry; 1128 my $registry = $obj->registry;
1038 1129
1039 @$registry = (); 1130 @$registry = ();
1040 1131
1055cf::attachable->attach ( 1146cf::attachable->attach (
1056 prio => -1000000, 1147 prio => -1000000,
1057 on_instantiate => sub { 1148 on_instantiate => sub {
1058 my ($obj, $data) = @_; 1149 my ($obj, $data) = @_;
1059 1150
1060 $data = from_json $data; 1151 $data = decode_json $data;
1061 1152
1062 for (@$data) { 1153 for (@$data) {
1063 my ($name, $args) = @$_; 1154 my ($name, $args) = @$_;
1064 1155
1065 $obj->attach ($name, %{$args || {} }); 1156 $obj->attach ($name, %{$args || {} });
1086 utf8::decode (my $decname = $filename); 1177 utf8::decode (my $decname = $filename);
1087 warn sprintf "saving %s (%d,%d)\n", 1178 warn sprintf "saving %s (%d,%d)\n",
1088 $decname, length $$rdata, scalar @$objs; 1179 $decname, length $$rdata, scalar @$objs;
1089 1180
1090 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1091 chmod SAVE_MODE, $fh; 1182 aio_chmod $fh, SAVE_MODE;
1092 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1093 aio_fsync $fh if $cf::USE_FSYNC; 1184 if ($cf::USE_FSYNC) {
1185 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;
1186 aio_fsync $fh;
1187 }
1094 close $fh; 1188 aio_close $fh;
1095 1189
1096 if (@$objs) { 1190 if (@$objs) {
1097 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1191 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1098 chmod SAVE_MODE, $fh; 1192 aio_chmod $fh, SAVE_MODE;
1099 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1193 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1100 aio_write $fh, 0, (length $data), $data, 0; 1194 aio_write $fh, 0, (length $data), $data, 0;
1101 aio_fsync $fh if $cf::USE_FSYNC; 1195 if ($cf::USE_FSYNC) {
1196 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;
1197 aio_fsync $fh;
1198 }
1102 close $fh; 1199 aio_close $fh;
1103 aio_rename "$filename.pst~", "$filename.pst"; 1200 aio_rename "$filename.pst~", "$filename.pst";
1104 } 1201 }
1105 } else { 1202 } else {
1106 aio_unlink "$filename.pst"; 1203 aio_unlink "$filename.pst";
1107 } 1204 }
1108 1205
1109 aio_rename "$filename~", $filename; 1206 aio_rename "$filename~", $filename;
1207
1208 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC;
1110 } else { 1210 } else {
1111 warn "FATAL: $filename~: $!\n"; 1211 warn "unable to save objects: $filename~: $!\n";
1112 } 1212 }
1113 } else { 1213 } else {
1114 aio_unlink $filename; 1214 aio_unlink $filename;
1115 aio_unlink "$filename.pst"; 1215 aio_unlink "$filename.pst";
1116 } 1216 }
1207 my ($name, $cb) = @_; 1307 my ($name, $cb) = @_;
1208 1308
1209 $EXTICMD{$name} = $cb; 1309 $EXTICMD{$name} = $cb;
1210} 1310}
1211 1311
1312use File::Glob ();
1313
1212cf::player->attach ( 1314cf::player->attach (
1213 on_command => sub { 1315 on_unknown_command => sub {
1214 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1215 1317
1216 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
1217 or return; 1319 or return;
1218 1320
1248 1350
1249 cf::override; 1351 cf::override;
1250 }, 1352 },
1251); 1353);
1252 1354
1355# "readahead" all extensions
1356sub cache_extensions {
1357 my $grp = IO::AIO::aio_group;
1358
1359 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1360 for (grep /\.ext$/, @{$_[0]}) {
1361 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1362 }
1363 };
1364
1365 $grp
1366}
1367
1253sub load_extensions { 1368sub load_extensions {
1254 cf::sync_job { 1369 cf::sync_job {
1255 my %todo; 1370 my %todo;
1256 1371
1257 for my $path (<$LIBDIR/*.ext>) { 1372 for my $path (<$LIBDIR/*.ext>) {
1276 1391
1277 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1278 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1279 1394
1280 $ext{source} = 1395 $ext{source} =
1281 "package $pkg; use strict; use utf8;\n" 1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1282 . "#line 1 \"$path\"\n{\n" 1397 . "#line 1 \"$path\"\n{\n"
1283 . $source 1398 . $source
1284 . "\n};\n1"; 1399 . "\n};\n1";
1285 1400
1286 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
1287 } 1402 }
1288 1403
1404 my $pass = 0;
1289 my %done; 1405 my %done;
1290 while (%todo) { 1406 while (%todo) {
1291 my $progress; 1407 my $progress;
1292 1408
1409 ++$pass;
1410
1411 ext:
1293 while (my ($k, $v) = each %todo) { 1412 while (my ($k, $v) = each %todo) {
1294 for (split /,\s*/, $v->{meta}{depends}) { 1413 for (split /,\s*/, $v->{meta}{depends}) {
1295 goto skip 1414 next ext
1296 unless exists $done{$_}; 1415 unless exists $done{$_};
1297 } 1416 }
1298 1417
1299 warn "... loading '$k' into '$v->{pkg}'\n"; 1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1300 1419
1301 unless (eval $v->{source}) { 1420 my $active = eval $v->{source};
1421
1422 if (length $@) {
1302 my $msg = $@ ? "$v->{path}: $@\n" 1423 warn "$v->{path}: $@\n";
1303 : "$v->{base}: extension inactive.\n";
1304 1424
1425 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1305 if (exists $v->{meta}{mandatory}) { 1426 if exists $v->{meta}{mandatory};
1306 warn $msg; 1427 } else {
1307 warn "mandatory extension failed to load, exiting.\n"; 1428 $done{$k} = delete $todo{$k};
1308 exit 1; 1429 push @EXTS, $v->{pkg};
1309 } 1430 $progress = 1;
1310 1431
1311 warn $msg; 1432 warn "$v->{base}: extension inactive.\n"
1433 unless $active;
1312 } 1434 }
1313
1314 $done{$k} = delete $todo{$k};
1315 push @EXTS, $v->{pkg};
1316 $progress = 1;
1317 } 1435 }
1318 1436
1319 skip: 1437 unless ($progress) {
1320 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1438 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1321 unless $progress; 1439
1440 while (my ($k, $v) = each %todo) {
1441 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1442 if exists $v->{meta}{mandatory};
1443 }
1444 }
1322 } 1445 }
1323 }; 1446 };
1324} 1447}
1325 1448
1326############################################################################# 1449#############################################################################
1327 1450
1328=back 1451=back
1329 1452
1330=head2 CORE EXTENSIONS 1453=head2 CORE EXTENSIONS
1331 1454
1332Functions and methods that extend core crossfire objects. 1455Functions and methods that extend core deliantra objects.
1333 1456
1334=cut 1457=cut
1335 1458
1336package cf::player; 1459package cf::player;
1337 1460
1380 1503
1381sub exists($) { 1504sub exists($) {
1382 my ($login) = @_; 1505 my ($login) = @_;
1383 1506
1384 $cf::PLAYER{$login} 1507 $cf::PLAYER{$login}
1385 or cf::sync_job { !aio_stat path $login } 1508 or !aio_stat path $login
1386} 1509}
1387 1510
1388sub find($) { 1511sub find($) {
1389 return $cf::PLAYER{$_[0]} || do { 1512 return $cf::PLAYER{$_[0]} || do {
1390 my $login = $_[0]; 1513 my $login = $_[0];
1402 my $f = new_from_file cf::object::thawer path $login 1525 my $f = new_from_file cf::object::thawer path $login
1403 or return; 1526 or return;
1404 1527
1405 my $pl = cf::player::load_pl $f 1528 my $pl = cf::player::load_pl $f
1406 or return; 1529 or return;
1530
1407 local $cf::PLAYER_LOADING{$login} = $pl; 1531 local $cf::PLAYER_LOADING{$login} = $pl;
1408 $f->resolve_delayed_derefs; 1532 $f->resolve_delayed_derefs;
1409 $cf::PLAYER{$login} = $pl 1533 $cf::PLAYER{$login} = $pl
1410 } 1534 }
1411 } 1535 }
1412} 1536}
1413 1537
1538cf::player->attach (
1539 on_load => sub {
1540 my ($pl, $path) = @_;
1541
1542 # restore slots saved in save, below
1543 my $slots = delete $pl->{_slots};
1544
1545 $pl->ob->current_weapon ($slots->[0]);
1546 $pl->combat_ob ($slots->[1]);
1547 $pl->ranged_ob ($slots->[2]);
1548 },
1549);
1550
1414sub save($) { 1551sub save($) {
1415 my ($pl) = @_; 1552 my ($pl) = @_;
1416 1553
1417 return if $pl->{deny_save}; 1554 return if $pl->{deny_save};
1418 1555
1421 1558
1422 return if $pl->{deny_save}; 1559 return if $pl->{deny_save};
1423 1560
1424 aio_mkdir playerdir $pl, 0770; 1561 aio_mkdir playerdir $pl, 0770;
1425 $pl->{last_save} = $cf::RUNTIME; 1562 $pl->{last_save} = $cf::RUNTIME;
1563
1564 cf::get_slot 0.01;
1565
1566 # save slots, to be restored later
1567 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1426 1568
1427 $pl->save_pl ($path); 1569 $pl->save_pl ($path);
1428 cf::cede_to_tick; 1570 cf::cede_to_tick;
1429} 1571}
1430 1572
1462 my ($pl) = @_; 1604 my ($pl) = @_;
1463 1605
1464 my $name = $pl->ob->name; 1606 my $name = $pl->ob->name;
1465 1607
1466 $pl->{deny_save} = 1; 1608 $pl->{deny_save} = 1;
1467 $pl->password ("*"); # this should lock out the player until we nuked the dir 1609 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1468 1610
1469 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1611 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1470 $pl->deactivate; 1612 $pl->deactivate;
1613 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1614 $pl->ob->check_score;
1471 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1615 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1472 $pl->ns->destroy if $pl->ns; 1616 $pl->ns->destroy if $pl->ns;
1473 1617
1474 my $path = playerdir $pl; 1618 my $path = playerdir $pl;
1475 my $temp = "$path~$cf::RUNTIME~deleting~"; 1619 my $temp = "$path~$cf::RUNTIME~deleting~";
1514 1658
1515 for my $login (@$dirs) { 1659 for my $login (@$dirs) {
1516 my $path = path $login; 1660 my $path = path $login;
1517 1661
1518 # a .pst is a dead give-away for a valid player 1662 # a .pst is a dead give-away for a valid player
1519 unless (-e "$path.pst") { 1663 # if no pst file found, open and chekc for blocked users
1664 if (aio_stat "$path.pst") {
1520 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1665 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1521 aio_read $fh, 0, 512, my $buf, 0 or next; 1666 aio_read $fh, 0, 512, my $buf, 0 or next;
1522 $buf !~ /^password -------------$/m or next; # official not-valid tag 1667 $buf !~ /^password -------------$/m or next; # official not-valid tag
1523 } 1668 }
1524 1669
1555 } 1700 }
1556 1701
1557 \@paths 1702 \@paths
1558} 1703}
1559 1704
1560=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1705=item $protocol_xml = $player->expand_cfpod ($cfpod)
1561 1706
1562Expand crossfire pod fragments into protocol xml. 1707Expand 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 1708
1653=item $player->ext_reply ($msgid, @msg) 1709=item $player->ext_reply ($msgid, @msg)
1654 1710
1655Sends an ext reply to the player. 1711Sends an ext reply to the player.
1656 1712
1723our $MAX_RESET = 3600; 1779our $MAX_RESET = 3600;
1724our $DEFAULT_RESET = 3000; 1780our $DEFAULT_RESET = 3000;
1725 1781
1726sub generate_random_map { 1782sub generate_random_map {
1727 my ($self, $rmp) = @_; 1783 my ($self, $rmp) = @_;
1784
1785 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1786
1728 # mit "rum" bekleckern, nicht 1787 # mit "rum" bekleckern, nicht
1729 $self->_create_random_map ( 1788 $self->_create_random_map (
1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1733 $rmp->{exit_on_final_map}, 1792 $rmp->{exit_on_final_map},
1734 $rmp->{xsize}, $rmp->{ysize}, 1793 $rmp->{xsize}, $rmp->{ysize},
1735 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1794 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1736 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1795 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1854 1913
1855# the temporary/swap location 1914# the temporary/swap location
1856sub save_path { 1915sub save_path {
1857 my ($self) = @_; 1916 my ($self) = @_;
1858 1917
1859 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1918 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1860 "$TMPDIR/$path.map" 1919 "$TMPDIR/$path.map"
1861} 1920}
1862 1921
1863# the unique path, undef == no special unique path 1922# the unique path, undef == no special unique path
1864sub uniq_path { 1923sub uniq_path {
1865 my ($self) = @_; 1924 my ($self) = @_;
1866 1925
1867 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1868 "$UNIQUEDIR/$path" 1927 "$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} 1928}
1879 1929
1880sub decay_objects { 1930sub decay_objects {
1881 my ($self) = @_; 1931 my ($self) = @_;
1882 1932
1966sub find { 2016sub find {
1967 my ($path, $origin) = @_; 2017 my ($path, $origin) = @_;
1968 2018
1969 $path = normalise $path, $origin && $origin->path; 2019 $path = normalise $path, $origin && $origin->path;
1970 2020
1971 cf::lock_wait "map_data:$path";#d#remove 2021 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1972 cf::lock_wait "map_find:$path"; 2022 my $guard2 = cf::lock_acquire "map_find:$path";
1973 2023
1974 $cf::MAP{$path} || do { 2024 $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 2025 my $map = new_from_path cf::map $path
1979 or return; 2026 or return;
1980 2027
1981 $map->{last_save} = $cf::RUNTIME; 2028 $map->{last_save} = $cf::RUNTIME;
1982 2029
1984 or return; 2031 or return;
1985 2032
1986 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2033 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1987 # doing this can freeze the server in a sync job, obviously 2034 # doing this can freeze the server in a sync job, obviously
1988 #$cf::WAIT_FOR_TICK->wait; 2035 #$cf::WAIT_FOR_TICK->wait;
2036 undef $guard2;
1989 undef $guard1; 2037 undef $guard1;
1990 undef $guard2;
1991 $map->reset; 2038 $map->reset;
1992 return find $path; 2039 return find $path;
1993 } 2040 }
1994 2041
1995 $cf::MAP{$path} = $map 2042 $cf::MAP{$path} = $map
1996 } 2043 }
1997} 2044}
1998 2045
1999sub pre_load { } 2046sub pre_load { }
2000sub post_load { } 2047#sub post_load { } # XS
2001 2048
2002sub load { 2049sub load {
2003 my ($self) = @_; 2050 my ($self) = @_;
2004 2051
2005 local $self->{deny_reset} = 1; # loading can take a long time 2052 local $self->{deny_reset} = 1; # loading can take a long time
2022 my $f = new_from_file cf::object::thawer $self->{load_path}; 2069 my $f = new_from_file cf::object::thawer $self->{load_path};
2023 $f->skip_block; 2070 $f->skip_block;
2024 $self->_load_objects ($f) 2071 $self->_load_objects ($f)
2025 or return; 2072 or return;
2026 2073
2027 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2074 $self->post_load_original
2028 if delete $self->{load_original}; 2075 if delete $self->{load_original};
2029 2076
2030 if (my $uniq = $self->uniq_path) { 2077 if (my $uniq = $self->uniq_path) {
2031 utf8::encode $uniq; 2078 utf8::encode $uniq;
2032 unless (aio_stat $uniq) { 2079 unless (aio_stat $uniq) {
2050 unless ($self->{deny_activate}) { 2097 unless ($self->{deny_activate}) {
2051 $self->decay_objects; 2098 $self->decay_objects;
2052 $self->fix_auto_apply; 2099 $self->fix_auto_apply;
2053 $self->update_buttons; 2100 $self->update_buttons;
2054 cf::cede_to_tick; 2101 cf::cede_to_tick;
2055 $self->set_darkness_map;
2056 cf::cede_to_tick;
2057 $self->activate; 2102 $self->activate;
2058 } 2103 }
2059 2104
2060 $self->{last_save} = $cf::RUNTIME; 2105 $self->{last_save} = $cf::RUNTIME;
2061 $self->last_access ($cf::RUNTIME); 2106 $self->last_access ($cf::RUNTIME);
2062 2107
2063 $self->in_memory (cf::MAP_IN_MEMORY); 2108 $self->in_memory (cf::MAP_ACTIVE);
2064 } 2109 }
2065 2110
2066 $self->post_load; 2111 $self->post_load;
2067} 2112}
2068 2113
2114# customize the map for a given player, i.e.
2115# return the _real_ map. used by e.g. per-player
2116# maps to change the path to ~playername/mappath
2069sub customise_for { 2117sub customise_for {
2070 my ($self, $ob) = @_; 2118 my ($self, $ob) = @_;
2071 2119
2072 return find "~" . $ob->name . "/" . $self->{path} 2120 return find "~" . $ob->name . "/" . $self->{path}
2073 if $self->per_player; 2121 if $self->per_player;
2126 my ($path, $origin, $load) = @_; 2174 my ($path, $origin, $load) = @_;
2127 2175
2128 $path = normalise $path, $origin && $origin->{path}; 2176 $path = normalise $path, $origin && $origin->{path};
2129 2177
2130 if (my $map = $cf::MAP{$path}) { 2178 if (my $map = $cf::MAP{$path}) {
2131 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2179 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2132 } 2180 }
2133 2181
2134 $MAP_PREFETCH{$path} |= $load; 2182 $MAP_PREFETCH{$path} |= $load;
2135 2183
2136 $MAP_PREFETCHER ||= cf::async { 2184 $MAP_PREFETCHER ||= cf::async {
2173 cf::async { 2221 cf::async {
2174 $Coro::current->{desc} = "map player save"; 2222 $Coro::current->{desc} = "map player save";
2175 $_->contr->save for $self->players; 2223 $_->contr->save for $self->players;
2176 }; 2224 };
2177 2225
2226 cf::get_slot 0.02;
2227
2178 if ($uniq) { 2228 if ($uniq) {
2179 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2229 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2180 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2230 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2181 } else { 2231 } else {
2182 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2232 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2190 $self->save; 2240 $self->save;
2191 2241
2192 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2193 2243
2194 return if $self->players; 2244 return if $self->players;
2195 return if $self->in_memory != cf::MAP_IN_MEMORY; 2245 return if $self->in_memory != cf::MAP_ACTIVE;
2196 return if $self->{deny_save}; 2246 return if $self->{deny_save};
2197 2247
2198 $self->in_memory (cf::MAP_SWAPPED); 2248 $self->in_memory (cf::MAP_SWAPPED);
2199 2249
2200 $self->deactivate; 2250 $self->deactivate;
2225 2275
2226 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2227 2277
2228 return if $self->players; 2278 return if $self->players;
2229 2279
2230 warn "resetting map ", $self->path; 2280 warn "resetting map ", $self->path, "\n";
2231 2281
2232 $self->in_memory (cf::MAP_SWAPPED); 2282 $self->in_memory (cf::MAP_SWAPPED);
2233 2283
2234 # need to save uniques path 2284 # need to save uniques path
2235 unless ($self->{deny_save}) { 2285 unless ($self->{deny_save}) {
2318 2368
2319sub unique_maps() { 2369sub unique_maps() {
2320 [ 2370 [
2321 map { 2371 map {
2322 utf8::decode $_; 2372 utf8::decode $_;
2323 /\.map$/ 2373 s/\.map$//; # TODO future compatibility hack
2374 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2375 ? ()
2324 ? normalise $_ 2376 : normalise $_
2325 : ()
2326 } @{ aio_readdir $UNIQUEDIR or [] } 2377 } @{ aio_readdir $UNIQUEDIR or [] }
2327 ] 2378 ]
2328} 2379}
2329 2380
2330package cf; 2381=item cf::map::static_maps
2382
2383Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2384file in the shared directory excluding F</styles> and F</editor>). May
2385block.
2386
2387=cut
2388
2389sub static_maps() {
2390 my @dirs = "";
2391 my @maps;
2392
2393 while (@dirs) {
2394 my $dir = shift @dirs;
2395
2396 next if $dir eq "/styles" || $dir eq "/editor";
2397
2398 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2399 or return;
2400
2401 for (@$files) {
2402 s/\.map$// or next;
2403 utf8::decode $_;
2404 push @maps, "$dir/$_";
2405 }
2406
2407 push @dirs, map "$dir/$_", @$dirs;
2408 }
2409
2410 \@maps
2411}
2331 2412
2332=back 2413=back
2333 2414
2334=head3 cf::object 2415=head3 cf::object
2335 2416
2339 2420
2340=over 4 2421=over 4
2341 2422
2342=item $ob->inv_recursive 2423=item $ob->inv_recursive
2343 2424
2344Returns the inventory of the object _and_ their inventories, recursively. 2425Returns the inventory of the object I<and> their inventories, recursively,
2426but I<not> the object itself.
2345 2427
2346=cut 2428=cut
2347 2429
2348sub inv_recursive_; 2430sub inv_recursive_;
2349sub inv_recursive_ { 2431sub inv_recursive_ {
2354 inv_recursive_ inv $_[0] 2436 inv_recursive_ inv $_[0]
2355} 2437}
2356 2438
2357=item $ref = $ob->ref 2439=item $ref = $ob->ref
2358 2440
2359creates and returns a persistent reference to an objetc that can be stored as a string. 2441Creates and returns a persistent reference to an object that can be stored as a string.
2360 2442
2361=item $ob = cf::object::deref ($refstring) 2443=item $ob = cf::object::deref ($refstring)
2362 2444
2363returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2445returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2364even if the object actually exists. May block. 2446even if the object actually exists. May block.
2396can be C<undef>. Does the right thing when the player is currently in a 2478can be C<undef>. Does the right thing when the player is currently in a
2397dialogue with the given NPC character. 2479dialogue with the given NPC character.
2398 2480
2399=cut 2481=cut
2400 2482
2483our $SAY_CHANNEL = {
2484 id => "say",
2485 title => "Map",
2486 reply => "say ",
2487 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2488};
2489
2490our $CHAT_CHANNEL = {
2491 id => "chat",
2492 title => "Chat",
2493 reply => "chat ",
2494 tooltip => "Player chat and shouts, global to the server.",
2495};
2496
2401# rough implementation of a future "reply" method that works 2497# rough implementation of a future "reply" method that works
2402# with dialog boxes. 2498# with dialog boxes.
2403#TODO: the first argument must go, split into a $npc->reply_to ( method 2499#TODO: the first argument must go, split into a $npc->reply_to ( method
2404sub cf::object::player::reply($$$;$) { 2500sub cf::object::player::reply($$$;$) {
2405 my ($self, $npc, $msg, $flags) = @_; 2501 my ($self, $npc, $msg, $flags) = @_;
2416 my $dialog = $pl->{npc_dialog}; 2512 my $dialog = $pl->{npc_dialog};
2417 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2513 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2418 2514
2419 } else { 2515 } else {
2420 $msg = $npc->name . " says: $msg" if $npc; 2516 $msg = $npc->name . " says: $msg" if $npc;
2421 $self->message ($msg, $flags); 2517 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2422 } 2518 }
2423 } 2519 }
2424} 2520}
2425 2521
2426=item $object->send_msg ($channel, $msg, $color, [extra...]) 2522=item $object->send_msg ($channel, $msg, $color, [extra...])
2451 2547
2452=item $player_object->enter_link 2548=item $player_object->enter_link
2453 2549
2454Freezes the player and moves him/her to a special map (C<{link}>). 2550Freezes the player and moves him/her to a special map (C<{link}>).
2455 2551
2456The player should be reasonably safe there for short amounts of time. You 2552The player should be reasonably safe there for short amounts of time (e.g.
2457I<MUST> call C<leave_link> as soon as possible, though. 2553for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2554though, as the palyer cannot control the character while it is on the link
2555map.
2458 2556
2459Will never block. 2557Will never block.
2460 2558
2461=item $player_object->leave_link ($map, $x, $y) 2559=item $player_object->leave_link ($map, $x, $y)
2462 2560
2514 ($x, $y) = (-1, -1) 2612 ($x, $y) = (-1, -1)
2515 unless (defined $x) && (defined $y); 2613 unless (defined $x) && (defined $y);
2516 2614
2517 # use -1 or undef as default coordinates, not 0, 0 2615 # use -1 or undef as default coordinates, not 0, 0
2518 ($x, $y) = ($map->enter_x, $map->enter_y) 2616 ($x, $y) = ($map->enter_x, $map->enter_y)
2519 if $x <=0 && $y <= 0; 2617 if $x <= 0 && $y <= 0;
2520 2618
2521 $map->load; 2619 $map->load;
2522 $map->load_neighbours; 2620 $map->load_neighbours;
2523 2621
2524 return unless $self->contr->active; 2622 return unless $self->contr->active;
2525 $self->activate_recursive;
2526 2623
2527 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2624 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2528 $self->enter_map ($map, $x, $y); 2625 $self->enter_map ($map, $x, $y);
2626
2627 # only activate afterwards, to support waiting in hooks
2628 $self->activate_recursive;
2529} 2629}
2530 2630
2531=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2631=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2532 2632
2533Moves the player to the given map-path and coordinates by first freezing 2633Moves the player to the given map-path and coordinates by first freezing
2534her, loading and preparing them map, calling the provided $check callback 2634her, loading and preparing them map, calling the provided $check callback
2535that has to return the map if sucecssful, and then unfreezes the player on 2635that 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 2636the new (success) or old (failed) map position. In either case, $done will
2537be called at the end of this process. 2637be called at the end of this process.
2638
2639Note that $check will be called with a potentially non-loaded map, so if
2640it needs a loaded map it has to call C<< ->load >>.
2538 2641
2539=cut 2642=cut
2540 2643
2541our $GOTOGEN; 2644our $GOTOGEN;
2542 2645
2621} 2724}
2622 2725
2623sub prepare_random_map { 2726sub prepare_random_map {
2624 my ($exit) = @_; 2727 my ($exit) = @_;
2625 2728
2626 my $guard = cf::lock_acquire "exit_prepare:$exit";
2627
2628 # all this does is basically replace the /! path by 2729 # all this does is basically replace the /! path by
2629 # a new random map path (?random/...) with a seed 2730 # a new random map path (?random/...) with a seed
2630 # that depends on the exit object 2731 # that depends on the exit object
2631 2732
2632 my $rmp = parse_random_map_params $exit->msg; 2733 my $rmp = parse_random_map_params $exit->msg;
2634 if ($exit->map) { 2735 if ($exit->map) {
2635 $rmp->{region} = $exit->region->name; 2736 $rmp->{region} = $exit->region->name;
2636 $rmp->{origin_map} = $exit->map->path; 2737 $rmp->{origin_map} = $exit->map->path;
2637 $rmp->{origin_x} = $exit->x; 2738 $rmp->{origin_x} = $exit->x;
2638 $rmp->{origin_y} = $exit->y; 2739 $rmp->{origin_y} = $exit->y;
2740
2741 $exit->map->touch;
2639 } 2742 }
2640 2743
2641 $rmp->{random_seed} ||= $exit->random_seed; 2744 $rmp->{random_seed} ||= $exit->random_seed;
2642 2745
2643 my $data = cf::to_json $rmp; 2746 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2644 my $md5 = Digest::MD5::md5_hex $data; 2747 my $md5 = Digest::MD5::md5_hex $data;
2645 my $meta = "$RANDOMDIR/$md5.meta"; 2748 my $meta = "$RANDOMDIR/$md5.meta";
2646 2749
2647 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2750 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2648 aio_write $fh, 0, (length $data), $data, 0; 2751 aio_write $fh, 0, (length $data), $data, 0;
2649 undef $fh; 2752 undef $fh;
2650 aio_rename "$meta~", $meta; 2753 aio_rename "$meta~", $meta;
2651 2754
2755 my $slaying = "?random/$md5";
2756
2757 if ($exit->valid) {
2652 $exit->slaying ("?random/$md5"); 2758 $exit->slaying ("?random/$md5");
2653 $exit->msg (undef); 2759 $exit->msg (undef);
2760 }
2654 } 2761 }
2655} 2762}
2656 2763
2657sub cf::object::player::enter_exit { 2764sub cf::object::player::enter_exit {
2658 my ($self, $exit) = @_; 2765 my ($self, $exit) = @_;
2659 2766
2660 return unless $self->type == cf::PLAYER; 2767 return unless $self->type == cf::PLAYER;
2661 2768
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; 2769 $self->enter_link;
2674 2770
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 { 2771 (async {
2680 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2772 $Coro::current->{desc} = "enter_exit";
2681 2773
2682 $self->deactivate_recursive; # just to be sure
2683 unless (eval { 2774 unless (eval {
2775 $self->deactivate_recursive; # just to be sure
2776
2777 # random map handling
2778 {
2779 my $guard = cf::lock_acquire "exit_prepare:$exit";
2780
2781 prepare_random_map $exit
2782 if $exit->slaying eq "/!";
2783 }
2784
2785 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2786 my $x = $exit->stats->hp;
2787 my $y = $exit->stats->sp;
2788
2684 $self->goto ($slaying, $hp, $sp); 2789 $self->goto ($map, $x, $y);
2685 2790
2791 # if exit is damned, update players death & WoR home-position
2792 $self->contr->savebed ($map, $x, $y)
2793 if $exit->flag (cf::FLAG_DAMNED);
2794
2686 1; 2795 1
2687 }) { 2796 }) {
2688 $self->message ("Something went wrong deep within the crossfire server. " 2797 $self->message ("Something went wrong deep within the deliantra server. "
2689 . "I'll try to bring you back to the map you were before. " 2798 . "I'll try to bring you back to the map you were before. "
2690 . "Please report this to the dungeon master!", 2799 . "Please report this to the dungeon master!",
2691 cf::NDI_UNIQUE | cf::NDI_RED); 2800 cf::NDI_UNIQUE | cf::NDI_RED);
2692 2801
2693 warn "ERROR in enter_exit: $@"; 2802 warn "ERROR in enter_exit: $@";
2710sub cf::client::send_drawinfo { 2819sub cf::client::send_drawinfo {
2711 my ($self, $text, $flags) = @_; 2820 my ($self, $text, $flags) = @_;
2712 2821
2713 utf8::encode $text; 2822 utf8::encode $text;
2714 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2823 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2824}
2825
2826=item $client->send_big_packet ($pkt)
2827
2828Like C<send_packet>, but tries to compress large packets, and fragments
2829them as required.
2830
2831=cut
2832
2833our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2834
2835sub cf::client::send_big_packet {
2836 my ($self, $pkt) = @_;
2837
2838 # try lzf for large packets
2839 $pkt = "lzf " . Compress::LZF::compress $pkt
2840 if 1024 <= length $pkt and $self->{can_lzf};
2841
2842 # split very large packets
2843 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2844 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2845 $pkt = "frag";
2846 }
2847
2848 $self->send_packet ($pkt);
2715} 2849}
2716 2850
2717=item $client->send_msg ($channel, $msg, $color, [extra...]) 2851=item $client->send_msg ($channel, $msg, $color, [extra...])
2718 2852
2719Send a drawinfo or msg packet to the client, formatting the msg for the 2853Send a drawinfo or msg packet to the client, formatting the msg for the
2723 2857
2724=cut 2858=cut
2725 2859
2726# non-persistent channels (usually the info channel) 2860# non-persistent channels (usually the info channel)
2727our %CHANNEL = ( 2861our %CHANNEL = (
2862 "c/motd" => {
2863 id => "infobox",
2864 title => "MOTD",
2865 reply => undef,
2866 tooltip => "The message of the day",
2867 },
2728 "c/identify" => { 2868 "c/identify" => {
2729 id => "infobox", 2869 id => "infobox",
2730 title => "Identify", 2870 title => "Identify",
2731 reply => undef, 2871 reply => undef,
2732 tooltip => "Items recently identified", 2872 tooltip => "Items recently identified",
2734 "c/examine" => { 2874 "c/examine" => {
2735 id => "infobox", 2875 id => "infobox",
2736 title => "Examine", 2876 title => "Examine",
2737 reply => undef, 2877 reply => undef,
2738 tooltip => "Signs and other items you examined", 2878 tooltip => "Signs and other items you examined",
2879 },
2880 "c/shopinfo" => {
2881 id => "infobox",
2882 title => "Shop Info",
2883 reply => undef,
2884 tooltip => "What your bargaining skill tells you about the shop",
2739 }, 2885 },
2740 "c/book" => { 2886 "c/book" => {
2741 id => "infobox", 2887 id => "infobox",
2742 title => "Book", 2888 title => "Book",
2743 reply => undef, 2889 reply => undef,
2759 id => "infobox", 2905 id => "infobox",
2760 title => "Body Parts", 2906 title => "Body Parts",
2761 reply => undef, 2907 reply => undef,
2762 tooltip => "Shows which body parts you posess and are available", 2908 tooltip => "Shows which body parts you posess and are available",
2763 }, 2909 },
2910 "c/statistics" => {
2911 id => "infobox",
2912 title => "Statistics",
2913 reply => undef,
2914 tooltip => "Shows your primary statistics",
2915 },
2916 "c/skills" => {
2917 id => "infobox",
2918 title => "Skills",
2919 reply => undef,
2920 tooltip => "Shows your experience per skill and item power",
2921 },
2922 "c/shopitems" => {
2923 id => "infobox",
2924 title => "Shop Items",
2925 reply => undef,
2926 tooltip => "Shows the items currently for sale in this shop",
2927 },
2928 "c/resistances" => {
2929 id => "infobox",
2930 title => "Resistances",
2931 reply => undef,
2932 tooltip => "Shows your resistances",
2933 },
2934 "c/pets" => {
2935 id => "infobox",
2936 title => "Pets",
2937 reply => undef,
2938 tooltip => "Shows information abotu your pets/a specific pet",
2939 },
2940 "c/perceiveself" => {
2941 id => "infobox",
2942 title => "Perceive Self",
2943 reply => undef,
2944 tooltip => "You gained detailed knowledge about yourself",
2945 },
2764 "c/uptime" => { 2946 "c/uptime" => {
2765 id => "infobox", 2947 id => "infobox",
2766 title => "Uptime", 2948 title => "Uptime",
2767 reply => undef, 2949 reply => undef,
2768 tooltip => "How long the server has been running since last restart", 2950 tooltip => "How long the server has been running since last restart",
2771 id => "infobox", 2953 id => "infobox",
2772 title => "Map Info", 2954 title => "Map Info",
2773 reply => undef, 2955 reply => undef,
2774 tooltip => "Information related to the maps", 2956 tooltip => "Information related to the maps",
2775 }, 2957 },
2958 "c/party" => {
2959 id => "party",
2960 title => "Party",
2961 reply => "gsay ",
2962 tooltip => "Messages and chat related to your party",
2963 },
2964 "c/death" => {
2965 id => "death",
2966 title => "Death",
2967 reply => undef,
2968 tooltip => "Reason for and more info about your most recent death",
2969 },
2970 "c/say" => $SAY_CHANNEL,
2971 "c/chat" => $CHAT_CHANNEL,
2776); 2972);
2777 2973
2778sub cf::client::send_msg { 2974sub cf::client::send_msg {
2779 my ($self, $channel, $msg, $color, @extra) = @_; 2975 my ($self, $channel, $msg, $color, @extra) = @_;
2780 2976
2781 $msg = $self->pl->expand_cfpod ($msg); 2977 $msg = $self->pl->expand_cfpod ($msg)
2978 unless $color & cf::NDI_VERBATIM;
2782 2979
2783 $color &= cf::NDI_CLIENT_MASK; # just in case... 2980 $color &= cf::NDI_CLIENT_MASK; # just in case...
2784 2981
2785 # check predefined channels, for the benefit of C 2982 # check predefined channels, for the benefit of C
2786 if ($CHANNEL{$channel}) { 2983 if ($CHANNEL{$channel}) {
2787 $channel = $CHANNEL{$channel}; 2984 $channel = $CHANNEL{$channel};
2788 2985
2789 $self->ext_msg (channel_info => $channel) 2986 $self->ext_msg (channel_info => $channel);
2790 if $self->can_msg;
2791
2792 $channel = $channel->{id}; 2987 $channel = $channel->{id};
2793 2988
2794 } elsif (ref $channel) { 2989 } elsif (ref $channel) {
2795 # send meta info to client, if not yet sent 2990 # send meta info to client, if not yet sent
2796 unless (exists $self->{channel}{$channel->{id}}) { 2991 unless (exists $self->{channel}{$channel->{id}}) {
2797 $self->{channel}{$channel->{id}} = $channel; 2992 $self->{channel}{$channel->{id}} = $channel;
2798 $self->ext_msg (channel_info => $channel) 2993 $self->ext_msg (channel_info => $channel);
2799 if $self->can_msg;
2800 } 2994 }
2801 2995
2802 $channel = $channel->{id}; 2996 $channel = $channel->{id};
2803 } 2997 }
2804 2998
2805 return unless @extra || length $msg; 2999 return unless @extra || length $msg;
2806 3000
2807 if ($self->can_msg) {
2808 # default colour, mask it out 3001 # default colour, mask it out
2809 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3002 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2810 if $color & cf::NDI_DEF; 3003 if $color & cf::NDI_DEF;
2811 3004
2812 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3005 my $pkt = "msg "
3006 . $self->{json_coder}->encode (
2813 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3007 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2814 } else { 3008 );
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 3009
2826 $color &= cf::NDI_COLOR_MASK; 3010 $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} 3011}
2840 3012
2841=item $client->ext_msg ($type, @msg) 3013=item $client->ext_msg ($type, @msg)
2842 3014
2843Sends an ext event to the client. 3015Sends an ext event to the client.
2846 3018
2847sub cf::client::ext_msg($$@) { 3019sub cf::client::ext_msg($$@) {
2848 my ($self, $type, @msg) = @_; 3020 my ($self, $type, @msg) = @_;
2849 3021
2850 if ($self->extcmd == 2) { 3022 if ($self->extcmd == 2) {
2851 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3023 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2852 } elsif ($self->extcmd == 1) { # TODO: remove 3024 } elsif ($self->extcmd == 1) { # TODO: remove
2853 push @msg, msgtype => "event_$type"; 3025 push @msg, msgtype => "event_$type";
2854 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3026 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2855 } 3027 }
2856} 3028}
2857 3029
2858=item $client->ext_reply ($msgid, @msg) 3030=item $client->ext_reply ($msgid, @msg)
2859 3031
2863 3035
2864sub cf::client::ext_reply($$@) { 3036sub cf::client::ext_reply($$@) {
2865 my ($self, $id, @msg) = @_; 3037 my ($self, $id, @msg) = @_;
2866 3038
2867 if ($self->extcmd == 2) { 3039 if ($self->extcmd == 2) {
2868 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3040 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2869 } elsif ($self->extcmd == 1) { 3041 } elsif ($self->extcmd == 1) {
2870 #TODO: version 1, remove 3042 #TODO: version 1, remove
2871 unshift @msg, msgtype => "reply", msgid => $id; 3043 unshift @msg, msgtype => "reply", msgid => $id;
2872 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3044 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2873 } 3045 }
2874} 3046}
2875 3047
2876=item $success = $client->query ($flags, "text", \&cb) 3048=item $success = $client->query ($flags, "text", \&cb)
2877 3049
2978 3150
2979 $coro 3151 $coro
2980} 3152}
2981 3153
2982cf::client->attach ( 3154cf::client->attach (
2983 on_destroy => sub { 3155 on_client_destroy => sub {
2984 my ($ns) = @_; 3156 my ($ns) = @_;
2985 3157
2986 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3158 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2987 }, 3159 },
2988); 3160);
3004our $safe_hole = new Safe::Hole; 3176our $safe_hole = new Safe::Hole;
3005 3177
3006$SIG{FPE} = 'IGNORE'; 3178$SIG{FPE} = 'IGNORE';
3007 3179
3008$safe->permit_only (Opcode::opset qw( 3180$safe->permit_only (Opcode::opset qw(
3009 :base_core :base_mem :base_orig :base_math 3181 :base_core :base_mem :base_orig :base_math :base_loop
3010 grepstart grepwhile mapstart mapwhile 3182 grepstart grepwhile mapstart mapwhile
3011 sort time 3183 sort time
3012)); 3184));
3013 3185
3014# here we export the classes and methods available to script code 3186# here we export the classes and methods available to script code
3017 3189
3018The following functions and methods are available within a safe environment: 3190The following functions and methods are available within a safe environment:
3019 3191
3020 cf::object 3192 cf::object
3021 contr pay_amount pay_player map x y force_find force_add destroy 3193 contr pay_amount pay_player map x y force_find force_add destroy
3022 insert remove name archname title slaying race decrease_ob_nr 3194 insert remove name archname title slaying race decrease split
3195 value
3023 3196
3024 cf::object::player 3197 cf::object::player
3025 player 3198 player
3026 3199
3027 cf::player 3200 cf::player
3032 3205
3033=cut 3206=cut
3034 3207
3035for ( 3208for (
3036 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3209 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3037 insert remove inv name archname title slaying race 3210 insert remove inv nrof name archname title slaying race
3038 decrease_ob_nr destroy)], 3211 decrease split destroy change_exp value msg lore send_msg)],
3039 ["cf::object::player" => qw(player)], 3212 ["cf::object::player" => qw(player)],
3040 ["cf::player" => qw(peaceful)], 3213 ["cf::player" => qw(peaceful send_msg)],
3041 ["cf::map" => qw(trigger)], 3214 ["cf::map" => qw(trigger)],
3042) { 3215) {
3043 no strict 'refs'; 3216 no strict 'refs';
3044 my ($pkg, @funs) = @$_; 3217 my ($pkg, @funs) = @$_;
3045 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3218 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3063 3236
3064 my $qcode = $code; 3237 my $qcode = $code;
3065 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3238 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3066 $qcode =~ s/\n/\\n/g; 3239 $qcode =~ s/\n/\\n/g;
3067 3240
3241 %vars = (_dummy => 0) unless %vars;
3242
3243 my @res;
3068 local $_; 3244 local $_;
3069 local @safe::cf::_safe_eval_args = values %vars;
3070 3245
3071 my $eval = 3246 my $eval =
3072 "do {\n" 3247 "do {\n"
3073 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3248 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3074 . "#line 0 \"{$qcode}\"\n" 3249 . "#line 0 \"{$qcode}\"\n"
3075 . $code 3250 . $code
3076 . "\n}" 3251 . "\n}"
3077 ; 3252 ;
3078 3253
3254 if ($CFG{safe_eval}) {
3079 sub_generation_inc; 3255 sub_generation_inc;
3256 local @safe::cf::_safe_eval_args = values %vars;
3080 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3257 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3081 sub_generation_inc; 3258 sub_generation_inc;
3259 } else {
3260 local @cf::_safe_eval_args = values %vars;
3261 @res = wantarray ? eval eval : scalar eval $eval;
3262 }
3082 3263
3083 if ($@) { 3264 if ($@) {
3084 warn "$@"; 3265 warn "$@";
3085 warn "while executing safe code '$code'\n"; 3266 warn "while executing safe code '$code'\n";
3086 warn "with arguments " . (join " ", %vars) . "\n"; 3267 warn "with arguments " . (join " ", %vars) . "\n";
3105=cut 3286=cut
3106 3287
3107sub register_script_function { 3288sub register_script_function {
3108 my ($fun, $cb) = @_; 3289 my ($fun, $cb) = @_;
3109 3290
3110 no strict 'refs'; 3291 $fun = "safe::$fun" if $CFG{safe_eval};
3111 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3292 *$fun = $safe_hole->wrap ($cb);
3112} 3293}
3113 3294
3114=back 3295=back
3115 3296
3116=cut 3297=cut
3137 3318
3138 $facedata->{version} == 2 3319 $facedata->{version} == 2
3139 or cf::cleanup "$path: version mismatch, cannot proceed."; 3320 or cf::cleanup "$path: version mismatch, cannot proceed.";
3140 3321
3141 # patch in the exptable 3322 # patch in the exptable
3323 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3142 $facedata->{resource}{"res/exp_table"} = { 3324 $facedata->{resource}{"res/exp_table"} = {
3143 type => FT_RSRC, 3325 type => FT_RSRC,
3144 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3326 data => $exp_table,
3327 hash => (Digest::MD5::md5 $exp_table),
3145 }; 3328 };
3146 cf::cede_to_tick; 3329 cf::cede_to_tick;
3147 3330
3148 { 3331 {
3149 my $faces = $facedata->{faceinfo}; 3332 my $faces = $facedata->{faceinfo};
3150 3333
3151 while (my ($face, $info) = each %$faces) { 3334 while (my ($face, $info) = each %$faces) {
3152 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3335 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3336
3153 cf::face::set_visibility $idx, $info->{visibility}; 3337 cf::face::set_visibility $idx, $info->{visibility};
3154 cf::face::set_magicmap $idx, $info->{magicmap}; 3338 cf::face::set_magicmap $idx, $info->{magicmap};
3155 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3339 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3156 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3340 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3157 3341
3158 cf::cede_to_tick; 3342 cf::cede_to_tick;
3159 } 3343 }
3160 3344
3161 while (my ($face, $info) = each %$faces) { 3345 while (my ($face, $info) = each %$faces) {
3162 next unless $info->{smooth}; 3346 next unless $info->{smooth};
3347
3163 my $idx = cf::face::find $face 3348 my $idx = cf::face::find $face
3164 or next; 3349 or next;
3350
3165 if (my $smooth = cf::face::find $info->{smooth}) { 3351 if (my $smooth = cf::face::find $info->{smooth}) {
3166 cf::face::set_smooth $idx, $smooth; 3352 cf::face::set_smooth $idx, $smooth;
3167 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3353 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3168 } else { 3354 } else {
3169 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3355 warn "smooth face '$info->{smooth}' not found for face '$face'";
3183 3369
3184 cf::anim::invalidate_all; # d'oh 3370 cf::anim::invalidate_all; # d'oh
3185 } 3371 }
3186 3372
3187 { 3373 {
3188 # TODO: for gcfclient pleasure, we should give resources
3189 # that gcfclient doesn't grok a >10000 face index.
3190 my $res = $facedata->{resource}; 3374 my $res = $facedata->{resource};
3191 3375
3192 my $soundconf = delete $res->{"res/sound.conf"};
3193
3194 while (my ($name, $info) = each %$res) { 3376 while (my ($name, $info) = each %$res) {
3377 if (defined $info->{type}) {
3195 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3378 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3196 my $data;
3197 3379
3198 if ($info->{type} & 1) { 3380 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3199 # prepend meta info 3381 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 { 3382 } else {
3208 $data = $info->{data}; 3383 $RESOURCE{$name} = $info;
3209 } 3384 }
3210 3385
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; 3386 cf::cede_to_tick;
3215 } 3387 }
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 } 3388 }
3389
3390 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3235 3391
3236 1 3392 1
3237} 3393}
3394
3395cf::global->attach (on_resource_update => sub {
3396 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3397 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3398
3399 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3400 my $sound = $soundconf->{compat}[$_]
3401 or next;
3402
3403 my $face = cf::face::find "sound/$sound->[1]";
3404 cf::sound::set $sound->[0] => $face;
3405 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3406 }
3407
3408 while (my ($k, $v) = each %{$soundconf->{event}}) {
3409 my $face = cf::face::find "sound/$v";
3410 cf::sound::set $k => $face;
3411 }
3412 }
3413});
3238 3414
3239register_exticmd fx_want => sub { 3415register_exticmd fx_want => sub {
3240 my ($ns, $want) = @_; 3416 my ($ns, $want) = @_;
3241 3417
3242 while (my ($k, $v) = each %$want) { 3418 while (my ($k, $v) = each %$want) {
3243 $ns->fx_want ($k, $v); 3419 $ns->fx_want ($k, $v);
3244 } 3420 }
3245}; 3421};
3422
3423sub load_resource_file($) {
3424 my $guard = lock_acquire "load_resource_file";
3425
3426 my $status = load_resource_file_ $_[0];
3427 get_slot 0.1, 100;
3428 cf::arch::commit_load;
3429
3430 $status
3431}
3246 3432
3247sub reload_regions { 3433sub reload_regions {
3248 # HACK to clear player env face cache, we need some signal framework 3434 # HACK to clear player env face cache, we need some signal framework
3249 # for this (global event?) 3435 # for this (global event?)
3250 %ext::player_env::MUSIC_FACE_CACHE = (); 3436 %ext::player_env::MUSIC_FACE_CACHE = ();
3264} 3450}
3265 3451
3266sub reload_archetypes { 3452sub reload_archetypes {
3267 load_resource_file "$DATADIR/archetypes" 3453 load_resource_file "$DATADIR/archetypes"
3268 or die "unable to load archetypes\n"; 3454 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} 3455}
3275 3456
3276sub reload_treasures { 3457sub reload_treasures {
3277 load_resource_file "$DATADIR/treasures" 3458 load_resource_file "$DATADIR/treasures"
3278 or die "unable to load treasurelists\n"; 3459 or die "unable to load treasurelists\n";
3279} 3460}
3280 3461
3281sub reload_resources { 3462sub reload_resources {
3282 warn "reloading resource files...\n"; 3463 warn "reloading resource files...\n";
3283 3464
3465 reload_facedata;
3466 reload_archetypes;
3284 reload_regions; 3467 reload_regions;
3285 reload_facedata;
3286 #reload_archetypes;#d#
3287 reload_archetypes;
3288 reload_treasures; 3468 reload_treasures;
3289 3469
3290 warn "finished reloading resource files\n"; 3470 warn "finished reloading resource files\n";
3291} 3471}
3292 3472
3293sub init {
3294 reload_resources;
3295}
3296
3297sub reload_config { 3473sub reload_config {
3474 warn "reloading config file...\n";
3475
3298 open my $fh, "<:utf8", "$CONFDIR/config" 3476 open my $fh, "<:utf8", "$CONFDIR/config"
3299 or return; 3477 or return;
3300 3478
3301 local $/; 3479 local $/;
3302 *CFG = YAML::Syck::Load <$fh>; 3480 *CFG = YAML::XS::Load scalar <$fh>;
3303 3481
3304 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3482 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3305 3483
3306 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3484 $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}; 3485 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3311 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3489 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3312 and die "WARNING: m(un)lockall failed: $!\n"; 3490 and die "WARNING: m(un)lockall failed: $!\n";
3313 }; 3491 };
3314 warn $@ if $@; 3492 warn $@ if $@;
3315 } 3493 }
3494
3495 warn "finished reloading resource files\n";
3496}
3497
3498sub pidfile() {
3499 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3500 or die "$PIDFILE: $!";
3501 flock $fh, &Fcntl::LOCK_EX
3502 or die "$PIDFILE: flock: $!";
3503 $fh
3504}
3505
3506# make sure only one server instance is running at any one time
3507sub atomic {
3508 my $fh = pidfile;
3509
3510 my $pid = <$fh>;
3511 kill 9, $pid if $pid > 0;
3512
3513 seek $fh, 0, 0;
3514 print $fh $$;
3515}
3516
3517sub main_loop {
3518 warn "EV::loop starting\n";
3519 if (1) {
3520 EV::loop;
3521 }
3522 warn "EV::loop returned\n";
3523 goto &main_loop unless $REALLY_UNLOOP;
3316} 3524}
3317 3525
3318sub main { 3526sub main {
3527 cf::init_globals; # initialise logging
3528
3529 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3530 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3531 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3532 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3533
3534 cf::init_experience;
3535 cf::init_anim;
3536 cf::init_attackmess;
3537 cf::init_dynamic;
3538
3539 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3540
3319 # we must not ever block the main coroutine 3541 # we must not ever block the main coroutine
3320 local $Coro::idle = sub { 3542 local $Coro::idle = sub {
3321 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3543 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3322 (async { 3544 (async {
3323 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3545 $Coro::current->{desc} = "IDLE BUG HANDLER";
3324 EV::loop EV::LOOP_ONESHOT; 3546 EV::loop EV::LOOP_ONESHOT;
3325 })->prio (Coro::PRIO_MAX); 3547 })->prio (Coro::PRIO_MAX);
3326 }; 3548 };
3327 3549
3550 evthread_start IO::AIO::poll_fileno;
3551
3552 cf::sync_job {
3553 cf::load_settings;
3554 cf::load_materials;
3555
3556 reload_resources;
3328 reload_config; 3557 reload_config;
3329 db_init; 3558 db_init;
3559
3560 cf::init_uuid;
3561 cf::init_signals;
3562 cf::init_skills;
3563
3564 cf::init_beforeplay;
3565
3566 atomic;
3567
3330 load_extensions; 3568 load_extensions;
3331 3569
3332 $TICK_WATCHER->start; 3570 utime time, time, $RUNTIMEFILE;
3333 EV::loop; 3571
3572 # no (long-running) fork's whatsoever before this point(!)
3573 use POSIX ();
3574 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3575
3576 (pop @POST_INIT)->(0) while @POST_INIT;
3577 };
3578
3579 main_loop;
3334} 3580}
3335 3581
3336############################################################################# 3582#############################################################################
3337# initialisation and cleanup 3583# initialisation and cleanup
3338 3584
3339# install some emergency cleanup handlers 3585# install some emergency cleanup handlers
3340BEGIN { 3586BEGIN {
3341 our %SIGWATCHER = (); 3587 our %SIGWATCHER = ();
3342 for my $signal (qw(INT HUP TERM)) { 3588 for my $signal (qw(INT HUP TERM)) {
3343 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3589 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3344 cf::cleanup "SIG$signal"; 3590 cf::cleanup "SIG$signal";
3345 }; 3591 };
3346 } 3592 }
3347} 3593}
3348 3594
3349sub write_runtime { 3595sub write_runtime_sync {
3350 my $runtime = "$LOCALDIR/runtime"; 3596 my $t0 = AE::time;
3351 3597
3352 # first touch the runtime file to show we are still running: 3598 # first touch the runtime file to show we are still running:
3353 # the fsync below can take a very very long time. 3599 # the fsync below can take a very very long time.
3354 3600
3355 IO::AIO::aio_utime $runtime, undef, undef; 3601 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3356 3602
3357 my $guard = cf::lock_acquire "write_runtime"; 3603 my $guard = cf::lock_acquire "write_runtime";
3358 3604
3359 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3605 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3360 or return; 3606 or return;
3361 3607
3362 my $value = $cf::RUNTIME + 90 + 10; 3608 my $value = $cf::RUNTIME + 90 + 10;
3363 # 10 is the runtime save interval, for a monotonic clock 3609 # 10 is the runtime save interval, for a monotonic clock
3364 # 60 allows for the watchdog to kill the server. 3610 # 60 allows for the watchdog to kill the server.
3374 aio_utime $fh, undef, undef; 3620 aio_utime $fh, undef, undef;
3375 3621
3376 close $fh 3622 close $fh
3377 or return; 3623 or return;
3378 3624
3379 aio_rename "$runtime~", $runtime 3625 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3380 and return; 3626 and return;
3381 3627
3382 warn "runtime file written.\n"; 3628 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3383 3629
3384 1 3630 1
3631}
3632
3633our $uuid_lock;
3634our $uuid_skip;
3635
3636sub write_uuid_sync($) {
3637 $uuid_skip ||= $_[0];
3638
3639 return if $uuid_lock;
3640 local $uuid_lock = 1;
3641
3642 my $uuid = "$LOCALDIR/uuid";
3643
3644 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3645 or return;
3646
3647 my $value = uuid_seq uuid_cur;
3648
3649 unless ($value) {
3650 warn "cowardly refusing to write zero uuid value!\n";
3651 return;
3652 }
3653
3654 my $value = uuid_str $value + $uuid_skip;
3655 $uuid_skip = 0;
3656
3657 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3658 and return;
3659
3660 # always fsync - this file is important
3661 aio_fsync $fh
3662 and return;
3663
3664 close $fh
3665 or return;
3666
3667 aio_rename "$uuid~", $uuid
3668 and return;
3669
3670 warn "uuid file written ($value).\n";
3671
3672 1
3673
3674}
3675
3676sub write_uuid($$) {
3677 my ($skip, $sync) = @_;
3678
3679 $sync ? write_uuid_sync $skip
3680 : async { write_uuid_sync $skip };
3385} 3681}
3386 3682
3387sub emergency_save() { 3683sub emergency_save() {
3388 my $freeze_guard = cf::freeze_mainloop; 3684 my $freeze_guard = cf::freeze_mainloop;
3389 3685
3390 warn "enter emergency perl save\n"; 3686 warn "emergency_perl_save: enter\n";
3391 3687
3392 cf::sync_job { 3688 cf::sync_job {
3689 # this is a trade-off: we want to be very quick here, so
3690 # save all maps without fsync, and later call a global sync
3691 # (which in turn might be very very slow)
3692 local $USE_FSYNC = 0;
3693
3393 # use a peculiar iteration method to avoid tripping on perl 3694 # use a peculiar iteration method to avoid tripping on perl
3394 # refcount bugs in for. also avoids problems with players 3695 # refcount bugs in for. also avoids problems with players
3395 # and maps saved/destroyed asynchronously. 3696 # and maps saved/destroyed asynchronously.
3396 warn "begin emergency player save\n"; 3697 warn "emergency_perl_save: begin player save\n";
3397 for my $login (keys %cf::PLAYER) { 3698 for my $login (keys %cf::PLAYER) {
3398 my $pl = $cf::PLAYER{$login} or next; 3699 my $pl = $cf::PLAYER{$login} or next;
3399 $pl->valid or next; 3700 $pl->valid or next;
3400 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3701 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3401 $pl->save; 3702 $pl->save;
3402 } 3703 }
3403 warn "end emergency player save\n"; 3704 warn "emergency_perl_save: end player save\n";
3404 3705
3405 warn "begin emergency map save\n"; 3706 warn "emergency_perl_save: begin map save\n";
3406 for my $path (keys %cf::MAP) { 3707 for my $path (keys %cf::MAP) {
3407 my $map = $cf::MAP{$path} or next; 3708 my $map = $cf::MAP{$path} or next;
3408 $map->valid or next; 3709 $map->valid or next;
3409 $map->save; 3710 $map->save;
3410 } 3711 }
3411 warn "end emergency map save\n"; 3712 warn "emergency_perl_save: end map save\n";
3412 3713
3413 warn "begin emergency database checkpoint\n"; 3714 warn "emergency_perl_save: begin database checkpoint\n";
3414 BDB::db_env_txn_checkpoint $DB_ENV; 3715 BDB::db_env_txn_checkpoint $DB_ENV;
3415 warn "end emergency database checkpoint\n"; 3716 warn "emergency_perl_save: end database checkpoint\n";
3717
3718 warn "emergency_perl_save: begin write uuid\n";
3719 write_uuid_sync 1;
3720 warn "emergency_perl_save: end write uuid\n";
3416 }; 3721 };
3417 3722
3723 warn "emergency_perl_save: starting sync()\n";
3724 IO::AIO::aio_sync sub {
3725 warn "emergency_perl_save: finished sync()\n";
3726 };
3727
3418 warn "leave emergency perl save\n"; 3728 warn "emergency_perl_save: leave\n";
3419} 3729}
3420 3730
3421sub post_cleanup { 3731sub post_cleanup {
3422 my ($make_core) = @_; 3732 my ($make_core) = @_;
3423 3733
3424 warn Carp::longmess "post_cleanup backtrace" 3734 warn Carp::longmess "post_cleanup backtrace"
3425 if $make_core; 3735 if $make_core;
3736
3737 my $fh = pidfile;
3738 unlink $PIDFILE if <$fh> == $$;
3739}
3740
3741# a safer delete_package, copied from Symbol
3742sub clear_package($) {
3743 my $pkg = shift;
3744
3745 # expand to full symbol table name if needed
3746 unless ($pkg =~ /^main::.*::$/) {
3747 $pkg = "main$pkg" if $pkg =~ /^::/;
3748 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3749 $pkg .= '::' unless $pkg =~ /::$/;
3750 }
3751
3752 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3753 my $stem_symtab = *{$stem}{HASH};
3754
3755 defined $stem_symtab and exists $stem_symtab->{$leaf}
3756 or return;
3757
3758 # clear all symbols
3759 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3760 for my $name (keys %$leaf_symtab) {
3761 _gv_clear *{"$pkg$name"};
3762# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3763 }
3764 warn "cleared package $pkg\n";#d#
3426} 3765}
3427 3766
3428sub do_reload_perl() { 3767sub do_reload_perl() {
3429 # can/must only be called in main 3768 # can/must only be called in main
3430 if ($Coro::current != $Coro::main) { 3769 if ($Coro::current != $Coro::main) {
3431 warn "can only reload from main coroutine"; 3770 warn "can only reload from main coroutine";
3432 return; 3771 return;
3433 } 3772 }
3434 3773
3774 return if $RELOAD++;
3775
3776 my $t1 = AE::time;
3777
3778 while ($RELOAD) {
3435 warn "reloading..."; 3779 warn "reloading...";
3436 3780
3437 warn "entering sync_job"; 3781 warn "entering sync_job";
3438 3782
3439 cf::sync_job { 3783 cf::sync_job {
3440 cf::write_runtime; # external watchdog should not bark 3784 cf::write_runtime_sync; # external watchdog should not bark
3441 cf::emergency_save; 3785 cf::emergency_save;
3442 cf::write_runtime; # external watchdog should not bark 3786 cf::write_runtime_sync; # external watchdog should not bark
3443 3787
3444 warn "syncing database to disk"; 3788 warn "syncing database to disk";
3445 BDB::db_env_txn_checkpoint $DB_ENV; 3789 BDB::db_env_txn_checkpoint $DB_ENV;
3446 3790
3447 # if anything goes wrong in here, we should simply crash as we already saved 3791 # if anything goes wrong in here, we should simply crash as we already saved
3448 3792
3449 warn "flushing outstanding aio requests"; 3793 warn "flushing outstanding aio requests";
3450 for (;;) {
3451 BDB::flush;
3452 IO::AIO::flush;
3453 Coro::cede_notself;
3454 last unless IO::AIO::nreqs || BDB::nreqs; 3794 while (IO::AIO::nreqs || BDB::nreqs) {
3455 warn "iterate..."; 3795 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3456 }
3457
3458 ++$RELOAD;
3459
3460 warn "cancelling all extension coros";
3461 $_->cancel for values %EXT_CORO;
3462 %EXT_CORO = ();
3463
3464 warn "removing commands";
3465 %COMMAND = ();
3466
3467 warn "removing ext/exti commands";
3468 %EXTCMD = ();
3469 %EXTICMD = ();
3470
3471 warn "unloading/nuking all extensions";
3472 for my $pkg (@EXTS) {
3473 warn "... unloading $pkg";
3474
3475 if (my $cb = $pkg->can ("unload")) {
3476 eval {
3477 $cb->($pkg);
3478 1
3479 } or warn "$pkg unloaded, but with errors: $@";
3480 } 3796 }
3481 3797
3482 warn "... nuking $pkg"; 3798 warn "cancelling all extension coros";
3483 Symbol::delete_package $pkg; 3799 $_->cancel for values %EXT_CORO;
3484 } 3800 %EXT_CORO = ();
3485 3801
3486 warn "unloading all perl modules loaded from $LIBDIR"; 3802 warn "removing commands";
3487 while (my ($k, $v) = each %INC) { 3803 %COMMAND = ();
3488 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3489 3804
3805 warn "removing ext/exti commands";
3806 %EXTCMD = ();
3807 %EXTICMD = ();
3808
3809 warn "unloading/nuking all extensions";
3810 for my $pkg (@EXTS) {
3490 warn "... unloading $k"; 3811 warn "... unloading $pkg";
3491 delete $INC{$k};
3492 3812
3493 $k =~ s/\.pm$//;
3494 $k =~ s/\//::/g;
3495
3496 if (my $cb = $k->can ("unload_module")) { 3813 if (my $cb = $pkg->can ("unload")) {
3814 eval {
3497 $cb->(); 3815 $cb->($pkg);
3816 1
3817 } or warn "$pkg unloaded, but with errors: $@";
3818 }
3819
3820 warn "... clearing $pkg";
3821 clear_package $pkg;
3498 } 3822 }
3499 3823
3500 Symbol::delete_package $k; 3824 warn "unloading all perl modules loaded from $LIBDIR";
3825 while (my ($k, $v) = each %INC) {
3826 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3827
3828 warn "... unloading $k";
3829 delete $INC{$k};
3830
3831 $k =~ s/\.pm$//;
3832 $k =~ s/\//::/g;
3833
3834 if (my $cb = $k->can ("unload_module")) {
3835 $cb->();
3836 }
3837
3838 clear_package $k;
3501 } 3839 }
3502 3840
3503 warn "getting rid of safe::, as good as possible"; 3841 warn "getting rid of safe::, as good as possible";
3504 Symbol::delete_package "safe::$_" 3842 clear_package "safe::$_"
3505 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3843 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3506 3844
3507 warn "unloading cf.pm \"a bit\""; 3845 warn "unloading cf.pm \"a bit\"";
3508 delete $INC{"cf.pm"}; 3846 delete $INC{"cf.pm"};
3509 delete $INC{"cf/pod.pm"}; 3847 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3510 3848
3511 # don't, removes xs symbols, too, 3849 # don't, removes xs symbols, too,
3512 # and global variables created in xs 3850 # and global variables created in xs
3513 #Symbol::delete_package __PACKAGE__; 3851 #clear_package __PACKAGE__;
3514 3852
3515 warn "unload completed, starting to reload now"; 3853 warn "unload completed, starting to reload now";
3516 3854
3517 warn "reloading cf.pm"; 3855 warn "reloading cf.pm";
3518 require cf; 3856 require cf;
3519 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3857 cf::_connect_to_perl_1;
3520 3858
3521 warn "loading config and database again"; 3859 warn "loading config and database again";
3522 cf::reload_config; 3860 cf::reload_config;
3523 3861
3524 warn "loading extensions"; 3862 warn "loading extensions";
3525 cf::load_extensions; 3863 cf::load_extensions;
3526 3864
3865 if ($REATTACH_ON_RELOAD) {
3527 warn "reattaching attachments to objects/players"; 3866 warn "reattaching attachments to objects/players";
3528 _global_reattach; # objects, sockets 3867 _global_reattach; # objects, sockets
3529 warn "reattaching attachments to maps"; 3868 warn "reattaching attachments to maps";
3530 reattach $_ for values %MAP; 3869 reattach $_ for values %MAP;
3531 warn "reattaching attachments to players"; 3870 warn "reattaching attachments to players";
3532 reattach $_ for values %PLAYER; 3871 reattach $_ for values %PLAYER;
3872 }
3533 3873
3874 warn "running post_init jobs";
3875 (pop @POST_INIT)->(1) while @POST_INIT;
3876
3534 warn "leaving sync_job"; 3877 warn "leaving sync_job";
3535 3878
3536 1 3879 1
3537 } or do { 3880 } or do {
3538 warn $@; 3881 warn $@;
3539 warn "error while reloading, exiting."; 3882 cf::cleanup "error while reloading, exiting.";
3540 exit 1;
3541 }; 3883 };
3542 3884
3543 warn "reloaded"; 3885 warn "reloaded";
3886 --$RELOAD;
3887 }
3888
3889 $t1 = AE::time - $t1;
3890 warn "reload completed in ${t1}s\n";
3544}; 3891};
3545 3892
3546our $RELOAD_WATCHER; # used only during reload 3893our $RELOAD_WATCHER; # used only during reload
3547 3894
3548sub reload_perl() { 3895sub reload_perl() {
3549 # doing reload synchronously and two reloads happen back-to-back, 3896 # doing reload synchronously and two reloads happen back-to-back,
3550 # coro crashes during coro_state_free->destroy here. 3897 # coro crashes during coro_state_free->destroy here.
3551 3898
3899 $RELOAD_WATCHER ||= cf::async {
3900 Coro::AIO::aio_wait cache_extensions;
3901
3552 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3902 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3903 do_reload_perl;
3553 undef $RELOAD_WATCHER; 3904 undef $RELOAD_WATCHER;
3554 do_reload_perl; 3905 };
3555 }; 3906 };
3556} 3907}
3557 3908
3558register_command "reload" => sub { 3909register_command "reload" => sub {
3559 my ($who, $arg) = @_; 3910 my ($who, $arg) = @_;
3573 3924
3574our @WAIT_FOR_TICK; 3925our @WAIT_FOR_TICK;
3575our @WAIT_FOR_TICK_BEGIN; 3926our @WAIT_FOR_TICK_BEGIN;
3576 3927
3577sub wait_for_tick { 3928sub wait_for_tick {
3578 return unless $TICK_WATCHER->is_active;
3579 return if $Coro::current == $Coro::main; 3929 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3580 3930
3581 my $signal = new Coro::Signal; 3931 my $signal = new Coro::Signal;
3582 push @WAIT_FOR_TICK, $signal; 3932 push @WAIT_FOR_TICK, $signal;
3583 $signal->wait; 3933 $signal->wait;
3584} 3934}
3585 3935
3586sub wait_for_tick_begin { 3936sub wait_for_tick_begin {
3587 return unless $TICK_WATCHER->is_active;
3588 return if $Coro::current == $Coro::main; 3937 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3589 3938
3590 my $signal = new Coro::Signal; 3939 my $signal = new Coro::Signal;
3591 push @WAIT_FOR_TICK_BEGIN, $signal; 3940 push @WAIT_FOR_TICK_BEGIN, $signal;
3592 $signal->wait; 3941 $signal->wait;
3593} 3942}
3594 3943
3595$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3944sub tick {
3596 if ($Coro::current != $Coro::main) { 3945 if ($Coro::current != $Coro::main) {
3597 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3946 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3598 unless ++$bug_warning > 10; 3947 unless ++$bug_warning > 10;
3599 return; 3948 return;
3600 } 3949 }
3601 3950
3602 $NOW = $tick_start = EV::now;
3603
3604 cf::server_tick; # one server iteration 3951 cf::server_tick; # one server iteration
3605 3952
3606 $RUNTIME += $TICK; 3953 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3607 $NEXT_TICK += $TICK;
3608 3954
3609 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3955 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3610 $NEXT_RUNTIME_WRITE = $NOW + 10; 3956 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3611 Coro::async_pool { 3957 Coro::async_pool {
3612 $Coro::current->{desc} = "runtime saver"; 3958 $Coro::current->{desc} = "runtime saver";
3613 write_runtime 3959 write_runtime_sync
3614 or warn "ERROR: unable to write runtime file: $!"; 3960 or warn "ERROR: unable to write runtime file: $!";
3615 }; 3961 };
3616 } 3962 }
3617 3963
3618 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3964 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3620 } 3966 }
3621 while (my $sig = shift @WAIT_FOR_TICK) { 3967 while (my $sig = shift @WAIT_FOR_TICK) {
3622 $sig->send; 3968 $sig->send;
3623 } 3969 }
3624 3970
3625 $LOAD = ($NOW - $tick_start) / $TICK; 3971 $LOAD = ($NOW - $TICK_START) / $TICK;
3626 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3972 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3627 3973
3628 _post_tick; 3974 if (0) {
3629}; 3975 if ($NEXT_TICK) {
3630$TICK_WATCHER->priority (EV::MAXPRI); 3976 my $jitter = $TICK_START - $NEXT_TICK;
3977 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3978 warn "jitter $JITTER\n";#d#
3979 }
3980 }
3981}
3631 3982
3632{ 3983{
3984 # configure BDB
3985
3633 BDB::min_parallel 8; 3986 BDB::min_parallel 16;
3634 BDB::max_poll_time $TICK * 0.1; 3987 BDB::max_poll_reqs $TICK * 0.1;
3635 $BDB_POLL_WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb; 3988 $AnyEvent::BDB::WATCHER->priority (1);
3636
3637 BDB::set_sync_prepare {
3638 my $status;
3639 my $current = $Coro::current;
3640 (
3641 sub {
3642 $status = $!;
3643 $current->ready; undef $current;
3644 },
3645 sub {
3646 Coro::schedule while defined $current;
3647 $! = $status;
3648 },
3649 )
3650 };
3651 3989
3652 unless ($DB_ENV) { 3990 unless ($DB_ENV) {
3653 $DB_ENV = BDB::db_env_create; 3991 $DB_ENV = BDB::db_env_create;
3654 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3992 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3655 | BDB::LOG_AUTOREMOVE, 1); 3993 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3994 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3656 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3995 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3657 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3996 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3658 3997
3659 cf::sync_job { 3998 cf::sync_job {
3660 eval { 3999 eval {
3682 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4021 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3683 }; 4022 };
3684} 4023}
3685 4024
3686{ 4025{
4026 # configure IO::AIO
4027
3687 IO::AIO::min_parallel 8; 4028 IO::AIO::min_parallel 8;
3688
3689 undef $Coro::AIO::WATCHER;
3690 IO::AIO::max_poll_time $TICK * 0.1; 4029 IO::AIO::max_poll_time $TICK * 0.1;
3691 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb; 4030 undef $AnyEvent::AIO::WATCHER;
3692} 4031}
3693 4032
3694my $_log_backtrace; 4033my $_log_backtrace;
3695 4034
3696sub _log_backtrace { 4035sub _log_backtrace {
3699 $msg =~ s/\n//; 4038 $msg =~ s/\n//;
3700 4039
3701 # limit the # of concurrent backtraces 4040 # limit the # of concurrent backtraces
3702 if ($_log_backtrace < 2) { 4041 if ($_log_backtrace < 2) {
3703 ++$_log_backtrace; 4042 ++$_log_backtrace;
4043 my $perl_bt = Carp::longmess $msg;
3704 async { 4044 async {
3705 $Coro::current->{desc} = "abt $msg"; 4045 $Coro::current->{desc} = "abt $msg";
3706 4046
3707 my @bt = fork_call { 4047 my @bt = fork_call {
3708 @addr = map { sprintf "%x", $_ } @addr; 4048 @addr = map { sprintf "%x", $_ } @addr;
3719 } 4059 }
3720 4060
3721 @funcs 4061 @funcs
3722 }; 4062 };
3723 4063
3724 LOG llevInfo, "[ABT] $msg\n"; 4064 LOG llevInfo, "[ABT] $perl_bt\n";
4065 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3725 LOG llevInfo, "[ABT] $_\n" for @bt; 4066 LOG llevInfo, "[ABT] $_\n" for @bt;
3726 --$_log_backtrace; 4067 --$_log_backtrace;
3727 }; 4068 };
3728 } else { 4069 } else {
3729 LOG llevInfo, "[ABT] $msg\n"; 4070 LOG llevInfo, "[ABT] $msg\n";
3730 LOG llevInfo, "[ABT] [suppressed]\n"; 4071 LOG llevInfo, "[ABT] [suppressed]\n";
3731 } 4072 }
3732} 4073}
3733 4074
3734# load additional modules 4075# load additional modules
3735use cf::pod; 4076require "cf/$_.pm" for @EXTRA_MODULES;
4077cf::_connect_to_perl_2;
3736 4078
3737END { cf::emergency_save } 4079END { cf::emergency_save }
3738 4080
37391 40811
3740 4082

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines