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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines