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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines