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.453 by root, Tue Sep 23 04:29:11 2008 UTC vs.
Revision 1.560 by root, Fri Apr 22 02:03:12 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
70 71
71# make sure c-lzf reinitialises itself 72# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
73Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
74 75
76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
78
75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
76 82
77our %COMMAND = (); 83our %COMMAND = ();
78our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
79 85
80our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
83our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
84our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
85 91
86our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
87our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
88 96
89our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
90our $DATADIR = datadir; 99our $DATADIR = datadir;
91our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
92our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
93our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
94our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
95our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
96our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
97our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
98our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
99our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
102 112
103our %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;
104 120
105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107our $NEXT_TICK; 123our $NEXT_TICK;
108our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
109 125
110our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
112our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
113our $DB_ENV; 129our $DB_ENV;
114 130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
115our %CFG; 133our %CFG;
116 134
117our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
118our $RUNTIME; 136our $RUNTIME;
119our $NOW; 137our $NOW;
129our $LOADAVG; # same thing, but with alpha-smoothing 147our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter 148our $JITTER; # average jitter
131our $TICK_START; # for load detecting purposes 149our $TICK_START; # for load detecting purposes
132 150
133our @POST_INIT; 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 :)
134 155
135binmode STDOUT; 156binmode STDOUT;
136binmode STDERR; 157binmode STDERR;
137 158
138# read virtual server time, if available 159# read virtual server time, if available
140 open my $fh, "<", $RUNTIMEFILE 161 open my $fh, "<", $RUNTIMEFILE
141 or die "unable to read $RUNTIMEFILE file: $!"; 162 or die "unable to read $RUNTIMEFILE file: $!";
142 $RUNTIME = <$fh> + 0.; 163 $RUNTIME = <$fh> + 0.;
143} 164}
144 165
166eval "sub TICK() { $TICK } 1" or die;
167
145mkdir $_ 168mkdir $_
146 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 169 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
147 170
148our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
149 172
150sub 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::"} };
151 189
152############################################################################# 190#############################################################################
153 191
154=head2 GLOBAL VARIABLES 192=head2 GLOBAL VARIABLES
155 193
197from wherever your confdir points to. 235from wherever your confdir points to.
198 236
199=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
200 238
201These 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
202returns 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
203per 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.
204 242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
247
205=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
206 249
207This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
208C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 251C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
209that call. 252that call.
210 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
211=back 260=back
212 261
213=cut 262=cut
214 263
215BEGIN { 264sub error(@) { LOG llevError, join "", @_ }
216 *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 {
217 my $msg = join "", @_; 271 my $msg = join "", @_;
218 272
219 $msg .= "\n" 273 $msg .= "\n"
220 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
221 275
222 $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;
223 277
224 LOG llevError, $msg; 278 LOG llevWarn, $msg;
225 }; 279};
226}
227 280
228$Coro::State::DIEHOOK = sub { 281$Coro::State::DIEHOOK = sub {
229 return unless $^S eq 0; # "eq", not "==" 282 return unless $^S eq 0; # "eq", not "=="
230 283
231 if ($Coro::current == $Coro::main) {#d# 284 error Carp::longmess $_[0];
285
286 if (in_main) {#d#
232 warn "DIEHOOK called in main context, Coro bug?\n";#d# 287 error "DIEHOOK called in main context, Coro bug?\n";#d#
233 return;#d# 288 return;#d#
234 }#d# 289 }#d#
235 290
236 # kill coroutine otherwise 291 # kill coroutine otherwise
237 warn Carp::longmess $_[0];
238 Coro::terminate 292 Coro::terminate
239}; 293};
240
241$SIG{__DIE__} = sub { }; #d#?
242 294
243@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 295@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
244@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 296@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
245@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 297@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
246@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 298@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
260)) { 312)) {
261 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
262} 314}
263 315
264$EV::DIED = sub { 316$EV::DIED = sub {
265 warn "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
266}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
267 324
268############################################################################# 325#############################################################################
269 326
270=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
271 328
292 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 349 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
293 $d 350 $d
294 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
295} 352}
296 353
354=item $scalar = load_file $path
355
356Loads the given file from path and returns its contents. Croaks on error
357and can block.
358
359=cut
360
361sub load_file($) {
362 0 <= aio_load $_[0], my $data
363 or Carp::croak "$_[0]: $!";
364
365 $data
366}
367
297=item $ref = cf::decode_json $json 368=item $ref = cf::decode_json $json
298 369
299Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
300 371
301=item $json = cf::encode_json $ref 372=item $json = cf::encode_json $ref
307our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 378our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
308 379
309sub encode_json($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
310sub decode_json($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
311 382
383=item $ref = cf::decode_storable $scalar
384
385Same as Coro::Storable::thaw, so blocks.
386
387=cut
388
389BEGIN { *decode_storable = \&Coro::Storable::thaw }
390
391=item $ref = cf::decode_yaml $scalar
392
393Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
394
395=cut
396
397sub decode_yaml($) {
398 fork_call { YAML::XS::Load $_[0] } @_
399}
400
401=item $scalar = cf::unlzf $scalar
402
403Same as Compress::LZF::compress, but takes server ticks into account, so
404blocks.
405
406=cut
407
408sub unlzf($) {
409 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
410 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
411 Compress::LZF::decompress $_[0]
412}
413
312=item cf::post_init { BLOCK } 414=item cf::post_init { BLOCK }
313 415
314Execute the given codeblock, I<after> all extensions have been (re-)loaded, 416Execute the given codeblock, I<after> all extensions have been (re-)loaded,
315but I<before> the server starts ticking again. 417but I<before> the server starts ticking again.
316 418
317The cdoeblock will have a single boolean argument to indicate whether this 419The codeblock will have a single boolean argument to indicate whether this
318is a reload or not. 420is a reload or not.
319 421
320=cut 422=cut
321 423
322sub post_init(&) { 424sub post_init(&) {
323 push @POST_INIT, shift; 425 push @POST_INIT, shift;
324} 426}
325 427
428sub _post_init {
429 trace "running post_init jobs";
430
431 # run them in parallel...
432
433 my @join;
434
435 while () {
436 push @join, map &Coro::async ($_, 0), @POST_INIT;
437 @POST_INIT = ();
438
439 @join or last;
440
441 (pop @join)->join;
442 }
443}
444
326=item cf::lock_wait $string 445=item cf::lock_wait $string
327 446
328Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
329 448
330=item my $lock = cf::lock_acquire $string 449=item my $lock = cf::lock_acquire $string
331 450
332Wait until the given lock is available and then acquires it and returns 451Wait until the given lock is available and then acquires it and returns
333a Coro::guard object. If the guard object gets destroyed (goes out of scope, 452a L<Guard> object. If the guard object gets destroyed (goes out of scope,
334for example when the coroutine gets canceled), the lock is automatically 453for example when the coroutine gets canceled), the lock is automatically
335returned. 454returned.
336 455
337Locks are *not* recursive, locking from the same coro twice results in a 456Locks are *not* recursive, locking from the same coro twice results in a
338deadlocked coro. 457deadlocked coro.
344 463
345Return true if the lock is currently active, i.e. somebody has locked it. 464Return true if the lock is currently active, i.e. somebody has locked it.
346 465
347=cut 466=cut
348 467
349our %LOCK; 468our $LOCKS = new Coro::SemaphoreSet;
350our %LOCKER;#d#
351 469
352sub lock_wait($) { 470sub lock_wait($) {
353 my ($key) = @_; 471 $LOCKS->wait ($_[0]);
354
355 if ($LOCKER{$key} == $Coro::current) {#d#
356 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
357 return;#d#
358 }#d#
359
360 # wait for lock, if any
361 while ($LOCK{$key}) {
362 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
363 push @{ $LOCK{$key} }, $Coro::current;
364 Coro::schedule;
365 }
366} 472}
367 473
368sub lock_acquire($) { 474sub lock_acquire($) {
369 my ($key) = @_; 475 $LOCKS->guard ($_[0])
370
371 # wait, to be sure we are not locked
372 lock_wait $key;
373
374 $LOCK{$key} = [];
375 $LOCKER{$key} = $Coro::current;#d#
376
377 Coro::guard {
378 delete $LOCKER{$key};#d#
379 # wake up all waiters, to be on the safe side
380 $_->ready for @{ delete $LOCK{$key} };
381 }
382} 476}
383 477
384sub lock_active($) { 478sub lock_active($) {
385 my ($key) = @_; 479 $LOCKS->count ($_[0]) < 1
386
387 ! ! $LOCK{$key}
388} 480}
389 481
390sub freeze_mainloop { 482sub freeze_mainloop {
391 tick_inhibit_inc; 483 tick_inhibit_inc;
392 484
393 Coro::guard \&tick_inhibit_dec; 485 &Guard::guard (\&tick_inhibit_dec);
394} 486}
395 487
396=item cf::periodic $interval, $cb 488=item cf::periodic $interval, $cb
397 489
398Like EV::periodic, but randomly selects a starting point so that the actions 490Like EV::periodic, but randomly selects a starting point so that the actions
399get spread over timer. 491get spread over time.
400 492
401=cut 493=cut
402 494
403sub periodic($$) { 495sub periodic($$) {
404 my ($interval, $cb) = @_; 496 my ($interval, $cb) = @_;
408 EV::periodic $start, $interval, 0, $cb 500 EV::periodic $start, $interval, 0, $cb
409} 501}
410 502
411=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
412 504
413Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
414This call blocks and returns only when you have at least C<$time> seconds 506(default: 0): This call blocks and returns only when you have at least
415of cpu time till the next tick. The slot is only valid till the next cede. 507C<$time> seconds of cpu time till the next tick. The slot is only valid
508till the next cede.
509
510Background jobs should use a priority les than zero, interactive jobs
511should use 100 or more.
416 512
417The optional C<$name> can be used to identify the job to run. It might be 513The optional C<$name> can be used to identify the job to run. It might be
418used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
419 515
420Useful for short background jobs. 516Useful for short background jobs.
421 517
422=cut 518=cut
423 519
424our @SLOT_QUEUE; 520our @SLOT_QUEUE;
425our $SLOT_QUEUE; 521our $SLOT_QUEUE;
522our $SLOT_DECAY = 0.9;
426 523
427$SLOT_QUEUE->cancel if $SLOT_QUEUE; 524$SLOT_QUEUE->cancel if $SLOT_QUEUE;
428$SLOT_QUEUE = Coro::async { 525$SLOT_QUEUE = Coro::async {
429 $Coro::current->desc ("timeslot manager"); 526 $Coro::current->desc ("timeslot manager");
430 527
431 my $signal = new Coro::Signal; 528 my $signal = new Coro::Signal;
529 my $busy;
432 530
433 while () { 531 while () {
434 next_job: 532 next_job:
533
435 my $avail = cf::till_tick; 534 my $avail = cf::till_tick;
436 if ($avail > 0.01) { 535
437 for (0 .. $#SLOT_QUEUE) { 536 for (0 .. $#SLOT_QUEUE) {
438 if ($SLOT_QUEUE[$_][0] < $avail) { 537 if ($SLOT_QUEUE[$_][0] <= $avail) {
538 $busy = 0;
439 my $job = splice @SLOT_QUEUE, $_, 1, (); 539 my $job = splice @SLOT_QUEUE, $_, 1, ();
440 $job->[2]->send; 540 $job->[2]->send;
441 Coro::cede; 541 Coro::cede;
442 goto next_job; 542 goto next_job;
443 } 543 } else {
544 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
444 } 545 }
445 } 546 }
446 547
447 if (@SLOT_QUEUE) { 548 if (@SLOT_QUEUE) {
448 # we do not use wait_for_tick() as it returns immediately when tick is inactive 549 # we do not use wait_for_tick() as it returns immediately when tick is inactive
449 push @cf::WAIT_FOR_TICK, $signal; 550 push @cf::WAIT_FOR_TICK, $signal;
450 $signal->wait; 551 $signal->wait;
451 } else { 552 } else {
553 $busy = 0;
452 Coro::schedule; 554 Coro::schedule;
453 } 555 }
454 } 556 }
455}; 557};
456 558
457sub get_slot($;$$) { 559sub get_slot($;$$) {
458 return if tick_inhibit || $Coro::current == $Coro::main; 560 return if tick_inhibit || $Coro::current == $Coro::main;
459 561
460 my ($time, $pri, $name) = @_; 562 my ($time, $pri, $name) = @_;
461 563
462 $time = $TICK * .6 if $time > $TICK * .6; 564 $time = clamp $time, 0.01, $TICK * .6;
565
463 my $sig = new Coro::Signal; 566 my $sig = new Coro::Signal;
464 567
465 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 568 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
466 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 569 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
467 $SLOT_QUEUE->ready; 570 $SLOT_QUEUE->ready;
493=cut 596=cut
494 597
495sub sync_job(&) { 598sub sync_job(&) {
496 my ($job) = @_; 599 my ($job) = @_;
497 600
498 if ($Coro::current == $Coro::main) { 601 if (in_main) {
499 my $time = EV::time; 602 my $time = AE::time;
500 603
501 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
502 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
503 606
504 LOG llevError, Carp::longmess "sync job";#d# 607 #LOG llevError, Carp::longmess "sync job";#d#
505 608
506 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
507 610
508 my $busy = 1; 611 my $busy = 1;
509 my @res; 612 my @res;
510 613
511 (async { 614 (async {
512 $Coro::current->desc ("sync job coro"); 615 $Coro::current->desc ("sync job coro");
513 @res = eval { $job->() }; 616 @res = eval { $job->() };
514 warn $@ if $@; 617 error $@ if $@;
515 undef $busy; 618 undef $busy;
516 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
517 620
518 while ($busy) { 621 while ($busy) {
519 if (Coro::nready) { 622 if (Coro::nready) {
521 } else { 624 } else {
522 EV::loop EV::LOOP_ONESHOT; 625 EV::loop EV::LOOP_ONESHOT;
523 } 626 }
524 } 627 }
525 628
526 my $time = EV::time - $time; 629 my $time = AE::time - $time;
527 630
528 $TICK_START += $time; # do not account sync jobs to server load 631 $TICK_START += $time; # do not account sync jobs to server load
529 632
530 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
531 } else { 634 } else {
553 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
554 657
555 $coro 658 $coro
556} 659}
557 660
558=item fork_call { }, $args 661=item fork_call { }, @args
559 662
560Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
561process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
562Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
563never block itself or use any form of event handling. 666never block itself or use any form of event handling.
564 667
565=cut 668=cut
566 669
670sub post_fork {
671 reset_signals;
672}
673
567sub fork_call(&@) { 674sub fork_call(&@) {
568 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
569 676
570 # we seemingly have to make a local copy of the whole thing, 677 # we seemingly have to make a local copy of the whole thing,
571 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
572 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
573 680
574 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
575 reset_signals; 682 cf::post_fork;
576 &$cb 683 &$cb
577 }, @args; 684 } @args;
578 685
579 wantarray ? @res : $res[-1] 686 wantarray ? @res : $res[-1]
687}
688
689sub objinfo {
690 (
691 "counter value" => cf::object::object_count,
692 "objects created" => cf::object::create_count,
693 "objects destroyed" => cf::object::destroy_count,
694 "freelist size" => cf::object::free_count,
695 "allocated objects" => cf::object::objects_size,
696 "active objects" => cf::object::actives_size,
697 )
580} 698}
581 699
582=item $coin = coin_from_name $name 700=item $coin = coin_from_name $name
583 701
584=cut 702=cut
621within each server. 739within each server.
622 740
623=cut 741=cut
624 742
625sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
626 my ($name) = @_; 747 my ($name) = @_;
627 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
628 749
629 eval { 750 eval {
630 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
640} 761}
641 762
642our $DB; 763our $DB;
643 764
644sub db_init { 765sub db_init {
645 cf::sync_job {
646 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
647 };
648} 767}
649 768
650sub db_get($$) { 769sub db_get($$) {
651 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
652 771
653 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
654 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
655 776
656 $! ? () 777 $! ? ()
657 : $data 778 : $data
658 }
659} 779}
660 780
661sub db_put($$$) { 781sub db_put($$$) {
662 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
663 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
691 811
692 my @data; 812 my @data;
693 my $md5; 813 my $md5;
694 814
695 for (0 .. $#$src) { 815 for (0 .. $#$src) {
696 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
697 or Carp::croak "$src->[$_]: $!";
698 } 817 }
699 818
700 # if processing is expensive, check 819 # if processing is expensive, check
701 # checksum first 820 # checksum first
702 if (1) { 821 if (1) {
719 838
720 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
721 my $data = $process->(\@data); 840 my $data = $process->(\@data);
722 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
723 842
724 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
725 844
726 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
727 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
728 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
729 848
739 858
740=cut 859=cut
741 860
742sub datalog($@) { 861sub datalog($@) {
743 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
744 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
745} 864}
746 865
747=back 866=back
748 867
749=cut 868=cut
944 1063
945 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
946 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
947 1066
948 } elsif (ref $type) { 1067 } elsif (ref $type) {
949 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
950 1069
951 } else { 1070 } else {
952 shift @arg; 1071 shift @arg;
953 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
954 } 1073 }
955 } 1074 }
956} 1075}
957 1076
958sub _object_attach { 1077sub _object_attach {
968 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
969 } 1088 }
970 1089
971 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
972 } else { 1091 } else {
973 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
974 } 1093 }
975 1094
976 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
977} 1096}
978 1097
1037 1156
1038 for (@$callbacks) { 1157 for (@$callbacks) {
1039 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
1040 1159
1041 if ($@) { 1160 if ($@) {
1042 warn "$@";
1043 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1044 override; 1162 override;
1045 } 1163 }
1046 1164
1047 return 1 if $override; 1165 return 1 if $override;
1048 } 1166 }
1127 for (@$attach) { 1245 for (@$attach) {
1128 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
1129 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
1130 } 1248 }
1131 } else { 1249 } else {
1132 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
1133 } 1251 }
1134 } 1252 }
1135} 1253}
1136 1254
1137cf::attachable->attach ( 1255cf::attachable->attach (
1164 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1165 1283
1166 sync_job { 1284 sync_job {
1167 if (length $$rdata) { 1285 if (length $$rdata) {
1168 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1169 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1170 $decname, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1171 1290
1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1173 aio_chmod $fh, SAVE_MODE; 1292 aio_chmod $fh, SAVE_MODE;
1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1175 aio_fsync $fh if $cf::USE_FSYNC; 1294 if ($cf::USE_FSYNC) {
1295 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;
1296 aio_fsync $fh;
1297 }
1176 aio_close $fh; 1298 aio_close $fh;
1177 1299
1178 if (@$objs) { 1300 if (@$objs) {
1179 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1301 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1180 aio_chmod $fh, SAVE_MODE; 1302 aio_chmod $fh, SAVE_MODE;
1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1303 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1182 aio_write $fh, 0, (length $data), $data, 0; 1304 aio_write $fh, 0, (length $data), $data, 0;
1183 aio_fsync $fh if $cf::USE_FSYNC; 1305 if ($cf::USE_FSYNC) {
1306 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;
1307 aio_fsync $fh;
1308 }
1184 aio_close $fh; 1309 aio_close $fh;
1185 aio_rename "$filename.pst~", "$filename.pst"; 1310 aio_rename "$filename.pst~", "$filename.pst";
1186 } 1311 }
1187 } else { 1312 } else {
1188 aio_unlink "$filename.pst"; 1313 aio_unlink "$filename.pst";
1189 } 1314 }
1190 1315
1191 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1317
1318 $filename =~ s%/[^/]+$%%;
1319 aio_pathsync $filename if $cf::USE_FSYNC;
1192 } else { 1320 } else {
1193 warn "FATAL: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1194 } 1322 }
1195 } else { 1323 } else {
1196 aio_unlink $filename; 1324 aio_unlink $filename;
1197 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1198 } 1326 }
1222 my $st = eval { Coro::Storable::thaw $av }; 1350 my $st = eval { Coro::Storable::thaw $av };
1223 $av = $st->{objs}; 1351 $av = $st->{objs};
1224 } 1352 }
1225 1353
1226 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1227 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1228 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1229 1358
1230 ($data, $av) 1359 ($data, $av)
1231} 1360}
1232 1361
1233=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
1289 my ($name, $cb) = @_; 1418 my ($name, $cb) = @_;
1290 1419
1291 $EXTICMD{$name} = $cb; 1420 $EXTICMD{$name} = $cb;
1292} 1421}
1293 1422
1423use File::Glob ();
1424
1294cf::player->attach ( 1425cf::player->attach (
1295 on_command => sub { 1426 on_unknown_command => sub {
1296 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1297 1428
1298 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1299 or return; 1430 or return;
1300 1431
1323 1454
1324 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1325 if $reply; 1456 if $reply;
1326 1457
1327 } else { 1458 } else {
1328 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1329 } 1460 }
1330 1461
1331 cf::override; 1462 cf::override;
1332 }, 1463 },
1333); 1464);
1334 1465
1466# "readahead" all extensions
1467sub cache_extensions {
1468 my $grp = IO::AIO::aio_group;
1469
1470 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1471 for (grep /\.ext$/, @{$_[0]}) {
1472 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1473 }
1474 };
1475
1476 $grp
1477}
1478
1335sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1336 cf::sync_job { 1482 cf::sync_job {
1337 my %todo; 1483 my %todo;
1338 1484
1339 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1340 next unless -r $path; 1486 next unless -r $path;
1358 1504
1359 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1360 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1361 1507
1362 $ext{source} = 1508 $ext{source} =
1363 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1364 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1365 . $source 1511 . $source
1366 . "\n};\n1"; 1512 . "\n};\n1";
1367 1513
1368 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
1369 } 1515 }
1370 1516
1517 my $pass = 0;
1371 my %done; 1518 my %done;
1372 while (%todo) { 1519 while (%todo) {
1373 my $progress; 1520 my $progress;
1374 1521
1522 ++$pass;
1523
1524 ext:
1375 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
1376 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1377 goto skip 1527 next ext
1378 unless exists $done{$_}; 1528 unless exists $done{$_};
1379 } 1529 }
1380 1530
1381 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1382 1532
1383 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
1384 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
1385 : "$v->{base}: extension inactive.\n";
1386 1537
1387 if (exists $v->{meta}{mandatory}) {
1388 warn $msg;
1389 cf::cleanup "mandatory extension failed to load, exiting."; 1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1390 } 1539 if exists $v->{meta}{mandatory};
1391 1540
1392 warn $msg; 1541 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1542 delete $todo{$k};
1543 } else {
1544 $done{$k} = delete $todo{$k};
1545 push @EXTS, $v->{pkg};
1546 $progress = 1;
1547
1548 info "$v->{base}: extension inactive.\n"
1549 unless $active;
1393 } 1550 }
1394
1395 $done{$k} = delete $todo{$k};
1396 push @EXTS, $v->{pkg};
1397 $progress = 1;
1398 } 1551 }
1399 1552
1400 skip: 1553 unless ($progress) {
1401 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1402 unless $progress; 1555
1556 while (my ($k, $v) = each %todo) {
1557 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1558 if exists $v->{meta}{mandatory};
1559 }
1560 }
1403 } 1561 }
1404 }; 1562 };
1405} 1563}
1406 1564
1407############################################################################# 1565#############################################################################
1491 $cf::PLAYER{$login} = $pl 1649 $cf::PLAYER{$login} = $pl
1492 } 1650 }
1493 } 1651 }
1494} 1652}
1495 1653
1654cf::player->attach (
1655 on_load => sub {
1656 my ($pl, $path) = @_;
1657
1658 # restore slots saved in save, below
1659 my $slots = delete $pl->{_slots};
1660
1661 $pl->ob->current_weapon ($slots->[0]);
1662 $pl->combat_ob ($slots->[1]);
1663 $pl->ranged_ob ($slots->[2]);
1664 },
1665);
1666
1496sub save($) { 1667sub save($) {
1497 my ($pl) = @_; 1668 my ($pl) = @_;
1498 1669
1499 return if $pl->{deny_save}; 1670 return if $pl->{deny_save};
1500 1671
1505 1676
1506 aio_mkdir playerdir $pl, 0770; 1677 aio_mkdir playerdir $pl, 0770;
1507 $pl->{last_save} = $cf::RUNTIME; 1678 $pl->{last_save} = $cf::RUNTIME;
1508 1679
1509 cf::get_slot 0.01; 1680 cf::get_slot 0.01;
1681
1682 # save slots, to be restored later
1683 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1510 1684
1511 $pl->save_pl ($path); 1685 $pl->save_pl ($path);
1512 cf::cede_to_tick; 1686 cf::cede_to_tick;
1513} 1687}
1514 1688
1548 my $name = $pl->ob->name; 1722 my $name = $pl->ob->name;
1549 1723
1550 $pl->{deny_save} = 1; 1724 $pl->{deny_save} = 1;
1551 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1725 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1552 1726
1553 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1727 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1554 $pl->deactivate; 1728 $pl->deactivate;
1729
1555 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1730 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1556 $pl->ob->check_score;
1557 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1731 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1732 ext::highscore::check ($pl->ob);
1733
1558 $pl->ns->destroy if $pl->ns; 1734 $pl->ns->destroy if $pl->ns;
1559 1735
1560 my $path = playerdir $pl; 1736 my $path = playerdir $pl;
1561 my $temp = "$path~$cf::RUNTIME~deleting~"; 1737 my $temp = "$path~$cf::RUNTIME~deleting~";
1562 aio_rename $path, $temp; 1738 aio_rename $path, $temp;
1616 \@logins 1792 \@logins
1617} 1793}
1618 1794
1619=item $player->maps 1795=item $player->maps
1620 1796
1797=item cf::player::maps $login
1798
1621Returns an arrayref of map paths that are private for this 1799Returns an arrayref of map paths that are private for this
1622player. May block. 1800player. May block.
1623 1801
1624=cut 1802=cut
1625 1803
1687=cut 1865=cut
1688 1866
1689sub find_by_path($) { 1867sub find_by_path($) {
1690 my ($path) = @_; 1868 my ($path) = @_;
1691 1869
1870 $path =~ s/^~[^\/]*//; # skip ~login
1871
1692 my ($match, $specificity); 1872 my ($match, $specificity);
1693 1873
1694 for my $region (list) { 1874 for my $region (list) {
1695 if ($region->{match} && $path =~ $region->{match}) { 1875 if ($region->{match} && $path =~ $region->{match}) {
1696 ($match, $specificity) = ($region, $region->specificity) 1876 ($match, $specificity) = ($region, $region->specificity)
1724sub generate_random_map { 1904sub generate_random_map {
1725 my ($self, $rmp) = @_; 1905 my ($self, $rmp) = @_;
1726 1906
1727 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1907 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1728 1908
1729 # mit "rum" bekleckern, nicht
1730 $self->_create_random_map ( 1909 $self->_create_random_map ($rmp);
1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1734 $rmp->{exit_on_final_map},
1735 $rmp->{xsize}, $rmp->{ysize},
1736 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1737 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1738 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1739 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1740 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1741 (cf::region::find $rmp->{region}), $rmp->{custom}
1742 )
1743} 1910}
1744 1911
1745=item cf::map->register ($regex, $prio) 1912=item cf::map->register ($regex, $prio)
1746 1913
1747Register a handler for the map path matching the given regex at the 1914Register a handler for the map path matching the given regex at the
1752 1919
1753sub register { 1920sub register {
1754 my (undef, $regex, $prio) = @_; 1921 my (undef, $regex, $prio) = @_;
1755 my $pkg = caller; 1922 my $pkg = caller;
1756 1923
1757 no strict;
1758 push @{"$pkg\::ISA"}, __PACKAGE__; 1924 push @{"$pkg\::ISA"}, __PACKAGE__;
1759 1925
1760 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1926 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1761} 1927}
1762 1928
1763# also paths starting with '/' 1929# also paths starting with '/'
1764$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1930$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1765 1931
1766sub thawer_merge { 1932sub thawer_merge {
1767 my ($self, $merge) = @_; 1933 my ($self, $merge) = @_;
1768 1934
1769 # we have to keep some variables in memory intact 1935 # we have to keep some variables in memory intact
1774} 1940}
1775 1941
1776sub normalise { 1942sub normalise {
1777 my ($path, $base) = @_; 1943 my ($path, $base) = @_;
1778 1944
1779 $path = "$path"; # make sure its a string 1945 $path = "$path"; # make sure it's a string
1780 1946
1781 $path =~ s/\.map$//; 1947 $path =~ s/\.map$//;
1782 1948
1783 # map plan: 1949 # map plan:
1784 # 1950 #
1799 $base =~ s{[^/]+/?$}{}; 1965 $base =~ s{[^/]+/?$}{};
1800 $path = "$base/$path"; 1966 $path = "$base/$path";
1801 } 1967 }
1802 1968
1803 for ($path) { 1969 for ($path) {
1804 redo if s{//}{/};
1805 redo if s{/\.?/}{/}; 1970 redo if s{/\.?/}{/};
1806 redo if s{/[^/]+/\.\./}{/}; 1971 redo if s{/[^/]+/\.\./}{/};
1807 } 1972 }
1808 1973
1809 $path 1974 $path
1823 $self->init; # pass $1 etc. 1988 $self->init; # pass $1 etc.
1824 return $self; 1989 return $self;
1825 } 1990 }
1826 } 1991 }
1827 1992
1828 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1993 Carp::cluck "unable to resolve path '$path' (base '$base')";
1829 () 1994 ()
1830} 1995}
1831 1996
1832sub init { 1997sub init {
1833 my ($self) = @_; 1998 my ($self) = @_;
1865sub uniq_path { 2030sub uniq_path {
1866 my ($self) = @_; 2031 my ($self) = @_;
1867 2032
1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2033 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1869 "$UNIQUEDIR/$path" 2034 "$UNIQUEDIR/$path"
1870}
1871
1872# and all this just because we cannot iterate over
1873# all maps in C++...
1874sub change_all_map_light {
1875 my ($change) = @_;
1876
1877 $_->change_map_light ($change)
1878 for grep $_->outdoor, values %cf::MAP;
1879} 2035}
1880 2036
1881sub decay_objects { 2037sub decay_objects {
1882 my ($self) = @_; 2038 my ($self) = @_;
1883 2039
1965 2121
1966sub find; 2122sub find;
1967sub find { 2123sub find {
1968 my ($path, $origin) = @_; 2124 my ($path, $origin) = @_;
1969 2125
2126 cf::cede_to_tick;
2127
1970 $path = normalise $path, $origin && $origin->path; 2128 $path = normalise $path, $origin && $origin->path;
1971 2129
1972 cf::lock_wait "map_data:$path";#d#remove 2130 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 cf::lock_wait "map_find:$path"; 2131 my $guard2 = cf::lock_acquire "map_find:$path";
1974 2132
1975 $cf::MAP{$path} || do { 2133 $cf::MAP{$path} || do {
1976 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1977 my $guard2 = cf::lock_acquire "map_find:$path";
1978
1979 my $map = new_from_path cf::map $path 2134 my $map = new_from_path cf::map $path
1980 or return; 2135 or return;
1981 2136
1982 $map->{last_save} = $cf::RUNTIME; 2137 $map->{last_save} = $cf::RUNTIME;
1983 2138
1995 2150
1996 $cf::MAP{$path} = $map 2151 $cf::MAP{$path} = $map
1997 } 2152 }
1998} 2153}
1999 2154
2000sub pre_load { } 2155sub pre_load { }
2001sub post_load { } 2156#sub post_load { } # XS
2002 2157
2003sub load { 2158sub load {
2004 my ($self) = @_; 2159 my ($self) = @_;
2005 2160
2006 local $self->{deny_reset} = 1; # loading can take a long time 2161 local $self->{deny_reset} = 1; # loading can take a long time
2051 unless ($self->{deny_activate}) { 2206 unless ($self->{deny_activate}) {
2052 $self->decay_objects; 2207 $self->decay_objects;
2053 $self->fix_auto_apply; 2208 $self->fix_auto_apply;
2054 $self->update_buttons; 2209 $self->update_buttons;
2055 cf::cede_to_tick; 2210 cf::cede_to_tick;
2056 $self->set_darkness_map;
2057 cf::cede_to_tick;
2058 $self->activate; 2211 $self->activate;
2059 } 2212 }
2060 2213
2061 $self->{last_save} = $cf::RUNTIME; 2214 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME); 2215 $self->last_access ($cf::RUNTIME);
2063 2216
2064 $self->in_memory (cf::MAP_ACTIVE); 2217 $self->in_memory (cf::MAP_ACTIVE);
2065 } 2218 }
2066 2219
2067 $self->post_load; 2220 $self->post_load;
2068}
2069 2221
2222 1
2223}
2224
2225# customize the map for a given player, i.e.
2226# return the _real_ map. used by e.g. per-player
2227# maps to change the path to ~playername/mappath
2070sub customise_for { 2228sub customise_for {
2071 my ($self, $ob) = @_; 2229 my ($self, $ob) = @_;
2072 2230
2073 return find "~" . $ob->name . "/" . $self->{path} 2231 return find "~" . $ob->name . "/" . $self->{path}
2074 if $self->per_player; 2232 if $self->per_player;
2090 or next; 2248 or next;
2091 $neigh = find $neigh, $map 2249 $neigh = find $neigh, $map
2092 or next; 2250 or next;
2093 $neigh->load; 2251 $neigh->load;
2094 2252
2253 # now find the diagonal neighbours
2095 push @neigh, 2254 push @neigh,
2096 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2255 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2097 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2256 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2098 } 2257 }
2099 2258
2106} 2265}
2107 2266
2108sub find_sync { 2267sub find_sync {
2109 my ($path, $origin) = @_; 2268 my ($path, $origin) = @_;
2110 2269
2111 cf::sync_job { find $path, $origin } 2270 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2271 if $Coro::current == $Coro::main;
2272
2273 find $path, $origin
2112} 2274}
2113 2275
2114sub do_load_sync { 2276sub do_load_sync {
2115 my ($map) = @_; 2277 my ($map) = @_;
2116 2278
2117 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2279 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2118 if $Coro::current == $Coro::main; 2280 if $Coro::current == $Coro::main;
2119 2281
2120 cf::sync_job { $map->load }; 2282 $map->load;
2121} 2283}
2122 2284
2123our %MAP_PREFETCH; 2285our %MAP_PREFETCH;
2124our $MAP_PREFETCHER = undef; 2286our $MAP_PREFETCHER = undef;
2125 2287
2151 $MAP_PREFETCHER->prio (6); 2313 $MAP_PREFETCHER->prio (6);
2152 2314
2153 () 2315 ()
2154} 2316}
2155 2317
2318# common code, used by both ->save and ->swapout
2156sub save { 2319sub _save {
2157 my ($self) = @_; 2320 my ($self) = @_;
2158
2159 my $lock = cf::lock_acquire "map_data:$self->{path}";
2160 2321
2161 $self->{last_save} = $cf::RUNTIME; 2322 $self->{last_save} = $cf::RUNTIME;
2162 2323
2163 return unless $self->dirty; 2324 return unless $self->dirty;
2164 2325
2184 } else { 2345 } else {
2185 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2346 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2186 } 2347 }
2187} 2348}
2188 2349
2350sub save {
2351 my ($self) = @_;
2352
2353 my $lock = cf::lock_acquire "map_data:$self->{path}";
2354
2355 $self->_save;
2356}
2357
2189sub swap_out { 2358sub swap_out {
2190 my ($self) = @_; 2359 my ($self) = @_;
2191 2360
2192 # save first because save cedes
2193 $self->save;
2194
2195 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2361 my $lock = cf::lock_acquire "map_data:$self->{path}";
2196 2362
2197 return if $self->players;
2198 return if $self->in_memory != cf::MAP_ACTIVE; 2363 return if $self->in_memory != cf::MAP_ACTIVE;
2199 return if $self->{deny_save}; 2364 return if $self->{deny_save};
2365 return if $self->players;
2200 2366
2367 # first deactivate the map and "unlink" it from the core
2368 $self->deactivate;
2369 $_->clear_links_to ($self) for values %cf::MAP;
2201 $self->in_memory (cf::MAP_SWAPPED); 2370 $self->in_memory (cf::MAP_SWAPPED);
2371
2372 # then atomically save
2373 $self->_save;
2374
2375 # then free the map
2376 $self->clear;
2377}
2378
2379sub reset_at {
2380 my ($self) = @_;
2381
2382 # TODO: safety, remove and allow resettable per-player maps
2383 return 1e99 if $self->{deny_reset};
2384
2385 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2386 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2387
2388 $time + $to
2389}
2390
2391sub should_reset {
2392 my ($self) = @_;
2393
2394 $self->reset_at <= $cf::RUNTIME
2395}
2396
2397sub reset {
2398 my ($self) = @_;
2399
2400 my $lock = cf::lock_acquire "map_data:$self->{path}";
2401
2402 return if $self->players;
2403
2404 cf::trace "resetting map ", $self->path, "\n";
2405
2406 $self->in_memory (cf::MAP_SWAPPED);
2407
2408 # need to save uniques path
2409 unless ($self->{deny_save}) {
2410 my $uniq = $self->uniq_path; utf8::encode $uniq;
2411
2412 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2413 if $uniq;
2414 }
2415
2416 delete $cf::MAP{$self->path};
2202 2417
2203 $self->deactivate; 2418 $self->deactivate;
2204 $_->clear_links_to ($self) for values %cf::MAP; 2419 $_->clear_links_to ($self) for values %cf::MAP;
2205 $self->clear; 2420 $self->clear;
2206}
2207
2208sub reset_at {
2209 my ($self) = @_;
2210
2211 # TODO: safety, remove and allow resettable per-player maps
2212 return 1e99 if $self->{deny_reset};
2213
2214 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2215 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2216
2217 $time + $to
2218}
2219
2220sub should_reset {
2221 my ($self) = @_;
2222
2223 $self->reset_at <= $cf::RUNTIME
2224}
2225
2226sub reset {
2227 my ($self) = @_;
2228
2229 my $lock = cf::lock_acquire "map_data:$self->{path}";
2230
2231 return if $self->players;
2232
2233 warn "resetting map ", $self->path;
2234
2235 $self->in_memory (cf::MAP_SWAPPED);
2236
2237 # need to save uniques path
2238 unless ($self->{deny_save}) {
2239 my $uniq = $self->uniq_path; utf8::encode $uniq;
2240
2241 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2242 if $uniq;
2243 }
2244
2245 delete $cf::MAP{$self->path};
2246
2247 $self->deactivate;
2248 $_->clear_links_to ($self) for values %cf::MAP;
2249 $self->clear;
2250 2421
2251 $self->unlink_save; 2422 $self->unlink_save;
2252 $self->destroy; 2423 $self->destroy;
2253} 2424}
2254 2425
2262 2433
2263 delete $cf::MAP{$self->path}; 2434 delete $cf::MAP{$self->path};
2264 2435
2265 $self->unlink_save; 2436 $self->unlink_save;
2266 2437
2267 bless $self, "cf::map"; 2438 bless $self, "cf::map::wrap";
2268 delete $self->{deny_reset}; 2439 delete $self->{deny_reset};
2269 $self->{deny_save} = 1; 2440 $self->{deny_save} = 1;
2270 $self->reset_timeout (1); 2441 $self->reset_timeout (1);
2271 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2442 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2272 2443
2329 : normalise $_ 2500 : normalise $_
2330 } @{ aio_readdir $UNIQUEDIR or [] } 2501 } @{ aio_readdir $UNIQUEDIR or [] }
2331 ] 2502 ]
2332} 2503}
2333 2504
2505=item cf::map::static_maps
2506
2507Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2508file in the shared directory excluding F</styles> and F</editor>). May
2509block.
2510
2511=cut
2512
2513sub static_maps() {
2514 my @dirs = "";
2515 my @maps;
2516
2517 while (@dirs) {
2518 my $dir = shift @dirs;
2519
2520 next if $dir eq "/styles" || $dir eq "/editor";
2521
2522 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2523 or return;
2524
2525 for (@$files) {
2526 s/\.map$// or next;
2527 utf8::decode $_;
2528 push @maps, "$dir/$_";
2529 }
2530
2531 push @dirs, map "$dir/$_", @$dirs;
2532 }
2533
2534 \@maps
2535}
2536
2334=back 2537=back
2335 2538
2336=head3 cf::object 2539=head3 cf::object
2337 2540
2338=cut 2541=cut
2403 2606
2404our $SAY_CHANNEL = { 2607our $SAY_CHANNEL = {
2405 id => "say", 2608 id => "say",
2406 title => "Map", 2609 title => "Map",
2407 reply => "say ", 2610 reply => "say ",
2408 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2611 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2409}; 2612};
2410 2613
2411our $CHAT_CHANNEL = { 2614our $CHAT_CHANNEL = {
2412 id => "chat", 2615 id => "chat",
2413 title => "Chat", 2616 title => "Chat",
2470 2673
2471Freezes the player and moves him/her to a special map (C<{link}>). 2674Freezes the player and moves him/her to a special map (C<{link}>).
2472 2675
2473The player should be reasonably safe there for short amounts of time (e.g. 2676The player should be reasonably safe there for short amounts of time (e.g.
2474for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2677for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2475though, as the palyer cannot control the character while it is on the link 2678though, as the player cannot control the character while it is on the link
2476map. 2679map.
2477 2680
2478Will never block. 2681Will never block.
2479 2682
2480=item $player_object->leave_link ($map, $x, $y) 2683=item $player_object->leave_link ($map, $x, $y)
2501sub cf::object::player::enter_link { 2704sub cf::object::player::enter_link {
2502 my ($self) = @_; 2705 my ($self) = @_;
2503 2706
2504 $self->deactivate_recursive; 2707 $self->deactivate_recursive;
2505 2708
2709 ++$self->{_link_recursion};
2710
2506 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2711 return if UNIVERSAL::isa $self->map, "ext::map_link";
2507 2712
2508 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2713 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2509 if $self->map && $self->map->{path} ne "{link}"; 2714 if $self->map && $self->map->{path} ne "{link}";
2510 2715
2511 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2716 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2512} 2717}
2513 2718
2514sub cf::object::player::leave_link { 2719sub cf::object::player::leave_link {
2515 my ($self, $map, $x, $y) = @_; 2720 my ($self, $map, $x, $y) = @_;
2516 2721
2533 ($x, $y) = (-1, -1) 2738 ($x, $y) = (-1, -1)
2534 unless (defined $x) && (defined $y); 2739 unless (defined $x) && (defined $y);
2535 2740
2536 # use -1 or undef as default coordinates, not 0, 0 2741 # use -1 or undef as default coordinates, not 0, 0
2537 ($x, $y) = ($map->enter_x, $map->enter_y) 2742 ($x, $y) = ($map->enter_x, $map->enter_y)
2538 if $x <=0 && $y <= 0; 2743 if $x <= 0 && $y <= 0;
2539 2744
2540 $map->load; 2745 $map->load;
2541 $map->load_neighbours; 2746 $map->load_neighbours;
2542 2747
2543 return unless $self->contr->active; 2748 return unless $self->contr->active;
2544 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2545 $self->activate_recursive;
2546 2749
2547 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2750 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2548 $self->enter_map ($map, $x, $y); 2751 if ($self->enter_map ($map, $x, $y)) {
2549} 2752 # entering was successful
2753 delete $self->{_link_recursion};
2754 # only activate afterwards, to support waiting in hooks
2755 $self->activate_recursive;
2756 }
2550 2757
2758}
2759
2551=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2760=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2552 2761
2553Moves the player to the given map-path and coordinates by first freezing 2762Moves the player to the given map-path and coordinates by first freezing
2554her, loading and preparing them map, calling the provided $check callback 2763her, loading and preparing them map, calling the provided $check callback
2555that has to return the map if sucecssful, and then unfreezes the player on 2764that has to return the map if sucecssful, and then unfreezes the player on
2556the new (success) or old (failed) map position. In either case, $done will 2765the new (success) or old (failed) map position. In either case, $done will
2563 2772
2564our $GOTOGEN; 2773our $GOTOGEN;
2565 2774
2566sub cf::object::player::goto { 2775sub cf::object::player::goto {
2567 my ($self, $path, $x, $y, $check, $done) = @_; 2776 my ($self, $path, $x, $y, $check, $done) = @_;
2777
2778 if ($self->{_link_recursion} >= $MAX_LINKS) {
2779 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2780 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2781 ($path, $x, $y) = @$EMERGENCY_POSITION;
2782 }
2568 2783
2569 # do generation counting so two concurrent goto's will be executed in-order 2784 # do generation counting so two concurrent goto's will be executed in-order
2570 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2785 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2571 2786
2572 $self->enter_link; 2787 $self->enter_link;
2596 my $map = eval { 2811 my $map = eval {
2597 my $map = defined $path ? cf::map::find $path : undef; 2812 my $map = defined $path ? cf::map::find $path : undef;
2598 2813
2599 if ($map) { 2814 if ($map) {
2600 $map = $map->customise_for ($self); 2815 $map = $map->customise_for ($self);
2601 $map = $check->($map) if $check && $map; 2816 $map = $check->($map, $x, $y, $self) if $check && $map;
2602 } else { 2817 } else {
2603 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2818 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2604 } 2819 }
2605 2820
2606 $map 2821 $map
2614 if ($gen == $self->{_goto_generation}) { 2829 if ($gen == $self->{_goto_generation}) {
2615 delete $self->{_goto_generation}; 2830 delete $self->{_goto_generation};
2616 $self->leave_link ($map, $x, $y); 2831 $self->leave_link ($map, $x, $y);
2617 } 2832 }
2618 2833
2619 $done->() if $done; 2834 $done->($self) if $done;
2620 })->prio (1); 2835 })->prio (1);
2621} 2836}
2622 2837
2623=item $player_object->enter_exit ($exit_object) 2838=item $player_object->enter_exit ($exit_object)
2624 2839
2717 $self->message ("Something went wrong deep within the deliantra server. " 2932 $self->message ("Something went wrong deep within the deliantra server. "
2718 . "I'll try to bring you back to the map you were before. " 2933 . "I'll try to bring you back to the map you were before. "
2719 . "Please report this to the dungeon master!", 2934 . "Please report this to the dungeon master!",
2720 cf::NDI_UNIQUE | cf::NDI_RED); 2935 cf::NDI_UNIQUE | cf::NDI_RED);
2721 2936
2722 warn "ERROR in enter_exit: $@"; 2937 error "ERROR in enter_exit: $@";
2723 $self->leave_link; 2938 $self->leave_link;
2724 } 2939 }
2725 })->prio (1); 2940 })->prio (1);
2726} 2941}
2727 2942
2739sub cf::client::send_drawinfo { 2954sub cf::client::send_drawinfo {
2740 my ($self, $text, $flags) = @_; 2955 my ($self, $text, $flags) = @_;
2741 2956
2742 utf8::encode $text; 2957 utf8::encode $text;
2743 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2958 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2959}
2960
2961=item $client->send_big_packet ($pkt)
2962
2963Like C<send_packet>, but tries to compress large packets, and fragments
2964them as required.
2965
2966=cut
2967
2968our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2969
2970sub cf::client::send_big_packet {
2971 my ($self, $pkt) = @_;
2972
2973 # try lzf for large packets
2974 $pkt = "lzf " . Compress::LZF::compress $pkt
2975 if 1024 <= length $pkt and $self->{can_lzf};
2976
2977 # split very large packets
2978 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2979 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2980 $pkt = "frag";
2981 }
2982
2983 $self->send_packet ($pkt);
2744} 2984}
2745 2985
2746=item $client->send_msg ($channel, $msg, $color, [extra...]) 2986=item $client->send_msg ($channel, $msg, $color, [extra...])
2747 2987
2748Send a drawinfo or msg packet to the client, formatting the msg for the 2988Send a drawinfo or msg packet to the client, formatting the msg for the
2752 2992
2753=cut 2993=cut
2754 2994
2755# non-persistent channels (usually the info channel) 2995# non-persistent channels (usually the info channel)
2756our %CHANNEL = ( 2996our %CHANNEL = (
2997 "c/motd" => {
2998 id => "infobox",
2999 title => "MOTD",
3000 reply => undef,
3001 tooltip => "The message of the day",
3002 },
2757 "c/identify" => { 3003 "c/identify" => {
2758 id => "infobox", 3004 id => "infobox",
2759 title => "Identify", 3005 title => "Identify",
2760 reply => undef, 3006 reply => undef,
2761 tooltip => "Items recently identified", 3007 tooltip => "Items recently identified",
2763 "c/examine" => { 3009 "c/examine" => {
2764 id => "infobox", 3010 id => "infobox",
2765 title => "Examine", 3011 title => "Examine",
2766 reply => undef, 3012 reply => undef,
2767 tooltip => "Signs and other items you examined", 3013 tooltip => "Signs and other items you examined",
3014 },
3015 "c/shopinfo" => {
3016 id => "infobox",
3017 title => "Shop Info",
3018 reply => undef,
3019 tooltip => "What your bargaining skill tells you about the shop",
2768 }, 3020 },
2769 "c/book" => { 3021 "c/book" => {
2770 id => "infobox", 3022 id => "infobox",
2771 title => "Book", 3023 title => "Book",
2772 reply => undef, 3024 reply => undef,
2788 id => "infobox", 3040 id => "infobox",
2789 title => "Body Parts", 3041 title => "Body Parts",
2790 reply => undef, 3042 reply => undef,
2791 tooltip => "Shows which body parts you posess and are available", 3043 tooltip => "Shows which body parts you posess and are available",
2792 }, 3044 },
3045 "c/statistics" => {
3046 id => "infobox",
3047 title => "Statistics",
3048 reply => undef,
3049 tooltip => "Shows your primary statistics",
3050 },
2793 "c/skills" => { 3051 "c/skills" => {
2794 id => "infobox", 3052 id => "infobox",
2795 title => "Skills", 3053 title => "Skills",
2796 reply => undef, 3054 reply => undef,
2797 tooltip => "Shows your experience per skill and item power", 3055 tooltip => "Shows your experience per skill and item power",
3056 },
3057 "c/shopitems" => {
3058 id => "infobox",
3059 title => "Shop Items",
3060 reply => undef,
3061 tooltip => "Shows the items currently for sale in this shop",
3062 },
3063 "c/resistances" => {
3064 id => "infobox",
3065 title => "Resistances",
3066 reply => undef,
3067 tooltip => "Shows your resistances",
3068 },
3069 "c/pets" => {
3070 id => "infobox",
3071 title => "Pets",
3072 reply => undef,
3073 tooltip => "Shows information abotu your pets/a specific pet",
3074 },
3075 "c/perceiveself" => {
3076 id => "infobox",
3077 title => "Perceive Self",
3078 reply => undef,
3079 tooltip => "You gained detailed knowledge about yourself",
2798 }, 3080 },
2799 "c/uptime" => { 3081 "c/uptime" => {
2800 id => "infobox", 3082 id => "infobox",
2801 title => "Uptime", 3083 title => "Uptime",
2802 reply => undef, 3084 reply => undef,
2812 id => "party", 3094 id => "party",
2813 title => "Party", 3095 title => "Party",
2814 reply => "gsay ", 3096 reply => "gsay ",
2815 tooltip => "Messages and chat related to your party", 3097 tooltip => "Messages and chat related to your party",
2816 }, 3098 },
3099 "c/death" => {
3100 id => "death",
3101 title => "Death",
3102 reply => undef,
3103 tooltip => "Reason for and more info about your most recent death",
3104 },
3105 "c/say" => $SAY_CHANNEL,
3106 "c/chat" => $CHAT_CHANNEL,
2817); 3107);
2818 3108
2819sub cf::client::send_msg { 3109sub cf::client::send_msg {
2820 my ($self, $channel, $msg, $color, @extra) = @_; 3110 my ($self, $channel, $msg, $color, @extra) = @_;
2821 3111
2826 3116
2827 # check predefined channels, for the benefit of C 3117 # check predefined channels, for the benefit of C
2828 if ($CHANNEL{$channel}) { 3118 if ($CHANNEL{$channel}) {
2829 $channel = $CHANNEL{$channel}; 3119 $channel = $CHANNEL{$channel};
2830 3120
2831 $self->ext_msg (channel_info => $channel) 3121 $self->ext_msg (channel_info => $channel);
2832 if $self->can_msg;
2833
2834 $channel = $channel->{id}; 3122 $channel = $channel->{id};
2835 3123
2836 } elsif (ref $channel) { 3124 } elsif (ref $channel) {
2837 # send meta info to client, if not yet sent 3125 # send meta info to client, if not yet sent
2838 unless (exists $self->{channel}{$channel->{id}}) { 3126 unless (exists $self->{channel}{$channel->{id}}) {
2839 $self->{channel}{$channel->{id}} = $channel; 3127 $self->{channel}{$channel->{id}} = $channel;
2840 $self->ext_msg (channel_info => $channel) 3128 $self->ext_msg (channel_info => $channel);
2841 if $self->can_msg;
2842 } 3129 }
2843 3130
2844 $channel = $channel->{id}; 3131 $channel = $channel->{id};
2845 } 3132 }
2846 3133
2847 return unless @extra || length $msg; 3134 return unless @extra || length $msg;
2848 3135
2849 if ($self->can_msg) {
2850 # default colour, mask it out 3136 # default colour, mask it out
2851 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3137 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2852 if $color & cf::NDI_DEF; 3138 if $color & cf::NDI_DEF;
2853 3139
2854 my $pkt = "msg " 3140 my $pkt = "msg "
2855 . $self->{json_coder}->encode ( 3141 . $self->{json_coder}->encode (
2856 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3142 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2857 ); 3143 );
2858 3144
2859 # try lzf for large packets
2860 $pkt = "lzf " . Compress::LZF::compress $pkt
2861 if 1024 <= length $pkt and $self->{can_lzf};
2862
2863 # split very large packets
2864 if (8192 < length $pkt and $self->{can_lzf}) {
2865 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2866 $pkt = "frag";
2867 }
2868
2869 $self->send_packet ($pkt); 3145 $self->send_big_packet ($pkt);
2870 } else {
2871 if ($color >= 0) {
2872 # replace some tags by gcfclient-compatible ones
2873 for ($msg) {
2874 1 while
2875 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2876 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2877 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2878 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2879 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2880 }
2881
2882 $color &= cf::NDI_COLOR_MASK;
2883
2884 utf8::encode $msg;
2885
2886 if (0 && $msg =~ /\[/) {
2887 # COMMAND/INFO
2888 $self->send_packet ("drawextinfo $color 10 8 $msg")
2889 } else {
2890 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2891 $self->send_packet ("drawinfo $color $msg")
2892 }
2893 }
2894 }
2895} 3146}
2896 3147
2897=item $client->ext_msg ($type, @msg) 3148=item $client->ext_msg ($type, @msg)
2898 3149
2899Sends an ext event to the client. 3150Sends an ext event to the client.
2902 3153
2903sub cf::client::ext_msg($$@) { 3154sub cf::client::ext_msg($$@) {
2904 my ($self, $type, @msg) = @_; 3155 my ($self, $type, @msg) = @_;
2905 3156
2906 if ($self->extcmd == 2) { 3157 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3158 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2908 } elsif ($self->extcmd == 1) { # TODO: remove 3159 } elsif ($self->extcmd == 1) { # TODO: remove
2909 push @msg, msgtype => "event_$type"; 3160 push @msg, msgtype => "event_$type";
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3161 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 } 3162 }
2912} 3163}
2913 3164
2914=item $client->ext_reply ($msgid, @msg) 3165=item $client->ext_reply ($msgid, @msg)
2915 3166
2919 3170
2920sub cf::client::ext_reply($$@) { 3171sub cf::client::ext_reply($$@) {
2921 my ($self, $id, @msg) = @_; 3172 my ($self, $id, @msg) = @_;
2922 3173
2923 if ($self->extcmd == 2) { 3174 if ($self->extcmd == 2) {
2924 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3175 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2925 } elsif ($self->extcmd == 1) { 3176 } elsif ($self->extcmd == 1) {
2926 #TODO: version 1, remove 3177 #TODO: version 1, remove
2927 unshift @msg, msgtype => "reply", msgid => $id; 3178 unshift @msg, msgtype => "reply", msgid => $id;
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2929 } 3180 }
2930} 3181}
2931 3182
2932=item $success = $client->query ($flags, "text", \&cb) 3183=item $success = $client->query ($flags, "text", \&cb)
2933 3184
3004 3255
3005 $ns->ext_reply ($reply, @reply) 3256 $ns->ext_reply ($reply, @reply)
3006 if $reply; 3257 if $reply;
3007 3258
3008 } else { 3259 } else {
3009 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3260 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3010 } 3261 }
3011 3262
3012 cf::override; 3263 cf::override;
3013 }, 3264 },
3014); 3265);
3034 3285
3035 $coro 3286 $coro
3036} 3287}
3037 3288
3038cf::client->attach ( 3289cf::client->attach (
3039 on_destroy => sub { 3290 on_client_destroy => sub {
3040 my ($ns) = @_; 3291 my ($ns) = @_;
3041 3292
3042 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3293 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3043 }, 3294 },
3044); 3295);
3060our $safe_hole = new Safe::Hole; 3311our $safe_hole = new Safe::Hole;
3061 3312
3062$SIG{FPE} = 'IGNORE'; 3313$SIG{FPE} = 'IGNORE';
3063 3314
3064$safe->permit_only (Opcode::opset qw( 3315$safe->permit_only (Opcode::opset qw(
3065 :base_core :base_mem :base_orig :base_math 3316 :base_core :base_mem :base_orig :base_math :base_loop
3066 grepstart grepwhile mapstart mapwhile 3317 grepstart grepwhile mapstart mapwhile
3067 sort time 3318 sort time
3068)); 3319));
3069 3320
3070# here we export the classes and methods available to script code 3321# here we export the classes and methods available to script code
3074The following functions and methods are available within a safe environment: 3325The following functions and methods are available within a safe environment:
3075 3326
3076 cf::object 3327 cf::object
3077 contr pay_amount pay_player map x y force_find force_add destroy 3328 contr pay_amount pay_player map x y force_find force_add destroy
3078 insert remove name archname title slaying race decrease split 3329 insert remove name archname title slaying race decrease split
3330 value
3079 3331
3080 cf::object::player 3332 cf::object::player
3081 player 3333 player
3082 3334
3083 cf::player 3335 cf::player
3089=cut 3341=cut
3090 3342
3091for ( 3343for (
3092 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3344 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3093 insert remove inv nrof name archname title slaying race 3345 insert remove inv nrof name archname title slaying race
3094 decrease split destroy change_exp)], 3346 decrease split destroy change_exp value msg lore send_msg)],
3095 ["cf::object::player" => qw(player)], 3347 ["cf::object::player" => qw(player)],
3096 ["cf::player" => qw(peaceful)], 3348 ["cf::player" => qw(peaceful send_msg)],
3097 ["cf::map" => qw(trigger)], 3349 ["cf::map" => qw(trigger)],
3098) { 3350) {
3099 no strict 'refs';
3100 my ($pkg, @funs) = @$_; 3351 my ($pkg, @funs) = @$_;
3101 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3352 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3102 for @funs; 3353 for @funs;
3103} 3354}
3104 3355
3119 3370
3120 my $qcode = $code; 3371 my $qcode = $code;
3121 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3372 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3122 $qcode =~ s/\n/\\n/g; 3373 $qcode =~ s/\n/\\n/g;
3123 3374
3375 %vars = (_dummy => 0) unless %vars;
3376
3377 my @res;
3124 local $_; 3378 local $_;
3125 local @safe::cf::_safe_eval_args = values %vars;
3126 3379
3127 my $eval = 3380 my $eval =
3128 "do {\n" 3381 "do {\n"
3129 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3382 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3130 . "#line 0 \"{$qcode}\"\n" 3383 . "#line 0 \"{$qcode}\"\n"
3131 . $code 3384 . $code
3132 . "\n}" 3385 . "\n}"
3133 ; 3386 ;
3134 3387
3388 if ($CFG{safe_eval}) {
3135 sub_generation_inc; 3389 sub_generation_inc;
3390 local @safe::cf::_safe_eval_args = values %vars;
3136 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3391 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3137 sub_generation_inc; 3392 sub_generation_inc;
3393 } else {
3394 local @cf::_safe_eval_args = values %vars;
3395 @res = wantarray ? eval eval : scalar eval $eval;
3396 }
3138 3397
3139 if ($@) { 3398 if ($@) {
3140 warn "$@"; 3399 warn "$@",
3141 warn "while executing safe code '$code'\n"; 3400 "while executing safe code '$code'\n",
3142 warn "with arguments " . (join " ", %vars) . "\n"; 3401 "with arguments " . (join " ", %vars) . "\n";
3143 } 3402 }
3144 3403
3145 wantarray ? @res : $res[0] 3404 wantarray ? @res : $res[0]
3146} 3405}
3147 3406
3161=cut 3420=cut
3162 3421
3163sub register_script_function { 3422sub register_script_function {
3164 my ($fun, $cb) = @_; 3423 my ($fun, $cb) = @_;
3165 3424
3166 no strict 'refs'; 3425 $fun = "safe::$fun" if $CFG{safe_eval};
3167 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3426 *$fun = $safe_hole->wrap ($cb);
3168} 3427}
3169 3428
3170=back 3429=back
3171 3430
3172=cut 3431=cut
3181 # for this (global event?) 3440 # for this (global event?)
3182 %ext::player_env::MUSIC_FACE_CACHE = (); 3441 %ext::player_env::MUSIC_FACE_CACHE = ();
3183 3442
3184 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3443 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3185 3444
3186 warn "loading facedata from $path\n"; 3445 trace "loading facedata from $path\n";
3187 3446
3188 my $facedata; 3447 my $facedata = decode_storable load_file $path;
3189 0 < aio_load $path, $facedata
3190 or die "$path: $!";
3191
3192 $facedata = Coro::Storable::thaw $facedata;
3193 3448
3194 $facedata->{version} == 2 3449 $facedata->{version} == 2
3195 or cf::cleanup "$path: version mismatch, cannot proceed."; 3450 or cf::cleanup "$path: version mismatch, cannot proceed.";
3196 3451
3197 # patch in the exptable 3452 # patch in the exptable
3453 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3198 $facedata->{resource}{"res/exp_table"} = { 3454 $facedata->{resource}{"res/exp_table"} = {
3199 type => FT_RSRC, 3455 type => FT_RSRC,
3200 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3456 data => $exp_table,
3457 hash => (Digest::MD5::md5 $exp_table),
3201 }; 3458 };
3202 cf::cede_to_tick; 3459 cf::cede_to_tick;
3203 3460
3204 { 3461 {
3205 my $faces = $facedata->{faceinfo}; 3462 my $faces = $facedata->{faceinfo};
3207 while (my ($face, $info) = each %$faces) { 3464 while (my ($face, $info) = each %$faces) {
3208 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3465 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3209 3466
3210 cf::face::set_visibility $idx, $info->{visibility}; 3467 cf::face::set_visibility $idx, $info->{visibility};
3211 cf::face::set_magicmap $idx, $info->{magicmap}; 3468 cf::face::set_magicmap $idx, $info->{magicmap};
3212 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3469 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3213 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3470 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3471 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3214 3472
3215 cf::cede_to_tick; 3473 cf::cede_to_tick;
3216 } 3474 }
3217 3475
3218 while (my ($face, $info) = each %$faces) { 3476 while (my ($face, $info) = each %$faces) {
3223 3481
3224 if (my $smooth = cf::face::find $info->{smooth}) { 3482 if (my $smooth = cf::face::find $info->{smooth}) {
3225 cf::face::set_smooth $idx, $smooth; 3483 cf::face::set_smooth $idx, $smooth;
3226 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3484 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3227 } else { 3485 } else {
3228 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3486 error "smooth face '$info->{smooth}' not found for face '$face'";
3229 } 3487 }
3230 3488
3231 cf::cede_to_tick; 3489 cf::cede_to_tick;
3232 } 3490 }
3233 } 3491 }
3242 3500
3243 cf::anim::invalidate_all; # d'oh 3501 cf::anim::invalidate_all; # d'oh
3244 } 3502 }
3245 3503
3246 { 3504 {
3247 # TODO: for gcfclient pleasure, we should give resources
3248 # that gcfclient doesn't grok a >10000 face index.
3249 my $res = $facedata->{resource}; 3505 my $res = $facedata->{resource};
3250 3506
3251 while (my ($name, $info) = each %$res) { 3507 while (my ($name, $info) = each %$res) {
3252 if (defined $info->{type}) { 3508 if (defined $info->{type}) {
3253 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3509 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3254 my $data;
3255 3510
3256 if ($info->{type} & 1) { 3511 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3257 # prepend meta info
3258
3259 my $meta = $enc->encode ({
3260 name => $name,
3261 %{ $info->{meta} || {} },
3262 });
3263
3264 $data = pack "(w/a*)*", $meta, $info->{data};
3265 } else {
3266 $data = $info->{data};
3267 }
3268
3269 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3270 cf::face::set_type $idx, $info->{type}; 3512 cf::face::set_type $idx, $info->{type};
3271 } else { 3513 } else {
3272 $RESOURCE{$name} = $info; 3514 $RESOURCE{$name} = $info; # unused
3273 } 3515 }
3274 3516
3275 cf::cede_to_tick; 3517 cf::cede_to_tick;
3276 } 3518 }
3277 } 3519 }
3278 3520
3279 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3521 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3280 3522
3281 1 3523 1
3282} 3524}
3283
3284cf::global->attach (on_resource_update => sub {
3285 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3286 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3287
3288 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3289 my $sound = $soundconf->{compat}[$_]
3290 or next;
3291
3292 my $face = cf::face::find "sound/$sound->[1]";
3293 cf::sound::set $sound->[0] => $face;
3294 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3295 }
3296
3297 while (my ($k, $v) = each %{$soundconf->{event}}) {
3298 my $face = cf::face::find "sound/$v";
3299 cf::sound::set $k => $face;
3300 }
3301 }
3302});
3303 3525
3304register_exticmd fx_want => sub { 3526register_exticmd fx_want => sub {
3305 my ($ns, $want) = @_; 3527 my ($ns, $want) = @_;
3306 3528
3307 while (my ($k, $v) = each %$want) { 3529 while (my ($k, $v) = each %$want) {
3346sub reload_treasures { 3568sub reload_treasures {
3347 load_resource_file "$DATADIR/treasures" 3569 load_resource_file "$DATADIR/treasures"
3348 or die "unable to load treasurelists\n"; 3570 or die "unable to load treasurelists\n";
3349} 3571}
3350 3572
3573sub reload_sound {
3574 trace "loading sound config from $DATADIR/sound\n";
3575
3576 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3577
3578 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3579 my $sound = $soundconf->{compat}[$_]
3580 or next;
3581
3582 my $face = cf::face::find "sound/$sound->[1]";
3583 cf::sound::set $sound->[0] => $face;
3584 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3585 }
3586
3587 while (my ($k, $v) = each %{$soundconf->{event}}) {
3588 my $face = cf::face::find "sound/$v";
3589 cf::sound::set $k => $face;
3590 }
3591}
3592
3351sub reload_resources { 3593sub reload_resources {
3352 warn "reloading resource files...\n"; 3594 trace "reloading resource files...\n";
3353 3595
3596 reload_exp_table;
3597 reload_materials;
3354 reload_facedata; 3598 reload_facedata;
3599 reload_sound;
3355 reload_archetypes; 3600 reload_archetypes;
3356 reload_regions; 3601 reload_regions;
3357 reload_treasures; 3602 reload_treasures;
3358 3603
3359 warn "finished reloading resource files\n"; 3604 trace "finished reloading resource files\n";
3360} 3605}
3361 3606
3362sub reload_config { 3607sub reload_config {
3363 open my $fh, "<:utf8", "$CONFDIR/config" 3608 trace "reloading config file...\n";
3364 or return;
3365 3609
3366 local $/; 3610 my $config = load_file "$CONFDIR/config";
3367 *CFG = YAML::Load <$fh>; 3611 utf8::decode $config;
3612 *CFG = decode_yaml $config;
3368 3613
3369 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3614 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3370 3615
3371 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3616 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3372 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3617 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3373 3618
3374 if (exists $CFG{mlockall}) { 3619 if (exists $CFG{mlockall}) {
3397 3642
3398 seek $fh, 0, 0; 3643 seek $fh, 0, 0;
3399 print $fh $$; 3644 print $fh $$;
3400} 3645}
3401 3646
3647sub main_loop {
3648 trace "EV::loop starting\n";
3649 if (1) {
3650 EV::loop;
3651 }
3652 trace "EV::loop returned\n";
3653 goto &main_loop unless $REALLY_UNLOOP;
3654}
3655
3402sub main { 3656sub main {
3403 cf::init_globals; # initialise logging 3657 cf::init_globals; # initialise logging
3404 3658
3405 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3659 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3406 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3660 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3407 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3661 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3408 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3662 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3409
3410 cf::init_experience;
3411 cf::init_anim;
3412 cf::init_attackmess;
3413 cf::init_dynamic;
3414 cf::init_block;
3415 3663
3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3664 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3417 3665
3418 # we must not ever block the main coroutine 3666 # we must not ever block the main coroutine
3419 local $Coro::idle = sub { 3667 local $Coro::idle = sub {
3425 }; 3673 };
3426 3674
3427 evthread_start IO::AIO::poll_fileno; 3675 evthread_start IO::AIO::poll_fileno;
3428 3676
3429 cf::sync_job { 3677 cf::sync_job {
3678 cf::incloader::init ();
3679
3680 cf::init_anim;
3681 cf::init_attackmess;
3682 cf::init_dynamic;
3683
3684 cf::load_settings;
3685
3430 reload_resources; 3686 reload_resources;
3431 reload_config; 3687 reload_config;
3432 db_init; 3688 db_init;
3433 3689
3434 cf::load_settings;
3435 cf::load_materials;
3436 cf::init_uuid; 3690 cf::init_uuid;
3437 cf::init_signals; 3691 cf::init_signals;
3438 cf::init_commands;
3439 cf::init_skills; 3692 cf::init_skills;
3440 3693
3441 cf::init_beforeplay; 3694 cf::init_beforeplay;
3442 3695
3443 atomic; 3696 atomic;
3445 load_extensions; 3698 load_extensions;
3446 3699
3447 utime time, time, $RUNTIMEFILE; 3700 utime time, time, $RUNTIMEFILE;
3448 3701
3449 # no (long-running) fork's whatsoever before this point(!) 3702 # no (long-running) fork's whatsoever before this point(!)
3703 use POSIX ();
3450 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3704 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3451 3705
3452 (pop @POST_INIT)->(0) while @POST_INIT; 3706 cf::_post_init 0;
3453 }; 3707 };
3454 3708
3455 EV::loop; 3709 cf::object::thawer::errors_are_fatal 0;
3710 info "parse errors in files are no longer fatal from this point on.\n";
3711
3712 my $free_main; $free_main = EV::idle sub {
3713 undef $free_main;
3714 undef &main; # free gobs of memory :)
3715 };
3716
3717 goto &main_loop;
3456} 3718}
3457 3719
3458############################################################################# 3720#############################################################################
3459# initialisation and cleanup 3721# initialisation and cleanup
3460 3722
3461# install some emergency cleanup handlers 3723# install some emergency cleanup handlers
3462BEGIN { 3724BEGIN {
3463 our %SIGWATCHER = (); 3725 our %SIGWATCHER = ();
3464 for my $signal (qw(INT HUP TERM)) { 3726 for my $signal (qw(INT HUP TERM)) {
3465 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3727 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3466 cf::cleanup "SIG$signal"; 3728 cf::cleanup "SIG$signal";
3467 }; 3729 };
3468 } 3730 }
3469} 3731}
3470 3732
3471sub write_runtime_sync { 3733sub write_runtime_sync {
3734 my $t0 = AE::time;
3735
3472 # first touch the runtime file to show we are still running: 3736 # first touch the runtime file to show we are still running:
3473 # the fsync below can take a very very long time. 3737 # the fsync below can take a very very long time.
3474 3738
3475 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3739 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3476 3740
3477 my $guard = cf::lock_acquire "write_runtime"; 3741 my $guard = cf::lock_acquire "write_runtime";
3478 3742
3479 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3743 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3480 or return; 3744 or return;
3481 3745
3482 my $value = $cf::RUNTIME + 90 + 10; 3746 my $value = $cf::RUNTIME + 90 + 10;
3483 # 10 is the runtime save interval, for a monotonic clock 3747 # 10 is the runtime save interval, for a monotonic clock
3484 # 60 allows for the watchdog to kill the server. 3748 # 60 allows for the watchdog to kill the server.
3497 or return; 3761 or return;
3498 3762
3499 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3763 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3500 and return; 3764 and return;
3501 3765
3502 warn "runtime file written.\n"; 3766 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3503 3767
3504 1 3768 1
3505} 3769}
3506 3770
3507our $uuid_lock; 3771our $uuid_lock;
3516 my $uuid = "$LOCALDIR/uuid"; 3780 my $uuid = "$LOCALDIR/uuid";
3517 3781
3518 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3782 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3519 or return; 3783 or return;
3520 3784
3521 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3785 my $value = uuid_seq uuid_cur;
3786
3787 unless ($value) {
3788 info "cowardly refusing to write zero uuid value!\n";
3789 return;
3790 }
3791
3792 my $value = uuid_str $value + $uuid_skip;
3522 $uuid_skip = 0; 3793 $uuid_skip = 0;
3523 3794
3524 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3795 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3525 and return; 3796 and return;
3526 3797
3532 or return; 3803 or return;
3533 3804
3534 aio_rename "$uuid~", $uuid 3805 aio_rename "$uuid~", $uuid
3535 and return; 3806 and return;
3536 3807
3537 warn "uuid file written ($value).\n"; 3808 trace "uuid file written ($value).\n";
3538 3809
3539 1 3810 1
3540 3811
3541} 3812}
3542 3813
3548} 3819}
3549 3820
3550sub emergency_save() { 3821sub emergency_save() {
3551 my $freeze_guard = cf::freeze_mainloop; 3822 my $freeze_guard = cf::freeze_mainloop;
3552 3823
3553 warn "enter emergency perl save\n"; 3824 info "emergency_perl_save: enter\n";
3825
3826 # this is a trade-off: we want to be very quick here, so
3827 # save all maps without fsync, and later call a global sync
3828 # (which in turn might be very very slow)
3829 local $USE_FSYNC = 0;
3554 3830
3555 cf::sync_job { 3831 cf::sync_job {
3832 cf::write_runtime_sync; # external watchdog should not bark
3833
3556 # use a peculiar iteration method to avoid tripping on perl 3834 # use a peculiar iteration method to avoid tripping on perl
3557 # refcount bugs in for. also avoids problems with players 3835 # refcount bugs in for. also avoids problems with players
3558 # and maps saved/destroyed asynchronously. 3836 # and maps saved/destroyed asynchronously.
3559 warn "begin emergency player save\n"; 3837 info "emergency_perl_save: begin player save\n";
3560 for my $login (keys %cf::PLAYER) { 3838 for my $login (keys %cf::PLAYER) {
3561 my $pl = $cf::PLAYER{$login} or next; 3839 my $pl = $cf::PLAYER{$login} or next;
3562 $pl->valid or next; 3840 $pl->valid or next;
3563 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3841 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3564 $pl->save; 3842 $pl->save;
3565 } 3843 }
3566 warn "end emergency player save\n"; 3844 info "emergency_perl_save: end player save\n";
3567 3845
3568 warn "begin emergency map save\n"; 3846 cf::write_runtime_sync; # external watchdog should not bark
3847
3848 info "emergency_perl_save: begin map save\n";
3569 for my $path (keys %cf::MAP) { 3849 for my $path (keys %cf::MAP) {
3570 my $map = $cf::MAP{$path} or next; 3850 my $map = $cf::MAP{$path} or next;
3571 $map->valid or next; 3851 $map->valid or next;
3572 $map->save; 3852 $map->save;
3573 } 3853 }
3574 warn "end emergency map save\n"; 3854 info "emergency_perl_save: end map save\n";
3575 3855
3576 warn "begin emergency database checkpoint\n"; 3856 cf::write_runtime_sync; # external watchdog should not bark
3857
3858 info "emergency_perl_save: begin database checkpoint\n";
3577 BDB::db_env_txn_checkpoint $DB_ENV; 3859 BDB::db_env_txn_checkpoint $DB_ENV;
3578 warn "end emergency database checkpoint\n"; 3860 info "emergency_perl_save: end database checkpoint\n";
3579 3861
3580 warn "begin write uuid\n"; 3862 info "emergency_perl_save: begin write uuid\n";
3581 write_uuid_sync 1; 3863 write_uuid_sync 1;
3582 warn "end write uuid\n"; 3864 info "emergency_perl_save: end write uuid\n";
3865
3866 cf::write_runtime_sync; # external watchdog should not bark
3867
3868 trace "emergency_perl_save: syncing database to disk";
3869 BDB::db_env_txn_checkpoint $DB_ENV;
3870
3871 info "emergency_perl_save: starting sync\n";
3872 IO::AIO::aio_sync sub {
3873 info "emergency_perl_save: finished sync\n";
3874 };
3875
3876 cf::write_runtime_sync; # external watchdog should not bark
3877
3878 trace "emergency_perl_save: flushing outstanding aio requests";
3879 while (IO::AIO::nreqs || BDB::nreqs) {
3880 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3881 }
3882
3883 cf::write_runtime_sync; # external watchdog should not bark
3583 }; 3884 };
3584 3885
3585 warn "leave emergency perl save\n"; 3886 info "emergency_perl_save: leave\n";
3586} 3887}
3587 3888
3588sub post_cleanup { 3889sub post_cleanup {
3589 my ($make_core) = @_; 3890 my ($make_core) = @_;
3590 3891
3892 IO::AIO::flush;
3893
3591 warn Carp::longmess "post_cleanup backtrace" 3894 error Carp::longmess "post_cleanup backtrace"
3592 if $make_core; 3895 if $make_core;
3593 3896
3594 my $fh = pidfile; 3897 my $fh = pidfile;
3595 unlink $PIDFILE if <$fh> == $$; 3898 unlink $PIDFILE if <$fh> == $$;
3596} 3899}
3616 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3919 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3617 for my $name (keys %$leaf_symtab) { 3920 for my $name (keys %$leaf_symtab) {
3618 _gv_clear *{"$pkg$name"}; 3921 _gv_clear *{"$pkg$name"};
3619# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3922# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3620 } 3923 }
3621 warn "cleared package $pkg\n";#d#
3622} 3924}
3623 3925
3624sub do_reload_perl() { 3926sub do_reload_perl() {
3625 # can/must only be called in main 3927 # can/must only be called in main
3626 if ($Coro::current != $Coro::main) { 3928 unless (in_main) {
3627 warn "can only reload from main coroutine"; 3929 error "can only reload from main coroutine";
3628 return; 3930 return;
3629 } 3931 }
3630 3932
3631 return if $RELOAD++; 3933 return if $RELOAD++;
3632 3934
3935 my $t1 = AE::time;
3936
3633 while ($RELOAD) { 3937 while ($RELOAD) {
3634 warn "reloading..."; 3938 cf::get_slot 0.1, -1, "reload_perl";
3939 info "perl_reload: reloading...";
3635 3940
3636 warn "entering sync_job"; 3941 trace "perl_reload: entering sync_job";
3637 3942
3638 cf::sync_job { 3943 cf::sync_job {
3639 cf::write_runtime_sync; # external watchdog should not bark
3640 cf::emergency_save; 3944 #cf::emergency_save;
3641 cf::write_runtime_sync; # external watchdog should not bark
3642 3945
3643 warn "syncing database to disk";
3644 BDB::db_env_txn_checkpoint $DB_ENV;
3645
3646 # if anything goes wrong in here, we should simply crash as we already saved
3647
3648 warn "flushing outstanding aio requests";
3649 while (IO::AIO::nreqs || BDB::nreqs) {
3650 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3651 }
3652
3653 warn "cancelling all extension coros"; 3946 trace "perl_reload: cancelling all extension coros";
3654 $_->cancel for values %EXT_CORO; 3947 $_->cancel for values %EXT_CORO;
3655 %EXT_CORO = (); 3948 %EXT_CORO = ();
3656 3949
3657 warn "removing commands"; 3950 trace "perl_reload: removing commands";
3658 %COMMAND = (); 3951 %COMMAND = ();
3659 3952
3660 warn "removing ext/exti commands"; 3953 trace "perl_reload: removing ext/exti commands";
3661 %EXTCMD = (); 3954 %EXTCMD = ();
3662 %EXTICMD = (); 3955 %EXTICMD = ();
3663 3956
3664 warn "unloading/nuking all extensions"; 3957 trace "perl_reload: unloading/nuking all extensions";
3665 for my $pkg (@EXTS) { 3958 for my $pkg (@EXTS) {
3666 warn "... unloading $pkg"; 3959 trace "... unloading $pkg";
3667 3960
3668 if (my $cb = $pkg->can ("unload")) { 3961 if (my $cb = $pkg->can ("unload")) {
3669 eval { 3962 eval {
3670 $cb->($pkg); 3963 $cb->($pkg);
3671 1 3964 1
3672 } or warn "$pkg unloaded, but with errors: $@"; 3965 } or error "$pkg unloaded, but with errors: $@";
3673 } 3966 }
3674 3967
3675 warn "... clearing $pkg"; 3968 trace "... clearing $pkg";
3676 clear_package $pkg; 3969 clear_package $pkg;
3677 } 3970 }
3678 3971
3679 warn "unloading all perl modules loaded from $LIBDIR"; 3972 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3680 while (my ($k, $v) = each %INC) { 3973 while (my ($k, $v) = each %INC) {
3681 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3974 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3682 3975
3683 warn "... unloading $k"; 3976 trace "... unloading $k";
3684 delete $INC{$k}; 3977 delete $INC{$k};
3685 3978
3686 $k =~ s/\.pm$//; 3979 $k =~ s/\.pm$//;
3687 $k =~ s/\//::/g; 3980 $k =~ s/\//::/g;
3688 3981
3691 } 3984 }
3692 3985
3693 clear_package $k; 3986 clear_package $k;
3694 } 3987 }
3695 3988
3696 warn "getting rid of safe::, as good as possible"; 3989 trace "perl_reload: getting rid of safe::, as good as possible";
3697 clear_package "safe::$_" 3990 clear_package "safe::$_"
3698 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3991 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3699 3992
3700 warn "unloading cf.pm \"a bit\""; 3993 trace "perl_reload: unloading cf.pm \"a bit\"";
3701 delete $INC{"cf.pm"}; 3994 delete $INC{"cf.pm"};
3702 delete $INC{"cf/pod.pm"}; 3995 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3703 3996
3704 # don't, removes xs symbols, too, 3997 # don't, removes xs symbols, too,
3705 # and global variables created in xs 3998 # and global variables created in xs
3706 #clear_package __PACKAGE__; 3999 #clear_package __PACKAGE__;
3707 4000
3708 warn "unload completed, starting to reload now"; 4001 info "perl_reload: unload completed, starting to reload now";
3709 4002
3710 warn "reloading cf.pm"; 4003 trace "perl_reload: reloading cf.pm";
3711 require cf; 4004 require cf;
3712 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4005 cf::_connect_to_perl_1;
3713 4006
3714 warn "loading config and database again"; 4007 trace "perl_reload: loading config and database again";
3715 cf::reload_config; 4008 cf::reload_config;
3716 4009
3717 warn "loading extensions"; 4010 trace "perl_reload: loading extensions";
3718 cf::load_extensions; 4011 cf::load_extensions;
3719 4012
4013 if ($REATTACH_ON_RELOAD) {
3720 warn "reattaching attachments to objects/players"; 4014 trace "perl_reload: reattaching attachments to objects/players";
3721 _global_reattach; # objects, sockets 4015 _global_reattach; # objects, sockets
3722 warn "reattaching attachments to maps"; 4016 trace "perl_reload: reattaching attachments to maps";
3723 reattach $_ for values %MAP; 4017 reattach $_ for values %MAP;
3724 warn "reattaching attachments to players"; 4018 trace "perl_reload: reattaching attachments to players";
3725 reattach $_ for values %PLAYER; 4019 reattach $_ for values %PLAYER;
4020 }
3726 4021
3727 warn "running post_load"; 4022 cf::_post_init 1;
3728 (pop @POST_INIT)->(1) while @POST_INIT;
3729 4023
3730 warn "leaving sync_job"; 4024 trace "perl_reload: leaving sync_job";
3731 4025
3732 1 4026 1
3733 } or do { 4027 } or do {
3734 warn $@; 4028 error $@;
3735 cf::cleanup "error while reloading, exiting."; 4029 cf::cleanup "perl_reload: error, exiting.";
3736 }; 4030 };
3737 4031
3738 warn "reloaded";
3739 --$RELOAD; 4032 --$RELOAD;
3740 } 4033 }
4034
4035 $t1 = AE::time - $t1;
4036 info "perl_reload: completed in ${t1}s\n";
3741}; 4037};
3742 4038
3743our $RELOAD_WATCHER; # used only during reload 4039our $RELOAD_WATCHER; # used only during reload
3744 4040
3745sub reload_perl() { 4041sub reload_perl() {
3746 # doing reload synchronously and two reloads happen back-to-back, 4042 # doing reload synchronously and two reloads happen back-to-back,
3747 # coro crashes during coro_state_free->destroy here. 4043 # coro crashes during coro_state_free->destroy here.
3748 4044
4045 $RELOAD_WATCHER ||= cf::async {
4046 Coro::AIO::aio_wait cache_extensions;
4047
3749 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 4048 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3750 do_reload_perl; 4049 do_reload_perl;
3751 undef $RELOAD_WATCHER; 4050 undef $RELOAD_WATCHER;
4051 };
3752 }; 4052 };
3753} 4053}
3754 4054
3755register_command "reload" => sub { 4055register_command "reload" => sub {
3756 my ($who, $arg) = @_; 4056 my ($who, $arg) = @_;
3762 reload_perl; 4062 reload_perl;
3763 }; 4063 };
3764 } 4064 }
3765}; 4065};
3766 4066
3767unshift @INC, $LIBDIR; 4067#############################################################################
3768 4068
3769my $bug_warning = 0; 4069my $bug_warning = 0;
3770 4070
3771our @WAIT_FOR_TICK; 4071our @WAIT_FOR_TICK;
3772our @WAIT_FOR_TICK_BEGIN; 4072our @WAIT_FOR_TICK_BEGIN;
3773 4073
3774sub wait_for_tick { 4074sub wait_for_tick() {
3775 return if tick_inhibit || $Coro::current == $Coro::main; 4075 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3776 4076
3777 my $signal = new Coro::Signal; 4077 my $signal = new Coro::Signal;
3778 push @WAIT_FOR_TICK, $signal; 4078 push @WAIT_FOR_TICK, $signal;
3779 $signal->wait; 4079 $signal->wait;
3780} 4080}
3781 4081
3782sub wait_for_tick_begin { 4082sub wait_for_tick_begin() {
3783 return if tick_inhibit || $Coro::current == $Coro::main; 4083 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3784 4084
3785 my $signal = new Coro::Signal; 4085 my $signal = new Coro::Signal;
3786 push @WAIT_FOR_TICK_BEGIN, $signal; 4086 push @WAIT_FOR_TICK_BEGIN, $signal;
3787 $signal->wait; 4087 $signal->wait;
3788} 4088}
3794 return; 4094 return;
3795 } 4095 }
3796 4096
3797 cf::server_tick; # one server iteration 4097 cf::server_tick; # one server iteration
3798 4098
4099 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4100
3799 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4101 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3800 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4102 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3801 Coro::async_pool { 4103 Coro::async_pool {
3802 $Coro::current->{desc} = "runtime saver"; 4104 $Coro::current->{desc} = "runtime saver";
3803 write_runtime_sync 4105 write_runtime_sync
3804 or warn "ERROR: unable to write runtime file: $!"; 4106 or error "ERROR: unable to write runtime file: $!";
3805 }; 4107 };
3806 } 4108 }
3807 4109
3808 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4110 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3809 $sig->send; 4111 $sig->send;
3817 4119
3818 if (0) { 4120 if (0) {
3819 if ($NEXT_TICK) { 4121 if ($NEXT_TICK) {
3820 my $jitter = $TICK_START - $NEXT_TICK; 4122 my $jitter = $TICK_START - $NEXT_TICK;
3821 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4123 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3822 warn "jitter $JITTER\n";#d# 4124 debug "jitter $JITTER\n";#d#
3823 } 4125 }
3824 } 4126 }
3825} 4127}
3826 4128
3827{ 4129{
3828 # configure BDB 4130 # configure BDB
3829 4131
3830 BDB::min_parallel 8; 4132 BDB::min_parallel 16;
3831 BDB::max_poll_reqs $TICK * 0.1; 4133 BDB::max_poll_reqs $TICK * 0.1;
3832 $AnyEvent::BDB::WATCHER->priority (1); 4134 $AnyEvent::BDB::WATCHER->priority (1);
3833 4135
3834 unless ($DB_ENV) { 4136 unless ($DB_ENV) {
3835 $DB_ENV = BDB::db_env_create; 4137 $DB_ENV = BDB::db_env_create;
3872 IO::AIO::min_parallel 8; 4174 IO::AIO::min_parallel 8;
3873 IO::AIO::max_poll_time $TICK * 0.1; 4175 IO::AIO::max_poll_time $TICK * 0.1;
3874 undef $AnyEvent::AIO::WATCHER; 4176 undef $AnyEvent::AIO::WATCHER;
3875} 4177}
3876 4178
3877my $_log_backtrace; 4179our $_log_backtrace;
4180our $_log_backtrace_last;
3878 4181
3879sub _log_backtrace { 4182sub _log_backtrace {
3880 my ($msg, @addr) = @_; 4183 my ($msg, @addr) = @_;
3881 4184
3882 $msg =~ s/\n//; 4185 $msg =~ s/\n$//;
3883 4186
4187 if ($_log_backtrace_last eq $msg) {
4188 LOG llevInfo, "[ABT] $msg\n";
4189 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3884 # limit the # of concurrent backtraces 4190 # limit the # of concurrent backtraces
3885 if ($_log_backtrace < 2) { 4191 } elsif ($_log_backtrace < 2) {
4192 $_log_backtrace_last = $msg;
3886 ++$_log_backtrace; 4193 ++$_log_backtrace;
3887 my $perl_bt = Carp::longmess $msg; 4194 my $perl_bt = Carp::longmess $msg;
3888 async { 4195 async {
3889 $Coro::current->{desc} = "abt $msg"; 4196 $Coro::current->{desc} = "abt $msg";
3890 4197
3910 LOG llevInfo, "[ABT] $_\n" for @bt; 4217 LOG llevInfo, "[ABT] $_\n" for @bt;
3911 --$_log_backtrace; 4218 --$_log_backtrace;
3912 }; 4219 };
3913 } else { 4220 } else {
3914 LOG llevInfo, "[ABT] $msg\n"; 4221 LOG llevInfo, "[ABT] $msg\n";
3915 LOG llevInfo, "[ABT] [suppressed]\n"; 4222 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3916 } 4223 }
3917} 4224}
3918 4225
3919# load additional modules 4226# load additional modules
3920use cf::pod; 4227require "cf/$_.pm" for @EXTRA_MODULES;
4228cf::_connect_to_perl_2;
3921 4229
3922END { cf::emergency_save } 4230END { cf::emergency_save }
3923 4231
39241 42321
3925 4233

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines