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.457 by root, Wed Oct 1 05:50:19 2008 UTC vs.
Revision 1.541 by root, Tue May 4 23:33:16 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use common::sense;
25use utf8;
26use strict "vars", "subs";
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
35use Carp ();
36 36
37use Guard ();
37use Coro (); 38use Coro ();
38use Coro::State; 39use Coro::State;
39use Coro::Handle; 40use Coro::Handle;
40use Coro::EV; 41use Coro::EV;
41use Coro::AnyEvent; 42use Coro::AnyEvent;
42use Coro::Timer; 43use Coro::Timer;
43use Coro::Signal; 44use Coro::Signal;
44use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
45use Coro::AnyEvent; 47use Coro::AnyEvent;
46use Coro::AIO; 48use Coro::AIO;
47use Coro::BDB 1.6; 49use Coro::BDB 1.6;
48use Coro::Storable; 50use Coro::Storable;
49use Coro::Util (); 51use Coro::Util ();
50 52
51use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
52use BDB (); 54use BDB ();
53use Data::Dumper; 55use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 56use Fcntl;
56use YAML (); 57use YAML::XS ();
57use IO::AIO (); 58use IO::AIO ();
58use Time::HiRes; 59use Time::HiRes;
59use Compress::LZF; 60use Compress::LZF;
60use Digest::MD5 (); 61use Digest::MD5 ();
61 62
70 71
71# make sure c-lzf reinitialises itself 72# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
73Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
74 75
76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
78
75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
76 82
77our %COMMAND = (); 83our %COMMAND = ();
78our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
79 85
80our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
83our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
84our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
85 91
86our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
87our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
88 96
89our $CONFDIR = confdir; 97our $CONFDIR = confdir;
90our $DATADIR = datadir; 98our $DATADIR = datadir;
91our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
92our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
98our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
99our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
102 110
103our %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;
104 118
105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107our $NEXT_TICK; 121our $NEXT_TICK;
108our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
109 123
110our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
112our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
113our $DB_ENV; 127our $DB_ENV;
114 128
129our @EXTRA_MODULES = qw(pod match mapscript);
130
115our %CFG; 131our %CFG;
116 132
117our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
118our $RUNTIME; 134our $RUNTIME;
119our $NOW; 135our $NOW;
130our $JITTER; # average jitter 146our $JITTER; # average jitter
131our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
132 148
133our @POST_INIT; 149our @POST_INIT;
134 150
135our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
136 153
137binmode STDOUT; 154binmode STDOUT;
138binmode STDERR; 155binmode STDERR;
139 156
140# read virtual server time, if available 157# read virtual server time, if available
142 open my $fh, "<", $RUNTIMEFILE 159 open my $fh, "<", $RUNTIMEFILE
143 or die "unable to read $RUNTIMEFILE file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
144 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
145} 162}
146 163
164eval "sub TICK() { $TICK } 1" or die;
165
147mkdir $_ 166mkdir $_
148 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
149 168
150our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
151 170
152sub 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::"} };
153 187
154############################################################################# 188#############################################################################
155 189
156=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
157 191
204returns 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
205per 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.
206 240
207=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
208 242
209This array contains the results of the last C<invoke ()> call. When 243This array contains the results of the last C<invoke ()> call. When
210C<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
211that call. 245that call.
212 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
213=back 253=back
214 254
215=cut 255=cut
216 256
217BEGIN { 257sub error(@) { LOG llevError, join "", @_ }
218 *CORE::GLOBAL::warn = sub { 258sub warn (@) { LOG llevWarn , join "", @_ }
259sub info (@) { LOG llevInfo , join "", @_ }
260sub debug(@) { LOG llevDebug, join "", @_ }
261sub trace(@) { LOG llevTrace, join "", @_ }
262
263$Coro::State::WARNHOOK = sub {
219 my $msg = join "", @_; 264 my $msg = join "", @_;
220 265
221 $msg .= "\n" 266 $msg .= "\n"
222 unless $msg =~ /\n$/; 267 unless $msg =~ /\n$/;
223 268
224 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 269 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
225 270
226 LOG llevError, $msg; 271 LOG llevWarn, $msg;
227 }; 272};
228}
229 273
230$Coro::State::DIEHOOK = sub { 274$Coro::State::DIEHOOK = sub {
231 return unless $^S eq 0; # "eq", not "==" 275 return unless $^S eq 0; # "eq", not "=="
232 276
233 if ($Coro::current == $Coro::main) {#d# 277 error Carp::longmess $_[0];
278
279 if (in_main) {#d#
234 warn "DIEHOOK called in main context, Coro bug?\n";#d# 280 error "DIEHOOK called in main context, Coro bug?\n";#d#
235 return;#d# 281 return;#d#
236 }#d# 282 }#d#
237 283
238 # kill coroutine otherwise 284 # kill coroutine otherwise
239 warn Carp::longmess $_[0];
240 Coro::terminate 285 Coro::terminate
241}; 286};
242
243$SIG{__DIE__} = sub { }; #d#?
244 287
245@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 288@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
246@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 289@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
247@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 290@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
248@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 291@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
262)) { 305)) {
263 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 306 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
264} 307}
265 308
266$EV::DIED = sub { 309$EV::DIED = sub {
267 warn "error in event callback: @_"; 310 Carp::cluck "error in event callback: @_";
268}; 311};
269 312
270############################################################################# 313#############################################################################
271 314
272=head2 UTILITY FUNCTIONS 315=head2 UTILITY FUNCTIONS
330Wait until the given lock is available. See cf::lock_acquire. 373Wait until the given lock is available. See cf::lock_acquire.
331 374
332=item my $lock = cf::lock_acquire $string 375=item my $lock = cf::lock_acquire $string
333 376
334Wait until the given lock is available and then acquires it and returns 377Wait until the given lock is available and then acquires it and returns
335a Coro::guard object. If the guard object gets destroyed (goes out of scope, 378a L<Guard> object. If the guard object gets destroyed (goes out of scope,
336for example when the coroutine gets canceled), the lock is automatically 379for example when the coroutine gets canceled), the lock is automatically
337returned. 380returned.
338 381
339Locks are *not* recursive, locking from the same coro twice results in a 382Locks are *not* recursive, locking from the same coro twice results in a
340deadlocked coro. 383deadlocked coro.
346 389
347Return true if the lock is currently active, i.e. somebody has locked it. 390Return true if the lock is currently active, i.e. somebody has locked it.
348 391
349=cut 392=cut
350 393
351our %LOCK; 394our $LOCKS = new Coro::SemaphoreSet;
352our %LOCKER;#d#
353 395
354sub lock_wait($) { 396sub lock_wait($) {
355 my ($key) = @_; 397 $LOCKS->wait ($_[0]);
356
357 if ($LOCKER{$key} == $Coro::current) {#d#
358 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
359 return;#d#
360 }#d#
361
362 # wait for lock, if any
363 while ($LOCK{$key}) {
364 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
365 push @{ $LOCK{$key} }, $Coro::current;
366 Coro::schedule;
367 }
368} 398}
369 399
370sub lock_acquire($) { 400sub lock_acquire($) {
371 my ($key) = @_; 401 $LOCKS->guard ($_[0])
372
373 # wait, to be sure we are not locked
374 lock_wait $key;
375
376 $LOCK{$key} = [];
377 $LOCKER{$key} = $Coro::current;#d#
378
379 Coro::guard {
380 delete $LOCKER{$key};#d#
381 # wake up all waiters, to be on the safe side
382 $_->ready for @{ delete $LOCK{$key} };
383 }
384} 402}
385 403
386sub lock_active($) { 404sub lock_active($) {
387 my ($key) = @_; 405 $LOCKS->count ($_[0]) < 1
388
389 ! ! $LOCK{$key}
390} 406}
391 407
392sub freeze_mainloop { 408sub freeze_mainloop {
393 tick_inhibit_inc; 409 tick_inhibit_inc;
394 410
395 Coro::guard \&tick_inhibit_dec; 411 &Guard::guard (\&tick_inhibit_dec);
396} 412}
397 413
398=item cf::periodic $interval, $cb 414=item cf::periodic $interval, $cb
399 415
400Like EV::periodic, but randomly selects a starting point so that the actions 416Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer. 417get spread over time.
402 418
403=cut 419=cut
404 420
405sub periodic($$) { 421sub periodic($$) {
406 my ($interval, $cb) = @_; 422 my ($interval, $cb) = @_;
423 439
424=cut 440=cut
425 441
426our @SLOT_QUEUE; 442our @SLOT_QUEUE;
427our $SLOT_QUEUE; 443our $SLOT_QUEUE;
444our $SLOT_DECAY = 0.9;
428 445
429$SLOT_QUEUE->cancel if $SLOT_QUEUE; 446$SLOT_QUEUE->cancel if $SLOT_QUEUE;
430$SLOT_QUEUE = Coro::async { 447$SLOT_QUEUE = Coro::async {
431 $Coro::current->desc ("timeslot manager"); 448 $Coro::current->desc ("timeslot manager");
432 449
433 my $signal = new Coro::Signal; 450 my $signal = new Coro::Signal;
451 my $busy;
434 452
435 while () { 453 while () {
436 next_job: 454 next_job:
455
437 my $avail = cf::till_tick; 456 my $avail = cf::till_tick;
438 if ($avail > 0.01) { 457
439 for (0 .. $#SLOT_QUEUE) { 458 for (0 .. $#SLOT_QUEUE) {
440 if ($SLOT_QUEUE[$_][0] < $avail) { 459 if ($SLOT_QUEUE[$_][0] <= $avail) {
460 $busy = 0;
441 my $job = splice @SLOT_QUEUE, $_, 1, (); 461 my $job = splice @SLOT_QUEUE, $_, 1, ();
442 $job->[2]->send; 462 $job->[2]->send;
443 Coro::cede; 463 Coro::cede;
444 goto next_job; 464 goto next_job;
445 } 465 } else {
466 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
446 } 467 }
447 } 468 }
448 469
449 if (@SLOT_QUEUE) { 470 if (@SLOT_QUEUE) {
450 # we do not use wait_for_tick() as it returns immediately when tick is inactive 471 # we do not use wait_for_tick() as it returns immediately when tick is inactive
451 push @cf::WAIT_FOR_TICK, $signal; 472 push @cf::WAIT_FOR_TICK, $signal;
452 $signal->wait; 473 $signal->wait;
453 } else { 474 } else {
475 $busy = 0;
454 Coro::schedule; 476 Coro::schedule;
455 } 477 }
456 } 478 }
457}; 479};
458 480
459sub get_slot($;$$) { 481sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main; 482 return if tick_inhibit || $Coro::current == $Coro::main;
461 483
462 my ($time, $pri, $name) = @_; 484 my ($time, $pri, $name) = @_;
463 485
464 $time = $TICK * .6 if $time > $TICK * .6; 486 $time = clamp $time, 0.01, $TICK * .6;
487
465 my $sig = new Coro::Signal; 488 my $sig = new Coro::Signal;
466 489
467 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 490 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
468 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 491 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
469 $SLOT_QUEUE->ready; 492 $SLOT_QUEUE->ready;
495=cut 518=cut
496 519
497sub sync_job(&) { 520sub sync_job(&) {
498 my ($job) = @_; 521 my ($job) = @_;
499 522
500 if ($Coro::current == $Coro::main) { 523 if (in_main) {
501 my $time = EV::time; 524 my $time = AE::time;
502 525
503 # this is the main coro, too bad, we have to block 526 # this is the main coro, too bad, we have to block
504 # till the operation succeeds, freezing the server :/ 527 # till the operation succeeds, freezing the server :/
505 528
506 LOG llevError, Carp::longmess "sync job";#d# 529 #LOG llevError, Carp::longmess "sync job";#d#
507 530
508 my $freeze_guard = freeze_mainloop; 531 my $freeze_guard = freeze_mainloop;
509 532
510 my $busy = 1; 533 my $busy = 1;
511 my @res; 534 my @res;
512 535
513 (async { 536 (async {
514 $Coro::current->desc ("sync job coro"); 537 $Coro::current->desc ("sync job coro");
515 @res = eval { $job->() }; 538 @res = eval { $job->() };
516 warn $@ if $@; 539 error $@ if $@;
517 undef $busy; 540 undef $busy;
518 })->prio (Coro::PRIO_MAX); 541 })->prio (Coro::PRIO_MAX);
519 542
520 while ($busy) { 543 while ($busy) {
521 if (Coro::nready) { 544 if (Coro::nready) {
523 } else { 546 } else {
524 EV::loop EV::LOOP_ONESHOT; 547 EV::loop EV::LOOP_ONESHOT;
525 } 548 }
526 } 549 }
527 550
528 my $time = EV::time - $time; 551 my $time = AE::time - $time;
529 552
530 $TICK_START += $time; # do not account sync jobs to server load 553 $TICK_START += $time; # do not account sync jobs to server load
531 554
532 wantarray ? @res : $res[0] 555 wantarray ? @res : $res[0]
533 } else { 556 } else {
577 reset_signals; 600 reset_signals;
578 &$cb 601 &$cb
579 }, @args; 602 }, @args;
580 603
581 wantarray ? @res : $res[-1] 604 wantarray ? @res : $res[-1]
605}
606
607sub objinfo {
608 (
609 "counter value" => cf::object::object_count,
610 "objects created" => cf::object::create_count,
611 "objects destroyed" => cf::object::destroy_count,
612 "freelist size" => cf::object::free_count,
613 "allocated objects" => cf::object::objects_size,
614 "active objects" => cf::object::actives_size,
615 )
582} 616}
583 617
584=item $coin = coin_from_name $name 618=item $coin = coin_from_name $name
585 619
586=cut 620=cut
623within each server. 657within each server.
624 658
625=cut 659=cut
626 660
627sub db_table($) { 661sub db_table($) {
662 cf::error "db_get called from main context"
663 if $Coro::current == $Coro::main;
664
628 my ($name) = @_; 665 my ($name) = @_;
629 my $db = BDB::db_create $DB_ENV; 666 my $db = BDB::db_create $DB_ENV;
630 667
631 eval { 668 eval {
632 $db->set_flags (BDB::CHKSUM); 669 $db->set_flags (BDB::CHKSUM);
642} 679}
643 680
644our $DB; 681our $DB;
645 682
646sub db_init { 683sub db_init {
647 cf::sync_job {
648 $DB ||= db_table "db"; 684 $DB ||= db_table "db";
649 };
650} 685}
651 686
652sub db_get($$) { 687sub db_get($$) {
653 my $key = "$_[0]/$_[1]"; 688 my $key = "$_[0]/$_[1]";
654 689
655 cf::sync_job { 690 cf::error "db_get called from main context"
691 if $Coro::current == $Coro::main;
692
656 BDB::db_get $DB, undef, $key, my $data; 693 BDB::db_get $DB, undef, $key, my $data;
657 694
658 $! ? () 695 $! ? ()
659 : $data 696 : $data
660 }
661} 697}
662 698
663sub db_put($$$) { 699sub db_put($$$) {
664 BDB::dbreq_pri 4; 700 BDB::dbreq_pri 4;
665 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 701 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
721 757
722 my $t1 = Time::HiRes::time; 758 my $t1 = Time::HiRes::time;
723 my $data = $process->(\@data); 759 my $data = $process->(\@data);
724 my $t2 = Time::HiRes::time; 760 my $t2 = Time::HiRes::time;
725 761
726 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 762 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
727 763
728 db_put cache => "$id/data", $data; 764 db_put cache => "$id/data", $data;
729 db_put cache => "$id/md5" , $md5; 765 db_put cache => "$id/md5" , $md5;
730 db_put cache => "$id/meta", $meta; 766 db_put cache => "$id/meta", $meta;
731 767
741 777
742=cut 778=cut
743 779
744sub datalog($@) { 780sub datalog($@) {
745 my ($type, %kv) = @_; 781 my ($type, %kv) = @_;
746 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 782 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
747} 783}
748 784
749=back 785=back
750 786
751=cut 787=cut
946 982
947 } elsif (exists $cb_id{$type}) { 983 } elsif (exists $cb_id{$type}) {
948 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 984 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
949 985
950 } elsif (ref $type) { 986 } elsif (ref $type) {
951 warn "attaching objects not supported, ignoring.\n"; 987 error "attaching objects not supported, ignoring.\n";
952 988
953 } else { 989 } else {
954 shift @arg; 990 shift @arg;
955 warn "attach argument '$type' not supported, ignoring.\n"; 991 error "attach argument '$type' not supported, ignoring.\n";
956 } 992 }
957 } 993 }
958} 994}
959 995
960sub _object_attach { 996sub _object_attach {
970 _attach $registry, $klass, @attach; 1006 _attach $registry, $klass, @attach;
971 } 1007 }
972 1008
973 $obj->{$name} = \%arg; 1009 $obj->{$name} = \%arg;
974 } else { 1010 } else {
975 warn "object uses attachment '$name' which is not available, postponing.\n"; 1011 info "object uses attachment '$name' which is not available, postponing.\n";
976 } 1012 }
977 1013
978 $obj->{_attachment}{$name} = undef; 1014 $obj->{_attachment}{$name} = undef;
979} 1015}
980 1016
1039 1075
1040 for (@$callbacks) { 1076 for (@$callbacks) {
1041 eval { &{$_->[1]} }; 1077 eval { &{$_->[1]} };
1042 1078
1043 if ($@) { 1079 if ($@) {
1044 warn "$@";
1045 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1080 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1046 override; 1081 override;
1047 } 1082 }
1048 1083
1049 return 1 if $override; 1084 return 1 if $override;
1050 } 1085 }
1129 for (@$attach) { 1164 for (@$attach) {
1130 my ($klass, @attach) = @$_; 1165 my ($klass, @attach) = @$_;
1131 _attach $registry, $klass, @attach; 1166 _attach $registry, $klass, @attach;
1132 } 1167 }
1133 } else { 1168 } else {
1134 warn "object uses attachment '$name' that is not available, postponing.\n"; 1169 info "object uses attachment '$name' that is not available, postponing.\n";
1135 } 1170 }
1136 } 1171 }
1137} 1172}
1138 1173
1139cf::attachable->attach ( 1174cf::attachable->attach (
1166 my ($filename, $rdata, $objs) = @_; 1201 my ($filename, $rdata, $objs) = @_;
1167 1202
1168 sync_job { 1203 sync_job {
1169 if (length $$rdata) { 1204 if (length $$rdata) {
1170 utf8::decode (my $decname = $filename); 1205 utf8::decode (my $decname = $filename);
1171 warn sprintf "saving %s (%d,%d)\n", 1206 trace sprintf "saving %s (%d,%d)\n",
1172 $decname, length $$rdata, scalar @$objs; 1207 $decname, length $$rdata, scalar @$objs
1208 if $VERBOSE_IO;
1173 1209
1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1210 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1175 aio_chmod $fh, SAVE_MODE; 1211 aio_chmod $fh, SAVE_MODE;
1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1212 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1177 aio_fsync $fh if $cf::USE_FSYNC; 1213 if ($cf::USE_FSYNC) {
1214 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1215 aio_fsync $fh;
1216 }
1178 aio_close $fh; 1217 aio_close $fh;
1179 1218
1180 if (@$objs) { 1219 if (@$objs) {
1181 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1220 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1182 aio_chmod $fh, SAVE_MODE; 1221 aio_chmod $fh, SAVE_MODE;
1183 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1222 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1184 aio_write $fh, 0, (length $data), $data, 0; 1223 aio_write $fh, 0, (length $data), $data, 0;
1185 aio_fsync $fh if $cf::USE_FSYNC; 1224 if ($cf::USE_FSYNC) {
1225 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;
1226 aio_fsync $fh;
1227 }
1186 aio_close $fh; 1228 aio_close $fh;
1187 aio_rename "$filename.pst~", "$filename.pst"; 1229 aio_rename "$filename.pst~", "$filename.pst";
1188 } 1230 }
1189 } else { 1231 } else {
1190 aio_unlink "$filename.pst"; 1232 aio_unlink "$filename.pst";
1193 aio_rename "$filename~", $filename; 1235 aio_rename "$filename~", $filename;
1194 1236
1195 $filename =~ s%/[^/]+$%%; 1237 $filename =~ s%/[^/]+$%%;
1196 aio_pathsync $filename if $cf::USE_FSYNC; 1238 aio_pathsync $filename if $cf::USE_FSYNC;
1197 } else { 1239 } else {
1198 warn "FATAL: $filename~: $!\n"; 1240 error "unable to save objects: $filename~: $!\n";
1199 } 1241 }
1200 } else { 1242 } else {
1201 aio_unlink $filename; 1243 aio_unlink $filename;
1202 aio_unlink "$filename.pst"; 1244 aio_unlink "$filename.pst";
1203 } 1245 }
1227 my $st = eval { Coro::Storable::thaw $av }; 1269 my $st = eval { Coro::Storable::thaw $av };
1228 $av = $st->{objs}; 1270 $av = $st->{objs};
1229 } 1271 }
1230 1272
1231 utf8::decode (my $decname = $filename); 1273 utf8::decode (my $decname = $filename);
1232 warn sprintf "loading %s (%d,%d)\n", 1274 trace sprintf "loading %s (%d,%d)\n",
1233 $decname, length $data, scalar @{$av || []}; 1275 $decname, length $data, scalar @{$av || []}
1276 if $VERBOSE_IO;
1234 1277
1235 ($data, $av) 1278 ($data, $av)
1236} 1279}
1237 1280
1238=head2 COMMAND CALLBACKS 1281=head2 COMMAND CALLBACKS
1297} 1340}
1298 1341
1299use File::Glob (); 1342use File::Glob ();
1300 1343
1301cf::player->attach ( 1344cf::player->attach (
1302 on_command => sub { 1345 on_unknown_command => sub {
1303 my ($pl, $name, $params) = @_; 1346 my ($pl, $name, $params) = @_;
1304 1347
1305 my $cb = $COMMAND{$name} 1348 my $cb = $COMMAND{$name}
1306 or return; 1349 or return;
1307 1350
1330 1373
1331 $pl->ext_reply ($reply, @reply) 1374 $pl->ext_reply ($reply, @reply)
1332 if $reply; 1375 if $reply;
1333 1376
1334 } else { 1377 } else {
1335 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1378 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1336 } 1379 }
1337 1380
1338 cf::override; 1381 cf::override;
1339 }, 1382 },
1340); 1383);
1341 1384
1342# "readahead" all extensions 1385# "readahead" all extensions
1343sub cache_extensions { 1386sub cache_extensions {
1344 my $grp = IO::AIO::aio_group; 1387 my $grp = IO::AIO::aio_group;
1345 1388
1346 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1389 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1347 for (grep /\.ext$/, @{$_[0]}) { 1390 for (grep /\.ext$/, @{$_[0]}) {
1348 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1391 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1349 } 1392 }
1350 }; 1393 };
1351 1394
1352 $grp 1395 $grp
1353} 1396}
1354 1397
1355sub load_extensions { 1398sub load_extensions {
1399 info "loading extensions...";
1400
1356 cf::sync_job { 1401 cf::sync_job {
1357 my %todo; 1402 my %todo;
1358 1403
1359 for my $path (<$LIBDIR/*.ext>) { 1404 for my $path (<$LIBDIR/*.ext>) {
1360 next unless -r $path; 1405 next unless -r $path;
1378 1423
1379 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1424 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1380 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1425 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1381 1426
1382 $ext{source} = 1427 $ext{source} =
1383 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1428 "package $pkg; use common::sense;\n"
1384 . "#line 1 \"$path\"\n{\n" 1429 . "#line 1 \"$path\"\n{\n"
1385 . $source 1430 . $source
1386 . "\n};\n1"; 1431 . "\n};\n1";
1387 1432
1388 $todo{$base} = \%ext; 1433 $todo{$base} = \%ext;
1389 } 1434 }
1390 1435
1436 my $pass = 0;
1391 my %done; 1437 my %done;
1392 while (%todo) { 1438 while (%todo) {
1393 my $progress; 1439 my $progress;
1394 1440
1441 ++$pass;
1442
1443 ext:
1395 while (my ($k, $v) = each %todo) { 1444 while (my ($k, $v) = each %todo) {
1396 for (split /,\s*/, $v->{meta}{depends}) { 1445 for (split /,\s*/, $v->{meta}{depends}) {
1397 goto skip 1446 next ext
1398 unless exists $done{$_}; 1447 unless exists $done{$_};
1399 } 1448 }
1400 1449
1401 warn "... loading '$k' into '$v->{pkg}'\n"; 1450 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1402 1451
1403 unless (eval $v->{source}) { 1452 my $active = eval $v->{source};
1453
1454 if (length $@) {
1404 my $msg = $@ ? "$v->{path}: $@\n" 1455 error "$v->{path}: $@\n";
1405 : "$v->{base}: extension inactive.\n"; 1456 undef $@; # work around perl 5.10.0 utf-8 caching bug
1406 1457
1407 if (exists $v->{meta}{mandatory}) {
1408 warn $msg;
1409 cf::cleanup "mandatory extension failed to load, exiting."; 1458 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1410 } 1459 if exists $v->{meta}{mandatory};
1411 1460
1412 warn $msg; 1461 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1462 delete $todo{$k};
1463 } else {
1464 $done{$k} = delete $todo{$k};
1465 push @EXTS, $v->{pkg};
1466 $progress = 1;
1467
1468 info "$v->{base}: extension inactive.\n"
1469 unless $active;
1413 } 1470 }
1414
1415 $done{$k} = delete $todo{$k};
1416 push @EXTS, $v->{pkg};
1417 $progress = 1;
1418 } 1471 }
1419 1472
1420 skip: 1473 unless ($progress) {
1421 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1474 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1422 unless $progress; 1475
1476 while (my ($k, $v) = each %todo) {
1477 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1478 if exists $v->{meta}{mandatory};
1479 }
1480 }
1423 } 1481 }
1424 }; 1482 };
1425} 1483}
1426 1484
1427############################################################################# 1485#############################################################################
1511 $cf::PLAYER{$login} = $pl 1569 $cf::PLAYER{$login} = $pl
1512 } 1570 }
1513 } 1571 }
1514} 1572}
1515 1573
1574cf::player->attach (
1575 on_load => sub {
1576 my ($pl, $path) = @_;
1577
1578 # restore slots saved in save, below
1579 my $slots = delete $pl->{_slots};
1580
1581 $pl->ob->current_weapon ($slots->[0]);
1582 $pl->combat_ob ($slots->[1]);
1583 $pl->ranged_ob ($slots->[2]);
1584 },
1585);
1586
1516sub save($) { 1587sub save($) {
1517 my ($pl) = @_; 1588 my ($pl) = @_;
1518 1589
1519 return if $pl->{deny_save}; 1590 return if $pl->{deny_save};
1520 1591
1525 1596
1526 aio_mkdir playerdir $pl, 0770; 1597 aio_mkdir playerdir $pl, 0770;
1527 $pl->{last_save} = $cf::RUNTIME; 1598 $pl->{last_save} = $cf::RUNTIME;
1528 1599
1529 cf::get_slot 0.01; 1600 cf::get_slot 0.01;
1601
1602 # save slots, to be restored later
1603 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1530 1604
1531 $pl->save_pl ($path); 1605 $pl->save_pl ($path);
1532 cf::cede_to_tick; 1606 cf::cede_to_tick;
1533} 1607}
1534 1608
1571 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1645 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1572 1646
1573 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1647 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1574 $pl->deactivate; 1648 $pl->deactivate;
1575 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1649 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1576 $pl->ob->check_score;
1577 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1650 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1578 $pl->ns->destroy if $pl->ns; 1651 $pl->ns->destroy if $pl->ns;
1579 1652
1580 my $path = playerdir $pl; 1653 my $path = playerdir $pl;
1581 my $temp = "$path~$cf::RUNTIME~deleting~"; 1654 my $temp = "$path~$cf::RUNTIME~deleting~";
1636 \@logins 1709 \@logins
1637} 1710}
1638 1711
1639=item $player->maps 1712=item $player->maps
1640 1713
1714=item cf::player::maps $login
1715
1641Returns an arrayref of map paths that are private for this 1716Returns an arrayref of map paths that are private for this
1642player. May block. 1717player. May block.
1643 1718
1644=cut 1719=cut
1645 1720
1707=cut 1782=cut
1708 1783
1709sub find_by_path($) { 1784sub find_by_path($) {
1710 my ($path) = @_; 1785 my ($path) = @_;
1711 1786
1787 $path =~ s/^~[^\/]*//; # skip ~login
1788
1712 my ($match, $specificity); 1789 my ($match, $specificity);
1713 1790
1714 for my $region (list) { 1791 for my $region (list) {
1715 if ($region->{match} && $path =~ $region->{match}) { 1792 if ($region->{match} && $path =~ $region->{match}) {
1716 ($match, $specificity) = ($region, $region->specificity) 1793 ($match, $specificity) = ($region, $region->specificity)
1747 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1824 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1748 1825
1749 # mit "rum" bekleckern, nicht 1826 # mit "rum" bekleckern, nicht
1750 $self->_create_random_map ( 1827 $self->_create_random_map (
1751 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1828 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1752 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1829 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1753 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1830 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1754 $rmp->{exit_on_final_map}, 1831 $rmp->{exit_on_final_map},
1755 $rmp->{xsize}, $rmp->{ysize}, 1832 $rmp->{xsize}, $rmp->{ysize},
1756 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1833 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1757 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1834 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1772 1849
1773sub register { 1850sub register {
1774 my (undef, $regex, $prio) = @_; 1851 my (undef, $regex, $prio) = @_;
1775 my $pkg = caller; 1852 my $pkg = caller;
1776 1853
1777 no strict;
1778 push @{"$pkg\::ISA"}, __PACKAGE__; 1854 push @{"$pkg\::ISA"}, __PACKAGE__;
1779 1855
1780 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1856 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1781} 1857}
1782 1858
1783# also paths starting with '/' 1859# also paths starting with '/'
1784$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1860$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1785 1861
1786sub thawer_merge { 1862sub thawer_merge {
1787 my ($self, $merge) = @_; 1863 my ($self, $merge) = @_;
1788 1864
1789 # we have to keep some variables in memory intact 1865 # we have to keep some variables in memory intact
1887 1963
1888 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1964 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1889 "$UNIQUEDIR/$path" 1965 "$UNIQUEDIR/$path"
1890} 1966}
1891 1967
1892# and all this just because we cannot iterate over
1893# all maps in C++...
1894sub change_all_map_light {
1895 my ($change) = @_;
1896
1897 $_->change_map_light ($change)
1898 for grep $_->outdoor, values %cf::MAP;
1899}
1900
1901sub decay_objects { 1968sub decay_objects {
1902 my ($self) = @_; 1969 my ($self) = @_;
1903 1970
1904 return if $self->{deny_reset}; 1971 return if $self->{deny_reset};
1905 1972
1987sub find { 2054sub find {
1988 my ($path, $origin) = @_; 2055 my ($path, $origin) = @_;
1989 2056
1990 $path = normalise $path, $origin && $origin->path; 2057 $path = normalise $path, $origin && $origin->path;
1991 2058
1992 cf::lock_wait "map_data:$path";#d#remove 2059 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1993 cf::lock_wait "map_find:$path"; 2060 my $guard2 = cf::lock_acquire "map_find:$path";
1994 2061
1995 $cf::MAP{$path} || do { 2062 $cf::MAP{$path} || do {
1996 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1997 my $guard2 = cf::lock_acquire "map_find:$path";
1998
1999 my $map = new_from_path cf::map $path 2063 my $map = new_from_path cf::map $path
2000 or return; 2064 or return;
2001 2065
2002 $map->{last_save} = $cf::RUNTIME; 2066 $map->{last_save} = $cf::RUNTIME;
2003 2067
2015 2079
2016 $cf::MAP{$path} = $map 2080 $cf::MAP{$path} = $map
2017 } 2081 }
2018} 2082}
2019 2083
2020sub pre_load { } 2084sub pre_load { }
2021sub post_load { } 2085#sub post_load { } # XS
2022 2086
2023sub load { 2087sub load {
2024 my ($self) = @_; 2088 my ($self) = @_;
2025 2089
2026 local $self->{deny_reset} = 1; # loading can take a long time 2090 local $self->{deny_reset} = 1; # loading can take a long time
2071 unless ($self->{deny_activate}) { 2135 unless ($self->{deny_activate}) {
2072 $self->decay_objects; 2136 $self->decay_objects;
2073 $self->fix_auto_apply; 2137 $self->fix_auto_apply;
2074 $self->update_buttons; 2138 $self->update_buttons;
2075 cf::cede_to_tick; 2139 cf::cede_to_tick;
2076 $self->set_darkness_map;
2077 cf::cede_to_tick;
2078 $self->activate; 2140 $self->activate;
2079 } 2141 }
2080 2142
2081 $self->{last_save} = $cf::RUNTIME; 2143 $self->{last_save} = $cf::RUNTIME;
2082 $self->last_access ($cf::RUNTIME); 2144 $self->last_access ($cf::RUNTIME);
2085 } 2147 }
2086 2148
2087 $self->post_load; 2149 $self->post_load;
2088} 2150}
2089 2151
2152# customize the map for a given player, i.e.
2153# return the _real_ map. used by e.g. per-player
2154# maps to change the path to ~playername/mappath
2090sub customise_for { 2155sub customise_for {
2091 my ($self, $ob) = @_; 2156 my ($self, $ob) = @_;
2092 2157
2093 return find "~" . $ob->name . "/" . $self->{path} 2158 return find "~" . $ob->name . "/" . $self->{path}
2094 if $self->per_player; 2159 if $self->per_player;
2110 or next; 2175 or next;
2111 $neigh = find $neigh, $map 2176 $neigh = find $neigh, $map
2112 or next; 2177 or next;
2113 $neigh->load; 2178 $neigh->load;
2114 2179
2180 # now find the diagonal neighbours
2115 push @neigh, 2181 push @neigh,
2116 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2182 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2117 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2183 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2118 } 2184 }
2119 2185
2126} 2192}
2127 2193
2128sub find_sync { 2194sub find_sync {
2129 my ($path, $origin) = @_; 2195 my ($path, $origin) = @_;
2130 2196
2131 cf::sync_job { find $path, $origin } 2197 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2198 if $Coro::current == $Coro::main;
2199
2200 find $path, $origin
2132} 2201}
2133 2202
2134sub do_load_sync { 2203sub do_load_sync {
2135 my ($map) = @_; 2204 my ($map) = @_;
2136 2205
2137 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2206 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2138 if $Coro::current == $Coro::main; 2207 if $Coro::current == $Coro::main;
2139 2208
2140 cf::sync_job { $map->load }; 2209 $map->load;
2141} 2210}
2142 2211
2143our %MAP_PREFETCH; 2212our %MAP_PREFETCH;
2144our $MAP_PREFETCHER = undef; 2213our $MAP_PREFETCHER = undef;
2145 2214
2171 $MAP_PREFETCHER->prio (6); 2240 $MAP_PREFETCHER->prio (6);
2172 2241
2173 () 2242 ()
2174} 2243}
2175 2244
2245# common code, used by both ->save and ->swapout
2176sub save { 2246sub _save {
2177 my ($self) = @_; 2247 my ($self) = @_;
2178
2179 my $lock = cf::lock_acquire "map_data:$self->{path}";
2180 2248
2181 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2182 2250
2183 return unless $self->dirty; 2251 return unless $self->dirty;
2184 2252
2204 } else { 2272 } else {
2205 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2273 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2206 } 2274 }
2207} 2275}
2208 2276
2277sub save {
2278 my ($self) = @_;
2279
2280 my $lock = cf::lock_acquire "map_data:$self->{path}";
2281
2282 $self->_save;
2283}
2284
2209sub swap_out { 2285sub swap_out {
2210 my ($self) = @_; 2286 my ($self) = @_;
2211 2287
2212 # save first because save cedes
2213 $self->save;
2214
2215 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2288 my $lock = cf::lock_acquire "map_data:$self->{path}";
2216 2289
2217 return if $self->players;
2218 return if $self->in_memory != cf::MAP_ACTIVE; 2290 return if $self->in_memory != cf::MAP_ACTIVE;
2219 return if $self->{deny_save}; 2291 return if $self->{deny_save};
2292 return if $self->players;
2220 2293
2294 # first deactivate the map and "unlink" it from the core
2295 $self->deactivate;
2296 $_->clear_links_to ($self) for values %cf::MAP;
2221 $self->in_memory (cf::MAP_SWAPPED); 2297 $self->in_memory (cf::MAP_SWAPPED);
2298
2299 # then atomically save
2300 $self->_save;
2301
2302 # then free the map
2303 $self->clear;
2304}
2305
2306sub reset_at {
2307 my ($self) = @_;
2308
2309 # TODO: safety, remove and allow resettable per-player maps
2310 return 1e99 if $self->{deny_reset};
2311
2312 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2313 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2314
2315 $time + $to
2316}
2317
2318sub should_reset {
2319 my ($self) = @_;
2320
2321 $self->reset_at <= $cf::RUNTIME
2322}
2323
2324sub reset {
2325 my ($self) = @_;
2326
2327 my $lock = cf::lock_acquire "map_data:$self->{path}";
2328
2329 return if $self->players;
2330
2331 cf::trace "resetting map ", $self->path, "\n";
2332
2333 $self->in_memory (cf::MAP_SWAPPED);
2334
2335 # need to save uniques path
2336 unless ($self->{deny_save}) {
2337 my $uniq = $self->uniq_path; utf8::encode $uniq;
2338
2339 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2340 if $uniq;
2341 }
2342
2343 delete $cf::MAP{$self->path};
2222 2344
2223 $self->deactivate; 2345 $self->deactivate;
2224 $_->clear_links_to ($self) for values %cf::MAP; 2346 $_->clear_links_to ($self) for values %cf::MAP;
2225 $self->clear; 2347 $self->clear;
2226}
2227
2228sub reset_at {
2229 my ($self) = @_;
2230
2231 # TODO: safety, remove and allow resettable per-player maps
2232 return 1e99 if $self->{deny_reset};
2233
2234 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2235 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2236
2237 $time + $to
2238}
2239
2240sub should_reset {
2241 my ($self) = @_;
2242
2243 $self->reset_at <= $cf::RUNTIME
2244}
2245
2246sub reset {
2247 my ($self) = @_;
2248
2249 my $lock = cf::lock_acquire "map_data:$self->{path}";
2250
2251 return if $self->players;
2252
2253 warn "resetting map ", $self->path;
2254
2255 $self->in_memory (cf::MAP_SWAPPED);
2256
2257 # need to save uniques path
2258 unless ($self->{deny_save}) {
2259 my $uniq = $self->uniq_path; utf8::encode $uniq;
2260
2261 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2262 if $uniq;
2263 }
2264
2265 delete $cf::MAP{$self->path};
2266
2267 $self->deactivate;
2268 $_->clear_links_to ($self) for values %cf::MAP;
2269 $self->clear;
2270 2348
2271 $self->unlink_save; 2349 $self->unlink_save;
2272 $self->destroy; 2350 $self->destroy;
2273} 2351}
2274 2352
2282 2360
2283 delete $cf::MAP{$self->path}; 2361 delete $cf::MAP{$self->path};
2284 2362
2285 $self->unlink_save; 2363 $self->unlink_save;
2286 2364
2287 bless $self, "cf::map"; 2365 bless $self, "cf::map::wrap";
2288 delete $self->{deny_reset}; 2366 delete $self->{deny_reset};
2289 $self->{deny_save} = 1; 2367 $self->{deny_save} = 1;
2290 $self->reset_timeout (1); 2368 $self->reset_timeout (1);
2291 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2369 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2292 2370
2349 : normalise $_ 2427 : normalise $_
2350 } @{ aio_readdir $UNIQUEDIR or [] } 2428 } @{ aio_readdir $UNIQUEDIR or [] }
2351 ] 2429 ]
2352} 2430}
2353 2431
2432=item cf::map::static_maps
2433
2434Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2435file in the shared directory excluding F</styles> and F</editor>). May
2436block.
2437
2438=cut
2439
2440sub static_maps() {
2441 my @dirs = "";
2442 my @maps;
2443
2444 while (@dirs) {
2445 my $dir = shift @dirs;
2446
2447 next if $dir eq "/styles" || $dir eq "/editor";
2448
2449 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2450 or return;
2451
2452 for (@$files) {
2453 s/\.map$// or next;
2454 utf8::decode $_;
2455 push @maps, "$dir/$_";
2456 }
2457
2458 push @dirs, map "$dir/$_", @$dirs;
2459 }
2460
2461 \@maps
2462}
2463
2354=back 2464=back
2355 2465
2356=head3 cf::object 2466=head3 cf::object
2357 2467
2358=cut 2468=cut
2423 2533
2424our $SAY_CHANNEL = { 2534our $SAY_CHANNEL = {
2425 id => "say", 2535 id => "say",
2426 title => "Map", 2536 title => "Map",
2427 reply => "say ", 2537 reply => "say ",
2428 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2538 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2429}; 2539};
2430 2540
2431our $CHAT_CHANNEL = { 2541our $CHAT_CHANNEL = {
2432 id => "chat", 2542 id => "chat",
2433 title => "Chat", 2543 title => "Chat",
2490 2600
2491Freezes the player and moves him/her to a special map (C<{link}>). 2601Freezes the player and moves him/her to a special map (C<{link}>).
2492 2602
2493The player should be reasonably safe there for short amounts of time (e.g. 2603The player should be reasonably safe there for short amounts of time (e.g.
2494for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2604for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2495though, as the palyer cannot control the character while it is on the link 2605though, as the player cannot control the character while it is on the link
2496map. 2606map.
2497 2607
2498Will never block. 2608Will never block.
2499 2609
2500=item $player_object->leave_link ($map, $x, $y) 2610=item $player_object->leave_link ($map, $x, $y)
2521sub cf::object::player::enter_link { 2631sub cf::object::player::enter_link {
2522 my ($self) = @_; 2632 my ($self) = @_;
2523 2633
2524 $self->deactivate_recursive; 2634 $self->deactivate_recursive;
2525 2635
2636 ++$self->{_link_recursion};
2637
2526 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2638 return if UNIVERSAL::isa $self->map, "ext::map_link";
2527 2639
2528 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2640 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2529 if $self->map && $self->map->{path} ne "{link}"; 2641 if $self->map && $self->map->{path} ne "{link}";
2530 2642
2531 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2643 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2532} 2644}
2533 2645
2534sub cf::object::player::leave_link { 2646sub cf::object::player::leave_link {
2535 my ($self, $map, $x, $y) = @_; 2647 my ($self, $map, $x, $y) = @_;
2536 2648
2553 ($x, $y) = (-1, -1) 2665 ($x, $y) = (-1, -1)
2554 unless (defined $x) && (defined $y); 2666 unless (defined $x) && (defined $y);
2555 2667
2556 # use -1 or undef as default coordinates, not 0, 0 2668 # use -1 or undef as default coordinates, not 0, 0
2557 ($x, $y) = ($map->enter_x, $map->enter_y) 2669 ($x, $y) = ($map->enter_x, $map->enter_y)
2558 if $x <=0 && $y <= 0; 2670 if $x <= 0 && $y <= 0;
2559 2671
2560 $map->load; 2672 $map->load;
2561 $map->load_neighbours; 2673 $map->load_neighbours;
2562 2674
2563 return unless $self->contr->active; 2675 return unless $self->contr->active;
2564 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2565 $self->activate_recursive;
2566 2676
2567 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2677 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2568 $self->enter_map ($map, $x, $y); 2678 if ($self->enter_map ($map, $x, $y)) {
2569} 2679 # entering was successful
2680 delete $self->{_link_recursion};
2681 # only activate afterwards, to support waiting in hooks
2682 $self->activate_recursive;
2683 }
2570 2684
2685}
2686
2571=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2687=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2572 2688
2573Moves the player to the given map-path and coordinates by first freezing 2689Moves the player to the given map-path and coordinates by first freezing
2574her, loading and preparing them map, calling the provided $check callback 2690her, loading and preparing them map, calling the provided $check callback
2575that has to return the map if sucecssful, and then unfreezes the player on 2691that has to return the map if sucecssful, and then unfreezes the player on
2576the new (success) or old (failed) map position. In either case, $done will 2692the new (success) or old (failed) map position. In either case, $done will
2583 2699
2584our $GOTOGEN; 2700our $GOTOGEN;
2585 2701
2586sub cf::object::player::goto { 2702sub cf::object::player::goto {
2587 my ($self, $path, $x, $y, $check, $done) = @_; 2703 my ($self, $path, $x, $y, $check, $done) = @_;
2704
2705 if ($self->{_link_recursion} >= $MAX_LINKS) {
2706 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2707 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2708 ($path, $x, $y) = @$EMERGENCY_POSITION;
2709 }
2588 2710
2589 # do generation counting so two concurrent goto's will be executed in-order 2711 # do generation counting so two concurrent goto's will be executed in-order
2590 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2712 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2591 2713
2592 $self->enter_link; 2714 $self->enter_link;
2616 my $map = eval { 2738 my $map = eval {
2617 my $map = defined $path ? cf::map::find $path : undef; 2739 my $map = defined $path ? cf::map::find $path : undef;
2618 2740
2619 if ($map) { 2741 if ($map) {
2620 $map = $map->customise_for ($self); 2742 $map = $map->customise_for ($self);
2621 $map = $check->($map) if $check && $map; 2743 $map = $check->($map, $x, $y, $self) if $check && $map;
2622 } else { 2744 } else {
2623 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2745 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2624 } 2746 }
2625 2747
2626 $map 2748 $map
2634 if ($gen == $self->{_goto_generation}) { 2756 if ($gen == $self->{_goto_generation}) {
2635 delete $self->{_goto_generation}; 2757 delete $self->{_goto_generation};
2636 $self->leave_link ($map, $x, $y); 2758 $self->leave_link ($map, $x, $y);
2637 } 2759 }
2638 2760
2639 $done->() if $done; 2761 $done->($self) if $done;
2640 })->prio (1); 2762 })->prio (1);
2641} 2763}
2642 2764
2643=item $player_object->enter_exit ($exit_object) 2765=item $player_object->enter_exit ($exit_object)
2644 2766
2737 $self->message ("Something went wrong deep within the deliantra server. " 2859 $self->message ("Something went wrong deep within the deliantra server. "
2738 . "I'll try to bring you back to the map you were before. " 2860 . "I'll try to bring you back to the map you were before. "
2739 . "Please report this to the dungeon master!", 2861 . "Please report this to the dungeon master!",
2740 cf::NDI_UNIQUE | cf::NDI_RED); 2862 cf::NDI_UNIQUE | cf::NDI_RED);
2741 2863
2742 warn "ERROR in enter_exit: $@"; 2864 error "ERROR in enter_exit: $@";
2743 $self->leave_link; 2865 $self->leave_link;
2744 } 2866 }
2745 })->prio (1); 2867 })->prio (1);
2746} 2868}
2747 2869
2759sub cf::client::send_drawinfo { 2881sub cf::client::send_drawinfo {
2760 my ($self, $text, $flags) = @_; 2882 my ($self, $text, $flags) = @_;
2761 2883
2762 utf8::encode $text; 2884 utf8::encode $text;
2763 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2885 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2886}
2887
2888=item $client->send_big_packet ($pkt)
2889
2890Like C<send_packet>, but tries to compress large packets, and fragments
2891them as required.
2892
2893=cut
2894
2895our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2896
2897sub cf::client::send_big_packet {
2898 my ($self, $pkt) = @_;
2899
2900 # try lzf for large packets
2901 $pkt = "lzf " . Compress::LZF::compress $pkt
2902 if 1024 <= length $pkt and $self->{can_lzf};
2903
2904 # split very large packets
2905 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2906 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2907 $pkt = "frag";
2908 }
2909
2910 $self->send_packet ($pkt);
2764} 2911}
2765 2912
2766=item $client->send_msg ($channel, $msg, $color, [extra...]) 2913=item $client->send_msg ($channel, $msg, $color, [extra...])
2767 2914
2768Send a drawinfo or msg packet to the client, formatting the msg for the 2915Send a drawinfo or msg packet to the client, formatting the msg for the
2772 2919
2773=cut 2920=cut
2774 2921
2775# non-persistent channels (usually the info channel) 2922# non-persistent channels (usually the info channel)
2776our %CHANNEL = ( 2923our %CHANNEL = (
2924 "c/motd" => {
2925 id => "infobox",
2926 title => "MOTD",
2927 reply => undef,
2928 tooltip => "The message of the day",
2929 },
2777 "c/identify" => { 2930 "c/identify" => {
2778 id => "infobox", 2931 id => "infobox",
2779 title => "Identify", 2932 title => "Identify",
2780 reply => undef, 2933 reply => undef,
2781 tooltip => "Items recently identified", 2934 tooltip => "Items recently identified",
2783 "c/examine" => { 2936 "c/examine" => {
2784 id => "infobox", 2937 id => "infobox",
2785 title => "Examine", 2938 title => "Examine",
2786 reply => undef, 2939 reply => undef,
2787 tooltip => "Signs and other items you examined", 2940 tooltip => "Signs and other items you examined",
2941 },
2942 "c/shopinfo" => {
2943 id => "infobox",
2944 title => "Shop Info",
2945 reply => undef,
2946 tooltip => "What your bargaining skill tells you about the shop",
2788 }, 2947 },
2789 "c/book" => { 2948 "c/book" => {
2790 id => "infobox", 2949 id => "infobox",
2791 title => "Book", 2950 title => "Book",
2792 reply => undef, 2951 reply => undef,
2808 id => "infobox", 2967 id => "infobox",
2809 title => "Body Parts", 2968 title => "Body Parts",
2810 reply => undef, 2969 reply => undef,
2811 tooltip => "Shows which body parts you posess and are available", 2970 tooltip => "Shows which body parts you posess and are available",
2812 }, 2971 },
2972 "c/statistics" => {
2973 id => "infobox",
2974 title => "Statistics",
2975 reply => undef,
2976 tooltip => "Shows your primary statistics",
2977 },
2813 "c/skills" => { 2978 "c/skills" => {
2814 id => "infobox", 2979 id => "infobox",
2815 title => "Skills", 2980 title => "Skills",
2816 reply => undef, 2981 reply => undef,
2817 tooltip => "Shows your experience per skill and item power", 2982 tooltip => "Shows your experience per skill and item power",
2983 },
2984 "c/shopitems" => {
2985 id => "infobox",
2986 title => "Shop Items",
2987 reply => undef,
2988 tooltip => "Shows the items currently for sale in this shop",
2989 },
2990 "c/resistances" => {
2991 id => "infobox",
2992 title => "Resistances",
2993 reply => undef,
2994 tooltip => "Shows your resistances",
2995 },
2996 "c/pets" => {
2997 id => "infobox",
2998 title => "Pets",
2999 reply => undef,
3000 tooltip => "Shows information abotu your pets/a specific pet",
3001 },
3002 "c/perceiveself" => {
3003 id => "infobox",
3004 title => "Perceive Self",
3005 reply => undef,
3006 tooltip => "You gained detailed knowledge about yourself",
2818 }, 3007 },
2819 "c/uptime" => { 3008 "c/uptime" => {
2820 id => "infobox", 3009 id => "infobox",
2821 title => "Uptime", 3010 title => "Uptime",
2822 reply => undef, 3011 reply => undef,
2832 id => "party", 3021 id => "party",
2833 title => "Party", 3022 title => "Party",
2834 reply => "gsay ", 3023 reply => "gsay ",
2835 tooltip => "Messages and chat related to your party", 3024 tooltip => "Messages and chat related to your party",
2836 }, 3025 },
3026 "c/death" => {
3027 id => "death",
3028 title => "Death",
3029 reply => undef,
3030 tooltip => "Reason for and more info about your most recent death",
3031 },
3032 "c/say" => $SAY_CHANNEL,
3033 "c/chat" => $CHAT_CHANNEL,
2837); 3034);
2838 3035
2839sub cf::client::send_msg { 3036sub cf::client::send_msg {
2840 my ($self, $channel, $msg, $color, @extra) = @_; 3037 my ($self, $channel, $msg, $color, @extra) = @_;
2841 3038
2846 3043
2847 # check predefined channels, for the benefit of C 3044 # check predefined channels, for the benefit of C
2848 if ($CHANNEL{$channel}) { 3045 if ($CHANNEL{$channel}) {
2849 $channel = $CHANNEL{$channel}; 3046 $channel = $CHANNEL{$channel};
2850 3047
2851 $self->ext_msg (channel_info => $channel) 3048 $self->ext_msg (channel_info => $channel);
2852 if $self->can_msg;
2853
2854 $channel = $channel->{id}; 3049 $channel = $channel->{id};
2855 3050
2856 } elsif (ref $channel) { 3051 } elsif (ref $channel) {
2857 # send meta info to client, if not yet sent 3052 # send meta info to client, if not yet sent
2858 unless (exists $self->{channel}{$channel->{id}}) { 3053 unless (exists $self->{channel}{$channel->{id}}) {
2859 $self->{channel}{$channel->{id}} = $channel; 3054 $self->{channel}{$channel->{id}} = $channel;
2860 $self->ext_msg (channel_info => $channel) 3055 $self->ext_msg (channel_info => $channel);
2861 if $self->can_msg;
2862 } 3056 }
2863 3057
2864 $channel = $channel->{id}; 3058 $channel = $channel->{id};
2865 } 3059 }
2866 3060
2867 return unless @extra || length $msg; 3061 return unless @extra || length $msg;
2868 3062
2869 if ($self->can_msg) {
2870 # default colour, mask it out 3063 # default colour, mask it out
2871 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3064 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2872 if $color & cf::NDI_DEF; 3065 if $color & cf::NDI_DEF;
2873 3066
2874 my $pkt = "msg " 3067 my $pkt = "msg "
2875 . $self->{json_coder}->encode ( 3068 . $self->{json_coder}->encode (
2876 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3069 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2877 ); 3070 );
2878 3071
2879 # try lzf for large packets
2880 $pkt = "lzf " . Compress::LZF::compress $pkt
2881 if 1024 <= length $pkt and $self->{can_lzf};
2882
2883 # split very large packets
2884 if (8192 < length $pkt and $self->{can_lzf}) {
2885 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2886 $pkt = "frag";
2887 }
2888
2889 $self->send_packet ($pkt); 3072 $self->send_big_packet ($pkt);
2890 } else {
2891 if ($color >= 0) {
2892 # replace some tags by gcfclient-compatible ones
2893 for ($msg) {
2894 1 while
2895 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2896 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2897 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2898 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2899 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2900 }
2901
2902 $color &= cf::NDI_COLOR_MASK;
2903
2904 utf8::encode $msg;
2905
2906 if (0 && $msg =~ /\[/) {
2907 # COMMAND/INFO
2908 $self->send_packet ("drawextinfo $color 10 8 $msg")
2909 } else {
2910 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2911 $self->send_packet ("drawinfo $color $msg")
2912 }
2913 }
2914 }
2915} 3073}
2916 3074
2917=item $client->ext_msg ($type, @msg) 3075=item $client->ext_msg ($type, @msg)
2918 3076
2919Sends an ext event to the client. 3077Sends an ext event to the client.
2922 3080
2923sub cf::client::ext_msg($$@) { 3081sub cf::client::ext_msg($$@) {
2924 my ($self, $type, @msg) = @_; 3082 my ($self, $type, @msg) = @_;
2925 3083
2926 if ($self->extcmd == 2) { 3084 if ($self->extcmd == 2) {
2927 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3085 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2928 } elsif ($self->extcmd == 1) { # TODO: remove 3086 } elsif ($self->extcmd == 1) { # TODO: remove
2929 push @msg, msgtype => "event_$type"; 3087 push @msg, msgtype => "event_$type";
2930 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3088 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2931 } 3089 }
2932} 3090}
2933 3091
2934=item $client->ext_reply ($msgid, @msg) 3092=item $client->ext_reply ($msgid, @msg)
2935 3093
2939 3097
2940sub cf::client::ext_reply($$@) { 3098sub cf::client::ext_reply($$@) {
2941 my ($self, $id, @msg) = @_; 3099 my ($self, $id, @msg) = @_;
2942 3100
2943 if ($self->extcmd == 2) { 3101 if ($self->extcmd == 2) {
2944 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3102 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2945 } elsif ($self->extcmd == 1) { 3103 } elsif ($self->extcmd == 1) {
2946 #TODO: version 1, remove 3104 #TODO: version 1, remove
2947 unshift @msg, msgtype => "reply", msgid => $id; 3105 unshift @msg, msgtype => "reply", msgid => $id;
2948 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3106 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2949 } 3107 }
2950} 3108}
2951 3109
2952=item $success = $client->query ($flags, "text", \&cb) 3110=item $success = $client->query ($flags, "text", \&cb)
2953 3111
3024 3182
3025 $ns->ext_reply ($reply, @reply) 3183 $ns->ext_reply ($reply, @reply)
3026 if $reply; 3184 if $reply;
3027 3185
3028 } else { 3186 } else {
3029 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3187 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3030 } 3188 }
3031 3189
3032 cf::override; 3190 cf::override;
3033 }, 3191 },
3034); 3192);
3054 3212
3055 $coro 3213 $coro
3056} 3214}
3057 3215
3058cf::client->attach ( 3216cf::client->attach (
3059 on_destroy => sub { 3217 on_client_destroy => sub {
3060 my ($ns) = @_; 3218 my ($ns) = @_;
3061 3219
3062 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3220 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3063 }, 3221 },
3064); 3222);
3080our $safe_hole = new Safe::Hole; 3238our $safe_hole = new Safe::Hole;
3081 3239
3082$SIG{FPE} = 'IGNORE'; 3240$SIG{FPE} = 'IGNORE';
3083 3241
3084$safe->permit_only (Opcode::opset qw( 3242$safe->permit_only (Opcode::opset qw(
3085 :base_core :base_mem :base_orig :base_math 3243 :base_core :base_mem :base_orig :base_math :base_loop
3086 grepstart grepwhile mapstart mapwhile 3244 grepstart grepwhile mapstart mapwhile
3087 sort time 3245 sort time
3088)); 3246));
3089 3247
3090# here we export the classes and methods available to script code 3248# here we export the classes and methods available to script code
3094The following functions and methods are available within a safe environment: 3252The following functions and methods are available within a safe environment:
3095 3253
3096 cf::object 3254 cf::object
3097 contr pay_amount pay_player map x y force_find force_add destroy 3255 contr pay_amount pay_player map x y force_find force_add destroy
3098 insert remove name archname title slaying race decrease split 3256 insert remove name archname title slaying race decrease split
3257 value
3099 3258
3100 cf::object::player 3259 cf::object::player
3101 player 3260 player
3102 3261
3103 cf::player 3262 cf::player
3109=cut 3268=cut
3110 3269
3111for ( 3270for (
3112 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3271 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3113 insert remove inv nrof name archname title slaying race 3272 insert remove inv nrof name archname title slaying race
3114 decrease split destroy change_exp)], 3273 decrease split destroy change_exp value msg lore send_msg)],
3115 ["cf::object::player" => qw(player)], 3274 ["cf::object::player" => qw(player)],
3116 ["cf::player" => qw(peaceful)], 3275 ["cf::player" => qw(peaceful send_msg)],
3117 ["cf::map" => qw(trigger)], 3276 ["cf::map" => qw(trigger)],
3118) { 3277) {
3119 no strict 'refs';
3120 my ($pkg, @funs) = @$_; 3278 my ($pkg, @funs) = @$_;
3121 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3279 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3122 for @funs; 3280 for @funs;
3123} 3281}
3124 3282
3139 3297
3140 my $qcode = $code; 3298 my $qcode = $code;
3141 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3299 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3142 $qcode =~ s/\n/\\n/g; 3300 $qcode =~ s/\n/\\n/g;
3143 3301
3302 %vars = (_dummy => 0) unless %vars;
3303
3304 my @res;
3144 local $_; 3305 local $_;
3145 local @safe::cf::_safe_eval_args = values %vars;
3146 3306
3147 my $eval = 3307 my $eval =
3148 "do {\n" 3308 "do {\n"
3149 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3309 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3150 . "#line 0 \"{$qcode}\"\n" 3310 . "#line 0 \"{$qcode}\"\n"
3151 . $code 3311 . $code
3152 . "\n}" 3312 . "\n}"
3153 ; 3313 ;
3154 3314
3315 if ($CFG{safe_eval}) {
3155 sub_generation_inc; 3316 sub_generation_inc;
3317 local @safe::cf::_safe_eval_args = values %vars;
3156 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3318 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3157 sub_generation_inc; 3319 sub_generation_inc;
3320 } else {
3321 local @cf::_safe_eval_args = values %vars;
3322 @res = wantarray ? eval eval : scalar eval $eval;
3323 }
3158 3324
3159 if ($@) { 3325 if ($@) {
3160 warn "$@"; 3326 warn "$@",
3161 warn "while executing safe code '$code'\n"; 3327 "while executing safe code '$code'\n",
3162 warn "with arguments " . (join " ", %vars) . "\n"; 3328 "with arguments " . (join " ", %vars) . "\n";
3163 } 3329 }
3164 3330
3165 wantarray ? @res : $res[0] 3331 wantarray ? @res : $res[0]
3166} 3332}
3167 3333
3181=cut 3347=cut
3182 3348
3183sub register_script_function { 3349sub register_script_function {
3184 my ($fun, $cb) = @_; 3350 my ($fun, $cb) = @_;
3185 3351
3186 no strict 'refs'; 3352 $fun = "safe::$fun" if $CFG{safe_eval};
3187 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3353 *$fun = $safe_hole->wrap ($cb);
3188} 3354}
3189 3355
3190=back 3356=back
3191 3357
3192=cut 3358=cut
3193 3359
3194############################################################################# 3360#############################################################################
3195# the server's init and main functions 3361# the server's init and main functions
3362
3363# async inc loader. yay.
3364sub inc_loader {
3365 my $mod = $_[1];
3366
3367 if (in_main && !tick_inhibit) {
3368 Carp::cluck "ERROR: attempted synchronous perl module load ($mod)";
3369 } else {
3370 debug "loading perl module $mod\n";
3371 }
3372
3373 # 1. find real file
3374 for my $dir (@ORIG_INC) {
3375 ref $dir and next;
3376 0 <= Coro::AIO::aio_load "$dir/$mod", my $data
3377 or next;
3378
3379 $data = "#line 1 $dir/$mod\n$data";
3380
3381 open my $fh, "<", \$data or die;
3382
3383 return $fh;
3384 }
3385
3386 ()
3387}
3388
3389sub init_inc {
3390 # save original @INC
3391 @ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC;
3392
3393 # make sure we can do scalar-opens
3394 open my $dummy, "<", \my $dummy2;
3395
3396 # execute some stuff so perl load's some of the core modules
3397 /Ü/ =~ /ü/i;
3398 eval { &Storable::nstore_fd };
3399
3400 @INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc.
3401
3402 debug "module loading will be asynchronous from this point on.";
3403}
3196 3404
3197sub load_facedata($) { 3405sub load_facedata($) {
3198 my ($path) = @_; 3406 my ($path) = @_;
3199 3407
3200 # HACK to clear player env face cache, we need some signal framework 3408 # HACK to clear player env face cache, we need some signal framework
3201 # for this (global event?) 3409 # for this (global event?)
3202 %ext::player_env::MUSIC_FACE_CACHE = (); 3410 %ext::player_env::MUSIC_FACE_CACHE = ();
3203 3411
3204 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3412 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3205 3413
3206 warn "loading facedata from $path\n"; 3414 trace "loading facedata from $path\n";
3207 3415
3208 my $facedata; 3416 my $facedata;
3209 0 < aio_load $path, $facedata 3417 0 < aio_load $path, $facedata
3210 or die "$path: $!"; 3418 or die "$path: $!";
3211 3419
3213 3421
3214 $facedata->{version} == 2 3422 $facedata->{version} == 2
3215 or cf::cleanup "$path: version mismatch, cannot proceed."; 3423 or cf::cleanup "$path: version mismatch, cannot proceed.";
3216 3424
3217 # patch in the exptable 3425 # patch in the exptable
3426 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3218 $facedata->{resource}{"res/exp_table"} = { 3427 $facedata->{resource}{"res/exp_table"} = {
3219 type => FT_RSRC, 3428 type => FT_RSRC,
3220 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3429 data => $exp_table,
3430 hash => (Digest::MD5::md5 $exp_table),
3221 }; 3431 };
3222 cf::cede_to_tick; 3432 cf::cede_to_tick;
3223 3433
3224 { 3434 {
3225 my $faces = $facedata->{faceinfo}; 3435 my $faces = $facedata->{faceinfo};
3227 while (my ($face, $info) = each %$faces) { 3437 while (my ($face, $info) = each %$faces) {
3228 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3438 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3229 3439
3230 cf::face::set_visibility $idx, $info->{visibility}; 3440 cf::face::set_visibility $idx, $info->{visibility};
3231 cf::face::set_magicmap $idx, $info->{magicmap}; 3441 cf::face::set_magicmap $idx, $info->{magicmap};
3232 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3442 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3233 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3443 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3234 3444
3235 cf::cede_to_tick; 3445 cf::cede_to_tick;
3236 } 3446 }
3237 3447
3238 while (my ($face, $info) = each %$faces) { 3448 while (my ($face, $info) = each %$faces) {
3243 3453
3244 if (my $smooth = cf::face::find $info->{smooth}) { 3454 if (my $smooth = cf::face::find $info->{smooth}) {
3245 cf::face::set_smooth $idx, $smooth; 3455 cf::face::set_smooth $idx, $smooth;
3246 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3456 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3247 } else { 3457 } else {
3248 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3458 error "smooth face '$info->{smooth}' not found for face '$face'";
3249 } 3459 }
3250 3460
3251 cf::cede_to_tick; 3461 cf::cede_to_tick;
3252 } 3462 }
3253 } 3463 }
3262 3472
3263 cf::anim::invalidate_all; # d'oh 3473 cf::anim::invalidate_all; # d'oh
3264 } 3474 }
3265 3475
3266 { 3476 {
3267 # TODO: for gcfclient pleasure, we should give resources
3268 # that gcfclient doesn't grok a >10000 face index.
3269 my $res = $facedata->{resource}; 3477 my $res = $facedata->{resource};
3270 3478
3271 while (my ($name, $info) = each %$res) { 3479 while (my ($name, $info) = each %$res) {
3272 if (defined $info->{type}) { 3480 if (defined $info->{type}) {
3273 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3481 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3274 my $data;
3275 3482
3276 if ($info->{type} & 1) { 3483 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3277 # prepend meta info
3278
3279 my $meta = $enc->encode ({
3280 name => $name,
3281 %{ $info->{meta} || {} },
3282 });
3283
3284 $data = pack "(w/a*)*", $meta, $info->{data};
3285 } else {
3286 $data = $info->{data};
3287 }
3288
3289 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3290 cf::face::set_type $idx, $info->{type}; 3484 cf::face::set_type $idx, $info->{type};
3291 } else { 3485 } else {
3292 $RESOURCE{$name} = $info; 3486 $RESOURCE{$name} = $info; # unused
3293 } 3487 }
3294 3488
3295 cf::cede_to_tick; 3489 cf::cede_to_tick;
3296 } 3490 }
3297 } 3491 }
3298 3492
3299 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3493 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3300 3494
3301 1 3495 1
3302} 3496}
3303
3304cf::global->attach (on_resource_update => sub {
3305 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3306 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3307
3308 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3309 my $sound = $soundconf->{compat}[$_]
3310 or next;
3311
3312 my $face = cf::face::find "sound/$sound->[1]";
3313 cf::sound::set $sound->[0] => $face;
3314 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3315 }
3316
3317 while (my ($k, $v) = each %{$soundconf->{event}}) {
3318 my $face = cf::face::find "sound/$v";
3319 cf::sound::set $k => $face;
3320 }
3321 }
3322});
3323 3497
3324register_exticmd fx_want => sub { 3498register_exticmd fx_want => sub {
3325 my ($ns, $want) = @_; 3499 my ($ns, $want) = @_;
3326 3500
3327 while (my ($k, $v) = each %$want) { 3501 while (my ($k, $v) = each %$want) {
3366sub reload_treasures { 3540sub reload_treasures {
3367 load_resource_file "$DATADIR/treasures" 3541 load_resource_file "$DATADIR/treasures"
3368 or die "unable to load treasurelists\n"; 3542 or die "unable to load treasurelists\n";
3369} 3543}
3370 3544
3545sub reload_sound {
3546 trace "loading sound config from $DATADIR/sound\n";
3547
3548 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3549 or die "$DATADIR/sound $!";
3550
3551 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3552
3553 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3554 my $sound = $soundconf->{compat}[$_]
3555 or next;
3556
3557 my $face = cf::face::find "sound/$sound->[1]";
3558 cf::sound::set $sound->[0] => $face;
3559 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3560 }
3561
3562 while (my ($k, $v) = each %{$soundconf->{event}}) {
3563 my $face = cf::face::find "sound/$v";
3564 cf::sound::set $k => $face;
3565 }
3566}
3567
3371sub reload_resources { 3568sub reload_resources {
3372 warn "reloading resource files...\n"; 3569 trace "reloading resource files...\n";
3373 3570
3374 reload_facedata; 3571 reload_facedata;
3572 reload_sound;
3375 reload_archetypes; 3573 reload_archetypes;
3376 reload_regions; 3574 reload_regions;
3377 reload_treasures; 3575 reload_treasures;
3378 3576
3379 warn "finished reloading resource files\n"; 3577 trace "finished reloading resource files\n";
3380} 3578}
3381 3579
3382sub reload_config { 3580sub reload_config {
3581 trace "reloading config file...\n";
3582
3383 open my $fh, "<:utf8", "$CONFDIR/config" 3583 open my $fh, "<:utf8", "$CONFDIR/config"
3384 or return; 3584 or return;
3385 3585
3386 local $/; 3586 local $/;
3387 *CFG = YAML::Load <$fh>; 3587 *CFG = YAML::XS::Load scalar <$fh>;
3388 3588
3389 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3589 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3390 3590
3391 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3591 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3392 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3592 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3393 3593
3394 if (exists $CFG{mlockall}) { 3594 if (exists $CFG{mlockall}) {
3396 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3596 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3397 and die "WARNING: m(un)lockall failed: $!\n"; 3597 and die "WARNING: m(un)lockall failed: $!\n";
3398 }; 3598 };
3399 warn $@ if $@; 3599 warn $@ if $@;
3400 } 3600 }
3601
3602 trace "finished reloading resource files\n";
3401} 3603}
3402 3604
3403sub pidfile() { 3605sub pidfile() {
3404 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3606 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3405 or die "$PIDFILE: $!"; 3607 or die "$PIDFILE: $!";
3417 3619
3418 seek $fh, 0, 0; 3620 seek $fh, 0, 0;
3419 print $fh $$; 3621 print $fh $$;
3420} 3622}
3421 3623
3624sub main_loop {
3625 trace "EV::loop starting\n";
3626 if (1) {
3627 EV::loop;
3628 }
3629 trace "EV::loop returned\n";
3630 goto &main_loop unless $REALLY_UNLOOP;
3631}
3632
3422sub main { 3633sub main {
3423 cf::init_globals; # initialise logging 3634 cf::init_globals; # initialise logging
3424 3635
3425 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3636 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3426 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3637 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3427 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3638 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3428 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3639 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3429
3430 cf::init_experience;
3431 cf::init_anim;
3432 cf::init_attackmess;
3433 cf::init_dynamic;
3434 cf::init_block;
3435 3640
3436 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3641 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3437 3642
3438 # we must not ever block the main coroutine 3643 # we must not ever block the main coroutine
3439 local $Coro::idle = sub { 3644 local $Coro::idle = sub {
3445 }; 3650 };
3446 3651
3447 evthread_start IO::AIO::poll_fileno; 3652 evthread_start IO::AIO::poll_fileno;
3448 3653
3449 cf::sync_job { 3654 cf::sync_job {
3655 init_inc;
3656
3657 cf::init_experience;
3658 cf::init_anim;
3659 cf::init_attackmess;
3660 cf::init_dynamic;
3661
3662 cf::load_settings;
3663 cf::load_materials;
3664
3450 reload_resources; 3665 reload_resources;
3451 reload_config; 3666 reload_config;
3452 db_init; 3667 db_init;
3453 3668
3454 cf::load_settings;
3455 cf::load_materials;
3456 cf::init_uuid; 3669 cf::init_uuid;
3457 cf::init_signals; 3670 cf::init_signals;
3458 cf::init_commands;
3459 cf::init_skills; 3671 cf::init_skills;
3460 3672
3461 cf::init_beforeplay; 3673 cf::init_beforeplay;
3462 3674
3463 atomic; 3675 atomic;
3465 load_extensions; 3677 load_extensions;
3466 3678
3467 utime time, time, $RUNTIMEFILE; 3679 utime time, time, $RUNTIMEFILE;
3468 3680
3469 # no (long-running) fork's whatsoever before this point(!) 3681 # no (long-running) fork's whatsoever before this point(!)
3682 use POSIX ();
3470 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3683 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3471 3684
3472 (pop @POST_INIT)->(0) while @POST_INIT; 3685 (pop @POST_INIT)->(0) while @POST_INIT;
3473 }; 3686 };
3474 3687
3475 EV::loop; 3688 cf::object::thawer::errors_are_fatal 0;
3689 info "parse errors in files are no longer fatal from this point on.\n";
3690
3691 my $free_main; $free_main = EV::idle sub {
3692 undef $free_main;
3693 undef &main; # free gobs of memory :)
3694 };
3695
3696 goto &main_loop;
3476} 3697}
3477 3698
3478############################################################################# 3699#############################################################################
3479# initialisation and cleanup 3700# initialisation and cleanup
3480 3701
3481# install some emergency cleanup handlers 3702# install some emergency cleanup handlers
3482BEGIN { 3703BEGIN {
3483 our %SIGWATCHER = (); 3704 our %SIGWATCHER = ();
3484 for my $signal (qw(INT HUP TERM)) { 3705 for my $signal (qw(INT HUP TERM)) {
3485 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3706 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3486 cf::cleanup "SIG$signal"; 3707 cf::cleanup "SIG$signal";
3487 }; 3708 };
3488 } 3709 }
3489} 3710}
3490 3711
3491sub write_runtime_sync { 3712sub write_runtime_sync {
3713 my $t0 = AE::time;
3714
3492 # first touch the runtime file to show we are still running: 3715 # first touch the runtime file to show we are still running:
3493 # the fsync below can take a very very long time. 3716 # the fsync below can take a very very long time.
3494 3717
3495 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3718 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3496 3719
3497 my $guard = cf::lock_acquire "write_runtime"; 3720 my $guard = cf::lock_acquire "write_runtime";
3498 3721
3499 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3722 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3500 or return; 3723 or return;
3501 3724
3502 my $value = $cf::RUNTIME + 90 + 10; 3725 my $value = $cf::RUNTIME + 90 + 10;
3503 # 10 is the runtime save interval, for a monotonic clock 3726 # 10 is the runtime save interval, for a monotonic clock
3504 # 60 allows for the watchdog to kill the server. 3727 # 60 allows for the watchdog to kill the server.
3517 or return; 3740 or return;
3518 3741
3519 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3742 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3520 and return; 3743 and return;
3521 3744
3522 warn "runtime file written.\n"; 3745 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3523 3746
3524 1 3747 1
3525} 3748}
3526 3749
3527our $uuid_lock; 3750our $uuid_lock;
3539 or return; 3762 or return;
3540 3763
3541 my $value = uuid_seq uuid_cur; 3764 my $value = uuid_seq uuid_cur;
3542 3765
3543 unless ($value) { 3766 unless ($value) {
3544 warn "cowardly refusing to write zero uuid value!\n"; 3767 info "cowardly refusing to write zero uuid value!\n";
3545 return; 3768 return;
3546 } 3769 }
3547 3770
3548 my $value = uuid_str $value + $uuid_skip; 3771 my $value = uuid_str $value + $uuid_skip;
3549 $uuid_skip = 0; 3772 $uuid_skip = 0;
3559 or return; 3782 or return;
3560 3783
3561 aio_rename "$uuid~", $uuid 3784 aio_rename "$uuid~", $uuid
3562 and return; 3785 and return;
3563 3786
3564 warn "uuid file written ($value).\n"; 3787 trace "uuid file written ($value).\n";
3565 3788
3566 1 3789 1
3567 3790
3568} 3791}
3569 3792
3575} 3798}
3576 3799
3577sub emergency_save() { 3800sub emergency_save() {
3578 my $freeze_guard = cf::freeze_mainloop; 3801 my $freeze_guard = cf::freeze_mainloop;
3579 3802
3580 warn "emergency_perl_save: enter\n"; 3803 info "emergency_perl_save: enter\n";
3804
3805 # this is a trade-off: we want to be very quick here, so
3806 # save all maps without fsync, and later call a global sync
3807 # (which in turn might be very very slow)
3808 local $USE_FSYNC = 0;
3581 3809
3582 cf::sync_job { 3810 cf::sync_job {
3583 # this is a trade-off: we want to be very quick here, so 3811 cf::write_runtime_sync; # external watchdog should not bark
3584 # save all maps without fsync, and later call a global sync
3585 # (which in turn might be very very slow)
3586 local $USE_FSYNC = 0;
3587 3812
3588 # use a peculiar iteration method to avoid tripping on perl 3813 # use a peculiar iteration method to avoid tripping on perl
3589 # refcount bugs in for. also avoids problems with players 3814 # refcount bugs in for. also avoids problems with players
3590 # and maps saved/destroyed asynchronously. 3815 # and maps saved/destroyed asynchronously.
3591 warn "emergency_perl_save: begin player save\n"; 3816 info "emergency_perl_save: begin player save\n";
3592 for my $login (keys %cf::PLAYER) { 3817 for my $login (keys %cf::PLAYER) {
3593 my $pl = $cf::PLAYER{$login} or next; 3818 my $pl = $cf::PLAYER{$login} or next;
3594 $pl->valid or next; 3819 $pl->valid or next;
3595 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3820 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3596 $pl->save; 3821 $pl->save;
3597 } 3822 }
3598 warn "emergency_perl_save: end player save\n"; 3823 info "emergency_perl_save: end player save\n";
3599 3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3826
3600 warn "emergency_perl_save: begin map save\n"; 3827 info "emergency_perl_save: begin map save\n";
3601 for my $path (keys %cf::MAP) { 3828 for my $path (keys %cf::MAP) {
3602 my $map = $cf::MAP{$path} or next; 3829 my $map = $cf::MAP{$path} or next;
3603 $map->valid or next; 3830 $map->valid or next;
3604 $map->save; 3831 $map->save;
3605 } 3832 }
3606 warn "emergency_perl_save: end map save\n"; 3833 info "emergency_perl_save: end map save\n";
3607 3834
3835 cf::write_runtime_sync; # external watchdog should not bark
3836
3608 warn "emergency_perl_save: begin database checkpoint\n"; 3837 info "emergency_perl_save: begin database checkpoint\n";
3609 BDB::db_env_txn_checkpoint $DB_ENV; 3838 BDB::db_env_txn_checkpoint $DB_ENV;
3610 warn "emergency_perl_save: end database checkpoint\n"; 3839 info "emergency_perl_save: end database checkpoint\n";
3611 3840
3612 warn "emergency_perl_save: begin write uuid\n"; 3841 info "emergency_perl_save: begin write uuid\n";
3613 write_uuid_sync 1; 3842 write_uuid_sync 1;
3614 warn "emergency_perl_save: end write uuid\n"; 3843 info "emergency_perl_save: end write uuid\n";
3844
3845 cf::write_runtime_sync; # external watchdog should not bark
3846
3847 trace "emergency_perl_save: syncing database to disk";
3848 BDB::db_env_txn_checkpoint $DB_ENV;
3849
3850 info "emergency_perl_save: starting sync\n";
3851 IO::AIO::aio_sync sub {
3852 info "emergency_perl_save: finished sync\n";
3853 };
3854
3855 cf::write_runtime_sync; # external watchdog should not bark
3856
3857 trace "emergency_perl_save: flushing outstanding aio requests";
3858 while (IO::AIO::nreqs || BDB::nreqs) {
3859 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3860 }
3861
3862 cf::write_runtime_sync; # external watchdog should not bark
3615 }; 3863 };
3616 3864
3617 warn "emergency_perl_save: starting sync()\n";
3618 IO::AIO::aio_sync sub {
3619 warn "emergency_perl_save: finished sync()\n";
3620 };
3621
3622 warn "emergency_perl_save: leave\n"; 3865 info "emergency_perl_save: leave\n";
3623} 3866}
3624 3867
3625sub post_cleanup { 3868sub post_cleanup {
3626 my ($make_core) = @_; 3869 my ($make_core) = @_;
3627 3870
3871 IO::AIO::flush;
3872
3628 warn Carp::longmess "post_cleanup backtrace" 3873 error Carp::longmess "post_cleanup backtrace"
3629 if $make_core; 3874 if $make_core;
3630 3875
3631 my $fh = pidfile; 3876 my $fh = pidfile;
3632 unlink $PIDFILE if <$fh> == $$; 3877 unlink $PIDFILE if <$fh> == $$;
3633} 3878}
3653 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3898 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3654 for my $name (keys %$leaf_symtab) { 3899 for my $name (keys %$leaf_symtab) {
3655 _gv_clear *{"$pkg$name"}; 3900 _gv_clear *{"$pkg$name"};
3656# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3901# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3657 } 3902 }
3658 warn "cleared package $pkg\n";#d#
3659} 3903}
3660 3904
3661sub do_reload_perl() { 3905sub do_reload_perl() {
3662 # can/must only be called in main 3906 # can/must only be called in main
3663 if ($Coro::current != $Coro::main) { 3907 if (in_main) {
3664 warn "can only reload from main coroutine"; 3908 error "can only reload from main coroutine";
3665 return; 3909 return;
3666 } 3910 }
3667 3911
3668 return if $RELOAD++; 3912 return if $RELOAD++;
3669 3913
3670 my $t1 = EV::time; 3914 my $t1 = AE::time;
3671 3915
3672 while ($RELOAD) { 3916 while ($RELOAD) {
3673 warn "reloading..."; 3917 info "reloading...";
3674 3918
3675 warn "entering sync_job"; 3919 trace "entering sync_job";
3676 3920
3677 cf::sync_job { 3921 cf::sync_job {
3678 cf::write_runtime_sync; # external watchdog should not bark
3679 cf::emergency_save; 3922 cf::emergency_save;
3680 cf::write_runtime_sync; # external watchdog should not bark
3681 3923
3682 warn "syncing database to disk";
3683 BDB::db_env_txn_checkpoint $DB_ENV;
3684
3685 # if anything goes wrong in here, we should simply crash as we already saved
3686
3687 warn "flushing outstanding aio requests";
3688 while (IO::AIO::nreqs || BDB::nreqs) {
3689 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3690 }
3691
3692 warn "cancelling all extension coros"; 3924 trace "cancelling all extension coros";
3693 $_->cancel for values %EXT_CORO; 3925 $_->cancel for values %EXT_CORO;
3694 %EXT_CORO = (); 3926 %EXT_CORO = ();
3695 3927
3696 warn "removing commands"; 3928 trace "removing commands";
3697 %COMMAND = (); 3929 %COMMAND = ();
3698 3930
3699 warn "removing ext/exti commands"; 3931 trace "removing ext/exti commands";
3700 %EXTCMD = (); 3932 %EXTCMD = ();
3701 %EXTICMD = (); 3933 %EXTICMD = ();
3702 3934
3703 warn "unloading/nuking all extensions"; 3935 trace "unloading/nuking all extensions";
3704 for my $pkg (@EXTS) { 3936 for my $pkg (@EXTS) {
3705 warn "... unloading $pkg"; 3937 trace "... unloading $pkg";
3706 3938
3707 if (my $cb = $pkg->can ("unload")) { 3939 if (my $cb = $pkg->can ("unload")) {
3708 eval { 3940 eval {
3709 $cb->($pkg); 3941 $cb->($pkg);
3710 1 3942 1
3711 } or warn "$pkg unloaded, but with errors: $@"; 3943 } or error "$pkg unloaded, but with errors: $@";
3712 } 3944 }
3713 3945
3714 warn "... clearing $pkg"; 3946 trace "... clearing $pkg";
3715 clear_package $pkg; 3947 clear_package $pkg;
3716 } 3948 }
3717 3949
3718 warn "unloading all perl modules loaded from $LIBDIR"; 3950 trace "unloading all perl modules loaded from $LIBDIR";
3719 while (my ($k, $v) = each %INC) { 3951 while (my ($k, $v) = each %INC) {
3720 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3952 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3721 3953
3722 warn "... unloading $k"; 3954 trace "... unloading $k";
3723 delete $INC{$k}; 3955 delete $INC{$k};
3724 3956
3725 $k =~ s/\.pm$//; 3957 $k =~ s/\.pm$//;
3726 $k =~ s/\//::/g; 3958 $k =~ s/\//::/g;
3727 3959
3730 } 3962 }
3731 3963
3732 clear_package $k; 3964 clear_package $k;
3733 } 3965 }
3734 3966
3735 warn "getting rid of safe::, as good as possible"; 3967 trace "getting rid of safe::, as good as possible";
3736 clear_package "safe::$_" 3968 clear_package "safe::$_"
3737 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3969 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3738 3970
3739 warn "unloading cf.pm \"a bit\""; 3971 trace "unloading cf.pm \"a bit\"";
3740 delete $INC{"cf.pm"}; 3972 delete $INC{"cf.pm"};
3741 delete $INC{"cf/pod.pm"}; 3973 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3742 3974
3743 # don't, removes xs symbols, too, 3975 # don't, removes xs symbols, too,
3744 # and global variables created in xs 3976 # and global variables created in xs
3745 #clear_package __PACKAGE__; 3977 #clear_package __PACKAGE__;
3746 3978
3747 warn "unload completed, starting to reload now"; 3979 info "unload completed, starting to reload now";
3748 3980
3749 warn "reloading cf.pm"; 3981 trace "reloading cf.pm";
3750 require cf; 3982 require cf;
3751 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3983 cf::_connect_to_perl_1;
3752 3984
3753 warn "loading config and database again"; 3985 trace "loading config and database again";
3754 cf::reload_config; 3986 cf::reload_config;
3755 3987
3756 warn "loading extensions"; 3988 trace "loading extensions";
3757 cf::load_extensions; 3989 cf::load_extensions;
3758 3990
3759 if ($REATTACH_ON_RELOAD) { 3991 if ($REATTACH_ON_RELOAD) {
3760 warn "reattaching attachments to objects/players"; 3992 trace "reattaching attachments to objects/players";
3761 _global_reattach; # objects, sockets 3993 _global_reattach; # objects, sockets
3762 warn "reattaching attachments to maps"; 3994 trace "reattaching attachments to maps";
3763 reattach $_ for values %MAP; 3995 reattach $_ for values %MAP;
3764 warn "reattaching attachments to players"; 3996 trace "reattaching attachments to players";
3765 reattach $_ for values %PLAYER; 3997 reattach $_ for values %PLAYER;
3766 } 3998 }
3767 3999
3768 warn "running post_init jobs"; 4000 trace "running post_init jobs";
3769 (pop @POST_INIT)->(1) while @POST_INIT; 4001 (pop @POST_INIT)->(1) while @POST_INIT;
3770 4002
3771 warn "leaving sync_job"; 4003 trace "leaving sync_job";
3772 4004
3773 1 4005 1
3774 } or do { 4006 } or do {
3775 warn $@; 4007 error $@;
3776 cf::cleanup "error while reloading, exiting."; 4008 cf::cleanup "error while reloading, exiting.";
3777 }; 4009 };
3778 4010
3779 warn "reloaded"; 4011 info "reloaded";
3780 --$RELOAD; 4012 --$RELOAD;
3781 } 4013 }
3782 4014
3783 $t1 = EV::time - $t1; 4015 $t1 = AE::time - $t1;
3784 warn "reload completed in ${t1}s\n"; 4016 info "reload completed in ${t1}s\n";
3785}; 4017};
3786 4018
3787our $RELOAD_WATCHER; # used only during reload 4019our $RELOAD_WATCHER; # used only during reload
3788 4020
3789sub reload_perl() { 4021sub reload_perl() {
3791 # coro crashes during coro_state_free->destroy here. 4023 # coro crashes during coro_state_free->destroy here.
3792 4024
3793 $RELOAD_WATCHER ||= cf::async { 4025 $RELOAD_WATCHER ||= cf::async {
3794 Coro::AIO::aio_wait cache_extensions; 4026 Coro::AIO::aio_wait cache_extensions;
3795 4027
3796 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4028 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3797 do_reload_perl; 4029 do_reload_perl;
3798 undef $RELOAD_WATCHER; 4030 undef $RELOAD_WATCHER;
3799 }; 4031 };
3800 }; 4032 };
3801} 4033}
3810 reload_perl; 4042 reload_perl;
3811 }; 4043 };
3812 } 4044 }
3813}; 4045};
3814 4046
3815unshift @INC, $LIBDIR; 4047#############################################################################
3816 4048
3817my $bug_warning = 0; 4049my $bug_warning = 0;
3818 4050
3819our @WAIT_FOR_TICK; 4051our @WAIT_FOR_TICK;
3820our @WAIT_FOR_TICK_BEGIN; 4052our @WAIT_FOR_TICK_BEGIN;
3821 4053
3822sub wait_for_tick { 4054sub wait_for_tick {
3823 return if tick_inhibit || $Coro::current == $Coro::main; 4055 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3824 4056
3825 my $signal = new Coro::Signal; 4057 my $signal = new Coro::Signal;
3826 push @WAIT_FOR_TICK, $signal; 4058 push @WAIT_FOR_TICK, $signal;
3827 $signal->wait; 4059 $signal->wait;
3828} 4060}
3829 4061
3830sub wait_for_tick_begin { 4062sub wait_for_tick_begin {
3831 return if tick_inhibit || $Coro::current == $Coro::main; 4063 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3832 4064
3833 my $signal = new Coro::Signal; 4065 my $signal = new Coro::Signal;
3834 push @WAIT_FOR_TICK_BEGIN, $signal; 4066 push @WAIT_FOR_TICK_BEGIN, $signal;
3835 $signal->wait; 4067 $signal->wait;
3836} 4068}
3842 return; 4074 return;
3843 } 4075 }
3844 4076
3845 cf::server_tick; # one server iteration 4077 cf::server_tick; # one server iteration
3846 4078
4079 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4080
3847 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4081 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3848 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4082 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3849 Coro::async_pool { 4083 Coro::async_pool {
3850 $Coro::current->{desc} = "runtime saver"; 4084 $Coro::current->{desc} = "runtime saver";
3851 write_runtime_sync 4085 write_runtime_sync
3852 or warn "ERROR: unable to write runtime file: $!"; 4086 or error "ERROR: unable to write runtime file: $!";
3853 }; 4087 };
3854 } 4088 }
3855 4089
3856 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4090 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3857 $sig->send; 4091 $sig->send;
3865 4099
3866 if (0) { 4100 if (0) {
3867 if ($NEXT_TICK) { 4101 if ($NEXT_TICK) {
3868 my $jitter = $TICK_START - $NEXT_TICK; 4102 my $jitter = $TICK_START - $NEXT_TICK;
3869 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4103 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3870 warn "jitter $JITTER\n";#d# 4104 debug "jitter $JITTER\n";#d#
3871 } 4105 }
3872 } 4106 }
3873} 4107}
3874 4108
3875{ 4109{
3876 # configure BDB 4110 # configure BDB
3877 4111
3878 BDB::min_parallel 8; 4112 BDB::min_parallel 16;
3879 BDB::max_poll_reqs $TICK * 0.1; 4113 BDB::max_poll_reqs $TICK * 0.1;
3880 $AnyEvent::BDB::WATCHER->priority (1); 4114 $AnyEvent::BDB::WATCHER->priority (1);
3881 4115
3882 unless ($DB_ENV) { 4116 unless ($DB_ENV) {
3883 $DB_ENV = BDB::db_env_create; 4117 $DB_ENV = BDB::db_env_create;
3963 LOG llevInfo, "[ABT] [suppressed]\n"; 4197 LOG llevInfo, "[ABT] [suppressed]\n";
3964 } 4198 }
3965} 4199}
3966 4200
3967# load additional modules 4201# load additional modules
3968use cf::pod; 4202require "cf/$_.pm" for @EXTRA_MODULES;
4203cf::_connect_to_perl_2;
3969 4204
3970END { cf::emergency_save } 4205END { cf::emergency_save }
3971 4206
39721 42071
3973 4208

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines