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.456 by root, Tue Sep 30 04:00:35 2008 UTC vs.
Revision 1.540 by root, Tue May 4 23:32:29 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;
129our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
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;
150
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
134 153
135binmode STDOUT; 154binmode STDOUT;
136binmode STDERR; 155binmode STDERR;
137 156
138# read virtual server time, if available 157# read virtual server time, if available
140 open my $fh, "<", $RUNTIMEFILE 159 open my $fh, "<", $RUNTIMEFILE
141 or die "unable to read $RUNTIMEFILE file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
142 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
143} 162}
144 163
164eval "sub TICK() { $TICK } 1" or die;
165
145mkdir $_ 166mkdir $_
146 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
147 168
148our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
149 170
150sub 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::"} };
151 187
152############################################################################# 188#############################################################################
153 189
154=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
155 191
202returns 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
203per 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.
204 240
205=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
206 242
207This array contains the results of the last C<invoke ()> call. When 243This array contains the results of the last C<invoke ()> call. When
208C<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
209that call. 245that call.
210 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
211=back 253=back
212 254
213=cut 255=cut
214 256
215BEGIN { 257sub error(@) { LOG llevError, join "", @_ }
216 *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 {
217 my $msg = join "", @_; 264 my $msg = join "", @_;
218 265
219 $msg .= "\n" 266 $msg .= "\n"
220 unless $msg =~ /\n$/; 267 unless $msg =~ /\n$/;
221 268
222 $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;
223 270
224 LOG llevError, $msg; 271 LOG llevWarn, $msg;
225 }; 272};
226}
227 273
228$Coro::State::DIEHOOK = sub { 274$Coro::State::DIEHOOK = sub {
229 return unless $^S eq 0; # "eq", not "==" 275 return unless $^S eq 0; # "eq", not "=="
230 276
231 if ($Coro::current == $Coro::main) {#d# 277 error Carp::longmess $_[0];
278
279 if (in_main) {#d#
232 warn "DIEHOOK called in main context, Coro bug?\n";#d# 280 error "DIEHOOK called in main context, Coro bug?\n";#d#
233 return;#d# 281 return;#d#
234 }#d# 282 }#d#
235 283
236 # kill coroutine otherwise 284 # kill coroutine otherwise
237 warn Carp::longmess $_[0];
238 Coro::terminate 285 Coro::terminate
239}; 286};
240
241$SIG{__DIE__} = sub { }; #d#?
242 287
243@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 288@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
244@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 289@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
245@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 290@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
246@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 291@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
260)) { 305)) {
261 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 306 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
262} 307}
263 308
264$EV::DIED = sub { 309$EV::DIED = sub {
265 warn "error in event callback: @_"; 310 Carp::cluck "error in event callback: @_";
266}; 311};
267 312
268############################################################################# 313#############################################################################
269 314
270=head2 UTILITY FUNCTIONS 315=head2 UTILITY FUNCTIONS
328Wait until the given lock is available. See cf::lock_acquire. 373Wait until the given lock is available. See cf::lock_acquire.
329 374
330=item my $lock = cf::lock_acquire $string 375=item my $lock = cf::lock_acquire $string
331 376
332Wait 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
333a 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,
334for example when the coroutine gets canceled), the lock is automatically 379for example when the coroutine gets canceled), the lock is automatically
335returned. 380returned.
336 381
337Locks 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
338deadlocked coro. 383deadlocked coro.
344 389
345Return 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.
346 391
347=cut 392=cut
348 393
349our %LOCK; 394our $LOCKS = new Coro::SemaphoreSet;
350our %LOCKER;#d#
351 395
352sub lock_wait($) { 396sub lock_wait($) {
353 my ($key) = @_; 397 $LOCKS->wait ($_[0]);
354
355 if ($LOCKER{$key} == $Coro::current) {#d#
356 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
357 return;#d#
358 }#d#
359
360 # wait for lock, if any
361 while ($LOCK{$key}) {
362 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
363 push @{ $LOCK{$key} }, $Coro::current;
364 Coro::schedule;
365 }
366} 398}
367 399
368sub lock_acquire($) { 400sub lock_acquire($) {
369 my ($key) = @_; 401 $LOCKS->guard ($_[0])
370
371 # wait, to be sure we are not locked
372 lock_wait $key;
373
374 $LOCK{$key} = [];
375 $LOCKER{$key} = $Coro::current;#d#
376
377 Coro::guard {
378 delete $LOCKER{$key};#d#
379 # wake up all waiters, to be on the safe side
380 $_->ready for @{ delete $LOCK{$key} };
381 }
382} 402}
383 403
384sub lock_active($) { 404sub lock_active($) {
385 my ($key) = @_; 405 $LOCKS->count ($_[0]) < 1
386
387 ! ! $LOCK{$key}
388} 406}
389 407
390sub freeze_mainloop { 408sub freeze_mainloop {
391 tick_inhibit_inc; 409 tick_inhibit_inc;
392 410
393 Coro::guard \&tick_inhibit_dec; 411 &Guard::guard (\&tick_inhibit_dec);
394} 412}
395 413
396=item cf::periodic $interval, $cb 414=item cf::periodic $interval, $cb
397 415
398Like 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
399get spread over timer. 417get spread over time.
400 418
401=cut 419=cut
402 420
403sub periodic($$) { 421sub periodic($$) {
404 my ($interval, $cb) = @_; 422 my ($interval, $cb) = @_;
421 439
422=cut 440=cut
423 441
424our @SLOT_QUEUE; 442our @SLOT_QUEUE;
425our $SLOT_QUEUE; 443our $SLOT_QUEUE;
444our $SLOT_DECAY = 0.9;
426 445
427$SLOT_QUEUE->cancel if $SLOT_QUEUE; 446$SLOT_QUEUE->cancel if $SLOT_QUEUE;
428$SLOT_QUEUE = Coro::async { 447$SLOT_QUEUE = Coro::async {
429 $Coro::current->desc ("timeslot manager"); 448 $Coro::current->desc ("timeslot manager");
430 449
431 my $signal = new Coro::Signal; 450 my $signal = new Coro::Signal;
451 my $busy;
432 452
433 while () { 453 while () {
434 next_job: 454 next_job:
455
435 my $avail = cf::till_tick; 456 my $avail = cf::till_tick;
436 if ($avail > 0.01) { 457
437 for (0 .. $#SLOT_QUEUE) { 458 for (0 .. $#SLOT_QUEUE) {
438 if ($SLOT_QUEUE[$_][0] < $avail) { 459 if ($SLOT_QUEUE[$_][0] <= $avail) {
460 $busy = 0;
439 my $job = splice @SLOT_QUEUE, $_, 1, (); 461 my $job = splice @SLOT_QUEUE, $_, 1, ();
440 $job->[2]->send; 462 $job->[2]->send;
441 Coro::cede; 463 Coro::cede;
442 goto next_job; 464 goto next_job;
443 } 465 } else {
466 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
444 } 467 }
445 } 468 }
446 469
447 if (@SLOT_QUEUE) { 470 if (@SLOT_QUEUE) {
448 # 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
449 push @cf::WAIT_FOR_TICK, $signal; 472 push @cf::WAIT_FOR_TICK, $signal;
450 $signal->wait; 473 $signal->wait;
451 } else { 474 } else {
475 $busy = 0;
452 Coro::schedule; 476 Coro::schedule;
453 } 477 }
454 } 478 }
455}; 479};
456 480
457sub get_slot($;$$) { 481sub get_slot($;$$) {
458 return if tick_inhibit || $Coro::current == $Coro::main; 482 return if tick_inhibit || $Coro::current == $Coro::main;
459 483
460 my ($time, $pri, $name) = @_; 484 my ($time, $pri, $name) = @_;
461 485
462 $time = $TICK * .6 if $time > $TICK * .6; 486 $time = clamp $time, 0.01, $TICK * .6;
487
463 my $sig = new Coro::Signal; 488 my $sig = new Coro::Signal;
464 489
465 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 490 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
466 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 491 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
467 $SLOT_QUEUE->ready; 492 $SLOT_QUEUE->ready;
493=cut 518=cut
494 519
495sub sync_job(&) { 520sub sync_job(&) {
496 my ($job) = @_; 521 my ($job) = @_;
497 522
498 if ($Coro::current == $Coro::main) { 523 if (in_main) {
499 my $time = EV::time; 524 my $time = AE::time;
500 525
501 # this is the main coro, too bad, we have to block 526 # this is the main coro, too bad, we have to block
502 # till the operation succeeds, freezing the server :/ 527 # till the operation succeeds, freezing the server :/
503 528
504 LOG llevError, Carp::longmess "sync job";#d# 529 #LOG llevError, Carp::longmess "sync job";#d#
505 530
506 my $freeze_guard = freeze_mainloop; 531 my $freeze_guard = freeze_mainloop;
507 532
508 my $busy = 1; 533 my $busy = 1;
509 my @res; 534 my @res;
510 535
511 (async { 536 (async {
512 $Coro::current->desc ("sync job coro"); 537 $Coro::current->desc ("sync job coro");
513 @res = eval { $job->() }; 538 @res = eval { $job->() };
514 warn $@ if $@; 539 error $@ if $@;
515 undef $busy; 540 undef $busy;
516 })->prio (Coro::PRIO_MAX); 541 })->prio (Coro::PRIO_MAX);
517 542
518 while ($busy) { 543 while ($busy) {
519 if (Coro::nready) { 544 if (Coro::nready) {
521 } else { 546 } else {
522 EV::loop EV::LOOP_ONESHOT; 547 EV::loop EV::LOOP_ONESHOT;
523 } 548 }
524 } 549 }
525 550
526 my $time = EV::time - $time; 551 my $time = AE::time - $time;
527 552
528 $TICK_START += $time; # do not account sync jobs to server load 553 $TICK_START += $time; # do not account sync jobs to server load
529 554
530 wantarray ? @res : $res[0] 555 wantarray ? @res : $res[0]
531 } else { 556 } else {
575 reset_signals; 600 reset_signals;
576 &$cb 601 &$cb
577 }, @args; 602 }, @args;
578 603
579 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 )
580} 616}
581 617
582=item $coin = coin_from_name $name 618=item $coin = coin_from_name $name
583 619
584=cut 620=cut
621within each server. 657within each server.
622 658
623=cut 659=cut
624 660
625sub db_table($) { 661sub db_table($) {
662 cf::error "db_get called from main context"
663 if $Coro::current == $Coro::main;
664
626 my ($name) = @_; 665 my ($name) = @_;
627 my $db = BDB::db_create $DB_ENV; 666 my $db = BDB::db_create $DB_ENV;
628 667
629 eval { 668 eval {
630 $db->set_flags (BDB::CHKSUM); 669 $db->set_flags (BDB::CHKSUM);
640} 679}
641 680
642our $DB; 681our $DB;
643 682
644sub db_init { 683sub db_init {
645 cf::sync_job {
646 $DB ||= db_table "db"; 684 $DB ||= db_table "db";
647 };
648} 685}
649 686
650sub db_get($$) { 687sub db_get($$) {
651 my $key = "$_[0]/$_[1]"; 688 my $key = "$_[0]/$_[1]";
652 689
653 cf::sync_job { 690 cf::error "db_get called from main context"
691 if $Coro::current == $Coro::main;
692
654 BDB::db_get $DB, undef, $key, my $data; 693 BDB::db_get $DB, undef, $key, my $data;
655 694
656 $! ? () 695 $! ? ()
657 : $data 696 : $data
658 }
659} 697}
660 698
661sub db_put($$$) { 699sub db_put($$$) {
662 BDB::dbreq_pri 4; 700 BDB::dbreq_pri 4;
663 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 701 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
719 757
720 my $t1 = Time::HiRes::time; 758 my $t1 = Time::HiRes::time;
721 my $data = $process->(\@data); 759 my $data = $process->(\@data);
722 my $t2 = Time::HiRes::time; 760 my $t2 = Time::HiRes::time;
723 761
724 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 762 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
725 763
726 db_put cache => "$id/data", $data; 764 db_put cache => "$id/data", $data;
727 db_put cache => "$id/md5" , $md5; 765 db_put cache => "$id/md5" , $md5;
728 db_put cache => "$id/meta", $meta; 766 db_put cache => "$id/meta", $meta;
729 767
739 777
740=cut 778=cut
741 779
742sub datalog($@) { 780sub datalog($@) {
743 my ($type, %kv) = @_; 781 my ($type, %kv) = @_;
744 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 782 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
745} 783}
746 784
747=back 785=back
748 786
749=cut 787=cut
944 982
945 } elsif (exists $cb_id{$type}) { 983 } elsif (exists $cb_id{$type}) {
946 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 984 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
947 985
948 } elsif (ref $type) { 986 } elsif (ref $type) {
949 warn "attaching objects not supported, ignoring.\n"; 987 error "attaching objects not supported, ignoring.\n";
950 988
951 } else { 989 } else {
952 shift @arg; 990 shift @arg;
953 warn "attach argument '$type' not supported, ignoring.\n"; 991 error "attach argument '$type' not supported, ignoring.\n";
954 } 992 }
955 } 993 }
956} 994}
957 995
958sub _object_attach { 996sub _object_attach {
968 _attach $registry, $klass, @attach; 1006 _attach $registry, $klass, @attach;
969 } 1007 }
970 1008
971 $obj->{$name} = \%arg; 1009 $obj->{$name} = \%arg;
972 } else { 1010 } else {
973 warn "object uses attachment '$name' which is not available, postponing.\n"; 1011 info "object uses attachment '$name' which is not available, postponing.\n";
974 } 1012 }
975 1013
976 $obj->{_attachment}{$name} = undef; 1014 $obj->{_attachment}{$name} = undef;
977} 1015}
978 1016
1037 1075
1038 for (@$callbacks) { 1076 for (@$callbacks) {
1039 eval { &{$_->[1]} }; 1077 eval { &{$_->[1]} };
1040 1078
1041 if ($@) { 1079 if ($@) {
1042 warn "$@";
1043 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1080 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1044 override; 1081 override;
1045 } 1082 }
1046 1083
1047 return 1 if $override; 1084 return 1 if $override;
1048 } 1085 }
1127 for (@$attach) { 1164 for (@$attach) {
1128 my ($klass, @attach) = @$_; 1165 my ($klass, @attach) = @$_;
1129 _attach $registry, $klass, @attach; 1166 _attach $registry, $klass, @attach;
1130 } 1167 }
1131 } else { 1168 } else {
1132 warn "object uses attachment '$name' that is not available, postponing.\n"; 1169 info "object uses attachment '$name' that is not available, postponing.\n";
1133 } 1170 }
1134 } 1171 }
1135} 1172}
1136 1173
1137cf::attachable->attach ( 1174cf::attachable->attach (
1164 my ($filename, $rdata, $objs) = @_; 1201 my ($filename, $rdata, $objs) = @_;
1165 1202
1166 sync_job { 1203 sync_job {
1167 if (length $$rdata) { 1204 if (length $$rdata) {
1168 utf8::decode (my $decname = $filename); 1205 utf8::decode (my $decname = $filename);
1169 warn sprintf "saving %s (%d,%d)\n", 1206 trace sprintf "saving %s (%d,%d)\n",
1170 $decname, length $$rdata, scalar @$objs; 1207 $decname, length $$rdata, scalar @$objs
1208 if $VERBOSE_IO;
1171 1209
1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1210 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1173 aio_chmod $fh, SAVE_MODE; 1211 aio_chmod $fh, SAVE_MODE;
1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1212 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1175 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 }
1176 aio_close $fh; 1217 aio_close $fh;
1177 1218
1178 if (@$objs) { 1219 if (@$objs) {
1179 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) {
1180 aio_chmod $fh, SAVE_MODE; 1221 aio_chmod $fh, SAVE_MODE;
1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1222 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1182 aio_write $fh, 0, (length $data), $data, 0; 1223 aio_write $fh, 0, (length $data), $data, 0;
1183 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 }
1184 aio_close $fh; 1228 aio_close $fh;
1185 aio_rename "$filename.pst~", "$filename.pst"; 1229 aio_rename "$filename.pst~", "$filename.pst";
1186 } 1230 }
1187 } else { 1231 } else {
1188 aio_unlink "$filename.pst"; 1232 aio_unlink "$filename.pst";
1189 } 1233 }
1190 1234
1191 aio_rename "$filename~", $filename; 1235 aio_rename "$filename~", $filename;
1192 1236
1193 $filename =~ s%/[^/]+$%%; 1237 $filename =~ s%/[^/]+$%%;
1194 aio_pathsync $filename; 1238 aio_pathsync $filename if $cf::USE_FSYNC;
1195 } else { 1239 } else {
1196 warn "FATAL: $filename~: $!\n"; 1240 error "unable to save objects: $filename~: $!\n";
1197 } 1241 }
1198 } else { 1242 } else {
1199 aio_unlink $filename; 1243 aio_unlink $filename;
1200 aio_unlink "$filename.pst"; 1244 aio_unlink "$filename.pst";
1201 } 1245 }
1225 my $st = eval { Coro::Storable::thaw $av }; 1269 my $st = eval { Coro::Storable::thaw $av };
1226 $av = $st->{objs}; 1270 $av = $st->{objs};
1227 } 1271 }
1228 1272
1229 utf8::decode (my $decname = $filename); 1273 utf8::decode (my $decname = $filename);
1230 warn sprintf "loading %s (%d,%d)\n", 1274 trace sprintf "loading %s (%d,%d)\n",
1231 $decname, length $data, scalar @{$av || []}; 1275 $decname, length $data, scalar @{$av || []}
1276 if $VERBOSE_IO;
1232 1277
1233 ($data, $av) 1278 ($data, $av)
1234} 1279}
1235 1280
1236=head2 COMMAND CALLBACKS 1281=head2 COMMAND CALLBACKS
1292 my ($name, $cb) = @_; 1337 my ($name, $cb) = @_;
1293 1338
1294 $EXTICMD{$name} = $cb; 1339 $EXTICMD{$name} = $cb;
1295} 1340}
1296 1341
1342use File::Glob ();
1343
1297cf::player->attach ( 1344cf::player->attach (
1298 on_command => sub { 1345 on_unknown_command => sub {
1299 my ($pl, $name, $params) = @_; 1346 my ($pl, $name, $params) = @_;
1300 1347
1301 my $cb = $COMMAND{$name} 1348 my $cb = $COMMAND{$name}
1302 or return; 1349 or return;
1303 1350
1326 1373
1327 $pl->ext_reply ($reply, @reply) 1374 $pl->ext_reply ($reply, @reply)
1328 if $reply; 1375 if $reply;
1329 1376
1330 } else { 1377 } else {
1331 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1378 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1332 } 1379 }
1333 1380
1334 cf::override; 1381 cf::override;
1335 }, 1382 },
1336); 1383);
1337 1384
1385# "readahead" all extensions
1386sub cache_extensions {
1387 my $grp = IO::AIO::aio_group;
1388
1389 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1390 for (grep /\.ext$/, @{$_[0]}) {
1391 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1392 }
1393 };
1394
1395 $grp
1396}
1397
1338sub load_extensions { 1398sub load_extensions {
1399 info "loading extensions...";
1400
1339 cf::sync_job { 1401 cf::sync_job {
1340 my %todo; 1402 my %todo;
1341 1403
1342 for my $path (<$LIBDIR/*.ext>) { 1404 for my $path (<$LIBDIR/*.ext>) {
1343 next unless -r $path; 1405 next unless -r $path;
1361 1423
1362 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1424 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1363 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1425 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1364 1426
1365 $ext{source} = 1427 $ext{source} =
1366 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1428 "package $pkg; use common::sense;\n"
1367 . "#line 1 \"$path\"\n{\n" 1429 . "#line 1 \"$path\"\n{\n"
1368 . $source 1430 . $source
1369 . "\n};\n1"; 1431 . "\n};\n1";
1370 1432
1371 $todo{$base} = \%ext; 1433 $todo{$base} = \%ext;
1372 } 1434 }
1373 1435
1436 my $pass = 0;
1374 my %done; 1437 my %done;
1375 while (%todo) { 1438 while (%todo) {
1376 my $progress; 1439 my $progress;
1377 1440
1441 ++$pass;
1442
1443 ext:
1378 while (my ($k, $v) = each %todo) { 1444 while (my ($k, $v) = each %todo) {
1379 for (split /,\s*/, $v->{meta}{depends}) { 1445 for (split /,\s*/, $v->{meta}{depends}) {
1380 goto skip 1446 next ext
1381 unless exists $done{$_}; 1447 unless exists $done{$_};
1382 } 1448 }
1383 1449
1384 warn "... loading '$k' into '$v->{pkg}'\n"; 1450 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1385 1451
1386 unless (eval $v->{source}) { 1452 my $active = eval $v->{source};
1453
1454 if (length $@) {
1387 my $msg = $@ ? "$v->{path}: $@\n" 1455 error "$v->{path}: $@\n";
1388 : "$v->{base}: extension inactive.\n"; 1456 undef $@; # work around perl 5.10.0 utf-8 caching bug
1389 1457
1390 if (exists $v->{meta}{mandatory}) {
1391 warn $msg;
1392 cf::cleanup "mandatory extension failed to load, exiting."; 1458 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1393 } 1459 if exists $v->{meta}{mandatory};
1394 1460
1395 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;
1396 } 1470 }
1397
1398 $done{$k} = delete $todo{$k};
1399 push @EXTS, $v->{pkg};
1400 $progress = 1;
1401 } 1471 }
1402 1472
1403 skip: 1473 unless ($progress) {
1404 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1474 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1405 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 }
1406 } 1481 }
1407 }; 1482 };
1408} 1483}
1409 1484
1410############################################################################# 1485#############################################################################
1494 $cf::PLAYER{$login} = $pl 1569 $cf::PLAYER{$login} = $pl
1495 } 1570 }
1496 } 1571 }
1497} 1572}
1498 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
1499sub save($) { 1587sub save($) {
1500 my ($pl) = @_; 1588 my ($pl) = @_;
1501 1589
1502 return if $pl->{deny_save}; 1590 return if $pl->{deny_save};
1503 1591
1508 1596
1509 aio_mkdir playerdir $pl, 0770; 1597 aio_mkdir playerdir $pl, 0770;
1510 $pl->{last_save} = $cf::RUNTIME; 1598 $pl->{last_save} = $cf::RUNTIME;
1511 1599
1512 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];
1513 1604
1514 $pl->save_pl ($path); 1605 $pl->save_pl ($path);
1515 cf::cede_to_tick; 1606 cf::cede_to_tick;
1516} 1607}
1517 1608
1554 $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
1555 1646
1556 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1647 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1557 $pl->deactivate; 1648 $pl->deactivate;
1558 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;
1559 $pl->ob->check_score;
1560 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1650 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1561 $pl->ns->destroy if $pl->ns; 1651 $pl->ns->destroy if $pl->ns;
1562 1652
1563 my $path = playerdir $pl; 1653 my $path = playerdir $pl;
1564 my $temp = "$path~$cf::RUNTIME~deleting~"; 1654 my $temp = "$path~$cf::RUNTIME~deleting~";
1619 \@logins 1709 \@logins
1620} 1710}
1621 1711
1622=item $player->maps 1712=item $player->maps
1623 1713
1714=item cf::player::maps $login
1715
1624Returns an arrayref of map paths that are private for this 1716Returns an arrayref of map paths that are private for this
1625player. May block. 1717player. May block.
1626 1718
1627=cut 1719=cut
1628 1720
1690=cut 1782=cut
1691 1783
1692sub find_by_path($) { 1784sub find_by_path($) {
1693 my ($path) = @_; 1785 my ($path) = @_;
1694 1786
1787 $path =~ s/^~[^\/]*//; # skip ~login
1788
1695 my ($match, $specificity); 1789 my ($match, $specificity);
1696 1790
1697 for my $region (list) { 1791 for my $region (list) {
1698 if ($region->{match} && $path =~ $region->{match}) { 1792 if ($region->{match} && $path =~ $region->{match}) {
1699 ($match, $specificity) = ($region, $region->specificity) 1793 ($match, $specificity) = ($region, $region->specificity)
1730 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
1731 1825
1732 # mit "rum" bekleckern, nicht 1826 # mit "rum" bekleckern, nicht
1733 $self->_create_random_map ( 1827 $self->_create_random_map (
1734 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1828 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1735 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1829 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1736 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1830 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1737 $rmp->{exit_on_final_map}, 1831 $rmp->{exit_on_final_map},
1738 $rmp->{xsize}, $rmp->{ysize}, 1832 $rmp->{xsize}, $rmp->{ysize},
1739 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1833 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1740 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1834 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1755 1849
1756sub register { 1850sub register {
1757 my (undef, $regex, $prio) = @_; 1851 my (undef, $regex, $prio) = @_;
1758 my $pkg = caller; 1852 my $pkg = caller;
1759 1853
1760 no strict;
1761 push @{"$pkg\::ISA"}, __PACKAGE__; 1854 push @{"$pkg\::ISA"}, __PACKAGE__;
1762 1855
1763 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1856 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1764} 1857}
1765 1858
1766# also paths starting with '/' 1859# also paths starting with '/'
1767$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1860$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1768 1861
1769sub thawer_merge { 1862sub thawer_merge {
1770 my ($self, $merge) = @_; 1863 my ($self, $merge) = @_;
1771 1864
1772 # we have to keep some variables in memory intact 1865 # we have to keep some variables in memory intact
1870 1963
1871 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1964 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1872 "$UNIQUEDIR/$path" 1965 "$UNIQUEDIR/$path"
1873} 1966}
1874 1967
1875# and all this just because we cannot iterate over
1876# all maps in C++...
1877sub change_all_map_light {
1878 my ($change) = @_;
1879
1880 $_->change_map_light ($change)
1881 for grep $_->outdoor, values %cf::MAP;
1882}
1883
1884sub decay_objects { 1968sub decay_objects {
1885 my ($self) = @_; 1969 my ($self) = @_;
1886 1970
1887 return if $self->{deny_reset}; 1971 return if $self->{deny_reset};
1888 1972
1970sub find { 2054sub find {
1971 my ($path, $origin) = @_; 2055 my ($path, $origin) = @_;
1972 2056
1973 $path = normalise $path, $origin && $origin->path; 2057 $path = normalise $path, $origin && $origin->path;
1974 2058
1975 cf::lock_wait "map_data:$path";#d#remove 2059 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1976 cf::lock_wait "map_find:$path"; 2060 my $guard2 = cf::lock_acquire "map_find:$path";
1977 2061
1978 $cf::MAP{$path} || do { 2062 $cf::MAP{$path} || do {
1979 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1980 my $guard2 = cf::lock_acquire "map_find:$path";
1981
1982 my $map = new_from_path cf::map $path 2063 my $map = new_from_path cf::map $path
1983 or return; 2064 or return;
1984 2065
1985 $map->{last_save} = $cf::RUNTIME; 2066 $map->{last_save} = $cf::RUNTIME;
1986 2067
1998 2079
1999 $cf::MAP{$path} = $map 2080 $cf::MAP{$path} = $map
2000 } 2081 }
2001} 2082}
2002 2083
2003sub pre_load { } 2084sub pre_load { }
2004sub post_load { } 2085#sub post_load { } # XS
2005 2086
2006sub load { 2087sub load {
2007 my ($self) = @_; 2088 my ($self) = @_;
2008 2089
2009 local $self->{deny_reset} = 1; # loading can take a long time 2090 local $self->{deny_reset} = 1; # loading can take a long time
2054 unless ($self->{deny_activate}) { 2135 unless ($self->{deny_activate}) {
2055 $self->decay_objects; 2136 $self->decay_objects;
2056 $self->fix_auto_apply; 2137 $self->fix_auto_apply;
2057 $self->update_buttons; 2138 $self->update_buttons;
2058 cf::cede_to_tick; 2139 cf::cede_to_tick;
2059 $self->set_darkness_map;
2060 cf::cede_to_tick;
2061 $self->activate; 2140 $self->activate;
2062 } 2141 }
2063 2142
2064 $self->{last_save} = $cf::RUNTIME; 2143 $self->{last_save} = $cf::RUNTIME;
2065 $self->last_access ($cf::RUNTIME); 2144 $self->last_access ($cf::RUNTIME);
2068 } 2147 }
2069 2148
2070 $self->post_load; 2149 $self->post_load;
2071} 2150}
2072 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
2073sub customise_for { 2155sub customise_for {
2074 my ($self, $ob) = @_; 2156 my ($self, $ob) = @_;
2075 2157
2076 return find "~" . $ob->name . "/" . $self->{path} 2158 return find "~" . $ob->name . "/" . $self->{path}
2077 if $self->per_player; 2159 if $self->per_player;
2093 or next; 2175 or next;
2094 $neigh = find $neigh, $map 2176 $neigh = find $neigh, $map
2095 or next; 2177 or next;
2096 $neigh->load; 2178 $neigh->load;
2097 2179
2180 # now find the diagonal neighbours
2098 push @neigh, 2181 push @neigh,
2099 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2182 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2100 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2183 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2101 } 2184 }
2102 2185
2109} 2192}
2110 2193
2111sub find_sync { 2194sub find_sync {
2112 my ($path, $origin) = @_; 2195 my ($path, $origin) = @_;
2113 2196
2114 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
2115} 2201}
2116 2202
2117sub do_load_sync { 2203sub do_load_sync {
2118 my ($map) = @_; 2204 my ($map) = @_;
2119 2205
2120 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2206 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2121 if $Coro::current == $Coro::main; 2207 if $Coro::current == $Coro::main;
2122 2208
2123 cf::sync_job { $map->load }; 2209 $map->load;
2124} 2210}
2125 2211
2126our %MAP_PREFETCH; 2212our %MAP_PREFETCH;
2127our $MAP_PREFETCHER = undef; 2213our $MAP_PREFETCHER = undef;
2128 2214
2154 $MAP_PREFETCHER->prio (6); 2240 $MAP_PREFETCHER->prio (6);
2155 2241
2156 () 2242 ()
2157} 2243}
2158 2244
2245# common code, used by both ->save and ->swapout
2159sub save { 2246sub _save {
2160 my ($self) = @_; 2247 my ($self) = @_;
2161
2162 my $lock = cf::lock_acquire "map_data:$self->{path}";
2163 2248
2164 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2165 2250
2166 return unless $self->dirty; 2251 return unless $self->dirty;
2167 2252
2187 } else { 2272 } else {
2188 $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);
2189 } 2274 }
2190} 2275}
2191 2276
2277sub save {
2278 my ($self) = @_;
2279
2280 my $lock = cf::lock_acquire "map_data:$self->{path}";
2281
2282 $self->_save;
2283}
2284
2192sub swap_out { 2285sub swap_out {
2193 my ($self) = @_; 2286 my ($self) = @_;
2194 2287
2195 # save first because save cedes
2196 $self->save;
2197
2198 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2288 my $lock = cf::lock_acquire "map_data:$self->{path}";
2199 2289
2200 return if $self->players;
2201 return if $self->in_memory != cf::MAP_ACTIVE; 2290 return if $self->in_memory != cf::MAP_ACTIVE;
2202 return if $self->{deny_save}; 2291 return if $self->{deny_save};
2292 return if $self->players;
2203 2293
2294 # first deactivate the map and "unlink" it from the core
2295 $self->deactivate;
2296 $_->clear_links_to ($self) for values %cf::MAP;
2204 $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};
2205 2344
2206 $self->deactivate; 2345 $self->deactivate;
2207 $_->clear_links_to ($self) for values %cf::MAP; 2346 $_->clear_links_to ($self) for values %cf::MAP;
2208 $self->clear; 2347 $self->clear;
2209}
2210
2211sub reset_at {
2212 my ($self) = @_;
2213
2214 # TODO: safety, remove and allow resettable per-player maps
2215 return 1e99 if $self->{deny_reset};
2216
2217 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2218 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2219
2220 $time + $to
2221}
2222
2223sub should_reset {
2224 my ($self) = @_;
2225
2226 $self->reset_at <= $cf::RUNTIME
2227}
2228
2229sub reset {
2230 my ($self) = @_;
2231
2232 my $lock = cf::lock_acquire "map_data:$self->{path}";
2233
2234 return if $self->players;
2235
2236 warn "resetting map ", $self->path;
2237
2238 $self->in_memory (cf::MAP_SWAPPED);
2239
2240 # need to save uniques path
2241 unless ($self->{deny_save}) {
2242 my $uniq = $self->uniq_path; utf8::encode $uniq;
2243
2244 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2245 if $uniq;
2246 }
2247
2248 delete $cf::MAP{$self->path};
2249
2250 $self->deactivate;
2251 $_->clear_links_to ($self) for values %cf::MAP;
2252 $self->clear;
2253 2348
2254 $self->unlink_save; 2349 $self->unlink_save;
2255 $self->destroy; 2350 $self->destroy;
2256} 2351}
2257 2352
2265 2360
2266 delete $cf::MAP{$self->path}; 2361 delete $cf::MAP{$self->path};
2267 2362
2268 $self->unlink_save; 2363 $self->unlink_save;
2269 2364
2270 bless $self, "cf::map"; 2365 bless $self, "cf::map::wrap";
2271 delete $self->{deny_reset}; 2366 delete $self->{deny_reset};
2272 $self->{deny_save} = 1; 2367 $self->{deny_save} = 1;
2273 $self->reset_timeout (1); 2368 $self->reset_timeout (1);
2274 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2369 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2275 2370
2332 : normalise $_ 2427 : normalise $_
2333 } @{ aio_readdir $UNIQUEDIR or [] } 2428 } @{ aio_readdir $UNIQUEDIR or [] }
2334 ] 2429 ]
2335} 2430}
2336 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
2337=back 2464=back
2338 2465
2339=head3 cf::object 2466=head3 cf::object
2340 2467
2341=cut 2468=cut
2406 2533
2407our $SAY_CHANNEL = { 2534our $SAY_CHANNEL = {
2408 id => "say", 2535 id => "say",
2409 title => "Map", 2536 title => "Map",
2410 reply => "say ", 2537 reply => "say ",
2411 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.",
2412}; 2539};
2413 2540
2414our $CHAT_CHANNEL = { 2541our $CHAT_CHANNEL = {
2415 id => "chat", 2542 id => "chat",
2416 title => "Chat", 2543 title => "Chat",
2473 2600
2474Freezes 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}>).
2475 2602
2476The 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.
2477for 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,
2478though, 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
2479map. 2606map.
2480 2607
2481Will never block. 2608Will never block.
2482 2609
2483=item $player_object->leave_link ($map, $x, $y) 2610=item $player_object->leave_link ($map, $x, $y)
2504sub cf::object::player::enter_link { 2631sub cf::object::player::enter_link {
2505 my ($self) = @_; 2632 my ($self) = @_;
2506 2633
2507 $self->deactivate_recursive; 2634 $self->deactivate_recursive;
2508 2635
2636 ++$self->{_link_recursion};
2637
2509 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2638 return if UNIVERSAL::isa $self->map, "ext::map_link";
2510 2639
2511 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2640 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2512 if $self->map && $self->map->{path} ne "{link}"; 2641 if $self->map && $self->map->{path} ne "{link}";
2513 2642
2514 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2643 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2515} 2644}
2516 2645
2517sub cf::object::player::leave_link { 2646sub cf::object::player::leave_link {
2518 my ($self, $map, $x, $y) = @_; 2647 my ($self, $map, $x, $y) = @_;
2519 2648
2536 ($x, $y) = (-1, -1) 2665 ($x, $y) = (-1, -1)
2537 unless (defined $x) && (defined $y); 2666 unless (defined $x) && (defined $y);
2538 2667
2539 # use -1 or undef as default coordinates, not 0, 0 2668 # use -1 or undef as default coordinates, not 0, 0
2540 ($x, $y) = ($map->enter_x, $map->enter_y) 2669 ($x, $y) = ($map->enter_x, $map->enter_y)
2541 if $x <=0 && $y <= 0; 2670 if $x <= 0 && $y <= 0;
2542 2671
2543 $map->load; 2672 $map->load;
2544 $map->load_neighbours; 2673 $map->load_neighbours;
2545 2674
2546 return unless $self->contr->active; 2675 return unless $self->contr->active;
2547 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2548 $self->activate_recursive;
2549 2676
2550 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2677 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2551 $self->enter_map ($map, $x, $y); 2678 if ($self->enter_map ($map, $x, $y)) {
2552} 2679 # entering was successful
2680 delete $self->{_link_recursion};
2681 # only activate afterwards, to support waiting in hooks
2682 $self->activate_recursive;
2683 }
2553 2684
2685}
2686
2554=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)]])
2555 2688
2556Moves 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
2557her, loading and preparing them map, calling the provided $check callback 2690her, loading and preparing them map, calling the provided $check callback
2558that 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
2559the 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
2566 2699
2567our $GOTOGEN; 2700our $GOTOGEN;
2568 2701
2569sub cf::object::player::goto { 2702sub cf::object::player::goto {
2570 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 }
2571 2710
2572 # 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
2573 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2712 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2574 2713
2575 $self->enter_link; 2714 $self->enter_link;
2599 my $map = eval { 2738 my $map = eval {
2600 my $map = defined $path ? cf::map::find $path : undef; 2739 my $map = defined $path ? cf::map::find $path : undef;
2601 2740
2602 if ($map) { 2741 if ($map) {
2603 $map = $map->customise_for ($self); 2742 $map = $map->customise_for ($self);
2604 $map = $check->($map) if $check && $map; 2743 $map = $check->($map, $x, $y, $self) if $check && $map;
2605 } else { 2744 } else {
2606 $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);
2607 } 2746 }
2608 2747
2609 $map 2748 $map
2617 if ($gen == $self->{_goto_generation}) { 2756 if ($gen == $self->{_goto_generation}) {
2618 delete $self->{_goto_generation}; 2757 delete $self->{_goto_generation};
2619 $self->leave_link ($map, $x, $y); 2758 $self->leave_link ($map, $x, $y);
2620 } 2759 }
2621 2760
2622 $done->() if $done; 2761 $done->($self) if $done;
2623 })->prio (1); 2762 })->prio (1);
2624} 2763}
2625 2764
2626=item $player_object->enter_exit ($exit_object) 2765=item $player_object->enter_exit ($exit_object)
2627 2766
2720 $self->message ("Something went wrong deep within the deliantra server. " 2859 $self->message ("Something went wrong deep within the deliantra server. "
2721 . "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. "
2722 . "Please report this to the dungeon master!", 2861 . "Please report this to the dungeon master!",
2723 cf::NDI_UNIQUE | cf::NDI_RED); 2862 cf::NDI_UNIQUE | cf::NDI_RED);
2724 2863
2725 warn "ERROR in enter_exit: $@"; 2864 error "ERROR in enter_exit: $@";
2726 $self->leave_link; 2865 $self->leave_link;
2727 } 2866 }
2728 })->prio (1); 2867 })->prio (1);
2729} 2868}
2730 2869
2742sub cf::client::send_drawinfo { 2881sub cf::client::send_drawinfo {
2743 my ($self, $text, $flags) = @_; 2882 my ($self, $text, $flags) = @_;
2744 2883
2745 utf8::encode $text; 2884 utf8::encode $text;
2746 $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);
2747} 2911}
2748 2912
2749=item $client->send_msg ($channel, $msg, $color, [extra...]) 2913=item $client->send_msg ($channel, $msg, $color, [extra...])
2750 2914
2751Send 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
2755 2919
2756=cut 2920=cut
2757 2921
2758# non-persistent channels (usually the info channel) 2922# non-persistent channels (usually the info channel)
2759our %CHANNEL = ( 2923our %CHANNEL = (
2924 "c/motd" => {
2925 id => "infobox",
2926 title => "MOTD",
2927 reply => undef,
2928 tooltip => "The message of the day",
2929 },
2760 "c/identify" => { 2930 "c/identify" => {
2761 id => "infobox", 2931 id => "infobox",
2762 title => "Identify", 2932 title => "Identify",
2763 reply => undef, 2933 reply => undef,
2764 tooltip => "Items recently identified", 2934 tooltip => "Items recently identified",
2766 "c/examine" => { 2936 "c/examine" => {
2767 id => "infobox", 2937 id => "infobox",
2768 title => "Examine", 2938 title => "Examine",
2769 reply => undef, 2939 reply => undef,
2770 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",
2771 }, 2947 },
2772 "c/book" => { 2948 "c/book" => {
2773 id => "infobox", 2949 id => "infobox",
2774 title => "Book", 2950 title => "Book",
2775 reply => undef, 2951 reply => undef,
2791 id => "infobox", 2967 id => "infobox",
2792 title => "Body Parts", 2968 title => "Body Parts",
2793 reply => undef, 2969 reply => undef,
2794 tooltip => "Shows which body parts you posess and are available", 2970 tooltip => "Shows which body parts you posess and are available",
2795 }, 2971 },
2972 "c/statistics" => {
2973 id => "infobox",
2974 title => "Statistics",
2975 reply => undef,
2976 tooltip => "Shows your primary statistics",
2977 },
2796 "c/skills" => { 2978 "c/skills" => {
2797 id => "infobox", 2979 id => "infobox",
2798 title => "Skills", 2980 title => "Skills",
2799 reply => undef, 2981 reply => undef,
2800 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",
2801 }, 3007 },
2802 "c/uptime" => { 3008 "c/uptime" => {
2803 id => "infobox", 3009 id => "infobox",
2804 title => "Uptime", 3010 title => "Uptime",
2805 reply => undef, 3011 reply => undef,
2815 id => "party", 3021 id => "party",
2816 title => "Party", 3022 title => "Party",
2817 reply => "gsay ", 3023 reply => "gsay ",
2818 tooltip => "Messages and chat related to your party", 3024 tooltip => "Messages and chat related to your party",
2819 }, 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,
2820); 3034);
2821 3035
2822sub cf::client::send_msg { 3036sub cf::client::send_msg {
2823 my ($self, $channel, $msg, $color, @extra) = @_; 3037 my ($self, $channel, $msg, $color, @extra) = @_;
2824 3038
2829 3043
2830 # check predefined channels, for the benefit of C 3044 # check predefined channels, for the benefit of C
2831 if ($CHANNEL{$channel}) { 3045 if ($CHANNEL{$channel}) {
2832 $channel = $CHANNEL{$channel}; 3046 $channel = $CHANNEL{$channel};
2833 3047
2834 $self->ext_msg (channel_info => $channel) 3048 $self->ext_msg (channel_info => $channel);
2835 if $self->can_msg;
2836
2837 $channel = $channel->{id}; 3049 $channel = $channel->{id};
2838 3050
2839 } elsif (ref $channel) { 3051 } elsif (ref $channel) {
2840 # send meta info to client, if not yet sent 3052 # send meta info to client, if not yet sent
2841 unless (exists $self->{channel}{$channel->{id}}) { 3053 unless (exists $self->{channel}{$channel->{id}}) {
2842 $self->{channel}{$channel->{id}} = $channel; 3054 $self->{channel}{$channel->{id}} = $channel;
2843 $self->ext_msg (channel_info => $channel) 3055 $self->ext_msg (channel_info => $channel);
2844 if $self->can_msg;
2845 } 3056 }
2846 3057
2847 $channel = $channel->{id}; 3058 $channel = $channel->{id};
2848 } 3059 }
2849 3060
2850 return unless @extra || length $msg; 3061 return unless @extra || length $msg;
2851 3062
2852 if ($self->can_msg) {
2853 # default colour, mask it out 3063 # default colour, mask it out
2854 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3064 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2855 if $color & cf::NDI_DEF; 3065 if $color & cf::NDI_DEF;
2856 3066
2857 my $pkt = "msg " 3067 my $pkt = "msg "
2858 . $self->{json_coder}->encode ( 3068 . $self->{json_coder}->encode (
2859 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3069 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2860 ); 3070 );
2861 3071
2862 # try lzf for large packets
2863 $pkt = "lzf " . Compress::LZF::compress $pkt
2864 if 1024 <= length $pkt and $self->{can_lzf};
2865
2866 # split very large packets
2867 if (8192 < length $pkt and $self->{can_lzf}) {
2868 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2869 $pkt = "frag";
2870 }
2871
2872 $self->send_packet ($pkt); 3072 $self->send_big_packet ($pkt);
2873 } else {
2874 if ($color >= 0) {
2875 # replace some tags by gcfclient-compatible ones
2876 for ($msg) {
2877 1 while
2878 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2879 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2880 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2881 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2882 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2883 }
2884
2885 $color &= cf::NDI_COLOR_MASK;
2886
2887 utf8::encode $msg;
2888
2889 if (0 && $msg =~ /\[/) {
2890 # COMMAND/INFO
2891 $self->send_packet ("drawextinfo $color 10 8 $msg")
2892 } else {
2893 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2894 $self->send_packet ("drawinfo $color $msg")
2895 }
2896 }
2897 }
2898} 3073}
2899 3074
2900=item $client->ext_msg ($type, @msg) 3075=item $client->ext_msg ($type, @msg)
2901 3076
2902Sends an ext event to the client. 3077Sends an ext event to the client.
2905 3080
2906sub cf::client::ext_msg($$@) { 3081sub cf::client::ext_msg($$@) {
2907 my ($self, $type, @msg) = @_; 3082 my ($self, $type, @msg) = @_;
2908 3083
2909 if ($self->extcmd == 2) { 3084 if ($self->extcmd == 2) {
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3085 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2911 } elsif ($self->extcmd == 1) { # TODO: remove 3086 } elsif ($self->extcmd == 1) { # TODO: remove
2912 push @msg, msgtype => "event_$type"; 3087 push @msg, msgtype => "event_$type";
2913 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3088 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2914 } 3089 }
2915} 3090}
2916 3091
2917=item $client->ext_reply ($msgid, @msg) 3092=item $client->ext_reply ($msgid, @msg)
2918 3093
2922 3097
2923sub cf::client::ext_reply($$@) { 3098sub cf::client::ext_reply($$@) {
2924 my ($self, $id, @msg) = @_; 3099 my ($self, $id, @msg) = @_;
2925 3100
2926 if ($self->extcmd == 2) { 3101 if ($self->extcmd == 2) {
2927 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3102 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2928 } elsif ($self->extcmd == 1) { 3103 } elsif ($self->extcmd == 1) {
2929 #TODO: version 1, remove 3104 #TODO: version 1, remove
2930 unshift @msg, msgtype => "reply", msgid => $id; 3105 unshift @msg, msgtype => "reply", msgid => $id;
2931 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3106 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2932 } 3107 }
2933} 3108}
2934 3109
2935=item $success = $client->query ($flags, "text", \&cb) 3110=item $success = $client->query ($flags, "text", \&cb)
2936 3111
3007 3182
3008 $ns->ext_reply ($reply, @reply) 3183 $ns->ext_reply ($reply, @reply)
3009 if $reply; 3184 if $reply;
3010 3185
3011 } else { 3186 } else {
3012 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";
3013 } 3188 }
3014 3189
3015 cf::override; 3190 cf::override;
3016 }, 3191 },
3017); 3192);
3037 3212
3038 $coro 3213 $coro
3039} 3214}
3040 3215
3041cf::client->attach ( 3216cf::client->attach (
3042 on_destroy => sub { 3217 on_client_destroy => sub {
3043 my ($ns) = @_; 3218 my ($ns) = @_;
3044 3219
3045 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3220 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3046 }, 3221 },
3047); 3222);
3063our $safe_hole = new Safe::Hole; 3238our $safe_hole = new Safe::Hole;
3064 3239
3065$SIG{FPE} = 'IGNORE'; 3240$SIG{FPE} = 'IGNORE';
3066 3241
3067$safe->permit_only (Opcode::opset qw( 3242$safe->permit_only (Opcode::opset qw(
3068 :base_core :base_mem :base_orig :base_math 3243 :base_core :base_mem :base_orig :base_math :base_loop
3069 grepstart grepwhile mapstart mapwhile 3244 grepstart grepwhile mapstart mapwhile
3070 sort time 3245 sort time
3071)); 3246));
3072 3247
3073# here we export the classes and methods available to script code 3248# here we export the classes and methods available to script code
3077The following functions and methods are available within a safe environment: 3252The following functions and methods are available within a safe environment:
3078 3253
3079 cf::object 3254 cf::object
3080 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
3081 insert remove name archname title slaying race decrease split 3256 insert remove name archname title slaying race decrease split
3257 value
3082 3258
3083 cf::object::player 3259 cf::object::player
3084 player 3260 player
3085 3261
3086 cf::player 3262 cf::player
3092=cut 3268=cut
3093 3269
3094for ( 3270for (
3095 ["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
3096 insert remove inv nrof name archname title slaying race 3272 insert remove inv nrof name archname title slaying race
3097 decrease split destroy change_exp)], 3273 decrease split destroy change_exp value msg lore send_msg)],
3098 ["cf::object::player" => qw(player)], 3274 ["cf::object::player" => qw(player)],
3099 ["cf::player" => qw(peaceful)], 3275 ["cf::player" => qw(peaceful send_msg)],
3100 ["cf::map" => qw(trigger)], 3276 ["cf::map" => qw(trigger)],
3101) { 3277) {
3102 no strict 'refs';
3103 my ($pkg, @funs) = @$_; 3278 my ($pkg, @funs) = @$_;
3104 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3279 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3105 for @funs; 3280 for @funs;
3106} 3281}
3107 3282
3122 3297
3123 my $qcode = $code; 3298 my $qcode = $code;
3124 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3299 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3125 $qcode =~ s/\n/\\n/g; 3300 $qcode =~ s/\n/\\n/g;
3126 3301
3302 %vars = (_dummy => 0) unless %vars;
3303
3304 my @res;
3127 local $_; 3305 local $_;
3128 local @safe::cf::_safe_eval_args = values %vars;
3129 3306
3130 my $eval = 3307 my $eval =
3131 "do {\n" 3308 "do {\n"
3132 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3309 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3133 . "#line 0 \"{$qcode}\"\n" 3310 . "#line 0 \"{$qcode}\"\n"
3134 . $code 3311 . $code
3135 . "\n}" 3312 . "\n}"
3136 ; 3313 ;
3137 3314
3315 if ($CFG{safe_eval}) {
3138 sub_generation_inc; 3316 sub_generation_inc;
3317 local @safe::cf::_safe_eval_args = values %vars;
3139 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3318 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3140 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 }
3141 3324
3142 if ($@) { 3325 if ($@) {
3143 warn "$@"; 3326 warn "$@",
3144 warn "while executing safe code '$code'\n"; 3327 "while executing safe code '$code'\n",
3145 warn "with arguments " . (join " ", %vars) . "\n"; 3328 "with arguments " . (join " ", %vars) . "\n";
3146 } 3329 }
3147 3330
3148 wantarray ? @res : $res[0] 3331 wantarray ? @res : $res[0]
3149} 3332}
3150 3333
3164=cut 3347=cut
3165 3348
3166sub register_script_function { 3349sub register_script_function {
3167 my ($fun, $cb) = @_; 3350 my ($fun, $cb) = @_;
3168 3351
3169 no strict 'refs'; 3352 $fun = "safe::$fun" if $CFG{safe_eval};
3170 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3353 *$fun = $safe_hole->wrap ($cb);
3171} 3354}
3172 3355
3173=back 3356=back
3174 3357
3175=cut 3358=cut
3176 3359
3177############################################################################# 3360#############################################################################
3178# 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 warn "$dir/$mod\n";#d#
3376 ref $dir and next;
3377 0 <= Coro::AIO::aio_load "$dir/$mod", my $data
3378 or next;
3379
3380 $data = "#line 1 $dir/$mod\n$data";
3381
3382 open my $fh, "<", \$data or die;
3383
3384 return $fh;
3385 }
3386
3387 ()
3388}
3389
3390sub init_inc {
3391 # save original @INC
3392 @ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC;
3393
3394 # make sure we can do scalar-opens
3395 open my $dummy, "<", \my $dummy2;
3396
3397 # execute some stuff so perl load's some of the core modules
3398 /Ü/ =~ /ü/i;
3399 eval { &Storable::nstore_fd };
3400
3401 @INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc.
3402
3403 debug "module loading will be asynchronous from this point on.";
3404}
3179 3405
3180sub load_facedata($) { 3406sub load_facedata($) {
3181 my ($path) = @_; 3407 my ($path) = @_;
3182 3408
3183 # HACK to clear player env face cache, we need some signal framework 3409 # HACK to clear player env face cache, we need some signal framework
3184 # for this (global event?) 3410 # for this (global event?)
3185 %ext::player_env::MUSIC_FACE_CACHE = (); 3411 %ext::player_env::MUSIC_FACE_CACHE = ();
3186 3412
3187 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3413 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3188 3414
3189 warn "loading facedata from $path\n"; 3415 trace "loading facedata from $path\n";
3190 3416
3191 my $facedata; 3417 my $facedata;
3192 0 < aio_load $path, $facedata 3418 0 < aio_load $path, $facedata
3193 or die "$path: $!"; 3419 or die "$path: $!";
3194 3420
3196 3422
3197 $facedata->{version} == 2 3423 $facedata->{version} == 2
3198 or cf::cleanup "$path: version mismatch, cannot proceed."; 3424 or cf::cleanup "$path: version mismatch, cannot proceed.";
3199 3425
3200 # patch in the exptable 3426 # patch in the exptable
3427 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3201 $facedata->{resource}{"res/exp_table"} = { 3428 $facedata->{resource}{"res/exp_table"} = {
3202 type => FT_RSRC, 3429 type => FT_RSRC,
3203 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3430 data => $exp_table,
3431 hash => (Digest::MD5::md5 $exp_table),
3204 }; 3432 };
3205 cf::cede_to_tick; 3433 cf::cede_to_tick;
3206 3434
3207 { 3435 {
3208 my $faces = $facedata->{faceinfo}; 3436 my $faces = $facedata->{faceinfo};
3210 while (my ($face, $info) = each %$faces) { 3438 while (my ($face, $info) = each %$faces) {
3211 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3439 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3212 3440
3213 cf::face::set_visibility $idx, $info->{visibility}; 3441 cf::face::set_visibility $idx, $info->{visibility};
3214 cf::face::set_magicmap $idx, $info->{magicmap}; 3442 cf::face::set_magicmap $idx, $info->{magicmap};
3215 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3443 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3216 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3444 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3217 3445
3218 cf::cede_to_tick; 3446 cf::cede_to_tick;
3219 } 3447 }
3220 3448
3221 while (my ($face, $info) = each %$faces) { 3449 while (my ($face, $info) = each %$faces) {
3226 3454
3227 if (my $smooth = cf::face::find $info->{smooth}) { 3455 if (my $smooth = cf::face::find $info->{smooth}) {
3228 cf::face::set_smooth $idx, $smooth; 3456 cf::face::set_smooth $idx, $smooth;
3229 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3457 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3230 } else { 3458 } else {
3231 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3459 error "smooth face '$info->{smooth}' not found for face '$face'";
3232 } 3460 }
3233 3461
3234 cf::cede_to_tick; 3462 cf::cede_to_tick;
3235 } 3463 }
3236 } 3464 }
3245 3473
3246 cf::anim::invalidate_all; # d'oh 3474 cf::anim::invalidate_all; # d'oh
3247 } 3475 }
3248 3476
3249 { 3477 {
3250 # TODO: for gcfclient pleasure, we should give resources
3251 # that gcfclient doesn't grok a >10000 face index.
3252 my $res = $facedata->{resource}; 3478 my $res = $facedata->{resource};
3253 3479
3254 while (my ($name, $info) = each %$res) { 3480 while (my ($name, $info) = each %$res) {
3255 if (defined $info->{type}) { 3481 if (defined $info->{type}) {
3256 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3482 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3257 my $data;
3258 3483
3259 if ($info->{type} & 1) { 3484 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3260 # prepend meta info
3261
3262 my $meta = $enc->encode ({
3263 name => $name,
3264 %{ $info->{meta} || {} },
3265 });
3266
3267 $data = pack "(w/a*)*", $meta, $info->{data};
3268 } else {
3269 $data = $info->{data};
3270 }
3271
3272 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3273 cf::face::set_type $idx, $info->{type}; 3485 cf::face::set_type $idx, $info->{type};
3274 } else { 3486 } else {
3275 $RESOURCE{$name} = $info; 3487 $RESOURCE{$name} = $info; # unused
3276 } 3488 }
3277 3489
3278 cf::cede_to_tick; 3490 cf::cede_to_tick;
3279 } 3491 }
3280 } 3492 }
3281 3493
3282 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3494 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3283 3495
3284 1 3496 1
3285} 3497}
3286
3287cf::global->attach (on_resource_update => sub {
3288 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3289 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3290
3291 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3292 my $sound = $soundconf->{compat}[$_]
3293 or next;
3294
3295 my $face = cf::face::find "sound/$sound->[1]";
3296 cf::sound::set $sound->[0] => $face;
3297 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3298 }
3299
3300 while (my ($k, $v) = each %{$soundconf->{event}}) {
3301 my $face = cf::face::find "sound/$v";
3302 cf::sound::set $k => $face;
3303 }
3304 }
3305});
3306 3498
3307register_exticmd fx_want => sub { 3499register_exticmd fx_want => sub {
3308 my ($ns, $want) = @_; 3500 my ($ns, $want) = @_;
3309 3501
3310 while (my ($k, $v) = each %$want) { 3502 while (my ($k, $v) = each %$want) {
3349sub reload_treasures { 3541sub reload_treasures {
3350 load_resource_file "$DATADIR/treasures" 3542 load_resource_file "$DATADIR/treasures"
3351 or die "unable to load treasurelists\n"; 3543 or die "unable to load treasurelists\n";
3352} 3544}
3353 3545
3546sub reload_sound {
3547 trace "loading sound config from $DATADIR/sound\n";
3548
3549 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3550 or die "$DATADIR/sound $!";
3551
3552 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3553
3554 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3555 my $sound = $soundconf->{compat}[$_]
3556 or next;
3557
3558 my $face = cf::face::find "sound/$sound->[1]";
3559 cf::sound::set $sound->[0] => $face;
3560 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3561 }
3562
3563 while (my ($k, $v) = each %{$soundconf->{event}}) {
3564 my $face = cf::face::find "sound/$v";
3565 cf::sound::set $k => $face;
3566 }
3567}
3568
3354sub reload_resources { 3569sub reload_resources {
3355 warn "reloading resource files...\n"; 3570 trace "reloading resource files...\n";
3356 3571
3357 reload_facedata; 3572 reload_facedata;
3573 reload_sound;
3358 reload_archetypes; 3574 reload_archetypes;
3359 reload_regions; 3575 reload_regions;
3360 reload_treasures; 3576 reload_treasures;
3361 3577
3362 warn "finished reloading resource files\n"; 3578 trace "finished reloading resource files\n";
3363} 3579}
3364 3580
3365sub reload_config { 3581sub reload_config {
3582 trace "reloading config file...\n";
3583
3366 open my $fh, "<:utf8", "$CONFDIR/config" 3584 open my $fh, "<:utf8", "$CONFDIR/config"
3367 or return; 3585 or return;
3368 3586
3369 local $/; 3587 local $/;
3370 *CFG = YAML::Load <$fh>; 3588 *CFG = YAML::XS::Load scalar <$fh>;
3371 3589
3372 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3590 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3373 3591
3374 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3592 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3375 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3593 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3376 3594
3377 if (exists $CFG{mlockall}) { 3595 if (exists $CFG{mlockall}) {
3379 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3597 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3380 and die "WARNING: m(un)lockall failed: $!\n"; 3598 and die "WARNING: m(un)lockall failed: $!\n";
3381 }; 3599 };
3382 warn $@ if $@; 3600 warn $@ if $@;
3383 } 3601 }
3602
3603 trace "finished reloading resource files\n";
3384} 3604}
3385 3605
3386sub pidfile() { 3606sub pidfile() {
3387 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3607 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3388 or die "$PIDFILE: $!"; 3608 or die "$PIDFILE: $!";
3400 3620
3401 seek $fh, 0, 0; 3621 seek $fh, 0, 0;
3402 print $fh $$; 3622 print $fh $$;
3403} 3623}
3404 3624
3625sub main_loop {
3626 trace "EV::loop starting\n";
3627 if (1) {
3628 EV::loop;
3629 }
3630 trace "EV::loop returned\n";
3631 goto &main_loop unless $REALLY_UNLOOP;
3632}
3633
3405sub main { 3634sub main {
3406 cf::init_globals; # initialise logging 3635 cf::init_globals; # initialise logging
3407 3636
3408 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3637 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3409 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3638 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3410 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3639 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3411 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3640 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3412
3413 cf::init_experience;
3414 cf::init_anim;
3415 cf::init_attackmess;
3416 cf::init_dynamic;
3417 cf::init_block;
3418 3641
3419 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3642 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3420 3643
3421 # we must not ever block the main coroutine 3644 # we must not ever block the main coroutine
3422 local $Coro::idle = sub { 3645 local $Coro::idle = sub {
3428 }; 3651 };
3429 3652
3430 evthread_start IO::AIO::poll_fileno; 3653 evthread_start IO::AIO::poll_fileno;
3431 3654
3432 cf::sync_job { 3655 cf::sync_job {
3656 init_inc;
3657
3658 cf::init_experience;
3659 cf::init_anim;
3660 cf::init_attackmess;
3661 cf::init_dynamic;
3662
3663 cf::load_settings;
3664 cf::load_materials;
3665
3433 reload_resources; 3666 reload_resources;
3434 reload_config; 3667 reload_config;
3435 db_init; 3668 db_init;
3436 3669
3437 cf::load_settings;
3438 cf::load_materials;
3439 cf::init_uuid; 3670 cf::init_uuid;
3440 cf::init_signals; 3671 cf::init_signals;
3441 cf::init_commands;
3442 cf::init_skills; 3672 cf::init_skills;
3443 3673
3444 cf::init_beforeplay; 3674 cf::init_beforeplay;
3445 3675
3446 atomic; 3676 atomic;
3448 load_extensions; 3678 load_extensions;
3449 3679
3450 utime time, time, $RUNTIMEFILE; 3680 utime time, time, $RUNTIMEFILE;
3451 3681
3452 # no (long-running) fork's whatsoever before this point(!) 3682 # no (long-running) fork's whatsoever before this point(!)
3683 use POSIX ();
3453 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3684 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3454 3685
3455 (pop @POST_INIT)->(0) while @POST_INIT; 3686 (pop @POST_INIT)->(0) while @POST_INIT;
3456 }; 3687 };
3457 3688
3458 EV::loop; 3689 cf::object::thawer::errors_are_fatal 0;
3690 info "parse errors in files are no longer fatal from this point on.\n";
3691
3692 my $free_main; $free_main = EV::idle sub {
3693 undef $free_main;
3694 undef &main; # free gobs of memory :)
3695 };
3696
3697 goto &main_loop;
3459} 3698}
3460 3699
3461############################################################################# 3700#############################################################################
3462# initialisation and cleanup 3701# initialisation and cleanup
3463 3702
3464# install some emergency cleanup handlers 3703# install some emergency cleanup handlers
3465BEGIN { 3704BEGIN {
3466 our %SIGWATCHER = (); 3705 our %SIGWATCHER = ();
3467 for my $signal (qw(INT HUP TERM)) { 3706 for my $signal (qw(INT HUP TERM)) {
3468 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3707 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3469 cf::cleanup "SIG$signal"; 3708 cf::cleanup "SIG$signal";
3470 }; 3709 };
3471 } 3710 }
3472} 3711}
3473 3712
3474sub write_runtime_sync { 3713sub write_runtime_sync {
3714 my $t0 = AE::time;
3715
3475 # first touch the runtime file to show we are still running: 3716 # first touch the runtime file to show we are still running:
3476 # the fsync below can take a very very long time. 3717 # the fsync below can take a very very long time.
3477 3718
3478 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3719 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3479 3720
3480 my $guard = cf::lock_acquire "write_runtime"; 3721 my $guard = cf::lock_acquire "write_runtime";
3481 3722
3482 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3723 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3483 or return; 3724 or return;
3484 3725
3485 my $value = $cf::RUNTIME + 90 + 10; 3726 my $value = $cf::RUNTIME + 90 + 10;
3486 # 10 is the runtime save interval, for a monotonic clock 3727 # 10 is the runtime save interval, for a monotonic clock
3487 # 60 allows for the watchdog to kill the server. 3728 # 60 allows for the watchdog to kill the server.
3500 or return; 3741 or return;
3501 3742
3502 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3743 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3503 and return; 3744 and return;
3504 3745
3505 warn "runtime file written.\n"; 3746 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3506 3747
3507 1 3748 1
3508} 3749}
3509 3750
3510our $uuid_lock; 3751our $uuid_lock;
3522 or return; 3763 or return;
3523 3764
3524 my $value = uuid_seq uuid_cur; 3765 my $value = uuid_seq uuid_cur;
3525 3766
3526 unless ($value) { 3767 unless ($value) {
3527 warn "cowardly refusing to write zero uuid value!\n"; 3768 info "cowardly refusing to write zero uuid value!\n";
3528 return; 3769 return;
3529 } 3770 }
3530 3771
3531 my $value = uuid_str $value + $uuid_skip; 3772 my $value = uuid_str $value + $uuid_skip;
3532 $uuid_skip = 0; 3773 $uuid_skip = 0;
3542 or return; 3783 or return;
3543 3784
3544 aio_rename "$uuid~", $uuid 3785 aio_rename "$uuid~", $uuid
3545 and return; 3786 and return;
3546 3787
3547 warn "uuid file written ($value).\n"; 3788 trace "uuid file written ($value).\n";
3548 3789
3549 1 3790 1
3550 3791
3551} 3792}
3552 3793
3558} 3799}
3559 3800
3560sub emergency_save() { 3801sub emergency_save() {
3561 my $freeze_guard = cf::freeze_mainloop; 3802 my $freeze_guard = cf::freeze_mainloop;
3562 3803
3563 warn "enter emergency perl save\n"; 3804 info "emergency_perl_save: enter\n";
3805
3806 # this is a trade-off: we want to be very quick here, so
3807 # save all maps without fsync, and later call a global sync
3808 # (which in turn might be very very slow)
3809 local $USE_FSYNC = 0;
3564 3810
3565 cf::sync_job { 3811 cf::sync_job {
3812 cf::write_runtime_sync; # external watchdog should not bark
3813
3566 # use a peculiar iteration method to avoid tripping on perl 3814 # use a peculiar iteration method to avoid tripping on perl
3567 # refcount bugs in for. also avoids problems with players 3815 # refcount bugs in for. also avoids problems with players
3568 # and maps saved/destroyed asynchronously. 3816 # and maps saved/destroyed asynchronously.
3569 warn "begin emergency player save\n"; 3817 info "emergency_perl_save: begin player save\n";
3570 for my $login (keys %cf::PLAYER) { 3818 for my $login (keys %cf::PLAYER) {
3571 my $pl = $cf::PLAYER{$login} or next; 3819 my $pl = $cf::PLAYER{$login} or next;
3572 $pl->valid or next; 3820 $pl->valid or next;
3573 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3821 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3574 $pl->save; 3822 $pl->save;
3575 } 3823 }
3576 warn "end emergency player save\n"; 3824 info "emergency_perl_save: end player save\n";
3577 3825
3578 warn "begin emergency map save\n"; 3826 cf::write_runtime_sync; # external watchdog should not bark
3827
3828 info "emergency_perl_save: begin map save\n";
3579 for my $path (keys %cf::MAP) { 3829 for my $path (keys %cf::MAP) {
3580 my $map = $cf::MAP{$path} or next; 3830 my $map = $cf::MAP{$path} or next;
3581 $map->valid or next; 3831 $map->valid or next;
3582 $map->save; 3832 $map->save;
3583 } 3833 }
3584 warn "end emergency map save\n"; 3834 info "emergency_perl_save: end map save\n";
3585 3835
3586 warn "begin emergency database checkpoint\n"; 3836 cf::write_runtime_sync; # external watchdog should not bark
3837
3838 info "emergency_perl_save: begin database checkpoint\n";
3587 BDB::db_env_txn_checkpoint $DB_ENV; 3839 BDB::db_env_txn_checkpoint $DB_ENV;
3588 warn "end emergency database checkpoint\n"; 3840 info "emergency_perl_save: end database checkpoint\n";
3589 3841
3590 warn "begin write uuid\n"; 3842 info "emergency_perl_save: begin write uuid\n";
3591 write_uuid_sync 1; 3843 write_uuid_sync 1;
3592 warn "end write uuid\n"; 3844 info "emergency_perl_save: end write uuid\n";
3845
3846 cf::write_runtime_sync; # external watchdog should not bark
3847
3848 trace "emergency_perl_save: syncing database to disk";
3849 BDB::db_env_txn_checkpoint $DB_ENV;
3850
3851 info "emergency_perl_save: starting sync\n";
3852 IO::AIO::aio_sync sub {
3853 info "emergency_perl_save: finished sync\n";
3854 };
3855
3856 cf::write_runtime_sync; # external watchdog should not bark
3857
3858 trace "emergency_perl_save: flushing outstanding aio requests";
3859 while (IO::AIO::nreqs || BDB::nreqs) {
3860 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3861 }
3862
3863 cf::write_runtime_sync; # external watchdog should not bark
3593 }; 3864 };
3594 3865
3595 warn "leave emergency perl save\n"; 3866 info "emergency_perl_save: leave\n";
3596} 3867}
3597 3868
3598sub post_cleanup { 3869sub post_cleanup {
3599 my ($make_core) = @_; 3870 my ($make_core) = @_;
3600 3871
3872 IO::AIO::flush;
3873
3601 warn Carp::longmess "post_cleanup backtrace" 3874 error Carp::longmess "post_cleanup backtrace"
3602 if $make_core; 3875 if $make_core;
3603 3876
3604 my $fh = pidfile; 3877 my $fh = pidfile;
3605 unlink $PIDFILE if <$fh> == $$; 3878 unlink $PIDFILE if <$fh> == $$;
3606} 3879}
3626 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3899 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3627 for my $name (keys %$leaf_symtab) { 3900 for my $name (keys %$leaf_symtab) {
3628 _gv_clear *{"$pkg$name"}; 3901 _gv_clear *{"$pkg$name"};
3629# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3902# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3630 } 3903 }
3631 warn "cleared package $pkg\n";#d#
3632} 3904}
3633 3905
3634sub do_reload_perl() { 3906sub do_reload_perl() {
3635 # can/must only be called in main 3907 # can/must only be called in main
3636 if ($Coro::current != $Coro::main) { 3908 if (in_main) {
3637 warn "can only reload from main coroutine"; 3909 error "can only reload from main coroutine";
3638 return; 3910 return;
3639 } 3911 }
3640 3912
3641 return if $RELOAD++; 3913 return if $RELOAD++;
3642 3914
3915 my $t1 = AE::time;
3916
3643 while ($RELOAD) { 3917 while ($RELOAD) {
3644 warn "reloading..."; 3918 info "reloading...";
3645 3919
3646 warn "entering sync_job"; 3920 trace "entering sync_job";
3647 3921
3648 cf::sync_job { 3922 cf::sync_job {
3649 cf::write_runtime_sync; # external watchdog should not bark
3650 cf::emergency_save; 3923 cf::emergency_save;
3651 cf::write_runtime_sync; # external watchdog should not bark
3652 3924
3653 warn "syncing database to disk";
3654 BDB::db_env_txn_checkpoint $DB_ENV;
3655
3656 # if anything goes wrong in here, we should simply crash as we already saved
3657
3658 warn "flushing outstanding aio requests";
3659 while (IO::AIO::nreqs || BDB::nreqs) {
3660 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3661 }
3662
3663 warn "cancelling all extension coros"; 3925 trace "cancelling all extension coros";
3664 $_->cancel for values %EXT_CORO; 3926 $_->cancel for values %EXT_CORO;
3665 %EXT_CORO = (); 3927 %EXT_CORO = ();
3666 3928
3667 warn "removing commands"; 3929 trace "removing commands";
3668 %COMMAND = (); 3930 %COMMAND = ();
3669 3931
3670 warn "removing ext/exti commands"; 3932 trace "removing ext/exti commands";
3671 %EXTCMD = (); 3933 %EXTCMD = ();
3672 %EXTICMD = (); 3934 %EXTICMD = ();
3673 3935
3674 warn "unloading/nuking all extensions"; 3936 trace "unloading/nuking all extensions";
3675 for my $pkg (@EXTS) { 3937 for my $pkg (@EXTS) {
3676 warn "... unloading $pkg"; 3938 trace "... unloading $pkg";
3677 3939
3678 if (my $cb = $pkg->can ("unload")) { 3940 if (my $cb = $pkg->can ("unload")) {
3679 eval { 3941 eval {
3680 $cb->($pkg); 3942 $cb->($pkg);
3681 1 3943 1
3682 } or warn "$pkg unloaded, but with errors: $@"; 3944 } or error "$pkg unloaded, but with errors: $@";
3683 } 3945 }
3684 3946
3685 warn "... clearing $pkg"; 3947 trace "... clearing $pkg";
3686 clear_package $pkg; 3948 clear_package $pkg;
3687 } 3949 }
3688 3950
3689 warn "unloading all perl modules loaded from $LIBDIR"; 3951 trace "unloading all perl modules loaded from $LIBDIR";
3690 while (my ($k, $v) = each %INC) { 3952 while (my ($k, $v) = each %INC) {
3691 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3953 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3692 3954
3693 warn "... unloading $k"; 3955 trace "... unloading $k";
3694 delete $INC{$k}; 3956 delete $INC{$k};
3695 3957
3696 $k =~ s/\.pm$//; 3958 $k =~ s/\.pm$//;
3697 $k =~ s/\//::/g; 3959 $k =~ s/\//::/g;
3698 3960
3701 } 3963 }
3702 3964
3703 clear_package $k; 3965 clear_package $k;
3704 } 3966 }
3705 3967
3706 warn "getting rid of safe::, as good as possible"; 3968 trace "getting rid of safe::, as good as possible";
3707 clear_package "safe::$_" 3969 clear_package "safe::$_"
3708 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3970 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3709 3971
3710 warn "unloading cf.pm \"a bit\""; 3972 trace "unloading cf.pm \"a bit\"";
3711 delete $INC{"cf.pm"}; 3973 delete $INC{"cf.pm"};
3712 delete $INC{"cf/pod.pm"}; 3974 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3713 3975
3714 # don't, removes xs symbols, too, 3976 # don't, removes xs symbols, too,
3715 # and global variables created in xs 3977 # and global variables created in xs
3716 #clear_package __PACKAGE__; 3978 #clear_package __PACKAGE__;
3717 3979
3718 warn "unload completed, starting to reload now"; 3980 info "unload completed, starting to reload now";
3719 3981
3720 warn "reloading cf.pm"; 3982 trace "reloading cf.pm";
3721 require cf; 3983 require cf;
3722 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3984 cf::_connect_to_perl_1;
3723 3985
3724 warn "loading config and database again"; 3986 trace "loading config and database again";
3725 cf::reload_config; 3987 cf::reload_config;
3726 3988
3727 warn "loading extensions"; 3989 trace "loading extensions";
3728 cf::load_extensions; 3990 cf::load_extensions;
3729 3991
3992 if ($REATTACH_ON_RELOAD) {
3730 warn "reattaching attachments to objects/players"; 3993 trace "reattaching attachments to objects/players";
3731 _global_reattach; # objects, sockets 3994 _global_reattach; # objects, sockets
3732 warn "reattaching attachments to maps"; 3995 trace "reattaching attachments to maps";
3733 reattach $_ for values %MAP; 3996 reattach $_ for values %MAP;
3734 warn "reattaching attachments to players"; 3997 trace "reattaching attachments to players";
3735 reattach $_ for values %PLAYER; 3998 reattach $_ for values %PLAYER;
3999 }
3736 4000
3737 warn "running post_load"; 4001 trace "running post_init jobs";
3738 (pop @POST_INIT)->(1) while @POST_INIT; 4002 (pop @POST_INIT)->(1) while @POST_INIT;
3739 4003
3740 warn "leaving sync_job"; 4004 trace "leaving sync_job";
3741 4005
3742 1 4006 1
3743 } or do { 4007 } or do {
3744 warn $@; 4008 error $@;
3745 cf::cleanup "error while reloading, exiting."; 4009 cf::cleanup "error while reloading, exiting.";
3746 }; 4010 };
3747 4011
3748 warn "reloaded"; 4012 info "reloaded";
3749 --$RELOAD; 4013 --$RELOAD;
3750 } 4014 }
4015
4016 $t1 = AE::time - $t1;
4017 info "reload completed in ${t1}s\n";
3751}; 4018};
3752 4019
3753our $RELOAD_WATCHER; # used only during reload 4020our $RELOAD_WATCHER; # used only during reload
3754 4021
3755sub reload_perl() { 4022sub reload_perl() {
3756 # doing reload synchronously and two reloads happen back-to-back, 4023 # doing reload synchronously and two reloads happen back-to-back,
3757 # coro crashes during coro_state_free->destroy here. 4024 # coro crashes during coro_state_free->destroy here.
3758 4025
4026 $RELOAD_WATCHER ||= cf::async {
4027 Coro::AIO::aio_wait cache_extensions;
4028
3759 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 4029 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3760 do_reload_perl; 4030 do_reload_perl;
3761 undef $RELOAD_WATCHER; 4031 undef $RELOAD_WATCHER;
4032 };
3762 }; 4033 };
3763} 4034}
3764 4035
3765register_command "reload" => sub { 4036register_command "reload" => sub {
3766 my ($who, $arg) = @_; 4037 my ($who, $arg) = @_;
3772 reload_perl; 4043 reload_perl;
3773 }; 4044 };
3774 } 4045 }
3775}; 4046};
3776 4047
3777unshift @INC, $LIBDIR; 4048#############################################################################
3778 4049
3779my $bug_warning = 0; 4050my $bug_warning = 0;
3780 4051
3781our @WAIT_FOR_TICK; 4052our @WAIT_FOR_TICK;
3782our @WAIT_FOR_TICK_BEGIN; 4053our @WAIT_FOR_TICK_BEGIN;
3783 4054
3784sub wait_for_tick { 4055sub wait_for_tick {
3785 return if tick_inhibit || $Coro::current == $Coro::main; 4056 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3786 4057
3787 my $signal = new Coro::Signal; 4058 my $signal = new Coro::Signal;
3788 push @WAIT_FOR_TICK, $signal; 4059 push @WAIT_FOR_TICK, $signal;
3789 $signal->wait; 4060 $signal->wait;
3790} 4061}
3791 4062
3792sub wait_for_tick_begin { 4063sub wait_for_tick_begin {
3793 return if tick_inhibit || $Coro::current == $Coro::main; 4064 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3794 4065
3795 my $signal = new Coro::Signal; 4066 my $signal = new Coro::Signal;
3796 push @WAIT_FOR_TICK_BEGIN, $signal; 4067 push @WAIT_FOR_TICK_BEGIN, $signal;
3797 $signal->wait; 4068 $signal->wait;
3798} 4069}
3804 return; 4075 return;
3805 } 4076 }
3806 4077
3807 cf::server_tick; # one server iteration 4078 cf::server_tick; # one server iteration
3808 4079
4080 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4081
3809 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4082 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3810 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4083 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3811 Coro::async_pool { 4084 Coro::async_pool {
3812 $Coro::current->{desc} = "runtime saver"; 4085 $Coro::current->{desc} = "runtime saver";
3813 write_runtime_sync 4086 write_runtime_sync
3814 or warn "ERROR: unable to write runtime file: $!"; 4087 or error "ERROR: unable to write runtime file: $!";
3815 }; 4088 };
3816 } 4089 }
3817 4090
3818 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4091 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3819 $sig->send; 4092 $sig->send;
3827 4100
3828 if (0) { 4101 if (0) {
3829 if ($NEXT_TICK) { 4102 if ($NEXT_TICK) {
3830 my $jitter = $TICK_START - $NEXT_TICK; 4103 my $jitter = $TICK_START - $NEXT_TICK;
3831 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4104 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3832 warn "jitter $JITTER\n";#d# 4105 debug "jitter $JITTER\n";#d#
3833 } 4106 }
3834 } 4107 }
3835} 4108}
3836 4109
3837{ 4110{
3838 # configure BDB 4111 # configure BDB
3839 4112
3840 BDB::min_parallel 8; 4113 BDB::min_parallel 16;
3841 BDB::max_poll_reqs $TICK * 0.1; 4114 BDB::max_poll_reqs $TICK * 0.1;
3842 $AnyEvent::BDB::WATCHER->priority (1); 4115 $AnyEvent::BDB::WATCHER->priority (1);
3843 4116
3844 unless ($DB_ENV) { 4117 unless ($DB_ENV) {
3845 $DB_ENV = BDB::db_env_create; 4118 $DB_ENV = BDB::db_env_create;
3925 LOG llevInfo, "[ABT] [suppressed]\n"; 4198 LOG llevInfo, "[ABT] [suppressed]\n";
3926 } 4199 }
3927} 4200}
3928 4201
3929# load additional modules 4202# load additional modules
3930use cf::pod; 4203require "cf/$_.pm" for @EXTRA_MODULES;
4204cf::_connect_to_perl_2;
3931 4205
3932END { cf::emergency_save } 4206END { cf::emergency_save }
3933 4207
39341 42081
3935 4209

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines