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.546 by root, Thu May 6 22:57:49 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
197from wherever your confdir points to. 233from wherever your confdir points to.
198 234
199=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
200 236
201These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
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 thread
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
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
205=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
206 247
207This array contains the results of the last C<invoke ()> call. When 248This 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 249C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
209that call. 250that call.
210 251
252=item %cf::REFLECT
253
254Contains, for each (C++) class name, a hash reference with information
255about object members (methods, scalars, arrays and flags) and other
256metadata, which is useful for introspection.
257
211=back 258=back
212 259
213=cut 260=cut
214 261
215BEGIN { 262sub error(@) { LOG llevError, join "", @_ }
216 *CORE::GLOBAL::warn = sub { 263sub warn (@) { LOG llevWarn , join "", @_ }
264sub info (@) { LOG llevInfo , join "", @_ }
265sub debug(@) { LOG llevDebug, join "", @_ }
266sub trace(@) { LOG llevTrace, join "", @_ }
267
268$Coro::State::WARNHOOK = sub {
217 my $msg = join "", @_; 269 my $msg = join "", @_;
218 270
219 $msg .= "\n" 271 $msg .= "\n"
220 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
221 273
222 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 274 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
223 275
224 LOG llevError, $msg; 276 LOG llevWarn, $msg;
225 }; 277};
226}
227 278
228$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
229 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
230 281
231 if ($Coro::current == $Coro::main) {#d# 282 error Carp::longmess $_[0];
283
284 if (in_main) {#d#
232 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
233 return;#d# 286 return;#d#
234 }#d# 287 }#d#
235 288
236 # kill coroutine otherwise 289 # kill coroutine otherwise
237 warn Carp::longmess $_[0];
238 Coro::terminate 290 Coro::terminate
239}; 291};
240
241$SIG{__DIE__} = sub { }; #d#?
242 292
243@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
244@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
245@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
246@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 296@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
260)) { 310)) {
261 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
262} 312}
263 313
264$EV::DIED = sub { 314$EV::DIED = sub {
265 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
266}; 316};
267 317
268############################################################################# 318#############################################################################
269 319
270=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
328Wait until the given lock is available. See cf::lock_acquire. 378Wait until the given lock is available. See cf::lock_acquire.
329 379
330=item my $lock = cf::lock_acquire $string 380=item my $lock = cf::lock_acquire $string
331 381
332Wait until the given lock is available and then acquires it and returns 382Wait 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, 383a L<Guard> object. If the guard object gets destroyed (goes out of scope,
334for example when the coroutine gets canceled), the lock is automatically 384for example when the coroutine gets canceled), the lock is automatically
335returned. 385returned.
336 386
337Locks are *not* recursive, locking from the same coro twice results in a 387Locks are *not* recursive, locking from the same coro twice results in a
338deadlocked coro. 388deadlocked coro.
344 394
345Return true if the lock is currently active, i.e. somebody has locked it. 395Return true if the lock is currently active, i.e. somebody has locked it.
346 396
347=cut 397=cut
348 398
349our %LOCK; 399our $LOCKS = new Coro::SemaphoreSet;
350our %LOCKER;#d#
351 400
352sub lock_wait($) { 401sub lock_wait($) {
353 my ($key) = @_; 402 $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} 403}
367 404
368sub lock_acquire($) { 405sub lock_acquire($) {
369 my ($key) = @_; 406 $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} 407}
383 408
384sub lock_active($) { 409sub lock_active($) {
385 my ($key) = @_; 410 $LOCKS->count ($_[0]) < 1
386
387 ! ! $LOCK{$key}
388} 411}
389 412
390sub freeze_mainloop { 413sub freeze_mainloop {
391 tick_inhibit_inc; 414 tick_inhibit_inc;
392 415
393 Coro::guard \&tick_inhibit_dec; 416 &Guard::guard (\&tick_inhibit_dec);
394} 417}
395 418
396=item cf::periodic $interval, $cb 419=item cf::periodic $interval, $cb
397 420
398Like EV::periodic, but randomly selects a starting point so that the actions 421Like EV::periodic, but randomly selects a starting point so that the actions
399get spread over timer. 422get spread over time.
400 423
401=cut 424=cut
402 425
403sub periodic($$) { 426sub periodic($$) {
404 my ($interval, $cb) = @_; 427 my ($interval, $cb) = @_;
421 444
422=cut 445=cut
423 446
424our @SLOT_QUEUE; 447our @SLOT_QUEUE;
425our $SLOT_QUEUE; 448our $SLOT_QUEUE;
449our $SLOT_DECAY = 0.9;
426 450
427$SLOT_QUEUE->cancel if $SLOT_QUEUE; 451$SLOT_QUEUE->cancel if $SLOT_QUEUE;
428$SLOT_QUEUE = Coro::async { 452$SLOT_QUEUE = Coro::async {
429 $Coro::current->desc ("timeslot manager"); 453 $Coro::current->desc ("timeslot manager");
430 454
431 my $signal = new Coro::Signal; 455 my $signal = new Coro::Signal;
456 my $busy;
432 457
433 while () { 458 while () {
434 next_job: 459 next_job:
460
435 my $avail = cf::till_tick; 461 my $avail = cf::till_tick;
436 if ($avail > 0.01) { 462
437 for (0 .. $#SLOT_QUEUE) { 463 for (0 .. $#SLOT_QUEUE) {
438 if ($SLOT_QUEUE[$_][0] < $avail) { 464 if ($SLOT_QUEUE[$_][0] <= $avail) {
465 $busy = 0;
439 my $job = splice @SLOT_QUEUE, $_, 1, (); 466 my $job = splice @SLOT_QUEUE, $_, 1, ();
440 $job->[2]->send; 467 $job->[2]->send;
441 Coro::cede; 468 Coro::cede;
442 goto next_job; 469 goto next_job;
443 } 470 } else {
471 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
444 } 472 }
445 } 473 }
446 474
447 if (@SLOT_QUEUE) { 475 if (@SLOT_QUEUE) {
448 # we do not use wait_for_tick() as it returns immediately when tick is inactive 476 # we do not use wait_for_tick() as it returns immediately when tick is inactive
449 push @cf::WAIT_FOR_TICK, $signal; 477 push @cf::WAIT_FOR_TICK, $signal;
450 $signal->wait; 478 $signal->wait;
451 } else { 479 } else {
480 $busy = 0;
452 Coro::schedule; 481 Coro::schedule;
453 } 482 }
454 } 483 }
455}; 484};
456 485
457sub get_slot($;$$) { 486sub get_slot($;$$) {
458 return if tick_inhibit || $Coro::current == $Coro::main; 487 return if tick_inhibit || $Coro::current == $Coro::main;
459 488
460 my ($time, $pri, $name) = @_; 489 my ($time, $pri, $name) = @_;
461 490
462 $time = $TICK * .6 if $time > $TICK * .6; 491 $time = clamp $time, 0.01, $TICK * .6;
492
463 my $sig = new Coro::Signal; 493 my $sig = new Coro::Signal;
464 494
465 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 495 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
466 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 496 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
467 $SLOT_QUEUE->ready; 497 $SLOT_QUEUE->ready;
493=cut 523=cut
494 524
495sub sync_job(&) { 525sub sync_job(&) {
496 my ($job) = @_; 526 my ($job) = @_;
497 527
498 if ($Coro::current == $Coro::main) { 528 if (in_main) {
499 my $time = EV::time; 529 my $time = AE::time;
500 530
501 # this is the main coro, too bad, we have to block 531 # this is the main coro, too bad, we have to block
502 # till the operation succeeds, freezing the server :/ 532 # till the operation succeeds, freezing the server :/
503 533
504 LOG llevError, Carp::longmess "sync job";#d# 534 #LOG llevError, Carp::longmess "sync job";#d#
505 535
506 my $freeze_guard = freeze_mainloop; 536 my $freeze_guard = freeze_mainloop;
507 537
508 my $busy = 1; 538 my $busy = 1;
509 my @res; 539 my @res;
510 540
511 (async { 541 (async {
512 $Coro::current->desc ("sync job coro"); 542 $Coro::current->desc ("sync job coro");
513 @res = eval { $job->() }; 543 @res = eval { $job->() };
514 warn $@ if $@; 544 error $@ if $@;
515 undef $busy; 545 undef $busy;
516 })->prio (Coro::PRIO_MAX); 546 })->prio (Coro::PRIO_MAX);
517 547
518 while ($busy) { 548 while ($busy) {
519 if (Coro::nready) { 549 if (Coro::nready) {
521 } else { 551 } else {
522 EV::loop EV::LOOP_ONESHOT; 552 EV::loop EV::LOOP_ONESHOT;
523 } 553 }
524 } 554 }
525 555
526 my $time = EV::time - $time; 556 my $time = AE::time - $time;
527 557
528 $TICK_START += $time; # do not account sync jobs to server load 558 $TICK_START += $time; # do not account sync jobs to server load
529 559
530 wantarray ? @res : $res[0] 560 wantarray ? @res : $res[0]
531 } else { 561 } else {
575 reset_signals; 605 reset_signals;
576 &$cb 606 &$cb
577 }, @args; 607 }, @args;
578 608
579 wantarray ? @res : $res[-1] 609 wantarray ? @res : $res[-1]
610}
611
612sub objinfo {
613 (
614 "counter value" => cf::object::object_count,
615 "objects created" => cf::object::create_count,
616 "objects destroyed" => cf::object::destroy_count,
617 "freelist size" => cf::object::free_count,
618 "allocated objects" => cf::object::objects_size,
619 "active objects" => cf::object::actives_size,
620 )
580} 621}
581 622
582=item $coin = coin_from_name $name 623=item $coin = coin_from_name $name
583 624
584=cut 625=cut
621within each server. 662within each server.
622 663
623=cut 664=cut
624 665
625sub db_table($) { 666sub db_table($) {
667 cf::error "db_get called from main context"
668 if $Coro::current == $Coro::main;
669
626 my ($name) = @_; 670 my ($name) = @_;
627 my $db = BDB::db_create $DB_ENV; 671 my $db = BDB::db_create $DB_ENV;
628 672
629 eval { 673 eval {
630 $db->set_flags (BDB::CHKSUM); 674 $db->set_flags (BDB::CHKSUM);
640} 684}
641 685
642our $DB; 686our $DB;
643 687
644sub db_init { 688sub db_init {
645 cf::sync_job {
646 $DB ||= db_table "db"; 689 $DB ||= db_table "db";
647 };
648} 690}
649 691
650sub db_get($$) { 692sub db_get($$) {
651 my $key = "$_[0]/$_[1]"; 693 my $key = "$_[0]/$_[1]";
652 694
653 cf::sync_job { 695 cf::error "db_get called from main context"
696 if $Coro::current == $Coro::main;
697
654 BDB::db_get $DB, undef, $key, my $data; 698 BDB::db_get $DB, undef, $key, my $data;
655 699
656 $! ? () 700 $! ? ()
657 : $data 701 : $data
658 }
659} 702}
660 703
661sub db_put($$$) { 704sub db_put($$$) {
662 BDB::dbreq_pri 4; 705 BDB::dbreq_pri 4;
663 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 706 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
719 762
720 my $t1 = Time::HiRes::time; 763 my $t1 = Time::HiRes::time;
721 my $data = $process->(\@data); 764 my $data = $process->(\@data);
722 my $t2 = Time::HiRes::time; 765 my $t2 = Time::HiRes::time;
723 766
724 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 767 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
725 768
726 db_put cache => "$id/data", $data; 769 db_put cache => "$id/data", $data;
727 db_put cache => "$id/md5" , $md5; 770 db_put cache => "$id/md5" , $md5;
728 db_put cache => "$id/meta", $meta; 771 db_put cache => "$id/meta", $meta;
729 772
739 782
740=cut 783=cut
741 784
742sub datalog($@) { 785sub datalog($@) {
743 my ($type, %kv) = @_; 786 my ($type, %kv) = @_;
744 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 787 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
745} 788}
746 789
747=back 790=back
748 791
749=cut 792=cut
944 987
945 } elsif (exists $cb_id{$type}) { 988 } elsif (exists $cb_id{$type}) {
946 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 989 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
947 990
948 } elsif (ref $type) { 991 } elsif (ref $type) {
949 warn "attaching objects not supported, ignoring.\n"; 992 error "attaching objects not supported, ignoring.\n";
950 993
951 } else { 994 } else {
952 shift @arg; 995 shift @arg;
953 warn "attach argument '$type' not supported, ignoring.\n"; 996 error "attach argument '$type' not supported, ignoring.\n";
954 } 997 }
955 } 998 }
956} 999}
957 1000
958sub _object_attach { 1001sub _object_attach {
968 _attach $registry, $klass, @attach; 1011 _attach $registry, $klass, @attach;
969 } 1012 }
970 1013
971 $obj->{$name} = \%arg; 1014 $obj->{$name} = \%arg;
972 } else { 1015 } else {
973 warn "object uses attachment '$name' which is not available, postponing.\n"; 1016 info "object uses attachment '$name' which is not available, postponing.\n";
974 } 1017 }
975 1018
976 $obj->{_attachment}{$name} = undef; 1019 $obj->{_attachment}{$name} = undef;
977} 1020}
978 1021
1037 1080
1038 for (@$callbacks) { 1081 for (@$callbacks) {
1039 eval { &{$_->[1]} }; 1082 eval { &{$_->[1]} };
1040 1083
1041 if ($@) { 1084 if ($@) {
1042 warn "$@";
1043 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1085 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1044 override; 1086 override;
1045 } 1087 }
1046 1088
1047 return 1 if $override; 1089 return 1 if $override;
1048 } 1090 }
1127 for (@$attach) { 1169 for (@$attach) {
1128 my ($klass, @attach) = @$_; 1170 my ($klass, @attach) = @$_;
1129 _attach $registry, $klass, @attach; 1171 _attach $registry, $klass, @attach;
1130 } 1172 }
1131 } else { 1173 } else {
1132 warn "object uses attachment '$name' that is not available, postponing.\n"; 1174 info "object uses attachment '$name' that is not available, postponing.\n";
1133 } 1175 }
1134 } 1176 }
1135} 1177}
1136 1178
1137cf::attachable->attach ( 1179cf::attachable->attach (
1164 my ($filename, $rdata, $objs) = @_; 1206 my ($filename, $rdata, $objs) = @_;
1165 1207
1166 sync_job { 1208 sync_job {
1167 if (length $$rdata) { 1209 if (length $$rdata) {
1168 utf8::decode (my $decname = $filename); 1210 utf8::decode (my $decname = $filename);
1169 warn sprintf "saving %s (%d,%d)\n", 1211 trace sprintf "saving %s (%d,%d)\n",
1170 $decname, length $$rdata, scalar @$objs; 1212 $decname, length $$rdata, scalar @$objs
1213 if $VERBOSE_IO;
1171 1214
1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1215 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1173 aio_chmod $fh, SAVE_MODE; 1216 aio_chmod $fh, SAVE_MODE;
1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1217 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1175 aio_fsync $fh if $cf::USE_FSYNC; 1218 if ($cf::USE_FSYNC) {
1219 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;
1220 aio_fsync $fh;
1221 }
1176 aio_close $fh; 1222 aio_close $fh;
1177 1223
1178 if (@$objs) { 1224 if (@$objs) {
1179 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1225 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1180 aio_chmod $fh, SAVE_MODE; 1226 aio_chmod $fh, SAVE_MODE;
1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1227 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1182 aio_write $fh, 0, (length $data), $data, 0; 1228 aio_write $fh, 0, (length $data), $data, 0;
1183 aio_fsync $fh if $cf::USE_FSYNC; 1229 if ($cf::USE_FSYNC) {
1230 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;
1231 aio_fsync $fh;
1232 }
1184 aio_close $fh; 1233 aio_close $fh;
1185 aio_rename "$filename.pst~", "$filename.pst"; 1234 aio_rename "$filename.pst~", "$filename.pst";
1186 } 1235 }
1187 } else { 1236 } else {
1188 aio_unlink "$filename.pst"; 1237 aio_unlink "$filename.pst";
1189 } 1238 }
1190 1239
1191 aio_rename "$filename~", $filename; 1240 aio_rename "$filename~", $filename;
1241
1242 $filename =~ s%/[^/]+$%%;
1243 aio_pathsync $filename if $cf::USE_FSYNC;
1192 } else { 1244 } else {
1193 warn "FATAL: $filename~: $!\n"; 1245 error "unable to save objects: $filename~: $!\n";
1194 } 1246 }
1195 } else { 1247 } else {
1196 aio_unlink $filename; 1248 aio_unlink $filename;
1197 aio_unlink "$filename.pst"; 1249 aio_unlink "$filename.pst";
1198 } 1250 }
1222 my $st = eval { Coro::Storable::thaw $av }; 1274 my $st = eval { Coro::Storable::thaw $av };
1223 $av = $st->{objs}; 1275 $av = $st->{objs};
1224 } 1276 }
1225 1277
1226 utf8::decode (my $decname = $filename); 1278 utf8::decode (my $decname = $filename);
1227 warn sprintf "loading %s (%d,%d)\n", 1279 trace sprintf "loading %s (%d,%d)\n",
1228 $decname, length $data, scalar @{$av || []}; 1280 $decname, length $data, scalar @{$av || []}
1281 if $VERBOSE_IO;
1229 1282
1230 ($data, $av) 1283 ($data, $av)
1231} 1284}
1232 1285
1233=head2 COMMAND CALLBACKS 1286=head2 COMMAND CALLBACKS
1289 my ($name, $cb) = @_; 1342 my ($name, $cb) = @_;
1290 1343
1291 $EXTICMD{$name} = $cb; 1344 $EXTICMD{$name} = $cb;
1292} 1345}
1293 1346
1347use File::Glob ();
1348
1294cf::player->attach ( 1349cf::player->attach (
1295 on_command => sub { 1350 on_unknown_command => sub {
1296 my ($pl, $name, $params) = @_; 1351 my ($pl, $name, $params) = @_;
1297 1352
1298 my $cb = $COMMAND{$name} 1353 my $cb = $COMMAND{$name}
1299 or return; 1354 or return;
1300 1355
1323 1378
1324 $pl->ext_reply ($reply, @reply) 1379 $pl->ext_reply ($reply, @reply)
1325 if $reply; 1380 if $reply;
1326 1381
1327 } else { 1382 } else {
1328 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1383 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1329 } 1384 }
1330 1385
1331 cf::override; 1386 cf::override;
1332 }, 1387 },
1333); 1388);
1334 1389
1390# "readahead" all extensions
1391sub cache_extensions {
1392 my $grp = IO::AIO::aio_group;
1393
1394 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1395 for (grep /\.ext$/, @{$_[0]}) {
1396 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1397 }
1398 };
1399
1400 $grp
1401}
1402
1335sub load_extensions { 1403sub load_extensions {
1404 info "loading extensions...";
1405
1336 cf::sync_job { 1406 cf::sync_job {
1337 my %todo; 1407 my %todo;
1338 1408
1339 for my $path (<$LIBDIR/*.ext>) { 1409 for my $path (<$LIBDIR/*.ext>) {
1340 next unless -r $path; 1410 next unless -r $path;
1358 1428
1359 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1429 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1360 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1430 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1361 1431
1362 $ext{source} = 1432 $ext{source} =
1363 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1433 "package $pkg; use common::sense;\n"
1364 . "#line 1 \"$path\"\n{\n" 1434 . "#line 1 \"$path\"\n{\n"
1365 . $source 1435 . $source
1366 . "\n};\n1"; 1436 . "\n};\n1";
1367 1437
1368 $todo{$base} = \%ext; 1438 $todo{$base} = \%ext;
1369 } 1439 }
1370 1440
1441 my $pass = 0;
1371 my %done; 1442 my %done;
1372 while (%todo) { 1443 while (%todo) {
1373 my $progress; 1444 my $progress;
1374 1445
1446 ++$pass;
1447
1448 ext:
1375 while (my ($k, $v) = each %todo) { 1449 while (my ($k, $v) = each %todo) {
1376 for (split /,\s*/, $v->{meta}{depends}) { 1450 for (split /,\s*/, $v->{meta}{depends}) {
1377 goto skip 1451 next ext
1378 unless exists $done{$_}; 1452 unless exists $done{$_};
1379 } 1453 }
1380 1454
1381 warn "... loading '$k' into '$v->{pkg}'\n"; 1455 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1382 1456
1383 unless (eval $v->{source}) { 1457 my $active = eval $v->{source};
1458
1459 if (length $@) {
1384 my $msg = $@ ? "$v->{path}: $@\n" 1460 error "$v->{path}: $@\n";
1385 : "$v->{base}: extension inactive.\n";
1386 1461
1387 if (exists $v->{meta}{mandatory}) {
1388 warn $msg;
1389 cf::cleanup "mandatory extension failed to load, exiting."; 1462 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1390 } 1463 if exists $v->{meta}{mandatory};
1391 1464
1392 warn $msg; 1465 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1466 delete $todo{$k};
1467 } else {
1468 $done{$k} = delete $todo{$k};
1469 push @EXTS, $v->{pkg};
1470 $progress = 1;
1471
1472 info "$v->{base}: extension inactive.\n"
1473 unless $active;
1393 } 1474 }
1394
1395 $done{$k} = delete $todo{$k};
1396 push @EXTS, $v->{pkg};
1397 $progress = 1;
1398 } 1475 }
1399 1476
1400 skip: 1477 unless ($progress) {
1401 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1478 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1402 unless $progress; 1479
1480 while (my ($k, $v) = each %todo) {
1481 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1482 if exists $v->{meta}{mandatory};
1483 }
1484 }
1403 } 1485 }
1404 }; 1486 };
1405} 1487}
1406 1488
1407############################################################################# 1489#############################################################################
1491 $cf::PLAYER{$login} = $pl 1573 $cf::PLAYER{$login} = $pl
1492 } 1574 }
1493 } 1575 }
1494} 1576}
1495 1577
1578cf::player->attach (
1579 on_load => sub {
1580 my ($pl, $path) = @_;
1581
1582 # restore slots saved in save, below
1583 my $slots = delete $pl->{_slots};
1584
1585 $pl->ob->current_weapon ($slots->[0]);
1586 $pl->combat_ob ($slots->[1]);
1587 $pl->ranged_ob ($slots->[2]);
1588 },
1589);
1590
1496sub save($) { 1591sub save($) {
1497 my ($pl) = @_; 1592 my ($pl) = @_;
1498 1593
1499 return if $pl->{deny_save}; 1594 return if $pl->{deny_save};
1500 1595
1505 1600
1506 aio_mkdir playerdir $pl, 0770; 1601 aio_mkdir playerdir $pl, 0770;
1507 $pl->{last_save} = $cf::RUNTIME; 1602 $pl->{last_save} = $cf::RUNTIME;
1508 1603
1509 cf::get_slot 0.01; 1604 cf::get_slot 0.01;
1605
1606 # save slots, to be restored later
1607 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1510 1608
1511 $pl->save_pl ($path); 1609 $pl->save_pl ($path);
1512 cf::cede_to_tick; 1610 cf::cede_to_tick;
1513} 1611}
1514 1612
1551 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1649 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1552 1650
1553 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1651 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1554 $pl->deactivate; 1652 $pl->deactivate;
1555 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1653 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1556 $pl->ob->check_score;
1557 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1654 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1558 $pl->ns->destroy if $pl->ns; 1655 $pl->ns->destroy if $pl->ns;
1559 1656
1560 my $path = playerdir $pl; 1657 my $path = playerdir $pl;
1561 my $temp = "$path~$cf::RUNTIME~deleting~"; 1658 my $temp = "$path~$cf::RUNTIME~deleting~";
1616 \@logins 1713 \@logins
1617} 1714}
1618 1715
1619=item $player->maps 1716=item $player->maps
1620 1717
1718=item cf::player::maps $login
1719
1621Returns an arrayref of map paths that are private for this 1720Returns an arrayref of map paths that are private for this
1622player. May block. 1721player. May block.
1623 1722
1624=cut 1723=cut
1625 1724
1687=cut 1786=cut
1688 1787
1689sub find_by_path($) { 1788sub find_by_path($) {
1690 my ($path) = @_; 1789 my ($path) = @_;
1691 1790
1791 $path =~ s/^~[^\/]*//; # skip ~login
1792
1692 my ($match, $specificity); 1793 my ($match, $specificity);
1693 1794
1694 for my $region (list) { 1795 for my $region (list) {
1695 if ($region->{match} && $path =~ $region->{match}) { 1796 if ($region->{match} && $path =~ $region->{match}) {
1696 ($match, $specificity) = ($region, $region->specificity) 1797 ($match, $specificity) = ($region, $region->specificity)
1727 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1828 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1728 1829
1729 # mit "rum" bekleckern, nicht 1830 # mit "rum" bekleckern, nicht
1730 $self->_create_random_map ( 1831 $self->_create_random_map (
1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1832 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1833 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1834 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1734 $rmp->{exit_on_final_map}, 1835 $rmp->{exit_on_final_map},
1735 $rmp->{xsize}, $rmp->{ysize}, 1836 $rmp->{xsize}, $rmp->{ysize},
1736 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1837 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1737 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1838 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1752 1853
1753sub register { 1854sub register {
1754 my (undef, $regex, $prio) = @_; 1855 my (undef, $regex, $prio) = @_;
1755 my $pkg = caller; 1856 my $pkg = caller;
1756 1857
1757 no strict;
1758 push @{"$pkg\::ISA"}, __PACKAGE__; 1858 push @{"$pkg\::ISA"}, __PACKAGE__;
1759 1859
1760 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1860 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1761} 1861}
1762 1862
1763# also paths starting with '/' 1863# also paths starting with '/'
1764$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1864$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1765 1865
1766sub thawer_merge { 1866sub thawer_merge {
1767 my ($self, $merge) = @_; 1867 my ($self, $merge) = @_;
1768 1868
1769 # we have to keep some variables in memory intact 1869 # we have to keep some variables in memory intact
1774} 1874}
1775 1875
1776sub normalise { 1876sub normalise {
1777 my ($path, $base) = @_; 1877 my ($path, $base) = @_;
1778 1878
1779 $path = "$path"; # make sure its a string 1879 $path = "$path"; # make sure it's a string
1780 1880
1781 $path =~ s/\.map$//; 1881 $path =~ s/\.map$//;
1782 1882
1783 # map plan: 1883 # map plan:
1784 # 1884 #
1823 $self->init; # pass $1 etc. 1923 $self->init; # pass $1 etc.
1824 return $self; 1924 return $self;
1825 } 1925 }
1826 } 1926 }
1827 1927
1828 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1928 Carp::cluck "unable to resolve path '$path' (base '$base')";
1829 () 1929 ()
1830} 1930}
1831 1931
1832sub init { 1932sub init {
1833 my ($self) = @_; 1933 my ($self) = @_;
1865sub uniq_path { 1965sub uniq_path {
1866 my ($self) = @_; 1966 my ($self) = @_;
1867 1967
1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1968 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1869 "$UNIQUEDIR/$path" 1969 "$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} 1970}
1880 1971
1881sub decay_objects { 1972sub decay_objects {
1882 my ($self) = @_; 1973 my ($self) = @_;
1883 1974
1965 2056
1966sub find; 2057sub find;
1967sub find { 2058sub find {
1968 my ($path, $origin) = @_; 2059 my ($path, $origin) = @_;
1969 2060
2061 cf::cede_to_tick;
2062
1970 $path = normalise $path, $origin && $origin->path; 2063 $path = normalise $path, $origin && $origin->path;
1971 2064
1972 cf::lock_wait "map_data:$path";#d#remove 2065 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 cf::lock_wait "map_find:$path"; 2066 my $guard2 = cf::lock_acquire "map_find:$path";
1974 2067
1975 $cf::MAP{$path} || do { 2068 $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 2069 my $map = new_from_path cf::map $path
1980 or return; 2070 or return;
1981 2071
1982 $map->{last_save} = $cf::RUNTIME; 2072 $map->{last_save} = $cf::RUNTIME;
1983 2073
1995 2085
1996 $cf::MAP{$path} = $map 2086 $cf::MAP{$path} = $map
1997 } 2087 }
1998} 2088}
1999 2089
2000sub pre_load { } 2090sub pre_load { }
2001sub post_load { } 2091#sub post_load { } # XS
2002 2092
2003sub load { 2093sub load {
2004 my ($self) = @_; 2094 my ($self) = @_;
2005 2095
2006 local $self->{deny_reset} = 1; # loading can take a long time 2096 local $self->{deny_reset} = 1; # loading can take a long time
2051 unless ($self->{deny_activate}) { 2141 unless ($self->{deny_activate}) {
2052 $self->decay_objects; 2142 $self->decay_objects;
2053 $self->fix_auto_apply; 2143 $self->fix_auto_apply;
2054 $self->update_buttons; 2144 $self->update_buttons;
2055 cf::cede_to_tick; 2145 cf::cede_to_tick;
2056 $self->set_darkness_map;
2057 cf::cede_to_tick;
2058 $self->activate; 2146 $self->activate;
2059 } 2147 }
2060 2148
2061 $self->{last_save} = $cf::RUNTIME; 2149 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME); 2150 $self->last_access ($cf::RUNTIME);
2065 } 2153 }
2066 2154
2067 $self->post_load; 2155 $self->post_load;
2068} 2156}
2069 2157
2158# customize the map for a given player, i.e.
2159# return the _real_ map. used by e.g. per-player
2160# maps to change the path to ~playername/mappath
2070sub customise_for { 2161sub customise_for {
2071 my ($self, $ob) = @_; 2162 my ($self, $ob) = @_;
2072 2163
2073 return find "~" . $ob->name . "/" . $self->{path} 2164 return find "~" . $ob->name . "/" . $self->{path}
2074 if $self->per_player; 2165 if $self->per_player;
2090 or next; 2181 or next;
2091 $neigh = find $neigh, $map 2182 $neigh = find $neigh, $map
2092 or next; 2183 or next;
2093 $neigh->load; 2184 $neigh->load;
2094 2185
2186 # now find the diagonal neighbours
2095 push @neigh, 2187 push @neigh,
2096 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2188 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2097 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2189 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2098 } 2190 }
2099 2191
2106} 2198}
2107 2199
2108sub find_sync { 2200sub find_sync {
2109 my ($path, $origin) = @_; 2201 my ($path, $origin) = @_;
2110 2202
2111 cf::sync_job { find $path, $origin } 2203 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2204 if $Coro::current == $Coro::main;
2205
2206 find $path, $origin
2112} 2207}
2113 2208
2114sub do_load_sync { 2209sub do_load_sync {
2115 my ($map) = @_; 2210 my ($map) = @_;
2116 2211
2117 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2212 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2118 if $Coro::current == $Coro::main; 2213 if $Coro::current == $Coro::main;
2119 2214
2120 cf::sync_job { $map->load }; 2215 $map->load;
2121} 2216}
2122 2217
2123our %MAP_PREFETCH; 2218our %MAP_PREFETCH;
2124our $MAP_PREFETCHER = undef; 2219our $MAP_PREFETCHER = undef;
2125 2220
2151 $MAP_PREFETCHER->prio (6); 2246 $MAP_PREFETCHER->prio (6);
2152 2247
2153 () 2248 ()
2154} 2249}
2155 2250
2251# common code, used by both ->save and ->swapout
2156sub save { 2252sub _save {
2157 my ($self) = @_; 2253 my ($self) = @_;
2158
2159 my $lock = cf::lock_acquire "map_data:$self->{path}";
2160 2254
2161 $self->{last_save} = $cf::RUNTIME; 2255 $self->{last_save} = $cf::RUNTIME;
2162 2256
2163 return unless $self->dirty; 2257 return unless $self->dirty;
2164 2258
2184 } else { 2278 } else {
2185 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2279 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2186 } 2280 }
2187} 2281}
2188 2282
2283sub save {
2284 my ($self) = @_;
2285
2286 my $lock = cf::lock_acquire "map_data:$self->{path}";
2287
2288 $self->_save;
2289}
2290
2189sub swap_out { 2291sub swap_out {
2190 my ($self) = @_; 2292 my ($self) = @_;
2191 2293
2192 # save first because save cedes
2193 $self->save;
2194
2195 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2294 my $lock = cf::lock_acquire "map_data:$self->{path}";
2196 2295
2197 return if $self->players;
2198 return if $self->in_memory != cf::MAP_ACTIVE; 2296 return if $self->in_memory != cf::MAP_ACTIVE;
2199 return if $self->{deny_save}; 2297 return if $self->{deny_save};
2298 return if $self->players;
2200 2299
2300 # first deactivate the map and "unlink" it from the core
2301 $self->deactivate;
2302 $_->clear_links_to ($self) for values %cf::MAP;
2201 $self->in_memory (cf::MAP_SWAPPED); 2303 $self->in_memory (cf::MAP_SWAPPED);
2304
2305 # then atomically save
2306 $self->_save;
2307
2308 # then free the map
2309 $self->clear;
2310}
2311
2312sub reset_at {
2313 my ($self) = @_;
2314
2315 # TODO: safety, remove and allow resettable per-player maps
2316 return 1e99 if $self->{deny_reset};
2317
2318 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2319 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2320
2321 $time + $to
2322}
2323
2324sub should_reset {
2325 my ($self) = @_;
2326
2327 $self->reset_at <= $cf::RUNTIME
2328}
2329
2330sub reset {
2331 my ($self) = @_;
2332
2333 my $lock = cf::lock_acquire "map_data:$self->{path}";
2334
2335 return if $self->players;
2336
2337 cf::trace "resetting map ", $self->path, "\n";
2338
2339 $self->in_memory (cf::MAP_SWAPPED);
2340
2341 # need to save uniques path
2342 unless ($self->{deny_save}) {
2343 my $uniq = $self->uniq_path; utf8::encode $uniq;
2344
2345 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2346 if $uniq;
2347 }
2348
2349 delete $cf::MAP{$self->path};
2202 2350
2203 $self->deactivate; 2351 $self->deactivate;
2204 $_->clear_links_to ($self) for values %cf::MAP; 2352 $_->clear_links_to ($self) for values %cf::MAP;
2205 $self->clear; 2353 $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 2354
2251 $self->unlink_save; 2355 $self->unlink_save;
2252 $self->destroy; 2356 $self->destroy;
2253} 2357}
2254 2358
2262 2366
2263 delete $cf::MAP{$self->path}; 2367 delete $cf::MAP{$self->path};
2264 2368
2265 $self->unlink_save; 2369 $self->unlink_save;
2266 2370
2267 bless $self, "cf::map"; 2371 bless $self, "cf::map::wrap";
2268 delete $self->{deny_reset}; 2372 delete $self->{deny_reset};
2269 $self->{deny_save} = 1; 2373 $self->{deny_save} = 1;
2270 $self->reset_timeout (1); 2374 $self->reset_timeout (1);
2271 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2375 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2272 2376
2329 : normalise $_ 2433 : normalise $_
2330 } @{ aio_readdir $UNIQUEDIR or [] } 2434 } @{ aio_readdir $UNIQUEDIR or [] }
2331 ] 2435 ]
2332} 2436}
2333 2437
2438=item cf::map::static_maps
2439
2440Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2441file in the shared directory excluding F</styles> and F</editor>). May
2442block.
2443
2444=cut
2445
2446sub static_maps() {
2447 my @dirs = "";
2448 my @maps;
2449
2450 while (@dirs) {
2451 my $dir = shift @dirs;
2452
2453 next if $dir eq "/styles" || $dir eq "/editor";
2454
2455 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2456 or return;
2457
2458 for (@$files) {
2459 s/\.map$// or next;
2460 utf8::decode $_;
2461 push @maps, "$dir/$_";
2462 }
2463
2464 push @dirs, map "$dir/$_", @$dirs;
2465 }
2466
2467 \@maps
2468}
2469
2334=back 2470=back
2335 2471
2336=head3 cf::object 2472=head3 cf::object
2337 2473
2338=cut 2474=cut
2403 2539
2404our $SAY_CHANNEL = { 2540our $SAY_CHANNEL = {
2405 id => "say", 2541 id => "say",
2406 title => "Map", 2542 title => "Map",
2407 reply => "say ", 2543 reply => "say ",
2408 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2544 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2409}; 2545};
2410 2546
2411our $CHAT_CHANNEL = { 2547our $CHAT_CHANNEL = {
2412 id => "chat", 2548 id => "chat",
2413 title => "Chat", 2549 title => "Chat",
2470 2606
2471Freezes the player and moves him/her to a special map (C<{link}>). 2607Freezes the player and moves him/her to a special map (C<{link}>).
2472 2608
2473The player should be reasonably safe there for short amounts of time (e.g. 2609The 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, 2610for 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 2611though, as the player cannot control the character while it is on the link
2476map. 2612map.
2477 2613
2478Will never block. 2614Will never block.
2479 2615
2480=item $player_object->leave_link ($map, $x, $y) 2616=item $player_object->leave_link ($map, $x, $y)
2501sub cf::object::player::enter_link { 2637sub cf::object::player::enter_link {
2502 my ($self) = @_; 2638 my ($self) = @_;
2503 2639
2504 $self->deactivate_recursive; 2640 $self->deactivate_recursive;
2505 2641
2642 ++$self->{_link_recursion};
2643
2506 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2644 return if UNIVERSAL::isa $self->map, "ext::map_link";
2507 2645
2508 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2646 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2509 if $self->map && $self->map->{path} ne "{link}"; 2647 if $self->map && $self->map->{path} ne "{link}";
2510 2648
2511 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2649 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2512} 2650}
2513 2651
2514sub cf::object::player::leave_link { 2652sub cf::object::player::leave_link {
2515 my ($self, $map, $x, $y) = @_; 2653 my ($self, $map, $x, $y) = @_;
2516 2654
2533 ($x, $y) = (-1, -1) 2671 ($x, $y) = (-1, -1)
2534 unless (defined $x) && (defined $y); 2672 unless (defined $x) && (defined $y);
2535 2673
2536 # use -1 or undef as default coordinates, not 0, 0 2674 # use -1 or undef as default coordinates, not 0, 0
2537 ($x, $y) = ($map->enter_x, $map->enter_y) 2675 ($x, $y) = ($map->enter_x, $map->enter_y)
2538 if $x <=0 && $y <= 0; 2676 if $x <= 0 && $y <= 0;
2539 2677
2540 $map->load; 2678 $map->load;
2541 $map->load_neighbours; 2679 $map->load_neighbours;
2542 2680
2543 return unless $self->contr->active; 2681 return unless $self->contr->active;
2544 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2545 $self->activate_recursive;
2546 2682
2547 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2683 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2548 $self->enter_map ($map, $x, $y); 2684 if ($self->enter_map ($map, $x, $y)) {
2549} 2685 # entering was successful
2686 delete $self->{_link_recursion};
2687 # only activate afterwards, to support waiting in hooks
2688 $self->activate_recursive;
2689 }
2550 2690
2691}
2692
2551=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2693=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2552 2694
2553Moves the player to the given map-path and coordinates by first freezing 2695Moves the player to the given map-path and coordinates by first freezing
2554her, loading and preparing them map, calling the provided $check callback 2696her, loading and preparing them map, calling the provided $check callback
2555that has to return the map if sucecssful, and then unfreezes the player on 2697that 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 2698the new (success) or old (failed) map position. In either case, $done will
2563 2705
2564our $GOTOGEN; 2706our $GOTOGEN;
2565 2707
2566sub cf::object::player::goto { 2708sub cf::object::player::goto {
2567 my ($self, $path, $x, $y, $check, $done) = @_; 2709 my ($self, $path, $x, $y, $check, $done) = @_;
2710
2711 if ($self->{_link_recursion} >= $MAX_LINKS) {
2712 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2713 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2714 ($path, $x, $y) = @$EMERGENCY_POSITION;
2715 }
2568 2716
2569 # do generation counting so two concurrent goto's will be executed in-order 2717 # do generation counting so two concurrent goto's will be executed in-order
2570 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2718 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2571 2719
2572 $self->enter_link; 2720 $self->enter_link;
2596 my $map = eval { 2744 my $map = eval {
2597 my $map = defined $path ? cf::map::find $path : undef; 2745 my $map = defined $path ? cf::map::find $path : undef;
2598 2746
2599 if ($map) { 2747 if ($map) {
2600 $map = $map->customise_for ($self); 2748 $map = $map->customise_for ($self);
2601 $map = $check->($map) if $check && $map; 2749 $map = $check->($map, $x, $y, $self) if $check && $map;
2602 } else { 2750 } else {
2603 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2751 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2604 } 2752 }
2605 2753
2606 $map 2754 $map
2614 if ($gen == $self->{_goto_generation}) { 2762 if ($gen == $self->{_goto_generation}) {
2615 delete $self->{_goto_generation}; 2763 delete $self->{_goto_generation};
2616 $self->leave_link ($map, $x, $y); 2764 $self->leave_link ($map, $x, $y);
2617 } 2765 }
2618 2766
2619 $done->() if $done; 2767 $done->($self) if $done;
2620 })->prio (1); 2768 })->prio (1);
2621} 2769}
2622 2770
2623=item $player_object->enter_exit ($exit_object) 2771=item $player_object->enter_exit ($exit_object)
2624 2772
2717 $self->message ("Something went wrong deep within the deliantra server. " 2865 $self->message ("Something went wrong deep within the deliantra server. "
2718 . "I'll try to bring you back to the map you were before. " 2866 . "I'll try to bring you back to the map you were before. "
2719 . "Please report this to the dungeon master!", 2867 . "Please report this to the dungeon master!",
2720 cf::NDI_UNIQUE | cf::NDI_RED); 2868 cf::NDI_UNIQUE | cf::NDI_RED);
2721 2869
2722 warn "ERROR in enter_exit: $@"; 2870 error "ERROR in enter_exit: $@";
2723 $self->leave_link; 2871 $self->leave_link;
2724 } 2872 }
2725 })->prio (1); 2873 })->prio (1);
2726} 2874}
2727 2875
2739sub cf::client::send_drawinfo { 2887sub cf::client::send_drawinfo {
2740 my ($self, $text, $flags) = @_; 2888 my ($self, $text, $flags) = @_;
2741 2889
2742 utf8::encode $text; 2890 utf8::encode $text;
2743 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2891 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2892}
2893
2894=item $client->send_big_packet ($pkt)
2895
2896Like C<send_packet>, but tries to compress large packets, and fragments
2897them as required.
2898
2899=cut
2900
2901our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2902
2903sub cf::client::send_big_packet {
2904 my ($self, $pkt) = @_;
2905
2906 # try lzf for large packets
2907 $pkt = "lzf " . Compress::LZF::compress $pkt
2908 if 1024 <= length $pkt and $self->{can_lzf};
2909
2910 # split very large packets
2911 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2912 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2913 $pkt = "frag";
2914 }
2915
2916 $self->send_packet ($pkt);
2744} 2917}
2745 2918
2746=item $client->send_msg ($channel, $msg, $color, [extra...]) 2919=item $client->send_msg ($channel, $msg, $color, [extra...])
2747 2920
2748Send a drawinfo or msg packet to the client, formatting the msg for the 2921Send a drawinfo or msg packet to the client, formatting the msg for the
2752 2925
2753=cut 2926=cut
2754 2927
2755# non-persistent channels (usually the info channel) 2928# non-persistent channels (usually the info channel)
2756our %CHANNEL = ( 2929our %CHANNEL = (
2930 "c/motd" => {
2931 id => "infobox",
2932 title => "MOTD",
2933 reply => undef,
2934 tooltip => "The message of the day",
2935 },
2757 "c/identify" => { 2936 "c/identify" => {
2758 id => "infobox", 2937 id => "infobox",
2759 title => "Identify", 2938 title => "Identify",
2760 reply => undef, 2939 reply => undef,
2761 tooltip => "Items recently identified", 2940 tooltip => "Items recently identified",
2763 "c/examine" => { 2942 "c/examine" => {
2764 id => "infobox", 2943 id => "infobox",
2765 title => "Examine", 2944 title => "Examine",
2766 reply => undef, 2945 reply => undef,
2767 tooltip => "Signs and other items you examined", 2946 tooltip => "Signs and other items you examined",
2947 },
2948 "c/shopinfo" => {
2949 id => "infobox",
2950 title => "Shop Info",
2951 reply => undef,
2952 tooltip => "What your bargaining skill tells you about the shop",
2768 }, 2953 },
2769 "c/book" => { 2954 "c/book" => {
2770 id => "infobox", 2955 id => "infobox",
2771 title => "Book", 2956 title => "Book",
2772 reply => undef, 2957 reply => undef,
2788 id => "infobox", 2973 id => "infobox",
2789 title => "Body Parts", 2974 title => "Body Parts",
2790 reply => undef, 2975 reply => undef,
2791 tooltip => "Shows which body parts you posess and are available", 2976 tooltip => "Shows which body parts you posess and are available",
2792 }, 2977 },
2978 "c/statistics" => {
2979 id => "infobox",
2980 title => "Statistics",
2981 reply => undef,
2982 tooltip => "Shows your primary statistics",
2983 },
2793 "c/skills" => { 2984 "c/skills" => {
2794 id => "infobox", 2985 id => "infobox",
2795 title => "Skills", 2986 title => "Skills",
2796 reply => undef, 2987 reply => undef,
2797 tooltip => "Shows your experience per skill and item power", 2988 tooltip => "Shows your experience per skill and item power",
2989 },
2990 "c/shopitems" => {
2991 id => "infobox",
2992 title => "Shop Items",
2993 reply => undef,
2994 tooltip => "Shows the items currently for sale in this shop",
2995 },
2996 "c/resistances" => {
2997 id => "infobox",
2998 title => "Resistances",
2999 reply => undef,
3000 tooltip => "Shows your resistances",
3001 },
3002 "c/pets" => {
3003 id => "infobox",
3004 title => "Pets",
3005 reply => undef,
3006 tooltip => "Shows information abotu your pets/a specific pet",
3007 },
3008 "c/perceiveself" => {
3009 id => "infobox",
3010 title => "Perceive Self",
3011 reply => undef,
3012 tooltip => "You gained detailed knowledge about yourself",
2798 }, 3013 },
2799 "c/uptime" => { 3014 "c/uptime" => {
2800 id => "infobox", 3015 id => "infobox",
2801 title => "Uptime", 3016 title => "Uptime",
2802 reply => undef, 3017 reply => undef,
2812 id => "party", 3027 id => "party",
2813 title => "Party", 3028 title => "Party",
2814 reply => "gsay ", 3029 reply => "gsay ",
2815 tooltip => "Messages and chat related to your party", 3030 tooltip => "Messages and chat related to your party",
2816 }, 3031 },
3032 "c/death" => {
3033 id => "death",
3034 title => "Death",
3035 reply => undef,
3036 tooltip => "Reason for and more info about your most recent death",
3037 },
3038 "c/say" => $SAY_CHANNEL,
3039 "c/chat" => $CHAT_CHANNEL,
2817); 3040);
2818 3041
2819sub cf::client::send_msg { 3042sub cf::client::send_msg {
2820 my ($self, $channel, $msg, $color, @extra) = @_; 3043 my ($self, $channel, $msg, $color, @extra) = @_;
2821 3044
2826 3049
2827 # check predefined channels, for the benefit of C 3050 # check predefined channels, for the benefit of C
2828 if ($CHANNEL{$channel}) { 3051 if ($CHANNEL{$channel}) {
2829 $channel = $CHANNEL{$channel}; 3052 $channel = $CHANNEL{$channel};
2830 3053
2831 $self->ext_msg (channel_info => $channel) 3054 $self->ext_msg (channel_info => $channel);
2832 if $self->can_msg;
2833
2834 $channel = $channel->{id}; 3055 $channel = $channel->{id};
2835 3056
2836 } elsif (ref $channel) { 3057 } elsif (ref $channel) {
2837 # send meta info to client, if not yet sent 3058 # send meta info to client, if not yet sent
2838 unless (exists $self->{channel}{$channel->{id}}) { 3059 unless (exists $self->{channel}{$channel->{id}}) {
2839 $self->{channel}{$channel->{id}} = $channel; 3060 $self->{channel}{$channel->{id}} = $channel;
2840 $self->ext_msg (channel_info => $channel) 3061 $self->ext_msg (channel_info => $channel);
2841 if $self->can_msg;
2842 } 3062 }
2843 3063
2844 $channel = $channel->{id}; 3064 $channel = $channel->{id};
2845 } 3065 }
2846 3066
2847 return unless @extra || length $msg; 3067 return unless @extra || length $msg;
2848 3068
2849 if ($self->can_msg) {
2850 # default colour, mask it out 3069 # default colour, mask it out
2851 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3070 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2852 if $color & cf::NDI_DEF; 3071 if $color & cf::NDI_DEF;
2853 3072
2854 my $pkt = "msg " 3073 my $pkt = "msg "
2855 . $self->{json_coder}->encode ( 3074 . $self->{json_coder}->encode (
2856 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3075 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2857 ); 3076 );
2858 3077
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); 3078 $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} 3079}
2896 3080
2897=item $client->ext_msg ($type, @msg) 3081=item $client->ext_msg ($type, @msg)
2898 3082
2899Sends an ext event to the client. 3083Sends an ext event to the client.
2902 3086
2903sub cf::client::ext_msg($$@) { 3087sub cf::client::ext_msg($$@) {
2904 my ($self, $type, @msg) = @_; 3088 my ($self, $type, @msg) = @_;
2905 3089
2906 if ($self->extcmd == 2) { 3090 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3091 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2908 } elsif ($self->extcmd == 1) { # TODO: remove 3092 } elsif ($self->extcmd == 1) { # TODO: remove
2909 push @msg, msgtype => "event_$type"; 3093 push @msg, msgtype => "event_$type";
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3094 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 } 3095 }
2912} 3096}
2913 3097
2914=item $client->ext_reply ($msgid, @msg) 3098=item $client->ext_reply ($msgid, @msg)
2915 3099
2919 3103
2920sub cf::client::ext_reply($$@) { 3104sub cf::client::ext_reply($$@) {
2921 my ($self, $id, @msg) = @_; 3105 my ($self, $id, @msg) = @_;
2922 3106
2923 if ($self->extcmd == 2) { 3107 if ($self->extcmd == 2) {
2924 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3108 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2925 } elsif ($self->extcmd == 1) { 3109 } elsif ($self->extcmd == 1) {
2926 #TODO: version 1, remove 3110 #TODO: version 1, remove
2927 unshift @msg, msgtype => "reply", msgid => $id; 3111 unshift @msg, msgtype => "reply", msgid => $id;
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3112 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2929 } 3113 }
2930} 3114}
2931 3115
2932=item $success = $client->query ($flags, "text", \&cb) 3116=item $success = $client->query ($flags, "text", \&cb)
2933 3117
3004 3188
3005 $ns->ext_reply ($reply, @reply) 3189 $ns->ext_reply ($reply, @reply)
3006 if $reply; 3190 if $reply;
3007 3191
3008 } else { 3192 } else {
3009 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3193 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3010 } 3194 }
3011 3195
3012 cf::override; 3196 cf::override;
3013 }, 3197 },
3014); 3198);
3034 3218
3035 $coro 3219 $coro
3036} 3220}
3037 3221
3038cf::client->attach ( 3222cf::client->attach (
3039 on_destroy => sub { 3223 on_client_destroy => sub {
3040 my ($ns) = @_; 3224 my ($ns) = @_;
3041 3225
3042 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3226 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3043 }, 3227 },
3044); 3228);
3060our $safe_hole = new Safe::Hole; 3244our $safe_hole = new Safe::Hole;
3061 3245
3062$SIG{FPE} = 'IGNORE'; 3246$SIG{FPE} = 'IGNORE';
3063 3247
3064$safe->permit_only (Opcode::opset qw( 3248$safe->permit_only (Opcode::opset qw(
3065 :base_core :base_mem :base_orig :base_math 3249 :base_core :base_mem :base_orig :base_math :base_loop
3066 grepstart grepwhile mapstart mapwhile 3250 grepstart grepwhile mapstart mapwhile
3067 sort time 3251 sort time
3068)); 3252));
3069 3253
3070# here we export the classes and methods available to script code 3254# here we export the classes and methods available to script code
3074The following functions and methods are available within a safe environment: 3258The following functions and methods are available within a safe environment:
3075 3259
3076 cf::object 3260 cf::object
3077 contr pay_amount pay_player map x y force_find force_add destroy 3261 contr pay_amount pay_player map x y force_find force_add destroy
3078 insert remove name archname title slaying race decrease split 3262 insert remove name archname title slaying race decrease split
3263 value
3079 3264
3080 cf::object::player 3265 cf::object::player
3081 player 3266 player
3082 3267
3083 cf::player 3268 cf::player
3089=cut 3274=cut
3090 3275
3091for ( 3276for (
3092 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3277 ["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 3278 insert remove inv nrof name archname title slaying race
3094 decrease split destroy change_exp)], 3279 decrease split destroy change_exp value msg lore send_msg)],
3095 ["cf::object::player" => qw(player)], 3280 ["cf::object::player" => qw(player)],
3096 ["cf::player" => qw(peaceful)], 3281 ["cf::player" => qw(peaceful send_msg)],
3097 ["cf::map" => qw(trigger)], 3282 ["cf::map" => qw(trigger)],
3098) { 3283) {
3099 no strict 'refs';
3100 my ($pkg, @funs) = @$_; 3284 my ($pkg, @funs) = @$_;
3101 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3285 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3102 for @funs; 3286 for @funs;
3103} 3287}
3104 3288
3119 3303
3120 my $qcode = $code; 3304 my $qcode = $code;
3121 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3305 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3122 $qcode =~ s/\n/\\n/g; 3306 $qcode =~ s/\n/\\n/g;
3123 3307
3308 %vars = (_dummy => 0) unless %vars;
3309
3310 my @res;
3124 local $_; 3311 local $_;
3125 local @safe::cf::_safe_eval_args = values %vars;
3126 3312
3127 my $eval = 3313 my $eval =
3128 "do {\n" 3314 "do {\n"
3129 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3315 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3130 . "#line 0 \"{$qcode}\"\n" 3316 . "#line 0 \"{$qcode}\"\n"
3131 . $code 3317 . $code
3132 . "\n}" 3318 . "\n}"
3133 ; 3319 ;
3134 3320
3321 if ($CFG{safe_eval}) {
3135 sub_generation_inc; 3322 sub_generation_inc;
3323 local @safe::cf::_safe_eval_args = values %vars;
3136 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3324 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3137 sub_generation_inc; 3325 sub_generation_inc;
3326 } else {
3327 local @cf::_safe_eval_args = values %vars;
3328 @res = wantarray ? eval eval : scalar eval $eval;
3329 }
3138 3330
3139 if ($@) { 3331 if ($@) {
3140 warn "$@"; 3332 warn "$@",
3141 warn "while executing safe code '$code'\n"; 3333 "while executing safe code '$code'\n",
3142 warn "with arguments " . (join " ", %vars) . "\n"; 3334 "with arguments " . (join " ", %vars) . "\n";
3143 } 3335 }
3144 3336
3145 wantarray ? @res : $res[0] 3337 wantarray ? @res : $res[0]
3146} 3338}
3147 3339
3161=cut 3353=cut
3162 3354
3163sub register_script_function { 3355sub register_script_function {
3164 my ($fun, $cb) = @_; 3356 my ($fun, $cb) = @_;
3165 3357
3166 no strict 'refs'; 3358 $fun = "safe::$fun" if $CFG{safe_eval};
3167 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3359 *$fun = $safe_hole->wrap ($cb);
3168} 3360}
3169 3361
3170=back 3362=back
3171 3363
3172=cut 3364=cut
3181 # for this (global event?) 3373 # for this (global event?)
3182 %ext::player_env::MUSIC_FACE_CACHE = (); 3374 %ext::player_env::MUSIC_FACE_CACHE = ();
3183 3375
3184 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3376 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3185 3377
3186 warn "loading facedata from $path\n"; 3378 trace "loading facedata from $path\n";
3187 3379
3188 my $facedata;
3189 0 < aio_load $path, $facedata 3380 0 < aio_load $path, my $facedata
3190 or die "$path: $!"; 3381 or die "$path: $!";
3191 3382
3192 $facedata = Coro::Storable::thaw $facedata; 3383 $facedata = Coro::Storable::thaw $facedata;
3193 3384
3194 $facedata->{version} == 2 3385 $facedata->{version} == 2
3195 or cf::cleanup "$path: version mismatch, cannot proceed."; 3386 or cf::cleanup "$path: version mismatch, cannot proceed.";
3196 3387
3197 # patch in the exptable 3388 # patch in the exptable
3389 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3198 $facedata->{resource}{"res/exp_table"} = { 3390 $facedata->{resource}{"res/exp_table"} = {
3199 type => FT_RSRC, 3391 type => FT_RSRC,
3200 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3392 data => $exp_table,
3393 hash => (Digest::MD5::md5 $exp_table),
3201 }; 3394 };
3202 cf::cede_to_tick; 3395 cf::cede_to_tick;
3203 3396
3204 { 3397 {
3205 my $faces = $facedata->{faceinfo}; 3398 my $faces = $facedata->{faceinfo};
3207 while (my ($face, $info) = each %$faces) { 3400 while (my ($face, $info) = each %$faces) {
3208 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3401 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3209 3402
3210 cf::face::set_visibility $idx, $info->{visibility}; 3403 cf::face::set_visibility $idx, $info->{visibility};
3211 cf::face::set_magicmap $idx, $info->{magicmap}; 3404 cf::face::set_magicmap $idx, $info->{magicmap};
3212 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3405 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3213 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3406 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3214 3407
3215 cf::cede_to_tick; 3408 cf::cede_to_tick;
3216 } 3409 }
3217 3410
3218 while (my ($face, $info) = each %$faces) { 3411 while (my ($face, $info) = each %$faces) {
3223 3416
3224 if (my $smooth = cf::face::find $info->{smooth}) { 3417 if (my $smooth = cf::face::find $info->{smooth}) {
3225 cf::face::set_smooth $idx, $smooth; 3418 cf::face::set_smooth $idx, $smooth;
3226 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3419 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3227 } else { 3420 } else {
3228 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3421 error "smooth face '$info->{smooth}' not found for face '$face'";
3229 } 3422 }
3230 3423
3231 cf::cede_to_tick; 3424 cf::cede_to_tick;
3232 } 3425 }
3233 } 3426 }
3242 3435
3243 cf::anim::invalidate_all; # d'oh 3436 cf::anim::invalidate_all; # d'oh
3244 } 3437 }
3245 3438
3246 { 3439 {
3247 # TODO: for gcfclient pleasure, we should give resources
3248 # that gcfclient doesn't grok a >10000 face index.
3249 my $res = $facedata->{resource}; 3440 my $res = $facedata->{resource};
3250 3441
3251 while (my ($name, $info) = each %$res) { 3442 while (my ($name, $info) = each %$res) {
3252 if (defined $info->{type}) { 3443 if (defined $info->{type}) {
3253 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3444 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3254 my $data;
3255 3445
3256 if ($info->{type} & 1) { 3446 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}; 3447 cf::face::set_type $idx, $info->{type};
3271 } else { 3448 } else {
3272 $RESOURCE{$name} = $info; 3449 $RESOURCE{$name} = $info; # unused
3273 } 3450 }
3274 3451
3275 cf::cede_to_tick; 3452 cf::cede_to_tick;
3276 } 3453 }
3277 } 3454 }
3278 3455
3279 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3456 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3280 3457
3281 1 3458 1
3282} 3459}
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 3460
3304register_exticmd fx_want => sub { 3461register_exticmd fx_want => sub {
3305 my ($ns, $want) = @_; 3462 my ($ns, $want) = @_;
3306 3463
3307 while (my ($k, $v) = each %$want) { 3464 while (my ($k, $v) = each %$want) {
3346sub reload_treasures { 3503sub reload_treasures {
3347 load_resource_file "$DATADIR/treasures" 3504 load_resource_file "$DATADIR/treasures"
3348 or die "unable to load treasurelists\n"; 3505 or die "unable to load treasurelists\n";
3349} 3506}
3350 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_table;
3535 reload_materials;
3354 reload_facedata; 3536 reload_facedata;
3537 reload_sound;
3355 reload_archetypes; 3538 reload_archetypes;
3356 reload_regions; 3539 reload_regions;
3357 reload_treasures; 3540 reload_treasures;
3358 3541
3359 warn "finished reloading resource files\n"; 3542 trace "finished reloading resource files\n";
3360} 3543}
3361 3544
3362sub reload_config { 3545sub reload_config {
3363 open my $fh, "<:utf8", "$CONFDIR/config" 3546 trace "reloading config file...\n";
3364 or return;
3365 3547
3366 local $/; 3548 0 < aio_load "$CONFDIR/config", my $config
3549 or die "$CONFDIR/config: $!";
3550
3551 utf8::decode $config;
3552
3553 cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
3367 *CFG = YAML::Load <$fh>; 3554 *CFG = YAML::XS::Load $config;
3368 3555
3369 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3556 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3370 3557
3371 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3558 $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}; 3559 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3373 3560
3374 if (exists $CFG{mlockall}) { 3561 if (exists $CFG{mlockall}) {
3397 3584
3398 seek $fh, 0, 0; 3585 seek $fh, 0, 0;
3399 print $fh $$; 3586 print $fh $$;
3400} 3587}
3401 3588
3589sub main_loop {
3590 trace "EV::loop starting\n";
3591 if (1) {
3592 EV::loop;
3593 }
3594 trace "EV::loop returned\n";
3595 goto &main_loop unless $REALLY_UNLOOP;
3596}
3597
3402sub main { 3598sub main {
3403 cf::init_globals; # initialise logging 3599 cf::init_globals; # initialise logging
3404 3600
3405 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3601 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3406 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3602 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3407 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3603 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3408 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3604 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 3605
3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3606 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3417 3607
3418 # we must not ever block the main coroutine 3608 # we must not ever block the main coroutine
3419 local $Coro::idle = sub { 3609 local $Coro::idle = sub {
3425 }; 3615 };
3426 3616
3427 evthread_start IO::AIO::poll_fileno; 3617 evthread_start IO::AIO::poll_fileno;
3428 3618
3429 cf::sync_job { 3619 cf::sync_job {
3620 cf::incloader::init ();
3621
3622 cf::init_anim;
3623 cf::init_attackmess;
3624 cf::init_dynamic;
3625
3626 cf::load_settings;
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