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.402 by root, Mon Dec 17 07:03:32 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.32 (); 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;
23use Coro::BDB; 51use Coro::BDB 1.6;
24use Coro::Storable; 52use Coro::Storable;
25use Coro::Util (); 53use Coro::Util ();
26 54
27use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
28use BDB (); 56use BDB ();
29use Data::Dumper; 57use Data::Dumper;
30use Digest::MD5;
31use Fcntl; 58use Fcntl;
32use YAML::Syck (); 59use YAML::XS ();
33use IO::AIO 2.51 (); 60use IO::AIO ();
34use Time::HiRes; 61use Time::HiRes;
35use Compress::LZF; 62use Compress::LZF;
36use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
37 66
38# configure various modules to our taste 67# configure various modules to our taste
39# 68#
40$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
41Coro::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";
42Compress::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
43 77
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 78# strictly for debugging
45$YAML::Syck::ImplicitUnicode = 1; 79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
46
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 80
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 82
51our %COMMAND = (); 83our %COMMAND = ();
52our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
55our %EXTCMD = (); 87our %EXTCMD = ();
56our %EXTICMD = (); 88our %EXTICMD = ();
57our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
58our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
59 91
60our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
61our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
62 96
63our $CONFDIR = confdir; 97our $CONFDIR = confdir;
64our $DATADIR = datadir; 98our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
68our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
73our $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;
74 115
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 118our $NEXT_TICK;
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;
92our $NOW; 132our $NOW;
98# 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 ∕
99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 139our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
100 140
101our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
102our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
143our $JITTER; # average jitter
103our $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 :)
104 150
105binmode STDOUT; 151binmode STDOUT;
106binmode STDERR; 152binmode STDERR;
107 153
108# read virtual server time, if available 154# read virtual server time, if available
109unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 155unless ($RUNTIME || !-e $RUNTIMEFILE) {
110 open my $fh, "<", "$LOCALDIR/runtime" 156 open my $fh, "<", $RUNTIMEFILE
111 or die "unable to read runtime file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
112 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
113} 159}
160
161eval "sub TICK() { $TICK } 1" or die;
114 162
115mkdir $_ 163mkdir $_
116 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
117 165
118our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
119 167
120sub 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::"} };
121 184
122############################################################################# 185#############################################################################
123 186
124=head2 GLOBAL VARIABLES 187=head2 GLOBAL VARIABLES
125 188
172returns 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
173per 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.
174 237
175=item @cf::INVOKE_RESULTS 238=item @cf::INVOKE_RESULTS
176 239
177This array contains the results of the last C<invoke ()> call. When 240This array contains the results of the last C<invoke ()> call. When
178C<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
179that call. 242that call.
180 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
181=back 250=back
182 251
183=cut 252=cut
184 253
185BEGIN { 254$Coro::State::WARNHOOK = sub {
186 *CORE::GLOBAL::warn = sub {
187 my $msg = join "", @_; 255 my $msg = join "", @_;
188 256
189 $msg .= "\n" 257 $msg .= "\n"
190 unless $msg =~ /\n$/; 258 unless $msg =~ /\n$/;
191 259
192 $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;
193 261
194 LOG llevError, $msg; 262 LOG llevError, $msg;
195 }; 263};
196} 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};
197 278
198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 279@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
199@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 280@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
200@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 281@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
201@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 282@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
208for my $pkg (qw( 289for my $pkg (qw(
209 cf::global cf::attachable 290 cf::global cf::attachable
210 cf::object cf::object::player 291 cf::object cf::object::player
211 cf::client cf::player 292 cf::client cf::player
212 cf::arch cf::living 293 cf::arch cf::living
294 cf::map cf::mapspace
213 cf::map cf::party cf::region 295 cf::party cf::region
214)) { 296)) {
215 no strict 'refs';
216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 297 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
217} 298}
218 299
219$EV::DIED = sub { 300$EV::DIED = sub {
220 warn "error in event callback: @_"; 301 Carp::cluck "error in event callback: @_";
221}; 302};
222 303
223############################################################################# 304#############################################################################
224 305
225=head2 UTILITY FUNCTIONS 306=head2 UTILITY FUNCTIONS
262our $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
263 344
264sub encode_json($) { $json_coder->encode ($_[0]) } 345sub encode_json($) { $json_coder->encode ($_[0]) }
265sub decode_json($) { $json_coder->decode ($_[0]) } 346sub decode_json($) { $json_coder->decode ($_[0]) }
266 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
267=item cf::lock_wait $string 362=item cf::lock_wait $string
268 363
269Wait until the given lock is available. See cf::lock_acquire. 364Wait until the given lock is available. See cf::lock_acquire.
270 365
271=item my $lock = cf::lock_acquire $string 366=item my $lock = cf::lock_acquire $string
272 367
273Wait 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
274a 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,
275for example when the coroutine gets canceled), the lock is automatically 370for example when the coroutine gets canceled), the lock is automatically
276returned. 371returned.
277 372
278Locks 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
279deadlocked coro. 374deadlocked coro.
285 380
286Return 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.
287 382
288=cut 383=cut
289 384
290our %LOCK; 385our $LOCKS = new Coro::SemaphoreSet;
291our %LOCKER;#d#
292 386
293sub lock_wait($) { 387sub lock_wait($) {
294 my ($key) = @_; 388 $LOCKS->wait ($_[0]);
295
296 if ($LOCKER{$key} == $Coro::current) {#d#
297 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
298 return;#d#
299 }#d#
300
301 # wait for lock, if any
302 while ($LOCK{$key}) {
303 push @{ $LOCK{$key} }, $Coro::current;
304 Coro::schedule;
305 }
306} 389}
307 390
308sub lock_acquire($) { 391sub lock_acquire($) {
309 my ($key) = @_; 392 $LOCKS->guard ($_[0])
310
311 # wait, to be sure we are not locked
312 lock_wait $key;
313
314 $LOCK{$key} = [];
315 $LOCKER{$key} = $Coro::current;#d#
316
317 Coro::guard {
318 delete $LOCKER{$key};#d#
319 # wake up all waiters, to be on the safe side
320 $_->ready for @{ delete $LOCK{$key} };
321 }
322} 393}
323 394
324sub lock_active($) { 395sub lock_active($) {
325 my ($key) = @_; 396 $LOCKS->count ($_[0]) < 1
326
327 ! ! $LOCK{$key}
328} 397}
329 398
330sub freeze_mainloop { 399sub freeze_mainloop {
331 return unless $TICK_WATCHER->is_active; 400 tick_inhibit_inc;
332 401
333 my $guard = Coro::guard { 402 &Guard::guard (\&tick_inhibit_dec);
334 $TICK_WATCHER->start;
335 };
336 $TICK_WATCHER->stop;
337 $guard
338} 403}
339 404
340=item cf::periodic $interval, $cb 405=item cf::periodic $interval, $cb
341 406
342Like 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
343get spread over timer. 408get spread over time.
344 409
345=cut 410=cut
346 411
347sub periodic($$) { 412sub periodic($$) {
348 my ($interval, $cb) = @_; 413 my ($interval, $cb) = @_;
365 430
366=cut 431=cut
367 432
368our @SLOT_QUEUE; 433our @SLOT_QUEUE;
369our $SLOT_QUEUE; 434our $SLOT_QUEUE;
435our $SLOT_DECAY = 0.9;
370 436
371$SLOT_QUEUE->cancel if $SLOT_QUEUE; 437$SLOT_QUEUE->cancel if $SLOT_QUEUE;
372$SLOT_QUEUE = Coro::async { 438$SLOT_QUEUE = Coro::async {
373 $Coro::current->desc ("timeslot manager"); 439 $Coro::current->desc ("timeslot manager");
374 440
375 my $signal = new Coro::Signal; 441 my $signal = new Coro::Signal;
442 my $busy;
376 443
377 while () { 444 while () {
378 next_job: 445 next_job:
446
379 my $avail = cf::till_tick; 447 my $avail = cf::till_tick;
380 if ($avail > 0.01) { 448
381 for (0 .. $#SLOT_QUEUE) { 449 for (0 .. $#SLOT_QUEUE) {
382 if ($SLOT_QUEUE[$_][0] < $avail) { 450 if ($SLOT_QUEUE[$_][0] <= $avail) {
451 $busy = 0;
383 my $job = splice @SLOT_QUEUE, $_, 1, (); 452 my $job = splice @SLOT_QUEUE, $_, 1, ();
384 $job->[2]->send; 453 $job->[2]->send;
385 Coro::cede; 454 Coro::cede;
386 goto next_job; 455 goto next_job;
387 } 456 } else {
457 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
388 } 458 }
389 } 459 }
390 460
391 if (@SLOT_QUEUE) { 461 if (@SLOT_QUEUE) {
392 # 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
393 push @cf::WAIT_FOR_TICK, $signal; 463 push @cf::WAIT_FOR_TICK, $signal;
394 $signal->wait; 464 $signal->wait;
395 } else { 465 } else {
466 $busy = 0;
396 Coro::schedule; 467 Coro::schedule;
397 } 468 }
398 } 469 }
399}; 470};
400 471
401sub get_slot($;$$) { 472sub get_slot($;$$) {
473 return if tick_inhibit || $Coro::current == $Coro::main;
474
402 my ($time, $pri, $name) = @_; 475 my ($time, $pri, $name) = @_;
403 476
404 $time = $TICK * .6 if $time > $TICK * .6; 477 $time = clamp $time, 0.01, $TICK * .6;
478
405 my $sig = new Coro::Signal; 479 my $sig = new Coro::Signal;
406 480
407 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 481 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
408 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 482 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
409 $SLOT_QUEUE->ready; 483 $SLOT_QUEUE->ready;
436 510
437sub sync_job(&) { 511sub sync_job(&) {
438 my ($job) = @_; 512 my ($job) = @_;
439 513
440 if ($Coro::current == $Coro::main) { 514 if ($Coro::current == $Coro::main) {
441 my $time = EV::time; 515 my $time = AE::time;
442 516
443 # this is the main coro, too bad, we have to block 517 # this is the main coro, too bad, we have to block
444 # till the operation succeeds, freezing the server :/ 518 # till the operation succeeds, freezing the server :/
445 519
446 LOG llevError, Carp::longmess "sync job";#d# 520 LOG llevError, Carp::longmess "sync job";#d#
447 521
448 # TODO: use suspend/resume instead
449 # (but this is cancel-safe)
450 my $freeze_guard = freeze_mainloop; 522 my $freeze_guard = freeze_mainloop;
451 523
452 my $busy = 1; 524 my $busy = 1;
453 my @res; 525 my @res;
454 526
465 } else { 537 } else {
466 EV::loop EV::LOOP_ONESHOT; 538 EV::loop EV::LOOP_ONESHOT;
467 } 539 }
468 } 540 }
469 541
470 $time = EV::time - $time; 542 my $time = AE::time - $time;
471 543
472 LOG llevError | logBacktrace, Carp::longmess "long sync job"
473 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
474
475 $tick_start += $time; # do not account sync jobs to server load 544 $TICK_START += $time; # do not account sync jobs to server load
476 545
477 wantarray ? @res : $res[0] 546 wantarray ? @res : $res[0]
478 } else { 547 } else {
479 # we are in another coroutine, how wonderful, everything just works 548 # we are in another coroutine, how wonderful, everything just works
480 549
522 reset_signals; 591 reset_signals;
523 &$cb 592 &$cb
524 }, @args; 593 }, @args;
525 594
526 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
527} 634}
528 635
529=item $value = cf::db_get $family => $key 636=item $value = cf::db_get $family => $key
530 637
531Returns a single value from the environment database. 638Returns a single value from the environment database.
670 777
671############################################################################# 778#############################################################################
672 779
673=head2 ATTACHABLE OBJECTS 780=head2 ATTACHABLE OBJECTS
674 781
675Many 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
676attach callbacks/event handlers (a collection of which is called an "attachment") 783attach callbacks/event handlers (a collection of which is called an "attachment")
677to it. All such attachable objects support the following methods. 784to it. All such attachable objects support the following methods.
678 785
679In 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>
680C<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
730=item cf::CLASS::attachment $name, ... 837=item cf::CLASS::attachment $name, ...
731 838
732Register an attachment by C<$name> through which attachable objects of the 839Register an attachment by C<$name> through which attachable objects of the
733given CLASS can refer to this attachment. 840given CLASS can refer to this attachment.
734 841
735Some classes such as crossfire maps and objects can specify attachments 842Some classes such as deliantra maps and objects can specify attachments
736that 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.
737 844
738These calls expect any number of the following handler/hook descriptions: 845These calls expect any number of the following handler/hook descriptions:
739 846
740=over 4 847=over 4
968 } 1075 }
969 1076
970 0 1077 0
971} 1078}
972 1079
973=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1080=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
974 1081
975=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1082=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
976 1083
977Generate an object-specific event with the given arguments. 1084Generate an object-specific event with the given arguments.
978 1085
1031 1138
1032sub reattach { 1139sub reattach {
1033 # basically do the same as instantiate, without calling instantiate 1140 # basically do the same as instantiate, without calling instantiate
1034 my ($obj) = @_; 1141 my ($obj) = @_;
1035 1142
1143 # no longer needed after getting rid of delete_package?
1036 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
1037 1145
1038 my $registry = $obj->registry; 1146 my $registry = $obj->registry;
1039 1147
1040 @$registry = (); 1148 @$registry = ();
1041 1149
1087 utf8::decode (my $decname = $filename); 1195 utf8::decode (my $decname = $filename);
1088 warn sprintf "saving %s (%d,%d)\n", 1196 warn sprintf "saving %s (%d,%d)\n",
1089 $decname, length $$rdata, scalar @$objs; 1197 $decname, length $$rdata, scalar @$objs;
1090 1198
1091 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1092 chmod SAVE_MODE, $fh; 1200 aio_chmod $fh, SAVE_MODE;
1093 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1094 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 }
1095 close $fh; 1206 aio_close $fh;
1096 1207
1097 if (@$objs) { 1208 if (@$objs) {
1098 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) {
1099 chmod SAVE_MODE, $fh; 1210 aio_chmod $fh, SAVE_MODE;
1100 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1211 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1101 aio_write $fh, 0, (length $data), $data, 0; 1212 aio_write $fh, 0, (length $data), $data, 0;
1102 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 }
1103 close $fh; 1217 aio_close $fh;
1104 aio_rename "$filename.pst~", "$filename.pst"; 1218 aio_rename "$filename.pst~", "$filename.pst";
1105 } 1219 }
1106 } else { 1220 } else {
1107 aio_unlink "$filename.pst"; 1221 aio_unlink "$filename.pst";
1108 } 1222 }
1109 1223
1110 aio_rename "$filename~", $filename; 1224 aio_rename "$filename~", $filename;
1225
1226 $filename =~ s%/[^/]+$%%;
1227 aio_pathsync $filename if $cf::USE_FSYNC;
1111 } else { 1228 } else {
1112 warn "FATAL: $filename~: $!\n"; 1229 warn "unable to save objects: $filename~: $!\n";
1113 } 1230 }
1114 } else { 1231 } else {
1115 aio_unlink $filename; 1232 aio_unlink $filename;
1116 aio_unlink "$filename.pst"; 1233 aio_unlink "$filename.pst";
1117 } 1234 }
1208 my ($name, $cb) = @_; 1325 my ($name, $cb) = @_;
1209 1326
1210 $EXTICMD{$name} = $cb; 1327 $EXTICMD{$name} = $cb;
1211} 1328}
1212 1329
1330use File::Glob ();
1331
1213cf::player->attach ( 1332cf::player->attach (
1214 on_command => sub { 1333 on_unknown_command => sub {
1215 my ($pl, $name, $params) = @_; 1334 my ($pl, $name, $params) = @_;
1216 1335
1217 my $cb = $COMMAND{$name} 1336 my $cb = $COMMAND{$name}
1218 or return; 1337 or return;
1219 1338
1249 1368
1250 cf::override; 1369 cf::override;
1251 }, 1370 },
1252); 1371);
1253 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
1254sub load_extensions { 1386sub load_extensions {
1255 cf::sync_job { 1387 cf::sync_job {
1256 my %todo; 1388 my %todo;
1257 1389
1258 for my $path (<$LIBDIR/*.ext>) { 1390 for my $path (<$LIBDIR/*.ext>) {
1277 1409
1278 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1410 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1279 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1411 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1280 1412
1281 $ext{source} = 1413 $ext{source} =
1282 "package $pkg; use strict; use utf8;\n" 1414 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1283 . "#line 1 \"$path\"\n{\n" 1415 . "#line 1 \"$path\"\n{\n"
1284 . $source 1416 . $source
1285 . "\n};\n1"; 1417 . "\n};\n1";
1286 1418
1287 $todo{$base} = \%ext; 1419 $todo{$base} = \%ext;
1288 } 1420 }
1289 1421
1422 my $pass = 0;
1290 my %done; 1423 my %done;
1291 while (%todo) { 1424 while (%todo) {
1292 my $progress; 1425 my $progress;
1293 1426
1427 ++$pass;
1428
1429 ext:
1294 while (my ($k, $v) = each %todo) { 1430 while (my ($k, $v) = each %todo) {
1295 for (split /,\s*/, $v->{meta}{depends}) { 1431 for (split /,\s*/, $v->{meta}{depends}) {
1296 goto skip 1432 next ext
1297 unless exists $done{$_}; 1433 unless exists $done{$_};
1298 } 1434 }
1299 1435
1300 warn "... loading '$k' into '$v->{pkg}'\n"; 1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1301 1437
1302 unless (eval $v->{source}) { 1438 my $active = eval $v->{source};
1439
1440 if (length $@) {
1303 my $msg = $@ ? "$v->{path}: $@\n" 1441 warn "$v->{path}: $@\n";
1304 : "$v->{base}: extension inactive.\n";
1305 1442
1443 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1306 if (exists $v->{meta}{mandatory}) { 1444 if exists $v->{meta}{mandatory};
1307 warn $msg; 1445
1308 warn "mandatory extension failed to load, exiting.\n"; 1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1309 exit 1; 1447 delete $todo{$k};
1310 } 1448 } else {
1311 1449 $done{$k} = delete $todo{$k};
1312 warn $msg; 1450 push @EXTS, $v->{pkg};
1451 $progress = 1;
1452
1453 warn "$v->{base}: extension inactive.\n"
1454 unless $active;
1313 } 1455 }
1314
1315 $done{$k} = delete $todo{$k};
1316 push @EXTS, $v->{pkg};
1317 $progress = 1;
1318 } 1456 }
1319 1457
1320 skip: 1458 unless ($progress) {
1321 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1459 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1322 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 }
1323 } 1466 }
1324 }; 1467 };
1325} 1468}
1326 1469
1327############################################################################# 1470#############################################################################
1328 1471
1329=back 1472=back
1330 1473
1331=head2 CORE EXTENSIONS 1474=head2 CORE EXTENSIONS
1332 1475
1333Functions and methods that extend core crossfire objects. 1476Functions and methods that extend core deliantra objects.
1334 1477
1335=cut 1478=cut
1336 1479
1337package cf::player; 1480package cf::player;
1338 1481
1381 1524
1382sub exists($) { 1525sub exists($) {
1383 my ($login) = @_; 1526 my ($login) = @_;
1384 1527
1385 $cf::PLAYER{$login} 1528 $cf::PLAYER{$login}
1386 or cf::sync_job { !aio_stat path $login } 1529 or !aio_stat path $login
1387} 1530}
1388 1531
1389sub find($) { 1532sub find($) {
1390 return $cf::PLAYER{$_[0]} || do { 1533 return $cf::PLAYER{$_[0]} || do {
1391 my $login = $_[0]; 1534 my $login = $_[0];
1403 my $f = new_from_file cf::object::thawer path $login 1546 my $f = new_from_file cf::object::thawer path $login
1404 or return; 1547 or return;
1405 1548
1406 my $pl = cf::player::load_pl $f 1549 my $pl = cf::player::load_pl $f
1407 or return; 1550 or return;
1551
1408 local $cf::PLAYER_LOADING{$login} = $pl; 1552 local $cf::PLAYER_LOADING{$login} = $pl;
1409 $f->resolve_delayed_derefs; 1553 $f->resolve_delayed_derefs;
1410 $cf::PLAYER{$login} = $pl 1554 $cf::PLAYER{$login} = $pl
1411 } 1555 }
1412 } 1556 }
1413} 1557}
1414 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
1415sub save($) { 1572sub save($) {
1416 my ($pl) = @_; 1573 my ($pl) = @_;
1417 1574
1418 return if $pl->{deny_save}; 1575 return if $pl->{deny_save};
1419 1576
1422 1579
1423 return if $pl->{deny_save}; 1580 return if $pl->{deny_save};
1424 1581
1425 aio_mkdir playerdir $pl, 0770; 1582 aio_mkdir playerdir $pl, 0770;
1426 $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];
1427 1589
1428 $pl->save_pl ($path); 1590 $pl->save_pl ($path);
1429 cf::cede_to_tick; 1591 cf::cede_to_tick;
1430} 1592}
1431 1593
1463 my ($pl) = @_; 1625 my ($pl) = @_;
1464 1626
1465 my $name = $pl->ob->name; 1627 my $name = $pl->ob->name;
1466 1628
1467 $pl->{deny_save} = 1; 1629 $pl->{deny_save} = 1;
1468 $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
1469 1631
1470 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1632 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1471 $pl->deactivate; 1633 $pl->deactivate;
1634 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1635 $pl->ob->check_score;
1472 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1636 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1473 $pl->ns->destroy if $pl->ns; 1637 $pl->ns->destroy if $pl->ns;
1474 1638
1475 my $path = playerdir $pl; 1639 my $path = playerdir $pl;
1476 my $temp = "$path~$cf::RUNTIME~deleting~"; 1640 my $temp = "$path~$cf::RUNTIME~deleting~";
1515 1679
1516 for my $login (@$dirs) { 1680 for my $login (@$dirs) {
1517 my $path = path $login; 1681 my $path = path $login;
1518 1682
1519 # a .pst is a dead give-away for a valid player 1683 # a .pst is a dead give-away for a valid player
1520 unless (-e "$path.pst") { 1684 # if no pst file found, open and chekc for blocked users
1685 if (aio_stat "$path.pst") {
1521 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1686 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1522 aio_read $fh, 0, 512, my $buf, 0 or next; 1687 aio_read $fh, 0, 512, my $buf, 0 or next;
1523 $buf !~ /^password -------------$/m or next; # official not-valid tag 1688 $buf !~ /^password -------------$/m or next; # official not-valid tag
1524 } 1689 }
1525 1690
1529 1694
1530 \@logins 1695 \@logins
1531} 1696}
1532 1697
1533=item $player->maps 1698=item $player->maps
1699
1700=item cf::player::maps $login
1534 1701
1535Returns an arrayref of map paths that are private for this 1702Returns an arrayref of map paths that are private for this
1536player. May block. 1703player. May block.
1537 1704
1538=cut 1705=cut
1556 } 1723 }
1557 1724
1558 \@paths 1725 \@paths
1559} 1726}
1560 1727
1561=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1728=item $protocol_xml = $player->expand_cfpod ($cfpod)
1562 1729
1563Expand crossfire pod fragments into protocol xml. 1730Expand deliantra pod fragments into protocol xml.
1564
1565=cut
1566
1567use re 'eval';
1568
1569my $group;
1570my $interior; $interior = qr{
1571 # match a pod interior sequence sans C<< >>
1572 (?:
1573 \ (.*?)\ (?{ $group = $^N })
1574 | < (??{$interior}) >
1575 )
1576}x;
1577
1578sub expand_cfpod {
1579 my ($self, $pod) = @_;
1580
1581 my $xml;
1582
1583 while () {
1584 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1585 $group = $1;
1586
1587 $group =~ s/&/&amp;/g;
1588 $group =~ s/</&lt;/g;
1589
1590 $xml .= $group;
1591 } elsif ($pod =~ m%\G
1592 ([BCGHITU])
1593 <
1594 (?:
1595 ([^<>]*) (?{ $group = $^N })
1596 | < $interior >
1597 )
1598 >
1599 %gcsx
1600 ) {
1601 my ($code, $data) = ($1, $group);
1602
1603 if ($code eq "B") {
1604 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1605 } elsif ($code eq "I") {
1606 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1607 } elsif ($code eq "U") {
1608 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1609 } elsif ($code eq "C") {
1610 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1611 } elsif ($code eq "T") {
1612 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1613 } elsif ($code eq "G") {
1614 my ($male, $female) = split /\|/, $data;
1615 $data = $self->gender ? $female : $male;
1616 $xml .= expand_cfpod ($self, $data);
1617 } elsif ($code eq "H") {
1618 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1619 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1620 "")
1621 [$self->{hintmode}];
1622 } else {
1623 $xml .= "error processing '$code($data)' directive";
1624 }
1625 } else {
1626 if ($pod =~ /\G(.+)/) {
1627 warn "parse error while expanding $pod (at $1)";
1628 }
1629 last;
1630 }
1631 }
1632
1633 for ($xml) {
1634 # create single paragraphs (very hackish)
1635 s/(?<=\S)\n(?=\w)/ /g;
1636
1637 # compress some whitespace
1638 s/\s+\n/\n/g; # ws line-ends
1639 s/\n\n+/\n/g; # double lines
1640 s/^\n+//; # beginning lines
1641 s/\n+$//; # ending lines
1642 }
1643
1644 $xml
1645}
1646
1647no re 'eval';
1648
1649sub hintmode {
1650 $_[0]{hintmode} = $_[1] if @_ > 1;
1651 $_[0]{hintmode}
1652}
1653 1731
1654=item $player->ext_reply ($msgid, @msg) 1732=item $player->ext_reply ($msgid, @msg)
1655 1733
1656Sends an ext reply to the player. 1734Sends an ext reply to the player.
1657 1735
1689 1767
1690=cut 1768=cut
1691 1769
1692sub find_by_path($) { 1770sub find_by_path($) {
1693 my ($path) = @_; 1771 my ($path) = @_;
1772
1773 $path =~ s/^~[^\/]*//; # skip ~login
1694 1774
1695 my ($match, $specificity); 1775 my ($match, $specificity);
1696 1776
1697 for my $region (list) { 1777 for my $region (list) {
1698 if ($region->{match} && $path =~ $region->{match}) { 1778 if ($region->{match} && $path =~ $region->{match}) {
1724our $MAX_RESET = 3600; 1804our $MAX_RESET = 3600;
1725our $DEFAULT_RESET = 3000; 1805our $DEFAULT_RESET = 3000;
1726 1806
1727sub generate_random_map { 1807sub generate_random_map {
1728 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
1729 # mit "rum" bekleckern, nicht 1812 # mit "rum" bekleckern, nicht
1730 $self->_create_random_map ( 1813 $self->_create_random_map (
1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1814 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1815 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1816 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1734 $rmp->{exit_on_final_map}, 1817 $rmp->{exit_on_final_map},
1735 $rmp->{xsize}, $rmp->{ysize}, 1818 $rmp->{xsize}, $rmp->{ysize},
1736 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1819 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1737 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1820 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1759 1842
1760 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1843 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1761} 1844}
1762 1845
1763# also paths starting with '/' 1846# also paths starting with '/'
1764$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1847$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1765 1848
1766sub thawer_merge { 1849sub thawer_merge {
1767 my ($self, $merge) = @_; 1850 my ($self, $merge) = @_;
1768 1851
1769 # we have to keep some variables in memory intact 1852 # we have to keep some variables in memory intact
1855 1938
1856# the temporary/swap location 1939# the temporary/swap location
1857sub save_path { 1940sub save_path {
1858 my ($self) = @_; 1941 my ($self) = @_;
1859 1942
1860 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1943 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1861 "$TMPDIR/$path.map" 1944 "$TMPDIR/$path.map"
1862} 1945}
1863 1946
1864# the unique path, undef == no special unique path 1947# the unique path, undef == no special unique path
1865sub uniq_path { 1948sub uniq_path {
1866 my ($self) = @_; 1949 my ($self) = @_;
1867 1950
1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1951 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1869 "$UNIQUEDIR/$path" 1952 "$UNIQUEDIR/$path"
1870}
1871
1872# and all this just because we cannot iterate over
1873# all maps in C++...
1874sub change_all_map_light {
1875 my ($change) = @_;
1876
1877 $_->change_map_light ($change)
1878 for grep $_->outdoor, values %cf::MAP;
1879} 1953}
1880 1954
1881sub decay_objects { 1955sub decay_objects {
1882 my ($self) = @_; 1956 my ($self) = @_;
1883 1957
1967sub find { 2041sub find {
1968 my ($path, $origin) = @_; 2042 my ($path, $origin) = @_;
1969 2043
1970 $path = normalise $path, $origin && $origin->path; 2044 $path = normalise $path, $origin && $origin->path;
1971 2045
1972 cf::lock_wait "map_data:$path";#d#remove 2046 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 cf::lock_wait "map_find:$path"; 2047 my $guard2 = cf::lock_acquire "map_find:$path";
1974 2048
1975 $cf::MAP{$path} || do { 2049 $cf::MAP{$path} || do {
1976 my $guard1 = cf::lock_acquire "map_find:$path";
1977 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1978
1979 my $map = new_from_path cf::map $path 2050 my $map = new_from_path cf::map $path
1980 or return; 2051 or return;
1981 2052
1982 $map->{last_save} = $cf::RUNTIME; 2053 $map->{last_save} = $cf::RUNTIME;
1983 2054
1985 or return; 2056 or return;
1986 2057
1987 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2058 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1988 # doing this can freeze the server in a sync job, obviously 2059 # doing this can freeze the server in a sync job, obviously
1989 #$cf::WAIT_FOR_TICK->wait; 2060 #$cf::WAIT_FOR_TICK->wait;
2061 undef $guard2;
1990 undef $guard1; 2062 undef $guard1;
1991 undef $guard2;
1992 $map->reset; 2063 $map->reset;
1993 return find $path; 2064 return find $path;
1994 } 2065 }
1995 2066
1996 $cf::MAP{$path} = $map 2067 $cf::MAP{$path} = $map
1997 } 2068 }
1998} 2069}
1999 2070
2000sub pre_load { } 2071sub pre_load { }
2001sub post_load { } 2072#sub post_load { } # XS
2002 2073
2003sub load { 2074sub load {
2004 my ($self) = @_; 2075 my ($self) = @_;
2005 2076
2006 local $self->{deny_reset} = 1; # loading can take a long time 2077 local $self->{deny_reset} = 1; # loading can take a long time
2023 my $f = new_from_file cf::object::thawer $self->{load_path}; 2094 my $f = new_from_file cf::object::thawer $self->{load_path};
2024 $f->skip_block; 2095 $f->skip_block;
2025 $self->_load_objects ($f) 2096 $self->_load_objects ($f)
2026 or return; 2097 or return;
2027 2098
2028 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2099 $self->post_load_original
2029 if delete $self->{load_original}; 2100 if delete $self->{load_original};
2030 2101
2031 if (my $uniq = $self->uniq_path) { 2102 if (my $uniq = $self->uniq_path) {
2032 utf8::encode $uniq; 2103 utf8::encode $uniq;
2033 unless (aio_stat $uniq) { 2104 unless (aio_stat $uniq) {
2051 unless ($self->{deny_activate}) { 2122 unless ($self->{deny_activate}) {
2052 $self->decay_objects; 2123 $self->decay_objects;
2053 $self->fix_auto_apply; 2124 $self->fix_auto_apply;
2054 $self->update_buttons; 2125 $self->update_buttons;
2055 cf::cede_to_tick; 2126 cf::cede_to_tick;
2056 $self->set_darkness_map;
2057 cf::cede_to_tick;
2058 $self->activate; 2127 $self->activate;
2059 } 2128 }
2060 2129
2061 $self->{last_save} = $cf::RUNTIME; 2130 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME); 2131 $self->last_access ($cf::RUNTIME);
2063 2132
2064 $self->in_memory (cf::MAP_IN_MEMORY); 2133 $self->in_memory (cf::MAP_ACTIVE);
2065 } 2134 }
2066 2135
2067 $self->post_load; 2136 $self->post_load;
2068} 2137}
2069 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
2070sub customise_for { 2142sub customise_for {
2071 my ($self, $ob) = @_; 2143 my ($self, $ob) = @_;
2072 2144
2073 return find "~" . $ob->name . "/" . $self->{path} 2145 return find "~" . $ob->name . "/" . $self->{path}
2074 if $self->per_player; 2146 if $self->per_player;
2127 my ($path, $origin, $load) = @_; 2199 my ($path, $origin, $load) = @_;
2128 2200
2129 $path = normalise $path, $origin && $origin->{path}; 2201 $path = normalise $path, $origin && $origin->{path};
2130 2202
2131 if (my $map = $cf::MAP{$path}) { 2203 if (my $map = $cf::MAP{$path}) {
2132 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2204 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2133 } 2205 }
2134 2206
2135 $MAP_PREFETCH{$path} |= $load; 2207 $MAP_PREFETCH{$path} |= $load;
2136 2208
2137 $MAP_PREFETCHER ||= cf::async { 2209 $MAP_PREFETCHER ||= cf::async {
2151 $MAP_PREFETCHER->prio (6); 2223 $MAP_PREFETCHER->prio (6);
2152 2224
2153 () 2225 ()
2154} 2226}
2155 2227
2228# common code, used by both ->save and ->swapout
2156sub save { 2229sub _save {
2157 my ($self) = @_; 2230 my ($self) = @_;
2158
2159 my $lock = cf::lock_acquire "map_data:$self->{path}";
2160 2231
2161 $self->{last_save} = $cf::RUNTIME; 2232 $self->{last_save} = $cf::RUNTIME;
2162 2233
2163 return unless $self->dirty; 2234 return unless $self->dirty;
2164 2235
2173 2244
2174 cf::async { 2245 cf::async {
2175 $Coro::current->{desc} = "map player save"; 2246 $Coro::current->{desc} = "map player save";
2176 $_->contr->save for $self->players; 2247 $_->contr->save for $self->players;
2177 }; 2248 };
2249
2250 cf::get_slot 0.02;
2178 2251
2179 if ($uniq) { 2252 if ($uniq) {
2180 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2253 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2181 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2254 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2182 } else { 2255 } else {
2183 $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);
2184 } 2257 }
2185} 2258}
2186 2259
2260sub save {
2261 my ($self) = @_;
2262
2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2264
2265 $self->_save;
2266}
2267
2187sub swap_out { 2268sub swap_out {
2188 my ($self) = @_; 2269 my ($self) = @_;
2189 2270
2190 # save first because save cedes
2191 $self->save;
2192
2193 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2271 my $lock = cf::lock_acquire "map_data:$self->{path}";
2194 2272
2273 return if $self->in_memory != cf::MAP_ACTIVE;
2274 return if $self->{deny_save};
2195 return if $self->players; 2275 return if $self->players;
2196 return if $self->in_memory != cf::MAP_IN_MEMORY;
2197 return if $self->{deny_save};
2198 2276
2277 # first deactivate the map and "unlink" it from the core
2278 $self->deactivate;
2279 $_->clear_links_to ($self) for values %cf::MAP;
2199 $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};
2200 2327
2201 $self->deactivate; 2328 $self->deactivate;
2202 $_->clear_links_to ($self) for values %cf::MAP; 2329 $_->clear_links_to ($self) for values %cf::MAP;
2203 $self->clear; 2330 $self->clear;
2204}
2205
2206sub reset_at {
2207 my ($self) = @_;
2208
2209 # TODO: safety, remove and allow resettable per-player maps
2210 return 1e99 if $self->{deny_reset};
2211
2212 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2213 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2214
2215 $time + $to
2216}
2217
2218sub should_reset {
2219 my ($self) = @_;
2220
2221 $self->reset_at <= $cf::RUNTIME
2222}
2223
2224sub reset {
2225 my ($self) = @_;
2226
2227 my $lock = cf::lock_acquire "map_data:$self->{path}";
2228
2229 return if $self->players;
2230
2231 warn "resetting map ", $self->path;
2232
2233 $self->in_memory (cf::MAP_SWAPPED);
2234
2235 # need to save uniques path
2236 unless ($self->{deny_save}) {
2237 my $uniq = $self->uniq_path; utf8::encode $uniq;
2238
2239 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2240 if $uniq;
2241 }
2242
2243 delete $cf::MAP{$self->path};
2244
2245 $self->deactivate;
2246 $_->clear_links_to ($self) for values %cf::MAP;
2247 $self->clear;
2248 2331
2249 $self->unlink_save; 2332 $self->unlink_save;
2250 $self->destroy; 2333 $self->destroy;
2251} 2334}
2252 2335
2260 2343
2261 delete $cf::MAP{$self->path}; 2344 delete $cf::MAP{$self->path};
2262 2345
2263 $self->unlink_save; 2346 $self->unlink_save;
2264 2347
2265 bless $self, "cf::map"; 2348 bless $self, "cf::map::wrap";
2266 delete $self->{deny_reset}; 2349 delete $self->{deny_reset};
2267 $self->{deny_save} = 1; 2350 $self->{deny_save} = 1;
2268 $self->reset_timeout (1); 2351 $self->reset_timeout (1);
2269 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2352 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2270 2353
2319 2402
2320sub unique_maps() { 2403sub unique_maps() {
2321 [ 2404 [
2322 map { 2405 map {
2323 utf8::decode $_; 2406 utf8::decode $_;
2324 /\.map$/ 2407 s/\.map$//; # TODO future compatibility hack
2408 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2409 ? ()
2325 ? normalise $_ 2410 : normalise $_
2326 : ()
2327 } @{ aio_readdir $UNIQUEDIR or [] } 2411 } @{ aio_readdir $UNIQUEDIR or [] }
2328 ] 2412 ]
2329} 2413}
2330 2414
2331package 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}
2332 2446
2333=back 2447=back
2334 2448
2335=head3 cf::object 2449=head3 cf::object
2336 2450
2340 2454
2341=over 4 2455=over 4
2342 2456
2343=item $ob->inv_recursive 2457=item $ob->inv_recursive
2344 2458
2345Returns 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.
2346 2461
2347=cut 2462=cut
2348 2463
2349sub inv_recursive_; 2464sub inv_recursive_;
2350sub inv_recursive_ { 2465sub inv_recursive_ {
2355 inv_recursive_ inv $_[0] 2470 inv_recursive_ inv $_[0]
2356} 2471}
2357 2472
2358=item $ref = $ob->ref 2473=item $ref = $ob->ref
2359 2474
2360creates 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.
2361 2476
2362=item $ob = cf::object::deref ($refstring) 2477=item $ob = cf::object::deref ($refstring)
2363 2478
2364returns 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,
2365even if the object actually exists. May block. 2480even if the object actually exists. May block.
2397can 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
2398dialogue with the given NPC character. 2513dialogue with the given NPC character.
2399 2514
2400=cut 2515=cut
2401 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
2402# rough implementation of a future "reply" method that works 2531# rough implementation of a future "reply" method that works
2403# with dialog boxes. 2532# with dialog boxes.
2404#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
2405sub cf::object::player::reply($$$;$) { 2534sub cf::object::player::reply($$$;$) {
2406 my ($self, $npc, $msg, $flags) = @_; 2535 my ($self, $npc, $msg, $flags) = @_;
2417 my $dialog = $pl->{npc_dialog}; 2546 my $dialog = $pl->{npc_dialog};
2418 $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));
2419 2548
2420 } else { 2549 } else {
2421 $msg = $npc->name . " says: $msg" if $npc; 2550 $msg = $npc->name . " says: $msg" if $npc;
2422 $self->message ($msg, $flags); 2551 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2423 } 2552 }
2424 } 2553 }
2425} 2554}
2426 2555
2427=item $object->send_msg ($channel, $msg, $color, [extra...]) 2556=item $object->send_msg ($channel, $msg, $color, [extra...])
2452 2581
2453=item $player_object->enter_link 2582=item $player_object->enter_link
2454 2583
2455Freezes 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}>).
2456 2585
2457The 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.
2458I<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.
2459 2590
2460Will never block. 2591Will never block.
2461 2592
2462=item $player_object->leave_link ($map, $x, $y) 2593=item $player_object->leave_link ($map, $x, $y)
2463 2594
2488 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2619 return if UNIVERSAL::isa $self->map, "ext::map_link";
2489 2620
2490 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2491 if $self->map && $self->map->{path} ne "{link}"; 2622 if $self->map && $self->map->{path} ne "{link}";
2492 2623
2493 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2624 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2494} 2625}
2495 2626
2496sub cf::object::player::leave_link { 2627sub cf::object::player::leave_link {
2497 my ($self, $map, $x, $y) = @_; 2628 my ($self, $map, $x, $y) = @_;
2498 2629
2515 ($x, $y) = (-1, -1) 2646 ($x, $y) = (-1, -1)
2516 unless (defined $x) && (defined $y); 2647 unless (defined $x) && (defined $y);
2517 2648
2518 # use -1 or undef as default coordinates, not 0, 0 2649 # use -1 or undef as default coordinates, not 0, 0
2519 ($x, $y) = ($map->enter_x, $map->enter_y) 2650 ($x, $y) = ($map->enter_x, $map->enter_y)
2520 if $x <=0 && $y <= 0; 2651 if $x <= 0 && $y <= 0;
2521 2652
2522 $map->load; 2653 $map->load;
2523 $map->load_neighbours; 2654 $map->load_neighbours;
2524 2655
2525 return unless $self->contr->active; 2656 return unless $self->contr->active;
2526 $self->activate_recursive;
2527 2657
2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2658 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2529 $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
2530} 2664}
2531 2665
2532=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2666=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2533 2667
2534Moves 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
2535her, loading and preparing them map, calling the provided $check callback 2669her, loading and preparing them map, calling the provided $check callback
2536that 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
2537the 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
2538be 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 >>.
2539 2676
2540=cut 2677=cut
2541 2678
2542our $GOTOGEN; 2679our $GOTOGEN;
2543 2680
2622} 2759}
2623 2760
2624sub prepare_random_map { 2761sub prepare_random_map {
2625 my ($exit) = @_; 2762 my ($exit) = @_;
2626 2763
2627 my $guard = cf::lock_acquire "exit_prepare:$exit";
2628
2629 # all this does is basically replace the /! path by 2764 # all this does is basically replace the /! path by
2630 # a new random map path (?random/...) with a seed 2765 # a new random map path (?random/...) with a seed
2631 # that depends on the exit object 2766 # that depends on the exit object
2632 2767
2633 my $rmp = parse_random_map_params $exit->msg; 2768 my $rmp = parse_random_map_params $exit->msg;
2635 if ($exit->map) { 2770 if ($exit->map) {
2636 $rmp->{region} = $exit->region->name; 2771 $rmp->{region} = $exit->region->name;
2637 $rmp->{origin_map} = $exit->map->path; 2772 $rmp->{origin_map} = $exit->map->path;
2638 $rmp->{origin_x} = $exit->x; 2773 $rmp->{origin_x} = $exit->x;
2639 $rmp->{origin_y} = $exit->y; 2774 $rmp->{origin_y} = $exit->y;
2775
2776 $exit->map->touch;
2640 } 2777 }
2641 2778
2642 $rmp->{random_seed} ||= $exit->random_seed; 2779 $rmp->{random_seed} ||= $exit->random_seed;
2643 2780
2644 my $data = cf::encode_json $rmp; 2781 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2645 my $md5 = Digest::MD5::md5_hex $data; 2782 my $md5 = Digest::MD5::md5_hex $data;
2646 my $meta = "$RANDOMDIR/$md5.meta"; 2783 my $meta = "$RANDOMDIR/$md5.meta";
2647 2784
2648 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2785 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2649 aio_write $fh, 0, (length $data), $data, 0; 2786 aio_write $fh, 0, (length $data), $data, 0;
2650 undef $fh; 2787 undef $fh;
2651 aio_rename "$meta~", $meta; 2788 aio_rename "$meta~", $meta;
2652 2789
2790 my $slaying = "?random/$md5";
2791
2792 if ($exit->valid) {
2653 $exit->slaying ("?random/$md5"); 2793 $exit->slaying ("?random/$md5");
2654 $exit->msg (undef); 2794 $exit->msg (undef);
2795 }
2655 } 2796 }
2656} 2797}
2657 2798
2658sub cf::object::player::enter_exit { 2799sub cf::object::player::enter_exit {
2659 my ($self, $exit) = @_; 2800 my ($self, $exit) = @_;
2660 2801
2661 return unless $self->type == cf::PLAYER; 2802 return unless $self->type == cf::PLAYER;
2662 2803
2663 if ($exit->slaying eq "/!") {
2664 #TODO: this should de-fi-ni-te-ly not be a sync-job
2665 # the problem is that $exit might not survive long enough
2666 # so it needs to be done right now, right here
2667 cf::sync_job { prepare_random_map $exit };
2668 }
2669
2670 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2671 my $hp = $exit->stats->hp;
2672 my $sp = $exit->stats->sp;
2673
2674 $self->enter_link; 2804 $self->enter_link;
2675 2805
2676 # if exit is damned, update players death & WoR home-position
2677 $self->contr->savebed ($slaying, $hp, $sp)
2678 if $exit->flag (FLAG_DAMNED);
2679
2680 (async { 2806 (async {
2681 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2807 $Coro::current->{desc} = "enter_exit";
2682 2808
2683 $self->deactivate_recursive; # just to be sure
2684 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
2685 $self->goto ($slaying, $hp, $sp); 2824 $self->goto ($map, $x, $y);
2686 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
2687 1; 2830 1
2688 }) { 2831 }) {
2689 $self->message ("Something went wrong deep within the crossfire server. " 2832 $self->message ("Something went wrong deep within the deliantra server. "
2690 . "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. "
2691 . "Please report this to the dungeon master!", 2834 . "Please report this to the dungeon master!",
2692 cf::NDI_UNIQUE | cf::NDI_RED); 2835 cf::NDI_UNIQUE | cf::NDI_RED);
2693 2836
2694 warn "ERROR in enter_exit: $@"; 2837 warn "ERROR in enter_exit: $@";
2711sub cf::client::send_drawinfo { 2854sub cf::client::send_drawinfo {
2712 my ($self, $text, $flags) = @_; 2855 my ($self, $text, $flags) = @_;
2713 2856
2714 utf8::encode $text; 2857 utf8::encode $text;
2715 $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);
2716} 2884}
2717 2885
2718=item $client->send_msg ($channel, $msg, $color, [extra...]) 2886=item $client->send_msg ($channel, $msg, $color, [extra...])
2719 2887
2720Send 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
2724 2892
2725=cut 2893=cut
2726 2894
2727# non-persistent channels (usually the info channel) 2895# non-persistent channels (usually the info channel)
2728our %CHANNEL = ( 2896our %CHANNEL = (
2897 "c/motd" => {
2898 id => "infobox",
2899 title => "MOTD",
2900 reply => undef,
2901 tooltip => "The message of the day",
2902 },
2729 "c/identify" => { 2903 "c/identify" => {
2730 id => "infobox", 2904 id => "infobox",
2731 title => "Identify", 2905 title => "Identify",
2732 reply => undef, 2906 reply => undef,
2733 tooltip => "Items recently identified", 2907 tooltip => "Items recently identified",
2735 "c/examine" => { 2909 "c/examine" => {
2736 id => "infobox", 2910 id => "infobox",
2737 title => "Examine", 2911 title => "Examine",
2738 reply => undef, 2912 reply => undef,
2739 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",
2740 }, 2920 },
2741 "c/book" => { 2921 "c/book" => {
2742 id => "infobox", 2922 id => "infobox",
2743 title => "Book", 2923 title => "Book",
2744 reply => undef, 2924 reply => undef,
2760 id => "infobox", 2940 id => "infobox",
2761 title => "Body Parts", 2941 title => "Body Parts",
2762 reply => undef, 2942 reply => undef,
2763 tooltip => "Shows which body parts you posess and are available", 2943 tooltip => "Shows which body parts you posess and are available",
2764 }, 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 },
2765 "c/uptime" => { 2981 "c/uptime" => {
2766 id => "infobox", 2982 id => "infobox",
2767 title => "Uptime", 2983 title => "Uptime",
2768 reply => undef, 2984 reply => undef,
2769 tooltip => "How long the server has been running since last restart", 2985 tooltip => "How long the server has been running since last restart",
2772 id => "infobox", 2988 id => "infobox",
2773 title => "Map Info", 2989 title => "Map Info",
2774 reply => undef, 2990 reply => undef,
2775 tooltip => "Information related to the maps", 2991 tooltip => "Information related to the maps",
2776 }, 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,
2777); 3007);
2778 3008
2779sub cf::client::send_msg { 3009sub cf::client::send_msg {
2780 my ($self, $channel, $msg, $color, @extra) = @_; 3010 my ($self, $channel, $msg, $color, @extra) = @_;
2781 3011
2782 $msg = $self->pl->expand_cfpod ($msg); 3012 $msg = $self->pl->expand_cfpod ($msg)
3013 unless $color & cf::NDI_VERBATIM;
2783 3014
2784 $color &= cf::NDI_CLIENT_MASK; # just in case... 3015 $color &= cf::NDI_CLIENT_MASK; # just in case...
2785 3016
2786 # check predefined channels, for the benefit of C 3017 # check predefined channels, for the benefit of C
2787 if ($CHANNEL{$channel}) { 3018 if ($CHANNEL{$channel}) {
2788 $channel = $CHANNEL{$channel}; 3019 $channel = $CHANNEL{$channel};
2789 3020
2790 $self->ext_msg (channel_info => $channel) 3021 $self->ext_msg (channel_info => $channel);
2791 if $self->can_msg;
2792
2793 $channel = $channel->{id}; 3022 $channel = $channel->{id};
2794 3023
2795 } elsif (ref $channel) { 3024 } elsif (ref $channel) {
2796 # send meta info to client, if not yet sent 3025 # send meta info to client, if not yet sent
2797 unless (exists $self->{channel}{$channel->{id}}) { 3026 unless (exists $self->{channel}{$channel->{id}}) {
2798 $self->{channel}{$channel->{id}} = $channel; 3027 $self->{channel}{$channel->{id}} = $channel;
2799 $self->ext_msg (channel_info => $channel) 3028 $self->ext_msg (channel_info => $channel);
2800 if $self->can_msg;
2801 } 3029 }
2802 3030
2803 $channel = $channel->{id}; 3031 $channel = $channel->{id};
2804 } 3032 }
2805 3033
2806 return unless @extra || length $msg; 3034 return unless @extra || length $msg;
2807 3035
2808 if ($self->can_msg) {
2809 # default colour, mask it out 3036 # default colour, mask it out
2810 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3037 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2811 if $color & cf::NDI_DEF; 3038 if $color & cf::NDI_DEF;
2812 3039
2813 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3040 my $pkt = "msg "
3041 . $self->{json_coder}->encode (
2814 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3042 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2815 } else { 3043 );
2816 if ($color >= 0) {
2817 # replace some tags by gcfclient-compatible ones
2818 for ($msg) {
2819 1 while
2820 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2821 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2822 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2823 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2824 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2825 }
2826 3044
2827 $color &= cf::NDI_COLOR_MASK; 3045 $self->send_big_packet ($pkt);
2828
2829 utf8::encode $msg;
2830
2831 if (0 && $msg =~ /\[/) {
2832 # COMMAND/INFO
2833 $self->send_packet ("drawextinfo $color 10 8 $msg")
2834 } else {
2835 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2836 $self->send_packet ("drawinfo $color $msg")
2837 }
2838 }
2839 }
2840} 3046}
2841 3047
2842=item $client->ext_msg ($type, @msg) 3048=item $client->ext_msg ($type, @msg)
2843 3049
2844Sends an ext event to the client. 3050Sends an ext event to the client.
2847 3053
2848sub cf::client::ext_msg($$@) { 3054sub cf::client::ext_msg($$@) {
2849 my ($self, $type, @msg) = @_; 3055 my ($self, $type, @msg) = @_;
2850 3056
2851 if ($self->extcmd == 2) { 3057 if ($self->extcmd == 2) {
2852 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3058 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2853 } elsif ($self->extcmd == 1) { # TODO: remove 3059 } elsif ($self->extcmd == 1) { # TODO: remove
2854 push @msg, msgtype => "event_$type"; 3060 push @msg, msgtype => "event_$type";
2855 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3061 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2856 } 3062 }
2857} 3063}
2858 3064
2859=item $client->ext_reply ($msgid, @msg) 3065=item $client->ext_reply ($msgid, @msg)
2860 3066
2864 3070
2865sub cf::client::ext_reply($$@) { 3071sub cf::client::ext_reply($$@) {
2866 my ($self, $id, @msg) = @_; 3072 my ($self, $id, @msg) = @_;
2867 3073
2868 if ($self->extcmd == 2) { 3074 if ($self->extcmd == 2) {
2869 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3075 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2870 } elsif ($self->extcmd == 1) { 3076 } elsif ($self->extcmd == 1) {
2871 #TODO: version 1, remove 3077 #TODO: version 1, remove
2872 unshift @msg, msgtype => "reply", msgid => $id; 3078 unshift @msg, msgtype => "reply", msgid => $id;
2873 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3079 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2874 } 3080 }
2875} 3081}
2876 3082
2877=item $success = $client->query ($flags, "text", \&cb) 3083=item $success = $client->query ($flags, "text", \&cb)
2878 3084
2979 3185
2980 $coro 3186 $coro
2981} 3187}
2982 3188
2983cf::client->attach ( 3189cf::client->attach (
2984 on_destroy => sub { 3190 on_client_destroy => sub {
2985 my ($ns) = @_; 3191 my ($ns) = @_;
2986 3192
2987 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3193 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2988 }, 3194 },
2989); 3195);
3005our $safe_hole = new Safe::Hole; 3211our $safe_hole = new Safe::Hole;
3006 3212
3007$SIG{FPE} = 'IGNORE'; 3213$SIG{FPE} = 'IGNORE';
3008 3214
3009$safe->permit_only (Opcode::opset qw( 3215$safe->permit_only (Opcode::opset qw(
3010 :base_core :base_mem :base_orig :base_math 3216 :base_core :base_mem :base_orig :base_math :base_loop
3011 grepstart grepwhile mapstart mapwhile 3217 grepstart grepwhile mapstart mapwhile
3012 sort time 3218 sort time
3013)); 3219));
3014 3220
3015# here we export the classes and methods available to script code 3221# here we export the classes and methods available to script code
3018 3224
3019The following functions and methods are available within a safe environment: 3225The following functions and methods are available within a safe environment:
3020 3226
3021 cf::object 3227 cf::object
3022 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
3023 insert remove name archname title slaying race decrease_ob_nr 3229 insert remove name archname title slaying race decrease split
3230 value
3024 3231
3025 cf::object::player 3232 cf::object::player
3026 player 3233 player
3027 3234
3028 cf::player 3235 cf::player
3033 3240
3034=cut 3241=cut
3035 3242
3036for ( 3243for (
3037 ["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
3038 insert remove inv name archname title slaying race 3245 insert remove inv nrof name archname title slaying race
3039 decrease_ob_nr destroy)], 3246 decrease split destroy change_exp value msg lore send_msg)],
3040 ["cf::object::player" => qw(player)], 3247 ["cf::object::player" => qw(player)],
3041 ["cf::player" => qw(peaceful)], 3248 ["cf::player" => qw(peaceful send_msg)],
3042 ["cf::map" => qw(trigger)], 3249 ["cf::map" => qw(trigger)],
3043) { 3250) {
3044 no strict 'refs'; 3251 no strict 'refs';
3045 my ($pkg, @funs) = @$_; 3252 my ($pkg, @funs) = @$_;
3046 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3253 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3064 3271
3065 my $qcode = $code; 3272 my $qcode = $code;
3066 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3273 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3067 $qcode =~ s/\n/\\n/g; 3274 $qcode =~ s/\n/\\n/g;
3068 3275
3276 %vars = (_dummy => 0) unless %vars;
3277
3278 my @res;
3069 local $_; 3279 local $_;
3070 local @safe::cf::_safe_eval_args = values %vars;
3071 3280
3072 my $eval = 3281 my $eval =
3073 "do {\n" 3282 "do {\n"
3074 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3283 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3075 . "#line 0 \"{$qcode}\"\n" 3284 . "#line 0 \"{$qcode}\"\n"
3076 . $code 3285 . $code
3077 . "\n}" 3286 . "\n}"
3078 ; 3287 ;
3079 3288
3289 if ($CFG{safe_eval}) {
3080 sub_generation_inc; 3290 sub_generation_inc;
3291 local @safe::cf::_safe_eval_args = values %vars;
3081 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3292 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3082 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 }
3083 3298
3084 if ($@) { 3299 if ($@) {
3085 warn "$@"; 3300 warn "$@";
3086 warn "while executing safe code '$code'\n"; 3301 warn "while executing safe code '$code'\n";
3087 warn "with arguments " . (join " ", %vars) . "\n"; 3302 warn "with arguments " . (join " ", %vars) . "\n";
3106=cut 3321=cut
3107 3322
3108sub register_script_function { 3323sub register_script_function {
3109 my ($fun, $cb) = @_; 3324 my ($fun, $cb) = @_;
3110 3325
3111 no strict 'refs'; 3326 $fun = "safe::$fun" if $CFG{safe_eval};
3112 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3327 *$fun = $safe_hole->wrap ($cb);
3113} 3328}
3114 3329
3115=back 3330=back
3116 3331
3117=cut 3332=cut
3138 3353
3139 $facedata->{version} == 2 3354 $facedata->{version} == 2
3140 or cf::cleanup "$path: version mismatch, cannot proceed."; 3355 or cf::cleanup "$path: version mismatch, cannot proceed.";
3141 3356
3142 # 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]);
3143 $facedata->{resource}{"res/exp_table"} = { 3359 $facedata->{resource}{"res/exp_table"} = {
3144 type => FT_RSRC, 3360 type => FT_RSRC,
3145 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),
3146 }; 3363 };
3147 cf::cede_to_tick; 3364 cf::cede_to_tick;
3148 3365
3149 { 3366 {
3150 my $faces = $facedata->{faceinfo}; 3367 my $faces = $facedata->{faceinfo};
3151 3368
3152 while (my ($face, $info) = each %$faces) { 3369 while (my ($face, $info) = each %$faces) {
3153 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3370 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3371
3154 cf::face::set_visibility $idx, $info->{visibility}; 3372 cf::face::set_visibility $idx, $info->{visibility};
3155 cf::face::set_magicmap $idx, $info->{magicmap}; 3373 cf::face::set_magicmap $idx, $info->{magicmap};
3156 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3374 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3157 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3375 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3158 3376
3159 cf::cede_to_tick; 3377 cf::cede_to_tick;
3160 } 3378 }
3161 3379
3162 while (my ($face, $info) = each %$faces) { 3380 while (my ($face, $info) = each %$faces) {
3163 next unless $info->{smooth}; 3381 next unless $info->{smooth};
3382
3164 my $idx = cf::face::find $face 3383 my $idx = cf::face::find $face
3165 or next; 3384 or next;
3385
3166 if (my $smooth = cf::face::find $info->{smooth}) { 3386 if (my $smooth = cf::face::find $info->{smooth}) {
3167 cf::face::set_smooth $idx, $smooth; 3387 cf::face::set_smooth $idx, $smooth;
3168 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3388 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3169 } else { 3389 } else {
3170 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3390 warn "smooth face '$info->{smooth}' not found for face '$face'";
3184 3404
3185 cf::anim::invalidate_all; # d'oh 3405 cf::anim::invalidate_all; # d'oh
3186 } 3406 }
3187 3407
3188 { 3408 {
3189 # TODO: for gcfclient pleasure, we should give resources
3190 # that gcfclient doesn't grok a >10000 face index.
3191 my $res = $facedata->{resource}; 3409 my $res = $facedata->{resource};
3192 3410
3193 my $soundconf = delete $res->{"res/sound.conf"};
3194
3195 while (my ($name, $info) = each %$res) { 3411 while (my ($name, $info) = each %$res) {
3412 if (defined $info->{type}) {
3196 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3413 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3197 my $data;
3198 3414
3199 if ($info->{type} & 1) { 3415 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3200 # prepend meta info 3416 cf::face::set_type $idx, $info->{type};
3201
3202 my $meta = $enc->encode ({
3203 name => $name,
3204 %{ $info->{meta} || {} },
3205 });
3206
3207 $data = pack "(w/a*)*", $meta, $info->{data};
3208 } else { 3417 } else {
3209 $data = $info->{data}; 3418 $RESOURCE{$name} = $info;
3210 } 3419 }
3211 3420
3212 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3213 cf::face::set_type $idx, $info->{type};
3214
3215 cf::cede_to_tick; 3421 cf::cede_to_tick;
3216 } 3422 }
3217
3218 if ($soundconf) {
3219 $soundconf = $enc->decode (delete $soundconf->{data});
3220
3221 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3222 my $sound = $soundconf->{compat}[$_]
3223 or next;
3224
3225 my $face = cf::face::find "sound/$sound->[1]";
3226 cf::sound::set $sound->[0] => $face;
3227 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3228 }
3229
3230 while (my ($k, $v) = each %{$soundconf->{event}}) {
3231 my $face = cf::face::find "sound/$v";
3232 cf::sound::set $k => $face;
3233 }
3234 }
3235 } 3423 }
3424
3425 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3236 3426
3237 1 3427 1
3238} 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});
3239 3449
3240register_exticmd fx_want => sub { 3450register_exticmd fx_want => sub {
3241 my ($ns, $want) = @_; 3451 my ($ns, $want) = @_;
3242 3452
3243 while (my ($k, $v) = each %$want) { 3453 while (my ($k, $v) = each %$want) {
3244 $ns->fx_want ($k, $v); 3454 $ns->fx_want ($k, $v);
3245 } 3455 }
3246}; 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}
3247 3467
3248sub reload_regions { 3468sub reload_regions {
3249 # 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
3250 # for this (global event?) 3470 # for this (global event?)
3251 %ext::player_env::MUSIC_FACE_CACHE = (); 3471 %ext::player_env::MUSIC_FACE_CACHE = ();
3265} 3485}
3266 3486
3267sub reload_archetypes { 3487sub reload_archetypes {
3268 load_resource_file "$DATADIR/archetypes" 3488 load_resource_file "$DATADIR/archetypes"
3269 or die "unable to load archetypes\n"; 3489 or die "unable to load archetypes\n";
3270 #d# NEED to laod twice to resolve forward references
3271 # this really needs to be done in an extra post-pass
3272 # (which needs to be synchronous, so solve it differently)
3273 load_resource_file "$DATADIR/archetypes"
3274 or die "unable to load archetypes\n";
3275} 3490}
3276 3491
3277sub reload_treasures { 3492sub reload_treasures {
3278 load_resource_file "$DATADIR/treasures" 3493 load_resource_file "$DATADIR/treasures"
3279 or die "unable to load treasurelists\n"; 3494 or die "unable to load treasurelists\n";
3280} 3495}
3281 3496
3282sub reload_resources { 3497sub reload_resources {
3283 warn "reloading resource files...\n"; 3498 warn "reloading resource files...\n";
3284 3499
3500 reload_facedata;
3501 reload_archetypes;
3285 reload_regions; 3502 reload_regions;
3286 reload_facedata;
3287 #reload_archetypes;#d#
3288 reload_archetypes;
3289 reload_treasures; 3503 reload_treasures;
3290 3504
3291 warn "finished reloading resource files\n"; 3505 warn "finished reloading resource files\n";
3292} 3506}
3293 3507
3294sub init {
3295 reload_resources;
3296}
3297
3298sub reload_config { 3508sub reload_config {
3509 warn "reloading config file...\n";
3510
3299 open my $fh, "<:utf8", "$CONFDIR/config" 3511 open my $fh, "<:utf8", "$CONFDIR/config"
3300 or return; 3512 or return;
3301 3513
3302 local $/; 3514 local $/;
3303 *CFG = YAML::Syck::Load <$fh>; 3515 *CFG = YAML::XS::Load scalar <$fh>;
3304 3516
3305 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3517 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3306 3518
3307 $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};
3308 $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};
3312 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3524 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3313 and die "WARNING: m(un)lockall failed: $!\n"; 3525 and die "WARNING: m(un)lockall failed: $!\n";
3314 }; 3526 };
3315 warn $@ if $@; 3527 warn $@ if $@;
3316 } 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;
3317} 3559}
3318 3560
3319sub 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
3320 # we must not ever block the main coroutine 3571 # we must not ever block the main coroutine
3321 local $Coro::idle = sub { 3572 local $Coro::idle = sub {
3322 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#
3323 (async { 3574 (async {
3324 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3575 $Coro::current->{desc} = "IDLE BUG HANDLER";
3325 EV::loop EV::LOOP_ONESHOT; 3576 EV::loop EV::LOOP_ONESHOT;
3326 })->prio (Coro::PRIO_MAX); 3577 })->prio (Coro::PRIO_MAX);
3327 }; 3578 };
3328 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;
3329 reload_config; 3592 reload_config;
3330 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
3331 load_extensions; 3603 load_extensions;
3332 3604
3333 $TICK_WATCHER->start; 3605 utime time, time, $RUNTIMEFILE;
3334 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3606
3335 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;
3336} 3618}
3337 3619
3338############################################################################# 3620#############################################################################
3339# initialisation and cleanup 3621# initialisation and cleanup
3340 3622
3341# install some emergency cleanup handlers 3623# install some emergency cleanup handlers
3342BEGIN { 3624BEGIN {
3343 our %SIGWATCHER = (); 3625 our %SIGWATCHER = ();
3344 for my $signal (qw(INT HUP TERM)) { 3626 for my $signal (qw(INT HUP TERM)) {
3345 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3627 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3346 cf::cleanup "SIG$signal"; 3628 cf::cleanup "SIG$signal";
3347 }; 3629 };
3348 } 3630 }
3349} 3631}
3350 3632
3351sub write_runtime { 3633sub write_runtime_sync {
3352 my $runtime = "$LOCALDIR/runtime"; 3634 my $t0 = AE::time;
3353 3635
3354 # first touch the runtime file to show we are still running: 3636 # first touch the runtime file to show we are still running:
3355 # the fsync below can take a very very long time. 3637 # the fsync below can take a very very long time.
3356 3638
3357 IO::AIO::aio_utime $runtime, undef, undef; 3639 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3358 3640
3359 my $guard = cf::lock_acquire "write_runtime"; 3641 my $guard = cf::lock_acquire "write_runtime";
3360 3642
3361 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3643 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3362 or return; 3644 or return;
3363 3645
3364 my $value = $cf::RUNTIME + 90 + 10; 3646 my $value = $cf::RUNTIME + 90 + 10;
3365 # 10 is the runtime save interval, for a monotonic clock 3647 # 10 is the runtime save interval, for a monotonic clock
3366 # 60 allows for the watchdog to kill the server. 3648 # 60 allows for the watchdog to kill the server.
3376 aio_utime $fh, undef, undef; 3658 aio_utime $fh, undef, undef;
3377 3659
3378 close $fh 3660 close $fh
3379 or return; 3661 or return;
3380 3662
3381 aio_rename "$runtime~", $runtime 3663 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3382 and return; 3664 and return;
3383 3665
3384 warn "runtime file written.\n"; 3666 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3385 3667
3386 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 };
3387} 3719}
3388 3720
3389sub emergency_save() { 3721sub emergency_save() {
3390 my $freeze_guard = cf::freeze_mainloop; 3722 my $freeze_guard = cf::freeze_mainloop;
3391 3723
3392 warn "enter emergency perl save\n"; 3724 warn "emergency_perl_save: enter\n";
3393 3725
3394 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
3395 # use a peculiar iteration method to avoid tripping on perl 3732 # use a peculiar iteration method to avoid tripping on perl
3396 # refcount bugs in for. also avoids problems with players 3733 # refcount bugs in for. also avoids problems with players
3397 # and maps saved/destroyed asynchronously. 3734 # and maps saved/destroyed asynchronously.
3398 warn "begin emergency player save\n"; 3735 warn "emergency_perl_save: begin player save\n";
3399 for my $login (keys %cf::PLAYER) { 3736 for my $login (keys %cf::PLAYER) {
3400 my $pl = $cf::PLAYER{$login} or next; 3737 my $pl = $cf::PLAYER{$login} or next;
3401 $pl->valid or next; 3738 $pl->valid or next;
3402 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3739 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3403 $pl->save; 3740 $pl->save;
3404 } 3741 }
3405 warn "end emergency player save\n"; 3742 warn "emergency_perl_save: end player save\n";
3406 3743
3407 warn "begin emergency map save\n"; 3744 warn "emergency_perl_save: begin map save\n";
3408 for my $path (keys %cf::MAP) { 3745 for my $path (keys %cf::MAP) {
3409 my $map = $cf::MAP{$path} or next; 3746 my $map = $cf::MAP{$path} or next;
3410 $map->valid or next; 3747 $map->valid or next;
3411 $map->save; 3748 $map->save;
3412 } 3749 }
3413 warn "end emergency map save\n"; 3750 warn "emergency_perl_save: end map save\n";
3414 3751
3415 warn "begin emergency database checkpoint\n"; 3752 warn "emergency_perl_save: begin database checkpoint\n";
3416 BDB::db_env_txn_checkpoint $DB_ENV; 3753 BDB::db_env_txn_checkpoint $DB_ENV;
3417 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";
3418 }; 3759 };
3419 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
3420 warn "leave emergency perl save\n"; 3766 warn "emergency_perl_save: leave\n";
3421} 3767}
3422 3768
3423sub post_cleanup { 3769sub post_cleanup {
3424 my ($make_core) = @_; 3770 my ($make_core) = @_;
3425 3771
3426 warn Carp::longmess "post_cleanup backtrace" 3772 warn Carp::longmess "post_cleanup backtrace"
3427 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 }
3428} 3802}
3429 3803
3430sub do_reload_perl() { 3804sub do_reload_perl() {
3431 # can/must only be called in main 3805 # can/must only be called in main
3432 if ($Coro::current != $Coro::main) { 3806 if (in_main) {
3433 warn "can only reload from main coroutine"; 3807 warn "can only reload from main coroutine";
3434 return; 3808 return;
3435 } 3809 }
3436 3810
3811 return if $RELOAD++;
3812
3813 my $t1 = AE::time;
3814
3815 while ($RELOAD) {
3437 warn "reloading..."; 3816 warn "reloading...";
3438 3817
3439 warn "entering sync_job"; 3818 warn "entering sync_job";
3440 3819
3441 cf::sync_job { 3820 cf::sync_job {
3442 cf::write_runtime; # external watchdog should not bark 3821 cf::write_runtime_sync; # external watchdog should not bark
3443 cf::emergency_save; 3822 cf::emergency_save;
3444 cf::write_runtime; # external watchdog should not bark 3823 cf::write_runtime_sync; # external watchdog should not bark
3445 3824
3446 warn "syncing database to disk"; 3825 warn "syncing database to disk";
3447 BDB::db_env_txn_checkpoint $DB_ENV; 3826 BDB::db_env_txn_checkpoint $DB_ENV;
3448 3827
3449 # 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
3450 3829
3451 warn "flushing outstanding aio requests"; 3830 warn "flushing outstanding aio requests";
3452 for (;;) {
3453 BDB::flush;
3454 IO::AIO::flush;
3455 Coro::cede_notself;
3456 last unless IO::AIO::nreqs || BDB::nreqs; 3831 while (IO::AIO::nreqs || BDB::nreqs) {
3457 warn "iterate..."; 3832 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3458 }
3459
3460 ++$RELOAD;
3461
3462 warn "cancelling all extension coros";
3463 $_->cancel for values %EXT_CORO;
3464 %EXT_CORO = ();
3465
3466 warn "removing commands";
3467 %COMMAND = ();
3468
3469 warn "removing ext/exti commands";
3470 %EXTCMD = ();
3471 %EXTICMD = ();
3472
3473 warn "unloading/nuking all extensions";
3474 for my $pkg (@EXTS) {
3475 warn "... unloading $pkg";
3476
3477 if (my $cb = $pkg->can ("unload")) {
3478 eval {
3479 $cb->($pkg);
3480 1
3481 } or warn "$pkg unloaded, but with errors: $@";
3482 } 3833 }
3483 3834
3484 warn "... nuking $pkg"; 3835 warn "cancelling all extension coros";
3485 Symbol::delete_package $pkg; 3836 $_->cancel for values %EXT_CORO;
3486 } 3837 %EXT_CORO = ();
3487 3838
3488 warn "unloading all perl modules loaded from $LIBDIR"; 3839 warn "removing commands";
3489 while (my ($k, $v) = each %INC) { 3840 %COMMAND = ();
3490 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3491 3841
3842 warn "removing ext/exti commands";
3843 %EXTCMD = ();
3844 %EXTICMD = ();
3845
3846 warn "unloading/nuking all extensions";
3847 for my $pkg (@EXTS) {
3492 warn "... unloading $k"; 3848 warn "... unloading $pkg";
3493 delete $INC{$k};
3494 3849
3495 $k =~ s/\.pm$//;
3496 $k =~ s/\//::/g;
3497
3498 if (my $cb = $k->can ("unload_module")) { 3850 if (my $cb = $pkg->can ("unload")) {
3851 eval {
3499 $cb->(); 3852 $cb->($pkg);
3853 1
3854 } or warn "$pkg unloaded, but with errors: $@";
3855 }
3856
3857 warn "... clearing $pkg";
3858 clear_package $pkg;
3500 } 3859 }
3501 3860
3502 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;
3503 } 3876 }
3504 3877
3505 warn "getting rid of safe::, as good as possible"; 3878 warn "getting rid of safe::, as good as possible";
3506 Symbol::delete_package "safe::$_" 3879 clear_package "safe::$_"
3507 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);
3508 3881
3509 warn "unloading cf.pm \"a bit\""; 3882 warn "unloading cf.pm \"a bit\"";
3510 delete $INC{"cf.pm"}; 3883 delete $INC{"cf.pm"};
3511 delete $INC{"cf/pod.pm"}; 3884 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3512 3885
3513 # don't, removes xs symbols, too, 3886 # don't, removes xs symbols, too,
3514 # and global variables created in xs 3887 # and global variables created in xs
3515 #Symbol::delete_package __PACKAGE__; 3888 #clear_package __PACKAGE__;
3516 3889
3517 warn "unload completed, starting to reload now"; 3890 warn "unload completed, starting to reload now";
3518 3891
3519 warn "reloading cf.pm"; 3892 warn "reloading cf.pm";
3520 require cf; 3893 require cf;
3521 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3894 cf::_connect_to_perl_1;
3522 3895
3523 warn "loading config and database again"; 3896 warn "loading config and database again";
3524 cf::reload_config; 3897 cf::reload_config;
3525 3898
3526 warn "loading extensions"; 3899 warn "loading extensions";
3527 cf::load_extensions; 3900 cf::load_extensions;
3528 3901
3902 if ($REATTACH_ON_RELOAD) {
3529 warn "reattaching attachments to objects/players"; 3903 warn "reattaching attachments to objects/players";
3530 _global_reattach; # objects, sockets 3904 _global_reattach; # objects, sockets
3531 warn "reattaching attachments to maps"; 3905 warn "reattaching attachments to maps";
3532 reattach $_ for values %MAP; 3906 reattach $_ for values %MAP;
3533 warn "reattaching attachments to players"; 3907 warn "reattaching attachments to players";
3534 reattach $_ for values %PLAYER; 3908 reattach $_ for values %PLAYER;
3909 }
3535 3910
3911 warn "running post_init jobs";
3912 (pop @POST_INIT)->(1) while @POST_INIT;
3913
3536 warn "leaving sync_job"; 3914 warn "leaving sync_job";
3537 3915
3538 1 3916 1
3539 } or do { 3917 } or do {
3540 warn $@; 3918 warn $@;
3541 warn "error while reloading, exiting."; 3919 cf::cleanup "error while reloading, exiting.";
3542 exit 1;
3543 }; 3920 };
3544 3921
3545 warn "reloaded"; 3922 warn "reloaded";
3923 --$RELOAD;
3924 }
3925
3926 $t1 = AE::time - $t1;
3927 warn "reload completed in ${t1}s\n";
3546}; 3928};
3547 3929
3548our $RELOAD_WATCHER; # used only during reload 3930our $RELOAD_WATCHER; # used only during reload
3549 3931
3550sub reload_perl() { 3932sub reload_perl() {
3551 # doing reload synchronously and two reloads happen back-to-back, 3933 # doing reload synchronously and two reloads happen back-to-back,
3552 # coro crashes during coro_state_free->destroy here. 3934 # coro crashes during coro_state_free->destroy here.
3553 3935
3936 $RELOAD_WATCHER ||= cf::async {
3937 Coro::AIO::aio_wait cache_extensions;
3938
3554 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3939 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3940 do_reload_perl;
3555 undef $RELOAD_WATCHER; 3941 undef $RELOAD_WATCHER;
3556 do_reload_perl; 3942 };
3557 }; 3943 };
3558} 3944}
3559 3945
3560register_command "reload" => sub { 3946register_command "reload" => sub {
3561 my ($who, $arg) = @_; 3947 my ($who, $arg) = @_;
3575 3961
3576our @WAIT_FOR_TICK; 3962our @WAIT_FOR_TICK;
3577our @WAIT_FOR_TICK_BEGIN; 3963our @WAIT_FOR_TICK_BEGIN;
3578 3964
3579sub wait_for_tick { 3965sub wait_for_tick {
3580 return unless $TICK_WATCHER->is_active;
3581 return if $Coro::current == $Coro::main; 3966 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3582 3967
3583 my $signal = new Coro::Signal; 3968 my $signal = new Coro::Signal;
3584 push @WAIT_FOR_TICK, $signal; 3969 push @WAIT_FOR_TICK, $signal;
3585 $signal->wait; 3970 $signal->wait;
3586} 3971}
3587 3972
3588sub wait_for_tick_begin { 3973sub wait_for_tick_begin {
3589 return unless $TICK_WATCHER->is_active;
3590 return if $Coro::current == $Coro::main; 3974 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3591 3975
3592 my $signal = new Coro::Signal; 3976 my $signal = new Coro::Signal;
3593 push @WAIT_FOR_TICK_BEGIN, $signal; 3977 push @WAIT_FOR_TICK_BEGIN, $signal;
3594 $signal->wait; 3978 $signal->wait;
3595} 3979}
3596 3980
3597$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3981sub tick {
3598 if ($Coro::current != $Coro::main) { 3982 if ($Coro::current != $Coro::main) {
3599 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"
3600 unless ++$bug_warning > 10; 3984 unless ++$bug_warning > 10;
3601 return; 3985 return;
3602 } 3986 }
3603 3987
3604 $NOW = $tick_start = EV::now;
3605
3606 cf::server_tick; # one server iteration 3988 cf::server_tick; # one server iteration
3607 3989
3608 $RUNTIME += $TICK; 3990 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3609 $NEXT_TICK += $TICK;
3610 3991
3611 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3992 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3612 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3993 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3613 Coro::async_pool { 3994 Coro::async_pool {
3614 $Coro::current->{desc} = "runtime saver"; 3995 $Coro::current->{desc} = "runtime saver";
3615 write_runtime 3996 write_runtime_sync
3616 or warn "ERROR: unable to write runtime file: $!"; 3997 or warn "ERROR: unable to write runtime file: $!";
3617 }; 3998 };
3618 } 3999 }
3619 4000
3620 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4001 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3622 } 4003 }
3623 while (my $sig = shift @WAIT_FOR_TICK) { 4004 while (my $sig = shift @WAIT_FOR_TICK) {
3624 $sig->send; 4005 $sig->send;
3625 } 4006 }
3626 4007
3627 $LOAD = ($NOW - $tick_start) / $TICK; 4008 $LOAD = ($NOW - $TICK_START) / $TICK;
3628 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4009 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3629 4010
3630 _post_tick; 4011 if (0) {
3631}; 4012 if ($NEXT_TICK) {
3632$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}
3633 4019
3634{ 4020{
3635 # configure BDB 4021 # configure BDB
3636 4022
3637 BDB::min_parallel 8; 4023 BDB::min_parallel 16;
3638 BDB::max_poll_reqs $TICK * 0.1; 4024 BDB::max_poll_reqs $TICK * 0.1;
4025 $AnyEvent::BDB::WATCHER->priority (1);
3639 4026
3640 unless ($DB_ENV) { 4027 unless ($DB_ENV) {
3641 $DB_ENV = BDB::db_env_create; 4028 $DB_ENV = BDB::db_env_create;
3642 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4029 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3643 | 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;
3644 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4032 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3645 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4033 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3646 4034
3647 cf::sync_job { 4035 cf::sync_job {
3648 eval { 4036 eval {
3674{ 4062{
3675 # configure IO::AIO 4063 # configure IO::AIO
3676 4064
3677 IO::AIO::min_parallel 8; 4065 IO::AIO::min_parallel 8;
3678 IO::AIO::max_poll_time $TICK * 0.1; 4066 IO::AIO::max_poll_time $TICK * 0.1;
4067 undef $AnyEvent::AIO::WATCHER;
3679} 4068}
3680 4069
3681my $_log_backtrace; 4070my $_log_backtrace;
3682 4071
3683sub _log_backtrace { 4072sub _log_backtrace {
3686 $msg =~ s/\n//; 4075 $msg =~ s/\n//;
3687 4076
3688 # limit the # of concurrent backtraces 4077 # limit the # of concurrent backtraces
3689 if ($_log_backtrace < 2) { 4078 if ($_log_backtrace < 2) {
3690 ++$_log_backtrace; 4079 ++$_log_backtrace;
4080 my $perl_bt = Carp::longmess $msg;
3691 async { 4081 async {
3692 $Coro::current->{desc} = "abt $msg"; 4082 $Coro::current->{desc} = "abt $msg";
3693 4083
3694 my @bt = fork_call { 4084 my @bt = fork_call {
3695 @addr = map { sprintf "%x", $_ } @addr; 4085 @addr = map { sprintf "%x", $_ } @addr;
3706 } 4096 }
3707 4097
3708 @funcs 4098 @funcs
3709 }; 4099 };
3710 4100
3711 LOG llevInfo, "[ABT] $msg\n"; 4101 LOG llevInfo, "[ABT] $perl_bt\n";
4102 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3712 LOG llevInfo, "[ABT] $_\n" for @bt; 4103 LOG llevInfo, "[ABT] $_\n" for @bt;
3713 --$_log_backtrace; 4104 --$_log_backtrace;
3714 }; 4105 };
3715 } else { 4106 } else {
3716 LOG llevInfo, "[ABT] $msg\n"; 4107 LOG llevInfo, "[ABT] $msg\n";
3717 LOG llevInfo, "[ABT] [suppressed]\n"; 4108 LOG llevInfo, "[ABT] [suppressed]\n";
3718 } 4109 }
3719} 4110}
3720 4111
3721# load additional modules 4112# load additional modules
3722use cf::pod; 4113require "cf/$_.pm" for @EXTRA_MODULES;
4114cf::_connect_to_perl_2;
3723 4115
3724END { cf::emergency_save } 4116END { cf::emergency_save }
3725 4117
37261 41181
3727 4119

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines