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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines