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.403 by root, Mon Dec 17 07:09:18 2007 UTC vs.
Revision 1.527 by root, Fri Apr 23 04:32:47 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines