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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines