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.450 by root, Mon Sep 22 01:33:09 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
81our %EXTCMD = (); 87our %EXTCMD = ();
82our %EXTICMD = (); 88our %EXTICMD = ();
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 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;
127 143
128our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
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
148
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 :)
132 153
133binmode STDOUT; 154binmode STDOUT;
134binmode STDERR; 155binmode STDERR;
135 156
136# read virtual server time, if available 157# read virtual server time, if available
138 open my $fh, "<", $RUNTIMEFILE 159 open my $fh, "<", $RUNTIMEFILE
139 or die "unable to read $RUNTIMEFILE file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
140 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
141} 162}
142 163
164eval "sub TICK() { $TICK } 1" or die;
165
143mkdir $_ 166mkdir $_
144 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
145 168
146our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
147 170
148sub 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::"} };
149 187
150############################################################################# 188#############################################################################
151 189
152=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
153 191
195from wherever your confdir points to. 233from wherever your confdir points to.
196 234
197=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
198 236
199These 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
200returns 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
201per 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.
202 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
203=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
204 247
205This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
206C<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
207that call. 250that call.
208 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
209=back 258=back
210 259
211=cut 260=cut
212 261
213BEGIN { 262sub error(@) { LOG llevError, join "", @_ }
214 *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 {
215 my $msg = join "", @_; 269 my $msg = join "", @_;
216 270
217 $msg .= "\n" 271 $msg .= "\n"
218 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
219 273
220 $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;
221 275
222 LOG llevError, $msg; 276 LOG llevWarn, $msg;
223 }; 277};
224}
225 278
226$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
227 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
228 281
229 if ($Coro::current == $Coro::main) {#d# 282 error Carp::longmess $_[0];
283
284 if (in_main) {#d#
230 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
231 return;#d# 286 return;#d#
232 }#d# 287 }#d#
233 288
234 # kill coroutine otherwise 289 # kill coroutine otherwise
235 warn Carp::longmess $_[0];
236 Coro::terminate 290 Coro::terminate
237}; 291};
238
239$SIG{__DIE__} = sub { }; #d#?
240 292
241@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
242@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
243@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
244@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 296@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
258)) { 310)) {
259 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
260} 312}
261 313
262$EV::DIED = sub { 314$EV::DIED = sub {
263 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
264}; 316};
265 317
266############################################################################# 318#############################################################################
267 319
268=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
305our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 357our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
306 358
307sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
308sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
309 361
362=item cf::post_init { BLOCK }
363
364Execute the given codeblock, I<after> all extensions have been (re-)loaded,
365but I<before> the server starts ticking again.
366
367The cdoeblock will have a single boolean argument to indicate whether this
368is a reload or not.
369
370=cut
371
372sub post_init(&) {
373 push @POST_INIT, shift;
374}
375
310=item cf::lock_wait $string 376=item cf::lock_wait $string
311 377
312Wait until the given lock is available. See cf::lock_acquire. 378Wait until the given lock is available. See cf::lock_acquire.
313 379
314=item my $lock = cf::lock_acquire $string 380=item my $lock = cf::lock_acquire $string
315 381
316Wait 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
317a 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,
318for example when the coroutine gets canceled), the lock is automatically 384for example when the coroutine gets canceled), the lock is automatically
319returned. 385returned.
320 386
321Locks 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
322deadlocked coro. 388deadlocked coro.
328 394
329Return 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.
330 396
331=cut 397=cut
332 398
333our %LOCK; 399our $LOCKS = new Coro::SemaphoreSet;
334our %LOCKER;#d#
335 400
336sub lock_wait($) { 401sub lock_wait($) {
337 my ($key) = @_; 402 $LOCKS->wait ($_[0]);
338
339 if ($LOCKER{$key} == $Coro::current) {#d#
340 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
341 return;#d#
342 }#d#
343
344 # wait for lock, if any
345 while ($LOCK{$key}) {
346 push @{ $LOCK{$key} }, $Coro::current;
347 Coro::schedule;
348 }
349} 403}
350 404
351sub lock_acquire($) { 405sub lock_acquire($) {
352 my ($key) = @_; 406 $LOCKS->guard ($_[0])
353
354 # wait, to be sure we are not locked
355 lock_wait $key;
356
357 $LOCK{$key} = [];
358 $LOCKER{$key} = $Coro::current;#d#
359
360 Coro::guard {
361 delete $LOCKER{$key};#d#
362 # wake up all waiters, to be on the safe side
363 $_->ready for @{ delete $LOCK{$key} };
364 }
365} 407}
366 408
367sub lock_active($) { 409sub lock_active($) {
368 my ($key) = @_; 410 $LOCKS->count ($_[0]) < 1
369
370 ! ! $LOCK{$key}
371} 411}
372 412
373sub freeze_mainloop { 413sub freeze_mainloop {
374 tick_inhibit_inc; 414 tick_inhibit_inc;
375 415
376 Coro::guard \&tick_inhibit_dec; 416 &Guard::guard (\&tick_inhibit_dec);
377} 417}
378 418
379=item cf::periodic $interval, $cb 419=item cf::periodic $interval, $cb
380 420
381Like 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
382get spread over timer. 422get spread over time.
383 423
384=cut 424=cut
385 425
386sub periodic($$) { 426sub periodic($$) {
387 my ($interval, $cb) = @_; 427 my ($interval, $cb) = @_;
404 444
405=cut 445=cut
406 446
407our @SLOT_QUEUE; 447our @SLOT_QUEUE;
408our $SLOT_QUEUE; 448our $SLOT_QUEUE;
449our $SLOT_DECAY = 0.9;
409 450
410$SLOT_QUEUE->cancel if $SLOT_QUEUE; 451$SLOT_QUEUE->cancel if $SLOT_QUEUE;
411$SLOT_QUEUE = Coro::async { 452$SLOT_QUEUE = Coro::async {
412 $Coro::current->desc ("timeslot manager"); 453 $Coro::current->desc ("timeslot manager");
413 454
414 my $signal = new Coro::Signal; 455 my $signal = new Coro::Signal;
456 my $busy;
415 457
416 while () { 458 while () {
417 next_job: 459 next_job:
460
418 my $avail = cf::till_tick; 461 my $avail = cf::till_tick;
419 if ($avail > 0.01) { 462
420 for (0 .. $#SLOT_QUEUE) { 463 for (0 .. $#SLOT_QUEUE) {
421 if ($SLOT_QUEUE[$_][0] < $avail) { 464 if ($SLOT_QUEUE[$_][0] <= $avail) {
465 $busy = 0;
422 my $job = splice @SLOT_QUEUE, $_, 1, (); 466 my $job = splice @SLOT_QUEUE, $_, 1, ();
423 $job->[2]->send; 467 $job->[2]->send;
424 Coro::cede; 468 Coro::cede;
425 goto next_job; 469 goto next_job;
426 } 470 } else {
471 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
427 } 472 }
428 } 473 }
429 474
430 if (@SLOT_QUEUE) { 475 if (@SLOT_QUEUE) {
431 # 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
432 push @cf::WAIT_FOR_TICK, $signal; 477 push @cf::WAIT_FOR_TICK, $signal;
433 $signal->wait; 478 $signal->wait;
434 } else { 479 } else {
480 $busy = 0;
435 Coro::schedule; 481 Coro::schedule;
436 } 482 }
437 } 483 }
438}; 484};
439 485
440sub get_slot($;$$) { 486sub get_slot($;$$) {
441 return if tick_inhibit || $Coro::current == $Coro::main; 487 return if tick_inhibit || $Coro::current == $Coro::main;
442 488
443 my ($time, $pri, $name) = @_; 489 my ($time, $pri, $name) = @_;
444 490
445 $time = $TICK * .6 if $time > $TICK * .6; 491 $time = clamp $time, 0.01, $TICK * .6;
492
446 my $sig = new Coro::Signal; 493 my $sig = new Coro::Signal;
447 494
448 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 495 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
449 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 496 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
450 $SLOT_QUEUE->ready; 497 $SLOT_QUEUE->ready;
476=cut 523=cut
477 524
478sub sync_job(&) { 525sub sync_job(&) {
479 my ($job) = @_; 526 my ($job) = @_;
480 527
481 if ($Coro::current == $Coro::main) { 528 if (in_main) {
482 my $time = EV::time; 529 my $time = AE::time;
483 530
484 # this is the main coro, too bad, we have to block 531 # this is the main coro, too bad, we have to block
485 # till the operation succeeds, freezing the server :/ 532 # till the operation succeeds, freezing the server :/
486 533
487 LOG llevError, Carp::longmess "sync job";#d# 534 #LOG llevError, Carp::longmess "sync job";#d#
488 535
489 my $freeze_guard = freeze_mainloop; 536 my $freeze_guard = freeze_mainloop;
490 537
491 my $busy = 1; 538 my $busy = 1;
492 my @res; 539 my @res;
493 540
494 (async { 541 (async {
495 $Coro::current->desc ("sync job coro"); 542 $Coro::current->desc ("sync job coro");
496 @res = eval { $job->() }; 543 @res = eval { $job->() };
497 warn $@ if $@; 544 error $@ if $@;
498 undef $busy; 545 undef $busy;
499 })->prio (Coro::PRIO_MAX); 546 })->prio (Coro::PRIO_MAX);
500 547
501 while ($busy) { 548 while ($busy) {
502 if (Coro::nready) { 549 if (Coro::nready) {
504 } else { 551 } else {
505 EV::loop EV::LOOP_ONESHOT; 552 EV::loop EV::LOOP_ONESHOT;
506 } 553 }
507 } 554 }
508 555
509 my $time = EV::time - $time; 556 my $time = AE::time - $time;
510 557
511 $TICK_START += $time; # do not account sync jobs to server load 558 $TICK_START += $time; # do not account sync jobs to server load
512 559
513 wantarray ? @res : $res[0] 560 wantarray ? @res : $res[0]
514 } else { 561 } else {
545Coro::Storable. May, of course, block. Note that the executed sub may 592Coro::Storable. May, of course, block. Note that the executed sub may
546never block itself or use any form of event handling. 593never block itself or use any form of event handling.
547 594
548=cut 595=cut
549 596
597sub post_fork {
598 reset_signals;
599}
600
550sub fork_call(&@) { 601sub fork_call(&@) {
551 my ($cb, @args) = @_; 602 my ($cb, @args) = @_;
552 603
553 # 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,
554 # otherwise perl prematurely frees the stuff :/ 605 # otherwise perl prematurely frees the stuff :/
555 # TODO: investigate and fix (likely this will be rather laborious) 606 # TODO: investigate and fix (likely this will be rather laborious)
556 607
557 my @res = Coro::Util::fork_eval { 608 my @res = Coro::Util::fork_eval {
558 reset_signals; 609 cf::post_fork;
559 &$cb 610 &$cb
560 }, @args; 611 }, @args;
561 612
562 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 )
563} 625}
564 626
565=item $coin = coin_from_name $name 627=item $coin = coin_from_name $name
566 628
567=cut 629=cut
604within each server. 666within each server.
605 667
606=cut 668=cut
607 669
608sub db_table($) { 670sub db_table($) {
671 cf::error "db_get called from main context"
672 if $Coro::current == $Coro::main;
673
609 my ($name) = @_; 674 my ($name) = @_;
610 my $db = BDB::db_create $DB_ENV; 675 my $db = BDB::db_create $DB_ENV;
611 676
612 eval { 677 eval {
613 $db->set_flags (BDB::CHKSUM); 678 $db->set_flags (BDB::CHKSUM);
623} 688}
624 689
625our $DB; 690our $DB;
626 691
627sub db_init { 692sub db_init {
628 cf::sync_job {
629 $DB ||= db_table "db"; 693 $DB ||= db_table "db";
630 };
631} 694}
632 695
633sub db_get($$) { 696sub db_get($$) {
634 my $key = "$_[0]/$_[1]"; 697 my $key = "$_[0]/$_[1]";
635 698
636 cf::sync_job { 699 cf::error "db_get called from main context"
700 if $Coro::current == $Coro::main;
701
637 BDB::db_get $DB, undef, $key, my $data; 702 BDB::db_get $DB, undef, $key, my $data;
638 703
639 $! ? () 704 $! ? ()
640 : $data 705 : $data
641 }
642} 706}
643 707
644sub db_put($$$) { 708sub db_put($$$) {
645 BDB::dbreq_pri 4; 709 BDB::dbreq_pri 4;
646 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 710 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
702 766
703 my $t1 = Time::HiRes::time; 767 my $t1 = Time::HiRes::time;
704 my $data = $process->(\@data); 768 my $data = $process->(\@data);
705 my $t2 = Time::HiRes::time; 769 my $t2 = Time::HiRes::time;
706 770
707 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 771 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
708 772
709 db_put cache => "$id/data", $data; 773 db_put cache => "$id/data", $data;
710 db_put cache => "$id/md5" , $md5; 774 db_put cache => "$id/md5" , $md5;
711 db_put cache => "$id/meta", $meta; 775 db_put cache => "$id/meta", $meta;
712 776
722 786
723=cut 787=cut
724 788
725sub datalog($@) { 789sub datalog($@) {
726 my ($type, %kv) = @_; 790 my ($type, %kv) = @_;
727 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 791 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
728} 792}
729 793
730=back 794=back
731 795
732=cut 796=cut
927 991
928 } elsif (exists $cb_id{$type}) { 992 } elsif (exists $cb_id{$type}) {
929 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 993 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
930 994
931 } elsif (ref $type) { 995 } elsif (ref $type) {
932 warn "attaching objects not supported, ignoring.\n"; 996 error "attaching objects not supported, ignoring.\n";
933 997
934 } else { 998 } else {
935 shift @arg; 999 shift @arg;
936 warn "attach argument '$type' not supported, ignoring.\n"; 1000 error "attach argument '$type' not supported, ignoring.\n";
937 } 1001 }
938 } 1002 }
939} 1003}
940 1004
941sub _object_attach { 1005sub _object_attach {
951 _attach $registry, $klass, @attach; 1015 _attach $registry, $klass, @attach;
952 } 1016 }
953 1017
954 $obj->{$name} = \%arg; 1018 $obj->{$name} = \%arg;
955 } else { 1019 } else {
956 warn "object uses attachment '$name' which is not available, postponing.\n"; 1020 info "object uses attachment '$name' which is not available, postponing.\n";
957 } 1021 }
958 1022
959 $obj->{_attachment}{$name} = undef; 1023 $obj->{_attachment}{$name} = undef;
960} 1024}
961 1025
1020 1084
1021 for (@$callbacks) { 1085 for (@$callbacks) {
1022 eval { &{$_->[1]} }; 1086 eval { &{$_->[1]} };
1023 1087
1024 if ($@) { 1088 if ($@) {
1025 warn "$@";
1026 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1089 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1027 override; 1090 override;
1028 } 1091 }
1029 1092
1030 return 1 if $override; 1093 return 1 if $override;
1031 } 1094 }
1110 for (@$attach) { 1173 for (@$attach) {
1111 my ($klass, @attach) = @$_; 1174 my ($klass, @attach) = @$_;
1112 _attach $registry, $klass, @attach; 1175 _attach $registry, $klass, @attach;
1113 } 1176 }
1114 } else { 1177 } else {
1115 warn "object uses attachment '$name' that is not available, postponing.\n"; 1178 info "object uses attachment '$name' that is not available, postponing.\n";
1116 } 1179 }
1117 } 1180 }
1118} 1181}
1119 1182
1120cf::attachable->attach ( 1183cf::attachable->attach (
1147 my ($filename, $rdata, $objs) = @_; 1210 my ($filename, $rdata, $objs) = @_;
1148 1211
1149 sync_job { 1212 sync_job {
1150 if (length $$rdata) { 1213 if (length $$rdata) {
1151 utf8::decode (my $decname = $filename); 1214 utf8::decode (my $decname = $filename);
1152 warn sprintf "saving %s (%d,%d)\n", 1215 trace sprintf "saving %s (%d,%d)\n",
1153 $decname, length $$rdata, scalar @$objs; 1216 $decname, length $$rdata, scalar @$objs
1217 if $VERBOSE_IO;
1154 1218
1155 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1219 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1156 aio_chmod $fh, SAVE_MODE; 1220 aio_chmod $fh, SAVE_MODE;
1157 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1221 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1158 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 }
1159 aio_close $fh; 1226 aio_close $fh;
1160 1227
1161 if (@$objs) { 1228 if (@$objs) {
1162 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) {
1163 aio_chmod $fh, SAVE_MODE; 1230 aio_chmod $fh, SAVE_MODE;
1164 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1231 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1165 aio_write $fh, 0, (length $data), $data, 0; 1232 aio_write $fh, 0, (length $data), $data, 0;
1166 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 }
1167 aio_close $fh; 1237 aio_close $fh;
1168 aio_rename "$filename.pst~", "$filename.pst"; 1238 aio_rename "$filename.pst~", "$filename.pst";
1169 } 1239 }
1170 } else { 1240 } else {
1171 aio_unlink "$filename.pst"; 1241 aio_unlink "$filename.pst";
1172 } 1242 }
1173 1243
1174 aio_rename "$filename~", $filename; 1244 aio_rename "$filename~", $filename;
1245
1246 $filename =~ s%/[^/]+$%%;
1247 aio_pathsync $filename if $cf::USE_FSYNC;
1175 } else { 1248 } else {
1176 warn "FATAL: $filename~: $!\n"; 1249 error "unable to save objects: $filename~: $!\n";
1177 } 1250 }
1178 } else { 1251 } else {
1179 aio_unlink $filename; 1252 aio_unlink $filename;
1180 aio_unlink "$filename.pst"; 1253 aio_unlink "$filename.pst";
1181 } 1254 }
1205 my $st = eval { Coro::Storable::thaw $av }; 1278 my $st = eval { Coro::Storable::thaw $av };
1206 $av = $st->{objs}; 1279 $av = $st->{objs};
1207 } 1280 }
1208 1281
1209 utf8::decode (my $decname = $filename); 1282 utf8::decode (my $decname = $filename);
1210 warn sprintf "loading %s (%d,%d)\n", 1283 trace sprintf "loading %s (%d,%d)\n",
1211 $decname, length $data, scalar @{$av || []}; 1284 $decname, length $data, scalar @{$av || []}
1285 if $VERBOSE_IO;
1212 1286
1213 ($data, $av) 1287 ($data, $av)
1214} 1288}
1215 1289
1216=head2 COMMAND CALLBACKS 1290=head2 COMMAND CALLBACKS
1272 my ($name, $cb) = @_; 1346 my ($name, $cb) = @_;
1273 1347
1274 $EXTICMD{$name} = $cb; 1348 $EXTICMD{$name} = $cb;
1275} 1349}
1276 1350
1351use File::Glob ();
1352
1277cf::player->attach ( 1353cf::player->attach (
1278 on_command => sub { 1354 on_unknown_command => sub {
1279 my ($pl, $name, $params) = @_; 1355 my ($pl, $name, $params) = @_;
1280 1356
1281 my $cb = $COMMAND{$name} 1357 my $cb = $COMMAND{$name}
1282 or return; 1358 or return;
1283 1359
1306 1382
1307 $pl->ext_reply ($reply, @reply) 1383 $pl->ext_reply ($reply, @reply)
1308 if $reply; 1384 if $reply;
1309 1385
1310 } else { 1386 } else {
1311 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1387 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1312 } 1388 }
1313 1389
1314 cf::override; 1390 cf::override;
1315 }, 1391 },
1316); 1392);
1317 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
1318sub load_extensions { 1407sub load_extensions {
1408 info "loading extensions...";
1409
1319 cf::sync_job { 1410 cf::sync_job {
1320 my %todo; 1411 my %todo;
1321 1412
1322 for my $path (<$LIBDIR/*.ext>) { 1413 for my $path (<$LIBDIR/*.ext>) {
1323 next unless -r $path; 1414 next unless -r $path;
1341 1432
1342 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1433 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1343 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1434 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1344 1435
1345 $ext{source} = 1436 $ext{source} =
1346 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1437 "package $pkg; use common::sense;\n"
1347 . "#line 1 \"$path\"\n{\n" 1438 . "#line 1 \"$path\"\n{\n"
1348 . $source 1439 . $source
1349 . "\n};\n1"; 1440 . "\n};\n1";
1350 1441
1351 $todo{$base} = \%ext; 1442 $todo{$base} = \%ext;
1352 } 1443 }
1353 1444
1445 my $pass = 0;
1354 my %done; 1446 my %done;
1355 while (%todo) { 1447 while (%todo) {
1356 my $progress; 1448 my $progress;
1357 1449
1450 ++$pass;
1451
1452 ext:
1358 while (my ($k, $v) = each %todo) { 1453 while (my ($k, $v) = each %todo) {
1359 for (split /,\s*/, $v->{meta}{depends}) { 1454 for (split /,\s*/, $v->{meta}{depends}) {
1360 goto skip 1455 next ext
1361 unless exists $done{$_}; 1456 unless exists $done{$_};
1362 } 1457 }
1363 1458
1364 warn "... loading '$k' into '$v->{pkg}'\n"; 1459 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1365 1460
1366 unless (eval $v->{source}) { 1461 my $active = eval $v->{source};
1462
1463 if (length $@) {
1367 my $msg = $@ ? "$v->{path}: $@\n" 1464 error "$v->{path}: $@\n";
1368 : "$v->{base}: extension inactive.\n";
1369 1465
1370 if (exists $v->{meta}{mandatory}) {
1371 warn $msg;
1372 cf::cleanup "mandatory extension failed to load, exiting."; 1466 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1373 } 1467 if exists $v->{meta}{mandatory};
1374 1468
1375 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;
1376 } 1478 }
1377
1378 $done{$k} = delete $todo{$k};
1379 push @EXTS, $v->{pkg};
1380 $progress = 1;
1381 } 1479 }
1382 1480
1383 skip: 1481 unless ($progress) {
1384 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1482 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1385 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 }
1386 } 1489 }
1387 }; 1490 };
1388} 1491}
1389 1492
1390############################################################################# 1493#############################################################################
1444 1547
1445sub exists($) { 1548sub exists($) {
1446 my ($login) = @_; 1549 my ($login) = @_;
1447 1550
1448 $cf::PLAYER{$login} 1551 $cf::PLAYER{$login}
1449 or cf::sync_job { !aio_stat path $login } 1552 or !aio_stat path $login
1450} 1553}
1451 1554
1452sub find($) { 1555sub find($) {
1453 return $cf::PLAYER{$_[0]} || do { 1556 return $cf::PLAYER{$_[0]} || do {
1454 my $login = $_[0]; 1557 my $login = $_[0];
1474 $cf::PLAYER{$login} = $pl 1577 $cf::PLAYER{$login} = $pl
1475 } 1578 }
1476 } 1579 }
1477} 1580}
1478 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
1479sub save($) { 1595sub save($) {
1480 my ($pl) = @_; 1596 my ($pl) = @_;
1481 1597
1482 return if $pl->{deny_save}; 1598 return if $pl->{deny_save};
1483 1599
1488 1604
1489 aio_mkdir playerdir $pl, 0770; 1605 aio_mkdir playerdir $pl, 0770;
1490 $pl->{last_save} = $cf::RUNTIME; 1606 $pl->{last_save} = $cf::RUNTIME;
1491 1607
1492 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];
1493 1612
1494 $pl->save_pl ($path); 1613 $pl->save_pl ($path);
1495 cf::cede_to_tick; 1614 cf::cede_to_tick;
1496} 1615}
1497 1616
1533 $pl->{deny_save} = 1; 1652 $pl->{deny_save} = 1;
1534 $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
1535 1654
1536 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1655 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1537 $pl->deactivate; 1656 $pl->deactivate;
1657
1538 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;
1539 $pl->ob->check_score; 1659 ext::highscore::check ($pl->ob);
1660
1540 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1661 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1541 $pl->ns->destroy if $pl->ns; 1662 $pl->ns->destroy if $pl->ns;
1542 1663
1543 my $path = playerdir $pl; 1664 my $path = playerdir $pl;
1544 my $temp = "$path~$cf::RUNTIME~deleting~"; 1665 my $temp = "$path~$cf::RUNTIME~deleting~";
1599 \@logins 1720 \@logins
1600} 1721}
1601 1722
1602=item $player->maps 1723=item $player->maps
1603 1724
1725=item cf::player::maps $login
1726
1604Returns an arrayref of map paths that are private for this 1727Returns an arrayref of map paths that are private for this
1605player. May block. 1728player. May block.
1606 1729
1607=cut 1730=cut
1608 1731
1670=cut 1793=cut
1671 1794
1672sub find_by_path($) { 1795sub find_by_path($) {
1673 my ($path) = @_; 1796 my ($path) = @_;
1674 1797
1798 $path =~ s/^~[^\/]*//; # skip ~login
1799
1675 my ($match, $specificity); 1800 my ($match, $specificity);
1676 1801
1677 for my $region (list) { 1802 for my $region (list) {
1678 if ($region->{match} && $path =~ $region->{match}) { 1803 if ($region->{match} && $path =~ $region->{match}) {
1679 ($match, $specificity) = ($region, $region->specificity) 1804 ($match, $specificity) = ($region, $region->specificity)
1710 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
1711 1836
1712 # mit "rum" bekleckern, nicht 1837 # mit "rum" bekleckern, nicht
1713 $self->_create_random_map ( 1838 $self->_create_random_map (
1714 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1839 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1715 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1840 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1716 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1841 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1717 $rmp->{exit_on_final_map}, 1842 $rmp->{exit_on_final_map},
1718 $rmp->{xsize}, $rmp->{ysize}, 1843 $rmp->{xsize}, $rmp->{ysize},
1719 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1844 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1720 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1845 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1735 1860
1736sub register { 1861sub register {
1737 my (undef, $regex, $prio) = @_; 1862 my (undef, $regex, $prio) = @_;
1738 my $pkg = caller; 1863 my $pkg = caller;
1739 1864
1740 no strict;
1741 push @{"$pkg\::ISA"}, __PACKAGE__; 1865 push @{"$pkg\::ISA"}, __PACKAGE__;
1742 1866
1743 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1867 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1744} 1868}
1745 1869
1746# also paths starting with '/' 1870# also paths starting with '/'
1747$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1871$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1748 1872
1749sub thawer_merge { 1873sub thawer_merge {
1750 my ($self, $merge) = @_; 1874 my ($self, $merge) = @_;
1751 1875
1752 # we have to keep some variables in memory intact 1876 # we have to keep some variables in memory intact
1757} 1881}
1758 1882
1759sub normalise { 1883sub normalise {
1760 my ($path, $base) = @_; 1884 my ($path, $base) = @_;
1761 1885
1762 $path = "$path"; # make sure its a string 1886 $path = "$path"; # make sure it's a string
1763 1887
1764 $path =~ s/\.map$//; 1888 $path =~ s/\.map$//;
1765 1889
1766 # map plan: 1890 # map plan:
1767 # 1891 #
1806 $self->init; # pass $1 etc. 1930 $self->init; # pass $1 etc.
1807 return $self; 1931 return $self;
1808 } 1932 }
1809 } 1933 }
1810 1934
1811 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1935 Carp::cluck "unable to resolve path '$path' (base '$base')";
1812 () 1936 ()
1813} 1937}
1814 1938
1815sub init { 1939sub init {
1816 my ($self) = @_; 1940 my ($self) = @_;
1848sub uniq_path { 1972sub uniq_path {
1849 my ($self) = @_; 1973 my ($self) = @_;
1850 1974
1851 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1975 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1852 "$UNIQUEDIR/$path" 1976 "$UNIQUEDIR/$path"
1853}
1854
1855# and all this just because we cannot iterate over
1856# all maps in C++...
1857sub change_all_map_light {
1858 my ($change) = @_;
1859
1860 $_->change_map_light ($change)
1861 for grep $_->outdoor, values %cf::MAP;
1862} 1977}
1863 1978
1864sub decay_objects { 1979sub decay_objects {
1865 my ($self) = @_; 1980 my ($self) = @_;
1866 1981
1948 2063
1949sub find; 2064sub find;
1950sub find { 2065sub find {
1951 my ($path, $origin) = @_; 2066 my ($path, $origin) = @_;
1952 2067
2068 cf::cede_to_tick;
2069
1953 $path = normalise $path, $origin && $origin->path; 2070 $path = normalise $path, $origin && $origin->path;
1954 2071
1955 cf::lock_wait "map_data:$path";#d#remove 2072 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1956 cf::lock_wait "map_find:$path"; 2073 my $guard2 = cf::lock_acquire "map_find:$path";
1957 2074
1958 $cf::MAP{$path} || do { 2075 $cf::MAP{$path} || do {
1959 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1960 my $guard2 = cf::lock_acquire "map_find:$path";
1961
1962 my $map = new_from_path cf::map $path 2076 my $map = new_from_path cf::map $path
1963 or return; 2077 or return;
1964 2078
1965 $map->{last_save} = $cf::RUNTIME; 2079 $map->{last_save} = $cf::RUNTIME;
1966 2080
1978 2092
1979 $cf::MAP{$path} = $map 2093 $cf::MAP{$path} = $map
1980 } 2094 }
1981} 2095}
1982 2096
1983sub pre_load { } 2097sub pre_load { }
1984sub post_load { } 2098#sub post_load { } # XS
1985 2099
1986sub load { 2100sub load {
1987 my ($self) = @_; 2101 my ($self) = @_;
1988 2102
1989 local $self->{deny_reset} = 1; # loading can take a long time 2103 local $self->{deny_reset} = 1; # loading can take a long time
2034 unless ($self->{deny_activate}) { 2148 unless ($self->{deny_activate}) {
2035 $self->decay_objects; 2149 $self->decay_objects;
2036 $self->fix_auto_apply; 2150 $self->fix_auto_apply;
2037 $self->update_buttons; 2151 $self->update_buttons;
2038 cf::cede_to_tick; 2152 cf::cede_to_tick;
2039 $self->set_darkness_map;
2040 cf::cede_to_tick;
2041 $self->activate; 2153 $self->activate;
2042 } 2154 }
2043 2155
2044 $self->{last_save} = $cf::RUNTIME; 2156 $self->{last_save} = $cf::RUNTIME;
2045 $self->last_access ($cf::RUNTIME); 2157 $self->last_access ($cf::RUNTIME);
2048 } 2160 }
2049 2161
2050 $self->post_load; 2162 $self->post_load;
2051} 2163}
2052 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
2053sub customise_for { 2168sub customise_for {
2054 my ($self, $ob) = @_; 2169 my ($self, $ob) = @_;
2055 2170
2056 return find "~" . $ob->name . "/" . $self->{path} 2171 return find "~" . $ob->name . "/" . $self->{path}
2057 if $self->per_player; 2172 if $self->per_player;
2073 or next; 2188 or next;
2074 $neigh = find $neigh, $map 2189 $neigh = find $neigh, $map
2075 or next; 2190 or next;
2076 $neigh->load; 2191 $neigh->load;
2077 2192
2193 # now find the diagonal neighbours
2078 push @neigh, 2194 push @neigh,
2079 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2195 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2080 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2196 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2081 } 2197 }
2082 2198
2089} 2205}
2090 2206
2091sub find_sync { 2207sub find_sync {
2092 my ($path, $origin) = @_; 2208 my ($path, $origin) = @_;
2093 2209
2094 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
2095} 2214}
2096 2215
2097sub do_load_sync { 2216sub do_load_sync {
2098 my ($map) = @_; 2217 my ($map) = @_;
2099 2218
2100 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2219 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2101 if $Coro::current == $Coro::main; 2220 if $Coro::current == $Coro::main;
2102 2221
2103 cf::sync_job { $map->load }; 2222 $map->load;
2104} 2223}
2105 2224
2106our %MAP_PREFETCH; 2225our %MAP_PREFETCH;
2107our $MAP_PREFETCHER = undef; 2226our $MAP_PREFETCHER = undef;
2108 2227
2134 $MAP_PREFETCHER->prio (6); 2253 $MAP_PREFETCHER->prio (6);
2135 2254
2136 () 2255 ()
2137} 2256}
2138 2257
2258# common code, used by both ->save and ->swapout
2139sub save { 2259sub _save {
2140 my ($self) = @_; 2260 my ($self) = @_;
2141
2142 my $lock = cf::lock_acquire "map_data:$self->{path}";
2143 2261
2144 $self->{last_save} = $cf::RUNTIME; 2262 $self->{last_save} = $cf::RUNTIME;
2145 2263
2146 return unless $self->dirty; 2264 return unless $self->dirty;
2147 2265
2167 } else { 2285 } else {
2168 $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);
2169 } 2287 }
2170} 2288}
2171 2289
2290sub save {
2291 my ($self) = @_;
2292
2293 my $lock = cf::lock_acquire "map_data:$self->{path}";
2294
2295 $self->_save;
2296}
2297
2172sub swap_out { 2298sub swap_out {
2173 my ($self) = @_; 2299 my ($self) = @_;
2174 2300
2175 # save first because save cedes
2176 $self->save;
2177
2178 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2301 my $lock = cf::lock_acquire "map_data:$self->{path}";
2179 2302
2180 return if $self->players;
2181 return if $self->in_memory != cf::MAP_ACTIVE; 2303 return if $self->in_memory != cf::MAP_ACTIVE;
2182 return if $self->{deny_save}; 2304 return if $self->{deny_save};
2305 return if $self->players;
2183 2306
2307 # first deactivate the map and "unlink" it from the core
2308 $self->deactivate;
2309 $_->clear_links_to ($self) for values %cf::MAP;
2184 $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};
2185 2357
2186 $self->deactivate; 2358 $self->deactivate;
2187 $_->clear_links_to ($self) for values %cf::MAP; 2359 $_->clear_links_to ($self) for values %cf::MAP;
2188 $self->clear; 2360 $self->clear;
2189}
2190
2191sub reset_at {
2192 my ($self) = @_;
2193
2194 # TODO: safety, remove and allow resettable per-player maps
2195 return 1e99 if $self->{deny_reset};
2196
2197 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2198 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2199
2200 $time + $to
2201}
2202
2203sub should_reset {
2204 my ($self) = @_;
2205
2206 $self->reset_at <= $cf::RUNTIME
2207}
2208
2209sub reset {
2210 my ($self) = @_;
2211
2212 my $lock = cf::lock_acquire "map_data:$self->{path}";
2213
2214 return if $self->players;
2215
2216 warn "resetting map ", $self->path;
2217
2218 $self->in_memory (cf::MAP_SWAPPED);
2219
2220 # need to save uniques path
2221 unless ($self->{deny_save}) {
2222 my $uniq = $self->uniq_path; utf8::encode $uniq;
2223
2224 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2225 if $uniq;
2226 }
2227
2228 delete $cf::MAP{$self->path};
2229
2230 $self->deactivate;
2231 $_->clear_links_to ($self) for values %cf::MAP;
2232 $self->clear;
2233 2361
2234 $self->unlink_save; 2362 $self->unlink_save;
2235 $self->destroy; 2363 $self->destroy;
2236} 2364}
2237 2365
2245 2373
2246 delete $cf::MAP{$self->path}; 2374 delete $cf::MAP{$self->path};
2247 2375
2248 $self->unlink_save; 2376 $self->unlink_save;
2249 2377
2250 bless $self, "cf::map"; 2378 bless $self, "cf::map::wrap";
2251 delete $self->{deny_reset}; 2379 delete $self->{deny_reset};
2252 $self->{deny_save} = 1; 2380 $self->{deny_save} = 1;
2253 $self->reset_timeout (1); 2381 $self->reset_timeout (1);
2254 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2382 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2255 2383
2312 : normalise $_ 2440 : normalise $_
2313 } @{ aio_readdir $UNIQUEDIR or [] } 2441 } @{ aio_readdir $UNIQUEDIR or [] }
2314 ] 2442 ]
2315} 2443}
2316 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
2317=back 2477=back
2318 2478
2319=head3 cf::object 2479=head3 cf::object
2320 2480
2321=cut 2481=cut
2386 2546
2387our $SAY_CHANNEL = { 2547our $SAY_CHANNEL = {
2388 id => "say", 2548 id => "say",
2389 title => "Map", 2549 title => "Map",
2390 reply => "say ", 2550 reply => "say ",
2391 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.",
2392}; 2552};
2393 2553
2394our $CHAT_CHANNEL = { 2554our $CHAT_CHANNEL = {
2395 id => "chat", 2555 id => "chat",
2396 title => "Chat", 2556 title => "Chat",
2453 2613
2454Freezes 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}>).
2455 2615
2456The 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.
2457for 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,
2458though, 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
2459map. 2619map.
2460 2620
2461Will never block. 2621Will never block.
2462 2622
2463=item $player_object->leave_link ($map, $x, $y) 2623=item $player_object->leave_link ($map, $x, $y)
2484sub cf::object::player::enter_link { 2644sub cf::object::player::enter_link {
2485 my ($self) = @_; 2645 my ($self) = @_;
2486 2646
2487 $self->deactivate_recursive; 2647 $self->deactivate_recursive;
2488 2648
2649 ++$self->{_link_recursion};
2650
2489 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2651 return if UNIVERSAL::isa $self->map, "ext::map_link";
2490 2652
2491 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2653 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2492 if $self->map && $self->map->{path} ne "{link}"; 2654 if $self->map && $self->map->{path} ne "{link}";
2493 2655
2494 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2656 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2495} 2657}
2496 2658
2497sub cf::object::player::leave_link { 2659sub cf::object::player::leave_link {
2498 my ($self, $map, $x, $y) = @_; 2660 my ($self, $map, $x, $y) = @_;
2499 2661
2516 ($x, $y) = (-1, -1) 2678 ($x, $y) = (-1, -1)
2517 unless (defined $x) && (defined $y); 2679 unless (defined $x) && (defined $y);
2518 2680
2519 # use -1 or undef as default coordinates, not 0, 0 2681 # use -1 or undef as default coordinates, not 0, 0
2520 ($x, $y) = ($map->enter_x, $map->enter_y) 2682 ($x, $y) = ($map->enter_x, $map->enter_y)
2521 if $x <=0 && $y <= 0; 2683 if $x <= 0 && $y <= 0;
2522 2684
2523 $map->load; 2685 $map->load;
2524 $map->load_neighbours; 2686 $map->load_neighbours;
2525 2687
2526 return unless $self->contr->active; 2688 return unless $self->contr->active;
2527 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2528 $self->activate_recursive;
2529 2689
2530 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2690 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2531 $self->enter_map ($map, $x, $y); 2691 if ($self->enter_map ($map, $x, $y)) {
2532} 2692 # entering was successful
2693 delete $self->{_link_recursion};
2694 # only activate afterwards, to support waiting in hooks
2695 $self->activate_recursive;
2696 }
2533 2697
2698}
2699
2534=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)]])
2535 2701
2536Moves 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
2537her, loading and preparing them map, calling the provided $check callback 2703her, loading and preparing them map, calling the provided $check callback
2538that 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
2539the 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
2546 2712
2547our $GOTOGEN; 2713our $GOTOGEN;
2548 2714
2549sub cf::object::player::goto { 2715sub cf::object::player::goto {
2550 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 }
2551 2723
2552 # 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
2553 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2725 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2554 2726
2555 $self->enter_link; 2727 $self->enter_link;
2579 my $map = eval { 2751 my $map = eval {
2580 my $map = defined $path ? cf::map::find $path : undef; 2752 my $map = defined $path ? cf::map::find $path : undef;
2581 2753
2582 if ($map) { 2754 if ($map) {
2583 $map = $map->customise_for ($self); 2755 $map = $map->customise_for ($self);
2584 $map = $check->($map) if $check && $map; 2756 $map = $check->($map, $x, $y, $self) if $check && $map;
2585 } else { 2757 } else {
2586 $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);
2587 } 2759 }
2588 2760
2589 $map 2761 $map
2597 if ($gen == $self->{_goto_generation}) { 2769 if ($gen == $self->{_goto_generation}) {
2598 delete $self->{_goto_generation}; 2770 delete $self->{_goto_generation};
2599 $self->leave_link ($map, $x, $y); 2771 $self->leave_link ($map, $x, $y);
2600 } 2772 }
2601 2773
2602 $done->() if $done; 2774 $done->($self) if $done;
2603 })->prio (1); 2775 })->prio (1);
2604} 2776}
2605 2777
2606=item $player_object->enter_exit ($exit_object) 2778=item $player_object->enter_exit ($exit_object)
2607 2779
2700 $self->message ("Something went wrong deep within the deliantra server. " 2872 $self->message ("Something went wrong deep within the deliantra server. "
2701 . "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. "
2702 . "Please report this to the dungeon master!", 2874 . "Please report this to the dungeon master!",
2703 cf::NDI_UNIQUE | cf::NDI_RED); 2875 cf::NDI_UNIQUE | cf::NDI_RED);
2704 2876
2705 warn "ERROR in enter_exit: $@"; 2877 error "ERROR in enter_exit: $@";
2706 $self->leave_link; 2878 $self->leave_link;
2707 } 2879 }
2708 })->prio (1); 2880 })->prio (1);
2709} 2881}
2710 2882
2722sub cf::client::send_drawinfo { 2894sub cf::client::send_drawinfo {
2723 my ($self, $text, $flags) = @_; 2895 my ($self, $text, $flags) = @_;
2724 2896
2725 utf8::encode $text; 2897 utf8::encode $text;
2726 $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);
2727} 2924}
2728 2925
2729=item $client->send_msg ($channel, $msg, $color, [extra...]) 2926=item $client->send_msg ($channel, $msg, $color, [extra...])
2730 2927
2731Send 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
2735 2932
2736=cut 2933=cut
2737 2934
2738# non-persistent channels (usually the info channel) 2935# non-persistent channels (usually the info channel)
2739our %CHANNEL = ( 2936our %CHANNEL = (
2937 "c/motd" => {
2938 id => "infobox",
2939 title => "MOTD",
2940 reply => undef,
2941 tooltip => "The message of the day",
2942 },
2740 "c/identify" => { 2943 "c/identify" => {
2741 id => "infobox", 2944 id => "infobox",
2742 title => "Identify", 2945 title => "Identify",
2743 reply => undef, 2946 reply => undef,
2744 tooltip => "Items recently identified", 2947 tooltip => "Items recently identified",
2746 "c/examine" => { 2949 "c/examine" => {
2747 id => "infobox", 2950 id => "infobox",
2748 title => "Examine", 2951 title => "Examine",
2749 reply => undef, 2952 reply => undef,
2750 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",
2751 }, 2960 },
2752 "c/book" => { 2961 "c/book" => {
2753 id => "infobox", 2962 id => "infobox",
2754 title => "Book", 2963 title => "Book",
2755 reply => undef, 2964 reply => undef,
2771 id => "infobox", 2980 id => "infobox",
2772 title => "Body Parts", 2981 title => "Body Parts",
2773 reply => undef, 2982 reply => undef,
2774 tooltip => "Shows which body parts you posess and are available", 2983 tooltip => "Shows which body parts you posess and are available",
2775 }, 2984 },
2985 "c/statistics" => {
2986 id => "infobox",
2987 title => "Statistics",
2988 reply => undef,
2989 tooltip => "Shows your primary statistics",
2990 },
2776 "c/skills" => { 2991 "c/skills" => {
2777 id => "infobox", 2992 id => "infobox",
2778 title => "Skills", 2993 title => "Skills",
2779 reply => undef, 2994 reply => undef,
2780 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",
2781 }, 3020 },
2782 "c/uptime" => { 3021 "c/uptime" => {
2783 id => "infobox", 3022 id => "infobox",
2784 title => "Uptime", 3023 title => "Uptime",
2785 reply => undef, 3024 reply => undef,
2795 id => "party", 3034 id => "party",
2796 title => "Party", 3035 title => "Party",
2797 reply => "gsay ", 3036 reply => "gsay ",
2798 tooltip => "Messages and chat related to your party", 3037 tooltip => "Messages and chat related to your party",
2799 }, 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,
2800); 3047);
2801 3048
2802sub cf::client::send_msg { 3049sub cf::client::send_msg {
2803 my ($self, $channel, $msg, $color, @extra) = @_; 3050 my ($self, $channel, $msg, $color, @extra) = @_;
2804 3051
2809 3056
2810 # check predefined channels, for the benefit of C 3057 # check predefined channels, for the benefit of C
2811 if ($CHANNEL{$channel}) { 3058 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel}; 3059 $channel = $CHANNEL{$channel};
2813 3060
2814 $self->ext_msg (channel_info => $channel) 3061 $self->ext_msg (channel_info => $channel);
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id}; 3062 $channel = $channel->{id};
2818 3063
2819 } elsif (ref $channel) { 3064 } elsif (ref $channel) {
2820 # send meta info to client, if not yet sent 3065 # send meta info to client, if not yet sent
2821 unless (exists $self->{channel}{$channel->{id}}) { 3066 unless (exists $self->{channel}{$channel->{id}}) {
2822 $self->{channel}{$channel->{id}} = $channel; 3067 $self->{channel}{$channel->{id}} = $channel;
2823 $self->ext_msg (channel_info => $channel) 3068 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825 } 3069 }
2826 3070
2827 $channel = $channel->{id}; 3071 $channel = $channel->{id};
2828 } 3072 }
2829 3073
2830 return unless @extra || length $msg; 3074 return unless @extra || length $msg;
2831 3075
2832 if ($self->can_msg) {
2833 # default colour, mask it out 3076 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3077 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF; 3078 if $color & cf::NDI_DEF;
2836 3079
2837 my $pkt = "msg " 3080 my $pkt = "msg "
2838 . $self->{json_coder}->encode ( 3081 . $self->{json_coder}->encode (
2839 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3082 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2840 ); 3083 );
2841 3084
2842 # try lzf for large packets
2843 $pkt = "lzf " . Compress::LZF::compress $pkt
2844 if 1024 <= length $pkt and $self->{can_lzf};
2845
2846 # split very large packets
2847 if (8192 < length $pkt and $self->{can_lzf}) {
2848 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2849 $pkt = "frag";
2850 }
2851
2852 $self->send_packet ($pkt); 3085 $self->send_big_packet ($pkt);
2853 } else {
2854 if ($color >= 0) {
2855 # replace some tags by gcfclient-compatible ones
2856 for ($msg) {
2857 1 while
2858 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2859 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2860 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2861 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2862 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2863 }
2864
2865 $color &= cf::NDI_COLOR_MASK;
2866
2867 utf8::encode $msg;
2868
2869 if (0 && $msg =~ /\[/) {
2870 # COMMAND/INFO
2871 $self->send_packet ("drawextinfo $color 10 8 $msg")
2872 } else {
2873 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2874 $self->send_packet ("drawinfo $color $msg")
2875 }
2876 }
2877 }
2878} 3086}
2879 3087
2880=item $client->ext_msg ($type, @msg) 3088=item $client->ext_msg ($type, @msg)
2881 3089
2882Sends an ext event to the client. 3090Sends an ext event to the client.
2885 3093
2886sub cf::client::ext_msg($$@) { 3094sub cf::client::ext_msg($$@) {
2887 my ($self, $type, @msg) = @_; 3095 my ($self, $type, @msg) = @_;
2888 3096
2889 if ($self->extcmd == 2) { 3097 if ($self->extcmd == 2) {
2890 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3098 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2891 } elsif ($self->extcmd == 1) { # TODO: remove 3099 } elsif ($self->extcmd == 1) { # TODO: remove
2892 push @msg, msgtype => "event_$type"; 3100 push @msg, msgtype => "event_$type";
2893 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3101 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2894 } 3102 }
2895} 3103}
2896 3104
2897=item $client->ext_reply ($msgid, @msg) 3105=item $client->ext_reply ($msgid, @msg)
2898 3106
2902 3110
2903sub cf::client::ext_reply($$@) { 3111sub cf::client::ext_reply($$@) {
2904 my ($self, $id, @msg) = @_; 3112 my ($self, $id, @msg) = @_;
2905 3113
2906 if ($self->extcmd == 2) { 3114 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3115 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2908 } elsif ($self->extcmd == 1) { 3116 } elsif ($self->extcmd == 1) {
2909 #TODO: version 1, remove 3117 #TODO: version 1, remove
2910 unshift @msg, msgtype => "reply", msgid => $id; 3118 unshift @msg, msgtype => "reply", msgid => $id;
2911 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3119 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2912 } 3120 }
2913} 3121}
2914 3122
2915=item $success = $client->query ($flags, "text", \&cb) 3123=item $success = $client->query ($flags, "text", \&cb)
2916 3124
2987 3195
2988 $ns->ext_reply ($reply, @reply) 3196 $ns->ext_reply ($reply, @reply)
2989 if $reply; 3197 if $reply;
2990 3198
2991 } else { 3199 } else {
2992 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";
2993 } 3201 }
2994 3202
2995 cf::override; 3203 cf::override;
2996 }, 3204 },
2997); 3205);
3017 3225
3018 $coro 3226 $coro
3019} 3227}
3020 3228
3021cf::client->attach ( 3229cf::client->attach (
3022 on_destroy => sub { 3230 on_client_destroy => sub {
3023 my ($ns) = @_; 3231 my ($ns) = @_;
3024 3232
3025 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3233 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3026 }, 3234 },
3027); 3235);
3043our $safe_hole = new Safe::Hole; 3251our $safe_hole = new Safe::Hole;
3044 3252
3045$SIG{FPE} = 'IGNORE'; 3253$SIG{FPE} = 'IGNORE';
3046 3254
3047$safe->permit_only (Opcode::opset qw( 3255$safe->permit_only (Opcode::opset qw(
3048 :base_core :base_mem :base_orig :base_math 3256 :base_core :base_mem :base_orig :base_math :base_loop
3049 grepstart grepwhile mapstart mapwhile 3257 grepstart grepwhile mapstart mapwhile
3050 sort time 3258 sort time
3051)); 3259));
3052 3260
3053# here we export the classes and methods available to script code 3261# here we export the classes and methods available to script code
3057The following functions and methods are available within a safe environment: 3265The following functions and methods are available within a safe environment:
3058 3266
3059 cf::object 3267 cf::object
3060 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
3061 insert remove name archname title slaying race decrease split 3269 insert remove name archname title slaying race decrease split
3270 value
3062 3271
3063 cf::object::player 3272 cf::object::player
3064 player 3273 player
3065 3274
3066 cf::player 3275 cf::player
3072=cut 3281=cut
3073 3282
3074for ( 3283for (
3075 ["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
3076 insert remove inv nrof name archname title slaying race 3285 insert remove inv nrof name archname title slaying race
3077 decrease split destroy change_exp)], 3286 decrease split destroy change_exp value msg lore send_msg)],
3078 ["cf::object::player" => qw(player)], 3287 ["cf::object::player" => qw(player)],
3079 ["cf::player" => qw(peaceful)], 3288 ["cf::player" => qw(peaceful send_msg)],
3080 ["cf::map" => qw(trigger)], 3289 ["cf::map" => qw(trigger)],
3081) { 3290) {
3082 no strict 'refs';
3083 my ($pkg, @funs) = @$_; 3291 my ($pkg, @funs) = @$_;
3084 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3292 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3085 for @funs; 3293 for @funs;
3086} 3294}
3087 3295
3102 3310
3103 my $qcode = $code; 3311 my $qcode = $code;
3104 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3312 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3105 $qcode =~ s/\n/\\n/g; 3313 $qcode =~ s/\n/\\n/g;
3106 3314
3315 %vars = (_dummy => 0) unless %vars;
3316
3317 my @res;
3107 local $_; 3318 local $_;
3108 local @safe::cf::_safe_eval_args = values %vars;
3109 3319
3110 my $eval = 3320 my $eval =
3111 "do {\n" 3321 "do {\n"
3112 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3322 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3113 . "#line 0 \"{$qcode}\"\n" 3323 . "#line 0 \"{$qcode}\"\n"
3114 . $code 3324 . $code
3115 . "\n}" 3325 . "\n}"
3116 ; 3326 ;
3117 3327
3328 if ($CFG{safe_eval}) {
3118 sub_generation_inc; 3329 sub_generation_inc;
3330 local @safe::cf::_safe_eval_args = values %vars;
3119 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3331 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3120 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 }
3121 3337
3122 if ($@) { 3338 if ($@) {
3123 warn "$@"; 3339 warn "$@",
3124 warn "while executing safe code '$code'\n"; 3340 "while executing safe code '$code'\n",
3125 warn "with arguments " . (join " ", %vars) . "\n"; 3341 "with arguments " . (join " ", %vars) . "\n";
3126 } 3342 }
3127 3343
3128 wantarray ? @res : $res[0] 3344 wantarray ? @res : $res[0]
3129} 3345}
3130 3346
3144=cut 3360=cut
3145 3361
3146sub register_script_function { 3362sub register_script_function {
3147 my ($fun, $cb) = @_; 3363 my ($fun, $cb) = @_;
3148 3364
3149 no strict 'refs'; 3365 $fun = "safe::$fun" if $CFG{safe_eval};
3150 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3366 *$fun = $safe_hole->wrap ($cb);
3151} 3367}
3152 3368
3153=back 3369=back
3154 3370
3155=cut 3371=cut
3164 # for this (global event?) 3380 # for this (global event?)
3165 %ext::player_env::MUSIC_FACE_CACHE = (); 3381 %ext::player_env::MUSIC_FACE_CACHE = ();
3166 3382
3167 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3383 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3168 3384
3169 warn "loading facedata from $path\n"; 3385 trace "loading facedata from $path\n";
3170 3386
3171 my $facedata;
3172 0 < aio_load $path, $facedata 3387 0 < aio_load $path, my $facedata
3173 or die "$path: $!"; 3388 or die "$path: $!";
3174 3389
3175 $facedata = Coro::Storable::thaw $facedata; 3390 $facedata = Coro::Storable::thaw $facedata;
3176 3391
3177 $facedata->{version} == 2 3392 $facedata->{version} == 2
3178 or cf::cleanup "$path: version mismatch, cannot proceed."; 3393 or cf::cleanup "$path: version mismatch, cannot proceed.";
3179 3394
3180 # 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]);
3181 $facedata->{resource}{"res/exp_table"} = { 3397 $facedata->{resource}{"res/exp_table"} = {
3182 type => FT_RSRC, 3398 type => FT_RSRC,
3183 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),
3184 }; 3401 };
3185 cf::cede_to_tick; 3402 cf::cede_to_tick;
3186 3403
3187 { 3404 {
3188 my $faces = $facedata->{faceinfo}; 3405 my $faces = $facedata->{faceinfo};
3190 while (my ($face, $info) = each %$faces) { 3407 while (my ($face, $info) = each %$faces) {
3191 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3408 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3192 3409
3193 cf::face::set_visibility $idx, $info->{visibility}; 3410 cf::face::set_visibility $idx, $info->{visibility};
3194 cf::face::set_magicmap $idx, $info->{magicmap}; 3411 cf::face::set_magicmap $idx, $info->{magicmap};
3195 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3412 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3196 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3413 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3197 3414
3198 cf::cede_to_tick; 3415 cf::cede_to_tick;
3199 } 3416 }
3200 3417
3201 while (my ($face, $info) = each %$faces) { 3418 while (my ($face, $info) = each %$faces) {
3206 3423
3207 if (my $smooth = cf::face::find $info->{smooth}) { 3424 if (my $smooth = cf::face::find $info->{smooth}) {
3208 cf::face::set_smooth $idx, $smooth; 3425 cf::face::set_smooth $idx, $smooth;
3209 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3426 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3210 } else { 3427 } else {
3211 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3428 error "smooth face '$info->{smooth}' not found for face '$face'";
3212 } 3429 }
3213 3430
3214 cf::cede_to_tick; 3431 cf::cede_to_tick;
3215 } 3432 }
3216 } 3433 }
3225 3442
3226 cf::anim::invalidate_all; # d'oh 3443 cf::anim::invalidate_all; # d'oh
3227 } 3444 }
3228 3445
3229 { 3446 {
3230 # TODO: for gcfclient pleasure, we should give resources
3231 # that gcfclient doesn't grok a >10000 face index.
3232 my $res = $facedata->{resource}; 3447 my $res = $facedata->{resource};
3233 3448
3234 while (my ($name, $info) = each %$res) { 3449 while (my ($name, $info) = each %$res) {
3235 if (defined $info->{type}) { 3450 if (defined $info->{type}) {
3236 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3451 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3237 my $data;
3238 3452
3239 if ($info->{type} & 1) { 3453 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3240 # prepend meta info
3241
3242 my $meta = $enc->encode ({
3243 name => $name,
3244 %{ $info->{meta} || {} },
3245 });
3246
3247 $data = pack "(w/a*)*", $meta, $info->{data};
3248 } else {
3249 $data = $info->{data};
3250 }
3251
3252 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3253 cf::face::set_type $idx, $info->{type}; 3454 cf::face::set_type $idx, $info->{type};
3254 } else { 3455 } else {
3255 $RESOURCE{$name} = $info; 3456 $RESOURCE{$name} = $info; # unused
3256 } 3457 }
3257 3458
3258 cf::cede_to_tick; 3459 cf::cede_to_tick;
3259 } 3460 }
3260 } 3461 }
3261 3462
3262 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3463 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3263 3464
3264 1 3465 1
3265} 3466}
3266
3267cf::global->attach (on_resource_update => sub {
3268 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3269 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3270
3271 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3272 my $sound = $soundconf->{compat}[$_]
3273 or next;
3274
3275 my $face = cf::face::find "sound/$sound->[1]";
3276 cf::sound::set $sound->[0] => $face;
3277 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3278 }
3279
3280 while (my ($k, $v) = each %{$soundconf->{event}}) {
3281 my $face = cf::face::find "sound/$v";
3282 cf::sound::set $k => $face;
3283 }
3284 }
3285});
3286 3467
3287register_exticmd fx_want => sub { 3468register_exticmd fx_want => sub {
3288 my ($ns, $want) = @_; 3469 my ($ns, $want) = @_;
3289 3470
3290 while (my ($k, $v) = each %$want) { 3471 while (my ($k, $v) = each %$want) {
3329sub reload_treasures { 3510sub reload_treasures {
3330 load_resource_file "$DATADIR/treasures" 3511 load_resource_file "$DATADIR/treasures"
3331 or die "unable to load treasurelists\n"; 3512 or die "unable to load treasurelists\n";
3332} 3513}
3333 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
3334sub reload_resources { 3538sub reload_resources {
3335 warn "reloading resource files...\n"; 3539 trace "reloading resource files...\n";
3336 3540
3541 reload_exp_table;
3542 reload_materials;
3337 reload_facedata; 3543 reload_facedata;
3544 reload_sound;
3338 reload_archetypes; 3545 reload_archetypes;
3339 reload_regions; 3546 reload_regions;
3340 reload_treasures; 3547 reload_treasures;
3341 3548
3342 warn "finished reloading resource files\n"; 3549 trace "finished reloading resource files\n";
3343}
3344
3345sub init {
3346 my $guard = freeze_mainloop;
3347
3348 evthread_start IO::AIO::poll_fileno;
3349
3350 reload_resources;
3351} 3550}
3352 3551
3353sub reload_config { 3552sub reload_config {
3354 open my $fh, "<:utf8", "$CONFDIR/config" 3553 trace "reloading config file...\n";
3355 or return;
3356 3554
3357 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...
3358 *CFG = YAML::Load <$fh>; 3561 *CFG = YAML::XS::Load $config;
3359 3562
3360 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3563 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3361 3564
3362 $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};
3363 $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};
3364 3567
3365 if (exists $CFG{mlockall}) { 3568 if (exists $CFG{mlockall}) {
3388 3591
3389 seek $fh, 0, 0; 3592 seek $fh, 0, 0;
3390 print $fh $$; 3593 print $fh $$;
3391} 3594}
3392 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
3393sub main { 3605sub main {
3394 atomic; 3606 cf::init_globals; # initialise logging
3607
3608 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3609 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3610 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3611 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3612
3613 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3395 3614
3396 # we must not ever block the main coroutine 3615 # we must not ever block the main coroutine
3397 local $Coro::idle = sub { 3616 local $Coro::idle = sub {
3398 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3617 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3399 (async { 3618 (async {
3400 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3619 $Coro::current->{desc} = "IDLE BUG HANDLER";
3401 EV::loop EV::LOOP_ONESHOT; 3620 EV::loop EV::LOOP_ONESHOT;
3402 })->prio (Coro::PRIO_MAX); 3621 })->prio (Coro::PRIO_MAX);
3403 }; 3622 };
3404 3623
3405 { 3624 evthread_start IO::AIO::poll_fileno;
3406 my $guard = freeze_mainloop; 3625
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
3635 reload_resources;
3407 reload_config; 3636 reload_config;
3408 db_init; 3637 db_init;
3638
3639 cf::init_uuid;
3640 cf::init_signals;
3641 cf::init_skills;
3642
3643 cf::init_beforeplay;
3644
3645 atomic;
3646
3409 load_extensions; 3647 load_extensions;
3410 3648
3411 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3412 }
3413
3414 utime time, time, $RUNTIMEFILE; 3649 utime time, time, $RUNTIMEFILE;
3415 3650
3416 # no (long-running) fork's whatsoever before this point(!) 3651 # no (long-running) fork's whatsoever before this point(!)
3652 use POSIX ();
3417 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};
3418 3654
3419 EV::loop; 3655 (pop @POST_INIT)->(0) while @POST_INIT;
3656 };
3657
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;
3420} 3667}
3421 3668
3422############################################################################# 3669#############################################################################
3423# initialisation and cleanup 3670# initialisation and cleanup
3424 3671
3425# install some emergency cleanup handlers 3672# install some emergency cleanup handlers
3426BEGIN { 3673BEGIN {
3427 our %SIGWATCHER = (); 3674 our %SIGWATCHER = ();
3428 for my $signal (qw(INT HUP TERM)) { 3675 for my $signal (qw(INT HUP TERM)) {
3429 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3676 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3430 cf::cleanup "SIG$signal"; 3677 cf::cleanup "SIG$signal";
3431 }; 3678 };
3432 } 3679 }
3433} 3680}
3434 3681
3435sub write_runtime_sync { 3682sub write_runtime_sync {
3683 my $t0 = AE::time;
3684
3436 # first touch the runtime file to show we are still running: 3685 # first touch the runtime file to show we are still running:
3437 # the fsync below can take a very very long time. 3686 # the fsync below can take a very very long time.
3438 3687
3439 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3688 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3440 3689
3441 my $guard = cf::lock_acquire "write_runtime"; 3690 my $guard = cf::lock_acquire "write_runtime";
3442 3691
3443 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3692 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3444 or return; 3693 or return;
3445 3694
3446 my $value = $cf::RUNTIME + 90 + 10; 3695 my $value = $cf::RUNTIME + 90 + 10;
3447 # 10 is the runtime save interval, for a monotonic clock 3696 # 10 is the runtime save interval, for a monotonic clock
3448 # 60 allows for the watchdog to kill the server. 3697 # 60 allows for the watchdog to kill the server.
3461 or return; 3710 or return;
3462 3711
3463 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3712 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3464 and return; 3713 and return;
3465 3714
3466 warn "runtime file written.\n"; 3715 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3467 3716
3468 1 3717 1
3469} 3718}
3470 3719
3471our $uuid_lock; 3720our $uuid_lock;
3480 my $uuid = "$LOCALDIR/uuid"; 3729 my $uuid = "$LOCALDIR/uuid";
3481 3730
3482 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3731 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3483 or return; 3732 or return;
3484 3733
3485 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3734 my $value = uuid_seq uuid_cur;
3735
3736 unless ($value) {
3737 info "cowardly refusing to write zero uuid value!\n";
3738 return;
3739 }
3740
3741 my $value = uuid_str $value + $uuid_skip;
3486 $uuid_skip = 0; 3742 $uuid_skip = 0;
3487 3743
3488 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3744 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3489 and return; 3745 and return;
3490 3746
3496 or return; 3752 or return;
3497 3753
3498 aio_rename "$uuid~", $uuid 3754 aio_rename "$uuid~", $uuid
3499 and return; 3755 and return;
3500 3756
3501 warn "uuid file written ($value).\n"; 3757 trace "uuid file written ($value).\n";
3502 3758
3503 1 3759 1
3504 3760
3505} 3761}
3506 3762
3512} 3768}
3513 3769
3514sub emergency_save() { 3770sub emergency_save() {
3515 my $freeze_guard = cf::freeze_mainloop; 3771 my $freeze_guard = cf::freeze_mainloop;
3516 3772
3517 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;
3518 3779
3519 cf::sync_job { 3780 cf::sync_job {
3781 cf::write_runtime_sync; # external watchdog should not bark
3782
3520 # use a peculiar iteration method to avoid tripping on perl 3783 # use a peculiar iteration method to avoid tripping on perl
3521 # refcount bugs in for. also avoids problems with players 3784 # refcount bugs in for. also avoids problems with players
3522 # and maps saved/destroyed asynchronously. 3785 # and maps saved/destroyed asynchronously.
3523 warn "begin emergency player save\n"; 3786 info "emergency_perl_save: begin player save\n";
3524 for my $login (keys %cf::PLAYER) { 3787 for my $login (keys %cf::PLAYER) {
3525 my $pl = $cf::PLAYER{$login} or next; 3788 my $pl = $cf::PLAYER{$login} or next;
3526 $pl->valid or next; 3789 $pl->valid or next;
3527 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3790 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3528 $pl->save; 3791 $pl->save;
3529 } 3792 }
3530 warn "end emergency player save\n"; 3793 info "emergency_perl_save: end player save\n";
3531 3794
3532 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";
3533 for my $path (keys %cf::MAP) { 3798 for my $path (keys %cf::MAP) {
3534 my $map = $cf::MAP{$path} or next; 3799 my $map = $cf::MAP{$path} or next;
3535 $map->valid or next; 3800 $map->valid or next;
3536 $map->save; 3801 $map->save;
3537 } 3802 }
3538 warn "end emergency map save\n"; 3803 info "emergency_perl_save: end map save\n";
3539 3804
3540 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";
3541 BDB::db_env_txn_checkpoint $DB_ENV; 3808 BDB::db_env_txn_checkpoint $DB_ENV;
3542 warn "end emergency database checkpoint\n"; 3809 info "emergency_perl_save: end database checkpoint\n";
3543 3810
3544 warn "begin write uuid\n"; 3811 info "emergency_perl_save: begin write uuid\n";
3545 write_uuid_sync 1; 3812 write_uuid_sync 1;
3546 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
3547 }; 3833 };
3548 3834
3549 warn "leave emergency perl save\n"; 3835 info "emergency_perl_save: leave\n";
3550} 3836}
3551 3837
3552sub post_cleanup { 3838sub post_cleanup {
3553 my ($make_core) = @_; 3839 my ($make_core) = @_;
3554 3840
3841 IO::AIO::flush;
3842
3555 warn Carp::longmess "post_cleanup backtrace" 3843 error Carp::longmess "post_cleanup backtrace"
3556 if $make_core; 3844 if $make_core;
3557 3845
3558 my $fh = pidfile; 3846 my $fh = pidfile;
3559 unlink $PIDFILE if <$fh> == $$; 3847 unlink $PIDFILE if <$fh> == $$;
3560} 3848}
3580 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3868 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3581 for my $name (keys %$leaf_symtab) { 3869 for my $name (keys %$leaf_symtab) {
3582 _gv_clear *{"$pkg$name"}; 3870 _gv_clear *{"$pkg$name"};
3583# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3871# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3584 } 3872 }
3585 warn "cleared package #$pkg\n";#d#
3586} 3873}
3587
3588our $RELOAD; # how many times to reload
3589 3874
3590sub do_reload_perl() { 3875sub do_reload_perl() {
3591 # can/must only be called in main 3876 # can/must only be called in main
3592 if ($Coro::current != $Coro::main) { 3877 unless (in_main) {
3593 warn "can only reload from main coroutine"; 3878 error "can only reload from main coroutine";
3594 return; 3879 return;
3595 } 3880 }
3596 3881
3597 return if $RELOAD++; 3882 return if $RELOAD++;
3598 3883
3884 my $t1 = AE::time;
3885
3599 while ($RELOAD) { 3886 while ($RELOAD) {
3887 cf::get_slot 0.1, -1, "reload_perl";
3600 warn "reloading..."; 3888 info "reloading...";
3601 3889
3602 warn "entering sync_job"; 3890 trace "entering sync_job";
3603 3891
3604 cf::sync_job { 3892 cf::sync_job {
3605 cf::write_runtime_sync; # external watchdog should not bark
3606 cf::emergency_save; 3893 #cf::emergency_save;
3607 cf::write_runtime_sync; # external watchdog should not bark
3608 3894
3609 warn "syncing database to disk";
3610 BDB::db_env_txn_checkpoint $DB_ENV;
3611
3612 # if anything goes wrong in here, we should simply crash as we already saved
3613
3614 warn "flushing outstanding aio requests";
3615 while (IO::AIO::nreqs || BDB::nreqs) {
3616 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3617 }
3618
3619 warn "cancelling all extension coros"; 3895 trace "cancelling all extension coros";
3620 $_->cancel for values %EXT_CORO; 3896 $_->cancel for values %EXT_CORO;
3621 %EXT_CORO = (); 3897 %EXT_CORO = ();
3622 3898
3623 warn "removing commands"; 3899 trace "removing commands";
3624 %COMMAND = (); 3900 %COMMAND = ();
3625 3901
3626 warn "removing ext/exti commands"; 3902 trace "removing ext/exti commands";
3627 %EXTCMD = (); 3903 %EXTCMD = ();
3628 %EXTICMD = (); 3904 %EXTICMD = ();
3629 3905
3630 warn "unloading/nuking all extensions"; 3906 trace "unloading/nuking all extensions";
3631 for my $pkg (@EXTS) { 3907 for my $pkg (@EXTS) {
3632 warn "... unloading $pkg"; 3908 trace "... unloading $pkg";
3633 3909
3634 if (my $cb = $pkg->can ("unload")) { 3910 if (my $cb = $pkg->can ("unload")) {
3635 eval { 3911 eval {
3636 $cb->($pkg); 3912 $cb->($pkg);
3637 1 3913 1
3638 } or warn "$pkg unloaded, but with errors: $@"; 3914 } or error "$pkg unloaded, but with errors: $@";
3639 } 3915 }
3640 3916
3641 warn "... clearing $pkg"; 3917 trace "... clearing $pkg";
3642 clear_package $pkg; 3918 clear_package $pkg;
3643 } 3919 }
3644 3920
3645 warn "unloading all perl modules loaded from $LIBDIR"; 3921 trace "unloading all perl modules loaded from $LIBDIR";
3646 while (my ($k, $v) = each %INC) { 3922 while (my ($k, $v) = each %INC) {
3647 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3923 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3648 3924
3649 warn "... unloading $k"; 3925 trace "... unloading $k";
3650 delete $INC{$k}; 3926 delete $INC{$k};
3651 3927
3652 $k =~ s/\.pm$//; 3928 $k =~ s/\.pm$//;
3653 $k =~ s/\//::/g; 3929 $k =~ s/\//::/g;
3654 3930
3657 } 3933 }
3658 3934
3659 clear_package $k; 3935 clear_package $k;
3660 } 3936 }
3661 3937
3662 warn "getting rid of safe::, as good as possible"; 3938 trace "getting rid of safe::, as good as possible";
3663 clear_package "safe::$_" 3939 clear_package "safe::$_"
3664 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);
3665 3941
3666 warn "unloading cf.pm \"a bit\""; 3942 trace "unloading cf.pm \"a bit\"";
3667 delete $INC{"cf.pm"}; 3943 delete $INC{"cf.pm"};
3668 delete $INC{"cf/pod.pm"}; 3944 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3669 3945
3670 # don't, removes xs symbols, too, 3946 # don't, removes xs symbols, too,
3671 # and global variables created in xs 3947 # and global variables created in xs
3672 #clear_package __PACKAGE__; 3948 #clear_package __PACKAGE__;
3673 3949
3674 warn "unload completed, starting to reload now"; 3950 info "unload completed, starting to reload now";
3675 3951
3676 warn "reloading cf.pm"; 3952 trace "reloading cf.pm";
3677 require cf; 3953 require cf;
3678 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3954 cf::_connect_to_perl_1;
3679 3955
3680 warn "loading config and database again"; 3956 trace "loading config and database again";
3681 cf::reload_config; 3957 cf::reload_config;
3682 3958
3683 warn "loading extensions"; 3959 trace "loading extensions";
3684 cf::load_extensions; 3960 cf::load_extensions;
3685 3961
3962 if ($REATTACH_ON_RELOAD) {
3686 warn "reattaching attachments to objects/players"; 3963 trace "reattaching attachments to objects/players";
3687 _global_reattach; # objects, sockets 3964 _global_reattach; # objects, sockets
3688 warn "reattaching attachments to maps"; 3965 trace "reattaching attachments to maps";
3689 reattach $_ for values %MAP; 3966 reattach $_ for values %MAP;
3690 warn "reattaching attachments to players"; 3967 trace "reattaching attachments to players";
3691 reattach $_ for values %PLAYER; 3968 reattach $_ for values %PLAYER;
3969 }
3692 3970
3971 trace "running post_init jobs";
3972 (pop @POST_INIT)->(1) while @POST_INIT;
3973
3693 warn "leaving sync_job"; 3974 trace "leaving sync_job";
3694 3975
3695 1 3976 1
3696 } or do { 3977 } or do {
3697 warn $@; 3978 error $@;
3698 cf::cleanup "error while reloading, exiting."; 3979 cf::cleanup "error while reloading, exiting.";
3699 }; 3980 };
3700 3981
3701 warn "reloaded"; 3982 info "reloaded";
3702 --$RELOAD; 3983 --$RELOAD;
3703 } 3984 }
3985
3986 $t1 = AE::time - $t1;
3987 info "reload completed in ${t1}s\n";
3704}; 3988};
3705 3989
3706our $RELOAD_WATCHER; # used only during reload 3990our $RELOAD_WATCHER; # used only during reload
3707 3991
3708sub reload_perl() { 3992sub reload_perl() {
3709 # doing reload synchronously and two reloads happen back-to-back, 3993 # doing reload synchronously and two reloads happen back-to-back,
3710 # coro crashes during coro_state_free->destroy here. 3994 # coro crashes during coro_state_free->destroy here.
3711 3995
3996 $RELOAD_WATCHER ||= cf::async {
3997 Coro::AIO::aio_wait cache_extensions;
3998
3712 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3999 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3713 do_reload_perl; 4000 do_reload_perl;
3714 undef $RELOAD_WATCHER; 4001 undef $RELOAD_WATCHER;
4002 };
3715 }; 4003 };
3716} 4004}
3717 4005
3718register_command "reload" => sub { 4006register_command "reload" => sub {
3719 my ($who, $arg) = @_; 4007 my ($who, $arg) = @_;
3725 reload_perl; 4013 reload_perl;
3726 }; 4014 };
3727 } 4015 }
3728}; 4016};
3729 4017
3730unshift @INC, $LIBDIR; 4018#############################################################################
3731 4019
3732my $bug_warning = 0; 4020my $bug_warning = 0;
3733 4021
3734our @WAIT_FOR_TICK; 4022our @WAIT_FOR_TICK;
3735our @WAIT_FOR_TICK_BEGIN; 4023our @WAIT_FOR_TICK_BEGIN;
3736 4024
3737sub wait_for_tick { 4025sub wait_for_tick() {
3738 return if tick_inhibit || $Coro::current == $Coro::main; 4026 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3739 4027
3740 my $signal = new Coro::Signal; 4028 my $signal = new Coro::Signal;
3741 push @WAIT_FOR_TICK, $signal; 4029 push @WAIT_FOR_TICK, $signal;
3742 $signal->wait; 4030 $signal->wait;
3743} 4031}
3744 4032
3745sub wait_for_tick_begin { 4033sub wait_for_tick_begin() {
3746 return if tick_inhibit || $Coro::current == $Coro::main; 4034 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3747 4035
3748 my $signal = new Coro::Signal; 4036 my $signal = new Coro::Signal;
3749 push @WAIT_FOR_TICK_BEGIN, $signal; 4037 push @WAIT_FOR_TICK_BEGIN, $signal;
3750 $signal->wait; 4038 $signal->wait;
3751} 4039}
3757 return; 4045 return;
3758 } 4046 }
3759 4047
3760 cf::server_tick; # one server iteration 4048 cf::server_tick; # one server iteration
3761 4049
4050 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4051
3762 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4052 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3763 $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.;
3764 Coro::async_pool { 4054 Coro::async_pool {
3765 $Coro::current->{desc} = "runtime saver"; 4055 $Coro::current->{desc} = "runtime saver";
3766 write_runtime_sync 4056 write_runtime_sync
3767 or warn "ERROR: unable to write runtime file: $!"; 4057 or error "ERROR: unable to write runtime file: $!";
3768 }; 4058 };
3769 } 4059 }
3770 4060
3771 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4061 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3772 $sig->send; 4062 $sig->send;
3780 4070
3781 if (0) { 4071 if (0) {
3782 if ($NEXT_TICK) { 4072 if ($NEXT_TICK) {
3783 my $jitter = $TICK_START - $NEXT_TICK; 4073 my $jitter = $TICK_START - $NEXT_TICK;
3784 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4074 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3785 warn "jitter $JITTER\n";#d# 4075 debug "jitter $JITTER\n";#d#
3786 } 4076 }
3787 } 4077 }
3788} 4078}
3789 4079
3790{ 4080{
3791 # configure BDB 4081 # configure BDB
3792 4082
3793 BDB::min_parallel 8; 4083 BDB::min_parallel 16;
3794 BDB::max_poll_reqs $TICK * 0.1; 4084 BDB::max_poll_reqs $TICK * 0.1;
3795 $AnyEvent::BDB::WATCHER->priority (1); 4085 $AnyEvent::BDB::WATCHER->priority (1);
3796 4086
3797 unless ($DB_ENV) { 4087 unless ($DB_ENV) {
3798 $DB_ENV = BDB::db_env_create; 4088 $DB_ENV = BDB::db_env_create;
3878 LOG llevInfo, "[ABT] [suppressed]\n"; 4168 LOG llevInfo, "[ABT] [suppressed]\n";
3879 } 4169 }
3880} 4170}
3881 4171
3882# load additional modules 4172# load additional modules
3883use cf::pod; 4173require "cf/$_.pm" for @EXTRA_MODULES;
4174cf::_connect_to_perl_2;
3884 4175
3885END { cf::emergency_save } 4176END { cf::emergency_save }
3886 4177
38871 41781
3888 4179

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines