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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines