ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.454 by root, Thu Sep 25 12:14:32 2008 UTC vs.
Revision 1.544 by root, Thu May 6 21:58:07 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines