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.456 by root, Tue Sep 30 04:00:35 2008 UTC vs.
Revision 1.561 by root, Fri Apr 22 06:10:33 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;
1192 1317
1193 $filename =~ s%/[^/]+$%%; 1318 $filename =~ s%/[^/]+$%%;
1194 aio_pathsync $filename; 1319 aio_pathsync $filename if $cf::USE_FSYNC;
1195 } else { 1320 } else {
1196 warn "FATAL: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1197 } 1322 }
1198 } else { 1323 } else {
1199 aio_unlink $filename; 1324 aio_unlink $filename;
1200 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1201 } 1326 }
1225 my $st = eval { Coro::Storable::thaw $av }; 1350 my $st = eval { Coro::Storable::thaw $av };
1226 $av = $st->{objs}; 1351 $av = $st->{objs};
1227 } 1352 }
1228 1353
1229 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1230 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1231 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1232 1358
1233 ($data, $av) 1359 ($data, $av)
1234} 1360}
1235 1361
1236=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
1292 my ($name, $cb) = @_; 1418 my ($name, $cb) = @_;
1293 1419
1294 $EXTICMD{$name} = $cb; 1420 $EXTICMD{$name} = $cb;
1295} 1421}
1296 1422
1423use File::Glob ();
1424
1297cf::player->attach ( 1425cf::player->attach (
1298 on_command => sub { 1426 on_unknown_command => sub {
1299 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1300 1428
1301 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1302 or return; 1430 or return;
1303 1431
1326 1454
1327 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1328 if $reply; 1456 if $reply;
1329 1457
1330 } else { 1458 } else {
1331 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1332 } 1460 }
1333 1461
1334 cf::override; 1462 cf::override;
1335 }, 1463 },
1336); 1464);
1337 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
1338sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1339 cf::sync_job { 1482 cf::sync_job {
1340 my %todo; 1483 my %todo;
1341 1484
1342 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1343 next unless -r $path; 1486 next unless -r $path;
1361 1504
1362 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1363 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1364 1507
1365 $ext{source} = 1508 $ext{source} =
1366 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1367 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1368 . $source 1511 . $source
1369 . "\n};\n1"; 1512 . "\n};\n1";
1370 1513
1371 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
1372 } 1515 }
1373 1516
1517 my $pass = 0;
1374 my %done; 1518 my %done;
1375 while (%todo) { 1519 while (%todo) {
1376 my $progress; 1520 my $progress;
1377 1521
1522 ++$pass;
1523
1524 ext:
1378 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
1379 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1380 goto skip 1527 next ext
1381 unless exists $done{$_}; 1528 unless exists $done{$_};
1382 } 1529 }
1383 1530
1384 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1385 1532
1386 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
1387 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
1388 : "$v->{base}: extension inactive.\n";
1389 1537
1390 if (exists $v->{meta}{mandatory}) {
1391 warn $msg;
1392 cf::cleanup "mandatory extension failed to load, exiting."; 1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1393 } 1539 if exists $v->{meta}{mandatory};
1394 1540
1395 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;
1396 } 1550 }
1397
1398 $done{$k} = delete $todo{$k};
1399 push @EXTS, $v->{pkg};
1400 $progress = 1;
1401 } 1551 }
1402 1552
1403 skip: 1553 unless ($progress) {
1404 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1405 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
1561 last;
1562 }
1406 } 1563 }
1407 }; 1564 };
1408} 1565}
1409 1566
1410############################################################################# 1567#############################################################################
1494 $cf::PLAYER{$login} = $pl 1651 $cf::PLAYER{$login} = $pl
1495 } 1652 }
1496 } 1653 }
1497} 1654}
1498 1655
1656cf::player->attach (
1657 on_load => sub {
1658 my ($pl, $path) = @_;
1659
1660 # restore slots saved in save, below
1661 my $slots = delete $pl->{_slots};
1662
1663 $pl->ob->current_weapon ($slots->[0]);
1664 $pl->combat_ob ($slots->[1]);
1665 $pl->ranged_ob ($slots->[2]);
1666 },
1667);
1668
1499sub save($) { 1669sub save($) {
1500 my ($pl) = @_; 1670 my ($pl) = @_;
1501 1671
1502 return if $pl->{deny_save}; 1672 return if $pl->{deny_save};
1503 1673
1508 1678
1509 aio_mkdir playerdir $pl, 0770; 1679 aio_mkdir playerdir $pl, 0770;
1510 $pl->{last_save} = $cf::RUNTIME; 1680 $pl->{last_save} = $cf::RUNTIME;
1511 1681
1512 cf::get_slot 0.01; 1682 cf::get_slot 0.01;
1683
1684 # save slots, to be restored later
1685 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1513 1686
1514 $pl->save_pl ($path); 1687 $pl->save_pl ($path);
1515 cf::cede_to_tick; 1688 cf::cede_to_tick;
1516} 1689}
1517 1690
1551 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1552 1725
1553 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1554 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1727 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1555 1728
1556 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1557 $pl->deactivate; 1730 $pl->deactivate;
1731
1558 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1732 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1559 $pl->ob->check_score;
1560 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1561 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1562 1737
1563 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1564 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1565 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
1619 \@logins 1794 \@logins
1620} 1795}
1621 1796
1622=item $player->maps 1797=item $player->maps
1623 1798
1799=item cf::player::maps $login
1800
1624Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1625player. May block. 1802player. May block.
1626 1803
1627=cut 1804=cut
1628 1805
1690=cut 1867=cut
1691 1868
1692sub find_by_path($) { 1869sub find_by_path($) {
1693 my ($path) = @_; 1870 my ($path) = @_;
1694 1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1873
1695 my ($match, $specificity); 1874 my ($match, $specificity);
1696 1875
1697 for my $region (list) { 1876 for my $region (list) {
1698 if ($region->{match} && $path =~ $region->{match}) { 1877 if ($region->{match} && $path =~ $region->{match}) {
1699 ($match, $specificity) = ($region, $region->specificity) 1878 ($match, $specificity) = ($region, $region->specificity)
1727sub generate_random_map { 1906sub generate_random_map {
1728 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1729 1908
1730 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1909 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1731 1910
1732 # mit "rum" bekleckern, nicht
1733 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1734 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1735 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1736 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1737 $rmp->{exit_on_final_map},
1738 $rmp->{xsize}, $rmp->{ysize},
1739 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1740 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1741 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1742 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1743 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1744 (cf::region::find $rmp->{region}), $rmp->{custom}
1745 )
1746} 1912}
1747 1913
1748=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1749 1915
1750Register a handler for the map path matching the given regex at the 1916Register a handler for the map path matching the given regex at the
1755 1921
1756sub register { 1922sub register {
1757 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1758 my $pkg = caller; 1924 my $pkg = caller;
1759 1925
1760 no strict;
1761 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1762 1927
1763 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1764} 1929}
1765 1930
1766# also paths starting with '/' 1931# also paths starting with '/'
1767$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1768 1933
1769sub thawer_merge { 1934sub thawer_merge {
1770 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1771 1936
1772 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
1777} 1942}
1778 1943
1779sub normalise { 1944sub normalise {
1780 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1781 1946
1782 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1783 1948
1784 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1785 1950
1786 # map plan: 1951 # map plan:
1787 # 1952 #
1802 $base =~ s{[^/]+/?$}{}; 1967 $base =~ s{[^/]+/?$}{};
1803 $path = "$base/$path"; 1968 $path = "$base/$path";
1804 } 1969 }
1805 1970
1806 for ($path) { 1971 for ($path) {
1807 redo if s{//}{/};
1808 redo if s{/\.?/}{/}; 1972 redo if s{/\.?/}{/};
1809 redo if s{/[^/]+/\.\./}{/}; 1973 redo if s{/[^/]+/\.\./}{/};
1810 } 1974 }
1811 1975
1812 $path 1976 $path
1826 $self->init; # pass $1 etc. 1990 $self->init; # pass $1 etc.
1827 return $self; 1991 return $self;
1828 } 1992 }
1829 } 1993 }
1830 1994
1831 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1995 Carp::cluck "unable to resolve path '$path' (base '$base')";
1832 () 1996 ()
1833} 1997}
1834 1998
1999# may re-bless or do other evil things
1835sub init { 2000sub init {
1836 my ($self) = @_; 2001 my ($self) = @_;
1837 2002
1838 $self 2003 $self
1839} 2004}
1868sub uniq_path { 2033sub uniq_path {
1869 my ($self) = @_; 2034 my ($self) = @_;
1870 2035
1871 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2036 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1872 "$UNIQUEDIR/$path" 2037 "$UNIQUEDIR/$path"
1873}
1874
1875# and all this just because we cannot iterate over
1876# all maps in C++...
1877sub change_all_map_light {
1878 my ($change) = @_;
1879
1880 $_->change_map_light ($change)
1881 for grep $_->outdoor, values %cf::MAP;
1882} 2038}
1883 2039
1884sub decay_objects { 2040sub decay_objects {
1885 my ($self) = @_; 2041 my ($self) = @_;
1886 2042
1968 2124
1969sub find; 2125sub find;
1970sub find { 2126sub find {
1971 my ($path, $origin) = @_; 2127 my ($path, $origin) = @_;
1972 2128
2129 cf::cede_to_tick;
2130
1973 $path = normalise $path, $origin && $origin->path; 2131 $path = normalise $path, $origin && $origin->path;
1974 2132
1975 cf::lock_wait "map_data:$path";#d#remove 2133 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1976 cf::lock_wait "map_find:$path"; 2134 my $guard2 = cf::lock_acquire "map_find:$path";
1977 2135
1978 $cf::MAP{$path} || do { 2136 $cf::MAP{$path} || do {
1979 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1980 my $guard2 = cf::lock_acquire "map_find:$path";
1981
1982 my $map = new_from_path cf::map $path 2137 my $map = new_from_path cf::map $path
1983 or return; 2138 or return;
1984 2139
1985 $map->{last_save} = $cf::RUNTIME; 2140 $map->{last_save} = $cf::RUNTIME;
1986 2141
1998 2153
1999 $cf::MAP{$path} = $map 2154 $cf::MAP{$path} = $map
2000 } 2155 }
2001} 2156}
2002 2157
2003sub pre_load { } 2158sub pre_load { }
2004sub post_load { } 2159#sub post_load { } # XS
2005 2160
2006sub load { 2161sub load {
2007 my ($self) = @_; 2162 my ($self) = @_;
2008 2163
2009 local $self->{deny_reset} = 1; # loading can take a long time 2164 local $self->{deny_reset} = 1; # loading can take a long time
2054 unless ($self->{deny_activate}) { 2209 unless ($self->{deny_activate}) {
2055 $self->decay_objects; 2210 $self->decay_objects;
2056 $self->fix_auto_apply; 2211 $self->fix_auto_apply;
2057 $self->update_buttons; 2212 $self->update_buttons;
2058 cf::cede_to_tick; 2213 cf::cede_to_tick;
2059 $self->set_darkness_map;
2060 cf::cede_to_tick;
2061 $self->activate; 2214 $self->activate;
2062 } 2215 }
2063 2216
2064 $self->{last_save} = $cf::RUNTIME; 2217 $self->{last_save} = $cf::RUNTIME;
2065 $self->last_access ($cf::RUNTIME); 2218 $self->last_access ($cf::RUNTIME);
2066 2219
2067 $self->in_memory (cf::MAP_ACTIVE); 2220 $self->in_memory (cf::MAP_ACTIVE);
2068 } 2221 }
2069 2222
2070 $self->post_load; 2223 $self->post_load;
2071}
2072 2224
2225 1
2226}
2227
2228# customize the map for a given player, i.e.
2229# return the _real_ map. used by e.g. per-player
2230# maps to change the path to ~playername/mappath
2073sub customise_for { 2231sub customise_for {
2074 my ($self, $ob) = @_; 2232 my ($self, $ob) = @_;
2075 2233
2076 return find "~" . $ob->name . "/" . $self->{path} 2234 return find "~" . $ob->name . "/" . $self->{path}
2077 if $self->per_player; 2235 if $self->per_player;
2093 or next; 2251 or next;
2094 $neigh = find $neigh, $map 2252 $neigh = find $neigh, $map
2095 or next; 2253 or next;
2096 $neigh->load; 2254 $neigh->load;
2097 2255
2256 # now find the diagonal neighbours
2098 push @neigh, 2257 push @neigh,
2099 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2258 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2100 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2259 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2101 } 2260 }
2102 2261
2109} 2268}
2110 2269
2111sub find_sync { 2270sub find_sync {
2112 my ($path, $origin) = @_; 2271 my ($path, $origin) = @_;
2113 2272
2114 cf::sync_job { find $path, $origin } 2273 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2274 if $Coro::current == $Coro::main;
2275
2276 find $path, $origin
2115} 2277}
2116 2278
2117sub do_load_sync { 2279sub do_load_sync {
2118 my ($map) = @_; 2280 my ($map) = @_;
2119 2281
2120 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2282 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2121 if $Coro::current == $Coro::main; 2283 if $Coro::current == $Coro::main;
2122 2284
2123 cf::sync_job { $map->load }; 2285 $map->load;
2124} 2286}
2125 2287
2126our %MAP_PREFETCH; 2288our %MAP_PREFETCH;
2127our $MAP_PREFETCHER = undef; 2289our $MAP_PREFETCHER = undef;
2128 2290
2154 $MAP_PREFETCHER->prio (6); 2316 $MAP_PREFETCHER->prio (6);
2155 2317
2156 () 2318 ()
2157} 2319}
2158 2320
2321# common code, used by both ->save and ->swapout
2159sub save { 2322sub _save {
2160 my ($self) = @_; 2323 my ($self) = @_;
2161
2162 my $lock = cf::lock_acquire "map_data:$self->{path}";
2163 2324
2164 $self->{last_save} = $cf::RUNTIME; 2325 $self->{last_save} = $cf::RUNTIME;
2165 2326
2166 return unless $self->dirty; 2327 return unless $self->dirty;
2167 2328
2187 } else { 2348 } else {
2188 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2349 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2189 } 2350 }
2190} 2351}
2191 2352
2353sub save {
2354 my ($self) = @_;
2355
2356 my $lock = cf::lock_acquire "map_data:$self->{path}";
2357
2358 $self->_save;
2359}
2360
2192sub swap_out { 2361sub swap_out {
2193 my ($self) = @_; 2362 my ($self) = @_;
2194 2363
2195 # save first because save cedes
2196 $self->save;
2197
2198 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2364 my $lock = cf::lock_acquire "map_data:$self->{path}";
2199 2365
2200 return if $self->players;
2201 return if $self->in_memory != cf::MAP_ACTIVE; 2366 return if $self->in_memory != cf::MAP_ACTIVE;
2202 return if $self->{deny_save}; 2367 return if $self->{deny_save};
2368 return if $self->players;
2203 2369
2370 # first deactivate the map and "unlink" it from the core
2371 $self->deactivate;
2372 $_->clear_links_to ($self) for values %cf::MAP;
2204 $self->in_memory (cf::MAP_SWAPPED); 2373 $self->in_memory (cf::MAP_SWAPPED);
2374
2375 # then atomically save
2376 $self->_save;
2377
2378 # then free the map
2379 $self->clear;
2380}
2381
2382sub reset_at {
2383 my ($self) = @_;
2384
2385 # TODO: safety, remove and allow resettable per-player maps
2386 return 1e99 if $self->{deny_reset};
2387
2388 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2389 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2390
2391 $time + $to
2392}
2393
2394sub should_reset {
2395 my ($self) = @_;
2396
2397 $self->reset_at <= $cf::RUNTIME
2398}
2399
2400sub reset {
2401 my ($self) = @_;
2402
2403 my $lock = cf::lock_acquire "map_data:$self->{path}";
2404
2405 return if $self->players;
2406
2407 cf::trace "resetting map ", $self->path, "\n";
2408
2409 $self->in_memory (cf::MAP_SWAPPED);
2410
2411 # need to save uniques path
2412 unless ($self->{deny_save}) {
2413 my $uniq = $self->uniq_path; utf8::encode $uniq;
2414
2415 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2416 if $uniq;
2417 }
2418
2419 delete $cf::MAP{$self->path};
2205 2420
2206 $self->deactivate; 2421 $self->deactivate;
2207 $_->clear_links_to ($self) for values %cf::MAP; 2422 $_->clear_links_to ($self) for values %cf::MAP;
2208 $self->clear; 2423 $self->clear;
2209}
2210
2211sub reset_at {
2212 my ($self) = @_;
2213
2214 # TODO: safety, remove and allow resettable per-player maps
2215 return 1e99 if $self->{deny_reset};
2216
2217 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2218 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2219
2220 $time + $to
2221}
2222
2223sub should_reset {
2224 my ($self) = @_;
2225
2226 $self->reset_at <= $cf::RUNTIME
2227}
2228
2229sub reset {
2230 my ($self) = @_;
2231
2232 my $lock = cf::lock_acquire "map_data:$self->{path}";
2233
2234 return if $self->players;
2235
2236 warn "resetting map ", $self->path;
2237
2238 $self->in_memory (cf::MAP_SWAPPED);
2239
2240 # need to save uniques path
2241 unless ($self->{deny_save}) {
2242 my $uniq = $self->uniq_path; utf8::encode $uniq;
2243
2244 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2245 if $uniq;
2246 }
2247
2248 delete $cf::MAP{$self->path};
2249
2250 $self->deactivate;
2251 $_->clear_links_to ($self) for values %cf::MAP;
2252 $self->clear;
2253 2424
2254 $self->unlink_save; 2425 $self->unlink_save;
2255 $self->destroy; 2426 $self->destroy;
2256} 2427}
2257 2428
2265 2436
2266 delete $cf::MAP{$self->path}; 2437 delete $cf::MAP{$self->path};
2267 2438
2268 $self->unlink_save; 2439 $self->unlink_save;
2269 2440
2270 bless $self, "cf::map"; 2441 bless $self, "cf::map::wrap";
2271 delete $self->{deny_reset}; 2442 delete $self->{deny_reset};
2272 $self->{deny_save} = 1; 2443 $self->{deny_save} = 1;
2273 $self->reset_timeout (1); 2444 $self->reset_timeout (1);
2274 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2445 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2275 2446
2332 : normalise $_ 2503 : normalise $_
2333 } @{ aio_readdir $UNIQUEDIR or [] } 2504 } @{ aio_readdir $UNIQUEDIR or [] }
2334 ] 2505 ]
2335} 2506}
2336 2507
2508=item cf::map::static_maps
2509
2510Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2511file in the shared directory excluding F</styles> and F</editor>). May
2512block.
2513
2514=cut
2515
2516sub static_maps() {
2517 my @dirs = "";
2518 my @maps;
2519
2520 while (@dirs) {
2521 my $dir = shift @dirs;
2522
2523 next if $dir eq "/styles" || $dir eq "/editor";
2524
2525 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2526 or return;
2527
2528 for (@$files) {
2529 s/\.map$// or next;
2530 utf8::decode $_;
2531 push @maps, "$dir/$_";
2532 }
2533
2534 push @dirs, map "$dir/$_", @$dirs;
2535 }
2536
2537 \@maps
2538}
2539
2337=back 2540=back
2338 2541
2339=head3 cf::object 2542=head3 cf::object
2340 2543
2341=cut 2544=cut
2406 2609
2407our $SAY_CHANNEL = { 2610our $SAY_CHANNEL = {
2408 id => "say", 2611 id => "say",
2409 title => "Map", 2612 title => "Map",
2410 reply => "say ", 2613 reply => "say ",
2411 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2614 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2412}; 2615};
2413 2616
2414our $CHAT_CHANNEL = { 2617our $CHAT_CHANNEL = {
2415 id => "chat", 2618 id => "chat",
2416 title => "Chat", 2619 title => "Chat",
2473 2676
2474Freezes the player and moves him/her to a special map (C<{link}>). 2677Freezes the player and moves him/her to a special map (C<{link}>).
2475 2678
2476The player should be reasonably safe there for short amounts of time (e.g. 2679The player should be reasonably safe there for short amounts of time (e.g.
2477for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2680for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2478though, as the palyer cannot control the character while it is on the link 2681though, as the player cannot control the character while it is on the link
2479map. 2682map.
2480 2683
2481Will never block. 2684Will never block.
2482 2685
2483=item $player_object->leave_link ($map, $x, $y) 2686=item $player_object->leave_link ($map, $x, $y)
2504sub cf::object::player::enter_link { 2707sub cf::object::player::enter_link {
2505 my ($self) = @_; 2708 my ($self) = @_;
2506 2709
2507 $self->deactivate_recursive; 2710 $self->deactivate_recursive;
2508 2711
2712 ++$self->{_link_recursion};
2713
2509 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2714 return if UNIVERSAL::isa $self->map, "ext::map_link";
2510 2715
2511 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2716 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2512 if $self->map && $self->map->{path} ne "{link}"; 2717 if $self->map && $self->map->{path} ne "{link}";
2513 2718
2514 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2719 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2515} 2720}
2516 2721
2517sub cf::object::player::leave_link { 2722sub cf::object::player::leave_link {
2518 my ($self, $map, $x, $y) = @_; 2723 my ($self, $map, $x, $y) = @_;
2519 2724
2536 ($x, $y) = (-1, -1) 2741 ($x, $y) = (-1, -1)
2537 unless (defined $x) && (defined $y); 2742 unless (defined $x) && (defined $y);
2538 2743
2539 # use -1 or undef as default coordinates, not 0, 0 2744 # use -1 or undef as default coordinates, not 0, 0
2540 ($x, $y) = ($map->enter_x, $map->enter_y) 2745 ($x, $y) = ($map->enter_x, $map->enter_y)
2541 if $x <=0 && $y <= 0; 2746 if $x <= 0 && $y <= 0;
2542 2747
2543 $map->load; 2748 $map->load;
2544 $map->load_neighbours; 2749 $map->load_neighbours;
2545 2750
2546 return unless $self->contr->active; 2751 return unless $self->contr->active;
2547 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2548 $self->activate_recursive;
2549 2752
2550 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2753 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2551 $self->enter_map ($map, $x, $y); 2754 if ($self->enter_map ($map, $x, $y)) {
2552} 2755 # entering was successful
2756 delete $self->{_link_recursion};
2757 # only activate afterwards, to support waiting in hooks
2758 $self->activate_recursive;
2759 }
2553 2760
2761}
2762
2554=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2763=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2555 2764
2556Moves the player to the given map-path and coordinates by first freezing 2765Moves the player to the given map-path and coordinates by first freezing
2557her, loading and preparing them map, calling the provided $check callback 2766her, loading and preparing them map, calling the provided $check callback
2558that has to return the map if sucecssful, and then unfreezes the player on 2767that has to return the map if sucecssful, and then unfreezes the player on
2559the new (success) or old (failed) map position. In either case, $done will 2768the new (success) or old (failed) map position. In either case, $done will
2566 2775
2567our $GOTOGEN; 2776our $GOTOGEN;
2568 2777
2569sub cf::object::player::goto { 2778sub cf::object::player::goto {
2570 my ($self, $path, $x, $y, $check, $done) = @_; 2779 my ($self, $path, $x, $y, $check, $done) = @_;
2780
2781 if ($self->{_link_recursion} >= $MAX_LINKS) {
2782 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2783 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2784 ($path, $x, $y) = @$EMERGENCY_POSITION;
2785 }
2571 2786
2572 # do generation counting so two concurrent goto's will be executed in-order 2787 # do generation counting so two concurrent goto's will be executed in-order
2573 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2788 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2574 2789
2575 $self->enter_link; 2790 $self->enter_link;
2599 my $map = eval { 2814 my $map = eval {
2600 my $map = defined $path ? cf::map::find $path : undef; 2815 my $map = defined $path ? cf::map::find $path : undef;
2601 2816
2602 if ($map) { 2817 if ($map) {
2603 $map = $map->customise_for ($self); 2818 $map = $map->customise_for ($self);
2604 $map = $check->($map) if $check && $map; 2819 $map = $check->($map, $x, $y, $self) if $check && $map;
2605 } else { 2820 } else {
2606 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2821 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2607 } 2822 }
2608 2823
2609 $map 2824 $map
2617 if ($gen == $self->{_goto_generation}) { 2832 if ($gen == $self->{_goto_generation}) {
2618 delete $self->{_goto_generation}; 2833 delete $self->{_goto_generation};
2619 $self->leave_link ($map, $x, $y); 2834 $self->leave_link ($map, $x, $y);
2620 } 2835 }
2621 2836
2622 $done->() if $done; 2837 $done->($self) if $done;
2623 })->prio (1); 2838 })->prio (1);
2624} 2839}
2625 2840
2626=item $player_object->enter_exit ($exit_object) 2841=item $player_object->enter_exit ($exit_object)
2627 2842
2720 $self->message ("Something went wrong deep within the deliantra server. " 2935 $self->message ("Something went wrong deep within the deliantra server. "
2721 . "I'll try to bring you back to the map you were before. " 2936 . "I'll try to bring you back to the map you were before. "
2722 . "Please report this to the dungeon master!", 2937 . "Please report this to the dungeon master!",
2723 cf::NDI_UNIQUE | cf::NDI_RED); 2938 cf::NDI_UNIQUE | cf::NDI_RED);
2724 2939
2725 warn "ERROR in enter_exit: $@"; 2940 error "ERROR in enter_exit: $@";
2726 $self->leave_link; 2941 $self->leave_link;
2727 } 2942 }
2728 })->prio (1); 2943 })->prio (1);
2729} 2944}
2730 2945
2742sub cf::client::send_drawinfo { 2957sub cf::client::send_drawinfo {
2743 my ($self, $text, $flags) = @_; 2958 my ($self, $text, $flags) = @_;
2744 2959
2745 utf8::encode $text; 2960 utf8::encode $text;
2746 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2961 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2962}
2963
2964=item $client->send_big_packet ($pkt)
2965
2966Like C<send_packet>, but tries to compress large packets, and fragments
2967them as required.
2968
2969=cut
2970
2971our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2972
2973sub cf::client::send_big_packet {
2974 my ($self, $pkt) = @_;
2975
2976 # try lzf for large packets
2977 $pkt = "lzf " . Compress::LZF::compress $pkt
2978 if 1024 <= length $pkt and $self->{can_lzf};
2979
2980 # split very large packets
2981 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2982 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2983 $pkt = "frag";
2984 }
2985
2986 $self->send_packet ($pkt);
2747} 2987}
2748 2988
2749=item $client->send_msg ($channel, $msg, $color, [extra...]) 2989=item $client->send_msg ($channel, $msg, $color, [extra...])
2750 2990
2751Send a drawinfo or msg packet to the client, formatting the msg for the 2991Send a drawinfo or msg packet to the client, formatting the msg for the
2755 2995
2756=cut 2996=cut
2757 2997
2758# non-persistent channels (usually the info channel) 2998# non-persistent channels (usually the info channel)
2759our %CHANNEL = ( 2999our %CHANNEL = (
3000 "c/motd" => {
3001 id => "infobox",
3002 title => "MOTD",
3003 reply => undef,
3004 tooltip => "The message of the day",
3005 },
2760 "c/identify" => { 3006 "c/identify" => {
2761 id => "infobox", 3007 id => "infobox",
2762 title => "Identify", 3008 title => "Identify",
2763 reply => undef, 3009 reply => undef,
2764 tooltip => "Items recently identified", 3010 tooltip => "Items recently identified",
2766 "c/examine" => { 3012 "c/examine" => {
2767 id => "infobox", 3013 id => "infobox",
2768 title => "Examine", 3014 title => "Examine",
2769 reply => undef, 3015 reply => undef,
2770 tooltip => "Signs and other items you examined", 3016 tooltip => "Signs and other items you examined",
3017 },
3018 "c/shopinfo" => {
3019 id => "infobox",
3020 title => "Shop Info",
3021 reply => undef,
3022 tooltip => "What your bargaining skill tells you about the shop",
2771 }, 3023 },
2772 "c/book" => { 3024 "c/book" => {
2773 id => "infobox", 3025 id => "infobox",
2774 title => "Book", 3026 title => "Book",
2775 reply => undef, 3027 reply => undef,
2791 id => "infobox", 3043 id => "infobox",
2792 title => "Body Parts", 3044 title => "Body Parts",
2793 reply => undef, 3045 reply => undef,
2794 tooltip => "Shows which body parts you posess and are available", 3046 tooltip => "Shows which body parts you posess and are available",
2795 }, 3047 },
3048 "c/statistics" => {
3049 id => "infobox",
3050 title => "Statistics",
3051 reply => undef,
3052 tooltip => "Shows your primary statistics",
3053 },
2796 "c/skills" => { 3054 "c/skills" => {
2797 id => "infobox", 3055 id => "infobox",
2798 title => "Skills", 3056 title => "Skills",
2799 reply => undef, 3057 reply => undef,
2800 tooltip => "Shows your experience per skill and item power", 3058 tooltip => "Shows your experience per skill and item power",
3059 },
3060 "c/shopitems" => {
3061 id => "infobox",
3062 title => "Shop Items",
3063 reply => undef,
3064 tooltip => "Shows the items currently for sale in this shop",
3065 },
3066 "c/resistances" => {
3067 id => "infobox",
3068 title => "Resistances",
3069 reply => undef,
3070 tooltip => "Shows your resistances",
3071 },
3072 "c/pets" => {
3073 id => "infobox",
3074 title => "Pets",
3075 reply => undef,
3076 tooltip => "Shows information abotu your pets/a specific pet",
3077 },
3078 "c/perceiveself" => {
3079 id => "infobox",
3080 title => "Perceive Self",
3081 reply => undef,
3082 tooltip => "You gained detailed knowledge about yourself",
2801 }, 3083 },
2802 "c/uptime" => { 3084 "c/uptime" => {
2803 id => "infobox", 3085 id => "infobox",
2804 title => "Uptime", 3086 title => "Uptime",
2805 reply => undef, 3087 reply => undef,
2815 id => "party", 3097 id => "party",
2816 title => "Party", 3098 title => "Party",
2817 reply => "gsay ", 3099 reply => "gsay ",
2818 tooltip => "Messages and chat related to your party", 3100 tooltip => "Messages and chat related to your party",
2819 }, 3101 },
3102 "c/death" => {
3103 id => "death",
3104 title => "Death",
3105 reply => undef,
3106 tooltip => "Reason for and more info about your most recent death",
3107 },
3108 "c/say" => $SAY_CHANNEL,
3109 "c/chat" => $CHAT_CHANNEL,
2820); 3110);
2821 3111
2822sub cf::client::send_msg { 3112sub cf::client::send_msg {
2823 my ($self, $channel, $msg, $color, @extra) = @_; 3113 my ($self, $channel, $msg, $color, @extra) = @_;
2824 3114
2829 3119
2830 # check predefined channels, for the benefit of C 3120 # check predefined channels, for the benefit of C
2831 if ($CHANNEL{$channel}) { 3121 if ($CHANNEL{$channel}) {
2832 $channel = $CHANNEL{$channel}; 3122 $channel = $CHANNEL{$channel};
2833 3123
2834 $self->ext_msg (channel_info => $channel) 3124 $self->ext_msg (channel_info => $channel);
2835 if $self->can_msg;
2836
2837 $channel = $channel->{id}; 3125 $channel = $channel->{id};
2838 3126
2839 } elsif (ref $channel) { 3127 } elsif (ref $channel) {
2840 # send meta info to client, if not yet sent 3128 # send meta info to client, if not yet sent
2841 unless (exists $self->{channel}{$channel->{id}}) { 3129 unless (exists $self->{channel}{$channel->{id}}) {
2842 $self->{channel}{$channel->{id}} = $channel; 3130 $self->{channel}{$channel->{id}} = $channel;
2843 $self->ext_msg (channel_info => $channel) 3131 $self->ext_msg (channel_info => $channel);
2844 if $self->can_msg;
2845 } 3132 }
2846 3133
2847 $channel = $channel->{id}; 3134 $channel = $channel->{id};
2848 } 3135 }
2849 3136
2850 return unless @extra || length $msg; 3137 return unless @extra || length $msg;
2851 3138
2852 if ($self->can_msg) {
2853 # default colour, mask it out 3139 # default colour, mask it out
2854 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3140 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2855 if $color & cf::NDI_DEF; 3141 if $color & cf::NDI_DEF;
2856 3142
2857 my $pkt = "msg " 3143 my $pkt = "msg "
2858 . $self->{json_coder}->encode ( 3144 . $self->{json_coder}->encode (
2859 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3145 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2860 ); 3146 );
2861 3147
2862 # try lzf for large packets
2863 $pkt = "lzf " . Compress::LZF::compress $pkt
2864 if 1024 <= length $pkt and $self->{can_lzf};
2865
2866 # split very large packets
2867 if (8192 < length $pkt and $self->{can_lzf}) {
2868 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2869 $pkt = "frag";
2870 }
2871
2872 $self->send_packet ($pkt); 3148 $self->send_big_packet ($pkt);
2873 } else {
2874 if ($color >= 0) {
2875 # replace some tags by gcfclient-compatible ones
2876 for ($msg) {
2877 1 while
2878 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2879 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2880 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2881 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2882 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2883 }
2884
2885 $color &= cf::NDI_COLOR_MASK;
2886
2887 utf8::encode $msg;
2888
2889 if (0 && $msg =~ /\[/) {
2890 # COMMAND/INFO
2891 $self->send_packet ("drawextinfo $color 10 8 $msg")
2892 } else {
2893 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2894 $self->send_packet ("drawinfo $color $msg")
2895 }
2896 }
2897 }
2898} 3149}
2899 3150
2900=item $client->ext_msg ($type, @msg) 3151=item $client->ext_msg ($type, @msg)
2901 3152
2902Sends an ext event to the client. 3153Sends an ext event to the client.
2905 3156
2906sub cf::client::ext_msg($$@) { 3157sub cf::client::ext_msg($$@) {
2907 my ($self, $type, @msg) = @_; 3158 my ($self, $type, @msg) = @_;
2908 3159
2909 if ($self->extcmd == 2) { 3160 if ($self->extcmd == 2) {
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3161 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2911 } elsif ($self->extcmd == 1) { # TODO: remove 3162 } elsif ($self->extcmd == 1) { # TODO: remove
2912 push @msg, msgtype => "event_$type"; 3163 push @msg, msgtype => "event_$type";
2913 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3164 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2914 } 3165 }
2915} 3166}
2916 3167
2917=item $client->ext_reply ($msgid, @msg) 3168=item $client->ext_reply ($msgid, @msg)
2918 3169
2922 3173
2923sub cf::client::ext_reply($$@) { 3174sub cf::client::ext_reply($$@) {
2924 my ($self, $id, @msg) = @_; 3175 my ($self, $id, @msg) = @_;
2925 3176
2926 if ($self->extcmd == 2) { 3177 if ($self->extcmd == 2) {
2927 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3178 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2928 } elsif ($self->extcmd == 1) { 3179 } elsif ($self->extcmd == 1) {
2929 #TODO: version 1, remove 3180 #TODO: version 1, remove
2930 unshift @msg, msgtype => "reply", msgid => $id; 3181 unshift @msg, msgtype => "reply", msgid => $id;
2931 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3182 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2932 } 3183 }
2933} 3184}
2934 3185
2935=item $success = $client->query ($flags, "text", \&cb) 3186=item $success = $client->query ($flags, "text", \&cb)
2936 3187
3007 3258
3008 $ns->ext_reply ($reply, @reply) 3259 $ns->ext_reply ($reply, @reply)
3009 if $reply; 3260 if $reply;
3010 3261
3011 } else { 3262 } else {
3012 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3263 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3013 } 3264 }
3014 3265
3015 cf::override; 3266 cf::override;
3016 }, 3267 },
3017); 3268);
3037 3288
3038 $coro 3289 $coro
3039} 3290}
3040 3291
3041cf::client->attach ( 3292cf::client->attach (
3042 on_destroy => sub { 3293 on_client_destroy => sub {
3043 my ($ns) = @_; 3294 my ($ns) = @_;
3044 3295
3045 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3296 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3046 }, 3297 },
3047); 3298);
3063our $safe_hole = new Safe::Hole; 3314our $safe_hole = new Safe::Hole;
3064 3315
3065$SIG{FPE} = 'IGNORE'; 3316$SIG{FPE} = 'IGNORE';
3066 3317
3067$safe->permit_only (Opcode::opset qw( 3318$safe->permit_only (Opcode::opset qw(
3068 :base_core :base_mem :base_orig :base_math 3319 :base_core :base_mem :base_orig :base_math :base_loop
3069 grepstart grepwhile mapstart mapwhile 3320 grepstart grepwhile mapstart mapwhile
3070 sort time 3321 sort time
3071)); 3322));
3072 3323
3073# here we export the classes and methods available to script code 3324# here we export the classes and methods available to script code
3077The following functions and methods are available within a safe environment: 3328The following functions and methods are available within a safe environment:
3078 3329
3079 cf::object 3330 cf::object
3080 contr pay_amount pay_player map x y force_find force_add destroy 3331 contr pay_amount pay_player map x y force_find force_add destroy
3081 insert remove name archname title slaying race decrease split 3332 insert remove name archname title slaying race decrease split
3333 value
3082 3334
3083 cf::object::player 3335 cf::object::player
3084 player 3336 player
3085 3337
3086 cf::player 3338 cf::player
3092=cut 3344=cut
3093 3345
3094for ( 3346for (
3095 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3347 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3096 insert remove inv nrof name archname title slaying race 3348 insert remove inv nrof name archname title slaying race
3097 decrease split destroy change_exp)], 3349 decrease split destroy change_exp value msg lore send_msg)],
3098 ["cf::object::player" => qw(player)], 3350 ["cf::object::player" => qw(player)],
3099 ["cf::player" => qw(peaceful)], 3351 ["cf::player" => qw(peaceful send_msg)],
3100 ["cf::map" => qw(trigger)], 3352 ["cf::map" => qw(trigger)],
3101) { 3353) {
3102 no strict 'refs';
3103 my ($pkg, @funs) = @$_; 3354 my ($pkg, @funs) = @$_;
3104 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3355 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3105 for @funs; 3356 for @funs;
3106} 3357}
3107 3358
3122 3373
3123 my $qcode = $code; 3374 my $qcode = $code;
3124 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3375 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3125 $qcode =~ s/\n/\\n/g; 3376 $qcode =~ s/\n/\\n/g;
3126 3377
3378 %vars = (_dummy => 0) unless %vars;
3379
3380 my @res;
3127 local $_; 3381 local $_;
3128 local @safe::cf::_safe_eval_args = values %vars;
3129 3382
3130 my $eval = 3383 my $eval =
3131 "do {\n" 3384 "do {\n"
3132 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3385 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3133 . "#line 0 \"{$qcode}\"\n" 3386 . "#line 0 \"{$qcode}\"\n"
3134 . $code 3387 . $code
3135 . "\n}" 3388 . "\n}"
3136 ; 3389 ;
3137 3390
3391 if ($CFG{safe_eval}) {
3138 sub_generation_inc; 3392 sub_generation_inc;
3393 local @safe::cf::_safe_eval_args = values %vars;
3139 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3394 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3140 sub_generation_inc; 3395 sub_generation_inc;
3396 } else {
3397 local @cf::_safe_eval_args = values %vars;
3398 @res = wantarray ? eval eval : scalar eval $eval;
3399 }
3141 3400
3142 if ($@) { 3401 if ($@) {
3143 warn "$@"; 3402 warn "$@",
3144 warn "while executing safe code '$code'\n"; 3403 "while executing safe code '$code'\n",
3145 warn "with arguments " . (join " ", %vars) . "\n"; 3404 "with arguments " . (join " ", %vars) . "\n";
3146 } 3405 }
3147 3406
3148 wantarray ? @res : $res[0] 3407 wantarray ? @res : $res[0]
3149} 3408}
3150 3409
3164=cut 3423=cut
3165 3424
3166sub register_script_function { 3425sub register_script_function {
3167 my ($fun, $cb) = @_; 3426 my ($fun, $cb) = @_;
3168 3427
3169 no strict 'refs'; 3428 $fun = "safe::$fun" if $CFG{safe_eval};
3170 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3429 *$fun = $safe_hole->wrap ($cb);
3171} 3430}
3172 3431
3173=back 3432=back
3174 3433
3175=cut 3434=cut
3184 # for this (global event?) 3443 # for this (global event?)
3185 %ext::player_env::MUSIC_FACE_CACHE = (); 3444 %ext::player_env::MUSIC_FACE_CACHE = ();
3186 3445
3187 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3446 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3188 3447
3189 warn "loading facedata from $path\n"; 3448 trace "loading facedata from $path\n";
3190 3449
3191 my $facedata; 3450 my $facedata = decode_storable load_file $path;
3192 0 < aio_load $path, $facedata
3193 or die "$path: $!";
3194
3195 $facedata = Coro::Storable::thaw $facedata;
3196 3451
3197 $facedata->{version} == 2 3452 $facedata->{version} == 2
3198 or cf::cleanup "$path: version mismatch, cannot proceed."; 3453 or cf::cleanup "$path: version mismatch, cannot proceed.";
3199 3454
3200 # patch in the exptable 3455 # patch in the exptable
3456 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3201 $facedata->{resource}{"res/exp_table"} = { 3457 $facedata->{resource}{"res/exp_table"} = {
3202 type => FT_RSRC, 3458 type => FT_RSRC,
3203 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3459 data => $exp_table,
3460 hash => (Digest::MD5::md5 $exp_table),
3204 }; 3461 };
3205 cf::cede_to_tick; 3462 cf::cede_to_tick;
3206 3463
3207 { 3464 {
3208 my $faces = $facedata->{faceinfo}; 3465 my $faces = $facedata->{faceinfo};
3210 while (my ($face, $info) = each %$faces) { 3467 while (my ($face, $info) = each %$faces) {
3211 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3468 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3212 3469
3213 cf::face::set_visibility $idx, $info->{visibility}; 3470 cf::face::set_visibility $idx, $info->{visibility};
3214 cf::face::set_magicmap $idx, $info->{magicmap}; 3471 cf::face::set_magicmap $idx, $info->{magicmap};
3215 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3472 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3216 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3473 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3474 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3217 3475
3218 cf::cede_to_tick; 3476 cf::cede_to_tick;
3219 } 3477 }
3220 3478
3221 while (my ($face, $info) = each %$faces) { 3479 while (my ($face, $info) = each %$faces) {
3226 3484
3227 if (my $smooth = cf::face::find $info->{smooth}) { 3485 if (my $smooth = cf::face::find $info->{smooth}) {
3228 cf::face::set_smooth $idx, $smooth; 3486 cf::face::set_smooth $idx, $smooth;
3229 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3487 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3230 } else { 3488 } else {
3231 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3489 error "smooth face '$info->{smooth}' not found for face '$face'";
3232 } 3490 }
3233 3491
3234 cf::cede_to_tick; 3492 cf::cede_to_tick;
3235 } 3493 }
3236 } 3494 }
3245 3503
3246 cf::anim::invalidate_all; # d'oh 3504 cf::anim::invalidate_all; # d'oh
3247 } 3505 }
3248 3506
3249 { 3507 {
3250 # TODO: for gcfclient pleasure, we should give resources
3251 # that gcfclient doesn't grok a >10000 face index.
3252 my $res = $facedata->{resource}; 3508 my $res = $facedata->{resource};
3253 3509
3254 while (my ($name, $info) = each %$res) { 3510 while (my ($name, $info) = each %$res) {
3255 if (defined $info->{type}) { 3511 if (defined $info->{type}) {
3256 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3512 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3257 my $data;
3258 3513
3259 if ($info->{type} & 1) { 3514 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3260 # prepend meta info
3261
3262 my $meta = $enc->encode ({
3263 name => $name,
3264 %{ $info->{meta} || {} },
3265 });
3266
3267 $data = pack "(w/a*)*", $meta, $info->{data};
3268 } else {
3269 $data = $info->{data};
3270 }
3271
3272 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3273 cf::face::set_type $idx, $info->{type}; 3515 cf::face::set_type $idx, $info->{type};
3274 } else { 3516 } else {
3275 $RESOURCE{$name} = $info; 3517 $RESOURCE{$name} = $info; # unused
3276 } 3518 }
3277 3519
3278 cf::cede_to_tick; 3520 cf::cede_to_tick;
3279 } 3521 }
3280 } 3522 }
3281 3523
3282 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3524 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3283 3525
3284 1 3526 1
3285} 3527}
3286
3287cf::global->attach (on_resource_update => sub {
3288 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3289 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3290
3291 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3292 my $sound = $soundconf->{compat}[$_]
3293 or next;
3294
3295 my $face = cf::face::find "sound/$sound->[1]";
3296 cf::sound::set $sound->[0] => $face;
3297 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3298 }
3299
3300 while (my ($k, $v) = each %{$soundconf->{event}}) {
3301 my $face = cf::face::find "sound/$v";
3302 cf::sound::set $k => $face;
3303 }
3304 }
3305});
3306 3528
3307register_exticmd fx_want => sub { 3529register_exticmd fx_want => sub {
3308 my ($ns, $want) = @_; 3530 my ($ns, $want) = @_;
3309 3531
3310 while (my ($k, $v) = each %$want) { 3532 while (my ($k, $v) = each %$want) {
3349sub reload_treasures { 3571sub reload_treasures {
3350 load_resource_file "$DATADIR/treasures" 3572 load_resource_file "$DATADIR/treasures"
3351 or die "unable to load treasurelists\n"; 3573 or die "unable to load treasurelists\n";
3352} 3574}
3353 3575
3576sub reload_sound {
3577 trace "loading sound config from $DATADIR/sound\n";
3578
3579 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3580
3581 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3582 my $sound = $soundconf->{compat}[$_]
3583 or next;
3584
3585 my $face = cf::face::find "sound/$sound->[1]";
3586 cf::sound::set $sound->[0] => $face;
3587 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3588 }
3589
3590 while (my ($k, $v) = each %{$soundconf->{event}}) {
3591 my $face = cf::face::find "sound/$v";
3592 cf::sound::set $k => $face;
3593 }
3594}
3595
3354sub reload_resources { 3596sub reload_resources {
3355 warn "reloading resource files...\n"; 3597 trace "reloading resource files...\n";
3356 3598
3599 reload_exp_table;
3600 reload_materials;
3357 reload_facedata; 3601 reload_facedata;
3602 reload_sound;
3358 reload_archetypes; 3603 reload_archetypes;
3359 reload_regions; 3604 reload_regions;
3360 reload_treasures; 3605 reload_treasures;
3361 3606
3362 warn "finished reloading resource files\n"; 3607 trace "finished reloading resource files\n";
3363} 3608}
3364 3609
3365sub reload_config { 3610sub reload_config {
3366 open my $fh, "<:utf8", "$CONFDIR/config" 3611 trace "reloading config file...\n";
3367 or return;
3368 3612
3369 local $/; 3613 my $config = load_file "$CONFDIR/config";
3370 *CFG = YAML::Load <$fh>; 3614 utf8::decode $config;
3615 *CFG = decode_yaml $config;
3371 3616
3372 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3617 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3373 3618
3374 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3619 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3375 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3620 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3376 3621
3377 if (exists $CFG{mlockall}) { 3622 if (exists $CFG{mlockall}) {
3400 3645
3401 seek $fh, 0, 0; 3646 seek $fh, 0, 0;
3402 print $fh $$; 3647 print $fh $$;
3403} 3648}
3404 3649
3650sub main_loop {
3651 trace "EV::loop starting\n";
3652 if (1) {
3653 EV::loop;
3654 }
3655 trace "EV::loop returned\n";
3656 goto &main_loop unless $REALLY_UNLOOP;
3657}
3658
3405sub main { 3659sub main {
3406 cf::init_globals; # initialise logging 3660 cf::init_globals; # initialise logging
3407 3661
3408 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3662 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3409 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3663 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3410 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3664 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3411 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3665 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3412
3413 cf::init_experience;
3414 cf::init_anim;
3415 cf::init_attackmess;
3416 cf::init_dynamic;
3417 cf::init_block;
3418 3666
3419 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3667 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3420 3668
3421 # we must not ever block the main coroutine 3669 # we must not ever block the main coroutine
3422 local $Coro::idle = sub { 3670 local $Coro::idle = sub {
3428 }; 3676 };
3429 3677
3430 evthread_start IO::AIO::poll_fileno; 3678 evthread_start IO::AIO::poll_fileno;
3431 3679
3432 cf::sync_job { 3680 cf::sync_job {
3681 cf::incloader::init ();
3682
3683 cf::init_anim;
3684 cf::init_attackmess;
3685 cf::init_dynamic;
3686
3687 cf::load_settings;
3688
3433 reload_resources; 3689 reload_resources;
3434 reload_config; 3690 reload_config;
3435 db_init; 3691 db_init;
3436 3692
3437 cf::load_settings;
3438 cf::load_materials;
3439 cf::init_uuid; 3693 cf::init_uuid;
3440 cf::init_signals; 3694 cf::init_signals;
3441 cf::init_commands;
3442 cf::init_skills; 3695 cf::init_skills;
3443 3696
3444 cf::init_beforeplay; 3697 cf::init_beforeplay;
3445 3698
3446 atomic; 3699 atomic;
3448 load_extensions; 3701 load_extensions;
3449 3702
3450 utime time, time, $RUNTIMEFILE; 3703 utime time, time, $RUNTIMEFILE;
3451 3704
3452 # no (long-running) fork's whatsoever before this point(!) 3705 # no (long-running) fork's whatsoever before this point(!)
3706 use POSIX ();
3453 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3707 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3454 3708
3455 (pop @POST_INIT)->(0) while @POST_INIT; 3709 cf::_post_init 0;
3456 }; 3710 };
3457 3711
3458 EV::loop; 3712 cf::object::thawer::errors_are_fatal 0;
3713 info "parse errors in files are no longer fatal from this point on.\n";
3714
3715 my $free_main; $free_main = EV::idle sub {
3716 undef $free_main;
3717 undef &main; # free gobs of memory :)
3718 };
3719
3720 goto &main_loop;
3459} 3721}
3460 3722
3461############################################################################# 3723#############################################################################
3462# initialisation and cleanup 3724# initialisation and cleanup
3463 3725
3464# install some emergency cleanup handlers 3726# install some emergency cleanup handlers
3465BEGIN { 3727BEGIN {
3466 our %SIGWATCHER = (); 3728 our %SIGWATCHER = ();
3467 for my $signal (qw(INT HUP TERM)) { 3729 for my $signal (qw(INT HUP TERM)) {
3468 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3730 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3469 cf::cleanup "SIG$signal"; 3731 cf::cleanup "SIG$signal";
3470 }; 3732 };
3471 } 3733 }
3472} 3734}
3473 3735
3474sub write_runtime_sync { 3736sub write_runtime_sync {
3737 my $t0 = AE::time;
3738
3475 # first touch the runtime file to show we are still running: 3739 # first touch the runtime file to show we are still running:
3476 # the fsync below can take a very very long time. 3740 # the fsync below can take a very very long time.
3477 3741
3478 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3742 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3479 3743
3480 my $guard = cf::lock_acquire "write_runtime"; 3744 my $guard = cf::lock_acquire "write_runtime";
3481 3745
3482 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3746 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3483 or return; 3747 or return;
3484 3748
3485 my $value = $cf::RUNTIME + 90 + 10; 3749 my $value = $cf::RUNTIME + 90 + 10;
3486 # 10 is the runtime save interval, for a monotonic clock 3750 # 10 is the runtime save interval, for a monotonic clock
3487 # 60 allows for the watchdog to kill the server. 3751 # 60 allows for the watchdog to kill the server.
3500 or return; 3764 or return;
3501 3765
3502 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3766 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3503 and return; 3767 and return;
3504 3768
3505 warn "runtime file written.\n"; 3769 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3506 3770
3507 1 3771 1
3508} 3772}
3509 3773
3510our $uuid_lock; 3774our $uuid_lock;
3522 or return; 3786 or return;
3523 3787
3524 my $value = uuid_seq uuid_cur; 3788 my $value = uuid_seq uuid_cur;
3525 3789
3526 unless ($value) { 3790 unless ($value) {
3527 warn "cowardly refusing to write zero uuid value!\n"; 3791 info "cowardly refusing to write zero uuid value!\n";
3528 return; 3792 return;
3529 } 3793 }
3530 3794
3531 my $value = uuid_str $value + $uuid_skip; 3795 my $value = uuid_str $value + $uuid_skip;
3532 $uuid_skip = 0; 3796 $uuid_skip = 0;
3542 or return; 3806 or return;
3543 3807
3544 aio_rename "$uuid~", $uuid 3808 aio_rename "$uuid~", $uuid
3545 and return; 3809 and return;
3546 3810
3547 warn "uuid file written ($value).\n"; 3811 trace "uuid file written ($value).\n";
3548 3812
3549 1 3813 1
3550 3814
3551} 3815}
3552 3816
3558} 3822}
3559 3823
3560sub emergency_save() { 3824sub emergency_save() {
3561 my $freeze_guard = cf::freeze_mainloop; 3825 my $freeze_guard = cf::freeze_mainloop;
3562 3826
3563 warn "enter emergency perl save\n"; 3827 info "emergency_perl_save: enter\n";
3828
3829 # this is a trade-off: we want to be very quick here, so
3830 # save all maps without fsync, and later call a global sync
3831 # (which in turn might be very very slow)
3832 local $USE_FSYNC = 0;
3564 3833
3565 cf::sync_job { 3834 cf::sync_job {
3835 cf::write_runtime_sync; # external watchdog should not bark
3836
3566 # use a peculiar iteration method to avoid tripping on perl 3837 # use a peculiar iteration method to avoid tripping on perl
3567 # refcount bugs in for. also avoids problems with players 3838 # refcount bugs in for. also avoids problems with players
3568 # and maps saved/destroyed asynchronously. 3839 # and maps saved/destroyed asynchronously.
3569 warn "begin emergency player save\n"; 3840 info "emergency_perl_save: begin player save\n";
3570 for my $login (keys %cf::PLAYER) { 3841 for my $login (keys %cf::PLAYER) {
3571 my $pl = $cf::PLAYER{$login} or next; 3842 my $pl = $cf::PLAYER{$login} or next;
3572 $pl->valid or next; 3843 $pl->valid or next;
3573 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3844 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3574 $pl->save; 3845 $pl->save;
3575 } 3846 }
3576 warn "end emergency player save\n"; 3847 info "emergency_perl_save: end player save\n";
3577 3848
3578 warn "begin emergency map save\n"; 3849 cf::write_runtime_sync; # external watchdog should not bark
3850
3851 info "emergency_perl_save: begin map save\n";
3579 for my $path (keys %cf::MAP) { 3852 for my $path (keys %cf::MAP) {
3580 my $map = $cf::MAP{$path} or next; 3853 my $map = $cf::MAP{$path} or next;
3581 $map->valid or next; 3854 $map->valid or next;
3582 $map->save; 3855 $map->save;
3583 } 3856 }
3584 warn "end emergency map save\n"; 3857 info "emergency_perl_save: end map save\n";
3585 3858
3586 warn "begin emergency database checkpoint\n"; 3859 cf::write_runtime_sync; # external watchdog should not bark
3860
3861 info "emergency_perl_save: begin database checkpoint\n";
3587 BDB::db_env_txn_checkpoint $DB_ENV; 3862 BDB::db_env_txn_checkpoint $DB_ENV;
3588 warn "end emergency database checkpoint\n"; 3863 info "emergency_perl_save: end database checkpoint\n";
3589 3864
3590 warn "begin write uuid\n"; 3865 info "emergency_perl_save: begin write uuid\n";
3591 write_uuid_sync 1; 3866 write_uuid_sync 1;
3592 warn "end write uuid\n"; 3867 info "emergency_perl_save: end write uuid\n";
3868
3869 cf::write_runtime_sync; # external watchdog should not bark
3870
3871 trace "emergency_perl_save: syncing database to disk";
3872 BDB::db_env_txn_checkpoint $DB_ENV;
3873
3874 info "emergency_perl_save: starting sync\n";
3875 IO::AIO::aio_sync sub {
3876 info "emergency_perl_save: finished sync\n";
3877 };
3878
3879 cf::write_runtime_sync; # external watchdog should not bark
3880
3881 trace "emergency_perl_save: flushing outstanding aio requests";
3882 while (IO::AIO::nreqs || BDB::nreqs) {
3883 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3884 }
3885
3886 cf::write_runtime_sync; # external watchdog should not bark
3593 }; 3887 };
3594 3888
3595 warn "leave emergency perl save\n"; 3889 info "emergency_perl_save: leave\n";
3596} 3890}
3597 3891
3598sub post_cleanup { 3892sub post_cleanup {
3599 my ($make_core) = @_; 3893 my ($make_core) = @_;
3600 3894
3895 IO::AIO::flush;
3896
3601 warn Carp::longmess "post_cleanup backtrace" 3897 error Carp::longmess "post_cleanup backtrace"
3602 if $make_core; 3898 if $make_core;
3603 3899
3604 my $fh = pidfile; 3900 my $fh = pidfile;
3605 unlink $PIDFILE if <$fh> == $$; 3901 unlink $PIDFILE if <$fh> == $$;
3606} 3902}
3626 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3922 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3627 for my $name (keys %$leaf_symtab) { 3923 for my $name (keys %$leaf_symtab) {
3628 _gv_clear *{"$pkg$name"}; 3924 _gv_clear *{"$pkg$name"};
3629# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3925# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3630 } 3926 }
3631 warn "cleared package $pkg\n";#d#
3632} 3927}
3633 3928
3634sub do_reload_perl() { 3929sub do_reload_perl() {
3635 # can/must only be called in main 3930 # can/must only be called in main
3636 if ($Coro::current != $Coro::main) { 3931 unless (in_main) {
3637 warn "can only reload from main coroutine"; 3932 error "can only reload from main coroutine";
3638 return; 3933 return;
3639 } 3934 }
3640 3935
3641 return if $RELOAD++; 3936 return if $RELOAD++;
3642 3937
3938 my $t1 = AE::time;
3939
3643 while ($RELOAD) { 3940 while ($RELOAD) {
3644 warn "reloading..."; 3941 cf::get_slot 0.1, -1, "reload_perl";
3942 info "perl_reload: reloading...";
3645 3943
3646 warn "entering sync_job"; 3944 trace "perl_reload: entering sync_job";
3647 3945
3648 cf::sync_job { 3946 cf::sync_job {
3649 cf::write_runtime_sync; # external watchdog should not bark
3650 cf::emergency_save; 3947 #cf::emergency_save;
3651 cf::write_runtime_sync; # external watchdog should not bark
3652 3948
3653 warn "syncing database to disk";
3654 BDB::db_env_txn_checkpoint $DB_ENV;
3655
3656 # if anything goes wrong in here, we should simply crash as we already saved
3657
3658 warn "flushing outstanding aio requests";
3659 while (IO::AIO::nreqs || BDB::nreqs) {
3660 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3661 }
3662
3663 warn "cancelling all extension coros"; 3949 trace "perl_reload: cancelling all extension coros";
3664 $_->cancel for values %EXT_CORO; 3950 $_->cancel for values %EXT_CORO;
3665 %EXT_CORO = (); 3951 %EXT_CORO = ();
3666 3952
3667 warn "removing commands"; 3953 trace "perl_reload: removing commands";
3668 %COMMAND = (); 3954 %COMMAND = ();
3669 3955
3670 warn "removing ext/exti commands"; 3956 trace "perl_reload: removing ext/exti commands";
3671 %EXTCMD = (); 3957 %EXTCMD = ();
3672 %EXTICMD = (); 3958 %EXTICMD = ();
3673 3959
3674 warn "unloading/nuking all extensions"; 3960 trace "perl_reload: unloading/nuking all extensions";
3675 for my $pkg (@EXTS) { 3961 for my $pkg (@EXTS) {
3676 warn "... unloading $pkg"; 3962 trace "... unloading $pkg";
3677 3963
3678 if (my $cb = $pkg->can ("unload")) { 3964 if (my $cb = $pkg->can ("unload")) {
3679 eval { 3965 eval {
3680 $cb->($pkg); 3966 $cb->($pkg);
3681 1 3967 1
3682 } or warn "$pkg unloaded, but with errors: $@"; 3968 } or error "$pkg unloaded, but with errors: $@";
3683 } 3969 }
3684 3970
3685 warn "... clearing $pkg"; 3971 trace "... clearing $pkg";
3686 clear_package $pkg; 3972 clear_package $pkg;
3687 } 3973 }
3688 3974
3689 warn "unloading all perl modules loaded from $LIBDIR"; 3975 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3690 while (my ($k, $v) = each %INC) { 3976 while (my ($k, $v) = each %INC) {
3691 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3977 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3692 3978
3693 warn "... unloading $k"; 3979 trace "... unloading $k";
3694 delete $INC{$k}; 3980 delete $INC{$k};
3695 3981
3696 $k =~ s/\.pm$//; 3982 $k =~ s/\.pm$//;
3697 $k =~ s/\//::/g; 3983 $k =~ s/\//::/g;
3698 3984
3701 } 3987 }
3702 3988
3703 clear_package $k; 3989 clear_package $k;
3704 } 3990 }
3705 3991
3706 warn "getting rid of safe::, as good as possible"; 3992 trace "perl_reload: getting rid of safe::, as good as possible";
3707 clear_package "safe::$_" 3993 clear_package "safe::$_"
3708 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3994 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3709 3995
3710 warn "unloading cf.pm \"a bit\""; 3996 trace "perl_reload: unloading cf.pm \"a bit\"";
3711 delete $INC{"cf.pm"}; 3997 delete $INC{"cf.pm"};
3712 delete $INC{"cf/pod.pm"}; 3998 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3713 3999
3714 # don't, removes xs symbols, too, 4000 # don't, removes xs symbols, too,
3715 # and global variables created in xs 4001 # and global variables created in xs
3716 #clear_package __PACKAGE__; 4002 #clear_package __PACKAGE__;
3717 4003
3718 warn "unload completed, starting to reload now"; 4004 info "perl_reload: unload completed, starting to reload now";
3719 4005
3720 warn "reloading cf.pm"; 4006 trace "perl_reload: reloading cf.pm";
3721 require cf; 4007 require cf;
3722 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4008 cf::_connect_to_perl_1;
3723 4009
3724 warn "loading config and database again"; 4010 trace "perl_reload: loading config and database again";
3725 cf::reload_config; 4011 cf::reload_config;
3726 4012
3727 warn "loading extensions"; 4013 trace "perl_reload: loading extensions";
3728 cf::load_extensions; 4014 cf::load_extensions;
3729 4015
4016 if ($REATTACH_ON_RELOAD) {
3730 warn "reattaching attachments to objects/players"; 4017 trace "perl_reload: reattaching attachments to objects/players";
3731 _global_reattach; # objects, sockets 4018 _global_reattach; # objects, sockets
3732 warn "reattaching attachments to maps"; 4019 trace "perl_reload: reattaching attachments to maps";
3733 reattach $_ for values %MAP; 4020 reattach $_ for values %MAP;
3734 warn "reattaching attachments to players"; 4021 trace "perl_reload: reattaching attachments to players";
3735 reattach $_ for values %PLAYER; 4022 reattach $_ for values %PLAYER;
4023 }
3736 4024
3737 warn "running post_load"; 4025 cf::_post_init 1;
3738 (pop @POST_INIT)->(1) while @POST_INIT;
3739 4026
3740 warn "leaving sync_job"; 4027 trace "perl_reload: leaving sync_job";
3741 4028
3742 1 4029 1
3743 } or do { 4030 } or do {
3744 warn $@; 4031 error $@;
3745 cf::cleanup "error while reloading, exiting."; 4032 cf::cleanup "perl_reload: error, exiting.";
3746 }; 4033 };
3747 4034
3748 warn "reloaded";
3749 --$RELOAD; 4035 --$RELOAD;
3750 } 4036 }
4037
4038 $t1 = AE::time - $t1;
4039 info "perl_reload: completed in ${t1}s\n";
3751}; 4040};
3752 4041
3753our $RELOAD_WATCHER; # used only during reload 4042our $RELOAD_WATCHER; # used only during reload
3754 4043
3755sub reload_perl() { 4044sub reload_perl() {
3756 # doing reload synchronously and two reloads happen back-to-back, 4045 # doing reload synchronously and two reloads happen back-to-back,
3757 # coro crashes during coro_state_free->destroy here. 4046 # coro crashes during coro_state_free->destroy here.
3758 4047
4048 $RELOAD_WATCHER ||= cf::async {
4049 Coro::AIO::aio_wait cache_extensions;
4050
3759 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 4051 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3760 do_reload_perl; 4052 do_reload_perl;
3761 undef $RELOAD_WATCHER; 4053 undef $RELOAD_WATCHER;
4054 };
3762 }; 4055 };
3763} 4056}
3764 4057
3765register_command "reload" => sub { 4058register_command "reload" => sub {
3766 my ($who, $arg) = @_; 4059 my ($who, $arg) = @_;
3772 reload_perl; 4065 reload_perl;
3773 }; 4066 };
3774 } 4067 }
3775}; 4068};
3776 4069
3777unshift @INC, $LIBDIR; 4070#############################################################################
3778 4071
3779my $bug_warning = 0; 4072my $bug_warning = 0;
3780 4073
3781our @WAIT_FOR_TICK; 4074our @WAIT_FOR_TICK;
3782our @WAIT_FOR_TICK_BEGIN; 4075our @WAIT_FOR_TICK_BEGIN;
3783 4076
3784sub wait_for_tick { 4077sub wait_for_tick() {
3785 return if tick_inhibit || $Coro::current == $Coro::main; 4078 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3786 4079
3787 my $signal = new Coro::Signal; 4080 my $signal = new Coro::Signal;
3788 push @WAIT_FOR_TICK, $signal; 4081 push @WAIT_FOR_TICK, $signal;
3789 $signal->wait; 4082 $signal->wait;
3790} 4083}
3791 4084
3792sub wait_for_tick_begin { 4085sub wait_for_tick_begin() {
3793 return if tick_inhibit || $Coro::current == $Coro::main; 4086 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3794 4087
3795 my $signal = new Coro::Signal; 4088 my $signal = new Coro::Signal;
3796 push @WAIT_FOR_TICK_BEGIN, $signal; 4089 push @WAIT_FOR_TICK_BEGIN, $signal;
3797 $signal->wait; 4090 $signal->wait;
3798} 4091}
3804 return; 4097 return;
3805 } 4098 }
3806 4099
3807 cf::server_tick; # one server iteration 4100 cf::server_tick; # one server iteration
3808 4101
4102 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4103
3809 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4104 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3810 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4105 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3811 Coro::async_pool { 4106 Coro::async_pool {
3812 $Coro::current->{desc} = "runtime saver"; 4107 $Coro::current->{desc} = "runtime saver";
3813 write_runtime_sync 4108 write_runtime_sync
3814 or warn "ERROR: unable to write runtime file: $!"; 4109 or error "ERROR: unable to write runtime file: $!";
3815 }; 4110 };
3816 } 4111 }
3817 4112
3818 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4113 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3819 $sig->send; 4114 $sig->send;
3827 4122
3828 if (0) { 4123 if (0) {
3829 if ($NEXT_TICK) { 4124 if ($NEXT_TICK) {
3830 my $jitter = $TICK_START - $NEXT_TICK; 4125 my $jitter = $TICK_START - $NEXT_TICK;
3831 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4126 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3832 warn "jitter $JITTER\n";#d# 4127 debug "jitter $JITTER\n";#d#
3833 } 4128 }
3834 } 4129 }
3835} 4130}
3836 4131
3837{ 4132{
3838 # configure BDB 4133 # configure BDB
3839 4134
3840 BDB::min_parallel 8; 4135 BDB::min_parallel 16;
3841 BDB::max_poll_reqs $TICK * 0.1; 4136 BDB::max_poll_reqs $TICK * 0.1;
3842 $AnyEvent::BDB::WATCHER->priority (1); 4137 $AnyEvent::BDB::WATCHER->priority (1);
3843 4138
3844 unless ($DB_ENV) { 4139 unless ($DB_ENV) {
3845 $DB_ENV = BDB::db_env_create; 4140 $DB_ENV = BDB::db_env_create;
3882 IO::AIO::min_parallel 8; 4177 IO::AIO::min_parallel 8;
3883 IO::AIO::max_poll_time $TICK * 0.1; 4178 IO::AIO::max_poll_time $TICK * 0.1;
3884 undef $AnyEvent::AIO::WATCHER; 4179 undef $AnyEvent::AIO::WATCHER;
3885} 4180}
3886 4181
3887my $_log_backtrace; 4182our $_log_backtrace;
4183our $_log_backtrace_last;
3888 4184
3889sub _log_backtrace { 4185sub _log_backtrace {
3890 my ($msg, @addr) = @_; 4186 my ($msg, @addr) = @_;
3891 4187
3892 $msg =~ s/\n//; 4188 $msg =~ s/\n$//;
3893 4189
4190 if ($_log_backtrace_last eq $msg) {
4191 LOG llevInfo, "[ABT] $msg\n";
4192 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3894 # limit the # of concurrent backtraces 4193 # limit the # of concurrent backtraces
3895 if ($_log_backtrace < 2) { 4194 } elsif ($_log_backtrace < 2) {
4195 $_log_backtrace_last = $msg;
3896 ++$_log_backtrace; 4196 ++$_log_backtrace;
3897 my $perl_bt = Carp::longmess $msg; 4197 my $perl_bt = Carp::longmess $msg;
3898 async { 4198 async {
3899 $Coro::current->{desc} = "abt $msg"; 4199 $Coro::current->{desc} = "abt $msg";
3900 4200
3920 LOG llevInfo, "[ABT] $_\n" for @bt; 4220 LOG llevInfo, "[ABT] $_\n" for @bt;
3921 --$_log_backtrace; 4221 --$_log_backtrace;
3922 }; 4222 };
3923 } else { 4223 } else {
3924 LOG llevInfo, "[ABT] $msg\n"; 4224 LOG llevInfo, "[ABT] $msg\n";
3925 LOG llevInfo, "[ABT] [suppressed]\n"; 4225 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3926 } 4226 }
3927} 4227}
3928 4228
3929# load additional modules 4229# load additional modules
3930use cf::pod; 4230require "cf/$_.pm" for @EXTRA_MODULES;
4231cf::_connect_to_perl_2;
3931 4232
3932END { cf::emergency_save } 4233END { cf::emergency_save }
3933 4234
39341 42351
3935 4236

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines