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.547 by root, Sun May 9 22:51:13 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 {
562Coro::Storable. May, of course, block. Note that the executed sub may 592Coro::Storable. May, of course, block. Note that the executed sub may
563never block itself or use any form of event handling. 593never block itself or use any form of event handling.
564 594
565=cut 595=cut
566 596
597sub post_fork {
598 reset_signals;
599}
600
567sub fork_call(&@) { 601sub fork_call(&@) {
568 my ($cb, @args) = @_; 602 my ($cb, @args) = @_;
569 603
570 # we seemingly have to make a local copy of the whole thing, 604 # we seemingly have to make a local copy of the whole thing,
571 # otherwise perl prematurely frees the stuff :/ 605 # otherwise perl prematurely frees the stuff :/
572 # TODO: investigate and fix (likely this will be rather laborious) 606 # TODO: investigate and fix (likely this will be rather laborious)
573 607
574 my @res = Coro::Util::fork_eval { 608 my @res = Coro::Util::fork_eval {
575 reset_signals; 609 cf::post_fork;
576 &$cb 610 &$cb
577 }, @args; 611 }, @args;
578 612
579 wantarray ? @res : $res[-1] 613 wantarray ? @res : $res[-1]
614}
615
616sub objinfo {
617 (
618 "counter value" => cf::object::object_count,
619 "objects created" => cf::object::create_count,
620 "objects destroyed" => cf::object::destroy_count,
621 "freelist size" => cf::object::free_count,
622 "allocated objects" => cf::object::objects_size,
623 "active objects" => cf::object::actives_size,
624 )
580} 625}
581 626
582=item $coin = coin_from_name $name 627=item $coin = coin_from_name $name
583 628
584=cut 629=cut
621within each server. 666within each server.
622 667
623=cut 668=cut
624 669
625sub db_table($) { 670sub db_table($) {
671 cf::error "db_get called from main context"
672 if $Coro::current == $Coro::main;
673
626 my ($name) = @_; 674 my ($name) = @_;
627 my $db = BDB::db_create $DB_ENV; 675 my $db = BDB::db_create $DB_ENV;
628 676
629 eval { 677 eval {
630 $db->set_flags (BDB::CHKSUM); 678 $db->set_flags (BDB::CHKSUM);
640} 688}
641 689
642our $DB; 690our $DB;
643 691
644sub db_init { 692sub db_init {
645 cf::sync_job {
646 $DB ||= db_table "db"; 693 $DB ||= db_table "db";
647 };
648} 694}
649 695
650sub db_get($$) { 696sub db_get($$) {
651 my $key = "$_[0]/$_[1]"; 697 my $key = "$_[0]/$_[1]";
652 698
653 cf::sync_job { 699 cf::error "db_get called from main context"
700 if $Coro::current == $Coro::main;
701
654 BDB::db_get $DB, undef, $key, my $data; 702 BDB::db_get $DB, undef, $key, my $data;
655 703
656 $! ? () 704 $! ? ()
657 : $data 705 : $data
658 }
659} 706}
660 707
661sub db_put($$$) { 708sub db_put($$$) {
662 BDB::dbreq_pri 4; 709 BDB::dbreq_pri 4;
663 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 710 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
719 766
720 my $t1 = Time::HiRes::time; 767 my $t1 = Time::HiRes::time;
721 my $data = $process->(\@data); 768 my $data = $process->(\@data);
722 my $t2 = Time::HiRes::time; 769 my $t2 = Time::HiRes::time;
723 770
724 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 771 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
725 772
726 db_put cache => "$id/data", $data; 773 db_put cache => "$id/data", $data;
727 db_put cache => "$id/md5" , $md5; 774 db_put cache => "$id/md5" , $md5;
728 db_put cache => "$id/meta", $meta; 775 db_put cache => "$id/meta", $meta;
729 776
739 786
740=cut 787=cut
741 788
742sub datalog($@) { 789sub datalog($@) {
743 my ($type, %kv) = @_; 790 my ($type, %kv) = @_;
744 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 791 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
745} 792}
746 793
747=back 794=back
748 795
749=cut 796=cut
944 991
945 } elsif (exists $cb_id{$type}) { 992 } elsif (exists $cb_id{$type}) {
946 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 993 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
947 994
948 } elsif (ref $type) { 995 } elsif (ref $type) {
949 warn "attaching objects not supported, ignoring.\n"; 996 error "attaching objects not supported, ignoring.\n";
950 997
951 } else { 998 } else {
952 shift @arg; 999 shift @arg;
953 warn "attach argument '$type' not supported, ignoring.\n"; 1000 error "attach argument '$type' not supported, ignoring.\n";
954 } 1001 }
955 } 1002 }
956} 1003}
957 1004
958sub _object_attach { 1005sub _object_attach {
968 _attach $registry, $klass, @attach; 1015 _attach $registry, $klass, @attach;
969 } 1016 }
970 1017
971 $obj->{$name} = \%arg; 1018 $obj->{$name} = \%arg;
972 } else { 1019 } else {
973 warn "object uses attachment '$name' which is not available, postponing.\n"; 1020 info "object uses attachment '$name' which is not available, postponing.\n";
974 } 1021 }
975 1022
976 $obj->{_attachment}{$name} = undef; 1023 $obj->{_attachment}{$name} = undef;
977} 1024}
978 1025
1037 1084
1038 for (@$callbacks) { 1085 for (@$callbacks) {
1039 eval { &{$_->[1]} }; 1086 eval { &{$_->[1]} };
1040 1087
1041 if ($@) { 1088 if ($@) {
1042 warn "$@";
1043 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1089 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1044 override; 1090 override;
1045 } 1091 }
1046 1092
1047 return 1 if $override; 1093 return 1 if $override;
1048 } 1094 }
1127 for (@$attach) { 1173 for (@$attach) {
1128 my ($klass, @attach) = @$_; 1174 my ($klass, @attach) = @$_;
1129 _attach $registry, $klass, @attach; 1175 _attach $registry, $klass, @attach;
1130 } 1176 }
1131 } else { 1177 } else {
1132 warn "object uses attachment '$name' that is not available, postponing.\n"; 1178 info "object uses attachment '$name' that is not available, postponing.\n";
1133 } 1179 }
1134 } 1180 }
1135} 1181}
1136 1182
1137cf::attachable->attach ( 1183cf::attachable->attach (
1164 my ($filename, $rdata, $objs) = @_; 1210 my ($filename, $rdata, $objs) = @_;
1165 1211
1166 sync_job { 1212 sync_job {
1167 if (length $$rdata) { 1213 if (length $$rdata) {
1168 utf8::decode (my $decname = $filename); 1214 utf8::decode (my $decname = $filename);
1169 warn sprintf "saving %s (%d,%d)\n", 1215 trace sprintf "saving %s (%d,%d)\n",
1170 $decname, length $$rdata, scalar @$objs; 1216 $decname, length $$rdata, scalar @$objs
1217 if $VERBOSE_IO;
1171 1218
1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1219 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1173 aio_chmod $fh, SAVE_MODE; 1220 aio_chmod $fh, SAVE_MODE;
1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1221 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1175 aio_fsync $fh if $cf::USE_FSYNC; 1222 if ($cf::USE_FSYNC) {
1223 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1224 aio_fsync $fh;
1225 }
1176 aio_close $fh; 1226 aio_close $fh;
1177 1227
1178 if (@$objs) { 1228 if (@$objs) {
1179 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1229 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1180 aio_chmod $fh, SAVE_MODE; 1230 aio_chmod $fh, SAVE_MODE;
1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1231 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1182 aio_write $fh, 0, (length $data), $data, 0; 1232 aio_write $fh, 0, (length $data), $data, 0;
1183 aio_fsync $fh if $cf::USE_FSYNC; 1233 if ($cf::USE_FSYNC) {
1234 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;
1235 aio_fsync $fh;
1236 }
1184 aio_close $fh; 1237 aio_close $fh;
1185 aio_rename "$filename.pst~", "$filename.pst"; 1238 aio_rename "$filename.pst~", "$filename.pst";
1186 } 1239 }
1187 } else { 1240 } else {
1188 aio_unlink "$filename.pst"; 1241 aio_unlink "$filename.pst";
1189 } 1242 }
1190 1243
1191 aio_rename "$filename~", $filename; 1244 aio_rename "$filename~", $filename;
1245
1246 $filename =~ s%/[^/]+$%%;
1247 aio_pathsync $filename if $cf::USE_FSYNC;
1192 } else { 1248 } else {
1193 warn "FATAL: $filename~: $!\n"; 1249 error "unable to save objects: $filename~: $!\n";
1194 } 1250 }
1195 } else { 1251 } else {
1196 aio_unlink $filename; 1252 aio_unlink $filename;
1197 aio_unlink "$filename.pst"; 1253 aio_unlink "$filename.pst";
1198 } 1254 }
1222 my $st = eval { Coro::Storable::thaw $av }; 1278 my $st = eval { Coro::Storable::thaw $av };
1223 $av = $st->{objs}; 1279 $av = $st->{objs};
1224 } 1280 }
1225 1281
1226 utf8::decode (my $decname = $filename); 1282 utf8::decode (my $decname = $filename);
1227 warn sprintf "loading %s (%d,%d)\n", 1283 trace sprintf "loading %s (%d,%d)\n",
1228 $decname, length $data, scalar @{$av || []}; 1284 $decname, length $data, scalar @{$av || []}
1285 if $VERBOSE_IO;
1229 1286
1230 ($data, $av) 1287 ($data, $av)
1231} 1288}
1232 1289
1233=head2 COMMAND CALLBACKS 1290=head2 COMMAND CALLBACKS
1289 my ($name, $cb) = @_; 1346 my ($name, $cb) = @_;
1290 1347
1291 $EXTICMD{$name} = $cb; 1348 $EXTICMD{$name} = $cb;
1292} 1349}
1293 1350
1351use File::Glob ();
1352
1294cf::player->attach ( 1353cf::player->attach (
1295 on_command => sub { 1354 on_unknown_command => sub {
1296 my ($pl, $name, $params) = @_; 1355 my ($pl, $name, $params) = @_;
1297 1356
1298 my $cb = $COMMAND{$name} 1357 my $cb = $COMMAND{$name}
1299 or return; 1358 or return;
1300 1359
1323 1382
1324 $pl->ext_reply ($reply, @reply) 1383 $pl->ext_reply ($reply, @reply)
1325 if $reply; 1384 if $reply;
1326 1385
1327 } else { 1386 } else {
1328 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1387 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1329 } 1388 }
1330 1389
1331 cf::override; 1390 cf::override;
1332 }, 1391 },
1333); 1392);
1334 1393
1394# "readahead" all extensions
1395sub cache_extensions {
1396 my $grp = IO::AIO::aio_group;
1397
1398 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1399 for (grep /\.ext$/, @{$_[0]}) {
1400 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1401 }
1402 };
1403
1404 $grp
1405}
1406
1335sub load_extensions { 1407sub load_extensions {
1408 info "loading extensions...";
1409
1336 cf::sync_job { 1410 cf::sync_job {
1337 my %todo; 1411 my %todo;
1338 1412
1339 for my $path (<$LIBDIR/*.ext>) { 1413 for my $path (<$LIBDIR/*.ext>) {
1340 next unless -r $path; 1414 next unless -r $path;
1358 1432
1359 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1433 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1360 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1434 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1361 1435
1362 $ext{source} = 1436 $ext{source} =
1363 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1437 "package $pkg; use common::sense;\n"
1364 . "#line 1 \"$path\"\n{\n" 1438 . "#line 1 \"$path\"\n{\n"
1365 . $source 1439 . $source
1366 . "\n};\n1"; 1440 . "\n};\n1";
1367 1441
1368 $todo{$base} = \%ext; 1442 $todo{$base} = \%ext;
1369 } 1443 }
1370 1444
1445 my $pass = 0;
1371 my %done; 1446 my %done;
1372 while (%todo) { 1447 while (%todo) {
1373 my $progress; 1448 my $progress;
1374 1449
1450 ++$pass;
1451
1452 ext:
1375 while (my ($k, $v) = each %todo) { 1453 while (my ($k, $v) = each %todo) {
1376 for (split /,\s*/, $v->{meta}{depends}) { 1454 for (split /,\s*/, $v->{meta}{depends}) {
1377 goto skip 1455 next ext
1378 unless exists $done{$_}; 1456 unless exists $done{$_};
1379 } 1457 }
1380 1458
1381 warn "... loading '$k' into '$v->{pkg}'\n"; 1459 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1382 1460
1383 unless (eval $v->{source}) { 1461 my $active = eval $v->{source};
1462
1463 if (length $@) {
1384 my $msg = $@ ? "$v->{path}: $@\n" 1464 error "$v->{path}: $@\n";
1385 : "$v->{base}: extension inactive.\n";
1386 1465
1387 if (exists $v->{meta}{mandatory}) {
1388 warn $msg;
1389 cf::cleanup "mandatory extension failed to load, exiting."; 1466 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1390 } 1467 if exists $v->{meta}{mandatory};
1391 1468
1392 warn $msg; 1469 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1470 delete $todo{$k};
1471 } else {
1472 $done{$k} = delete $todo{$k};
1473 push @EXTS, $v->{pkg};
1474 $progress = 1;
1475
1476 info "$v->{base}: extension inactive.\n"
1477 unless $active;
1393 } 1478 }
1394
1395 $done{$k} = delete $todo{$k};
1396 push @EXTS, $v->{pkg};
1397 $progress = 1;
1398 } 1479 }
1399 1480
1400 skip: 1481 unless ($progress) {
1401 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1482 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1402 unless $progress; 1483
1484 while (my ($k, $v) = each %todo) {
1485 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1486 if exists $v->{meta}{mandatory};
1487 }
1488 }
1403 } 1489 }
1404 }; 1490 };
1405} 1491}
1406 1492
1407############################################################################# 1493#############################################################################
1491 $cf::PLAYER{$login} = $pl 1577 $cf::PLAYER{$login} = $pl
1492 } 1578 }
1493 } 1579 }
1494} 1580}
1495 1581
1582cf::player->attach (
1583 on_load => sub {
1584 my ($pl, $path) = @_;
1585
1586 # restore slots saved in save, below
1587 my $slots = delete $pl->{_slots};
1588
1589 $pl->ob->current_weapon ($slots->[0]);
1590 $pl->combat_ob ($slots->[1]);
1591 $pl->ranged_ob ($slots->[2]);
1592 },
1593);
1594
1496sub save($) { 1595sub save($) {
1497 my ($pl) = @_; 1596 my ($pl) = @_;
1498 1597
1499 return if $pl->{deny_save}; 1598 return if $pl->{deny_save};
1500 1599
1505 1604
1506 aio_mkdir playerdir $pl, 0770; 1605 aio_mkdir playerdir $pl, 0770;
1507 $pl->{last_save} = $cf::RUNTIME; 1606 $pl->{last_save} = $cf::RUNTIME;
1508 1607
1509 cf::get_slot 0.01; 1608 cf::get_slot 0.01;
1609
1610 # save slots, to be restored later
1611 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1510 1612
1511 $pl->save_pl ($path); 1613 $pl->save_pl ($path);
1512 cf::cede_to_tick; 1614 cf::cede_to_tick;
1513} 1615}
1514 1616
1550 $pl->{deny_save} = 1; 1652 $pl->{deny_save} = 1;
1551 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1653 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1552 1654
1553 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1655 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1554 $pl->deactivate; 1656 $pl->deactivate;
1657
1555 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1658 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1556 $pl->ob->check_score; 1659 ext::highscore::check ($pl->ob);
1660
1557 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1661 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1558 $pl->ns->destroy if $pl->ns; 1662 $pl->ns->destroy if $pl->ns;
1559 1663
1560 my $path = playerdir $pl; 1664 my $path = playerdir $pl;
1561 my $temp = "$path~$cf::RUNTIME~deleting~"; 1665 my $temp = "$path~$cf::RUNTIME~deleting~";
1616 \@logins 1720 \@logins
1617} 1721}
1618 1722
1619=item $player->maps 1723=item $player->maps
1620 1724
1725=item cf::player::maps $login
1726
1621Returns an arrayref of map paths that are private for this 1727Returns an arrayref of map paths that are private for this
1622player. May block. 1728player. May block.
1623 1729
1624=cut 1730=cut
1625 1731
1687=cut 1793=cut
1688 1794
1689sub find_by_path($) { 1795sub find_by_path($) {
1690 my ($path) = @_; 1796 my ($path) = @_;
1691 1797
1798 $path =~ s/^~[^\/]*//; # skip ~login
1799
1692 my ($match, $specificity); 1800 my ($match, $specificity);
1693 1801
1694 for my $region (list) { 1802 for my $region (list) {
1695 if ($region->{match} && $path =~ $region->{match}) { 1803 if ($region->{match} && $path =~ $region->{match}) {
1696 ($match, $specificity) = ($region, $region->specificity) 1804 ($match, $specificity) = ($region, $region->specificity)
1727 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1835 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1728 1836
1729 # mit "rum" bekleckern, nicht 1837 # mit "rum" bekleckern, nicht
1730 $self->_create_random_map ( 1838 $self->_create_random_map (
1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1839 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1840 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1841 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1734 $rmp->{exit_on_final_map}, 1842 $rmp->{exit_on_final_map},
1735 $rmp->{xsize}, $rmp->{ysize}, 1843 $rmp->{xsize}, $rmp->{ysize},
1736 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1844 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1737 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1845 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1752 1860
1753sub register { 1861sub register {
1754 my (undef, $regex, $prio) = @_; 1862 my (undef, $regex, $prio) = @_;
1755 my $pkg = caller; 1863 my $pkg = caller;
1756 1864
1757 no strict;
1758 push @{"$pkg\::ISA"}, __PACKAGE__; 1865 push @{"$pkg\::ISA"}, __PACKAGE__;
1759 1866
1760 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1867 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1761} 1868}
1762 1869
1763# also paths starting with '/' 1870# also paths starting with '/'
1764$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1871$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1765 1872
1766sub thawer_merge { 1873sub thawer_merge {
1767 my ($self, $merge) = @_; 1874 my ($self, $merge) = @_;
1768 1875
1769 # we have to keep some variables in memory intact 1876 # we have to keep some variables in memory intact
1774} 1881}
1775 1882
1776sub normalise { 1883sub normalise {
1777 my ($path, $base) = @_; 1884 my ($path, $base) = @_;
1778 1885
1779 $path = "$path"; # make sure its a string 1886 $path = "$path"; # make sure it's a string
1780 1887
1781 $path =~ s/\.map$//; 1888 $path =~ s/\.map$//;
1782 1889
1783 # map plan: 1890 # map plan:
1784 # 1891 #
1823 $self->init; # pass $1 etc. 1930 $self->init; # pass $1 etc.
1824 return $self; 1931 return $self;
1825 } 1932 }
1826 } 1933 }
1827 1934
1828 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1935 Carp::cluck "unable to resolve path '$path' (base '$base')";
1829 () 1936 ()
1830} 1937}
1831 1938
1832sub init { 1939sub init {
1833 my ($self) = @_; 1940 my ($self) = @_;
1865sub uniq_path { 1972sub uniq_path {
1866 my ($self) = @_; 1973 my ($self) = @_;
1867 1974
1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1975 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1869 "$UNIQUEDIR/$path" 1976 "$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} 1977}
1880 1978
1881sub decay_objects { 1979sub decay_objects {
1882 my ($self) = @_; 1980 my ($self) = @_;
1883 1981
1965 2063
1966sub find; 2064sub find;
1967sub find { 2065sub find {
1968 my ($path, $origin) = @_; 2066 my ($path, $origin) = @_;
1969 2067
2068 cf::cede_to_tick;
2069
1970 $path = normalise $path, $origin && $origin->path; 2070 $path = normalise $path, $origin && $origin->path;
1971 2071
1972 cf::lock_wait "map_data:$path";#d#remove 2072 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 cf::lock_wait "map_find:$path"; 2073 my $guard2 = cf::lock_acquire "map_find:$path";
1974 2074
1975 $cf::MAP{$path} || do { 2075 $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 2076 my $map = new_from_path cf::map $path
1980 or return; 2077 or return;
1981 2078
1982 $map->{last_save} = $cf::RUNTIME; 2079 $map->{last_save} = $cf::RUNTIME;
1983 2080
1995 2092
1996 $cf::MAP{$path} = $map 2093 $cf::MAP{$path} = $map
1997 } 2094 }
1998} 2095}
1999 2096
2000sub pre_load { } 2097sub pre_load { }
2001sub post_load { } 2098#sub post_load { } # XS
2002 2099
2003sub load { 2100sub load {
2004 my ($self) = @_; 2101 my ($self) = @_;
2005 2102
2006 local $self->{deny_reset} = 1; # loading can take a long time 2103 local $self->{deny_reset} = 1; # loading can take a long time
2051 unless ($self->{deny_activate}) { 2148 unless ($self->{deny_activate}) {
2052 $self->decay_objects; 2149 $self->decay_objects;
2053 $self->fix_auto_apply; 2150 $self->fix_auto_apply;
2054 $self->update_buttons; 2151 $self->update_buttons;
2055 cf::cede_to_tick; 2152 cf::cede_to_tick;
2056 $self->set_darkness_map;
2057 cf::cede_to_tick;
2058 $self->activate; 2153 $self->activate;
2059 } 2154 }
2060 2155
2061 $self->{last_save} = $cf::RUNTIME; 2156 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME); 2157 $self->last_access ($cf::RUNTIME);
2065 } 2160 }
2066 2161
2067 $self->post_load; 2162 $self->post_load;
2068} 2163}
2069 2164
2165# customize the map for a given player, i.e.
2166# return the _real_ map. used by e.g. per-player
2167# maps to change the path to ~playername/mappath
2070sub customise_for { 2168sub customise_for {
2071 my ($self, $ob) = @_; 2169 my ($self, $ob) = @_;
2072 2170
2073 return find "~" . $ob->name . "/" . $self->{path} 2171 return find "~" . $ob->name . "/" . $self->{path}
2074 if $self->per_player; 2172 if $self->per_player;
2090 or next; 2188 or next;
2091 $neigh = find $neigh, $map 2189 $neigh = find $neigh, $map
2092 or next; 2190 or next;
2093 $neigh->load; 2191 $neigh->load;
2094 2192
2193 # now find the diagonal neighbours
2095 push @neigh, 2194 push @neigh,
2096 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2195 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2097 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2196 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2098 } 2197 }
2099 2198
2106} 2205}
2107 2206
2108sub find_sync { 2207sub find_sync {
2109 my ($path, $origin) = @_; 2208 my ($path, $origin) = @_;
2110 2209
2111 cf::sync_job { find $path, $origin } 2210 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2211 if $Coro::current == $Coro::main;
2212
2213 find $path, $origin
2112} 2214}
2113 2215
2114sub do_load_sync { 2216sub do_load_sync {
2115 my ($map) = @_; 2217 my ($map) = @_;
2116 2218
2117 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2219 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2118 if $Coro::current == $Coro::main; 2220 if $Coro::current == $Coro::main;
2119 2221
2120 cf::sync_job { $map->load }; 2222 $map->load;
2121} 2223}
2122 2224
2123our %MAP_PREFETCH; 2225our %MAP_PREFETCH;
2124our $MAP_PREFETCHER = undef; 2226our $MAP_PREFETCHER = undef;
2125 2227
2151 $MAP_PREFETCHER->prio (6); 2253 $MAP_PREFETCHER->prio (6);
2152 2254
2153 () 2255 ()
2154} 2256}
2155 2257
2258# common code, used by both ->save and ->swapout
2156sub save { 2259sub _save {
2157 my ($self) = @_; 2260 my ($self) = @_;
2158
2159 my $lock = cf::lock_acquire "map_data:$self->{path}";
2160 2261
2161 $self->{last_save} = $cf::RUNTIME; 2262 $self->{last_save} = $cf::RUNTIME;
2162 2263
2163 return unless $self->dirty; 2264 return unless $self->dirty;
2164 2265
2184 } else { 2285 } else {
2185 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2286 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2186 } 2287 }
2187} 2288}
2188 2289
2290sub save {
2291 my ($self) = @_;
2292
2293 my $lock = cf::lock_acquire "map_data:$self->{path}";
2294
2295 $self->_save;
2296}
2297
2189sub swap_out { 2298sub swap_out {
2190 my ($self) = @_; 2299 my ($self) = @_;
2191 2300
2192 # save first because save cedes
2193 $self->save;
2194
2195 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2301 my $lock = cf::lock_acquire "map_data:$self->{path}";
2196 2302
2197 return if $self->players;
2198 return if $self->in_memory != cf::MAP_ACTIVE; 2303 return if $self->in_memory != cf::MAP_ACTIVE;
2199 return if $self->{deny_save}; 2304 return if $self->{deny_save};
2305 return if $self->players;
2200 2306
2307 # first deactivate the map and "unlink" it from the core
2308 $self->deactivate;
2309 $_->clear_links_to ($self) for values %cf::MAP;
2201 $self->in_memory (cf::MAP_SWAPPED); 2310 $self->in_memory (cf::MAP_SWAPPED);
2311
2312 # then atomically save
2313 $self->_save;
2314
2315 # then free the map
2316 $self->clear;
2317}
2318
2319sub reset_at {
2320 my ($self) = @_;
2321
2322 # TODO: safety, remove and allow resettable per-player maps
2323 return 1e99 if $self->{deny_reset};
2324
2325 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2326 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2327
2328 $time + $to
2329}
2330
2331sub should_reset {
2332 my ($self) = @_;
2333
2334 $self->reset_at <= $cf::RUNTIME
2335}
2336
2337sub reset {
2338 my ($self) = @_;
2339
2340 my $lock = cf::lock_acquire "map_data:$self->{path}";
2341
2342 return if $self->players;
2343
2344 cf::trace "resetting map ", $self->path, "\n";
2345
2346 $self->in_memory (cf::MAP_SWAPPED);
2347
2348 # need to save uniques path
2349 unless ($self->{deny_save}) {
2350 my $uniq = $self->uniq_path; utf8::encode $uniq;
2351
2352 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2353 if $uniq;
2354 }
2355
2356 delete $cf::MAP{$self->path};
2202 2357
2203 $self->deactivate; 2358 $self->deactivate;
2204 $_->clear_links_to ($self) for values %cf::MAP; 2359 $_->clear_links_to ($self) for values %cf::MAP;
2205 $self->clear; 2360 $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 2361
2251 $self->unlink_save; 2362 $self->unlink_save;
2252 $self->destroy; 2363 $self->destroy;
2253} 2364}
2254 2365
2262 2373
2263 delete $cf::MAP{$self->path}; 2374 delete $cf::MAP{$self->path};
2264 2375
2265 $self->unlink_save; 2376 $self->unlink_save;
2266 2377
2267 bless $self, "cf::map"; 2378 bless $self, "cf::map::wrap";
2268 delete $self->{deny_reset}; 2379 delete $self->{deny_reset};
2269 $self->{deny_save} = 1; 2380 $self->{deny_save} = 1;
2270 $self->reset_timeout (1); 2381 $self->reset_timeout (1);
2271 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2382 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2272 2383
2329 : normalise $_ 2440 : normalise $_
2330 } @{ aio_readdir $UNIQUEDIR or [] } 2441 } @{ aio_readdir $UNIQUEDIR or [] }
2331 ] 2442 ]
2332} 2443}
2333 2444
2445=item cf::map::static_maps
2446
2447Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2448file in the shared directory excluding F</styles> and F</editor>). May
2449block.
2450
2451=cut
2452
2453sub static_maps() {
2454 my @dirs = "";
2455 my @maps;
2456
2457 while (@dirs) {
2458 my $dir = shift @dirs;
2459
2460 next if $dir eq "/styles" || $dir eq "/editor";
2461
2462 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2463 or return;
2464
2465 for (@$files) {
2466 s/\.map$// or next;
2467 utf8::decode $_;
2468 push @maps, "$dir/$_";
2469 }
2470
2471 push @dirs, map "$dir/$_", @$dirs;
2472 }
2473
2474 \@maps
2475}
2476
2334=back 2477=back
2335 2478
2336=head3 cf::object 2479=head3 cf::object
2337 2480
2338=cut 2481=cut
2403 2546
2404our $SAY_CHANNEL = { 2547our $SAY_CHANNEL = {
2405 id => "say", 2548 id => "say",
2406 title => "Map", 2549 title => "Map",
2407 reply => "say ", 2550 reply => "say ",
2408 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2551 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2409}; 2552};
2410 2553
2411our $CHAT_CHANNEL = { 2554our $CHAT_CHANNEL = {
2412 id => "chat", 2555 id => "chat",
2413 title => "Chat", 2556 title => "Chat",
2470 2613
2471Freezes the player and moves him/her to a special map (C<{link}>). 2614Freezes the player and moves him/her to a special map (C<{link}>).
2472 2615
2473The player should be reasonably safe there for short amounts of time (e.g. 2616The 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, 2617for 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 2618though, as the player cannot control the character while it is on the link
2476map. 2619map.
2477 2620
2478Will never block. 2621Will never block.
2479 2622
2480=item $player_object->leave_link ($map, $x, $y) 2623=item $player_object->leave_link ($map, $x, $y)
2501sub cf::object::player::enter_link { 2644sub cf::object::player::enter_link {
2502 my ($self) = @_; 2645 my ($self) = @_;
2503 2646
2504 $self->deactivate_recursive; 2647 $self->deactivate_recursive;
2505 2648
2649 ++$self->{_link_recursion};
2650
2506 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2651 return if UNIVERSAL::isa $self->map, "ext::map_link";
2507 2652
2508 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2653 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2509 if $self->map && $self->map->{path} ne "{link}"; 2654 if $self->map && $self->map->{path} ne "{link}";
2510 2655
2511 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2656 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2512} 2657}
2513 2658
2514sub cf::object::player::leave_link { 2659sub cf::object::player::leave_link {
2515 my ($self, $map, $x, $y) = @_; 2660 my ($self, $map, $x, $y) = @_;
2516 2661
2533 ($x, $y) = (-1, -1) 2678 ($x, $y) = (-1, -1)
2534 unless (defined $x) && (defined $y); 2679 unless (defined $x) && (defined $y);
2535 2680
2536 # use -1 or undef as default coordinates, not 0, 0 2681 # use -1 or undef as default coordinates, not 0, 0
2537 ($x, $y) = ($map->enter_x, $map->enter_y) 2682 ($x, $y) = ($map->enter_x, $map->enter_y)
2538 if $x <=0 && $y <= 0; 2683 if $x <= 0 && $y <= 0;
2539 2684
2540 $map->load; 2685 $map->load;
2541 $map->load_neighbours; 2686 $map->load_neighbours;
2542 2687
2543 return unless $self->contr->active; 2688 return unless $self->contr->active;
2544 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2545 $self->activate_recursive;
2546 2689
2547 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2690 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2548 $self->enter_map ($map, $x, $y); 2691 if ($self->enter_map ($map, $x, $y)) {
2549} 2692 # entering was successful
2693 delete $self->{_link_recursion};
2694 # only activate afterwards, to support waiting in hooks
2695 $self->activate_recursive;
2696 }
2550 2697
2698}
2699
2551=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2700=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2552 2701
2553Moves the player to the given map-path and coordinates by first freezing 2702Moves the player to the given map-path and coordinates by first freezing
2554her, loading and preparing them map, calling the provided $check callback 2703her, loading and preparing them map, calling the provided $check callback
2555that has to return the map if sucecssful, and then unfreezes the player on 2704that 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 2705the new (success) or old (failed) map position. In either case, $done will
2563 2712
2564our $GOTOGEN; 2713our $GOTOGEN;
2565 2714
2566sub cf::object::player::goto { 2715sub cf::object::player::goto {
2567 my ($self, $path, $x, $y, $check, $done) = @_; 2716 my ($self, $path, $x, $y, $check, $done) = @_;
2717
2718 if ($self->{_link_recursion} >= $MAX_LINKS) {
2719 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2720 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2721 ($path, $x, $y) = @$EMERGENCY_POSITION;
2722 }
2568 2723
2569 # do generation counting so two concurrent goto's will be executed in-order 2724 # do generation counting so two concurrent goto's will be executed in-order
2570 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2725 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2571 2726
2572 $self->enter_link; 2727 $self->enter_link;
2596 my $map = eval { 2751 my $map = eval {
2597 my $map = defined $path ? cf::map::find $path : undef; 2752 my $map = defined $path ? cf::map::find $path : undef;
2598 2753
2599 if ($map) { 2754 if ($map) {
2600 $map = $map->customise_for ($self); 2755 $map = $map->customise_for ($self);
2601 $map = $check->($map) if $check && $map; 2756 $map = $check->($map, $x, $y, $self) if $check && $map;
2602 } else { 2757 } else {
2603 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2758 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2604 } 2759 }
2605 2760
2606 $map 2761 $map
2614 if ($gen == $self->{_goto_generation}) { 2769 if ($gen == $self->{_goto_generation}) {
2615 delete $self->{_goto_generation}; 2770 delete $self->{_goto_generation};
2616 $self->leave_link ($map, $x, $y); 2771 $self->leave_link ($map, $x, $y);
2617 } 2772 }
2618 2773
2619 $done->() if $done; 2774 $done->($self) if $done;
2620 })->prio (1); 2775 })->prio (1);
2621} 2776}
2622 2777
2623=item $player_object->enter_exit ($exit_object) 2778=item $player_object->enter_exit ($exit_object)
2624 2779
2717 $self->message ("Something went wrong deep within the deliantra server. " 2872 $self->message ("Something went wrong deep within the deliantra server. "
2718 . "I'll try to bring you back to the map you were before. " 2873 . "I'll try to bring you back to the map you were before. "
2719 . "Please report this to the dungeon master!", 2874 . "Please report this to the dungeon master!",
2720 cf::NDI_UNIQUE | cf::NDI_RED); 2875 cf::NDI_UNIQUE | cf::NDI_RED);
2721 2876
2722 warn "ERROR in enter_exit: $@"; 2877 error "ERROR in enter_exit: $@";
2723 $self->leave_link; 2878 $self->leave_link;
2724 } 2879 }
2725 })->prio (1); 2880 })->prio (1);
2726} 2881}
2727 2882
2739sub cf::client::send_drawinfo { 2894sub cf::client::send_drawinfo {
2740 my ($self, $text, $flags) = @_; 2895 my ($self, $text, $flags) = @_;
2741 2896
2742 utf8::encode $text; 2897 utf8::encode $text;
2743 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2898 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2899}
2900
2901=item $client->send_big_packet ($pkt)
2902
2903Like C<send_packet>, but tries to compress large packets, and fragments
2904them as required.
2905
2906=cut
2907
2908our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2909
2910sub cf::client::send_big_packet {
2911 my ($self, $pkt) = @_;
2912
2913 # try lzf for large packets
2914 $pkt = "lzf " . Compress::LZF::compress $pkt
2915 if 1024 <= length $pkt and $self->{can_lzf};
2916
2917 # split very large packets
2918 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2919 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2920 $pkt = "frag";
2921 }
2922
2923 $self->send_packet ($pkt);
2744} 2924}
2745 2925
2746=item $client->send_msg ($channel, $msg, $color, [extra...]) 2926=item $client->send_msg ($channel, $msg, $color, [extra...])
2747 2927
2748Send a drawinfo or msg packet to the client, formatting the msg for the 2928Send a drawinfo or msg packet to the client, formatting the msg for the
2752 2932
2753=cut 2933=cut
2754 2934
2755# non-persistent channels (usually the info channel) 2935# non-persistent channels (usually the info channel)
2756our %CHANNEL = ( 2936our %CHANNEL = (
2937 "c/motd" => {
2938 id => "infobox",
2939 title => "MOTD",
2940 reply => undef,
2941 tooltip => "The message of the day",
2942 },
2757 "c/identify" => { 2943 "c/identify" => {
2758 id => "infobox", 2944 id => "infobox",
2759 title => "Identify", 2945 title => "Identify",
2760 reply => undef, 2946 reply => undef,
2761 tooltip => "Items recently identified", 2947 tooltip => "Items recently identified",
2763 "c/examine" => { 2949 "c/examine" => {
2764 id => "infobox", 2950 id => "infobox",
2765 title => "Examine", 2951 title => "Examine",
2766 reply => undef, 2952 reply => undef,
2767 tooltip => "Signs and other items you examined", 2953 tooltip => "Signs and other items you examined",
2954 },
2955 "c/shopinfo" => {
2956 id => "infobox",
2957 title => "Shop Info",
2958 reply => undef,
2959 tooltip => "What your bargaining skill tells you about the shop",
2768 }, 2960 },
2769 "c/book" => { 2961 "c/book" => {
2770 id => "infobox", 2962 id => "infobox",
2771 title => "Book", 2963 title => "Book",
2772 reply => undef, 2964 reply => undef,
2788 id => "infobox", 2980 id => "infobox",
2789 title => "Body Parts", 2981 title => "Body Parts",
2790 reply => undef, 2982 reply => undef,
2791 tooltip => "Shows which body parts you posess and are available", 2983 tooltip => "Shows which body parts you posess and are available",
2792 }, 2984 },
2985 "c/statistics" => {
2986 id => "infobox",
2987 title => "Statistics",
2988 reply => undef,
2989 tooltip => "Shows your primary statistics",
2990 },
2793 "c/skills" => { 2991 "c/skills" => {
2794 id => "infobox", 2992 id => "infobox",
2795 title => "Skills", 2993 title => "Skills",
2796 reply => undef, 2994 reply => undef,
2797 tooltip => "Shows your experience per skill and item power", 2995 tooltip => "Shows your experience per skill and item power",
2996 },
2997 "c/shopitems" => {
2998 id => "infobox",
2999 title => "Shop Items",
3000 reply => undef,
3001 tooltip => "Shows the items currently for sale in this shop",
3002 },
3003 "c/resistances" => {
3004 id => "infobox",
3005 title => "Resistances",
3006 reply => undef,
3007 tooltip => "Shows your resistances",
3008 },
3009 "c/pets" => {
3010 id => "infobox",
3011 title => "Pets",
3012 reply => undef,
3013 tooltip => "Shows information abotu your pets/a specific pet",
3014 },
3015 "c/perceiveself" => {
3016 id => "infobox",
3017 title => "Perceive Self",
3018 reply => undef,
3019 tooltip => "You gained detailed knowledge about yourself",
2798 }, 3020 },
2799 "c/uptime" => { 3021 "c/uptime" => {
2800 id => "infobox", 3022 id => "infobox",
2801 title => "Uptime", 3023 title => "Uptime",
2802 reply => undef, 3024 reply => undef,
2812 id => "party", 3034 id => "party",
2813 title => "Party", 3035 title => "Party",
2814 reply => "gsay ", 3036 reply => "gsay ",
2815 tooltip => "Messages and chat related to your party", 3037 tooltip => "Messages and chat related to your party",
2816 }, 3038 },
3039 "c/death" => {
3040 id => "death",
3041 title => "Death",
3042 reply => undef,
3043 tooltip => "Reason for and more info about your most recent death",
3044 },
3045 "c/say" => $SAY_CHANNEL,
3046 "c/chat" => $CHAT_CHANNEL,
2817); 3047);
2818 3048
2819sub cf::client::send_msg { 3049sub cf::client::send_msg {
2820 my ($self, $channel, $msg, $color, @extra) = @_; 3050 my ($self, $channel, $msg, $color, @extra) = @_;
2821 3051
2826 3056
2827 # check predefined channels, for the benefit of C 3057 # check predefined channels, for the benefit of C
2828 if ($CHANNEL{$channel}) { 3058 if ($CHANNEL{$channel}) {
2829 $channel = $CHANNEL{$channel}; 3059 $channel = $CHANNEL{$channel};
2830 3060
2831 $self->ext_msg (channel_info => $channel) 3061 $self->ext_msg (channel_info => $channel);
2832 if $self->can_msg;
2833
2834 $channel = $channel->{id}; 3062 $channel = $channel->{id};
2835 3063
2836 } elsif (ref $channel) { 3064 } elsif (ref $channel) {
2837 # send meta info to client, if not yet sent 3065 # send meta info to client, if not yet sent
2838 unless (exists $self->{channel}{$channel->{id}}) { 3066 unless (exists $self->{channel}{$channel->{id}}) {
2839 $self->{channel}{$channel->{id}} = $channel; 3067 $self->{channel}{$channel->{id}} = $channel;
2840 $self->ext_msg (channel_info => $channel) 3068 $self->ext_msg (channel_info => $channel);
2841 if $self->can_msg;
2842 } 3069 }
2843 3070
2844 $channel = $channel->{id}; 3071 $channel = $channel->{id};
2845 } 3072 }
2846 3073
2847 return unless @extra || length $msg; 3074 return unless @extra || length $msg;
2848 3075
2849 if ($self->can_msg) {
2850 # default colour, mask it out 3076 # default colour, mask it out
2851 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3077 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2852 if $color & cf::NDI_DEF; 3078 if $color & cf::NDI_DEF;
2853 3079
2854 my $pkt = "msg " 3080 my $pkt = "msg "
2855 . $self->{json_coder}->encode ( 3081 . $self->{json_coder}->encode (
2856 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3082 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2857 ); 3083 );
2858 3084
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); 3085 $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} 3086}
2896 3087
2897=item $client->ext_msg ($type, @msg) 3088=item $client->ext_msg ($type, @msg)
2898 3089
2899Sends an ext event to the client. 3090Sends an ext event to the client.
2902 3093
2903sub cf::client::ext_msg($$@) { 3094sub cf::client::ext_msg($$@) {
2904 my ($self, $type, @msg) = @_; 3095 my ($self, $type, @msg) = @_;
2905 3096
2906 if ($self->extcmd == 2) { 3097 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3098 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2908 } elsif ($self->extcmd == 1) { # TODO: remove 3099 } elsif ($self->extcmd == 1) { # TODO: remove
2909 push @msg, msgtype => "event_$type"; 3100 push @msg, msgtype => "event_$type";
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3101 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 } 3102 }
2912} 3103}
2913 3104
2914=item $client->ext_reply ($msgid, @msg) 3105=item $client->ext_reply ($msgid, @msg)
2915 3106
2919 3110
2920sub cf::client::ext_reply($$@) { 3111sub cf::client::ext_reply($$@) {
2921 my ($self, $id, @msg) = @_; 3112 my ($self, $id, @msg) = @_;
2922 3113
2923 if ($self->extcmd == 2) { 3114 if ($self->extcmd == 2) {
2924 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3115 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2925 } elsif ($self->extcmd == 1) { 3116 } elsif ($self->extcmd == 1) {
2926 #TODO: version 1, remove 3117 #TODO: version 1, remove
2927 unshift @msg, msgtype => "reply", msgid => $id; 3118 unshift @msg, msgtype => "reply", msgid => $id;
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3119 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2929 } 3120 }
2930} 3121}
2931 3122
2932=item $success = $client->query ($flags, "text", \&cb) 3123=item $success = $client->query ($flags, "text", \&cb)
2933 3124
3004 3195
3005 $ns->ext_reply ($reply, @reply) 3196 $ns->ext_reply ($reply, @reply)
3006 if $reply; 3197 if $reply;
3007 3198
3008 } else { 3199 } else {
3009 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3200 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3010 } 3201 }
3011 3202
3012 cf::override; 3203 cf::override;
3013 }, 3204 },
3014); 3205);
3034 3225
3035 $coro 3226 $coro
3036} 3227}
3037 3228
3038cf::client->attach ( 3229cf::client->attach (
3039 on_destroy => sub { 3230 on_client_destroy => sub {
3040 my ($ns) = @_; 3231 my ($ns) = @_;
3041 3232
3042 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3233 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3043 }, 3234 },
3044); 3235);
3060our $safe_hole = new Safe::Hole; 3251our $safe_hole = new Safe::Hole;
3061 3252
3062$SIG{FPE} = 'IGNORE'; 3253$SIG{FPE} = 'IGNORE';
3063 3254
3064$safe->permit_only (Opcode::opset qw( 3255$safe->permit_only (Opcode::opset qw(
3065 :base_core :base_mem :base_orig :base_math 3256 :base_core :base_mem :base_orig :base_math :base_loop
3066 grepstart grepwhile mapstart mapwhile 3257 grepstart grepwhile mapstart mapwhile
3067 sort time 3258 sort time
3068)); 3259));
3069 3260
3070# here we export the classes and methods available to script code 3261# here we export the classes and methods available to script code
3074The following functions and methods are available within a safe environment: 3265The following functions and methods are available within a safe environment:
3075 3266
3076 cf::object 3267 cf::object
3077 contr pay_amount pay_player map x y force_find force_add destroy 3268 contr pay_amount pay_player map x y force_find force_add destroy
3078 insert remove name archname title slaying race decrease split 3269 insert remove name archname title slaying race decrease split
3270 value
3079 3271
3080 cf::object::player 3272 cf::object::player
3081 player 3273 player
3082 3274
3083 cf::player 3275 cf::player
3089=cut 3281=cut
3090 3282
3091for ( 3283for (
3092 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3284 ["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 3285 insert remove inv nrof name archname title slaying race
3094 decrease split destroy change_exp)], 3286 decrease split destroy change_exp value msg lore send_msg)],
3095 ["cf::object::player" => qw(player)], 3287 ["cf::object::player" => qw(player)],
3096 ["cf::player" => qw(peaceful)], 3288 ["cf::player" => qw(peaceful send_msg)],
3097 ["cf::map" => qw(trigger)], 3289 ["cf::map" => qw(trigger)],
3098) { 3290) {
3099 no strict 'refs';
3100 my ($pkg, @funs) = @$_; 3291 my ($pkg, @funs) = @$_;
3101 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3292 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3102 for @funs; 3293 for @funs;
3103} 3294}
3104 3295
3119 3310
3120 my $qcode = $code; 3311 my $qcode = $code;
3121 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3312 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3122 $qcode =~ s/\n/\\n/g; 3313 $qcode =~ s/\n/\\n/g;
3123 3314
3315 %vars = (_dummy => 0) unless %vars;
3316
3317 my @res;
3124 local $_; 3318 local $_;
3125 local @safe::cf::_safe_eval_args = values %vars;
3126 3319
3127 my $eval = 3320 my $eval =
3128 "do {\n" 3321 "do {\n"
3129 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3322 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3130 . "#line 0 \"{$qcode}\"\n" 3323 . "#line 0 \"{$qcode}\"\n"
3131 . $code 3324 . $code
3132 . "\n}" 3325 . "\n}"
3133 ; 3326 ;
3134 3327
3328 if ($CFG{safe_eval}) {
3135 sub_generation_inc; 3329 sub_generation_inc;
3330 local @safe::cf::_safe_eval_args = values %vars;
3136 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3331 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3137 sub_generation_inc; 3332 sub_generation_inc;
3333 } else {
3334 local @cf::_safe_eval_args = values %vars;
3335 @res = wantarray ? eval eval : scalar eval $eval;
3336 }
3138 3337
3139 if ($@) { 3338 if ($@) {
3140 warn "$@"; 3339 warn "$@",
3141 warn "while executing safe code '$code'\n"; 3340 "while executing safe code '$code'\n",
3142 warn "with arguments " . (join " ", %vars) . "\n"; 3341 "with arguments " . (join " ", %vars) . "\n";
3143 } 3342 }
3144 3343
3145 wantarray ? @res : $res[0] 3344 wantarray ? @res : $res[0]
3146} 3345}
3147 3346
3161=cut 3360=cut
3162 3361
3163sub register_script_function { 3362sub register_script_function {
3164 my ($fun, $cb) = @_; 3363 my ($fun, $cb) = @_;
3165 3364
3166 no strict 'refs'; 3365 $fun = "safe::$fun" if $CFG{safe_eval};
3167 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3366 *$fun = $safe_hole->wrap ($cb);
3168} 3367}
3169 3368
3170=back 3369=back
3171 3370
3172=cut 3371=cut
3181 # for this (global event?) 3380 # for this (global event?)
3182 %ext::player_env::MUSIC_FACE_CACHE = (); 3381 %ext::player_env::MUSIC_FACE_CACHE = ();
3183 3382
3184 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3383 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3185 3384
3186 warn "loading facedata from $path\n"; 3385 trace "loading facedata from $path\n";
3187 3386
3188 my $facedata;
3189 0 < aio_load $path, $facedata 3387 0 < aio_load $path, my $facedata
3190 or die "$path: $!"; 3388 or die "$path: $!";
3191 3389
3192 $facedata = Coro::Storable::thaw $facedata; 3390 $facedata = Coro::Storable::thaw $facedata;
3193 3391
3194 $facedata->{version} == 2 3392 $facedata->{version} == 2
3195 or cf::cleanup "$path: version mismatch, cannot proceed."; 3393 or cf::cleanup "$path: version mismatch, cannot proceed.";
3196 3394
3197 # patch in the exptable 3395 # patch in the exptable
3396 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3198 $facedata->{resource}{"res/exp_table"} = { 3397 $facedata->{resource}{"res/exp_table"} = {
3199 type => FT_RSRC, 3398 type => FT_RSRC,
3200 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3399 data => $exp_table,
3400 hash => (Digest::MD5::md5 $exp_table),
3201 }; 3401 };
3202 cf::cede_to_tick; 3402 cf::cede_to_tick;
3203 3403
3204 { 3404 {
3205 my $faces = $facedata->{faceinfo}; 3405 my $faces = $facedata->{faceinfo};
3207 while (my ($face, $info) = each %$faces) { 3407 while (my ($face, $info) = each %$faces) {
3208 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3408 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3209 3409
3210 cf::face::set_visibility $idx, $info->{visibility}; 3410 cf::face::set_visibility $idx, $info->{visibility};
3211 cf::face::set_magicmap $idx, $info->{magicmap}; 3411 cf::face::set_magicmap $idx, $info->{magicmap};
3212 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3412 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3213 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3413 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3214 3414
3215 cf::cede_to_tick; 3415 cf::cede_to_tick;
3216 } 3416 }
3217 3417
3218 while (my ($face, $info) = each %$faces) { 3418 while (my ($face, $info) = each %$faces) {
3223 3423
3224 if (my $smooth = cf::face::find $info->{smooth}) { 3424 if (my $smooth = cf::face::find $info->{smooth}) {
3225 cf::face::set_smooth $idx, $smooth; 3425 cf::face::set_smooth $idx, $smooth;
3226 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3426 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3227 } else { 3427 } else {
3228 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3428 error "smooth face '$info->{smooth}' not found for face '$face'";
3229 } 3429 }
3230 3430
3231 cf::cede_to_tick; 3431 cf::cede_to_tick;
3232 } 3432 }
3233 } 3433 }
3242 3442
3243 cf::anim::invalidate_all; # d'oh 3443 cf::anim::invalidate_all; # d'oh
3244 } 3444 }
3245 3445
3246 { 3446 {
3247 # TODO: for gcfclient pleasure, we should give resources
3248 # that gcfclient doesn't grok a >10000 face index.
3249 my $res = $facedata->{resource}; 3447 my $res = $facedata->{resource};
3250 3448
3251 while (my ($name, $info) = each %$res) { 3449 while (my ($name, $info) = each %$res) {
3252 if (defined $info->{type}) { 3450 if (defined $info->{type}) {
3253 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3451 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3254 my $data;
3255 3452
3256 if ($info->{type} & 1) { 3453 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}; 3454 cf::face::set_type $idx, $info->{type};
3271 } else { 3455 } else {
3272 $RESOURCE{$name} = $info; 3456 $RESOURCE{$name} = $info; # unused
3273 } 3457 }
3274 3458
3275 cf::cede_to_tick; 3459 cf::cede_to_tick;
3276 } 3460 }
3277 } 3461 }
3278 3462
3279 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3463 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3280 3464
3281 1 3465 1
3282} 3466}
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 3467
3304register_exticmd fx_want => sub { 3468register_exticmd fx_want => sub {
3305 my ($ns, $want) = @_; 3469 my ($ns, $want) = @_;
3306 3470
3307 while (my ($k, $v) = each %$want) { 3471 while (my ($k, $v) = each %$want) {
3346sub reload_treasures { 3510sub reload_treasures {
3347 load_resource_file "$DATADIR/treasures" 3511 load_resource_file "$DATADIR/treasures"
3348 or die "unable to load treasurelists\n"; 3512 or die "unable to load treasurelists\n";
3349} 3513}
3350 3514
3515sub reload_sound {
3516 trace "loading sound config from $DATADIR/sound\n";
3517
3518 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3519 or die "$DATADIR/sound $!";
3520
3521 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3522
3523 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3524 my $sound = $soundconf->{compat}[$_]
3525 or next;
3526
3527 my $face = cf::face::find "sound/$sound->[1]";
3528 cf::sound::set $sound->[0] => $face;
3529 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3530 }
3531
3532 while (my ($k, $v) = each %{$soundconf->{event}}) {
3533 my $face = cf::face::find "sound/$v";
3534 cf::sound::set $k => $face;
3535 }
3536}
3537
3351sub reload_resources { 3538sub reload_resources {
3352 warn "reloading resource files...\n"; 3539 trace "reloading resource files...\n";
3353 3540
3541 reload_exp_table;
3542 reload_materials;
3354 reload_facedata; 3543 reload_facedata;
3544 reload_sound;
3355 reload_archetypes; 3545 reload_archetypes;
3356 reload_regions; 3546 reload_regions;
3357 reload_treasures; 3547 reload_treasures;
3358 3548
3359 warn "finished reloading resource files\n"; 3549 trace "finished reloading resource files\n";
3360} 3550}
3361 3551
3362sub reload_config { 3552sub reload_config {
3363 open my $fh, "<:utf8", "$CONFDIR/config" 3553 trace "reloading config file...\n";
3364 or return;
3365 3554
3366 local $/; 3555 0 < aio_load "$CONFDIR/config", my $config
3556 or die "$CONFDIR/config: $!";
3557
3558 utf8::decode $config;
3559
3560 cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
3367 *CFG = YAML::Load <$fh>; 3561 *CFG = YAML::XS::Load $config;
3368 3562
3369 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3563 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3370 3564
3371 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3565 $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}; 3566 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3373 3567
3374 if (exists $CFG{mlockall}) { 3568 if (exists $CFG{mlockall}) {
3397 3591
3398 seek $fh, 0, 0; 3592 seek $fh, 0, 0;
3399 print $fh $$; 3593 print $fh $$;
3400} 3594}
3401 3595
3596sub main_loop {
3597 trace "EV::loop starting\n";
3598 if (1) {
3599 EV::loop;
3600 }
3601 trace "EV::loop returned\n";
3602 goto &main_loop unless $REALLY_UNLOOP;
3603}
3604
3402sub main { 3605sub main {
3403 cf::init_globals; # initialise logging 3606 cf::init_globals; # initialise logging
3404 3607
3405 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3608 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3406 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3609 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3407 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3610 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3408 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3611 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 3612
3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3613 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3417 3614
3418 # we must not ever block the main coroutine 3615 # we must not ever block the main coroutine
3419 local $Coro::idle = sub { 3616 local $Coro::idle = sub {
3425 }; 3622 };
3426 3623
3427 evthread_start IO::AIO::poll_fileno; 3624 evthread_start IO::AIO::poll_fileno;
3428 3625
3429 cf::sync_job { 3626 cf::sync_job {
3627 cf::incloader::init ();
3628
3629 cf::init_anim;
3630 cf::init_attackmess;
3631 cf::init_dynamic;
3632
3633 cf::load_settings;
3634
3430 reload_resources; 3635 reload_resources;
3431 reload_config; 3636 reload_config;
3432 db_init; 3637 db_init;
3433 3638
3434 cf::load_settings;
3435 cf::load_materials;
3436 cf::init_uuid; 3639 cf::init_uuid;
3437 cf::init_signals; 3640 cf::init_signals;
3438 cf::init_commands;
3439 cf::init_skills; 3641 cf::init_skills;
3440 3642
3441 cf::init_beforeplay; 3643 cf::init_beforeplay;
3442 3644
3443 atomic; 3645 atomic;
3445 load_extensions; 3647 load_extensions;
3446 3648
3447 utime time, time, $RUNTIMEFILE; 3649 utime time, time, $RUNTIMEFILE;
3448 3650
3449 # no (long-running) fork's whatsoever before this point(!) 3651 # no (long-running) fork's whatsoever before this point(!)
3652 use POSIX ();
3450 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3653 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3451 3654
3452 (pop @POST_INIT)->(0) while @POST_INIT; 3655 (pop @POST_INIT)->(0) while @POST_INIT;
3453 }; 3656 };
3454 3657
3455 EV::loop; 3658 cf::object::thawer::errors_are_fatal 0;
3659 info "parse errors in files are no longer fatal from this point on.\n";
3660
3661 my $free_main; $free_main = EV::idle sub {
3662 undef $free_main;
3663 undef &main; # free gobs of memory :)
3664 };
3665
3666 goto &main_loop;
3456} 3667}
3457 3668
3458############################################################################# 3669#############################################################################
3459# initialisation and cleanup 3670# initialisation and cleanup
3460 3671
3461# install some emergency cleanup handlers 3672# install some emergency cleanup handlers
3462BEGIN { 3673BEGIN {
3463 our %SIGWATCHER = (); 3674 our %SIGWATCHER = ();
3464 for my $signal (qw(INT HUP TERM)) { 3675 for my $signal (qw(INT HUP TERM)) {
3465 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3676 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3466 cf::cleanup "SIG$signal"; 3677 cf::cleanup "SIG$signal";
3467 }; 3678 };
3468 } 3679 }
3469} 3680}
3470 3681
3471sub write_runtime_sync { 3682sub write_runtime_sync {
3683 my $t0 = AE::time;
3684
3472 # first touch the runtime file to show we are still running: 3685 # first touch the runtime file to show we are still running:
3473 # the fsync below can take a very very long time. 3686 # the fsync below can take a very very long time.
3474 3687
3475 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3688 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3476 3689
3477 my $guard = cf::lock_acquire "write_runtime"; 3690 my $guard = cf::lock_acquire "write_runtime";
3478 3691
3479 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3692 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3480 or return; 3693 or return;
3481 3694
3482 my $value = $cf::RUNTIME + 90 + 10; 3695 my $value = $cf::RUNTIME + 90 + 10;
3483 # 10 is the runtime save interval, for a monotonic clock 3696 # 10 is the runtime save interval, for a monotonic clock
3484 # 60 allows for the watchdog to kill the server. 3697 # 60 allows for the watchdog to kill the server.
3497 or return; 3710 or return;
3498 3711
3499 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3712 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3500 and return; 3713 and return;
3501 3714
3502 warn "runtime file written.\n"; 3715 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3503 3716
3504 1 3717 1
3505} 3718}
3506 3719
3507our $uuid_lock; 3720our $uuid_lock;
3518 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3731 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3519 or return; 3732 or return;
3520 3733
3521 my $value = uuid_seq uuid_cur; 3734 my $value = uuid_seq uuid_cur;
3522 3735
3523 if ($value < 1024) { 3736 unless ($value) {
3524 warn "cowardly refusing to write low uuid value ($value)!\n"; 3737 info "cowardly refusing to write zero uuid value!\n";
3525 return; 3738 return;
3526 } 3739 }
3527 3740
3528 my $value = uuid_str $value + $uuid_skip; 3741 my $value = uuid_str $value + $uuid_skip;
3529 $uuid_skip = 0; 3742 $uuid_skip = 0;
3539 or return; 3752 or return;
3540 3753
3541 aio_rename "$uuid~", $uuid 3754 aio_rename "$uuid~", $uuid
3542 and return; 3755 and return;
3543 3756
3544 warn "uuid file written ($value).\n"; 3757 trace "uuid file written ($value).\n";
3545 3758
3546 1 3759 1
3547 3760
3548} 3761}
3549 3762
3555} 3768}
3556 3769
3557sub emergency_save() { 3770sub emergency_save() {
3558 my $freeze_guard = cf::freeze_mainloop; 3771 my $freeze_guard = cf::freeze_mainloop;
3559 3772
3560 warn "enter emergency perl save\n"; 3773 info "emergency_perl_save: enter\n";
3774
3775 # this is a trade-off: we want to be very quick here, so
3776 # save all maps without fsync, and later call a global sync
3777 # (which in turn might be very very slow)
3778 local $USE_FSYNC = 0;
3561 3779
3562 cf::sync_job { 3780 cf::sync_job {
3781 cf::write_runtime_sync; # external watchdog should not bark
3782
3563 # use a peculiar iteration method to avoid tripping on perl 3783 # use a peculiar iteration method to avoid tripping on perl
3564 # refcount bugs in for. also avoids problems with players 3784 # refcount bugs in for. also avoids problems with players
3565 # and maps saved/destroyed asynchronously. 3785 # and maps saved/destroyed asynchronously.
3566 warn "begin emergency player save\n"; 3786 info "emergency_perl_save: begin player save\n";
3567 for my $login (keys %cf::PLAYER) { 3787 for my $login (keys %cf::PLAYER) {
3568 my $pl = $cf::PLAYER{$login} or next; 3788 my $pl = $cf::PLAYER{$login} or next;
3569 $pl->valid or next; 3789 $pl->valid or next;
3570 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3790 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3571 $pl->save; 3791 $pl->save;
3572 } 3792 }
3573 warn "end emergency player save\n"; 3793 info "emergency_perl_save: end player save\n";
3574 3794
3575 warn "begin emergency map save\n"; 3795 cf::write_runtime_sync; # external watchdog should not bark
3796
3797 info "emergency_perl_save: begin map save\n";
3576 for my $path (keys %cf::MAP) { 3798 for my $path (keys %cf::MAP) {
3577 my $map = $cf::MAP{$path} or next; 3799 my $map = $cf::MAP{$path} or next;
3578 $map->valid or next; 3800 $map->valid or next;
3579 $map->save; 3801 $map->save;
3580 } 3802 }
3581 warn "end emergency map save\n"; 3803 info "emergency_perl_save: end map save\n";
3582 3804
3583 warn "begin emergency database checkpoint\n"; 3805 cf::write_runtime_sync; # external watchdog should not bark
3806
3807 info "emergency_perl_save: begin database checkpoint\n";
3584 BDB::db_env_txn_checkpoint $DB_ENV; 3808 BDB::db_env_txn_checkpoint $DB_ENV;
3585 warn "end emergency database checkpoint\n"; 3809 info "emergency_perl_save: end database checkpoint\n";
3586 3810
3587 warn "begin write uuid\n"; 3811 info "emergency_perl_save: begin write uuid\n";
3588 write_uuid_sync 1; 3812 write_uuid_sync 1;
3589 warn "end write uuid\n"; 3813 info "emergency_perl_save: end write uuid\n";
3814
3815 cf::write_runtime_sync; # external watchdog should not bark
3816
3817 trace "emergency_perl_save: syncing database to disk";
3818 BDB::db_env_txn_checkpoint $DB_ENV;
3819
3820 info "emergency_perl_save: starting sync\n";
3821 IO::AIO::aio_sync sub {
3822 info "emergency_perl_save: finished sync\n";
3823 };
3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3826
3827 trace "emergency_perl_save: flushing outstanding aio requests";
3828 while (IO::AIO::nreqs || BDB::nreqs) {
3829 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3830 }
3831
3832 cf::write_runtime_sync; # external watchdog should not bark
3590 }; 3833 };
3591 3834
3592 warn "leave emergency perl save\n"; 3835 info "emergency_perl_save: leave\n";
3593} 3836}
3594 3837
3595sub post_cleanup { 3838sub post_cleanup {
3596 my ($make_core) = @_; 3839 my ($make_core) = @_;
3597 3840
3841 IO::AIO::flush;
3842
3598 warn Carp::longmess "post_cleanup backtrace" 3843 error Carp::longmess "post_cleanup backtrace"
3599 if $make_core; 3844 if $make_core;
3600 3845
3601 my $fh = pidfile; 3846 my $fh = pidfile;
3602 unlink $PIDFILE if <$fh> == $$; 3847 unlink $PIDFILE if <$fh> == $$;
3603} 3848}
3623 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3868 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3624 for my $name (keys %$leaf_symtab) { 3869 for my $name (keys %$leaf_symtab) {
3625 _gv_clear *{"$pkg$name"}; 3870 _gv_clear *{"$pkg$name"};
3626# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3871# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3627 } 3872 }
3628 warn "cleared package $pkg\n";#d#
3629} 3873}
3630 3874
3631sub do_reload_perl() { 3875sub do_reload_perl() {
3632 # can/must only be called in main 3876 # can/must only be called in main
3633 if ($Coro::current != $Coro::main) { 3877 unless (in_main) {
3634 warn "can only reload from main coroutine"; 3878 error "can only reload from main coroutine";
3635 return; 3879 return;
3636 } 3880 }
3637 3881
3638 return if $RELOAD++; 3882 return if $RELOAD++;
3639 3883
3884 my $t1 = AE::time;
3885
3640 while ($RELOAD) { 3886 while ($RELOAD) {
3887 cf::get_slot 0.1, -1, "reload_perl";
3641 warn "reloading..."; 3888 info "reloading...";
3642 3889
3643 warn "entering sync_job"; 3890 trace "entering sync_job";
3644 3891
3645 cf::sync_job { 3892 cf::sync_job {
3646 cf::write_runtime_sync; # external watchdog should not bark
3647 cf::emergency_save; 3893 #cf::emergency_save;
3648 cf::write_runtime_sync; # external watchdog should not bark
3649 3894
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"; 3895 trace "cancelling all extension coros";
3661 $_->cancel for values %EXT_CORO; 3896 $_->cancel for values %EXT_CORO;
3662 %EXT_CORO = (); 3897 %EXT_CORO = ();
3663 3898
3664 warn "removing commands"; 3899 trace "removing commands";
3665 %COMMAND = (); 3900 %COMMAND = ();
3666 3901
3667 warn "removing ext/exti commands"; 3902 trace "removing ext/exti commands";
3668 %EXTCMD = (); 3903 %EXTCMD = ();
3669 %EXTICMD = (); 3904 %EXTICMD = ();
3670 3905
3671 warn "unloading/nuking all extensions"; 3906 trace "unloading/nuking all extensions";
3672 for my $pkg (@EXTS) { 3907 for my $pkg (@EXTS) {
3673 warn "... unloading $pkg"; 3908 trace "... unloading $pkg";
3674 3909
3675 if (my $cb = $pkg->can ("unload")) { 3910 if (my $cb = $pkg->can ("unload")) {
3676 eval { 3911 eval {
3677 $cb->($pkg); 3912 $cb->($pkg);
3678 1 3913 1
3679 } or warn "$pkg unloaded, but with errors: $@"; 3914 } or error "$pkg unloaded, but with errors: $@";
3680 } 3915 }
3681 3916
3682 warn "... clearing $pkg"; 3917 trace "... clearing $pkg";
3683 clear_package $pkg; 3918 clear_package $pkg;
3684 } 3919 }
3685 3920
3686 warn "unloading all perl modules loaded from $LIBDIR"; 3921 trace "unloading all perl modules loaded from $LIBDIR";
3687 while (my ($k, $v) = each %INC) { 3922 while (my ($k, $v) = each %INC) {
3688 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3923 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3689 3924
3690 warn "... unloading $k"; 3925 trace "... unloading $k";
3691 delete $INC{$k}; 3926 delete $INC{$k};
3692 3927
3693 $k =~ s/\.pm$//; 3928 $k =~ s/\.pm$//;
3694 $k =~ s/\//::/g; 3929 $k =~ s/\//::/g;
3695 3930
3698 } 3933 }
3699 3934
3700 clear_package $k; 3935 clear_package $k;
3701 } 3936 }
3702 3937
3703 warn "getting rid of safe::, as good as possible"; 3938 trace "getting rid of safe::, as good as possible";
3704 clear_package "safe::$_" 3939 clear_package "safe::$_"
3705 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3940 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3706 3941
3707 warn "unloading cf.pm \"a bit\""; 3942 trace "unloading cf.pm \"a bit\"";
3708 delete $INC{"cf.pm"}; 3943 delete $INC{"cf.pm"};
3709 delete $INC{"cf/pod.pm"}; 3944 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3710 3945
3711 # don't, removes xs symbols, too, 3946 # don't, removes xs symbols, too,
3712 # and global variables created in xs 3947 # and global variables created in xs
3713 #clear_package __PACKAGE__; 3948 #clear_package __PACKAGE__;
3714 3949
3715 warn "unload completed, starting to reload now"; 3950 info "unload completed, starting to reload now";
3716 3951
3717 warn "reloading cf.pm"; 3952 trace "reloading cf.pm";
3718 require cf; 3953 require cf;
3719 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3954 cf::_connect_to_perl_1;
3720 3955
3721 warn "loading config and database again"; 3956 trace "loading config and database again";
3722 cf::reload_config; 3957 cf::reload_config;
3723 3958
3724 warn "loading extensions"; 3959 trace "loading extensions";
3725 cf::load_extensions; 3960 cf::load_extensions;
3726 3961
3962 if ($REATTACH_ON_RELOAD) {
3727 warn "reattaching attachments to objects/players"; 3963 trace "reattaching attachments to objects/players";
3728 _global_reattach; # objects, sockets 3964 _global_reattach; # objects, sockets
3729 warn "reattaching attachments to maps"; 3965 trace "reattaching attachments to maps";
3730 reattach $_ for values %MAP; 3966 reattach $_ for values %MAP;
3731 warn "reattaching attachments to players"; 3967 trace "reattaching attachments to players";
3732 reattach $_ for values %PLAYER; 3968 reattach $_ for values %PLAYER;
3969 }
3733 3970
3734 warn "running post_load"; 3971 trace "running post_init jobs";
3735 (pop @POST_INIT)->(1) while @POST_INIT; 3972 (pop @POST_INIT)->(1) while @POST_INIT;
3736 3973
3737 warn "leaving sync_job"; 3974 trace "leaving sync_job";
3738 3975
3739 1 3976 1
3740 } or do { 3977 } or do {
3741 warn $@; 3978 error $@;
3742 cf::cleanup "error while reloading, exiting."; 3979 cf::cleanup "error while reloading, exiting.";
3743 }; 3980 };
3744 3981
3745 warn "reloaded"; 3982 info "reloaded";
3746 --$RELOAD; 3983 --$RELOAD;
3747 } 3984 }
3985
3986 $t1 = AE::time - $t1;
3987 info "reload completed in ${t1}s\n";
3748}; 3988};
3749 3989
3750our $RELOAD_WATCHER; # used only during reload 3990our $RELOAD_WATCHER; # used only during reload
3751 3991
3752sub reload_perl() { 3992sub reload_perl() {
3753 # doing reload synchronously and two reloads happen back-to-back, 3993 # doing reload synchronously and two reloads happen back-to-back,
3754 # coro crashes during coro_state_free->destroy here. 3994 # coro crashes during coro_state_free->destroy here.
3755 3995
3996 $RELOAD_WATCHER ||= cf::async {
3997 Coro::AIO::aio_wait cache_extensions;
3998
3756 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 3999 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3757 do_reload_perl; 4000 do_reload_perl;
3758 undef $RELOAD_WATCHER; 4001 undef $RELOAD_WATCHER;
4002 };
3759 }; 4003 };
3760} 4004}
3761 4005
3762register_command "reload" => sub { 4006register_command "reload" => sub {
3763 my ($who, $arg) = @_; 4007 my ($who, $arg) = @_;
3769 reload_perl; 4013 reload_perl;
3770 }; 4014 };
3771 } 4015 }
3772}; 4016};
3773 4017
3774unshift @INC, $LIBDIR; 4018#############################################################################
3775 4019
3776my $bug_warning = 0; 4020my $bug_warning = 0;
3777 4021
3778our @WAIT_FOR_TICK; 4022our @WAIT_FOR_TICK;
3779our @WAIT_FOR_TICK_BEGIN; 4023our @WAIT_FOR_TICK_BEGIN;
3780 4024
3781sub wait_for_tick { 4025sub wait_for_tick() {
3782 return if tick_inhibit || $Coro::current == $Coro::main; 4026 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3783 4027
3784 my $signal = new Coro::Signal; 4028 my $signal = new Coro::Signal;
3785 push @WAIT_FOR_TICK, $signal; 4029 push @WAIT_FOR_TICK, $signal;
3786 $signal->wait; 4030 $signal->wait;
3787} 4031}
3788 4032
3789sub wait_for_tick_begin { 4033sub wait_for_tick_begin() {
3790 return if tick_inhibit || $Coro::current == $Coro::main; 4034 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3791 4035
3792 my $signal = new Coro::Signal; 4036 my $signal = new Coro::Signal;
3793 push @WAIT_FOR_TICK_BEGIN, $signal; 4037 push @WAIT_FOR_TICK_BEGIN, $signal;
3794 $signal->wait; 4038 $signal->wait;
3795} 4039}
3801 return; 4045 return;
3802 } 4046 }
3803 4047
3804 cf::server_tick; # one server iteration 4048 cf::server_tick; # one server iteration
3805 4049
4050 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4051
3806 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4052 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3807 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4053 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3808 Coro::async_pool { 4054 Coro::async_pool {
3809 $Coro::current->{desc} = "runtime saver"; 4055 $Coro::current->{desc} = "runtime saver";
3810 write_runtime_sync 4056 write_runtime_sync
3811 or warn "ERROR: unable to write runtime file: $!"; 4057 or error "ERROR: unable to write runtime file: $!";
3812 }; 4058 };
3813 } 4059 }
3814 4060
3815 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4061 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3816 $sig->send; 4062 $sig->send;
3824 4070
3825 if (0) { 4071 if (0) {
3826 if ($NEXT_TICK) { 4072 if ($NEXT_TICK) {
3827 my $jitter = $TICK_START - $NEXT_TICK; 4073 my $jitter = $TICK_START - $NEXT_TICK;
3828 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4074 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3829 warn "jitter $JITTER\n";#d# 4075 debug "jitter $JITTER\n";#d#
3830 } 4076 }
3831 } 4077 }
3832} 4078}
3833 4079
3834{ 4080{
3835 # configure BDB 4081 # configure BDB
3836 4082
3837 BDB::min_parallel 8; 4083 BDB::min_parallel 16;
3838 BDB::max_poll_reqs $TICK * 0.1; 4084 BDB::max_poll_reqs $TICK * 0.1;
3839 $AnyEvent::BDB::WATCHER->priority (1); 4085 $AnyEvent::BDB::WATCHER->priority (1);
3840 4086
3841 unless ($DB_ENV) { 4087 unless ($DB_ENV) {
3842 $DB_ENV = BDB::db_env_create; 4088 $DB_ENV = BDB::db_env_create;
3922 LOG llevInfo, "[ABT] [suppressed]\n"; 4168 LOG llevInfo, "[ABT] [suppressed]\n";
3923 } 4169 }
3924} 4170}
3925 4171
3926# load additional modules 4172# load additional modules
3927use cf::pod; 4173require "cf/$_.pm" for @EXTRA_MODULES;
4174cf::_connect_to_perl_2;
3928 4175
3929END { cf::emergency_save } 4176END { cf::emergency_save }
3930 4177
39311 41781
3932 4179

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines