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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.398 by root, Wed Dec 5 11:08:34 2007 UTC vs.
Revision 1.526 by root, Wed Apr 21 05:48:35 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines