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.445 by root, Wed Sep 10 18:18:10 2008 UTC vs.
Revision 1.558 by root, Tue Oct 5 22:35:30 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
63 64
64# configure various modules to our taste 65# configure various modules to our taste
65# 66#
66$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
68Compress::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
69 75
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
71 78
72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
73 82
74our %COMMAND = (); 83our %COMMAND = ();
75our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
76 85
77our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
78our %EXTCMD = (); 87our %EXTCMD = ();
79our %EXTICMD = (); 88our %EXTICMD = ();
80our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
81our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
82 91
83our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
84our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
85 96
86our $CONFDIR = confdir; 97our $CONFDIR = confdir;
87our $DATADIR = datadir; 98our $DATADIR = datadir;
88our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
89our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
95our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
96our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
97our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
98our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
99 110
100our %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;
101 118
102our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
103our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
104our $NEXT_TICK; 121our $NEXT_TICK;
105our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
106 123
107our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
108our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
109our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
110our $DB_ENV; 127our $DB_ENV;
111 128
129our @EXTRA_MODULES = qw(pod match mapscript incloader);
130
112our %CFG; 131our %CFG;
113 132
114our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
115our $RUNTIME; 134our $RUNTIME;
116our $NOW; 135our $NOW;
124 143
125our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
126our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
127our $JITTER; # average jitter 146our $JITTER; # average jitter
128our $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 :)
129 153
130binmode STDOUT; 154binmode STDOUT;
131binmode STDERR; 155binmode STDERR;
132 156
133# read virtual server time, if available 157# read virtual server time, if available
135 open my $fh, "<", $RUNTIMEFILE 159 open my $fh, "<", $RUNTIMEFILE
136 or die "unable to read $RUNTIMEFILE file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
137 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
138} 162}
139 163
164eval "sub TICK() { $TICK } 1" or die;
165
140mkdir $_ 166mkdir $_
141 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
142 168
143our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
144 170
145sub 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::"} };
146 187
147############################################################################# 188#############################################################################
148 189
149=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
150 191
192from wherever your confdir points to. 233from wherever your confdir points to.
193 234
194=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
195 236
196These 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
197returns 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
198per 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.
199 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
200=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
201 247
202This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
203C<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
204that call. 250that call.
205 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
206=back 258=back
207 259
208=cut 260=cut
209 261
210BEGIN { 262sub error(@) { LOG llevError, join "", @_ }
211 *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 {
212 my $msg = join "", @_; 269 my $msg = join "", @_;
213 270
214 $msg .= "\n" 271 $msg .= "\n"
215 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
216 273
217 $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;
218 275
219 LOG llevError, $msg; 276 LOG llevWarn, $msg;
220 }; 277};
221}
222 278
223$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
224 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
225 281
226 if ($Coro::current == $Coro::main) {#d# 282 error Carp::longmess $_[0];
283
284 if (in_main) {#d#
227 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
228 return;#d# 286 return;#d#
229 }#d# 287 }#d#
230 288
231 # kill coroutine otherwise 289 # kill coroutine otherwise
232 warn Carp::longmess $_[0];
233 Coro::terminate 290 Coro::terminate
234}; 291};
235
236$SIG{__DIE__} = sub { }; #d#?
237 292
238@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
239@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
240@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
241@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 296@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
255)) { 310)) {
256 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
257} 312}
258 313
259$EV::DIED = sub { 314$EV::DIED = sub {
260 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
261}; 316};
262 317
263############################################################################# 318#############################################################################
264 319
265=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
302our $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
303 358
304sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
305sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
306 361
362=item $ref = cf::yaml_load $scalar
363
364Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365
366=cut
367
368sub fork_call(&@);
369
370sub yaml_load($) {
371 fork_call { YAML::XS::Load $_[0] } @_
372}
373
374=item cf::post_init { BLOCK }
375
376Execute the given codeblock, I<after> all extensions have been (re-)loaded,
377but I<before> the server starts ticking again.
378
379The codeblock will have a single boolean argument to indicate whether this
380is a reload or not.
381
382=cut
383
384sub post_init(&) {
385 push @POST_INIT, shift;
386}
387
388sub _post_init {
389 trace "running post_init jobs";
390
391 # run them in parallel...
392
393 my @join;
394
395 while () {
396 push @join, map &Coro::async ($_, 0), @POST_INIT;
397 @POST_INIT = ();
398
399 @join or last;
400
401 (pop @join)->join;
402 }
403}
404
307=item cf::lock_wait $string 405=item cf::lock_wait $string
308 406
309Wait until the given lock is available. See cf::lock_acquire. 407Wait until the given lock is available. See cf::lock_acquire.
310 408
311=item my $lock = cf::lock_acquire $string 409=item my $lock = cf::lock_acquire $string
312 410
313Wait until the given lock is available and then acquires it and returns 411Wait until the given lock is available and then acquires it and returns
314a Coro::guard object. If the guard object gets destroyed (goes out of scope, 412a L<Guard> object. If the guard object gets destroyed (goes out of scope,
315for example when the coroutine gets canceled), the lock is automatically 413for example when the coroutine gets canceled), the lock is automatically
316returned. 414returned.
317 415
318Locks are *not* recursive, locking from the same coro twice results in a 416Locks are *not* recursive, locking from the same coro twice results in a
319deadlocked coro. 417deadlocked coro.
325 423
326Return true if the lock is currently active, i.e. somebody has locked it. 424Return true if the lock is currently active, i.e. somebody has locked it.
327 425
328=cut 426=cut
329 427
330our %LOCK; 428our $LOCKS = new Coro::SemaphoreSet;
331our %LOCKER;#d#
332 429
333sub lock_wait($) { 430sub lock_wait($) {
334 my ($key) = @_; 431 $LOCKS->wait ($_[0]);
335
336 if ($LOCKER{$key} == $Coro::current) {#d#
337 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
338 return;#d#
339 }#d#
340
341 # wait for lock, if any
342 while ($LOCK{$key}) {
343 push @{ $LOCK{$key} }, $Coro::current;
344 Coro::schedule;
345 }
346} 432}
347 433
348sub lock_acquire($) { 434sub lock_acquire($) {
349 my ($key) = @_; 435 $LOCKS->guard ($_[0])
350
351 # wait, to be sure we are not locked
352 lock_wait $key;
353
354 $LOCK{$key} = [];
355 $LOCKER{$key} = $Coro::current;#d#
356
357 Coro::guard {
358 delete $LOCKER{$key};#d#
359 # wake up all waiters, to be on the safe side
360 $_->ready for @{ delete $LOCK{$key} };
361 }
362} 436}
363 437
364sub lock_active($) { 438sub lock_active($) {
365 my ($key) = @_; 439 $LOCKS->count ($_[0]) < 1
366
367 ! ! $LOCK{$key}
368} 440}
369 441
370sub freeze_mainloop { 442sub freeze_mainloop {
371 tick_inhibit_inc; 443 tick_inhibit_inc;
372 444
373 Coro::guard \&tick_inhibit_dec; 445 &Guard::guard (\&tick_inhibit_dec);
374} 446}
375 447
376=item cf::periodic $interval, $cb 448=item cf::periodic $interval, $cb
377 449
378Like EV::periodic, but randomly selects a starting point so that the actions 450Like EV::periodic, but randomly selects a starting point so that the actions
379get spread over timer. 451get spread over time.
380 452
381=cut 453=cut
382 454
383sub periodic($$) { 455sub periodic($$) {
384 my ($interval, $cb) = @_; 456 my ($interval, $cb) = @_;
401 473
402=cut 474=cut
403 475
404our @SLOT_QUEUE; 476our @SLOT_QUEUE;
405our $SLOT_QUEUE; 477our $SLOT_QUEUE;
478our $SLOT_DECAY = 0.9;
406 479
407$SLOT_QUEUE->cancel if $SLOT_QUEUE; 480$SLOT_QUEUE->cancel if $SLOT_QUEUE;
408$SLOT_QUEUE = Coro::async { 481$SLOT_QUEUE = Coro::async {
409 $Coro::current->desc ("timeslot manager"); 482 $Coro::current->desc ("timeslot manager");
410 483
411 my $signal = new Coro::Signal; 484 my $signal = new Coro::Signal;
485 my $busy;
412 486
413 while () { 487 while () {
414 next_job: 488 next_job:
489
415 my $avail = cf::till_tick; 490 my $avail = cf::till_tick;
416 if ($avail > 0.01) { 491
417 for (0 .. $#SLOT_QUEUE) { 492 for (0 .. $#SLOT_QUEUE) {
418 if ($SLOT_QUEUE[$_][0] < $avail) { 493 if ($SLOT_QUEUE[$_][0] <= $avail) {
494 $busy = 0;
419 my $job = splice @SLOT_QUEUE, $_, 1, (); 495 my $job = splice @SLOT_QUEUE, $_, 1, ();
420 $job->[2]->send; 496 $job->[2]->send;
421 Coro::cede; 497 Coro::cede;
422 goto next_job; 498 goto next_job;
423 } 499 } else {
500 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
424 } 501 }
425 } 502 }
426 503
427 if (@SLOT_QUEUE) { 504 if (@SLOT_QUEUE) {
428 # we do not use wait_for_tick() as it returns immediately when tick is inactive 505 # we do not use wait_for_tick() as it returns immediately when tick is inactive
429 push @cf::WAIT_FOR_TICK, $signal; 506 push @cf::WAIT_FOR_TICK, $signal;
430 $signal->wait; 507 $signal->wait;
431 } else { 508 } else {
509 $busy = 0;
432 Coro::schedule; 510 Coro::schedule;
433 } 511 }
434 } 512 }
435}; 513};
436 514
437sub get_slot($;$$) { 515sub get_slot($;$$) {
438 return if tick_inhibit || $Coro::current == $Coro::main; 516 return if tick_inhibit || $Coro::current == $Coro::main;
439 517
440 my ($time, $pri, $name) = @_; 518 my ($time, $pri, $name) = @_;
441 519
442 $time = $TICK * .6 if $time > $TICK * .6; 520 $time = clamp $time, 0.01, $TICK * .6;
521
443 my $sig = new Coro::Signal; 522 my $sig = new Coro::Signal;
444 523
445 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 524 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
446 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 525 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
447 $SLOT_QUEUE->ready; 526 $SLOT_QUEUE->ready;
473=cut 552=cut
474 553
475sub sync_job(&) { 554sub sync_job(&) {
476 my ($job) = @_; 555 my ($job) = @_;
477 556
478 if ($Coro::current == $Coro::main) { 557 if (in_main) {
479 my $time = EV::time; 558 my $time = AE::time;
480 559
481 # this is the main coro, too bad, we have to block 560 # this is the main coro, too bad, we have to block
482 # till the operation succeeds, freezing the server :/ 561 # till the operation succeeds, freezing the server :/
483 562
484 LOG llevError, Carp::longmess "sync job";#d# 563 #LOG llevError, Carp::longmess "sync job";#d#
485 564
486 my $freeze_guard = freeze_mainloop; 565 my $freeze_guard = freeze_mainloop;
487 566
488 my $busy = 1; 567 my $busy = 1;
489 my @res; 568 my @res;
490 569
491 (async { 570 (async {
492 $Coro::current->desc ("sync job coro"); 571 $Coro::current->desc ("sync job coro");
493 @res = eval { $job->() }; 572 @res = eval { $job->() };
494 warn $@ if $@; 573 error $@ if $@;
495 undef $busy; 574 undef $busy;
496 })->prio (Coro::PRIO_MAX); 575 })->prio (Coro::PRIO_MAX);
497 576
498 while ($busy) { 577 while ($busy) {
499 if (Coro::nready) { 578 if (Coro::nready) {
501 } else { 580 } else {
502 EV::loop EV::LOOP_ONESHOT; 581 EV::loop EV::LOOP_ONESHOT;
503 } 582 }
504 } 583 }
505 584
506 my $time = EV::time - $time; 585 my $time = AE::time - $time;
507 586
508 $TICK_START += $time; # do not account sync jobs to server load 587 $TICK_START += $time; # do not account sync jobs to server load
509 588
510 wantarray ? @res : $res[0] 589 wantarray ? @res : $res[0]
511 } else { 590 } else {
533 $EXT_CORO{$coro+0} = $coro; 612 $EXT_CORO{$coro+0} = $coro;
534 613
535 $coro 614 $coro
536} 615}
537 616
538=item fork_call { }, $args 617=item fork_call { }, @args
539 618
540Executes the given code block with the given arguments in a seperate 619Executes the given code block with the given arguments in a seperate
541process, returning the results. Everything must be serialisable with 620process, returning the results. Everything must be serialisable with
542Coro::Storable. May, of course, block. Note that the executed sub may 621Coro::Storable. May, of course, block. Note that the executed sub may
543never block itself or use any form of event handling. 622never block itself or use any form of event handling.
544 623
545=cut 624=cut
546 625
626sub post_fork {
627 reset_signals;
628}
629
547sub fork_call(&@) { 630sub fork_call(&@) {
548 my ($cb, @args) = @_; 631 my ($cb, @args) = @_;
549 632
550 # we seemingly have to make a local copy of the whole thing, 633 # we seemingly have to make a local copy of the whole thing,
551 # otherwise perl prematurely frees the stuff :/ 634 # otherwise perl prematurely frees the stuff :/
552 # TODO: investigate and fix (likely this will be rather laborious) 635 # TODO: investigate and fix (likely this will be rather laborious)
553 636
554 my @res = Coro::Util::fork_eval { 637 my @res = Coro::Util::fork_eval {
555 reset_signals; 638 cf::post_fork;
556 &$cb 639 &$cb
557 }, @args; 640 } @args;
558 641
559 wantarray ? @res : $res[-1] 642 wantarray ? @res : $res[-1]
643}
644
645sub objinfo {
646 (
647 "counter value" => cf::object::object_count,
648 "objects created" => cf::object::create_count,
649 "objects destroyed" => cf::object::destroy_count,
650 "freelist size" => cf::object::free_count,
651 "allocated objects" => cf::object::objects_size,
652 "active objects" => cf::object::actives_size,
653 )
560} 654}
561 655
562=item $coin = coin_from_name $name 656=item $coin = coin_from_name $name
563 657
564=cut 658=cut
601within each server. 695within each server.
602 696
603=cut 697=cut
604 698
605sub db_table($) { 699sub db_table($) {
700 cf::error "db_get called from main context"
701 if $Coro::current == $Coro::main;
702
606 my ($name) = @_; 703 my ($name) = @_;
607 my $db = BDB::db_create $DB_ENV; 704 my $db = BDB::db_create $DB_ENV;
608 705
609 eval { 706 eval {
610 $db->set_flags (BDB::CHKSUM); 707 $db->set_flags (BDB::CHKSUM);
620} 717}
621 718
622our $DB; 719our $DB;
623 720
624sub db_init { 721sub db_init {
625 cf::sync_job {
626 $DB ||= db_table "db"; 722 $DB ||= db_table "db";
627 };
628} 723}
629 724
630sub db_get($$) { 725sub db_get($$) {
631 my $key = "$_[0]/$_[1]"; 726 my $key = "$_[0]/$_[1]";
632 727
633 cf::sync_job { 728 cf::error "db_get called from main context"
729 if $Coro::current == $Coro::main;
730
634 BDB::db_get $DB, undef, $key, my $data; 731 BDB::db_get $DB, undef, $key, my $data;
635 732
636 $! ? () 733 $! ? ()
637 : $data 734 : $data
638 }
639} 735}
640 736
641sub db_put($$$) { 737sub db_put($$$) {
642 BDB::dbreq_pri 4; 738 BDB::dbreq_pri 4;
643 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 739 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
699 795
700 my $t1 = Time::HiRes::time; 796 my $t1 = Time::HiRes::time;
701 my $data = $process->(\@data); 797 my $data = $process->(\@data);
702 my $t2 = Time::HiRes::time; 798 my $t2 = Time::HiRes::time;
703 799
704 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 800 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
705 801
706 db_put cache => "$id/data", $data; 802 db_put cache => "$id/data", $data;
707 db_put cache => "$id/md5" , $md5; 803 db_put cache => "$id/md5" , $md5;
708 db_put cache => "$id/meta", $meta; 804 db_put cache => "$id/meta", $meta;
709 805
719 815
720=cut 816=cut
721 817
722sub datalog($@) { 818sub datalog($@) {
723 my ($type, %kv) = @_; 819 my ($type, %kv) = @_;
724 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 820 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
725} 821}
726 822
727=back 823=back
728 824
729=cut 825=cut
730 826
731############################################################################# 827#############################################################################
732 828
733=head2 ATTACHABLE OBJECTS 829=head2 ATTACHABLE OBJECTS
734 830
735Many objects in crossfire are so-called attachable objects. That means you can 831Many objects in deliantra are so-called attachable objects. That means you can
736attach callbacks/event handlers (a collection of which is called an "attachment") 832attach callbacks/event handlers (a collection of which is called an "attachment")
737to it. All such attachable objects support the following methods. 833to it. All such attachable objects support the following methods.
738 834
739In the following description, CLASS can be any of C<global>, C<object> 835In the following description, CLASS can be any of C<global>, C<object>
740C<player>, C<client> or C<map> (i.e. the attachable objects in 836C<player>, C<client> or C<map> (i.e. the attachable objects in
790=item cf::CLASS::attachment $name, ... 886=item cf::CLASS::attachment $name, ...
791 887
792Register an attachment by C<$name> through which attachable objects of the 888Register an attachment by C<$name> through which attachable objects of the
793given CLASS can refer to this attachment. 889given CLASS can refer to this attachment.
794 890
795Some classes such as crossfire maps and objects can specify attachments 891Some classes such as deliantra maps and objects can specify attachments
796that are attached at load/instantiate time, thus the need for a name. 892that are attached at load/instantiate time, thus the need for a name.
797 893
798These calls expect any number of the following handler/hook descriptions: 894These calls expect any number of the following handler/hook descriptions:
799 895
800=over 4 896=over 4
924 1020
925 } elsif (exists $cb_id{$type}) { 1021 } elsif (exists $cb_id{$type}) {
926 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1022 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
927 1023
928 } elsif (ref $type) { 1024 } elsif (ref $type) {
929 warn "attaching objects not supported, ignoring.\n"; 1025 error "attaching objects not supported, ignoring.\n";
930 1026
931 } else { 1027 } else {
932 shift @arg; 1028 shift @arg;
933 warn "attach argument '$type' not supported, ignoring.\n"; 1029 error "attach argument '$type' not supported, ignoring.\n";
934 } 1030 }
935 } 1031 }
936} 1032}
937 1033
938sub _object_attach { 1034sub _object_attach {
948 _attach $registry, $klass, @attach; 1044 _attach $registry, $klass, @attach;
949 } 1045 }
950 1046
951 $obj->{$name} = \%arg; 1047 $obj->{$name} = \%arg;
952 } else { 1048 } else {
953 warn "object uses attachment '$name' which is not available, postponing.\n"; 1049 info "object uses attachment '$name' which is not available, postponing.\n";
954 } 1050 }
955 1051
956 $obj->{_attachment}{$name} = undef; 1052 $obj->{_attachment}{$name} = undef;
957} 1053}
958 1054
1017 1113
1018 for (@$callbacks) { 1114 for (@$callbacks) {
1019 eval { &{$_->[1]} }; 1115 eval { &{$_->[1]} };
1020 1116
1021 if ($@) { 1117 if ($@) {
1022 warn "$@";
1023 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1118 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1024 override; 1119 override;
1025 } 1120 }
1026 1121
1027 return 1 if $override; 1122 return 1 if $override;
1028 } 1123 }
1107 for (@$attach) { 1202 for (@$attach) {
1108 my ($klass, @attach) = @$_; 1203 my ($klass, @attach) = @$_;
1109 _attach $registry, $klass, @attach; 1204 _attach $registry, $klass, @attach;
1110 } 1205 }
1111 } else { 1206 } else {
1112 warn "object uses attachment '$name' that is not available, postponing.\n"; 1207 info "object uses attachment '$name' that is not available, postponing.\n";
1113 } 1208 }
1114 } 1209 }
1115} 1210}
1116 1211
1117cf::attachable->attach ( 1212cf::attachable->attach (
1144 my ($filename, $rdata, $objs) = @_; 1239 my ($filename, $rdata, $objs) = @_;
1145 1240
1146 sync_job { 1241 sync_job {
1147 if (length $$rdata) { 1242 if (length $$rdata) {
1148 utf8::decode (my $decname = $filename); 1243 utf8::decode (my $decname = $filename);
1149 warn sprintf "saving %s (%d,%d)\n", 1244 trace sprintf "saving %s (%d,%d)\n",
1150 $decname, length $$rdata, scalar @$objs; 1245 $decname, length $$rdata, scalar @$objs
1246 if $VERBOSE_IO;
1151 1247
1152 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1248 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1153 aio_chmod $fh, SAVE_MODE; 1249 aio_chmod $fh, SAVE_MODE;
1154 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1250 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1155 aio_fsync $fh if $cf::USE_FSYNC; 1251 if ($cf::USE_FSYNC) {
1252 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;
1253 aio_fsync $fh;
1254 }
1156 aio_close $fh; 1255 aio_close $fh;
1157 1256
1158 if (@$objs) { 1257 if (@$objs) {
1159 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1258 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1160 aio_chmod $fh, SAVE_MODE; 1259 aio_chmod $fh, SAVE_MODE;
1161 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1260 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1162 aio_write $fh, 0, (length $data), $data, 0; 1261 aio_write $fh, 0, (length $data), $data, 0;
1163 aio_fsync $fh if $cf::USE_FSYNC; 1262 if ($cf::USE_FSYNC) {
1263 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;
1264 aio_fsync $fh;
1265 }
1164 aio_close $fh; 1266 aio_close $fh;
1165 aio_rename "$filename.pst~", "$filename.pst"; 1267 aio_rename "$filename.pst~", "$filename.pst";
1166 } 1268 }
1167 } else { 1269 } else {
1168 aio_unlink "$filename.pst"; 1270 aio_unlink "$filename.pst";
1169 } 1271 }
1170 1272
1171 aio_rename "$filename~", $filename; 1273 aio_rename "$filename~", $filename;
1274
1275 $filename =~ s%/[^/]+$%%;
1276 aio_pathsync $filename if $cf::USE_FSYNC;
1172 } else { 1277 } else {
1173 warn "FATAL: $filename~: $!\n"; 1278 error "unable to save objects: $filename~: $!\n";
1174 } 1279 }
1175 } else { 1280 } else {
1176 aio_unlink $filename; 1281 aio_unlink $filename;
1177 aio_unlink "$filename.pst"; 1282 aio_unlink "$filename.pst";
1178 } 1283 }
1202 my $st = eval { Coro::Storable::thaw $av }; 1307 my $st = eval { Coro::Storable::thaw $av };
1203 $av = $st->{objs}; 1308 $av = $st->{objs};
1204 } 1309 }
1205 1310
1206 utf8::decode (my $decname = $filename); 1311 utf8::decode (my $decname = $filename);
1207 warn sprintf "loading %s (%d,%d)\n", 1312 trace sprintf "loading %s (%d,%d)\n",
1208 $decname, length $data, scalar @{$av || []}; 1313 $decname, length $data, scalar @{$av || []}
1314 if $VERBOSE_IO;
1209 1315
1210 ($data, $av) 1316 ($data, $av)
1211} 1317}
1212 1318
1213=head2 COMMAND CALLBACKS 1319=head2 COMMAND CALLBACKS
1269 my ($name, $cb) = @_; 1375 my ($name, $cb) = @_;
1270 1376
1271 $EXTICMD{$name} = $cb; 1377 $EXTICMD{$name} = $cb;
1272} 1378}
1273 1379
1380use File::Glob ();
1381
1274cf::player->attach ( 1382cf::player->attach (
1275 on_command => sub { 1383 on_unknown_command => sub {
1276 my ($pl, $name, $params) = @_; 1384 my ($pl, $name, $params) = @_;
1277 1385
1278 my $cb = $COMMAND{$name} 1386 my $cb = $COMMAND{$name}
1279 or return; 1387 or return;
1280 1388
1303 1411
1304 $pl->ext_reply ($reply, @reply) 1412 $pl->ext_reply ($reply, @reply)
1305 if $reply; 1413 if $reply;
1306 1414
1307 } else { 1415 } else {
1308 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1416 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1309 } 1417 }
1310 1418
1311 cf::override; 1419 cf::override;
1312 }, 1420 },
1313); 1421);
1314 1422
1423# "readahead" all extensions
1424sub cache_extensions {
1425 my $grp = IO::AIO::aio_group;
1426
1427 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1428 for (grep /\.ext$/, @{$_[0]}) {
1429 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1430 }
1431 };
1432
1433 $grp
1434}
1435
1315sub load_extensions { 1436sub load_extensions {
1437 info "loading extensions...";
1438
1316 cf::sync_job { 1439 cf::sync_job {
1317 my %todo; 1440 my %todo;
1318 1441
1319 for my $path (<$LIBDIR/*.ext>) { 1442 for my $path (<$LIBDIR/*.ext>) {
1320 next unless -r $path; 1443 next unless -r $path;
1338 1461
1339 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1462 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1340 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1463 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1341 1464
1342 $ext{source} = 1465 $ext{source} =
1343 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1466 "package $pkg; use common::sense;\n"
1344 . "#line 1 \"$path\"\n{\n" 1467 . "#line 1 \"$path\"\n{\n"
1345 . $source 1468 . $source
1346 . "\n};\n1"; 1469 . "\n};\n1";
1347 1470
1348 $todo{$base} = \%ext; 1471 $todo{$base} = \%ext;
1349 } 1472 }
1350 1473
1474 my $pass = 0;
1351 my %done; 1475 my %done;
1352 while (%todo) { 1476 while (%todo) {
1353 my $progress; 1477 my $progress;
1354 1478
1479 ++$pass;
1480
1481 ext:
1355 while (my ($k, $v) = each %todo) { 1482 while (my ($k, $v) = each %todo) {
1356 for (split /,\s*/, $v->{meta}{depends}) { 1483 for (split /,\s*/, $v->{meta}{depends}) {
1357 goto skip 1484 next ext
1358 unless exists $done{$_}; 1485 unless exists $done{$_};
1359 } 1486 }
1360 1487
1361 warn "... loading '$k' into '$v->{pkg}'\n"; 1488 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1362 1489
1363 unless (eval $v->{source}) { 1490 my $active = eval $v->{source};
1491
1492 if (length $@) {
1364 my $msg = $@ ? "$v->{path}: $@\n" 1493 error "$v->{path}: $@\n";
1365 : "$v->{base}: extension inactive.\n";
1366 1494
1367 if (exists $v->{meta}{mandatory}) {
1368 warn $msg;
1369 cf::cleanup "mandatory extension failed to load, exiting."; 1495 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1370 } 1496 if exists $v->{meta}{mandatory};
1371 1497
1372 warn $msg; 1498 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1499 delete $todo{$k};
1500 } else {
1501 $done{$k} = delete $todo{$k};
1502 push @EXTS, $v->{pkg};
1503 $progress = 1;
1504
1505 info "$v->{base}: extension inactive.\n"
1506 unless $active;
1373 } 1507 }
1374
1375 $done{$k} = delete $todo{$k};
1376 push @EXTS, $v->{pkg};
1377 $progress = 1;
1378 } 1508 }
1379 1509
1380 skip: 1510 unless ($progress) {
1381 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1511 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1382 unless $progress; 1512
1513 while (my ($k, $v) = each %todo) {
1514 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1515 if exists $v->{meta}{mandatory};
1516 }
1517 }
1383 } 1518 }
1384 }; 1519 };
1385} 1520}
1386 1521
1387############################################################################# 1522#############################################################################
1388 1523
1389=back 1524=back
1390 1525
1391=head2 CORE EXTENSIONS 1526=head2 CORE EXTENSIONS
1392 1527
1393Functions and methods that extend core crossfire objects. 1528Functions and methods that extend core deliantra objects.
1394 1529
1395=cut 1530=cut
1396 1531
1397package cf::player; 1532package cf::player;
1398 1533
1441 1576
1442sub exists($) { 1577sub exists($) {
1443 my ($login) = @_; 1578 my ($login) = @_;
1444 1579
1445 $cf::PLAYER{$login} 1580 $cf::PLAYER{$login}
1446 or cf::sync_job { !aio_stat path $login } 1581 or !aio_stat path $login
1447} 1582}
1448 1583
1449sub find($) { 1584sub find($) {
1450 return $cf::PLAYER{$_[0]} || do { 1585 return $cf::PLAYER{$_[0]} || do {
1451 my $login = $_[0]; 1586 my $login = $_[0];
1471 $cf::PLAYER{$login} = $pl 1606 $cf::PLAYER{$login} = $pl
1472 } 1607 }
1473 } 1608 }
1474} 1609}
1475 1610
1611cf::player->attach (
1612 on_load => sub {
1613 my ($pl, $path) = @_;
1614
1615 # restore slots saved in save, below
1616 my $slots = delete $pl->{_slots};
1617
1618 $pl->ob->current_weapon ($slots->[0]);
1619 $pl->combat_ob ($slots->[1]);
1620 $pl->ranged_ob ($slots->[2]);
1621 },
1622);
1623
1476sub save($) { 1624sub save($) {
1477 my ($pl) = @_; 1625 my ($pl) = @_;
1478 1626
1479 return if $pl->{deny_save}; 1627 return if $pl->{deny_save};
1480 1628
1485 1633
1486 aio_mkdir playerdir $pl, 0770; 1634 aio_mkdir playerdir $pl, 0770;
1487 $pl->{last_save} = $cf::RUNTIME; 1635 $pl->{last_save} = $cf::RUNTIME;
1488 1636
1489 cf::get_slot 0.01; 1637 cf::get_slot 0.01;
1638
1639 # save slots, to be restored later
1640 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1490 1641
1491 $pl->save_pl ($path); 1642 $pl->save_pl ($path);
1492 cf::cede_to_tick; 1643 cf::cede_to_tick;
1493} 1644}
1494 1645
1528 my $name = $pl->ob->name; 1679 my $name = $pl->ob->name;
1529 1680
1530 $pl->{deny_save} = 1; 1681 $pl->{deny_save} = 1;
1531 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1682 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1532 1683
1533 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1684 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1534 $pl->deactivate; 1685 $pl->deactivate;
1686
1535 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1687 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1536 $pl->ob->check_score;
1537 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1688 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1689 ext::highscore::check ($pl->ob);
1690
1538 $pl->ns->destroy if $pl->ns; 1691 $pl->ns->destroy if $pl->ns;
1539 1692
1540 my $path = playerdir $pl; 1693 my $path = playerdir $pl;
1541 my $temp = "$path~$cf::RUNTIME~deleting~"; 1694 my $temp = "$path~$cf::RUNTIME~deleting~";
1542 aio_rename $path, $temp; 1695 aio_rename $path, $temp;
1596 \@logins 1749 \@logins
1597} 1750}
1598 1751
1599=item $player->maps 1752=item $player->maps
1600 1753
1754=item cf::player::maps $login
1755
1601Returns an arrayref of map paths that are private for this 1756Returns an arrayref of map paths that are private for this
1602player. May block. 1757player. May block.
1603 1758
1604=cut 1759=cut
1605 1760
1622 } 1777 }
1623 1778
1624 \@paths 1779 \@paths
1625} 1780}
1626 1781
1627=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1782=item $protocol_xml = $player->expand_cfpod ($cfpod)
1628 1783
1629Expand crossfire pod fragments into protocol xml. 1784Expand deliantra pod fragments into protocol xml.
1630 1785
1631=item $player->ext_reply ($msgid, @msg) 1786=item $player->ext_reply ($msgid, @msg)
1632 1787
1633Sends an ext reply to the player. 1788Sends an ext reply to the player.
1634 1789
1666 1821
1667=cut 1822=cut
1668 1823
1669sub find_by_path($) { 1824sub find_by_path($) {
1670 my ($path) = @_; 1825 my ($path) = @_;
1826
1827 $path =~ s/^~[^\/]*//; # skip ~login
1671 1828
1672 my ($match, $specificity); 1829 my ($match, $specificity);
1673 1830
1674 for my $region (list) { 1831 for my $region (list) {
1675 if ($region->{match} && $path =~ $region->{match}) { 1832 if ($region->{match} && $path =~ $region->{match}) {
1704sub generate_random_map { 1861sub generate_random_map {
1705 my ($self, $rmp) = @_; 1862 my ($self, $rmp) = @_;
1706 1863
1707 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1864 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1708 1865
1709 # mit "rum" bekleckern, nicht
1710 $self->_create_random_map ( 1866 $self->_create_random_map ($rmp);
1711 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1712 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1713 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1714 $rmp->{exit_on_final_map},
1715 $rmp->{xsize}, $rmp->{ysize},
1716 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1717 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1718 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1719 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1720 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1721 (cf::region::find $rmp->{region}), $rmp->{custom}
1722 )
1723} 1867}
1724 1868
1725=item cf::map->register ($regex, $prio) 1869=item cf::map->register ($regex, $prio)
1726 1870
1727Register a handler for the map path matching the given regex at the 1871Register a handler for the map path matching the given regex at the
1732 1876
1733sub register { 1877sub register {
1734 my (undef, $regex, $prio) = @_; 1878 my (undef, $regex, $prio) = @_;
1735 my $pkg = caller; 1879 my $pkg = caller;
1736 1880
1737 no strict;
1738 push @{"$pkg\::ISA"}, __PACKAGE__; 1881 push @{"$pkg\::ISA"}, __PACKAGE__;
1739 1882
1740 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1883 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1741} 1884}
1742 1885
1743# also paths starting with '/' 1886# also paths starting with '/'
1744$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1887$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1745 1888
1746sub thawer_merge { 1889sub thawer_merge {
1747 my ($self, $merge) = @_; 1890 my ($self, $merge) = @_;
1748 1891
1749 # we have to keep some variables in memory intact 1892 # we have to keep some variables in memory intact
1754} 1897}
1755 1898
1756sub normalise { 1899sub normalise {
1757 my ($path, $base) = @_; 1900 my ($path, $base) = @_;
1758 1901
1759 $path = "$path"; # make sure its a string 1902 $path = "$path"; # make sure it's a string
1760 1903
1761 $path =~ s/\.map$//; 1904 $path =~ s/\.map$//;
1762 1905
1763 # map plan: 1906 # map plan:
1764 # 1907 #
1779 $base =~ s{[^/]+/?$}{}; 1922 $base =~ s{[^/]+/?$}{};
1780 $path = "$base/$path"; 1923 $path = "$base/$path";
1781 } 1924 }
1782 1925
1783 for ($path) { 1926 for ($path) {
1784 redo if s{//}{/};
1785 redo if s{/\.?/}{/}; 1927 redo if s{/\.?/}{/};
1786 redo if s{/[^/]+/\.\./}{/}; 1928 redo if s{/[^/]+/\.\./}{/};
1787 } 1929 }
1788 1930
1789 $path 1931 $path
1803 $self->init; # pass $1 etc. 1945 $self->init; # pass $1 etc.
1804 return $self; 1946 return $self;
1805 } 1947 }
1806 } 1948 }
1807 1949
1808 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1950 Carp::cluck "unable to resolve path '$path' (base '$base')";
1809 () 1951 ()
1810} 1952}
1811 1953
1812sub init { 1954sub init {
1813 my ($self) = @_; 1955 my ($self) = @_;
1845sub uniq_path { 1987sub uniq_path {
1846 my ($self) = @_; 1988 my ($self) = @_;
1847 1989
1848 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1990 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1849 "$UNIQUEDIR/$path" 1991 "$UNIQUEDIR/$path"
1850}
1851
1852# and all this just because we cannot iterate over
1853# all maps in C++...
1854sub change_all_map_light {
1855 my ($change) = @_;
1856
1857 $_->change_map_light ($change)
1858 for grep $_->outdoor, values %cf::MAP;
1859} 1992}
1860 1993
1861sub decay_objects { 1994sub decay_objects {
1862 my ($self) = @_; 1995 my ($self) = @_;
1863 1996
1945 2078
1946sub find; 2079sub find;
1947sub find { 2080sub find {
1948 my ($path, $origin) = @_; 2081 my ($path, $origin) = @_;
1949 2082
2083 cf::cede_to_tick;
2084
1950 $path = normalise $path, $origin && $origin->path; 2085 $path = normalise $path, $origin && $origin->path;
1951 2086
1952 cf::lock_wait "map_data:$path";#d#remove 2087 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1953 cf::lock_wait "map_find:$path"; 2088 my $guard2 = cf::lock_acquire "map_find:$path";
1954 2089
1955 $cf::MAP{$path} || do { 2090 $cf::MAP{$path} || do {
1956 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1957 my $guard2 = cf::lock_acquire "map_find:$path";
1958
1959 my $map = new_from_path cf::map $path 2091 my $map = new_from_path cf::map $path
1960 or return; 2092 or return;
1961 2093
1962 $map->{last_save} = $cf::RUNTIME; 2094 $map->{last_save} = $cf::RUNTIME;
1963 2095
1975 2107
1976 $cf::MAP{$path} = $map 2108 $cf::MAP{$path} = $map
1977 } 2109 }
1978} 2110}
1979 2111
1980sub pre_load { } 2112sub pre_load { }
1981sub post_load { } 2113#sub post_load { } # XS
1982 2114
1983sub load { 2115sub load {
1984 my ($self) = @_; 2116 my ($self) = @_;
1985 2117
1986 local $self->{deny_reset} = 1; # loading can take a long time 2118 local $self->{deny_reset} = 1; # loading can take a long time
2031 unless ($self->{deny_activate}) { 2163 unless ($self->{deny_activate}) {
2032 $self->decay_objects; 2164 $self->decay_objects;
2033 $self->fix_auto_apply; 2165 $self->fix_auto_apply;
2034 $self->update_buttons; 2166 $self->update_buttons;
2035 cf::cede_to_tick; 2167 cf::cede_to_tick;
2036 $self->set_darkness_map;
2037 cf::cede_to_tick;
2038 $self->activate; 2168 $self->activate;
2039 } 2169 }
2040 2170
2041 $self->{last_save} = $cf::RUNTIME; 2171 $self->{last_save} = $cf::RUNTIME;
2042 $self->last_access ($cf::RUNTIME); 2172 $self->last_access ($cf::RUNTIME);
2043 2173
2044 $self->in_memory (cf::MAP_ACTIVE); 2174 $self->in_memory (cf::MAP_ACTIVE);
2045 } 2175 }
2046 2176
2047 $self->post_load; 2177 $self->post_load;
2048}
2049 2178
2179 1
2180}
2181
2182# customize the map for a given player, i.e.
2183# return the _real_ map. used by e.g. per-player
2184# maps to change the path to ~playername/mappath
2050sub customise_for { 2185sub customise_for {
2051 my ($self, $ob) = @_; 2186 my ($self, $ob) = @_;
2052 2187
2053 return find "~" . $ob->name . "/" . $self->{path} 2188 return find "~" . $ob->name . "/" . $self->{path}
2054 if $self->per_player; 2189 if $self->per_player;
2070 or next; 2205 or next;
2071 $neigh = find $neigh, $map 2206 $neigh = find $neigh, $map
2072 or next; 2207 or next;
2073 $neigh->load; 2208 $neigh->load;
2074 2209
2210 # now find the diagonal neighbours
2075 push @neigh, 2211 push @neigh,
2076 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2212 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2077 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2213 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2078 } 2214 }
2079 2215
2086} 2222}
2087 2223
2088sub find_sync { 2224sub find_sync {
2089 my ($path, $origin) = @_; 2225 my ($path, $origin) = @_;
2090 2226
2091 cf::sync_job { find $path, $origin } 2227 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2228 if $Coro::current == $Coro::main;
2229
2230 find $path, $origin
2092} 2231}
2093 2232
2094sub do_load_sync { 2233sub do_load_sync {
2095 my ($map) = @_; 2234 my ($map) = @_;
2096 2235
2097 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2236 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2098 if $Coro::current == $Coro::main; 2237 if $Coro::current == $Coro::main;
2099 2238
2100 cf::sync_job { $map->load }; 2239 $map->load;
2101} 2240}
2102 2241
2103our %MAP_PREFETCH; 2242our %MAP_PREFETCH;
2104our $MAP_PREFETCHER = undef; 2243our $MAP_PREFETCHER = undef;
2105 2244
2131 $MAP_PREFETCHER->prio (6); 2270 $MAP_PREFETCHER->prio (6);
2132 2271
2133 () 2272 ()
2134} 2273}
2135 2274
2275# common code, used by both ->save and ->swapout
2136sub save { 2276sub _save {
2137 my ($self) = @_; 2277 my ($self) = @_;
2138
2139 my $lock = cf::lock_acquire "map_data:$self->{path}";
2140 2278
2141 $self->{last_save} = $cf::RUNTIME; 2279 $self->{last_save} = $cf::RUNTIME;
2142 2280
2143 return unless $self->dirty; 2281 return unless $self->dirty;
2144 2282
2164 } else { 2302 } else {
2165 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2303 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2166 } 2304 }
2167} 2305}
2168 2306
2307sub save {
2308 my ($self) = @_;
2309
2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311
2312 $self->_save;
2313}
2314
2169sub swap_out { 2315sub swap_out {
2170 my ($self) = @_; 2316 my ($self) = @_;
2171 2317
2172 # save first because save cedes
2173 $self->save;
2174
2175 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2318 my $lock = cf::lock_acquire "map_data:$self->{path}";
2176 2319
2177 return if $self->players;
2178 return if $self->in_memory != cf::MAP_ACTIVE; 2320 return if $self->in_memory != cf::MAP_ACTIVE;
2179 return if $self->{deny_save}; 2321 return if $self->{deny_save};
2322 return if $self->players;
2180 2323
2324 # first deactivate the map and "unlink" it from the core
2325 $self->deactivate;
2326 $_->clear_links_to ($self) for values %cf::MAP;
2181 $self->in_memory (cf::MAP_SWAPPED); 2327 $self->in_memory (cf::MAP_SWAPPED);
2328
2329 # then atomically save
2330 $self->_save;
2331
2332 # then free the map
2333 $self->clear;
2334}
2335
2336sub reset_at {
2337 my ($self) = @_;
2338
2339 # TODO: safety, remove and allow resettable per-player maps
2340 return 1e99 if $self->{deny_reset};
2341
2342 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2343 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2344
2345 $time + $to
2346}
2347
2348sub should_reset {
2349 my ($self) = @_;
2350
2351 $self->reset_at <= $cf::RUNTIME
2352}
2353
2354sub reset {
2355 my ($self) = @_;
2356
2357 my $lock = cf::lock_acquire "map_data:$self->{path}";
2358
2359 return if $self->players;
2360
2361 cf::trace "resetting map ", $self->path, "\n";
2362
2363 $self->in_memory (cf::MAP_SWAPPED);
2364
2365 # need to save uniques path
2366 unless ($self->{deny_save}) {
2367 my $uniq = $self->uniq_path; utf8::encode $uniq;
2368
2369 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2370 if $uniq;
2371 }
2372
2373 delete $cf::MAP{$self->path};
2182 2374
2183 $self->deactivate; 2375 $self->deactivate;
2184 $_->clear_links_to ($self) for values %cf::MAP; 2376 $_->clear_links_to ($self) for values %cf::MAP;
2185 $self->clear; 2377 $self->clear;
2186}
2187
2188sub reset_at {
2189 my ($self) = @_;
2190
2191 # TODO: safety, remove and allow resettable per-player maps
2192 return 1e99 if $self->{deny_reset};
2193
2194 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2195 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2196
2197 $time + $to
2198}
2199
2200sub should_reset {
2201 my ($self) = @_;
2202
2203 $self->reset_at <= $cf::RUNTIME
2204}
2205
2206sub reset {
2207 my ($self) = @_;
2208
2209 my $lock = cf::lock_acquire "map_data:$self->{path}";
2210
2211 return if $self->players;
2212
2213 warn "resetting map ", $self->path;
2214
2215 $self->in_memory (cf::MAP_SWAPPED);
2216
2217 # need to save uniques path
2218 unless ($self->{deny_save}) {
2219 my $uniq = $self->uniq_path; utf8::encode $uniq;
2220
2221 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2222 if $uniq;
2223 }
2224
2225 delete $cf::MAP{$self->path};
2226
2227 $self->deactivate;
2228 $_->clear_links_to ($self) for values %cf::MAP;
2229 $self->clear;
2230 2378
2231 $self->unlink_save; 2379 $self->unlink_save;
2232 $self->destroy; 2380 $self->destroy;
2233} 2381}
2234 2382
2242 2390
2243 delete $cf::MAP{$self->path}; 2391 delete $cf::MAP{$self->path};
2244 2392
2245 $self->unlink_save; 2393 $self->unlink_save;
2246 2394
2247 bless $self, "cf::map"; 2395 bless $self, "cf::map::wrap";
2248 delete $self->{deny_reset}; 2396 delete $self->{deny_reset};
2249 $self->{deny_save} = 1; 2397 $self->{deny_save} = 1;
2250 $self->reset_timeout (1); 2398 $self->reset_timeout (1);
2251 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2399 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2252 2400
2309 : normalise $_ 2457 : normalise $_
2310 } @{ aio_readdir $UNIQUEDIR or [] } 2458 } @{ aio_readdir $UNIQUEDIR or [] }
2311 ] 2459 ]
2312} 2460}
2313 2461
2462=item cf::map::static_maps
2463
2464Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2465file in the shared directory excluding F</styles> and F</editor>). May
2466block.
2467
2468=cut
2469
2470sub static_maps() {
2471 my @dirs = "";
2472 my @maps;
2473
2474 while (@dirs) {
2475 my $dir = shift @dirs;
2476
2477 next if $dir eq "/styles" || $dir eq "/editor";
2478
2479 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2480 or return;
2481
2482 for (@$files) {
2483 s/\.map$// or next;
2484 utf8::decode $_;
2485 push @maps, "$dir/$_";
2486 }
2487
2488 push @dirs, map "$dir/$_", @$dirs;
2489 }
2490
2491 \@maps
2492}
2493
2314=back 2494=back
2315 2495
2316=head3 cf::object 2496=head3 cf::object
2317 2497
2318=cut 2498=cut
2383 2563
2384our $SAY_CHANNEL = { 2564our $SAY_CHANNEL = {
2385 id => "say", 2565 id => "say",
2386 title => "Map", 2566 title => "Map",
2387 reply => "say ", 2567 reply => "say ",
2388 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2568 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2389}; 2569};
2390 2570
2391our $CHAT_CHANNEL = { 2571our $CHAT_CHANNEL = {
2392 id => "chat", 2572 id => "chat",
2393 title => "Chat", 2573 title => "Chat",
2448 2628
2449=item $player_object->enter_link 2629=item $player_object->enter_link
2450 2630
2451Freezes the player and moves him/her to a special map (C<{link}>). 2631Freezes the player and moves him/her to a special map (C<{link}>).
2452 2632
2453The player should be reasonably safe there for short amounts of time. You 2633The player should be reasonably safe there for short amounts of time (e.g.
2454I<MUST> call C<leave_link> as soon as possible, though. 2634for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2635though, as the player cannot control the character while it is on the link
2636map.
2455 2637
2456Will never block. 2638Will never block.
2457 2639
2458=item $player_object->leave_link ($map, $x, $y) 2640=item $player_object->leave_link ($map, $x, $y)
2459 2641
2479sub cf::object::player::enter_link { 2661sub cf::object::player::enter_link {
2480 my ($self) = @_; 2662 my ($self) = @_;
2481 2663
2482 $self->deactivate_recursive; 2664 $self->deactivate_recursive;
2483 2665
2666 ++$self->{_link_recursion};
2667
2484 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2668 return if UNIVERSAL::isa $self->map, "ext::map_link";
2485 2669
2486 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2670 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2487 if $self->map && $self->map->{path} ne "{link}"; 2671 if $self->map && $self->map->{path} ne "{link}";
2488 2672
2489 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2673 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2490} 2674}
2491 2675
2492sub cf::object::player::leave_link { 2676sub cf::object::player::leave_link {
2493 my ($self, $map, $x, $y) = @_; 2677 my ($self, $map, $x, $y) = @_;
2494 2678
2511 ($x, $y) = (-1, -1) 2695 ($x, $y) = (-1, -1)
2512 unless (defined $x) && (defined $y); 2696 unless (defined $x) && (defined $y);
2513 2697
2514 # use -1 or undef as default coordinates, not 0, 0 2698 # use -1 or undef as default coordinates, not 0, 0
2515 ($x, $y) = ($map->enter_x, $map->enter_y) 2699 ($x, $y) = ($map->enter_x, $map->enter_y)
2516 if $x <=0 && $y <= 0; 2700 if $x <= 0 && $y <= 0;
2517 2701
2518 $map->load; 2702 $map->load;
2519 $map->load_neighbours; 2703 $map->load_neighbours;
2520 2704
2521 return unless $self->contr->active; 2705 return unless $self->contr->active;
2522 $self->activate_recursive;
2523 2706
2524 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2707 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2525 $self->enter_map ($map, $x, $y); 2708 if ($self->enter_map ($map, $x, $y)) {
2526} 2709 # entering was successful
2710 delete $self->{_link_recursion};
2711 # only activate afterwards, to support waiting in hooks
2712 $self->activate_recursive;
2713 }
2527 2714
2715}
2716
2528=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2717=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2529 2718
2530Moves the player to the given map-path and coordinates by first freezing 2719Moves the player to the given map-path and coordinates by first freezing
2531her, loading and preparing them map, calling the provided $check callback 2720her, loading and preparing them map, calling the provided $check callback
2532that has to return the map if sucecssful, and then unfreezes the player on 2721that has to return the map if sucecssful, and then unfreezes the player on
2533the new (success) or old (failed) map position. In either case, $done will 2722the new (success) or old (failed) map position. In either case, $done will
2540 2729
2541our $GOTOGEN; 2730our $GOTOGEN;
2542 2731
2543sub cf::object::player::goto { 2732sub cf::object::player::goto {
2544 my ($self, $path, $x, $y, $check, $done) = @_; 2733 my ($self, $path, $x, $y, $check, $done) = @_;
2734
2735 if ($self->{_link_recursion} >= $MAX_LINKS) {
2736 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2737 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2738 ($path, $x, $y) = @$EMERGENCY_POSITION;
2739 }
2545 2740
2546 # do generation counting so two concurrent goto's will be executed in-order 2741 # do generation counting so two concurrent goto's will be executed in-order
2547 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2742 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2548 2743
2549 $self->enter_link; 2744 $self->enter_link;
2573 my $map = eval { 2768 my $map = eval {
2574 my $map = defined $path ? cf::map::find $path : undef; 2769 my $map = defined $path ? cf::map::find $path : undef;
2575 2770
2576 if ($map) { 2771 if ($map) {
2577 $map = $map->customise_for ($self); 2772 $map = $map->customise_for ($self);
2578 $map = $check->($map) if $check && $map; 2773 $map = $check->($map, $x, $y, $self) if $check && $map;
2579 } else { 2774 } else {
2580 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2775 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2581 } 2776 }
2582 2777
2583 $map 2778 $map
2591 if ($gen == $self->{_goto_generation}) { 2786 if ($gen == $self->{_goto_generation}) {
2592 delete $self->{_goto_generation}; 2787 delete $self->{_goto_generation};
2593 $self->leave_link ($map, $x, $y); 2788 $self->leave_link ($map, $x, $y);
2594 } 2789 }
2595 2790
2596 $done->() if $done; 2791 $done->($self) if $done;
2597 })->prio (1); 2792 })->prio (1);
2598} 2793}
2599 2794
2600=item $player_object->enter_exit ($exit_object) 2795=item $player_object->enter_exit ($exit_object)
2601 2796
2689 $self->contr->savebed ($map, $x, $y) 2884 $self->contr->savebed ($map, $x, $y)
2690 if $exit->flag (cf::FLAG_DAMNED); 2885 if $exit->flag (cf::FLAG_DAMNED);
2691 2886
2692 1 2887 1
2693 }) { 2888 }) {
2694 $self->message ("Something went wrong deep within the crossfire server. " 2889 $self->message ("Something went wrong deep within the deliantra server. "
2695 . "I'll try to bring you back to the map you were before. " 2890 . "I'll try to bring you back to the map you were before. "
2696 . "Please report this to the dungeon master!", 2891 . "Please report this to the dungeon master!",
2697 cf::NDI_UNIQUE | cf::NDI_RED); 2892 cf::NDI_UNIQUE | cf::NDI_RED);
2698 2893
2699 warn "ERROR in enter_exit: $@"; 2894 error "ERROR in enter_exit: $@";
2700 $self->leave_link; 2895 $self->leave_link;
2701 } 2896 }
2702 })->prio (1); 2897 })->prio (1);
2703} 2898}
2704 2899
2716sub cf::client::send_drawinfo { 2911sub cf::client::send_drawinfo {
2717 my ($self, $text, $flags) = @_; 2912 my ($self, $text, $flags) = @_;
2718 2913
2719 utf8::encode $text; 2914 utf8::encode $text;
2720 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2915 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2916}
2917
2918=item $client->send_big_packet ($pkt)
2919
2920Like C<send_packet>, but tries to compress large packets, and fragments
2921them as required.
2922
2923=cut
2924
2925our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2926
2927sub cf::client::send_big_packet {
2928 my ($self, $pkt) = @_;
2929
2930 # try lzf for large packets
2931 $pkt = "lzf " . Compress::LZF::compress $pkt
2932 if 1024 <= length $pkt and $self->{can_lzf};
2933
2934 # split very large packets
2935 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2936 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2937 $pkt = "frag";
2938 }
2939
2940 $self->send_packet ($pkt);
2721} 2941}
2722 2942
2723=item $client->send_msg ($channel, $msg, $color, [extra...]) 2943=item $client->send_msg ($channel, $msg, $color, [extra...])
2724 2944
2725Send a drawinfo or msg packet to the client, formatting the msg for the 2945Send a drawinfo or msg packet to the client, formatting the msg for the
2729 2949
2730=cut 2950=cut
2731 2951
2732# non-persistent channels (usually the info channel) 2952# non-persistent channels (usually the info channel)
2733our %CHANNEL = ( 2953our %CHANNEL = (
2954 "c/motd" => {
2955 id => "infobox",
2956 title => "MOTD",
2957 reply => undef,
2958 tooltip => "The message of the day",
2959 },
2734 "c/identify" => { 2960 "c/identify" => {
2735 id => "infobox", 2961 id => "infobox",
2736 title => "Identify", 2962 title => "Identify",
2737 reply => undef, 2963 reply => undef,
2738 tooltip => "Items recently identified", 2964 tooltip => "Items recently identified",
2740 "c/examine" => { 2966 "c/examine" => {
2741 id => "infobox", 2967 id => "infobox",
2742 title => "Examine", 2968 title => "Examine",
2743 reply => undef, 2969 reply => undef,
2744 tooltip => "Signs and other items you examined", 2970 tooltip => "Signs and other items you examined",
2971 },
2972 "c/shopinfo" => {
2973 id => "infobox",
2974 title => "Shop Info",
2975 reply => undef,
2976 tooltip => "What your bargaining skill tells you about the shop",
2745 }, 2977 },
2746 "c/book" => { 2978 "c/book" => {
2747 id => "infobox", 2979 id => "infobox",
2748 title => "Book", 2980 title => "Book",
2749 reply => undef, 2981 reply => undef,
2765 id => "infobox", 2997 id => "infobox",
2766 title => "Body Parts", 2998 title => "Body Parts",
2767 reply => undef, 2999 reply => undef,
2768 tooltip => "Shows which body parts you posess and are available", 3000 tooltip => "Shows which body parts you posess and are available",
2769 }, 3001 },
3002 "c/statistics" => {
3003 id => "infobox",
3004 title => "Statistics",
3005 reply => undef,
3006 tooltip => "Shows your primary statistics",
3007 },
3008 "c/skills" => {
3009 id => "infobox",
3010 title => "Skills",
3011 reply => undef,
3012 tooltip => "Shows your experience per skill and item power",
3013 },
3014 "c/shopitems" => {
3015 id => "infobox",
3016 title => "Shop Items",
3017 reply => undef,
3018 tooltip => "Shows the items currently for sale in this shop",
3019 },
3020 "c/resistances" => {
3021 id => "infobox",
3022 title => "Resistances",
3023 reply => undef,
3024 tooltip => "Shows your resistances",
3025 },
3026 "c/pets" => {
3027 id => "infobox",
3028 title => "Pets",
3029 reply => undef,
3030 tooltip => "Shows information abotu your pets/a specific pet",
3031 },
3032 "c/perceiveself" => {
3033 id => "infobox",
3034 title => "Perceive Self",
3035 reply => undef,
3036 tooltip => "You gained detailed knowledge about yourself",
3037 },
2770 "c/uptime" => { 3038 "c/uptime" => {
2771 id => "infobox", 3039 id => "infobox",
2772 title => "Uptime", 3040 title => "Uptime",
2773 reply => undef, 3041 reply => undef,
2774 tooltip => "How long the server has been running since last restart", 3042 tooltip => "How long the server has been running since last restart",
2783 id => "party", 3051 id => "party",
2784 title => "Party", 3052 title => "Party",
2785 reply => "gsay ", 3053 reply => "gsay ",
2786 tooltip => "Messages and chat related to your party", 3054 tooltip => "Messages and chat related to your party",
2787 }, 3055 },
3056 "c/death" => {
3057 id => "death",
3058 title => "Death",
3059 reply => undef,
3060 tooltip => "Reason for and more info about your most recent death",
3061 },
3062 "c/say" => $SAY_CHANNEL,
3063 "c/chat" => $CHAT_CHANNEL,
2788); 3064);
2789 3065
2790sub cf::client::send_msg { 3066sub cf::client::send_msg {
2791 my ($self, $channel, $msg, $color, @extra) = @_; 3067 my ($self, $channel, $msg, $color, @extra) = @_;
2792 3068
2793 $msg = $self->pl->expand_cfpod ($msg); 3069 $msg = $self->pl->expand_cfpod ($msg)
3070 unless $color & cf::NDI_VERBATIM;
2794 3071
2795 $color &= cf::NDI_CLIENT_MASK; # just in case... 3072 $color &= cf::NDI_CLIENT_MASK; # just in case...
2796 3073
2797 # check predefined channels, for the benefit of C 3074 # check predefined channels, for the benefit of C
2798 if ($CHANNEL{$channel}) { 3075 if ($CHANNEL{$channel}) {
2799 $channel = $CHANNEL{$channel}; 3076 $channel = $CHANNEL{$channel};
2800 3077
2801 $self->ext_msg (channel_info => $channel) 3078 $self->ext_msg (channel_info => $channel);
2802 if $self->can_msg;
2803
2804 $channel = $channel->{id}; 3079 $channel = $channel->{id};
2805 3080
2806 } elsif (ref $channel) { 3081 } elsif (ref $channel) {
2807 # send meta info to client, if not yet sent 3082 # send meta info to client, if not yet sent
2808 unless (exists $self->{channel}{$channel->{id}}) { 3083 unless (exists $self->{channel}{$channel->{id}}) {
2809 $self->{channel}{$channel->{id}} = $channel; 3084 $self->{channel}{$channel->{id}} = $channel;
2810 $self->ext_msg (channel_info => $channel) 3085 $self->ext_msg (channel_info => $channel);
2811 if $self->can_msg;
2812 } 3086 }
2813 3087
2814 $channel = $channel->{id}; 3088 $channel = $channel->{id};
2815 } 3089 }
2816 3090
2817 return unless @extra || length $msg; 3091 return unless @extra || length $msg;
2818 3092
2819 if ($self->can_msg) {
2820 # default colour, mask it out 3093 # default colour, mask it out
2821 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3094 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2822 if $color & cf::NDI_DEF; 3095 if $color & cf::NDI_DEF;
2823 3096
2824 my $pkt = "msg " 3097 my $pkt = "msg "
2825 . $self->{json_coder}->encode ( 3098 . $self->{json_coder}->encode (
2826 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3099 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2827 ); 3100 );
2828 3101
2829 # try lzf for large packets
2830 $pkt = "lzf " . Compress::LZF::compress $pkt
2831 if 1024 <= length $pkt and $self->{can_lzf};
2832
2833 # split very large packets
2834 if (8192 < length $pkt and $self->{can_lzf}) {
2835 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2836 $pkt = "frag";
2837 }
2838
2839 $self->send_packet ($pkt); 3102 $self->send_big_packet ($pkt);
2840 } else {
2841 if ($color >= 0) {
2842 # replace some tags by gcfclient-compatible ones
2843 for ($msg) {
2844 1 while
2845 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2846 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2847 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2848 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2849 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2850 }
2851
2852 $color &= cf::NDI_COLOR_MASK;
2853
2854 utf8::encode $msg;
2855
2856 if (0 && $msg =~ /\[/) {
2857 # COMMAND/INFO
2858 $self->send_packet ("drawextinfo $color 10 8 $msg")
2859 } else {
2860 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2861 $self->send_packet ("drawinfo $color $msg")
2862 }
2863 }
2864 }
2865} 3103}
2866 3104
2867=item $client->ext_msg ($type, @msg) 3105=item $client->ext_msg ($type, @msg)
2868 3106
2869Sends an ext event to the client. 3107Sends an ext event to the client.
2872 3110
2873sub cf::client::ext_msg($$@) { 3111sub cf::client::ext_msg($$@) {
2874 my ($self, $type, @msg) = @_; 3112 my ($self, $type, @msg) = @_;
2875 3113
2876 if ($self->extcmd == 2) { 3114 if ($self->extcmd == 2) {
2877 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3115 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2878 } elsif ($self->extcmd == 1) { # TODO: remove 3116 } elsif ($self->extcmd == 1) { # TODO: remove
2879 push @msg, msgtype => "event_$type"; 3117 push @msg, msgtype => "event_$type";
2880 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3118 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2881 } 3119 }
2882} 3120}
2883 3121
2884=item $client->ext_reply ($msgid, @msg) 3122=item $client->ext_reply ($msgid, @msg)
2885 3123
2889 3127
2890sub cf::client::ext_reply($$@) { 3128sub cf::client::ext_reply($$@) {
2891 my ($self, $id, @msg) = @_; 3129 my ($self, $id, @msg) = @_;
2892 3130
2893 if ($self->extcmd == 2) { 3131 if ($self->extcmd == 2) {
2894 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3132 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2895 } elsif ($self->extcmd == 1) { 3133 } elsif ($self->extcmd == 1) {
2896 #TODO: version 1, remove 3134 #TODO: version 1, remove
2897 unshift @msg, msgtype => "reply", msgid => $id; 3135 unshift @msg, msgtype => "reply", msgid => $id;
2898 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3136 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2899 } 3137 }
2900} 3138}
2901 3139
2902=item $success = $client->query ($flags, "text", \&cb) 3140=item $success = $client->query ($flags, "text", \&cb)
2903 3141
2974 3212
2975 $ns->ext_reply ($reply, @reply) 3213 $ns->ext_reply ($reply, @reply)
2976 if $reply; 3214 if $reply;
2977 3215
2978 } else { 3216 } else {
2979 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3217 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2980 } 3218 }
2981 3219
2982 cf::override; 3220 cf::override;
2983 }, 3221 },
2984); 3222);
3004 3242
3005 $coro 3243 $coro
3006} 3244}
3007 3245
3008cf::client->attach ( 3246cf::client->attach (
3009 on_destroy => sub { 3247 on_client_destroy => sub {
3010 my ($ns) = @_; 3248 my ($ns) = @_;
3011 3249
3012 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3250 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3013 }, 3251 },
3014); 3252);
3030our $safe_hole = new Safe::Hole; 3268our $safe_hole = new Safe::Hole;
3031 3269
3032$SIG{FPE} = 'IGNORE'; 3270$SIG{FPE} = 'IGNORE';
3033 3271
3034$safe->permit_only (Opcode::opset qw( 3272$safe->permit_only (Opcode::opset qw(
3035 :base_core :base_mem :base_orig :base_math 3273 :base_core :base_mem :base_orig :base_math :base_loop
3036 grepstart grepwhile mapstart mapwhile 3274 grepstart grepwhile mapstart mapwhile
3037 sort time 3275 sort time
3038)); 3276));
3039 3277
3040# here we export the classes and methods available to script code 3278# here we export the classes and methods available to script code
3044The following functions and methods are available within a safe environment: 3282The following functions and methods are available within a safe environment:
3045 3283
3046 cf::object 3284 cf::object
3047 contr pay_amount pay_player map x y force_find force_add destroy 3285 contr pay_amount pay_player map x y force_find force_add destroy
3048 insert remove name archname title slaying race decrease split 3286 insert remove name archname title slaying race decrease split
3287 value
3049 3288
3050 cf::object::player 3289 cf::object::player
3051 player 3290 player
3052 3291
3053 cf::player 3292 cf::player
3059=cut 3298=cut
3060 3299
3061for ( 3300for (
3062 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3301 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3063 insert remove inv nrof name archname title slaying race 3302 insert remove inv nrof name archname title slaying race
3064 decrease split destroy change_exp)], 3303 decrease split destroy change_exp value msg lore send_msg)],
3065 ["cf::object::player" => qw(player)], 3304 ["cf::object::player" => qw(player)],
3066 ["cf::player" => qw(peaceful)], 3305 ["cf::player" => qw(peaceful send_msg)],
3067 ["cf::map" => qw(trigger)], 3306 ["cf::map" => qw(trigger)],
3068) { 3307) {
3069 no strict 'refs';
3070 my ($pkg, @funs) = @$_; 3308 my ($pkg, @funs) = @$_;
3071 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3309 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3072 for @funs; 3310 for @funs;
3073} 3311}
3074 3312
3089 3327
3090 my $qcode = $code; 3328 my $qcode = $code;
3091 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3329 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3092 $qcode =~ s/\n/\\n/g; 3330 $qcode =~ s/\n/\\n/g;
3093 3331
3332 %vars = (_dummy => 0) unless %vars;
3333
3334 my @res;
3094 local $_; 3335 local $_;
3095 local @safe::cf::_safe_eval_args = values %vars;
3096 3336
3097 my $eval = 3337 my $eval =
3098 "do {\n" 3338 "do {\n"
3099 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3339 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3100 . "#line 0 \"{$qcode}\"\n" 3340 . "#line 0 \"{$qcode}\"\n"
3101 . $code 3341 . $code
3102 . "\n}" 3342 . "\n}"
3103 ; 3343 ;
3104 3344
3345 if ($CFG{safe_eval}) {
3105 sub_generation_inc; 3346 sub_generation_inc;
3347 local @safe::cf::_safe_eval_args = values %vars;
3106 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3348 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3107 sub_generation_inc; 3349 sub_generation_inc;
3350 } else {
3351 local @cf::_safe_eval_args = values %vars;
3352 @res = wantarray ? eval eval : scalar eval $eval;
3353 }
3108 3354
3109 if ($@) { 3355 if ($@) {
3110 warn "$@"; 3356 warn "$@",
3111 warn "while executing safe code '$code'\n"; 3357 "while executing safe code '$code'\n",
3112 warn "with arguments " . (join " ", %vars) . "\n"; 3358 "with arguments " . (join " ", %vars) . "\n";
3113 } 3359 }
3114 3360
3115 wantarray ? @res : $res[0] 3361 wantarray ? @res : $res[0]
3116} 3362}
3117 3363
3131=cut 3377=cut
3132 3378
3133sub register_script_function { 3379sub register_script_function {
3134 my ($fun, $cb) = @_; 3380 my ($fun, $cb) = @_;
3135 3381
3136 no strict 'refs'; 3382 $fun = "safe::$fun" if $CFG{safe_eval};
3137 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3383 *$fun = $safe_hole->wrap ($cb);
3138} 3384}
3139 3385
3140=back 3386=back
3141 3387
3142=cut 3388=cut
3151 # for this (global event?) 3397 # for this (global event?)
3152 %ext::player_env::MUSIC_FACE_CACHE = (); 3398 %ext::player_env::MUSIC_FACE_CACHE = ();
3153 3399
3154 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3400 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3155 3401
3156 warn "loading facedata from $path\n"; 3402 trace "loading facedata from $path\n";
3157 3403
3158 my $facedata;
3159 0 < aio_load $path, $facedata 3404 0 < aio_load $path, my $facedata
3160 or die "$path: $!"; 3405 or die "$path: $!";
3161 3406
3162 $facedata = Coro::Storable::thaw $facedata; 3407 $facedata = Coro::Storable::thaw $facedata;
3163 3408
3164 $facedata->{version} == 2 3409 $facedata->{version} == 2
3165 or cf::cleanup "$path: version mismatch, cannot proceed."; 3410 or cf::cleanup "$path: version mismatch, cannot proceed.";
3166 3411
3167 # patch in the exptable 3412 # patch in the exptable
3413 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3168 $facedata->{resource}{"res/exp_table"} = { 3414 $facedata->{resource}{"res/exp_table"} = {
3169 type => FT_RSRC, 3415 type => FT_RSRC,
3170 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3416 data => $exp_table,
3417 hash => (Digest::MD5::md5 $exp_table),
3171 }; 3418 };
3172 cf::cede_to_tick; 3419 cf::cede_to_tick;
3173 3420
3174 { 3421 {
3175 my $faces = $facedata->{faceinfo}; 3422 my $faces = $facedata->{faceinfo};
3177 while (my ($face, $info) = each %$faces) { 3424 while (my ($face, $info) = each %$faces) {
3178 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3425 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3179 3426
3180 cf::face::set_visibility $idx, $info->{visibility}; 3427 cf::face::set_visibility $idx, $info->{visibility};
3181 cf::face::set_magicmap $idx, $info->{magicmap}; 3428 cf::face::set_magicmap $idx, $info->{magicmap};
3182 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3429 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3183 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3430 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3431 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3184 3432
3185 cf::cede_to_tick; 3433 cf::cede_to_tick;
3186 } 3434 }
3187 3435
3188 while (my ($face, $info) = each %$faces) { 3436 while (my ($face, $info) = each %$faces) {
3193 3441
3194 if (my $smooth = cf::face::find $info->{smooth}) { 3442 if (my $smooth = cf::face::find $info->{smooth}) {
3195 cf::face::set_smooth $idx, $smooth; 3443 cf::face::set_smooth $idx, $smooth;
3196 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3444 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3197 } else { 3445 } else {
3198 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3446 error "smooth face '$info->{smooth}' not found for face '$face'";
3199 } 3447 }
3200 3448
3201 cf::cede_to_tick; 3449 cf::cede_to_tick;
3202 } 3450 }
3203 } 3451 }
3212 3460
3213 cf::anim::invalidate_all; # d'oh 3461 cf::anim::invalidate_all; # d'oh
3214 } 3462 }
3215 3463
3216 { 3464 {
3217 # TODO: for gcfclient pleasure, we should give resources
3218 # that gcfclient doesn't grok a >10000 face index.
3219 my $res = $facedata->{resource}; 3465 my $res = $facedata->{resource};
3220 3466
3221 while (my ($name, $info) = each %$res) { 3467 while (my ($name, $info) = each %$res) {
3222 if (defined $info->{type}) { 3468 if (defined $info->{type}) {
3223 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3469 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3224 my $data;
3225 3470
3226 if ($info->{type} & 1) { 3471 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3227 # prepend meta info
3228
3229 my $meta = $enc->encode ({
3230 name => $name,
3231 %{ $info->{meta} || {} },
3232 });
3233
3234 $data = pack "(w/a*)*", $meta, $info->{data};
3235 } else {
3236 $data = $info->{data};
3237 }
3238
3239 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3240 cf::face::set_type $idx, $info->{type}; 3472 cf::face::set_type $idx, $info->{type};
3241 } else { 3473 } else {
3242 $RESOURCE{$name} = $info; 3474 $RESOURCE{$name} = $info; # unused
3243 } 3475 }
3244 3476
3245 cf::cede_to_tick; 3477 cf::cede_to_tick;
3246 } 3478 }
3247 } 3479 }
3248 3480
3249 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3481 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3250 3482
3251 1 3483 1
3252} 3484}
3253
3254cf::global->attach (on_resource_update => sub {
3255 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3256 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3257
3258 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3259 my $sound = $soundconf->{compat}[$_]
3260 or next;
3261
3262 my $face = cf::face::find "sound/$sound->[1]";
3263 cf::sound::set $sound->[0] => $face;
3264 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3265 }
3266
3267 while (my ($k, $v) = each %{$soundconf->{event}}) {
3268 my $face = cf::face::find "sound/$v";
3269 cf::sound::set $k => $face;
3270 }
3271 }
3272});
3273 3485
3274register_exticmd fx_want => sub { 3486register_exticmd fx_want => sub {
3275 my ($ns, $want) = @_; 3487 my ($ns, $want) = @_;
3276 3488
3277 while (my ($k, $v) = each %$want) { 3489 while (my ($k, $v) = each %$want) {
3316sub reload_treasures { 3528sub reload_treasures {
3317 load_resource_file "$DATADIR/treasures" 3529 load_resource_file "$DATADIR/treasures"
3318 or die "unable to load treasurelists\n"; 3530 or die "unable to load treasurelists\n";
3319} 3531}
3320 3532
3533sub reload_sound {
3534 trace "loading sound config from $DATADIR/sound\n";
3535
3536 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3537 or die "$DATADIR/sound $!";
3538
3539 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3540
3541 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3542 my $sound = $soundconf->{compat}[$_]
3543 or next;
3544
3545 my $face = cf::face::find "sound/$sound->[1]";
3546 cf::sound::set $sound->[0] => $face;
3547 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3548 }
3549
3550 while (my ($k, $v) = each %{$soundconf->{event}}) {
3551 my $face = cf::face::find "sound/$v";
3552 cf::sound::set $k => $face;
3553 }
3554}
3555
3321sub reload_resources { 3556sub reload_resources {
3322 warn "reloading resource files...\n"; 3557 trace "reloading resource files...\n";
3323 3558
3559 reload_exp_table;
3560 reload_materials;
3324 reload_facedata; 3561 reload_facedata;
3562 reload_sound;
3325 reload_archetypes; 3563 reload_archetypes;
3326 reload_regions; 3564 reload_regions;
3327 reload_treasures; 3565 reload_treasures;
3328 3566
3329 warn "finished reloading resource files\n"; 3567 trace "finished reloading resource files\n";
3330}
3331
3332sub init {
3333 my $guard = freeze_mainloop;
3334
3335 evthread_start IO::AIO::poll_fileno;
3336
3337 reload_resources;
3338} 3568}
3339 3569
3340sub reload_config { 3570sub reload_config {
3341 open my $fh, "<:utf8", "$CONFDIR/config" 3571 trace "reloading config file...\n";
3342 or return;
3343 3572
3344 local $/; 3573 0 < aio_load "$CONFDIR/config", my $config
3345 *CFG = YAML::Load <$fh>; 3574 or die "$CONFDIR/config: $!";
3346 3575
3576 utf8::decode $config;
3577 *CFG = yaml_load $config;
3578
3347 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3579 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3348 3580
3349 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3581 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3350 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3582 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3351 3583
3352 if (exists $CFG{mlockall}) { 3584 if (exists $CFG{mlockall}) {
3375 3607
3376 seek $fh, 0, 0; 3608 seek $fh, 0, 0;
3377 print $fh $$; 3609 print $fh $$;
3378} 3610}
3379 3611
3612sub main_loop {
3613 trace "EV::loop starting\n";
3614 if (1) {
3615 EV::loop;
3616 }
3617 trace "EV::loop returned\n";
3618 goto &main_loop unless $REALLY_UNLOOP;
3619}
3620
3380sub main { 3621sub main {
3381 atomic; 3622 cf::init_globals; # initialise logging
3623
3624 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3625 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3626 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3627 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3628
3629 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3382 3630
3383 # we must not ever block the main coroutine 3631 # we must not ever block the main coroutine
3384 local $Coro::idle = sub { 3632 local $Coro::idle = sub {
3385 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3633 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3386 (async { 3634 (async {
3387 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3635 $Coro::current->{desc} = "IDLE BUG HANDLER";
3388 EV::loop EV::LOOP_ONESHOT; 3636 EV::loop EV::LOOP_ONESHOT;
3389 })->prio (Coro::PRIO_MAX); 3637 })->prio (Coro::PRIO_MAX);
3390 }; 3638 };
3391 3639
3392 { 3640 evthread_start IO::AIO::poll_fileno;
3393 my $guard = freeze_mainloop; 3641
3642 cf::sync_job {
3643 cf::incloader::init ();
3644
3645 cf::init_anim;
3646 cf::init_attackmess;
3647 cf::init_dynamic;
3648
3649 cf::load_settings;
3650
3651 reload_resources;
3394 reload_config; 3652 reload_config;
3395 db_init; 3653 db_init;
3654
3655 cf::init_uuid;
3656 cf::init_signals;
3657 cf::init_skills;
3658
3659 cf::init_beforeplay;
3660
3661 atomic;
3662
3396 load_extensions; 3663 load_extensions;
3397 3664
3398 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3399 }
3400
3401 utime time, time, $RUNTIMEFILE; 3665 utime time, time, $RUNTIMEFILE;
3402 3666
3403 # no (long-running) fork's whatsoever before this point(!) 3667 # no (long-running) fork's whatsoever before this point(!)
3668 use POSIX ();
3404 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3669 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3405 3670
3406 EV::loop; 3671 cf::_post_init 0;
3672 };
3673
3674 cf::object::thawer::errors_are_fatal 0;
3675 info "parse errors in files are no longer fatal from this point on.\n";
3676
3677 my $free_main; $free_main = EV::idle sub {
3678 undef $free_main;
3679 undef &main; # free gobs of memory :)
3680 };
3681
3682 goto &main_loop;
3407} 3683}
3408 3684
3409############################################################################# 3685#############################################################################
3410# initialisation and cleanup 3686# initialisation and cleanup
3411 3687
3412# install some emergency cleanup handlers 3688# install some emergency cleanup handlers
3413BEGIN { 3689BEGIN {
3414 our %SIGWATCHER = (); 3690 our %SIGWATCHER = ();
3415 for my $signal (qw(INT HUP TERM)) { 3691 for my $signal (qw(INT HUP TERM)) {
3416 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3692 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3417 cf::cleanup "SIG$signal"; 3693 cf::cleanup "SIG$signal";
3418 }; 3694 };
3419 } 3695 }
3420} 3696}
3421 3697
3422sub write_runtime_sync { 3698sub write_runtime_sync {
3699 my $t0 = AE::time;
3700
3423 # first touch the runtime file to show we are still running: 3701 # first touch the runtime file to show we are still running:
3424 # the fsync below can take a very very long time. 3702 # the fsync below can take a very very long time.
3425 3703
3426 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3704 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3427 3705
3428 my $guard = cf::lock_acquire "write_runtime"; 3706 my $guard = cf::lock_acquire "write_runtime";
3429 3707
3430 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3708 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3431 or return; 3709 or return;
3432 3710
3433 my $value = $cf::RUNTIME + 90 + 10; 3711 my $value = $cf::RUNTIME + 90 + 10;
3434 # 10 is the runtime save interval, for a monotonic clock 3712 # 10 is the runtime save interval, for a monotonic clock
3435 # 60 allows for the watchdog to kill the server. 3713 # 60 allows for the watchdog to kill the server.
3448 or return; 3726 or return;
3449 3727
3450 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3728 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3451 and return; 3729 and return;
3452 3730
3453 warn "runtime file written.\n"; 3731 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3454 3732
3455 1 3733 1
3456} 3734}
3457 3735
3458our $uuid_lock; 3736our $uuid_lock;
3467 my $uuid = "$LOCALDIR/uuid"; 3745 my $uuid = "$LOCALDIR/uuid";
3468 3746
3469 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3747 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3470 or return; 3748 or return;
3471 3749
3472 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3750 my $value = uuid_seq uuid_cur;
3751
3752 unless ($value) {
3753 info "cowardly refusing to write zero uuid value!\n";
3754 return;
3755 }
3756
3757 my $value = uuid_str $value + $uuid_skip;
3473 $uuid_skip = 0; 3758 $uuid_skip = 0;
3474 3759
3475 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3760 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3476 and return; 3761 and return;
3477 3762
3483 or return; 3768 or return;
3484 3769
3485 aio_rename "$uuid~", $uuid 3770 aio_rename "$uuid~", $uuid
3486 and return; 3771 and return;
3487 3772
3488 warn "uuid file written ($value).\n"; 3773 trace "uuid file written ($value).\n";
3489 3774
3490 1 3775 1
3491 3776
3492} 3777}
3493 3778
3499} 3784}
3500 3785
3501sub emergency_save() { 3786sub emergency_save() {
3502 my $freeze_guard = cf::freeze_mainloop; 3787 my $freeze_guard = cf::freeze_mainloop;
3503 3788
3504 warn "enter emergency perl save\n"; 3789 info "emergency_perl_save: enter\n";
3790
3791 # this is a trade-off: we want to be very quick here, so
3792 # save all maps without fsync, and later call a global sync
3793 # (which in turn might be very very slow)
3794 local $USE_FSYNC = 0;
3505 3795
3506 cf::sync_job { 3796 cf::sync_job {
3797 cf::write_runtime_sync; # external watchdog should not bark
3798
3507 # use a peculiar iteration method to avoid tripping on perl 3799 # use a peculiar iteration method to avoid tripping on perl
3508 # refcount bugs in for. also avoids problems with players 3800 # refcount bugs in for. also avoids problems with players
3509 # and maps saved/destroyed asynchronously. 3801 # and maps saved/destroyed asynchronously.
3510 warn "begin emergency player save\n"; 3802 info "emergency_perl_save: begin player save\n";
3511 for my $login (keys %cf::PLAYER) { 3803 for my $login (keys %cf::PLAYER) {
3512 my $pl = $cf::PLAYER{$login} or next; 3804 my $pl = $cf::PLAYER{$login} or next;
3513 $pl->valid or next; 3805 $pl->valid or next;
3514 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3806 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3515 $pl->save; 3807 $pl->save;
3516 } 3808 }
3517 warn "end emergency player save\n"; 3809 info "emergency_perl_save: end player save\n";
3518 3810
3519 warn "begin emergency map save\n"; 3811 cf::write_runtime_sync; # external watchdog should not bark
3812
3813 info "emergency_perl_save: begin map save\n";
3520 for my $path (keys %cf::MAP) { 3814 for my $path (keys %cf::MAP) {
3521 my $map = $cf::MAP{$path} or next; 3815 my $map = $cf::MAP{$path} or next;
3522 $map->valid or next; 3816 $map->valid or next;
3523 $map->save; 3817 $map->save;
3524 } 3818 }
3525 warn "end emergency map save\n"; 3819 info "emergency_perl_save: end map save\n";
3526 3820
3527 warn "begin emergency database checkpoint\n"; 3821 cf::write_runtime_sync; # external watchdog should not bark
3822
3823 info "emergency_perl_save: begin database checkpoint\n";
3528 BDB::db_env_txn_checkpoint $DB_ENV; 3824 BDB::db_env_txn_checkpoint $DB_ENV;
3529 warn "end emergency database checkpoint\n"; 3825 info "emergency_perl_save: end database checkpoint\n";
3530 3826
3531 warn "begin write uuid\n"; 3827 info "emergency_perl_save: begin write uuid\n";
3532 write_uuid_sync 1; 3828 write_uuid_sync 1;
3533 warn "end write uuid\n"; 3829 info "emergency_perl_save: end write uuid\n";
3830
3831 cf::write_runtime_sync; # external watchdog should not bark
3832
3833 trace "emergency_perl_save: syncing database to disk";
3834 BDB::db_env_txn_checkpoint $DB_ENV;
3835
3836 info "emergency_perl_save: starting sync\n";
3837 IO::AIO::aio_sync sub {
3838 info "emergency_perl_save: finished sync\n";
3839 };
3840
3841 cf::write_runtime_sync; # external watchdog should not bark
3842
3843 trace "emergency_perl_save: flushing outstanding aio requests";
3844 while (IO::AIO::nreqs || BDB::nreqs) {
3845 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3846 }
3847
3848 cf::write_runtime_sync; # external watchdog should not bark
3534 }; 3849 };
3535 3850
3536 warn "leave emergency perl save\n"; 3851 info "emergency_perl_save: leave\n";
3537} 3852}
3538 3853
3539sub post_cleanup { 3854sub post_cleanup {
3540 my ($make_core) = @_; 3855 my ($make_core) = @_;
3541 3856
3857 IO::AIO::flush;
3858
3542 warn Carp::longmess "post_cleanup backtrace" 3859 error Carp::longmess "post_cleanup backtrace"
3543 if $make_core; 3860 if $make_core;
3544 3861
3545 my $fh = pidfile; 3862 my $fh = pidfile;
3546 unlink $PIDFILE if <$fh> == $$; 3863 unlink $PIDFILE if <$fh> == $$;
3547} 3864}
3567 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3884 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3568 for my $name (keys %$leaf_symtab) { 3885 for my $name (keys %$leaf_symtab) {
3569 _gv_clear *{"$pkg$name"}; 3886 _gv_clear *{"$pkg$name"};
3570# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3887# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3571 } 3888 }
3572 warn "cleared package #$pkg\n";#d#
3573} 3889}
3574
3575our $RELOAD; # how many times to reload
3576 3890
3577sub do_reload_perl() { 3891sub do_reload_perl() {
3578 # can/must only be called in main 3892 # can/must only be called in main
3579 if ($Coro::current != $Coro::main) { 3893 unless (in_main) {
3580 warn "can only reload from main coroutine"; 3894 error "can only reload from main coroutine";
3581 return; 3895 return;
3582 } 3896 }
3583 3897
3584 return if $RELOAD++; 3898 return if $RELOAD++;
3585 3899
3900 my $t1 = AE::time;
3901
3586 while ($RELOAD) { 3902 while ($RELOAD) {
3587 warn "reloading..."; 3903 cf::get_slot 0.1, -1, "reload_perl";
3904 info "perl_reload: reloading...";
3588 3905
3589 warn "entering sync_job"; 3906 trace "perl_reload: entering sync_job";
3590 3907
3591 cf::sync_job { 3908 cf::sync_job {
3592 cf::write_runtime_sync; # external watchdog should not bark
3593 cf::emergency_save; 3909 #cf::emergency_save;
3594 cf::write_runtime_sync; # external watchdog should not bark
3595 3910
3596 warn "syncing database to disk";
3597 BDB::db_env_txn_checkpoint $DB_ENV;
3598
3599 # if anything goes wrong in here, we should simply crash as we already saved
3600
3601 warn "flushing outstanding aio requests";
3602 while (IO::AIO::nreqs || BDB::nreqs) {
3603 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3604 }
3605
3606 warn "cancelling all extension coros"; 3911 trace "perl_reload: cancelling all extension coros";
3607 $_->cancel for values %EXT_CORO; 3912 $_->cancel for values %EXT_CORO;
3608 %EXT_CORO = (); 3913 %EXT_CORO = ();
3609 3914
3610 warn "removing commands"; 3915 trace "perl_reload: removing commands";
3611 %COMMAND = (); 3916 %COMMAND = ();
3612 3917
3613 warn "removing ext/exti commands"; 3918 trace "perl_reload: removing ext/exti commands";
3614 %EXTCMD = (); 3919 %EXTCMD = ();
3615 %EXTICMD = (); 3920 %EXTICMD = ();
3616 3921
3617 warn "unloading/nuking all extensions"; 3922 trace "perl_reload: unloading/nuking all extensions";
3618 for my $pkg (@EXTS) { 3923 for my $pkg (@EXTS) {
3619 warn "... unloading $pkg"; 3924 trace "... unloading $pkg";
3620 3925
3621 if (my $cb = $pkg->can ("unload")) { 3926 if (my $cb = $pkg->can ("unload")) {
3622 eval { 3927 eval {
3623 $cb->($pkg); 3928 $cb->($pkg);
3624 1 3929 1
3625 } or warn "$pkg unloaded, but with errors: $@"; 3930 } or error "$pkg unloaded, but with errors: $@";
3626 } 3931 }
3627 3932
3628 warn "... clearing $pkg"; 3933 trace "... clearing $pkg";
3629 clear_package $pkg; 3934 clear_package $pkg;
3630 } 3935 }
3631 3936
3632 warn "unloading all perl modules loaded from $LIBDIR"; 3937 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3633 while (my ($k, $v) = each %INC) { 3938 while (my ($k, $v) = each %INC) {
3634 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3939 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3635 3940
3636 warn "... unloading $k"; 3941 trace "... unloading $k";
3637 delete $INC{$k}; 3942 delete $INC{$k};
3638 3943
3639 $k =~ s/\.pm$//; 3944 $k =~ s/\.pm$//;
3640 $k =~ s/\//::/g; 3945 $k =~ s/\//::/g;
3641 3946
3644 } 3949 }
3645 3950
3646 clear_package $k; 3951 clear_package $k;
3647 } 3952 }
3648 3953
3649 warn "getting rid of safe::, as good as possible"; 3954 trace "perl_reload: getting rid of safe::, as good as possible";
3650 clear_package "safe::$_" 3955 clear_package "safe::$_"
3651 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3956 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3652 3957
3653 warn "unloading cf.pm \"a bit\""; 3958 trace "perl_reload: unloading cf.pm \"a bit\"";
3654 delete $INC{"cf.pm"}; 3959 delete $INC{"cf.pm"};
3655 delete $INC{"cf/pod.pm"}; 3960 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3656 3961
3657 # don't, removes xs symbols, too, 3962 # don't, removes xs symbols, too,
3658 # and global variables created in xs 3963 # and global variables created in xs
3659 #clear_package __PACKAGE__; 3964 #clear_package __PACKAGE__;
3660 3965
3661 warn "unload completed, starting to reload now"; 3966 info "perl_reload: unload completed, starting to reload now";
3662 3967
3663 warn "reloading cf.pm"; 3968 trace "perl_reload: reloading cf.pm";
3664 require cf; 3969 require cf;
3665 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3970 cf::_connect_to_perl_1;
3666 3971
3667 warn "loading config and database again"; 3972 trace "perl_reload: loading config and database again";
3668 cf::reload_config; 3973 cf::reload_config;
3669 3974
3670 warn "loading extensions"; 3975 trace "perl_reload: loading extensions";
3671 cf::load_extensions; 3976 cf::load_extensions;
3672 3977
3978 if ($REATTACH_ON_RELOAD) {
3673 warn "reattaching attachments to objects/players"; 3979 trace "perl_reload: reattaching attachments to objects/players";
3674 _global_reattach; # objects, sockets 3980 _global_reattach; # objects, sockets
3675 warn "reattaching attachments to maps"; 3981 trace "perl_reload: reattaching attachments to maps";
3676 reattach $_ for values %MAP; 3982 reattach $_ for values %MAP;
3677 warn "reattaching attachments to players"; 3983 trace "perl_reload: reattaching attachments to players";
3678 reattach $_ for values %PLAYER; 3984 reattach $_ for values %PLAYER;
3985 }
3679 3986
3680 warn "leaving sync_job"; 3987 cf::_post_init 1;
3988
3989 trace "perl_reload: leaving sync_job";
3681 3990
3682 1 3991 1
3683 } or do { 3992 } or do {
3684 warn $@; 3993 error $@;
3685 cf::cleanup "error while reloading, exiting."; 3994 cf::cleanup "perl_reload: error, exiting.";
3686 }; 3995 };
3687 3996
3688 warn "reloaded";
3689 --$RELOAD; 3997 --$RELOAD;
3690 } 3998 }
3999
4000 $t1 = AE::time - $t1;
4001 info "perl_reload: completed in ${t1}s\n";
3691}; 4002};
3692 4003
3693our $RELOAD_WATCHER; # used only during reload 4004our $RELOAD_WATCHER; # used only during reload
3694 4005
3695sub reload_perl() { 4006sub reload_perl() {
3696 # doing reload synchronously and two reloads happen back-to-back, 4007 # doing reload synchronously and two reloads happen back-to-back,
3697 # coro crashes during coro_state_free->destroy here. 4008 # coro crashes during coro_state_free->destroy here.
3698 4009
4010 $RELOAD_WATCHER ||= cf::async {
4011 Coro::AIO::aio_wait cache_extensions;
4012
3699 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4013 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3700 do_reload_perl; 4014 do_reload_perl;
3701 undef $RELOAD_WATCHER; 4015 undef $RELOAD_WATCHER;
4016 };
3702 }; 4017 };
3703} 4018}
3704 4019
3705register_command "reload" => sub { 4020register_command "reload" => sub {
3706 my ($who, $arg) = @_; 4021 my ($who, $arg) = @_;
3712 reload_perl; 4027 reload_perl;
3713 }; 4028 };
3714 } 4029 }
3715}; 4030};
3716 4031
3717unshift @INC, $LIBDIR; 4032#############################################################################
3718 4033
3719my $bug_warning = 0; 4034my $bug_warning = 0;
3720 4035
3721our @WAIT_FOR_TICK; 4036our @WAIT_FOR_TICK;
3722our @WAIT_FOR_TICK_BEGIN; 4037our @WAIT_FOR_TICK_BEGIN;
3723 4038
3724sub wait_for_tick { 4039sub wait_for_tick() {
3725 return if tick_inhibit || $Coro::current == $Coro::main; 4040 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3726 4041
3727 my $signal = new Coro::Signal; 4042 my $signal = new Coro::Signal;
3728 push @WAIT_FOR_TICK, $signal; 4043 push @WAIT_FOR_TICK, $signal;
3729 $signal->wait; 4044 $signal->wait;
3730} 4045}
3731 4046
3732sub wait_for_tick_begin { 4047sub wait_for_tick_begin() {
3733 return if tick_inhibit || $Coro::current == $Coro::main; 4048 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3734 4049
3735 my $signal = new Coro::Signal; 4050 my $signal = new Coro::Signal;
3736 push @WAIT_FOR_TICK_BEGIN, $signal; 4051 push @WAIT_FOR_TICK_BEGIN, $signal;
3737 $signal->wait; 4052 $signal->wait;
3738} 4053}
3744 return; 4059 return;
3745 } 4060 }
3746 4061
3747 cf::server_tick; # one server iteration 4062 cf::server_tick; # one server iteration
3748 4063
4064 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4065
3749 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4066 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3750 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4067 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3751 Coro::async_pool { 4068 Coro::async_pool {
3752 $Coro::current->{desc} = "runtime saver"; 4069 $Coro::current->{desc} = "runtime saver";
3753 write_runtime_sync 4070 write_runtime_sync
3754 or warn "ERROR: unable to write runtime file: $!"; 4071 or error "ERROR: unable to write runtime file: $!";
3755 }; 4072 };
3756 } 4073 }
3757 4074
3758 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4075 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3759 $sig->send; 4076 $sig->send;
3767 4084
3768 if (0) { 4085 if (0) {
3769 if ($NEXT_TICK) { 4086 if ($NEXT_TICK) {
3770 my $jitter = $TICK_START - $NEXT_TICK; 4087 my $jitter = $TICK_START - $NEXT_TICK;
3771 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4088 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3772 warn "jitter $JITTER\n";#d# 4089 debug "jitter $JITTER\n";#d#
3773 } 4090 }
3774 } 4091 }
3775} 4092}
3776 4093
3777{ 4094{
3778 # configure BDB 4095 # configure BDB
3779 4096
3780 BDB::min_parallel 8; 4097 BDB::min_parallel 16;
3781 BDB::max_poll_reqs $TICK * 0.1; 4098 BDB::max_poll_reqs $TICK * 0.1;
3782 $AnyEvent::BDB::WATCHER->priority (1); 4099 $AnyEvent::BDB::WATCHER->priority (1);
3783 4100
3784 unless ($DB_ENV) { 4101 unless ($DB_ENV) {
3785 $DB_ENV = BDB::db_env_create; 4102 $DB_ENV = BDB::db_env_create;
3822 IO::AIO::min_parallel 8; 4139 IO::AIO::min_parallel 8;
3823 IO::AIO::max_poll_time $TICK * 0.1; 4140 IO::AIO::max_poll_time $TICK * 0.1;
3824 undef $AnyEvent::AIO::WATCHER; 4141 undef $AnyEvent::AIO::WATCHER;
3825} 4142}
3826 4143
3827my $_log_backtrace; 4144our $_log_backtrace;
4145our $_log_backtrace_last;
3828 4146
3829sub _log_backtrace { 4147sub _log_backtrace {
3830 my ($msg, @addr) = @_; 4148 my ($msg, @addr) = @_;
3831 4149
3832 $msg =~ s/\n//; 4150 $msg =~ s/\n$//;
3833 4151
4152 if ($_log_backtrace_last eq $msg) {
4153 LOG llevInfo, "[ABT] $msg\n";
4154 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3834 # limit the # of concurrent backtraces 4155 # limit the # of concurrent backtraces
3835 if ($_log_backtrace < 2) { 4156 } elsif ($_log_backtrace < 2) {
4157 $_log_backtrace_last = $msg;
3836 ++$_log_backtrace; 4158 ++$_log_backtrace;
4159 my $perl_bt = Carp::longmess $msg;
3837 async { 4160 async {
3838 $Coro::current->{desc} = "abt $msg"; 4161 $Coro::current->{desc} = "abt $msg";
3839 4162
3840 my @bt = fork_call { 4163 my @bt = fork_call {
3841 @addr = map { sprintf "%x", $_ } @addr; 4164 @addr = map { sprintf "%x", $_ } @addr;
3852 } 4175 }
3853 4176
3854 @funcs 4177 @funcs
3855 }; 4178 };
3856 4179
3857 LOG llevInfo, "[ABT] $msg\n"; 4180 LOG llevInfo, "[ABT] $perl_bt\n";
4181 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3858 LOG llevInfo, "[ABT] $_\n" for @bt; 4182 LOG llevInfo, "[ABT] $_\n" for @bt;
3859 --$_log_backtrace; 4183 --$_log_backtrace;
3860 }; 4184 };
3861 } else { 4185 } else {
3862 LOG llevInfo, "[ABT] $msg\n"; 4186 LOG llevInfo, "[ABT] $msg\n";
3863 LOG llevInfo, "[ABT] [suppressed]\n"; 4187 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3864 } 4188 }
3865} 4189}
3866 4190
3867# load additional modules 4191# load additional modules
3868use cf::pod; 4192require "cf/$_.pm" for @EXTRA_MODULES;
4193cf::_connect_to_perl_2;
3869 4194
3870END { cf::emergency_save } 4195END { cf::emergency_save }
3871 4196
38721 41971
3873 4198

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines