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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines