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.540 by root, Tue May 4 23:32:29 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines