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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines