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.409 by root, Mon Jan 14 11:41:48 2008 UTC vs.
Revision 1.531 by root, Wed Apr 28 21:07:41 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines