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.455 by root, Sat Sep 27 08:17:40 2008 UTC vs.
Revision 1.542 by root, Wed May 5 09:05:03 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;
1236
1237 $filename =~ s%/[^/]+$%%;
1238 aio_pathsync $filename if $cf::USE_FSYNC;
1192 } else { 1239 } else {
1193 warn "FATAL: $filename~: $!\n"; 1240 error "unable to save objects: $filename~: $!\n";
1194 } 1241 }
1195 } else { 1242 } else {
1196 aio_unlink $filename; 1243 aio_unlink $filename;
1197 aio_unlink "$filename.pst"; 1244 aio_unlink "$filename.pst";
1198 } 1245 }
1222 my $st = eval { Coro::Storable::thaw $av }; 1269 my $st = eval { Coro::Storable::thaw $av };
1223 $av = $st->{objs}; 1270 $av = $st->{objs};
1224 } 1271 }
1225 1272
1226 utf8::decode (my $decname = $filename); 1273 utf8::decode (my $decname = $filename);
1227 warn sprintf "loading %s (%d,%d)\n", 1274 trace sprintf "loading %s (%d,%d)\n",
1228 $decname, length $data, scalar @{$av || []}; 1275 $decname, length $data, scalar @{$av || []}
1276 if $VERBOSE_IO;
1229 1277
1230 ($data, $av) 1278 ($data, $av)
1231} 1279}
1232 1280
1233=head2 COMMAND CALLBACKS 1281=head2 COMMAND CALLBACKS
1289 my ($name, $cb) = @_; 1337 my ($name, $cb) = @_;
1290 1338
1291 $EXTICMD{$name} = $cb; 1339 $EXTICMD{$name} = $cb;
1292} 1340}
1293 1341
1342use File::Glob ();
1343
1294cf::player->attach ( 1344cf::player->attach (
1295 on_command => sub { 1345 on_unknown_command => sub {
1296 my ($pl, $name, $params) = @_; 1346 my ($pl, $name, $params) = @_;
1297 1347
1298 my $cb = $COMMAND{$name} 1348 my $cb = $COMMAND{$name}
1299 or return; 1349 or return;
1300 1350
1323 1373
1324 $pl->ext_reply ($reply, @reply) 1374 $pl->ext_reply ($reply, @reply)
1325 if $reply; 1375 if $reply;
1326 1376
1327 } else { 1377 } else {
1328 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1378 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1329 } 1379 }
1330 1380
1331 cf::override; 1381 cf::override;
1332 }, 1382 },
1333); 1383);
1334 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
1335sub load_extensions { 1398sub load_extensions {
1399 info "loading extensions...";
1400
1336 cf::sync_job { 1401 cf::sync_job {
1337 my %todo; 1402 my %todo;
1338 1403
1339 for my $path (<$LIBDIR/*.ext>) { 1404 for my $path (<$LIBDIR/*.ext>) {
1340 next unless -r $path; 1405 next unless -r $path;
1358 1423
1359 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1424 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1360 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1425 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1361 1426
1362 $ext{source} = 1427 $ext{source} =
1363 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1428 "package $pkg; use common::sense;\n"
1364 . "#line 1 \"$path\"\n{\n" 1429 . "#line 1 \"$path\"\n{\n"
1365 . $source 1430 . $source
1366 . "\n};\n1"; 1431 . "\n};\n1";
1367 1432
1368 $todo{$base} = \%ext; 1433 $todo{$base} = \%ext;
1369 } 1434 }
1370 1435
1436 my $pass = 0;
1371 my %done; 1437 my %done;
1372 while (%todo) { 1438 while (%todo) {
1373 my $progress; 1439 my $progress;
1374 1440
1441 ++$pass;
1442
1443 ext:
1375 while (my ($k, $v) = each %todo) { 1444 while (my ($k, $v) = each %todo) {
1376 for (split /,\s*/, $v->{meta}{depends}) { 1445 for (split /,\s*/, $v->{meta}{depends}) {
1377 goto skip 1446 next ext
1378 unless exists $done{$_}; 1447 unless exists $done{$_};
1379 } 1448 }
1380 1449
1381 warn "... loading '$k' into '$v->{pkg}'\n"; 1450 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1382 1451
1383 unless (eval $v->{source}) { 1452 my $active = eval $v->{source};
1453
1454 if (length $@) {
1384 my $msg = $@ ? "$v->{path}: $@\n" 1455 error "$v->{path}: $@\n";
1385 : "$v->{base}: extension inactive.\n";
1386 1456
1387 if (exists $v->{meta}{mandatory}) {
1388 warn $msg;
1389 cf::cleanup "mandatory extension failed to load, exiting."; 1457 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1390 } 1458 if exists $v->{meta}{mandatory};
1391 1459
1392 warn $msg; 1460 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1461 delete $todo{$k};
1462 } else {
1463 $done{$k} = delete $todo{$k};
1464 push @EXTS, $v->{pkg};
1465 $progress = 1;
1466
1467 info "$v->{base}: extension inactive.\n"
1468 unless $active;
1393 } 1469 }
1394
1395 $done{$k} = delete $todo{$k};
1396 push @EXTS, $v->{pkg};
1397 $progress = 1;
1398 } 1470 }
1399 1471
1400 skip: 1472 unless ($progress) {
1401 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1473 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1402 unless $progress; 1474
1475 while (my ($k, $v) = each %todo) {
1476 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1477 if exists $v->{meta}{mandatory};
1478 }
1479 }
1403 } 1480 }
1404 }; 1481 };
1405} 1482}
1406 1483
1407############################################################################# 1484#############################################################################
1491 $cf::PLAYER{$login} = $pl 1568 $cf::PLAYER{$login} = $pl
1492 } 1569 }
1493 } 1570 }
1494} 1571}
1495 1572
1573cf::player->attach (
1574 on_load => sub {
1575 my ($pl, $path) = @_;
1576
1577 # restore slots saved in save, below
1578 my $slots = delete $pl->{_slots};
1579
1580 $pl->ob->current_weapon ($slots->[0]);
1581 $pl->combat_ob ($slots->[1]);
1582 $pl->ranged_ob ($slots->[2]);
1583 },
1584);
1585
1496sub save($) { 1586sub save($) {
1497 my ($pl) = @_; 1587 my ($pl) = @_;
1498 1588
1499 return if $pl->{deny_save}; 1589 return if $pl->{deny_save};
1500 1590
1505 1595
1506 aio_mkdir playerdir $pl, 0770; 1596 aio_mkdir playerdir $pl, 0770;
1507 $pl->{last_save} = $cf::RUNTIME; 1597 $pl->{last_save} = $cf::RUNTIME;
1508 1598
1509 cf::get_slot 0.01; 1599 cf::get_slot 0.01;
1600
1601 # save slots, to be restored later
1602 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1510 1603
1511 $pl->save_pl ($path); 1604 $pl->save_pl ($path);
1512 cf::cede_to_tick; 1605 cf::cede_to_tick;
1513} 1606}
1514 1607
1551 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1644 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1552 1645
1553 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1646 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1554 $pl->deactivate; 1647 $pl->deactivate;
1555 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1648 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1556 $pl->ob->check_score;
1557 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1649 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1558 $pl->ns->destroy if $pl->ns; 1650 $pl->ns->destroy if $pl->ns;
1559 1651
1560 my $path = playerdir $pl; 1652 my $path = playerdir $pl;
1561 my $temp = "$path~$cf::RUNTIME~deleting~"; 1653 my $temp = "$path~$cf::RUNTIME~deleting~";
1616 \@logins 1708 \@logins
1617} 1709}
1618 1710
1619=item $player->maps 1711=item $player->maps
1620 1712
1713=item cf::player::maps $login
1714
1621Returns an arrayref of map paths that are private for this 1715Returns an arrayref of map paths that are private for this
1622player. May block. 1716player. May block.
1623 1717
1624=cut 1718=cut
1625 1719
1687=cut 1781=cut
1688 1782
1689sub find_by_path($) { 1783sub find_by_path($) {
1690 my ($path) = @_; 1784 my ($path) = @_;
1691 1785
1786 $path =~ s/^~[^\/]*//; # skip ~login
1787
1692 my ($match, $specificity); 1788 my ($match, $specificity);
1693 1789
1694 for my $region (list) { 1790 for my $region (list) {
1695 if ($region->{match} && $path =~ $region->{match}) { 1791 if ($region->{match} && $path =~ $region->{match}) {
1696 ($match, $specificity) = ($region, $region->specificity) 1792 ($match, $specificity) = ($region, $region->specificity)
1727 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1823 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1728 1824
1729 # mit "rum" bekleckern, nicht 1825 # mit "rum" bekleckern, nicht
1730 $self->_create_random_map ( 1826 $self->_create_random_map (
1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1827 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1828 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1829 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1734 $rmp->{exit_on_final_map}, 1830 $rmp->{exit_on_final_map},
1735 $rmp->{xsize}, $rmp->{ysize}, 1831 $rmp->{xsize}, $rmp->{ysize},
1736 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1832 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1737 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1833 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1752 1848
1753sub register { 1849sub register {
1754 my (undef, $regex, $prio) = @_; 1850 my (undef, $regex, $prio) = @_;
1755 my $pkg = caller; 1851 my $pkg = caller;
1756 1852
1757 no strict;
1758 push @{"$pkg\::ISA"}, __PACKAGE__; 1853 push @{"$pkg\::ISA"}, __PACKAGE__;
1759 1854
1760 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1855 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1761} 1856}
1762 1857
1763# also paths starting with '/' 1858# also paths starting with '/'
1764$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1859$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1765 1860
1766sub thawer_merge { 1861sub thawer_merge {
1767 my ($self, $merge) = @_; 1862 my ($self, $merge) = @_;
1768 1863
1769 # we have to keep some variables in memory intact 1864 # we have to keep some variables in memory intact
1867 1962
1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1963 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1869 "$UNIQUEDIR/$path" 1964 "$UNIQUEDIR/$path"
1870} 1965}
1871 1966
1872# and all this just because we cannot iterate over
1873# all maps in C++...
1874sub change_all_map_light {
1875 my ($change) = @_;
1876
1877 $_->change_map_light ($change)
1878 for grep $_->outdoor, values %cf::MAP;
1879}
1880
1881sub decay_objects { 1967sub decay_objects {
1882 my ($self) = @_; 1968 my ($self) = @_;
1883 1969
1884 return if $self->{deny_reset}; 1970 return if $self->{deny_reset};
1885 1971
1967sub find { 2053sub find {
1968 my ($path, $origin) = @_; 2054 my ($path, $origin) = @_;
1969 2055
1970 $path = normalise $path, $origin && $origin->path; 2056 $path = normalise $path, $origin && $origin->path;
1971 2057
1972 cf::lock_wait "map_data:$path";#d#remove 2058 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 cf::lock_wait "map_find:$path"; 2059 my $guard2 = cf::lock_acquire "map_find:$path";
1974 2060
1975 $cf::MAP{$path} || do { 2061 $cf::MAP{$path} || do {
1976 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1977 my $guard2 = cf::lock_acquire "map_find:$path";
1978
1979 my $map = new_from_path cf::map $path 2062 my $map = new_from_path cf::map $path
1980 or return; 2063 or return;
1981 2064
1982 $map->{last_save} = $cf::RUNTIME; 2065 $map->{last_save} = $cf::RUNTIME;
1983 2066
1995 2078
1996 $cf::MAP{$path} = $map 2079 $cf::MAP{$path} = $map
1997 } 2080 }
1998} 2081}
1999 2082
2000sub pre_load { } 2083sub pre_load { }
2001sub post_load { } 2084#sub post_load { } # XS
2002 2085
2003sub load { 2086sub load {
2004 my ($self) = @_; 2087 my ($self) = @_;
2005 2088
2006 local $self->{deny_reset} = 1; # loading can take a long time 2089 local $self->{deny_reset} = 1; # loading can take a long time
2051 unless ($self->{deny_activate}) { 2134 unless ($self->{deny_activate}) {
2052 $self->decay_objects; 2135 $self->decay_objects;
2053 $self->fix_auto_apply; 2136 $self->fix_auto_apply;
2054 $self->update_buttons; 2137 $self->update_buttons;
2055 cf::cede_to_tick; 2138 cf::cede_to_tick;
2056 $self->set_darkness_map;
2057 cf::cede_to_tick;
2058 $self->activate; 2139 $self->activate;
2059 } 2140 }
2060 2141
2061 $self->{last_save} = $cf::RUNTIME; 2142 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME); 2143 $self->last_access ($cf::RUNTIME);
2065 } 2146 }
2066 2147
2067 $self->post_load; 2148 $self->post_load;
2068} 2149}
2069 2150
2151# customize the map for a given player, i.e.
2152# return the _real_ map. used by e.g. per-player
2153# maps to change the path to ~playername/mappath
2070sub customise_for { 2154sub customise_for {
2071 my ($self, $ob) = @_; 2155 my ($self, $ob) = @_;
2072 2156
2073 return find "~" . $ob->name . "/" . $self->{path} 2157 return find "~" . $ob->name . "/" . $self->{path}
2074 if $self->per_player; 2158 if $self->per_player;
2090 or next; 2174 or next;
2091 $neigh = find $neigh, $map 2175 $neigh = find $neigh, $map
2092 or next; 2176 or next;
2093 $neigh->load; 2177 $neigh->load;
2094 2178
2179 # now find the diagonal neighbours
2095 push @neigh, 2180 push @neigh,
2096 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2181 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2097 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2182 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2098 } 2183 }
2099 2184
2106} 2191}
2107 2192
2108sub find_sync { 2193sub find_sync {
2109 my ($path, $origin) = @_; 2194 my ($path, $origin) = @_;
2110 2195
2111 cf::sync_job { find $path, $origin } 2196 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2197 if $Coro::current == $Coro::main;
2198
2199 find $path, $origin
2112} 2200}
2113 2201
2114sub do_load_sync { 2202sub do_load_sync {
2115 my ($map) = @_; 2203 my ($map) = @_;
2116 2204
2117 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2205 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2118 if $Coro::current == $Coro::main; 2206 if $Coro::current == $Coro::main;
2119 2207
2120 cf::sync_job { $map->load }; 2208 $map->load;
2121} 2209}
2122 2210
2123our %MAP_PREFETCH; 2211our %MAP_PREFETCH;
2124our $MAP_PREFETCHER = undef; 2212our $MAP_PREFETCHER = undef;
2125 2213
2151 $MAP_PREFETCHER->prio (6); 2239 $MAP_PREFETCHER->prio (6);
2152 2240
2153 () 2241 ()
2154} 2242}
2155 2243
2244# common code, used by both ->save and ->swapout
2156sub save { 2245sub _save {
2157 my ($self) = @_; 2246 my ($self) = @_;
2158
2159 my $lock = cf::lock_acquire "map_data:$self->{path}";
2160 2247
2161 $self->{last_save} = $cf::RUNTIME; 2248 $self->{last_save} = $cf::RUNTIME;
2162 2249
2163 return unless $self->dirty; 2250 return unless $self->dirty;
2164 2251
2184 } else { 2271 } else {
2185 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2272 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2186 } 2273 }
2187} 2274}
2188 2275
2276sub save {
2277 my ($self) = @_;
2278
2279 my $lock = cf::lock_acquire "map_data:$self->{path}";
2280
2281 $self->_save;
2282}
2283
2189sub swap_out { 2284sub swap_out {
2190 my ($self) = @_; 2285 my ($self) = @_;
2191 2286
2192 # save first because save cedes
2193 $self->save;
2194
2195 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2287 my $lock = cf::lock_acquire "map_data:$self->{path}";
2196 2288
2197 return if $self->players;
2198 return if $self->in_memory != cf::MAP_ACTIVE; 2289 return if $self->in_memory != cf::MAP_ACTIVE;
2199 return if $self->{deny_save}; 2290 return if $self->{deny_save};
2291 return if $self->players;
2200 2292
2293 # first deactivate the map and "unlink" it from the core
2294 $self->deactivate;
2295 $_->clear_links_to ($self) for values %cf::MAP;
2201 $self->in_memory (cf::MAP_SWAPPED); 2296 $self->in_memory (cf::MAP_SWAPPED);
2297
2298 # then atomically save
2299 $self->_save;
2300
2301 # then free the map
2302 $self->clear;
2303}
2304
2305sub reset_at {
2306 my ($self) = @_;
2307
2308 # TODO: safety, remove and allow resettable per-player maps
2309 return 1e99 if $self->{deny_reset};
2310
2311 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2312 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2313
2314 $time + $to
2315}
2316
2317sub should_reset {
2318 my ($self) = @_;
2319
2320 $self->reset_at <= $cf::RUNTIME
2321}
2322
2323sub reset {
2324 my ($self) = @_;
2325
2326 my $lock = cf::lock_acquire "map_data:$self->{path}";
2327
2328 return if $self->players;
2329
2330 cf::trace "resetting map ", $self->path, "\n";
2331
2332 $self->in_memory (cf::MAP_SWAPPED);
2333
2334 # need to save uniques path
2335 unless ($self->{deny_save}) {
2336 my $uniq = $self->uniq_path; utf8::encode $uniq;
2337
2338 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2339 if $uniq;
2340 }
2341
2342 delete $cf::MAP{$self->path};
2202 2343
2203 $self->deactivate; 2344 $self->deactivate;
2204 $_->clear_links_to ($self) for values %cf::MAP; 2345 $_->clear_links_to ($self) for values %cf::MAP;
2205 $self->clear; 2346 $self->clear;
2206}
2207
2208sub reset_at {
2209 my ($self) = @_;
2210
2211 # TODO: safety, remove and allow resettable per-player maps
2212 return 1e99 if $self->{deny_reset};
2213
2214 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2215 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2216
2217 $time + $to
2218}
2219
2220sub should_reset {
2221 my ($self) = @_;
2222
2223 $self->reset_at <= $cf::RUNTIME
2224}
2225
2226sub reset {
2227 my ($self) = @_;
2228
2229 my $lock = cf::lock_acquire "map_data:$self->{path}";
2230
2231 return if $self->players;
2232
2233 warn "resetting map ", $self->path;
2234
2235 $self->in_memory (cf::MAP_SWAPPED);
2236
2237 # need to save uniques path
2238 unless ($self->{deny_save}) {
2239 my $uniq = $self->uniq_path; utf8::encode $uniq;
2240
2241 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2242 if $uniq;
2243 }
2244
2245 delete $cf::MAP{$self->path};
2246
2247 $self->deactivate;
2248 $_->clear_links_to ($self) for values %cf::MAP;
2249 $self->clear;
2250 2347
2251 $self->unlink_save; 2348 $self->unlink_save;
2252 $self->destroy; 2349 $self->destroy;
2253} 2350}
2254 2351
2262 2359
2263 delete $cf::MAP{$self->path}; 2360 delete $cf::MAP{$self->path};
2264 2361
2265 $self->unlink_save; 2362 $self->unlink_save;
2266 2363
2267 bless $self, "cf::map"; 2364 bless $self, "cf::map::wrap";
2268 delete $self->{deny_reset}; 2365 delete $self->{deny_reset};
2269 $self->{deny_save} = 1; 2366 $self->{deny_save} = 1;
2270 $self->reset_timeout (1); 2367 $self->reset_timeout (1);
2271 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2368 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2272 2369
2329 : normalise $_ 2426 : normalise $_
2330 } @{ aio_readdir $UNIQUEDIR or [] } 2427 } @{ aio_readdir $UNIQUEDIR or [] }
2331 ] 2428 ]
2332} 2429}
2333 2430
2431=item cf::map::static_maps
2432
2433Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2434file in the shared directory excluding F</styles> and F</editor>). May
2435block.
2436
2437=cut
2438
2439sub static_maps() {
2440 my @dirs = "";
2441 my @maps;
2442
2443 while (@dirs) {
2444 my $dir = shift @dirs;
2445
2446 next if $dir eq "/styles" || $dir eq "/editor";
2447
2448 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2449 or return;
2450
2451 for (@$files) {
2452 s/\.map$// or next;
2453 utf8::decode $_;
2454 push @maps, "$dir/$_";
2455 }
2456
2457 push @dirs, map "$dir/$_", @$dirs;
2458 }
2459
2460 \@maps
2461}
2462
2334=back 2463=back
2335 2464
2336=head3 cf::object 2465=head3 cf::object
2337 2466
2338=cut 2467=cut
2403 2532
2404our $SAY_CHANNEL = { 2533our $SAY_CHANNEL = {
2405 id => "say", 2534 id => "say",
2406 title => "Map", 2535 title => "Map",
2407 reply => "say ", 2536 reply => "say ",
2408 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2537 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2409}; 2538};
2410 2539
2411our $CHAT_CHANNEL = { 2540our $CHAT_CHANNEL = {
2412 id => "chat", 2541 id => "chat",
2413 title => "Chat", 2542 title => "Chat",
2470 2599
2471Freezes the player and moves him/her to a special map (C<{link}>). 2600Freezes the player and moves him/her to a special map (C<{link}>).
2472 2601
2473The player should be reasonably safe there for short amounts of time (e.g. 2602The player should be reasonably safe there for short amounts of time (e.g.
2474for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2603for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2475though, as the palyer cannot control the character while it is on the link 2604though, as the player cannot control the character while it is on the link
2476map. 2605map.
2477 2606
2478Will never block. 2607Will never block.
2479 2608
2480=item $player_object->leave_link ($map, $x, $y) 2609=item $player_object->leave_link ($map, $x, $y)
2501sub cf::object::player::enter_link { 2630sub cf::object::player::enter_link {
2502 my ($self) = @_; 2631 my ($self) = @_;
2503 2632
2504 $self->deactivate_recursive; 2633 $self->deactivate_recursive;
2505 2634
2635 ++$self->{_link_recursion};
2636
2506 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2637 return if UNIVERSAL::isa $self->map, "ext::map_link";
2507 2638
2508 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2639 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2509 if $self->map && $self->map->{path} ne "{link}"; 2640 if $self->map && $self->map->{path} ne "{link}";
2510 2641
2511 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2642 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2512} 2643}
2513 2644
2514sub cf::object::player::leave_link { 2645sub cf::object::player::leave_link {
2515 my ($self, $map, $x, $y) = @_; 2646 my ($self, $map, $x, $y) = @_;
2516 2647
2533 ($x, $y) = (-1, -1) 2664 ($x, $y) = (-1, -1)
2534 unless (defined $x) && (defined $y); 2665 unless (defined $x) && (defined $y);
2535 2666
2536 # use -1 or undef as default coordinates, not 0, 0 2667 # use -1 or undef as default coordinates, not 0, 0
2537 ($x, $y) = ($map->enter_x, $map->enter_y) 2668 ($x, $y) = ($map->enter_x, $map->enter_y)
2538 if $x <=0 && $y <= 0; 2669 if $x <= 0 && $y <= 0;
2539 2670
2540 $map->load; 2671 $map->load;
2541 $map->load_neighbours; 2672 $map->load_neighbours;
2542 2673
2543 return unless $self->contr->active; 2674 return unless $self->contr->active;
2544 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2545 $self->activate_recursive;
2546 2675
2547 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2676 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2548 $self->enter_map ($map, $x, $y); 2677 if ($self->enter_map ($map, $x, $y)) {
2549} 2678 # entering was successful
2679 delete $self->{_link_recursion};
2680 # only activate afterwards, to support waiting in hooks
2681 $self->activate_recursive;
2682 }
2550 2683
2684}
2685
2551=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2686=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2552 2687
2553Moves the player to the given map-path and coordinates by first freezing 2688Moves the player to the given map-path and coordinates by first freezing
2554her, loading and preparing them map, calling the provided $check callback 2689her, loading and preparing them map, calling the provided $check callback
2555that has to return the map if sucecssful, and then unfreezes the player on 2690that has to return the map if sucecssful, and then unfreezes the player on
2556the new (success) or old (failed) map position. In either case, $done will 2691the new (success) or old (failed) map position. In either case, $done will
2563 2698
2564our $GOTOGEN; 2699our $GOTOGEN;
2565 2700
2566sub cf::object::player::goto { 2701sub cf::object::player::goto {
2567 my ($self, $path, $x, $y, $check, $done) = @_; 2702 my ($self, $path, $x, $y, $check, $done) = @_;
2703
2704 if ($self->{_link_recursion} >= $MAX_LINKS) {
2705 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2706 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2707 ($path, $x, $y) = @$EMERGENCY_POSITION;
2708 }
2568 2709
2569 # do generation counting so two concurrent goto's will be executed in-order 2710 # do generation counting so two concurrent goto's will be executed in-order
2570 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2711 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2571 2712
2572 $self->enter_link; 2713 $self->enter_link;
2596 my $map = eval { 2737 my $map = eval {
2597 my $map = defined $path ? cf::map::find $path : undef; 2738 my $map = defined $path ? cf::map::find $path : undef;
2598 2739
2599 if ($map) { 2740 if ($map) {
2600 $map = $map->customise_for ($self); 2741 $map = $map->customise_for ($self);
2601 $map = $check->($map) if $check && $map; 2742 $map = $check->($map, $x, $y, $self) if $check && $map;
2602 } else { 2743 } else {
2603 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2744 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2604 } 2745 }
2605 2746
2606 $map 2747 $map
2614 if ($gen == $self->{_goto_generation}) { 2755 if ($gen == $self->{_goto_generation}) {
2615 delete $self->{_goto_generation}; 2756 delete $self->{_goto_generation};
2616 $self->leave_link ($map, $x, $y); 2757 $self->leave_link ($map, $x, $y);
2617 } 2758 }
2618 2759
2619 $done->() if $done; 2760 $done->($self) if $done;
2620 })->prio (1); 2761 })->prio (1);
2621} 2762}
2622 2763
2623=item $player_object->enter_exit ($exit_object) 2764=item $player_object->enter_exit ($exit_object)
2624 2765
2717 $self->message ("Something went wrong deep within the deliantra server. " 2858 $self->message ("Something went wrong deep within the deliantra server. "
2718 . "I'll try to bring you back to the map you were before. " 2859 . "I'll try to bring you back to the map you were before. "
2719 . "Please report this to the dungeon master!", 2860 . "Please report this to the dungeon master!",
2720 cf::NDI_UNIQUE | cf::NDI_RED); 2861 cf::NDI_UNIQUE | cf::NDI_RED);
2721 2862
2722 warn "ERROR in enter_exit: $@"; 2863 error "ERROR in enter_exit: $@";
2723 $self->leave_link; 2864 $self->leave_link;
2724 } 2865 }
2725 })->prio (1); 2866 })->prio (1);
2726} 2867}
2727 2868
2739sub cf::client::send_drawinfo { 2880sub cf::client::send_drawinfo {
2740 my ($self, $text, $flags) = @_; 2881 my ($self, $text, $flags) = @_;
2741 2882
2742 utf8::encode $text; 2883 utf8::encode $text;
2743 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2884 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2885}
2886
2887=item $client->send_big_packet ($pkt)
2888
2889Like C<send_packet>, but tries to compress large packets, and fragments
2890them as required.
2891
2892=cut
2893
2894our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2895
2896sub cf::client::send_big_packet {
2897 my ($self, $pkt) = @_;
2898
2899 # try lzf for large packets
2900 $pkt = "lzf " . Compress::LZF::compress $pkt
2901 if 1024 <= length $pkt and $self->{can_lzf};
2902
2903 # split very large packets
2904 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2905 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2906 $pkt = "frag";
2907 }
2908
2909 $self->send_packet ($pkt);
2744} 2910}
2745 2911
2746=item $client->send_msg ($channel, $msg, $color, [extra...]) 2912=item $client->send_msg ($channel, $msg, $color, [extra...])
2747 2913
2748Send a drawinfo or msg packet to the client, formatting the msg for the 2914Send a drawinfo or msg packet to the client, formatting the msg for the
2752 2918
2753=cut 2919=cut
2754 2920
2755# non-persistent channels (usually the info channel) 2921# non-persistent channels (usually the info channel)
2756our %CHANNEL = ( 2922our %CHANNEL = (
2923 "c/motd" => {
2924 id => "infobox",
2925 title => "MOTD",
2926 reply => undef,
2927 tooltip => "The message of the day",
2928 },
2757 "c/identify" => { 2929 "c/identify" => {
2758 id => "infobox", 2930 id => "infobox",
2759 title => "Identify", 2931 title => "Identify",
2760 reply => undef, 2932 reply => undef,
2761 tooltip => "Items recently identified", 2933 tooltip => "Items recently identified",
2763 "c/examine" => { 2935 "c/examine" => {
2764 id => "infobox", 2936 id => "infobox",
2765 title => "Examine", 2937 title => "Examine",
2766 reply => undef, 2938 reply => undef,
2767 tooltip => "Signs and other items you examined", 2939 tooltip => "Signs and other items you examined",
2940 },
2941 "c/shopinfo" => {
2942 id => "infobox",
2943 title => "Shop Info",
2944 reply => undef,
2945 tooltip => "What your bargaining skill tells you about the shop",
2768 }, 2946 },
2769 "c/book" => { 2947 "c/book" => {
2770 id => "infobox", 2948 id => "infobox",
2771 title => "Book", 2949 title => "Book",
2772 reply => undef, 2950 reply => undef,
2788 id => "infobox", 2966 id => "infobox",
2789 title => "Body Parts", 2967 title => "Body Parts",
2790 reply => undef, 2968 reply => undef,
2791 tooltip => "Shows which body parts you posess and are available", 2969 tooltip => "Shows which body parts you posess and are available",
2792 }, 2970 },
2971 "c/statistics" => {
2972 id => "infobox",
2973 title => "Statistics",
2974 reply => undef,
2975 tooltip => "Shows your primary statistics",
2976 },
2793 "c/skills" => { 2977 "c/skills" => {
2794 id => "infobox", 2978 id => "infobox",
2795 title => "Skills", 2979 title => "Skills",
2796 reply => undef, 2980 reply => undef,
2797 tooltip => "Shows your experience per skill and item power", 2981 tooltip => "Shows your experience per skill and item power",
2982 },
2983 "c/shopitems" => {
2984 id => "infobox",
2985 title => "Shop Items",
2986 reply => undef,
2987 tooltip => "Shows the items currently for sale in this shop",
2988 },
2989 "c/resistances" => {
2990 id => "infobox",
2991 title => "Resistances",
2992 reply => undef,
2993 tooltip => "Shows your resistances",
2994 },
2995 "c/pets" => {
2996 id => "infobox",
2997 title => "Pets",
2998 reply => undef,
2999 tooltip => "Shows information abotu your pets/a specific pet",
3000 },
3001 "c/perceiveself" => {
3002 id => "infobox",
3003 title => "Perceive Self",
3004 reply => undef,
3005 tooltip => "You gained detailed knowledge about yourself",
2798 }, 3006 },
2799 "c/uptime" => { 3007 "c/uptime" => {
2800 id => "infobox", 3008 id => "infobox",
2801 title => "Uptime", 3009 title => "Uptime",
2802 reply => undef, 3010 reply => undef,
2812 id => "party", 3020 id => "party",
2813 title => "Party", 3021 title => "Party",
2814 reply => "gsay ", 3022 reply => "gsay ",
2815 tooltip => "Messages and chat related to your party", 3023 tooltip => "Messages and chat related to your party",
2816 }, 3024 },
3025 "c/death" => {
3026 id => "death",
3027 title => "Death",
3028 reply => undef,
3029 tooltip => "Reason for and more info about your most recent death",
3030 },
3031 "c/say" => $SAY_CHANNEL,
3032 "c/chat" => $CHAT_CHANNEL,
2817); 3033);
2818 3034
2819sub cf::client::send_msg { 3035sub cf::client::send_msg {
2820 my ($self, $channel, $msg, $color, @extra) = @_; 3036 my ($self, $channel, $msg, $color, @extra) = @_;
2821 3037
2826 3042
2827 # check predefined channels, for the benefit of C 3043 # check predefined channels, for the benefit of C
2828 if ($CHANNEL{$channel}) { 3044 if ($CHANNEL{$channel}) {
2829 $channel = $CHANNEL{$channel}; 3045 $channel = $CHANNEL{$channel};
2830 3046
2831 $self->ext_msg (channel_info => $channel) 3047 $self->ext_msg (channel_info => $channel);
2832 if $self->can_msg;
2833
2834 $channel = $channel->{id}; 3048 $channel = $channel->{id};
2835 3049
2836 } elsif (ref $channel) { 3050 } elsif (ref $channel) {
2837 # send meta info to client, if not yet sent 3051 # send meta info to client, if not yet sent
2838 unless (exists $self->{channel}{$channel->{id}}) { 3052 unless (exists $self->{channel}{$channel->{id}}) {
2839 $self->{channel}{$channel->{id}} = $channel; 3053 $self->{channel}{$channel->{id}} = $channel;
2840 $self->ext_msg (channel_info => $channel) 3054 $self->ext_msg (channel_info => $channel);
2841 if $self->can_msg;
2842 } 3055 }
2843 3056
2844 $channel = $channel->{id}; 3057 $channel = $channel->{id};
2845 } 3058 }
2846 3059
2847 return unless @extra || length $msg; 3060 return unless @extra || length $msg;
2848 3061
2849 if ($self->can_msg) {
2850 # default colour, mask it out 3062 # default colour, mask it out
2851 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3063 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2852 if $color & cf::NDI_DEF; 3064 if $color & cf::NDI_DEF;
2853 3065
2854 my $pkt = "msg " 3066 my $pkt = "msg "
2855 . $self->{json_coder}->encode ( 3067 . $self->{json_coder}->encode (
2856 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3068 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2857 ); 3069 );
2858 3070
2859 # try lzf for large packets
2860 $pkt = "lzf " . Compress::LZF::compress $pkt
2861 if 1024 <= length $pkt and $self->{can_lzf};
2862
2863 # split very large packets
2864 if (8192 < length $pkt and $self->{can_lzf}) {
2865 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2866 $pkt = "frag";
2867 }
2868
2869 $self->send_packet ($pkt); 3071 $self->send_big_packet ($pkt);
2870 } else {
2871 if ($color >= 0) {
2872 # replace some tags by gcfclient-compatible ones
2873 for ($msg) {
2874 1 while
2875 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2876 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2877 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2878 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2879 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2880 }
2881
2882 $color &= cf::NDI_COLOR_MASK;
2883
2884 utf8::encode $msg;
2885
2886 if (0 && $msg =~ /\[/) {
2887 # COMMAND/INFO
2888 $self->send_packet ("drawextinfo $color 10 8 $msg")
2889 } else {
2890 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2891 $self->send_packet ("drawinfo $color $msg")
2892 }
2893 }
2894 }
2895} 3072}
2896 3073
2897=item $client->ext_msg ($type, @msg) 3074=item $client->ext_msg ($type, @msg)
2898 3075
2899Sends an ext event to the client. 3076Sends an ext event to the client.
2902 3079
2903sub cf::client::ext_msg($$@) { 3080sub cf::client::ext_msg($$@) {
2904 my ($self, $type, @msg) = @_; 3081 my ($self, $type, @msg) = @_;
2905 3082
2906 if ($self->extcmd == 2) { 3083 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3084 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2908 } elsif ($self->extcmd == 1) { # TODO: remove 3085 } elsif ($self->extcmd == 1) { # TODO: remove
2909 push @msg, msgtype => "event_$type"; 3086 push @msg, msgtype => "event_$type";
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3087 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 } 3088 }
2912} 3089}
2913 3090
2914=item $client->ext_reply ($msgid, @msg) 3091=item $client->ext_reply ($msgid, @msg)
2915 3092
2919 3096
2920sub cf::client::ext_reply($$@) { 3097sub cf::client::ext_reply($$@) {
2921 my ($self, $id, @msg) = @_; 3098 my ($self, $id, @msg) = @_;
2922 3099
2923 if ($self->extcmd == 2) { 3100 if ($self->extcmd == 2) {
2924 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3101 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2925 } elsif ($self->extcmd == 1) { 3102 } elsif ($self->extcmd == 1) {
2926 #TODO: version 1, remove 3103 #TODO: version 1, remove
2927 unshift @msg, msgtype => "reply", msgid => $id; 3104 unshift @msg, msgtype => "reply", msgid => $id;
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3105 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2929 } 3106 }
2930} 3107}
2931 3108
2932=item $success = $client->query ($flags, "text", \&cb) 3109=item $success = $client->query ($flags, "text", \&cb)
2933 3110
3004 3181
3005 $ns->ext_reply ($reply, @reply) 3182 $ns->ext_reply ($reply, @reply)
3006 if $reply; 3183 if $reply;
3007 3184
3008 } else { 3185 } else {
3009 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3186 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3010 } 3187 }
3011 3188
3012 cf::override; 3189 cf::override;
3013 }, 3190 },
3014); 3191);
3034 3211
3035 $coro 3212 $coro
3036} 3213}
3037 3214
3038cf::client->attach ( 3215cf::client->attach (
3039 on_destroy => sub { 3216 on_client_destroy => sub {
3040 my ($ns) = @_; 3217 my ($ns) = @_;
3041 3218
3042 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3219 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3043 }, 3220 },
3044); 3221);
3060our $safe_hole = new Safe::Hole; 3237our $safe_hole = new Safe::Hole;
3061 3238
3062$SIG{FPE} = 'IGNORE'; 3239$SIG{FPE} = 'IGNORE';
3063 3240
3064$safe->permit_only (Opcode::opset qw( 3241$safe->permit_only (Opcode::opset qw(
3065 :base_core :base_mem :base_orig :base_math 3242 :base_core :base_mem :base_orig :base_math :base_loop
3066 grepstart grepwhile mapstart mapwhile 3243 grepstart grepwhile mapstart mapwhile
3067 sort time 3244 sort time
3068)); 3245));
3069 3246
3070# here we export the classes and methods available to script code 3247# here we export the classes and methods available to script code
3074The following functions and methods are available within a safe environment: 3251The following functions and methods are available within a safe environment:
3075 3252
3076 cf::object 3253 cf::object
3077 contr pay_amount pay_player map x y force_find force_add destroy 3254 contr pay_amount pay_player map x y force_find force_add destroy
3078 insert remove name archname title slaying race decrease split 3255 insert remove name archname title slaying race decrease split
3256 value
3079 3257
3080 cf::object::player 3258 cf::object::player
3081 player 3259 player
3082 3260
3083 cf::player 3261 cf::player
3089=cut 3267=cut
3090 3268
3091for ( 3269for (
3092 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3270 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3093 insert remove inv nrof name archname title slaying race 3271 insert remove inv nrof name archname title slaying race
3094 decrease split destroy change_exp)], 3272 decrease split destroy change_exp value msg lore send_msg)],
3095 ["cf::object::player" => qw(player)], 3273 ["cf::object::player" => qw(player)],
3096 ["cf::player" => qw(peaceful)], 3274 ["cf::player" => qw(peaceful send_msg)],
3097 ["cf::map" => qw(trigger)], 3275 ["cf::map" => qw(trigger)],
3098) { 3276) {
3099 no strict 'refs';
3100 my ($pkg, @funs) = @$_; 3277 my ($pkg, @funs) = @$_;
3101 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3278 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3102 for @funs; 3279 for @funs;
3103} 3280}
3104 3281
3119 3296
3120 my $qcode = $code; 3297 my $qcode = $code;
3121 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3298 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3122 $qcode =~ s/\n/\\n/g; 3299 $qcode =~ s/\n/\\n/g;
3123 3300
3301 %vars = (_dummy => 0) unless %vars;
3302
3303 my @res;
3124 local $_; 3304 local $_;
3125 local @safe::cf::_safe_eval_args = values %vars;
3126 3305
3127 my $eval = 3306 my $eval =
3128 "do {\n" 3307 "do {\n"
3129 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3308 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3130 . "#line 0 \"{$qcode}\"\n" 3309 . "#line 0 \"{$qcode}\"\n"
3131 . $code 3310 . $code
3132 . "\n}" 3311 . "\n}"
3133 ; 3312 ;
3134 3313
3314 if ($CFG{safe_eval}) {
3135 sub_generation_inc; 3315 sub_generation_inc;
3316 local @safe::cf::_safe_eval_args = values %vars;
3136 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3317 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3137 sub_generation_inc; 3318 sub_generation_inc;
3319 } else {
3320 local @cf::_safe_eval_args = values %vars;
3321 @res = wantarray ? eval eval : scalar eval $eval;
3322 }
3138 3323
3139 if ($@) { 3324 if ($@) {
3140 warn "$@"; 3325 warn "$@",
3141 warn "while executing safe code '$code'\n"; 3326 "while executing safe code '$code'\n",
3142 warn "with arguments " . (join " ", %vars) . "\n"; 3327 "with arguments " . (join " ", %vars) . "\n";
3143 } 3328 }
3144 3329
3145 wantarray ? @res : $res[0] 3330 wantarray ? @res : $res[0]
3146} 3331}
3147 3332
3161=cut 3346=cut
3162 3347
3163sub register_script_function { 3348sub register_script_function {
3164 my ($fun, $cb) = @_; 3349 my ($fun, $cb) = @_;
3165 3350
3166 no strict 'refs'; 3351 $fun = "safe::$fun" if $CFG{safe_eval};
3167 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3352 *$fun = $safe_hole->wrap ($cb);
3168} 3353}
3169 3354
3170=back 3355=back
3171 3356
3172=cut 3357=cut
3173 3358
3174############################################################################# 3359#############################################################################
3175# the server's init and main functions 3360# the server's init and main functions
3361
3362# async inc loader. yay.
3363sub inc_loader {
3364 my $mod = $_[1];
3365
3366 if (in_main && !tick_inhibit) {
3367 Carp::cluck "ERROR: attempted synchronous perl module load ($mod)";
3368 } else {
3369 debug "loading perl module $mod\n";
3370 }
3371
3372 # 1. find real file
3373 for my $dir (@ORIG_INC) {
3374 ref $dir and next;
3375 0 <= Coro::AIO::aio_load "$dir/$mod", my $data
3376 or next;
3377
3378 $data = "#line 1 $dir/$mod\n$data";
3379
3380 open my $fh, "<", \$data or die;
3381
3382 return $fh;
3383 }
3384
3385 ()
3386}
3387
3388sub init_inc {
3389 # save original @INC
3390 @ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC;
3391
3392 # make sure we can do scalar-opens
3393 open my $dummy, "<", \my $dummy2;
3394
3395 # execute some stuff so perl load's some of the core modules
3396 /Ü/ =~ /ü/i;
3397 eval { &Storable::nstore_fd };
3398
3399 @INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc.
3400
3401 debug "module loading will be asynchronous from this point on.";
3402}
3176 3403
3177sub load_facedata($) { 3404sub load_facedata($) {
3178 my ($path) = @_; 3405 my ($path) = @_;
3179 3406
3180 # HACK to clear player env face cache, we need some signal framework 3407 # HACK to clear player env face cache, we need some signal framework
3181 # for this (global event?) 3408 # for this (global event?)
3182 %ext::player_env::MUSIC_FACE_CACHE = (); 3409 %ext::player_env::MUSIC_FACE_CACHE = ();
3183 3410
3184 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3411 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3185 3412
3186 warn "loading facedata from $path\n"; 3413 trace "loading facedata from $path\n";
3187 3414
3188 my $facedata; 3415 my $facedata;
3189 0 < aio_load $path, $facedata 3416 0 < aio_load $path, $facedata
3190 or die "$path: $!"; 3417 or die "$path: $!";
3191 3418
3193 3420
3194 $facedata->{version} == 2 3421 $facedata->{version} == 2
3195 or cf::cleanup "$path: version mismatch, cannot proceed."; 3422 or cf::cleanup "$path: version mismatch, cannot proceed.";
3196 3423
3197 # patch in the exptable 3424 # patch in the exptable
3425 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3198 $facedata->{resource}{"res/exp_table"} = { 3426 $facedata->{resource}{"res/exp_table"} = {
3199 type => FT_RSRC, 3427 type => FT_RSRC,
3200 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3428 data => $exp_table,
3429 hash => (Digest::MD5::md5 $exp_table),
3201 }; 3430 };
3202 cf::cede_to_tick; 3431 cf::cede_to_tick;
3203 3432
3204 { 3433 {
3205 my $faces = $facedata->{faceinfo}; 3434 my $faces = $facedata->{faceinfo};
3207 while (my ($face, $info) = each %$faces) { 3436 while (my ($face, $info) = each %$faces) {
3208 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3437 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3209 3438
3210 cf::face::set_visibility $idx, $info->{visibility}; 3439 cf::face::set_visibility $idx, $info->{visibility};
3211 cf::face::set_magicmap $idx, $info->{magicmap}; 3440 cf::face::set_magicmap $idx, $info->{magicmap};
3212 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3441 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3213 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3442 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3214 3443
3215 cf::cede_to_tick; 3444 cf::cede_to_tick;
3216 } 3445 }
3217 3446
3218 while (my ($face, $info) = each %$faces) { 3447 while (my ($face, $info) = each %$faces) {
3223 3452
3224 if (my $smooth = cf::face::find $info->{smooth}) { 3453 if (my $smooth = cf::face::find $info->{smooth}) {
3225 cf::face::set_smooth $idx, $smooth; 3454 cf::face::set_smooth $idx, $smooth;
3226 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3455 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3227 } else { 3456 } else {
3228 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3457 error "smooth face '$info->{smooth}' not found for face '$face'";
3229 } 3458 }
3230 3459
3231 cf::cede_to_tick; 3460 cf::cede_to_tick;
3232 } 3461 }
3233 } 3462 }
3242 3471
3243 cf::anim::invalidate_all; # d'oh 3472 cf::anim::invalidate_all; # d'oh
3244 } 3473 }
3245 3474
3246 { 3475 {
3247 # TODO: for gcfclient pleasure, we should give resources
3248 # that gcfclient doesn't grok a >10000 face index.
3249 my $res = $facedata->{resource}; 3476 my $res = $facedata->{resource};
3250 3477
3251 while (my ($name, $info) = each %$res) { 3478 while (my ($name, $info) = each %$res) {
3252 if (defined $info->{type}) { 3479 if (defined $info->{type}) {
3253 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3480 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3254 my $data;
3255 3481
3256 if ($info->{type} & 1) { 3482 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3257 # prepend meta info
3258
3259 my $meta = $enc->encode ({
3260 name => $name,
3261 %{ $info->{meta} || {} },
3262 });
3263
3264 $data = pack "(w/a*)*", $meta, $info->{data};
3265 } else {
3266 $data = $info->{data};
3267 }
3268
3269 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3270 cf::face::set_type $idx, $info->{type}; 3483 cf::face::set_type $idx, $info->{type};
3271 } else { 3484 } else {
3272 $RESOURCE{$name} = $info; 3485 $RESOURCE{$name} = $info; # unused
3273 } 3486 }
3274 3487
3275 cf::cede_to_tick; 3488 cf::cede_to_tick;
3276 } 3489 }
3277 } 3490 }
3278 3491
3279 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3492 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3280 3493
3281 1 3494 1
3282} 3495}
3283
3284cf::global->attach (on_resource_update => sub {
3285 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3286 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3287
3288 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3289 my $sound = $soundconf->{compat}[$_]
3290 or next;
3291
3292 my $face = cf::face::find "sound/$sound->[1]";
3293 cf::sound::set $sound->[0] => $face;
3294 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3295 }
3296
3297 while (my ($k, $v) = each %{$soundconf->{event}}) {
3298 my $face = cf::face::find "sound/$v";
3299 cf::sound::set $k => $face;
3300 }
3301 }
3302});
3303 3496
3304register_exticmd fx_want => sub { 3497register_exticmd fx_want => sub {
3305 my ($ns, $want) = @_; 3498 my ($ns, $want) = @_;
3306 3499
3307 while (my ($k, $v) = each %$want) { 3500 while (my ($k, $v) = each %$want) {
3346sub reload_treasures { 3539sub reload_treasures {
3347 load_resource_file "$DATADIR/treasures" 3540 load_resource_file "$DATADIR/treasures"
3348 or die "unable to load treasurelists\n"; 3541 or die "unable to load treasurelists\n";
3349} 3542}
3350 3543
3544sub reload_sound {
3545 trace "loading sound config from $DATADIR/sound\n";
3546
3547 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3548 or die "$DATADIR/sound $!";
3549
3550 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3551
3552 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3553 my $sound = $soundconf->{compat}[$_]
3554 or next;
3555
3556 my $face = cf::face::find "sound/$sound->[1]";
3557 cf::sound::set $sound->[0] => $face;
3558 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3559 }
3560
3561 while (my ($k, $v) = each %{$soundconf->{event}}) {
3562 my $face = cf::face::find "sound/$v";
3563 cf::sound::set $k => $face;
3564 }
3565}
3566
3351sub reload_resources { 3567sub reload_resources {
3352 warn "reloading resource files...\n"; 3568 trace "reloading resource files...\n";
3353 3569
3354 reload_facedata; 3570 reload_facedata;
3571 reload_sound;
3355 reload_archetypes; 3572 reload_archetypes;
3356 reload_regions; 3573 reload_regions;
3357 reload_treasures; 3574 reload_treasures;
3358 3575
3359 warn "finished reloading resource files\n"; 3576 trace "finished reloading resource files\n";
3360} 3577}
3361 3578
3362sub reload_config { 3579sub reload_config {
3580 trace "reloading config file...\n";
3581
3363 open my $fh, "<:utf8", "$CONFDIR/config" 3582 open my $fh, "<:utf8", "$CONFDIR/config"
3364 or return; 3583 or return;
3365 3584
3366 local $/; 3585 local $/;
3367 *CFG = YAML::Load <$fh>; 3586 *CFG = YAML::XS::Load scalar <$fh>;
3368 3587
3369 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3588 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3370 3589
3371 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3590 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3372 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3591 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3373 3592
3374 if (exists $CFG{mlockall}) { 3593 if (exists $CFG{mlockall}) {
3376 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3595 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3377 and die "WARNING: m(un)lockall failed: $!\n"; 3596 and die "WARNING: m(un)lockall failed: $!\n";
3378 }; 3597 };
3379 warn $@ if $@; 3598 warn $@ if $@;
3380 } 3599 }
3600
3601 trace "finished reloading resource files\n";
3381} 3602}
3382 3603
3383sub pidfile() { 3604sub pidfile() {
3384 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3605 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3385 or die "$PIDFILE: $!"; 3606 or die "$PIDFILE: $!";
3397 3618
3398 seek $fh, 0, 0; 3619 seek $fh, 0, 0;
3399 print $fh $$; 3620 print $fh $$;
3400} 3621}
3401 3622
3623sub main_loop {
3624 trace "EV::loop starting\n";
3625 if (1) {
3626 EV::loop;
3627 }
3628 trace "EV::loop returned\n";
3629 goto &main_loop unless $REALLY_UNLOOP;
3630}
3631
3402sub main { 3632sub main {
3403 cf::init_globals; # initialise logging 3633 cf::init_globals; # initialise logging
3404 3634
3405 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3635 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3406 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3636 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3407 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3637 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3408 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3638 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3409
3410 cf::init_experience;
3411 cf::init_anim;
3412 cf::init_attackmess;
3413 cf::init_dynamic;
3414 cf::init_block;
3415 3639
3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3640 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3417 3641
3418 # we must not ever block the main coroutine 3642 # we must not ever block the main coroutine
3419 local $Coro::idle = sub { 3643 local $Coro::idle = sub {
3425 }; 3649 };
3426 3650
3427 evthread_start IO::AIO::poll_fileno; 3651 evthread_start IO::AIO::poll_fileno;
3428 3652
3429 cf::sync_job { 3653 cf::sync_job {
3654 init_inc;
3655
3656 cf::init_experience;
3657 cf::init_anim;
3658 cf::init_attackmess;
3659 cf::init_dynamic;
3660
3661 cf::load_settings;
3662 cf::load_materials;
3663
3430 reload_resources; 3664 reload_resources;
3431 reload_config; 3665 reload_config;
3432 db_init; 3666 db_init;
3433 3667
3434 cf::load_settings;
3435 cf::load_materials;
3436 cf::init_uuid; 3668 cf::init_uuid;
3437 cf::init_signals; 3669 cf::init_signals;
3438 cf::init_commands;
3439 cf::init_skills; 3670 cf::init_skills;
3440 3671
3441 cf::init_beforeplay; 3672 cf::init_beforeplay;
3442 3673
3443 atomic; 3674 atomic;
3445 load_extensions; 3676 load_extensions;
3446 3677
3447 utime time, time, $RUNTIMEFILE; 3678 utime time, time, $RUNTIMEFILE;
3448 3679
3449 # no (long-running) fork's whatsoever before this point(!) 3680 # no (long-running) fork's whatsoever before this point(!)
3681 use POSIX ();
3450 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3682 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3451 3683
3452 (pop @POST_INIT)->(0) while @POST_INIT; 3684 (pop @POST_INIT)->(0) while @POST_INIT;
3453 }; 3685 };
3454 3686
3455 EV::loop; 3687 cf::object::thawer::errors_are_fatal 0;
3688 info "parse errors in files are no longer fatal from this point on.\n";
3689
3690 my $free_main; $free_main = EV::idle sub {
3691 undef $free_main;
3692 undef &main; # free gobs of memory :)
3693 };
3694
3695 goto &main_loop;
3456} 3696}
3457 3697
3458############################################################################# 3698#############################################################################
3459# initialisation and cleanup 3699# initialisation and cleanup
3460 3700
3461# install some emergency cleanup handlers 3701# install some emergency cleanup handlers
3462BEGIN { 3702BEGIN {
3463 our %SIGWATCHER = (); 3703 our %SIGWATCHER = ();
3464 for my $signal (qw(INT HUP TERM)) { 3704 for my $signal (qw(INT HUP TERM)) {
3465 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3705 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3466 cf::cleanup "SIG$signal"; 3706 cf::cleanup "SIG$signal";
3467 }; 3707 };
3468 } 3708 }
3469} 3709}
3470 3710
3471sub write_runtime_sync { 3711sub write_runtime_sync {
3712 my $t0 = AE::time;
3713
3472 # first touch the runtime file to show we are still running: 3714 # first touch the runtime file to show we are still running:
3473 # the fsync below can take a very very long time. 3715 # the fsync below can take a very very long time.
3474 3716
3475 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3717 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3476 3718
3477 my $guard = cf::lock_acquire "write_runtime"; 3719 my $guard = cf::lock_acquire "write_runtime";
3478 3720
3479 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3721 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3480 or return; 3722 or return;
3481 3723
3482 my $value = $cf::RUNTIME + 90 + 10; 3724 my $value = $cf::RUNTIME + 90 + 10;
3483 # 10 is the runtime save interval, for a monotonic clock 3725 # 10 is the runtime save interval, for a monotonic clock
3484 # 60 allows for the watchdog to kill the server. 3726 # 60 allows for the watchdog to kill the server.
3497 or return; 3739 or return;
3498 3740
3499 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3741 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3500 and return; 3742 and return;
3501 3743
3502 warn "runtime file written.\n"; 3744 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3503 3745
3504 1 3746 1
3505} 3747}
3506 3748
3507our $uuid_lock; 3749our $uuid_lock;
3519 or return; 3761 or return;
3520 3762
3521 my $value = uuid_seq uuid_cur; 3763 my $value = uuid_seq uuid_cur;
3522 3764
3523 unless ($value) { 3765 unless ($value) {
3524 warn "cowardly refusing to write zero uuid value!\n"; 3766 info "cowardly refusing to write zero uuid value!\n";
3525 return; 3767 return;
3526 } 3768 }
3527 3769
3528 my $value = uuid_str $value + $uuid_skip; 3770 my $value = uuid_str $value + $uuid_skip;
3529 $uuid_skip = 0; 3771 $uuid_skip = 0;
3539 or return; 3781 or return;
3540 3782
3541 aio_rename "$uuid~", $uuid 3783 aio_rename "$uuid~", $uuid
3542 and return; 3784 and return;
3543 3785
3544 warn "uuid file written ($value).\n"; 3786 trace "uuid file written ($value).\n";
3545 3787
3546 1 3788 1
3547 3789
3548} 3790}
3549 3791
3555} 3797}
3556 3798
3557sub emergency_save() { 3799sub emergency_save() {
3558 my $freeze_guard = cf::freeze_mainloop; 3800 my $freeze_guard = cf::freeze_mainloop;
3559 3801
3560 warn "enter emergency perl save\n"; 3802 info "emergency_perl_save: enter\n";
3803
3804 # this is a trade-off: we want to be very quick here, so
3805 # save all maps without fsync, and later call a global sync
3806 # (which in turn might be very very slow)
3807 local $USE_FSYNC = 0;
3561 3808
3562 cf::sync_job { 3809 cf::sync_job {
3810 cf::write_runtime_sync; # external watchdog should not bark
3811
3563 # use a peculiar iteration method to avoid tripping on perl 3812 # use a peculiar iteration method to avoid tripping on perl
3564 # refcount bugs in for. also avoids problems with players 3813 # refcount bugs in for. also avoids problems with players
3565 # and maps saved/destroyed asynchronously. 3814 # and maps saved/destroyed asynchronously.
3566 warn "begin emergency player save\n"; 3815 info "emergency_perl_save: begin player save\n";
3567 for my $login (keys %cf::PLAYER) { 3816 for my $login (keys %cf::PLAYER) {
3568 my $pl = $cf::PLAYER{$login} or next; 3817 my $pl = $cf::PLAYER{$login} or next;
3569 $pl->valid or next; 3818 $pl->valid or next;
3570 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3819 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3571 $pl->save; 3820 $pl->save;
3572 } 3821 }
3573 warn "end emergency player save\n"; 3822 info "emergency_perl_save: end player save\n";
3574 3823
3575 warn "begin emergency map save\n"; 3824 cf::write_runtime_sync; # external watchdog should not bark
3825
3826 info "emergency_perl_save: begin map save\n";
3576 for my $path (keys %cf::MAP) { 3827 for my $path (keys %cf::MAP) {
3577 my $map = $cf::MAP{$path} or next; 3828 my $map = $cf::MAP{$path} or next;
3578 $map->valid or next; 3829 $map->valid or next;
3579 $map->save; 3830 $map->save;
3580 } 3831 }
3581 warn "end emergency map save\n"; 3832 info "emergency_perl_save: end map save\n";
3582 3833
3583 warn "begin emergency database checkpoint\n"; 3834 cf::write_runtime_sync; # external watchdog should not bark
3835
3836 info "emergency_perl_save: begin database checkpoint\n";
3584 BDB::db_env_txn_checkpoint $DB_ENV; 3837 BDB::db_env_txn_checkpoint $DB_ENV;
3585 warn "end emergency database checkpoint\n"; 3838 info "emergency_perl_save: end database checkpoint\n";
3586 3839
3587 warn "begin write uuid\n"; 3840 info "emergency_perl_save: begin write uuid\n";
3588 write_uuid_sync 1; 3841 write_uuid_sync 1;
3589 warn "end write uuid\n"; 3842 info "emergency_perl_save: end write uuid\n";
3843
3844 cf::write_runtime_sync; # external watchdog should not bark
3845
3846 trace "emergency_perl_save: syncing database to disk";
3847 BDB::db_env_txn_checkpoint $DB_ENV;
3848
3849 info "emergency_perl_save: starting sync\n";
3850 IO::AIO::aio_sync sub {
3851 info "emergency_perl_save: finished sync\n";
3852 };
3853
3854 cf::write_runtime_sync; # external watchdog should not bark
3855
3856 trace "emergency_perl_save: flushing outstanding aio requests";
3857 while (IO::AIO::nreqs || BDB::nreqs) {
3858 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3859 }
3860
3861 cf::write_runtime_sync; # external watchdog should not bark
3590 }; 3862 };
3591 3863
3592 warn "leave emergency perl save\n"; 3864 info "emergency_perl_save: leave\n";
3593} 3865}
3594 3866
3595sub post_cleanup { 3867sub post_cleanup {
3596 my ($make_core) = @_; 3868 my ($make_core) = @_;
3597 3869
3870 IO::AIO::flush;
3871
3598 warn Carp::longmess "post_cleanup backtrace" 3872 error Carp::longmess "post_cleanup backtrace"
3599 if $make_core; 3873 if $make_core;
3600 3874
3601 my $fh = pidfile; 3875 my $fh = pidfile;
3602 unlink $PIDFILE if <$fh> == $$; 3876 unlink $PIDFILE if <$fh> == $$;
3603} 3877}
3623 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3897 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3624 for my $name (keys %$leaf_symtab) { 3898 for my $name (keys %$leaf_symtab) {
3625 _gv_clear *{"$pkg$name"}; 3899 _gv_clear *{"$pkg$name"};
3626# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3900# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3627 } 3901 }
3628 warn "cleared package $pkg\n";#d#
3629} 3902}
3630 3903
3631sub do_reload_perl() { 3904sub do_reload_perl() {
3632 # can/must only be called in main 3905 # can/must only be called in main
3633 if ($Coro::current != $Coro::main) { 3906 if (in_main) {
3634 warn "can only reload from main coroutine"; 3907 error "can only reload from main coroutine";
3635 return; 3908 return;
3636 } 3909 }
3637 3910
3638 return if $RELOAD++; 3911 return if $RELOAD++;
3639 3912
3913 my $t1 = AE::time;
3914
3640 while ($RELOAD) { 3915 while ($RELOAD) {
3641 warn "reloading..."; 3916 info "reloading...";
3642 3917
3643 warn "entering sync_job"; 3918 trace "entering sync_job";
3644 3919
3645 cf::sync_job { 3920 cf::sync_job {
3646 cf::write_runtime_sync; # external watchdog should not bark
3647 cf::emergency_save; 3921 cf::emergency_save;
3648 cf::write_runtime_sync; # external watchdog should not bark
3649 3922
3650 warn "syncing database to disk";
3651 BDB::db_env_txn_checkpoint $DB_ENV;
3652
3653 # if anything goes wrong in here, we should simply crash as we already saved
3654
3655 warn "flushing outstanding aio requests";
3656 while (IO::AIO::nreqs || BDB::nreqs) {
3657 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3658 }
3659
3660 warn "cancelling all extension coros"; 3923 trace "cancelling all extension coros";
3661 $_->cancel for values %EXT_CORO; 3924 $_->cancel for values %EXT_CORO;
3662 %EXT_CORO = (); 3925 %EXT_CORO = ();
3663 3926
3664 warn "removing commands"; 3927 trace "removing commands";
3665 %COMMAND = (); 3928 %COMMAND = ();
3666 3929
3667 warn "removing ext/exti commands"; 3930 trace "removing ext/exti commands";
3668 %EXTCMD = (); 3931 %EXTCMD = ();
3669 %EXTICMD = (); 3932 %EXTICMD = ();
3670 3933
3671 warn "unloading/nuking all extensions"; 3934 trace "unloading/nuking all extensions";
3672 for my $pkg (@EXTS) { 3935 for my $pkg (@EXTS) {
3673 warn "... unloading $pkg"; 3936 trace "... unloading $pkg";
3674 3937
3675 if (my $cb = $pkg->can ("unload")) { 3938 if (my $cb = $pkg->can ("unload")) {
3676 eval { 3939 eval {
3677 $cb->($pkg); 3940 $cb->($pkg);
3678 1 3941 1
3679 } or warn "$pkg unloaded, but with errors: $@"; 3942 } or error "$pkg unloaded, but with errors: $@";
3680 } 3943 }
3681 3944
3682 warn "... clearing $pkg"; 3945 trace "... clearing $pkg";
3683 clear_package $pkg; 3946 clear_package $pkg;
3684 } 3947 }
3685 3948
3686 warn "unloading all perl modules loaded from $LIBDIR"; 3949 trace "unloading all perl modules loaded from $LIBDIR";
3687 while (my ($k, $v) = each %INC) { 3950 while (my ($k, $v) = each %INC) {
3688 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3951 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3689 3952
3690 warn "... unloading $k"; 3953 trace "... unloading $k";
3691 delete $INC{$k}; 3954 delete $INC{$k};
3692 3955
3693 $k =~ s/\.pm$//; 3956 $k =~ s/\.pm$//;
3694 $k =~ s/\//::/g; 3957 $k =~ s/\//::/g;
3695 3958
3698 } 3961 }
3699 3962
3700 clear_package $k; 3963 clear_package $k;
3701 } 3964 }
3702 3965
3703 warn "getting rid of safe::, as good as possible"; 3966 trace "getting rid of safe::, as good as possible";
3704 clear_package "safe::$_" 3967 clear_package "safe::$_"
3705 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3968 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3706 3969
3707 warn "unloading cf.pm \"a bit\""; 3970 trace "unloading cf.pm \"a bit\"";
3708 delete $INC{"cf.pm"}; 3971 delete $INC{"cf.pm"};
3709 delete $INC{"cf/pod.pm"}; 3972 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3710 3973
3711 # don't, removes xs symbols, too, 3974 # don't, removes xs symbols, too,
3712 # and global variables created in xs 3975 # and global variables created in xs
3713 #clear_package __PACKAGE__; 3976 #clear_package __PACKAGE__;
3714 3977
3715 warn "unload completed, starting to reload now"; 3978 info "unload completed, starting to reload now";
3716 3979
3717 warn "reloading cf.pm"; 3980 trace "reloading cf.pm";
3718 require cf; 3981 require cf;
3719 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3982 cf::_connect_to_perl_1;
3720 3983
3721 warn "loading config and database again"; 3984 trace "loading config and database again";
3722 cf::reload_config; 3985 cf::reload_config;
3723 3986
3724 warn "loading extensions"; 3987 trace "loading extensions";
3725 cf::load_extensions; 3988 cf::load_extensions;
3726 3989
3990 if ($REATTACH_ON_RELOAD) {
3727 warn "reattaching attachments to objects/players"; 3991 trace "reattaching attachments to objects/players";
3728 _global_reattach; # objects, sockets 3992 _global_reattach; # objects, sockets
3729 warn "reattaching attachments to maps"; 3993 trace "reattaching attachments to maps";
3730 reattach $_ for values %MAP; 3994 reattach $_ for values %MAP;
3731 warn "reattaching attachments to players"; 3995 trace "reattaching attachments to players";
3732 reattach $_ for values %PLAYER; 3996 reattach $_ for values %PLAYER;
3997 }
3733 3998
3734 warn "running post_load"; 3999 trace "running post_init jobs";
3735 (pop @POST_INIT)->(1) while @POST_INIT; 4000 (pop @POST_INIT)->(1) while @POST_INIT;
3736 4001
3737 warn "leaving sync_job"; 4002 trace "leaving sync_job";
3738 4003
3739 1 4004 1
3740 } or do { 4005 } or do {
3741 warn $@; 4006 error $@;
3742 cf::cleanup "error while reloading, exiting."; 4007 cf::cleanup "error while reloading, exiting.";
3743 }; 4008 };
3744 4009
3745 warn "reloaded"; 4010 info "reloaded";
3746 --$RELOAD; 4011 --$RELOAD;
3747 } 4012 }
4013
4014 $t1 = AE::time - $t1;
4015 info "reload completed in ${t1}s\n";
3748}; 4016};
3749 4017
3750our $RELOAD_WATCHER; # used only during reload 4018our $RELOAD_WATCHER; # used only during reload
3751 4019
3752sub reload_perl() { 4020sub reload_perl() {
3753 # doing reload synchronously and two reloads happen back-to-back, 4021 # doing reload synchronously and two reloads happen back-to-back,
3754 # coro crashes during coro_state_free->destroy here. 4022 # coro crashes during coro_state_free->destroy here.
3755 4023
4024 $RELOAD_WATCHER ||= cf::async {
4025 Coro::AIO::aio_wait cache_extensions;
4026
3756 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 4027 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3757 do_reload_perl; 4028 do_reload_perl;
3758 undef $RELOAD_WATCHER; 4029 undef $RELOAD_WATCHER;
4030 };
3759 }; 4031 };
3760} 4032}
3761 4033
3762register_command "reload" => sub { 4034register_command "reload" => sub {
3763 my ($who, $arg) = @_; 4035 my ($who, $arg) = @_;
3769 reload_perl; 4041 reload_perl;
3770 }; 4042 };
3771 } 4043 }
3772}; 4044};
3773 4045
3774unshift @INC, $LIBDIR; 4046#############################################################################
3775 4047
3776my $bug_warning = 0; 4048my $bug_warning = 0;
3777 4049
3778our @WAIT_FOR_TICK; 4050our @WAIT_FOR_TICK;
3779our @WAIT_FOR_TICK_BEGIN; 4051our @WAIT_FOR_TICK_BEGIN;
3780 4052
3781sub wait_for_tick { 4053sub wait_for_tick {
3782 return if tick_inhibit || $Coro::current == $Coro::main; 4054 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3783 4055
3784 my $signal = new Coro::Signal; 4056 my $signal = new Coro::Signal;
3785 push @WAIT_FOR_TICK, $signal; 4057 push @WAIT_FOR_TICK, $signal;
3786 $signal->wait; 4058 $signal->wait;
3787} 4059}
3788 4060
3789sub wait_for_tick_begin { 4061sub wait_for_tick_begin {
3790 return if tick_inhibit || $Coro::current == $Coro::main; 4062 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3791 4063
3792 my $signal = new Coro::Signal; 4064 my $signal = new Coro::Signal;
3793 push @WAIT_FOR_TICK_BEGIN, $signal; 4065 push @WAIT_FOR_TICK_BEGIN, $signal;
3794 $signal->wait; 4066 $signal->wait;
3795} 4067}
3801 return; 4073 return;
3802 } 4074 }
3803 4075
3804 cf::server_tick; # one server iteration 4076 cf::server_tick; # one server iteration
3805 4077
4078 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4079
3806 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4080 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3807 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4081 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3808 Coro::async_pool { 4082 Coro::async_pool {
3809 $Coro::current->{desc} = "runtime saver"; 4083 $Coro::current->{desc} = "runtime saver";
3810 write_runtime_sync 4084 write_runtime_sync
3811 or warn "ERROR: unable to write runtime file: $!"; 4085 or error "ERROR: unable to write runtime file: $!";
3812 }; 4086 };
3813 } 4087 }
3814 4088
3815 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4089 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3816 $sig->send; 4090 $sig->send;
3824 4098
3825 if (0) { 4099 if (0) {
3826 if ($NEXT_TICK) { 4100 if ($NEXT_TICK) {
3827 my $jitter = $TICK_START - $NEXT_TICK; 4101 my $jitter = $TICK_START - $NEXT_TICK;
3828 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4102 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3829 warn "jitter $JITTER\n";#d# 4103 debug "jitter $JITTER\n";#d#
3830 } 4104 }
3831 } 4105 }
3832} 4106}
3833 4107
3834{ 4108{
3835 # configure BDB 4109 # configure BDB
3836 4110
3837 BDB::min_parallel 8; 4111 BDB::min_parallel 16;
3838 BDB::max_poll_reqs $TICK * 0.1; 4112 BDB::max_poll_reqs $TICK * 0.1;
3839 $AnyEvent::BDB::WATCHER->priority (1); 4113 $AnyEvent::BDB::WATCHER->priority (1);
3840 4114
3841 unless ($DB_ENV) { 4115 unless ($DB_ENV) {
3842 $DB_ENV = BDB::db_env_create; 4116 $DB_ENV = BDB::db_env_create;
3922 LOG llevInfo, "[ABT] [suppressed]\n"; 4196 LOG llevInfo, "[ABT] [suppressed]\n";
3923 } 4197 }
3924} 4198}
3925 4199
3926# load additional modules 4200# load additional modules
3927use cf::pod; 4201require "cf/$_.pm" for @EXTRA_MODULES;
4202cf::_connect_to_perl_2;
3928 4203
3929END { cf::emergency_save } 4204END { cf::emergency_save }
3930 4205
39311 42061
3932 4207

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines