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.449 by root, Sat Sep 20 00:09:27 2008 UTC vs.
Revision 1.560 by root, Fri Apr 22 02:03:12 2011 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use common::sense;
25use utf8;
26use strict "vars", "subs";
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
35use Carp ();
36 36
37use Guard ();
37use Coro (); 38use Coro ();
38use Coro::State; 39use Coro::State;
39use Coro::Handle; 40use Coro::Handle;
40use Coro::EV; 41use Coro::EV;
41use Coro::AnyEvent; 42use Coro::AnyEvent;
42use Coro::Timer; 43use Coro::Timer;
43use Coro::Signal; 44use Coro::Signal;
44use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
45use Coro::AnyEvent; 47use Coro::AnyEvent;
46use Coro::AIO; 48use Coro::AIO;
47use Coro::BDB 1.6; 49use Coro::BDB 1.6;
48use Coro::Storable; 50use Coro::Storable;
49use Coro::Util (); 51use Coro::Util ();
50 52
51use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
52use BDB (); 54use BDB ();
53use Data::Dumper; 55use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 56use Fcntl;
56use YAML (); 57use YAML::XS ();
57use IO::AIO (); 58use IO::AIO ();
58use Time::HiRes; 59use Time::HiRes;
59use Compress::LZF; 60use Compress::LZF;
60use Digest::MD5 (); 61use Digest::MD5 ();
61 62
70 71
71# make sure c-lzf reinitialises itself 72# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
73Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
74 75
76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
78
75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
76 82
77our %COMMAND = (); 83our %COMMAND = ();
78our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
79 85
80our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
81our %EXTCMD = (); 87our %EXTCMD = ();
82our %EXTICMD = (); 88our %EXTICMD = ();
83our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
84our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
85 91
86our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
87our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
88 96
89our $CONFDIR = confdir; 97our $CONFDIR = confdir;
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;
127 145
128our $LOAD; # a number between 0 (idle) and 1 (too many objects) 146our $LOAD; # a number between 0 (idle) and 1 (too many objects)
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
150
151our @POST_INIT;
152
153our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
154our $REALLY_UNLOOP; # never set to true, please :)
132 155
133binmode STDOUT; 156binmode STDOUT;
134binmode STDERR; 157binmode STDERR;
135 158
136# read virtual server time, if available 159# read virtual server time, if available
138 open my $fh, "<", $RUNTIMEFILE 161 open my $fh, "<", $RUNTIMEFILE
139 or die "unable to read $RUNTIMEFILE file: $!"; 162 or die "unable to read $RUNTIMEFILE file: $!";
140 $RUNTIME = <$fh> + 0.; 163 $RUNTIME = <$fh> + 0.;
141} 164}
142 165
166eval "sub TICK() { $TICK } 1" or die;
167
143mkdir $_ 168mkdir $_
144 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 169 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
145 170
146our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
147 172
148sub 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::"} };
149 189
150############################################################################# 190#############################################################################
151 191
152=head2 GLOBAL VARIABLES 192=head2 GLOBAL VARIABLES
153 193
195from wherever your confdir points to. 235from wherever your confdir points to.
196 236
197=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
198 238
199These 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
200returns 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
201per 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.
202 242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
247
203=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
204 249
205This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
206C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 251C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
207that call. 252that call.
208 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
209=back 260=back
210 261
211=cut 262=cut
212 263
213BEGIN { 264sub error(@) { LOG llevError, join "", @_ }
214 *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 {
215 my $msg = join "", @_; 271 my $msg = join "", @_;
216 272
217 $msg .= "\n" 273 $msg .= "\n"
218 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
219 275
220 $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;
221 277
222 LOG llevError, $msg; 278 LOG llevWarn, $msg;
223 }; 279};
224}
225 280
226$Coro::State::DIEHOOK = sub { 281$Coro::State::DIEHOOK = sub {
227 return unless $^S eq 0; # "eq", not "==" 282 return unless $^S eq 0; # "eq", not "=="
228 283
229 if ($Coro::current == $Coro::main) {#d# 284 error Carp::longmess $_[0];
285
286 if (in_main) {#d#
230 warn "DIEHOOK called in main context, Coro bug?\n";#d# 287 error "DIEHOOK called in main context, Coro bug?\n";#d#
231 return;#d# 288 return;#d#
232 }#d# 289 }#d#
233 290
234 # kill coroutine otherwise 291 # kill coroutine otherwise
235 warn Carp::longmess $_[0];
236 Coro::terminate 292 Coro::terminate
237}; 293};
238
239$SIG{__DIE__} = sub { }; #d#?
240 294
241@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 295@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
242@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 296@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
243@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 297@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
244@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 298@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
258)) { 312)) {
259 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
260} 314}
261 315
262$EV::DIED = sub { 316$EV::DIED = sub {
263 warn "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
264}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
265 324
266############################################################################# 325#############################################################################
267 326
268=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
269 328
290 $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;
291 $d 350 $d
292 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
293} 352}
294 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
295=item $ref = cf::decode_json $json 368=item $ref = cf::decode_json $json
296 369
297Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
298 371
299=item $json = cf::encode_json $ref 372=item $json = cf::encode_json $ref
305our $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
306 379
307sub encode_json($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
308sub decode_json($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
309 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
414=item cf::post_init { BLOCK }
415
416Execute the given codeblock, I<after> all extensions have been (re-)loaded,
417but I<before> the server starts ticking again.
418
419The codeblock will have a single boolean argument to indicate whether this
420is a reload or not.
421
422=cut
423
424sub post_init(&) {
425 push @POST_INIT, shift;
426}
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
310=item cf::lock_wait $string 445=item cf::lock_wait $string
311 446
312Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
313 448
314=item my $lock = cf::lock_acquire $string 449=item my $lock = cf::lock_acquire $string
315 450
316Wait 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
317a 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,
318for example when the coroutine gets canceled), the lock is automatically 453for example when the coroutine gets canceled), the lock is automatically
319returned. 454returned.
320 455
321Locks 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
322deadlocked coro. 457deadlocked coro.
328 463
329Return 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.
330 465
331=cut 466=cut
332 467
333our %LOCK; 468our $LOCKS = new Coro::SemaphoreSet;
334our %LOCKER;#d#
335 469
336sub lock_wait($) { 470sub lock_wait($) {
337 my ($key) = @_; 471 $LOCKS->wait ($_[0]);
338
339 if ($LOCKER{$key} == $Coro::current) {#d#
340 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
341 return;#d#
342 }#d#
343
344 # wait for lock, if any
345 while ($LOCK{$key}) {
346 push @{ $LOCK{$key} }, $Coro::current;
347 Coro::schedule;
348 }
349} 472}
350 473
351sub lock_acquire($) { 474sub lock_acquire($) {
352 my ($key) = @_; 475 $LOCKS->guard ($_[0])
353
354 # wait, to be sure we are not locked
355 lock_wait $key;
356
357 $LOCK{$key} = [];
358 $LOCKER{$key} = $Coro::current;#d#
359
360 Coro::guard {
361 delete $LOCKER{$key};#d#
362 # wake up all waiters, to be on the safe side
363 $_->ready for @{ delete $LOCK{$key} };
364 }
365} 476}
366 477
367sub lock_active($) { 478sub lock_active($) {
368 my ($key) = @_; 479 $LOCKS->count ($_[0]) < 1
369
370 ! ! $LOCK{$key}
371} 480}
372 481
373sub freeze_mainloop { 482sub freeze_mainloop {
374 tick_inhibit_inc; 483 tick_inhibit_inc;
375 484
376 Coro::guard \&tick_inhibit_dec; 485 &Guard::guard (\&tick_inhibit_dec);
377} 486}
378 487
379=item cf::periodic $interval, $cb 488=item cf::periodic $interval, $cb
380 489
381Like 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
382get spread over timer. 491get spread over time.
383 492
384=cut 493=cut
385 494
386sub periodic($$) { 495sub periodic($$) {
387 my ($interval, $cb) = @_; 496 my ($interval, $cb) = @_;
391 EV::periodic $start, $interval, 0, $cb 500 EV::periodic $start, $interval, 0, $cb
392} 501}
393 502
394=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
395 504
396Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
397This 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
398of 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.
399 512
400The 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
401used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
402 515
403Useful for short background jobs. 516Useful for short background jobs.
404 517
405=cut 518=cut
406 519
407our @SLOT_QUEUE; 520our @SLOT_QUEUE;
408our $SLOT_QUEUE; 521our $SLOT_QUEUE;
522our $SLOT_DECAY = 0.9;
409 523
410$SLOT_QUEUE->cancel if $SLOT_QUEUE; 524$SLOT_QUEUE->cancel if $SLOT_QUEUE;
411$SLOT_QUEUE = Coro::async { 525$SLOT_QUEUE = Coro::async {
412 $Coro::current->desc ("timeslot manager"); 526 $Coro::current->desc ("timeslot manager");
413 527
414 my $signal = new Coro::Signal; 528 my $signal = new Coro::Signal;
529 my $busy;
415 530
416 while () { 531 while () {
417 next_job: 532 next_job:
533
418 my $avail = cf::till_tick; 534 my $avail = cf::till_tick;
419 if ($avail > 0.01) { 535
420 for (0 .. $#SLOT_QUEUE) { 536 for (0 .. $#SLOT_QUEUE) {
421 if ($SLOT_QUEUE[$_][0] < $avail) { 537 if ($SLOT_QUEUE[$_][0] <= $avail) {
538 $busy = 0;
422 my $job = splice @SLOT_QUEUE, $_, 1, (); 539 my $job = splice @SLOT_QUEUE, $_, 1, ();
423 $job->[2]->send; 540 $job->[2]->send;
424 Coro::cede; 541 Coro::cede;
425 goto next_job; 542 goto next_job;
426 } 543 } else {
544 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
427 } 545 }
428 } 546 }
429 547
430 if (@SLOT_QUEUE) { 548 if (@SLOT_QUEUE) {
431 # 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
432 push @cf::WAIT_FOR_TICK, $signal; 550 push @cf::WAIT_FOR_TICK, $signal;
433 $signal->wait; 551 $signal->wait;
434 } else { 552 } else {
553 $busy = 0;
435 Coro::schedule; 554 Coro::schedule;
436 } 555 }
437 } 556 }
438}; 557};
439 558
440sub get_slot($;$$) { 559sub get_slot($;$$) {
441 return if tick_inhibit || $Coro::current == $Coro::main; 560 return if tick_inhibit || $Coro::current == $Coro::main;
442 561
443 my ($time, $pri, $name) = @_; 562 my ($time, $pri, $name) = @_;
444 563
445 $time = $TICK * .6 if $time > $TICK * .6; 564 $time = clamp $time, 0.01, $TICK * .6;
565
446 my $sig = new Coro::Signal; 566 my $sig = new Coro::Signal;
447 567
448 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 568 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
449 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 569 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
450 $SLOT_QUEUE->ready; 570 $SLOT_QUEUE->ready;
476=cut 596=cut
477 597
478sub sync_job(&) { 598sub sync_job(&) {
479 my ($job) = @_; 599 my ($job) = @_;
480 600
481 if ($Coro::current == $Coro::main) { 601 if (in_main) {
482 my $time = EV::time; 602 my $time = AE::time;
483 603
484 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
485 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
486 606
487 LOG llevError, Carp::longmess "sync job";#d# 607 #LOG llevError, Carp::longmess "sync job";#d#
488 608
489 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
490 610
491 my $busy = 1; 611 my $busy = 1;
492 my @res; 612 my @res;
493 613
494 (async { 614 (async {
495 $Coro::current->desc ("sync job coro"); 615 $Coro::current->desc ("sync job coro");
496 @res = eval { $job->() }; 616 @res = eval { $job->() };
497 warn $@ if $@; 617 error $@ if $@;
498 undef $busy; 618 undef $busy;
499 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
500 620
501 while ($busy) { 621 while ($busy) {
502 if (Coro::nready) { 622 if (Coro::nready) {
504 } else { 624 } else {
505 EV::loop EV::LOOP_ONESHOT; 625 EV::loop EV::LOOP_ONESHOT;
506 } 626 }
507 } 627 }
508 628
509 my $time = EV::time - $time; 629 my $time = AE::time - $time;
510 630
511 $TICK_START += $time; # do not account sync jobs to server load 631 $TICK_START += $time; # do not account sync jobs to server load
512 632
513 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
514 } else { 634 } else {
536 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
537 657
538 $coro 658 $coro
539} 659}
540 660
541=item fork_call { }, $args 661=item fork_call { }, @args
542 662
543Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
544process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
545Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
546never block itself or use any form of event handling. 666never block itself or use any form of event handling.
547 667
548=cut 668=cut
549 669
670sub post_fork {
671 reset_signals;
672}
673
550sub fork_call(&@) { 674sub fork_call(&@) {
551 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
552 676
553 # 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,
554 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
555 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
556 680
557 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
558 reset_signals; 682 cf::post_fork;
559 &$cb 683 &$cb
560 }, @args; 684 } @args;
561 685
562 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 )
563} 698}
564 699
565=item $coin = coin_from_name $name 700=item $coin = coin_from_name $name
566 701
567=cut 702=cut
604within each server. 739within each server.
605 740
606=cut 741=cut
607 742
608sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
609 my ($name) = @_; 747 my ($name) = @_;
610 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
611 749
612 eval { 750 eval {
613 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
623} 761}
624 762
625our $DB; 763our $DB;
626 764
627sub db_init { 765sub db_init {
628 cf::sync_job {
629 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
630 };
631} 767}
632 768
633sub db_get($$) { 769sub db_get($$) {
634 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
635 771
636 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
637 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
638 776
639 $! ? () 777 $! ? ()
640 : $data 778 : $data
641 }
642} 779}
643 780
644sub db_put($$$) { 781sub db_put($$$) {
645 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
646 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
674 811
675 my @data; 812 my @data;
676 my $md5; 813 my $md5;
677 814
678 for (0 .. $#$src) { 815 for (0 .. $#$src) {
679 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
680 or Carp::croak "$src->[$_]: $!";
681 } 817 }
682 818
683 # if processing is expensive, check 819 # if processing is expensive, check
684 # checksum first 820 # checksum first
685 if (1) { 821 if (1) {
702 838
703 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
704 my $data = $process->(\@data); 840 my $data = $process->(\@data);
705 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
706 842
707 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
708 844
709 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
710 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
711 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
712 848
722 858
723=cut 859=cut
724 860
725sub datalog($@) { 861sub datalog($@) {
726 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
727 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
728} 864}
729 865
730=back 866=back
731 867
732=cut 868=cut
927 1063
928 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
929 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
930 1066
931 } elsif (ref $type) { 1067 } elsif (ref $type) {
932 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
933 1069
934 } else { 1070 } else {
935 shift @arg; 1071 shift @arg;
936 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
937 } 1073 }
938 } 1074 }
939} 1075}
940 1076
941sub _object_attach { 1077sub _object_attach {
951 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
952 } 1088 }
953 1089
954 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
955 } else { 1091 } else {
956 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
957 } 1093 }
958 1094
959 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
960} 1096}
961 1097
1020 1156
1021 for (@$callbacks) { 1157 for (@$callbacks) {
1022 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
1023 1159
1024 if ($@) { 1160 if ($@) {
1025 warn "$@";
1026 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1027 override; 1162 override;
1028 } 1163 }
1029 1164
1030 return 1 if $override; 1165 return 1 if $override;
1031 } 1166 }
1110 for (@$attach) { 1245 for (@$attach) {
1111 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
1112 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
1113 } 1248 }
1114 } else { 1249 } else {
1115 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
1116 } 1251 }
1117 } 1252 }
1118} 1253}
1119 1254
1120cf::attachable->attach ( 1255cf::attachable->attach (
1147 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1148 1283
1149 sync_job { 1284 sync_job {
1150 if (length $$rdata) { 1285 if (length $$rdata) {
1151 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1152 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1153 $decname, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1154 1290
1155 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1156 aio_chmod $fh, SAVE_MODE; 1292 aio_chmod $fh, SAVE_MODE;
1157 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1158 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 }
1159 aio_close $fh; 1298 aio_close $fh;
1160 1299
1161 if (@$objs) { 1300 if (@$objs) {
1162 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) {
1163 aio_chmod $fh, SAVE_MODE; 1302 aio_chmod $fh, SAVE_MODE;
1164 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1303 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1165 aio_write $fh, 0, (length $data), $data, 0; 1304 aio_write $fh, 0, (length $data), $data, 0;
1166 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 }
1167 aio_close $fh; 1309 aio_close $fh;
1168 aio_rename "$filename.pst~", "$filename.pst"; 1310 aio_rename "$filename.pst~", "$filename.pst";
1169 } 1311 }
1170 } else { 1312 } else {
1171 aio_unlink "$filename.pst"; 1313 aio_unlink "$filename.pst";
1172 } 1314 }
1173 1315
1174 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1317
1318 $filename =~ s%/[^/]+$%%;
1319 aio_pathsync $filename if $cf::USE_FSYNC;
1175 } else { 1320 } else {
1176 warn "FATAL: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1177 } 1322 }
1178 } else { 1323 } else {
1179 aio_unlink $filename; 1324 aio_unlink $filename;
1180 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1181 } 1326 }
1205 my $st = eval { Coro::Storable::thaw $av }; 1350 my $st = eval { Coro::Storable::thaw $av };
1206 $av = $st->{objs}; 1351 $av = $st->{objs};
1207 } 1352 }
1208 1353
1209 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1210 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1211 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1212 1358
1213 ($data, $av) 1359 ($data, $av)
1214} 1360}
1215 1361
1216=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
1272 my ($name, $cb) = @_; 1418 my ($name, $cb) = @_;
1273 1419
1274 $EXTICMD{$name} = $cb; 1420 $EXTICMD{$name} = $cb;
1275} 1421}
1276 1422
1423use File::Glob ();
1424
1277cf::player->attach ( 1425cf::player->attach (
1278 on_command => sub { 1426 on_unknown_command => sub {
1279 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1280 1428
1281 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1282 or return; 1430 or return;
1283 1431
1306 1454
1307 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1308 if $reply; 1456 if $reply;
1309 1457
1310 } else { 1458 } else {
1311 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1312 } 1460 }
1313 1461
1314 cf::override; 1462 cf::override;
1315 }, 1463 },
1316); 1464);
1317 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
1318sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1319 cf::sync_job { 1482 cf::sync_job {
1320 my %todo; 1483 my %todo;
1321 1484
1322 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1323 next unless -r $path; 1486 next unless -r $path;
1341 1504
1342 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1343 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1344 1507
1345 $ext{source} = 1508 $ext{source} =
1346 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1347 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1348 . $source 1511 . $source
1349 . "\n};\n1"; 1512 . "\n};\n1";
1350 1513
1351 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
1352 } 1515 }
1353 1516
1517 my $pass = 0;
1354 my %done; 1518 my %done;
1355 while (%todo) { 1519 while (%todo) {
1356 my $progress; 1520 my $progress;
1357 1521
1522 ++$pass;
1523
1524 ext:
1358 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
1359 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1360 goto skip 1527 next ext
1361 unless exists $done{$_}; 1528 unless exists $done{$_};
1362 } 1529 }
1363 1530
1364 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1365 1532
1366 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
1367 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
1368 : "$v->{base}: extension inactive.\n";
1369 1537
1370 if (exists $v->{meta}{mandatory}) {
1371 warn $msg;
1372 cf::cleanup "mandatory extension failed to load, exiting."; 1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1373 } 1539 if exists $v->{meta}{mandatory};
1374 1540
1375 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;
1376 } 1550 }
1377
1378 $done{$k} = delete $todo{$k};
1379 push @EXTS, $v->{pkg};
1380 $progress = 1;
1381 } 1551 }
1382 1552
1383 skip: 1553 unless ($progress) {
1384 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1385 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 }
1386 } 1561 }
1387 }; 1562 };
1388} 1563}
1389 1564
1390############################################################################# 1565#############################################################################
1444 1619
1445sub exists($) { 1620sub exists($) {
1446 my ($login) = @_; 1621 my ($login) = @_;
1447 1622
1448 $cf::PLAYER{$login} 1623 $cf::PLAYER{$login}
1449 or cf::sync_job { !aio_stat path $login } 1624 or !aio_stat path $login
1450} 1625}
1451 1626
1452sub find($) { 1627sub find($) {
1453 return $cf::PLAYER{$_[0]} || do { 1628 return $cf::PLAYER{$_[0]} || do {
1454 my $login = $_[0]; 1629 my $login = $_[0];
1474 $cf::PLAYER{$login} = $pl 1649 $cf::PLAYER{$login} = $pl
1475 } 1650 }
1476 } 1651 }
1477} 1652}
1478 1653
1654cf::player->attach (
1655 on_load => sub {
1656 my ($pl, $path) = @_;
1657
1658 # restore slots saved in save, below
1659 my $slots = delete $pl->{_slots};
1660
1661 $pl->ob->current_weapon ($slots->[0]);
1662 $pl->combat_ob ($slots->[1]);
1663 $pl->ranged_ob ($slots->[2]);
1664 },
1665);
1666
1479sub save($) { 1667sub save($) {
1480 my ($pl) = @_; 1668 my ($pl) = @_;
1481 1669
1482 return if $pl->{deny_save}; 1670 return if $pl->{deny_save};
1483 1671
1488 1676
1489 aio_mkdir playerdir $pl, 0770; 1677 aio_mkdir playerdir $pl, 0770;
1490 $pl->{last_save} = $cf::RUNTIME; 1678 $pl->{last_save} = $cf::RUNTIME;
1491 1679
1492 cf::get_slot 0.01; 1680 cf::get_slot 0.01;
1681
1682 # save slots, to be restored later
1683 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1493 1684
1494 $pl->save_pl ($path); 1685 $pl->save_pl ($path);
1495 cf::cede_to_tick; 1686 cf::cede_to_tick;
1496} 1687}
1497 1688
1531 my $name = $pl->ob->name; 1722 my $name = $pl->ob->name;
1532 1723
1533 $pl->{deny_save} = 1; 1724 $pl->{deny_save} = 1;
1534 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1725 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1535 1726
1536 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1727 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1537 $pl->deactivate; 1728 $pl->deactivate;
1729
1538 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1730 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1539 $pl->ob->check_score;
1540 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1731 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1732 ext::highscore::check ($pl->ob);
1733
1541 $pl->ns->destroy if $pl->ns; 1734 $pl->ns->destroy if $pl->ns;
1542 1735
1543 my $path = playerdir $pl; 1736 my $path = playerdir $pl;
1544 my $temp = "$path~$cf::RUNTIME~deleting~"; 1737 my $temp = "$path~$cf::RUNTIME~deleting~";
1545 aio_rename $path, $temp; 1738 aio_rename $path, $temp;
1599 \@logins 1792 \@logins
1600} 1793}
1601 1794
1602=item $player->maps 1795=item $player->maps
1603 1796
1797=item cf::player::maps $login
1798
1604Returns an arrayref of map paths that are private for this 1799Returns an arrayref of map paths that are private for this
1605player. May block. 1800player. May block.
1606 1801
1607=cut 1802=cut
1608 1803
1670=cut 1865=cut
1671 1866
1672sub find_by_path($) { 1867sub find_by_path($) {
1673 my ($path) = @_; 1868 my ($path) = @_;
1674 1869
1870 $path =~ s/^~[^\/]*//; # skip ~login
1871
1675 my ($match, $specificity); 1872 my ($match, $specificity);
1676 1873
1677 for my $region (list) { 1874 for my $region (list) {
1678 if ($region->{match} && $path =~ $region->{match}) { 1875 if ($region->{match} && $path =~ $region->{match}) {
1679 ($match, $specificity) = ($region, $region->specificity) 1876 ($match, $specificity) = ($region, $region->specificity)
1707sub generate_random_map { 1904sub generate_random_map {
1708 my ($self, $rmp) = @_; 1905 my ($self, $rmp) = @_;
1709 1906
1710 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1907 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1711 1908
1712 # mit "rum" bekleckern, nicht
1713 $self->_create_random_map ( 1909 $self->_create_random_map ($rmp);
1714 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1715 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1716 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1717 $rmp->{exit_on_final_map},
1718 $rmp->{xsize}, $rmp->{ysize},
1719 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1720 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1721 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1722 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1723 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1724 (cf::region::find $rmp->{region}), $rmp->{custom}
1725 )
1726} 1910}
1727 1911
1728=item cf::map->register ($regex, $prio) 1912=item cf::map->register ($regex, $prio)
1729 1913
1730Register a handler for the map path matching the given regex at the 1914Register a handler for the map path matching the given regex at the
1735 1919
1736sub register { 1920sub register {
1737 my (undef, $regex, $prio) = @_; 1921 my (undef, $regex, $prio) = @_;
1738 my $pkg = caller; 1922 my $pkg = caller;
1739 1923
1740 no strict;
1741 push @{"$pkg\::ISA"}, __PACKAGE__; 1924 push @{"$pkg\::ISA"}, __PACKAGE__;
1742 1925
1743 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1926 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1744} 1927}
1745 1928
1746# also paths starting with '/' 1929# also paths starting with '/'
1747$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1930$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1748 1931
1749sub thawer_merge { 1932sub thawer_merge {
1750 my ($self, $merge) = @_; 1933 my ($self, $merge) = @_;
1751 1934
1752 # we have to keep some variables in memory intact 1935 # we have to keep some variables in memory intact
1757} 1940}
1758 1941
1759sub normalise { 1942sub normalise {
1760 my ($path, $base) = @_; 1943 my ($path, $base) = @_;
1761 1944
1762 $path = "$path"; # make sure its a string 1945 $path = "$path"; # make sure it's a string
1763 1946
1764 $path =~ s/\.map$//; 1947 $path =~ s/\.map$//;
1765 1948
1766 # map plan: 1949 # map plan:
1767 # 1950 #
1782 $base =~ s{[^/]+/?$}{}; 1965 $base =~ s{[^/]+/?$}{};
1783 $path = "$base/$path"; 1966 $path = "$base/$path";
1784 } 1967 }
1785 1968
1786 for ($path) { 1969 for ($path) {
1787 redo if s{//}{/};
1788 redo if s{/\.?/}{/}; 1970 redo if s{/\.?/}{/};
1789 redo if s{/[^/]+/\.\./}{/}; 1971 redo if s{/[^/]+/\.\./}{/};
1790 } 1972 }
1791 1973
1792 $path 1974 $path
1806 $self->init; # pass $1 etc. 1988 $self->init; # pass $1 etc.
1807 return $self; 1989 return $self;
1808 } 1990 }
1809 } 1991 }
1810 1992
1811 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1993 Carp::cluck "unable to resolve path '$path' (base '$base')";
1812 () 1994 ()
1813} 1995}
1814 1996
1815sub init { 1997sub init {
1816 my ($self) = @_; 1998 my ($self) = @_;
1848sub uniq_path { 2030sub uniq_path {
1849 my ($self) = @_; 2031 my ($self) = @_;
1850 2032
1851 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2033 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1852 "$UNIQUEDIR/$path" 2034 "$UNIQUEDIR/$path"
1853}
1854
1855# and all this just because we cannot iterate over
1856# all maps in C++...
1857sub change_all_map_light {
1858 my ($change) = @_;
1859
1860 $_->change_map_light ($change)
1861 for grep $_->outdoor, values %cf::MAP;
1862} 2035}
1863 2036
1864sub decay_objects { 2037sub decay_objects {
1865 my ($self) = @_; 2038 my ($self) = @_;
1866 2039
1948 2121
1949sub find; 2122sub find;
1950sub find { 2123sub find {
1951 my ($path, $origin) = @_; 2124 my ($path, $origin) = @_;
1952 2125
2126 cf::cede_to_tick;
2127
1953 $path = normalise $path, $origin && $origin->path; 2128 $path = normalise $path, $origin && $origin->path;
1954 2129
1955 cf::lock_wait "map_data:$path";#d#remove 2130 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1956 cf::lock_wait "map_find:$path"; 2131 my $guard2 = cf::lock_acquire "map_find:$path";
1957 2132
1958 $cf::MAP{$path} || do { 2133 $cf::MAP{$path} || do {
1959 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1960 my $guard2 = cf::lock_acquire "map_find:$path";
1961
1962 my $map = new_from_path cf::map $path 2134 my $map = new_from_path cf::map $path
1963 or return; 2135 or return;
1964 2136
1965 $map->{last_save} = $cf::RUNTIME; 2137 $map->{last_save} = $cf::RUNTIME;
1966 2138
1978 2150
1979 $cf::MAP{$path} = $map 2151 $cf::MAP{$path} = $map
1980 } 2152 }
1981} 2153}
1982 2154
1983sub pre_load { } 2155sub pre_load { }
1984sub post_load { } 2156#sub post_load { } # XS
1985 2157
1986sub load { 2158sub load {
1987 my ($self) = @_; 2159 my ($self) = @_;
1988 2160
1989 local $self->{deny_reset} = 1; # loading can take a long time 2161 local $self->{deny_reset} = 1; # loading can take a long time
2034 unless ($self->{deny_activate}) { 2206 unless ($self->{deny_activate}) {
2035 $self->decay_objects; 2207 $self->decay_objects;
2036 $self->fix_auto_apply; 2208 $self->fix_auto_apply;
2037 $self->update_buttons; 2209 $self->update_buttons;
2038 cf::cede_to_tick; 2210 cf::cede_to_tick;
2039 $self->set_darkness_map;
2040 cf::cede_to_tick;
2041 $self->activate; 2211 $self->activate;
2042 } 2212 }
2043 2213
2044 $self->{last_save} = $cf::RUNTIME; 2214 $self->{last_save} = $cf::RUNTIME;
2045 $self->last_access ($cf::RUNTIME); 2215 $self->last_access ($cf::RUNTIME);
2046 2216
2047 $self->in_memory (cf::MAP_ACTIVE); 2217 $self->in_memory (cf::MAP_ACTIVE);
2048 } 2218 }
2049 2219
2050 $self->post_load; 2220 $self->post_load;
2051}
2052 2221
2222 1
2223}
2224
2225# customize the map for a given player, i.e.
2226# return the _real_ map. used by e.g. per-player
2227# maps to change the path to ~playername/mappath
2053sub customise_for { 2228sub customise_for {
2054 my ($self, $ob) = @_; 2229 my ($self, $ob) = @_;
2055 2230
2056 return find "~" . $ob->name . "/" . $self->{path} 2231 return find "~" . $ob->name . "/" . $self->{path}
2057 if $self->per_player; 2232 if $self->per_player;
2073 or next; 2248 or next;
2074 $neigh = find $neigh, $map 2249 $neigh = find $neigh, $map
2075 or next; 2250 or next;
2076 $neigh->load; 2251 $neigh->load;
2077 2252
2253 # now find the diagonal neighbours
2078 push @neigh, 2254 push @neigh,
2079 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2255 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2080 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2256 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2081 } 2257 }
2082 2258
2089} 2265}
2090 2266
2091sub find_sync { 2267sub find_sync {
2092 my ($path, $origin) = @_; 2268 my ($path, $origin) = @_;
2093 2269
2094 cf::sync_job { find $path, $origin } 2270 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2271 if $Coro::current == $Coro::main;
2272
2273 find $path, $origin
2095} 2274}
2096 2275
2097sub do_load_sync { 2276sub do_load_sync {
2098 my ($map) = @_; 2277 my ($map) = @_;
2099 2278
2100 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2279 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2101 if $Coro::current == $Coro::main; 2280 if $Coro::current == $Coro::main;
2102 2281
2103 cf::sync_job { $map->load }; 2282 $map->load;
2104} 2283}
2105 2284
2106our %MAP_PREFETCH; 2285our %MAP_PREFETCH;
2107our $MAP_PREFETCHER = undef; 2286our $MAP_PREFETCHER = undef;
2108 2287
2134 $MAP_PREFETCHER->prio (6); 2313 $MAP_PREFETCHER->prio (6);
2135 2314
2136 () 2315 ()
2137} 2316}
2138 2317
2318# common code, used by both ->save and ->swapout
2139sub save { 2319sub _save {
2140 my ($self) = @_; 2320 my ($self) = @_;
2141
2142 my $lock = cf::lock_acquire "map_data:$self->{path}";
2143 2321
2144 $self->{last_save} = $cf::RUNTIME; 2322 $self->{last_save} = $cf::RUNTIME;
2145 2323
2146 return unless $self->dirty; 2324 return unless $self->dirty;
2147 2325
2167 } else { 2345 } else {
2168 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2346 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2169 } 2347 }
2170} 2348}
2171 2349
2350sub save {
2351 my ($self) = @_;
2352
2353 my $lock = cf::lock_acquire "map_data:$self->{path}";
2354
2355 $self->_save;
2356}
2357
2172sub swap_out { 2358sub swap_out {
2173 my ($self) = @_; 2359 my ($self) = @_;
2174 2360
2175 # save first because save cedes
2176 $self->save;
2177
2178 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2361 my $lock = cf::lock_acquire "map_data:$self->{path}";
2179 2362
2180 return if $self->players;
2181 return if $self->in_memory != cf::MAP_ACTIVE; 2363 return if $self->in_memory != cf::MAP_ACTIVE;
2182 return if $self->{deny_save}; 2364 return if $self->{deny_save};
2365 return if $self->players;
2183 2366
2367 # first deactivate the map and "unlink" it from the core
2368 $self->deactivate;
2369 $_->clear_links_to ($self) for values %cf::MAP;
2184 $self->in_memory (cf::MAP_SWAPPED); 2370 $self->in_memory (cf::MAP_SWAPPED);
2371
2372 # then atomically save
2373 $self->_save;
2374
2375 # then free the map
2376 $self->clear;
2377}
2378
2379sub reset_at {
2380 my ($self) = @_;
2381
2382 # TODO: safety, remove and allow resettable per-player maps
2383 return 1e99 if $self->{deny_reset};
2384
2385 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2386 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2387
2388 $time + $to
2389}
2390
2391sub should_reset {
2392 my ($self) = @_;
2393
2394 $self->reset_at <= $cf::RUNTIME
2395}
2396
2397sub reset {
2398 my ($self) = @_;
2399
2400 my $lock = cf::lock_acquire "map_data:$self->{path}";
2401
2402 return if $self->players;
2403
2404 cf::trace "resetting map ", $self->path, "\n";
2405
2406 $self->in_memory (cf::MAP_SWAPPED);
2407
2408 # need to save uniques path
2409 unless ($self->{deny_save}) {
2410 my $uniq = $self->uniq_path; utf8::encode $uniq;
2411
2412 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2413 if $uniq;
2414 }
2415
2416 delete $cf::MAP{$self->path};
2185 2417
2186 $self->deactivate; 2418 $self->deactivate;
2187 $_->clear_links_to ($self) for values %cf::MAP; 2419 $_->clear_links_to ($self) for values %cf::MAP;
2188 $self->clear; 2420 $self->clear;
2189}
2190
2191sub reset_at {
2192 my ($self) = @_;
2193
2194 # TODO: safety, remove and allow resettable per-player maps
2195 return 1e99 if $self->{deny_reset};
2196
2197 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2198 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2199
2200 $time + $to
2201}
2202
2203sub should_reset {
2204 my ($self) = @_;
2205
2206 $self->reset_at <= $cf::RUNTIME
2207}
2208
2209sub reset {
2210 my ($self) = @_;
2211
2212 my $lock = cf::lock_acquire "map_data:$self->{path}";
2213
2214 return if $self->players;
2215
2216 warn "resetting map ", $self->path;
2217
2218 $self->in_memory (cf::MAP_SWAPPED);
2219
2220 # need to save uniques path
2221 unless ($self->{deny_save}) {
2222 my $uniq = $self->uniq_path; utf8::encode $uniq;
2223
2224 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2225 if $uniq;
2226 }
2227
2228 delete $cf::MAP{$self->path};
2229
2230 $self->deactivate;
2231 $_->clear_links_to ($self) for values %cf::MAP;
2232 $self->clear;
2233 2421
2234 $self->unlink_save; 2422 $self->unlink_save;
2235 $self->destroy; 2423 $self->destroy;
2236} 2424}
2237 2425
2245 2433
2246 delete $cf::MAP{$self->path}; 2434 delete $cf::MAP{$self->path};
2247 2435
2248 $self->unlink_save; 2436 $self->unlink_save;
2249 2437
2250 bless $self, "cf::map"; 2438 bless $self, "cf::map::wrap";
2251 delete $self->{deny_reset}; 2439 delete $self->{deny_reset};
2252 $self->{deny_save} = 1; 2440 $self->{deny_save} = 1;
2253 $self->reset_timeout (1); 2441 $self->reset_timeout (1);
2254 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2442 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2255 2443
2312 : normalise $_ 2500 : normalise $_
2313 } @{ aio_readdir $UNIQUEDIR or [] } 2501 } @{ aio_readdir $UNIQUEDIR or [] }
2314 ] 2502 ]
2315} 2503}
2316 2504
2505=item cf::map::static_maps
2506
2507Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2508file in the shared directory excluding F</styles> and F</editor>). May
2509block.
2510
2511=cut
2512
2513sub static_maps() {
2514 my @dirs = "";
2515 my @maps;
2516
2517 while (@dirs) {
2518 my $dir = shift @dirs;
2519
2520 next if $dir eq "/styles" || $dir eq "/editor";
2521
2522 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2523 or return;
2524
2525 for (@$files) {
2526 s/\.map$// or next;
2527 utf8::decode $_;
2528 push @maps, "$dir/$_";
2529 }
2530
2531 push @dirs, map "$dir/$_", @$dirs;
2532 }
2533
2534 \@maps
2535}
2536
2317=back 2537=back
2318 2538
2319=head3 cf::object 2539=head3 cf::object
2320 2540
2321=cut 2541=cut
2386 2606
2387our $SAY_CHANNEL = { 2607our $SAY_CHANNEL = {
2388 id => "say", 2608 id => "say",
2389 title => "Map", 2609 title => "Map",
2390 reply => "say ", 2610 reply => "say ",
2391 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2611 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2392}; 2612};
2393 2613
2394our $CHAT_CHANNEL = { 2614our $CHAT_CHANNEL = {
2395 id => "chat", 2615 id => "chat",
2396 title => "Chat", 2616 title => "Chat",
2453 2673
2454Freezes the player and moves him/her to a special map (C<{link}>). 2674Freezes the player and moves him/her to a special map (C<{link}>).
2455 2675
2456The player should be reasonably safe there for short amounts of time (e.g. 2676The player should be reasonably safe there for short amounts of time (e.g.
2457for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2677for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2458though, as the palyer cannot control the character while it is on the link 2678though, as the player cannot control the character while it is on the link
2459map. 2679map.
2460 2680
2461Will never block. 2681Will never block.
2462 2682
2463=item $player_object->leave_link ($map, $x, $y) 2683=item $player_object->leave_link ($map, $x, $y)
2484sub cf::object::player::enter_link { 2704sub cf::object::player::enter_link {
2485 my ($self) = @_; 2705 my ($self) = @_;
2486 2706
2487 $self->deactivate_recursive; 2707 $self->deactivate_recursive;
2488 2708
2709 ++$self->{_link_recursion};
2710
2489 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2711 return if UNIVERSAL::isa $self->map, "ext::map_link";
2490 2712
2491 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2713 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2492 if $self->map && $self->map->{path} ne "{link}"; 2714 if $self->map && $self->map->{path} ne "{link}";
2493 2715
2494 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2716 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2495} 2717}
2496 2718
2497sub cf::object::player::leave_link { 2719sub cf::object::player::leave_link {
2498 my ($self, $map, $x, $y) = @_; 2720 my ($self, $map, $x, $y) = @_;
2499 2721
2516 ($x, $y) = (-1, -1) 2738 ($x, $y) = (-1, -1)
2517 unless (defined $x) && (defined $y); 2739 unless (defined $x) && (defined $y);
2518 2740
2519 # use -1 or undef as default coordinates, not 0, 0 2741 # use -1 or undef as default coordinates, not 0, 0
2520 ($x, $y) = ($map->enter_x, $map->enter_y) 2742 ($x, $y) = ($map->enter_x, $map->enter_y)
2521 if $x <=0 && $y <= 0; 2743 if $x <= 0 && $y <= 0;
2522 2744
2523 $map->load; 2745 $map->load;
2524 $map->load_neighbours; 2746 $map->load_neighbours;
2525 2747
2526 return unless $self->contr->active; 2748 return unless $self->contr->active;
2527 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2528 $self->activate_recursive;
2529 2749
2530 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2750 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2531 $self->enter_map ($map, $x, $y); 2751 if ($self->enter_map ($map, $x, $y)) {
2532} 2752 # entering was successful
2753 delete $self->{_link_recursion};
2754 # only activate afterwards, to support waiting in hooks
2755 $self->activate_recursive;
2756 }
2533 2757
2758}
2759
2534=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2760=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2535 2761
2536Moves the player to the given map-path and coordinates by first freezing 2762Moves the player to the given map-path and coordinates by first freezing
2537her, loading and preparing them map, calling the provided $check callback 2763her, loading and preparing them map, calling the provided $check callback
2538that has to return the map if sucecssful, and then unfreezes the player on 2764that has to return the map if sucecssful, and then unfreezes the player on
2539the new (success) or old (failed) map position. In either case, $done will 2765the new (success) or old (failed) map position. In either case, $done will
2546 2772
2547our $GOTOGEN; 2773our $GOTOGEN;
2548 2774
2549sub cf::object::player::goto { 2775sub cf::object::player::goto {
2550 my ($self, $path, $x, $y, $check, $done) = @_; 2776 my ($self, $path, $x, $y, $check, $done) = @_;
2777
2778 if ($self->{_link_recursion} >= $MAX_LINKS) {
2779 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2780 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2781 ($path, $x, $y) = @$EMERGENCY_POSITION;
2782 }
2551 2783
2552 # do generation counting so two concurrent goto's will be executed in-order 2784 # do generation counting so two concurrent goto's will be executed in-order
2553 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2785 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2554 2786
2555 $self->enter_link; 2787 $self->enter_link;
2579 my $map = eval { 2811 my $map = eval {
2580 my $map = defined $path ? cf::map::find $path : undef; 2812 my $map = defined $path ? cf::map::find $path : undef;
2581 2813
2582 if ($map) { 2814 if ($map) {
2583 $map = $map->customise_for ($self); 2815 $map = $map->customise_for ($self);
2584 $map = $check->($map) if $check && $map; 2816 $map = $check->($map, $x, $y, $self) if $check && $map;
2585 } else { 2817 } else {
2586 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2818 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2587 } 2819 }
2588 2820
2589 $map 2821 $map
2597 if ($gen == $self->{_goto_generation}) { 2829 if ($gen == $self->{_goto_generation}) {
2598 delete $self->{_goto_generation}; 2830 delete $self->{_goto_generation};
2599 $self->leave_link ($map, $x, $y); 2831 $self->leave_link ($map, $x, $y);
2600 } 2832 }
2601 2833
2602 $done->() if $done; 2834 $done->($self) if $done;
2603 })->prio (1); 2835 })->prio (1);
2604} 2836}
2605 2837
2606=item $player_object->enter_exit ($exit_object) 2838=item $player_object->enter_exit ($exit_object)
2607 2839
2700 $self->message ("Something went wrong deep within the deliantra server. " 2932 $self->message ("Something went wrong deep within the deliantra server. "
2701 . "I'll try to bring you back to the map you were before. " 2933 . "I'll try to bring you back to the map you were before. "
2702 . "Please report this to the dungeon master!", 2934 . "Please report this to the dungeon master!",
2703 cf::NDI_UNIQUE | cf::NDI_RED); 2935 cf::NDI_UNIQUE | cf::NDI_RED);
2704 2936
2705 warn "ERROR in enter_exit: $@"; 2937 error "ERROR in enter_exit: $@";
2706 $self->leave_link; 2938 $self->leave_link;
2707 } 2939 }
2708 })->prio (1); 2940 })->prio (1);
2709} 2941}
2710 2942
2722sub cf::client::send_drawinfo { 2954sub cf::client::send_drawinfo {
2723 my ($self, $text, $flags) = @_; 2955 my ($self, $text, $flags) = @_;
2724 2956
2725 utf8::encode $text; 2957 utf8::encode $text;
2726 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2958 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2959}
2960
2961=item $client->send_big_packet ($pkt)
2962
2963Like C<send_packet>, but tries to compress large packets, and fragments
2964them as required.
2965
2966=cut
2967
2968our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2969
2970sub cf::client::send_big_packet {
2971 my ($self, $pkt) = @_;
2972
2973 # try lzf for large packets
2974 $pkt = "lzf " . Compress::LZF::compress $pkt
2975 if 1024 <= length $pkt and $self->{can_lzf};
2976
2977 # split very large packets
2978 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2979 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2980 $pkt = "frag";
2981 }
2982
2983 $self->send_packet ($pkt);
2727} 2984}
2728 2985
2729=item $client->send_msg ($channel, $msg, $color, [extra...]) 2986=item $client->send_msg ($channel, $msg, $color, [extra...])
2730 2987
2731Send a drawinfo or msg packet to the client, formatting the msg for the 2988Send a drawinfo or msg packet to the client, formatting the msg for the
2735 2992
2736=cut 2993=cut
2737 2994
2738# non-persistent channels (usually the info channel) 2995# non-persistent channels (usually the info channel)
2739our %CHANNEL = ( 2996our %CHANNEL = (
2997 "c/motd" => {
2998 id => "infobox",
2999 title => "MOTD",
3000 reply => undef,
3001 tooltip => "The message of the day",
3002 },
2740 "c/identify" => { 3003 "c/identify" => {
2741 id => "infobox", 3004 id => "infobox",
2742 title => "Identify", 3005 title => "Identify",
2743 reply => undef, 3006 reply => undef,
2744 tooltip => "Items recently identified", 3007 tooltip => "Items recently identified",
2746 "c/examine" => { 3009 "c/examine" => {
2747 id => "infobox", 3010 id => "infobox",
2748 title => "Examine", 3011 title => "Examine",
2749 reply => undef, 3012 reply => undef,
2750 tooltip => "Signs and other items you examined", 3013 tooltip => "Signs and other items you examined",
3014 },
3015 "c/shopinfo" => {
3016 id => "infobox",
3017 title => "Shop Info",
3018 reply => undef,
3019 tooltip => "What your bargaining skill tells you about the shop",
2751 }, 3020 },
2752 "c/book" => { 3021 "c/book" => {
2753 id => "infobox", 3022 id => "infobox",
2754 title => "Book", 3023 title => "Book",
2755 reply => undef, 3024 reply => undef,
2771 id => "infobox", 3040 id => "infobox",
2772 title => "Body Parts", 3041 title => "Body Parts",
2773 reply => undef, 3042 reply => undef,
2774 tooltip => "Shows which body parts you posess and are available", 3043 tooltip => "Shows which body parts you posess and are available",
2775 }, 3044 },
3045 "c/statistics" => {
3046 id => "infobox",
3047 title => "Statistics",
3048 reply => undef,
3049 tooltip => "Shows your primary statistics",
3050 },
3051 "c/skills" => {
3052 id => "infobox",
3053 title => "Skills",
3054 reply => undef,
3055 tooltip => "Shows your experience per skill and item power",
3056 },
3057 "c/shopitems" => {
3058 id => "infobox",
3059 title => "Shop Items",
3060 reply => undef,
3061 tooltip => "Shows the items currently for sale in this shop",
3062 },
3063 "c/resistances" => {
3064 id => "infobox",
3065 title => "Resistances",
3066 reply => undef,
3067 tooltip => "Shows your resistances",
3068 },
3069 "c/pets" => {
3070 id => "infobox",
3071 title => "Pets",
3072 reply => undef,
3073 tooltip => "Shows information abotu your pets/a specific pet",
3074 },
3075 "c/perceiveself" => {
3076 id => "infobox",
3077 title => "Perceive Self",
3078 reply => undef,
3079 tooltip => "You gained detailed knowledge about yourself",
3080 },
2776 "c/uptime" => { 3081 "c/uptime" => {
2777 id => "infobox", 3082 id => "infobox",
2778 title => "Uptime", 3083 title => "Uptime",
2779 reply => undef, 3084 reply => undef,
2780 tooltip => "How long the server has been running since last restart", 3085 tooltip => "How long the server has been running since last restart",
2789 id => "party", 3094 id => "party",
2790 title => "Party", 3095 title => "Party",
2791 reply => "gsay ", 3096 reply => "gsay ",
2792 tooltip => "Messages and chat related to your party", 3097 tooltip => "Messages and chat related to your party",
2793 }, 3098 },
3099 "c/death" => {
3100 id => "death",
3101 title => "Death",
3102 reply => undef,
3103 tooltip => "Reason for and more info about your most recent death",
3104 },
3105 "c/say" => $SAY_CHANNEL,
3106 "c/chat" => $CHAT_CHANNEL,
2794); 3107);
2795 3108
2796sub cf::client::send_msg { 3109sub cf::client::send_msg {
2797 my ($self, $channel, $msg, $color, @extra) = @_; 3110 my ($self, $channel, $msg, $color, @extra) = @_;
2798 3111
2803 3116
2804 # check predefined channels, for the benefit of C 3117 # check predefined channels, for the benefit of C
2805 if ($CHANNEL{$channel}) { 3118 if ($CHANNEL{$channel}) {
2806 $channel = $CHANNEL{$channel}; 3119 $channel = $CHANNEL{$channel};
2807 3120
2808 $self->ext_msg (channel_info => $channel) 3121 $self->ext_msg (channel_info => $channel);
2809 if $self->can_msg;
2810
2811 $channel = $channel->{id}; 3122 $channel = $channel->{id};
2812 3123
2813 } elsif (ref $channel) { 3124 } elsif (ref $channel) {
2814 # send meta info to client, if not yet sent 3125 # send meta info to client, if not yet sent
2815 unless (exists $self->{channel}{$channel->{id}}) { 3126 unless (exists $self->{channel}{$channel->{id}}) {
2816 $self->{channel}{$channel->{id}} = $channel; 3127 $self->{channel}{$channel->{id}} = $channel;
2817 $self->ext_msg (channel_info => $channel) 3128 $self->ext_msg (channel_info => $channel);
2818 if $self->can_msg;
2819 } 3129 }
2820 3130
2821 $channel = $channel->{id}; 3131 $channel = $channel->{id};
2822 } 3132 }
2823 3133
2824 return unless @extra || length $msg; 3134 return unless @extra || length $msg;
2825 3135
2826 if ($self->can_msg) {
2827 # default colour, mask it out 3136 # default colour, mask it out
2828 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3137 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2829 if $color & cf::NDI_DEF; 3138 if $color & cf::NDI_DEF;
2830 3139
2831 my $pkt = "msg " 3140 my $pkt = "msg "
2832 . $self->{json_coder}->encode ( 3141 . $self->{json_coder}->encode (
2833 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3142 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2834 ); 3143 );
2835 3144
2836 # try lzf for large packets
2837 $pkt = "lzf " . Compress::LZF::compress $pkt
2838 if 1024 <= length $pkt and $self->{can_lzf};
2839
2840 # split very large packets
2841 if (8192 < length $pkt and $self->{can_lzf}) {
2842 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2843 $pkt = "frag";
2844 }
2845
2846 $self->send_packet ($pkt); 3145 $self->send_big_packet ($pkt);
2847 } else {
2848 if ($color >= 0) {
2849 # replace some tags by gcfclient-compatible ones
2850 for ($msg) {
2851 1 while
2852 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2853 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2854 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2855 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2856 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2857 }
2858
2859 $color &= cf::NDI_COLOR_MASK;
2860
2861 utf8::encode $msg;
2862
2863 if (0 && $msg =~ /\[/) {
2864 # COMMAND/INFO
2865 $self->send_packet ("drawextinfo $color 10 8 $msg")
2866 } else {
2867 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2868 $self->send_packet ("drawinfo $color $msg")
2869 }
2870 }
2871 }
2872} 3146}
2873 3147
2874=item $client->ext_msg ($type, @msg) 3148=item $client->ext_msg ($type, @msg)
2875 3149
2876Sends an ext event to the client. 3150Sends an ext event to the client.
2879 3153
2880sub cf::client::ext_msg($$@) { 3154sub cf::client::ext_msg($$@) {
2881 my ($self, $type, @msg) = @_; 3155 my ($self, $type, @msg) = @_;
2882 3156
2883 if ($self->extcmd == 2) { 3157 if ($self->extcmd == 2) {
2884 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3158 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2885 } elsif ($self->extcmd == 1) { # TODO: remove 3159 } elsif ($self->extcmd == 1) { # TODO: remove
2886 push @msg, msgtype => "event_$type"; 3160 push @msg, msgtype => "event_$type";
2887 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3161 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2888 } 3162 }
2889} 3163}
2890 3164
2891=item $client->ext_reply ($msgid, @msg) 3165=item $client->ext_reply ($msgid, @msg)
2892 3166
2896 3170
2897sub cf::client::ext_reply($$@) { 3171sub cf::client::ext_reply($$@) {
2898 my ($self, $id, @msg) = @_; 3172 my ($self, $id, @msg) = @_;
2899 3173
2900 if ($self->extcmd == 2) { 3174 if ($self->extcmd == 2) {
2901 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3175 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2902 } elsif ($self->extcmd == 1) { 3176 } elsif ($self->extcmd == 1) {
2903 #TODO: version 1, remove 3177 #TODO: version 1, remove
2904 unshift @msg, msgtype => "reply", msgid => $id; 3178 unshift @msg, msgtype => "reply", msgid => $id;
2905 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2906 } 3180 }
2907} 3181}
2908 3182
2909=item $success = $client->query ($flags, "text", \&cb) 3183=item $success = $client->query ($flags, "text", \&cb)
2910 3184
2981 3255
2982 $ns->ext_reply ($reply, @reply) 3256 $ns->ext_reply ($reply, @reply)
2983 if $reply; 3257 if $reply;
2984 3258
2985 } else { 3259 } else {
2986 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3260 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2987 } 3261 }
2988 3262
2989 cf::override; 3263 cf::override;
2990 }, 3264 },
2991); 3265);
3011 3285
3012 $coro 3286 $coro
3013} 3287}
3014 3288
3015cf::client->attach ( 3289cf::client->attach (
3016 on_destroy => sub { 3290 on_client_destroy => sub {
3017 my ($ns) = @_; 3291 my ($ns) = @_;
3018 3292
3019 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3293 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3020 }, 3294 },
3021); 3295);
3037our $safe_hole = new Safe::Hole; 3311our $safe_hole = new Safe::Hole;
3038 3312
3039$SIG{FPE} = 'IGNORE'; 3313$SIG{FPE} = 'IGNORE';
3040 3314
3041$safe->permit_only (Opcode::opset qw( 3315$safe->permit_only (Opcode::opset qw(
3042 :base_core :base_mem :base_orig :base_math 3316 :base_core :base_mem :base_orig :base_math :base_loop
3043 grepstart grepwhile mapstart mapwhile 3317 grepstart grepwhile mapstart mapwhile
3044 sort time 3318 sort time
3045)); 3319));
3046 3320
3047# here we export the classes and methods available to script code 3321# here we export the classes and methods available to script code
3051The following functions and methods are available within a safe environment: 3325The following functions and methods are available within a safe environment:
3052 3326
3053 cf::object 3327 cf::object
3054 contr pay_amount pay_player map x y force_find force_add destroy 3328 contr pay_amount pay_player map x y force_find force_add destroy
3055 insert remove name archname title slaying race decrease split 3329 insert remove name archname title slaying race decrease split
3330 value
3056 3331
3057 cf::object::player 3332 cf::object::player
3058 player 3333 player
3059 3334
3060 cf::player 3335 cf::player
3066=cut 3341=cut
3067 3342
3068for ( 3343for (
3069 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3344 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3070 insert remove inv nrof name archname title slaying race 3345 insert remove inv nrof name archname title slaying race
3071 decrease split destroy change_exp)], 3346 decrease split destroy change_exp value msg lore send_msg)],
3072 ["cf::object::player" => qw(player)], 3347 ["cf::object::player" => qw(player)],
3073 ["cf::player" => qw(peaceful)], 3348 ["cf::player" => qw(peaceful send_msg)],
3074 ["cf::map" => qw(trigger)], 3349 ["cf::map" => qw(trigger)],
3075) { 3350) {
3076 no strict 'refs';
3077 my ($pkg, @funs) = @$_; 3351 my ($pkg, @funs) = @$_;
3078 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3352 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3079 for @funs; 3353 for @funs;
3080} 3354}
3081 3355
3096 3370
3097 my $qcode = $code; 3371 my $qcode = $code;
3098 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3372 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3099 $qcode =~ s/\n/\\n/g; 3373 $qcode =~ s/\n/\\n/g;
3100 3374
3375 %vars = (_dummy => 0) unless %vars;
3376
3377 my @res;
3101 local $_; 3378 local $_;
3102 local @safe::cf::_safe_eval_args = values %vars;
3103 3379
3104 my $eval = 3380 my $eval =
3105 "do {\n" 3381 "do {\n"
3106 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3382 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3107 . "#line 0 \"{$qcode}\"\n" 3383 . "#line 0 \"{$qcode}\"\n"
3108 . $code 3384 . $code
3109 . "\n}" 3385 . "\n}"
3110 ; 3386 ;
3111 3387
3388 if ($CFG{safe_eval}) {
3112 sub_generation_inc; 3389 sub_generation_inc;
3390 local @safe::cf::_safe_eval_args = values %vars;
3113 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3391 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3114 sub_generation_inc; 3392 sub_generation_inc;
3393 } else {
3394 local @cf::_safe_eval_args = values %vars;
3395 @res = wantarray ? eval eval : scalar eval $eval;
3396 }
3115 3397
3116 if ($@) { 3398 if ($@) {
3117 warn "$@"; 3399 warn "$@",
3118 warn "while executing safe code '$code'\n"; 3400 "while executing safe code '$code'\n",
3119 warn "with arguments " . (join " ", %vars) . "\n"; 3401 "with arguments " . (join " ", %vars) . "\n";
3120 } 3402 }
3121 3403
3122 wantarray ? @res : $res[0] 3404 wantarray ? @res : $res[0]
3123} 3405}
3124 3406
3138=cut 3420=cut
3139 3421
3140sub register_script_function { 3422sub register_script_function {
3141 my ($fun, $cb) = @_; 3423 my ($fun, $cb) = @_;
3142 3424
3143 no strict 'refs'; 3425 $fun = "safe::$fun" if $CFG{safe_eval};
3144 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3426 *$fun = $safe_hole->wrap ($cb);
3145} 3427}
3146 3428
3147=back 3429=back
3148 3430
3149=cut 3431=cut
3158 # for this (global event?) 3440 # for this (global event?)
3159 %ext::player_env::MUSIC_FACE_CACHE = (); 3441 %ext::player_env::MUSIC_FACE_CACHE = ();
3160 3442
3161 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3443 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3162 3444
3163 warn "loading facedata from $path\n"; 3445 trace "loading facedata from $path\n";
3164 3446
3165 my $facedata; 3447 my $facedata = decode_storable load_file $path;
3166 0 < aio_load $path, $facedata
3167 or die "$path: $!";
3168
3169 $facedata = Coro::Storable::thaw $facedata;
3170 3448
3171 $facedata->{version} == 2 3449 $facedata->{version} == 2
3172 or cf::cleanup "$path: version mismatch, cannot proceed."; 3450 or cf::cleanup "$path: version mismatch, cannot proceed.";
3173 3451
3174 # patch in the exptable 3452 # patch in the exptable
3453 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3175 $facedata->{resource}{"res/exp_table"} = { 3454 $facedata->{resource}{"res/exp_table"} = {
3176 type => FT_RSRC, 3455 type => FT_RSRC,
3177 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3456 data => $exp_table,
3457 hash => (Digest::MD5::md5 $exp_table),
3178 }; 3458 };
3179 cf::cede_to_tick; 3459 cf::cede_to_tick;
3180 3460
3181 { 3461 {
3182 my $faces = $facedata->{faceinfo}; 3462 my $faces = $facedata->{faceinfo};
3184 while (my ($face, $info) = each %$faces) { 3464 while (my ($face, $info) = each %$faces) {
3185 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3465 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3186 3466
3187 cf::face::set_visibility $idx, $info->{visibility}; 3467 cf::face::set_visibility $idx, $info->{visibility};
3188 cf::face::set_magicmap $idx, $info->{magicmap}; 3468 cf::face::set_magicmap $idx, $info->{magicmap};
3189 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3469 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3190 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3470 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3471 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3191 3472
3192 cf::cede_to_tick; 3473 cf::cede_to_tick;
3193 } 3474 }
3194 3475
3195 while (my ($face, $info) = each %$faces) { 3476 while (my ($face, $info) = each %$faces) {
3200 3481
3201 if (my $smooth = cf::face::find $info->{smooth}) { 3482 if (my $smooth = cf::face::find $info->{smooth}) {
3202 cf::face::set_smooth $idx, $smooth; 3483 cf::face::set_smooth $idx, $smooth;
3203 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3484 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3204 } else { 3485 } else {
3205 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3486 error "smooth face '$info->{smooth}' not found for face '$face'";
3206 } 3487 }
3207 3488
3208 cf::cede_to_tick; 3489 cf::cede_to_tick;
3209 } 3490 }
3210 } 3491 }
3219 3500
3220 cf::anim::invalidate_all; # d'oh 3501 cf::anim::invalidate_all; # d'oh
3221 } 3502 }
3222 3503
3223 { 3504 {
3224 # TODO: for gcfclient pleasure, we should give resources
3225 # that gcfclient doesn't grok a >10000 face index.
3226 my $res = $facedata->{resource}; 3505 my $res = $facedata->{resource};
3227 3506
3228 while (my ($name, $info) = each %$res) { 3507 while (my ($name, $info) = each %$res) {
3229 if (defined $info->{type}) { 3508 if (defined $info->{type}) {
3230 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3509 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3231 my $data;
3232 3510
3233 if ($info->{type} & 1) { 3511 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3234 # prepend meta info
3235
3236 my $meta = $enc->encode ({
3237 name => $name,
3238 %{ $info->{meta} || {} },
3239 });
3240
3241 $data = pack "(w/a*)*", $meta, $info->{data};
3242 } else {
3243 $data = $info->{data};
3244 }
3245
3246 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3247 cf::face::set_type $idx, $info->{type}; 3512 cf::face::set_type $idx, $info->{type};
3248 } else { 3513 } else {
3249 $RESOURCE{$name} = $info; 3514 $RESOURCE{$name} = $info; # unused
3250 } 3515 }
3251 3516
3252 cf::cede_to_tick; 3517 cf::cede_to_tick;
3253 } 3518 }
3254 } 3519 }
3255 3520
3256 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3521 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3257 3522
3258 1 3523 1
3259} 3524}
3260
3261cf::global->attach (on_resource_update => sub {
3262 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3263 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3264
3265 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3266 my $sound = $soundconf->{compat}[$_]
3267 or next;
3268
3269 my $face = cf::face::find "sound/$sound->[1]";
3270 cf::sound::set $sound->[0] => $face;
3271 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3272 }
3273
3274 while (my ($k, $v) = each %{$soundconf->{event}}) {
3275 my $face = cf::face::find "sound/$v";
3276 cf::sound::set $k => $face;
3277 }
3278 }
3279});
3280 3525
3281register_exticmd fx_want => sub { 3526register_exticmd fx_want => sub {
3282 my ($ns, $want) = @_; 3527 my ($ns, $want) = @_;
3283 3528
3284 while (my ($k, $v) = each %$want) { 3529 while (my ($k, $v) = each %$want) {
3323sub reload_treasures { 3568sub reload_treasures {
3324 load_resource_file "$DATADIR/treasures" 3569 load_resource_file "$DATADIR/treasures"
3325 or die "unable to load treasurelists\n"; 3570 or die "unable to load treasurelists\n";
3326} 3571}
3327 3572
3573sub reload_sound {
3574 trace "loading sound config from $DATADIR/sound\n";
3575
3576 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3577
3578 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3579 my $sound = $soundconf->{compat}[$_]
3580 or next;
3581
3582 my $face = cf::face::find "sound/$sound->[1]";
3583 cf::sound::set $sound->[0] => $face;
3584 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3585 }
3586
3587 while (my ($k, $v) = each %{$soundconf->{event}}) {
3588 my $face = cf::face::find "sound/$v";
3589 cf::sound::set $k => $face;
3590 }
3591}
3592
3328sub reload_resources { 3593sub reload_resources {
3329 warn "reloading resource files...\n"; 3594 trace "reloading resource files...\n";
3330 3595
3596 reload_exp_table;
3597 reload_materials;
3331 reload_facedata; 3598 reload_facedata;
3599 reload_sound;
3332 reload_archetypes; 3600 reload_archetypes;
3333 reload_regions; 3601 reload_regions;
3334 reload_treasures; 3602 reload_treasures;
3335 3603
3336 warn "finished reloading resource files\n"; 3604 trace "finished reloading resource files\n";
3337}
3338
3339sub init {
3340 my $guard = freeze_mainloop;
3341
3342 evthread_start IO::AIO::poll_fileno;
3343
3344 reload_resources;
3345} 3605}
3346 3606
3347sub reload_config { 3607sub reload_config {
3348 open my $fh, "<:utf8", "$CONFDIR/config" 3608 trace "reloading config file...\n";
3349 or return;
3350 3609
3351 local $/; 3610 my $config = load_file "$CONFDIR/config";
3352 *CFG = YAML::Load <$fh>; 3611 utf8::decode $config;
3612 *CFG = decode_yaml $config;
3353 3613
3354 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3614 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3355 3615
3356 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3616 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3357 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3617 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3358 3618
3359 if (exists $CFG{mlockall}) { 3619 if (exists $CFG{mlockall}) {
3382 3642
3383 seek $fh, 0, 0; 3643 seek $fh, 0, 0;
3384 print $fh $$; 3644 print $fh $$;
3385} 3645}
3386 3646
3647sub main_loop {
3648 trace "EV::loop starting\n";
3649 if (1) {
3650 EV::loop;
3651 }
3652 trace "EV::loop returned\n";
3653 goto &main_loop unless $REALLY_UNLOOP;
3654}
3655
3387sub main { 3656sub main {
3388 atomic; 3657 cf::init_globals; # initialise logging
3658
3659 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3660 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3661 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3662 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3663
3664 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3389 3665
3390 # we must not ever block the main coroutine 3666 # we must not ever block the main coroutine
3391 local $Coro::idle = sub { 3667 local $Coro::idle = sub {
3392 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3668 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3393 (async { 3669 (async {
3394 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3670 $Coro::current->{desc} = "IDLE BUG HANDLER";
3395 EV::loop EV::LOOP_ONESHOT; 3671 EV::loop EV::LOOP_ONESHOT;
3396 })->prio (Coro::PRIO_MAX); 3672 })->prio (Coro::PRIO_MAX);
3397 }; 3673 };
3398 3674
3399 { 3675 evthread_start IO::AIO::poll_fileno;
3400 my $guard = freeze_mainloop; 3676
3677 cf::sync_job {
3678 cf::incloader::init ();
3679
3680 cf::init_anim;
3681 cf::init_attackmess;
3682 cf::init_dynamic;
3683
3684 cf::load_settings;
3685
3686 reload_resources;
3401 reload_config; 3687 reload_config;
3402 db_init; 3688 db_init;
3689
3690 cf::init_uuid;
3691 cf::init_signals;
3692 cf::init_skills;
3693
3694 cf::init_beforeplay;
3695
3696 atomic;
3697
3403 load_extensions; 3698 load_extensions;
3404 3699
3405 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3406 }
3407
3408 utime time, time, $RUNTIMEFILE; 3700 utime time, time, $RUNTIMEFILE;
3409 3701
3410 # no (long-running) fork's whatsoever before this point(!) 3702 # no (long-running) fork's whatsoever before this point(!)
3703 use POSIX ();
3411 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3704 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3412 3705
3413 EV::loop; 3706 cf::_post_init 0;
3707 };
3708
3709 cf::object::thawer::errors_are_fatal 0;
3710 info "parse errors in files are no longer fatal from this point on.\n";
3711
3712 my $free_main; $free_main = EV::idle sub {
3713 undef $free_main;
3714 undef &main; # free gobs of memory :)
3715 };
3716
3717 goto &main_loop;
3414} 3718}
3415 3719
3416############################################################################# 3720#############################################################################
3417# initialisation and cleanup 3721# initialisation and cleanup
3418 3722
3419# install some emergency cleanup handlers 3723# install some emergency cleanup handlers
3420BEGIN { 3724BEGIN {
3421 our %SIGWATCHER = (); 3725 our %SIGWATCHER = ();
3422 for my $signal (qw(INT HUP TERM)) { 3726 for my $signal (qw(INT HUP TERM)) {
3423 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3727 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3424 cf::cleanup "SIG$signal"; 3728 cf::cleanup "SIG$signal";
3425 }; 3729 };
3426 } 3730 }
3427} 3731}
3428 3732
3429sub write_runtime_sync { 3733sub write_runtime_sync {
3734 my $t0 = AE::time;
3735
3430 # first touch the runtime file to show we are still running: 3736 # first touch the runtime file to show we are still running:
3431 # the fsync below can take a very very long time. 3737 # the fsync below can take a very very long time.
3432 3738
3433 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3739 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3434 3740
3435 my $guard = cf::lock_acquire "write_runtime"; 3741 my $guard = cf::lock_acquire "write_runtime";
3436 3742
3437 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3743 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3438 or return; 3744 or return;
3439 3745
3440 my $value = $cf::RUNTIME + 90 + 10; 3746 my $value = $cf::RUNTIME + 90 + 10;
3441 # 10 is the runtime save interval, for a monotonic clock 3747 # 10 is the runtime save interval, for a monotonic clock
3442 # 60 allows for the watchdog to kill the server. 3748 # 60 allows for the watchdog to kill the server.
3455 or return; 3761 or return;
3456 3762
3457 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3763 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3458 and return; 3764 and return;
3459 3765
3460 warn "runtime file written.\n"; 3766 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3461 3767
3462 1 3768 1
3463} 3769}
3464 3770
3465our $uuid_lock; 3771our $uuid_lock;
3474 my $uuid = "$LOCALDIR/uuid"; 3780 my $uuid = "$LOCALDIR/uuid";
3475 3781
3476 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3782 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3477 or return; 3783 or return;
3478 3784
3479 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3785 my $value = uuid_seq uuid_cur;
3786
3787 unless ($value) {
3788 info "cowardly refusing to write zero uuid value!\n";
3789 return;
3790 }
3791
3792 my $value = uuid_str $value + $uuid_skip;
3480 $uuid_skip = 0; 3793 $uuid_skip = 0;
3481 3794
3482 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3795 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3483 and return; 3796 and return;
3484 3797
3490 or return; 3803 or return;
3491 3804
3492 aio_rename "$uuid~", $uuid 3805 aio_rename "$uuid~", $uuid
3493 and return; 3806 and return;
3494 3807
3495 warn "uuid file written ($value).\n"; 3808 trace "uuid file written ($value).\n";
3496 3809
3497 1 3810 1
3498 3811
3499} 3812}
3500 3813
3506} 3819}
3507 3820
3508sub emergency_save() { 3821sub emergency_save() {
3509 my $freeze_guard = cf::freeze_mainloop; 3822 my $freeze_guard = cf::freeze_mainloop;
3510 3823
3511 warn "enter emergency perl save\n"; 3824 info "emergency_perl_save: enter\n";
3825
3826 # this is a trade-off: we want to be very quick here, so
3827 # save all maps without fsync, and later call a global sync
3828 # (which in turn might be very very slow)
3829 local $USE_FSYNC = 0;
3512 3830
3513 cf::sync_job { 3831 cf::sync_job {
3832 cf::write_runtime_sync; # external watchdog should not bark
3833
3514 # use a peculiar iteration method to avoid tripping on perl 3834 # use a peculiar iteration method to avoid tripping on perl
3515 # refcount bugs in for. also avoids problems with players 3835 # refcount bugs in for. also avoids problems with players
3516 # and maps saved/destroyed asynchronously. 3836 # and maps saved/destroyed asynchronously.
3517 warn "begin emergency player save\n"; 3837 info "emergency_perl_save: begin player save\n";
3518 for my $login (keys %cf::PLAYER) { 3838 for my $login (keys %cf::PLAYER) {
3519 my $pl = $cf::PLAYER{$login} or next; 3839 my $pl = $cf::PLAYER{$login} or next;
3520 $pl->valid or next; 3840 $pl->valid or next;
3521 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3841 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3522 $pl->save; 3842 $pl->save;
3523 } 3843 }
3524 warn "end emergency player save\n"; 3844 info "emergency_perl_save: end player save\n";
3525 3845
3526 warn "begin emergency map save\n"; 3846 cf::write_runtime_sync; # external watchdog should not bark
3847
3848 info "emergency_perl_save: begin map save\n";
3527 for my $path (keys %cf::MAP) { 3849 for my $path (keys %cf::MAP) {
3528 my $map = $cf::MAP{$path} or next; 3850 my $map = $cf::MAP{$path} or next;
3529 $map->valid or next; 3851 $map->valid or next;
3530 $map->save; 3852 $map->save;
3531 } 3853 }
3532 warn "end emergency map save\n"; 3854 info "emergency_perl_save: end map save\n";
3533 3855
3534 warn "begin emergency database checkpoint\n"; 3856 cf::write_runtime_sync; # external watchdog should not bark
3857
3858 info "emergency_perl_save: begin database checkpoint\n";
3535 BDB::db_env_txn_checkpoint $DB_ENV; 3859 BDB::db_env_txn_checkpoint $DB_ENV;
3536 warn "end emergency database checkpoint\n"; 3860 info "emergency_perl_save: end database checkpoint\n";
3537 3861
3538 warn "begin write uuid\n"; 3862 info "emergency_perl_save: begin write uuid\n";
3539 write_uuid_sync 1; 3863 write_uuid_sync 1;
3540 warn "end write uuid\n"; 3864 info "emergency_perl_save: end write uuid\n";
3865
3866 cf::write_runtime_sync; # external watchdog should not bark
3867
3868 trace "emergency_perl_save: syncing database to disk";
3869 BDB::db_env_txn_checkpoint $DB_ENV;
3870
3871 info "emergency_perl_save: starting sync\n";
3872 IO::AIO::aio_sync sub {
3873 info "emergency_perl_save: finished sync\n";
3874 };
3875
3876 cf::write_runtime_sync; # external watchdog should not bark
3877
3878 trace "emergency_perl_save: flushing outstanding aio requests";
3879 while (IO::AIO::nreqs || BDB::nreqs) {
3880 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3881 }
3882
3883 cf::write_runtime_sync; # external watchdog should not bark
3541 }; 3884 };
3542 3885
3543 warn "leave emergency perl save\n"; 3886 info "emergency_perl_save: leave\n";
3544} 3887}
3545 3888
3546sub post_cleanup { 3889sub post_cleanup {
3547 my ($make_core) = @_; 3890 my ($make_core) = @_;
3548 3891
3892 IO::AIO::flush;
3893
3549 warn Carp::longmess "post_cleanup backtrace" 3894 error Carp::longmess "post_cleanup backtrace"
3550 if $make_core; 3895 if $make_core;
3551 3896
3552 my $fh = pidfile; 3897 my $fh = pidfile;
3553 unlink $PIDFILE if <$fh> == $$; 3898 unlink $PIDFILE if <$fh> == $$;
3554} 3899}
3574 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3919 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3575 for my $name (keys %$leaf_symtab) { 3920 for my $name (keys %$leaf_symtab) {
3576 _gv_clear *{"$pkg$name"}; 3921 _gv_clear *{"$pkg$name"};
3577# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3922# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3578 } 3923 }
3579 warn "cleared package #$pkg\n";#d#
3580} 3924}
3581
3582our $RELOAD; # how many times to reload
3583 3925
3584sub do_reload_perl() { 3926sub do_reload_perl() {
3585 # can/must only be called in main 3927 # can/must only be called in main
3586 if ($Coro::current != $Coro::main) { 3928 unless (in_main) {
3587 warn "can only reload from main coroutine"; 3929 error "can only reload from main coroutine";
3588 return; 3930 return;
3589 } 3931 }
3590 3932
3591 return if $RELOAD++; 3933 return if $RELOAD++;
3592 3934
3935 my $t1 = AE::time;
3936
3593 while ($RELOAD) { 3937 while ($RELOAD) {
3594 warn "reloading..."; 3938 cf::get_slot 0.1, -1, "reload_perl";
3939 info "perl_reload: reloading...";
3595 3940
3596 warn "entering sync_job"; 3941 trace "perl_reload: entering sync_job";
3597 3942
3598 cf::sync_job { 3943 cf::sync_job {
3599 cf::write_runtime_sync; # external watchdog should not bark
3600 cf::emergency_save; 3944 #cf::emergency_save;
3601 cf::write_runtime_sync; # external watchdog should not bark
3602 3945
3603 warn "syncing database to disk";
3604 BDB::db_env_txn_checkpoint $DB_ENV;
3605
3606 # if anything goes wrong in here, we should simply crash as we already saved
3607
3608 warn "flushing outstanding aio requests";
3609 while (IO::AIO::nreqs || BDB::nreqs) {
3610 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3611 }
3612
3613 warn "cancelling all extension coros"; 3946 trace "perl_reload: cancelling all extension coros";
3614 $_->cancel for values %EXT_CORO; 3947 $_->cancel for values %EXT_CORO;
3615 %EXT_CORO = (); 3948 %EXT_CORO = ();
3616 3949
3617 warn "removing commands"; 3950 trace "perl_reload: removing commands";
3618 %COMMAND = (); 3951 %COMMAND = ();
3619 3952
3620 warn "removing ext/exti commands"; 3953 trace "perl_reload: removing ext/exti commands";
3621 %EXTCMD = (); 3954 %EXTCMD = ();
3622 %EXTICMD = (); 3955 %EXTICMD = ();
3623 3956
3624 warn "unloading/nuking all extensions"; 3957 trace "perl_reload: unloading/nuking all extensions";
3625 for my $pkg (@EXTS) { 3958 for my $pkg (@EXTS) {
3626 warn "... unloading $pkg"; 3959 trace "... unloading $pkg";
3627 3960
3628 if (my $cb = $pkg->can ("unload")) { 3961 if (my $cb = $pkg->can ("unload")) {
3629 eval { 3962 eval {
3630 $cb->($pkg); 3963 $cb->($pkg);
3631 1 3964 1
3632 } or warn "$pkg unloaded, but with errors: $@"; 3965 } or error "$pkg unloaded, but with errors: $@";
3633 } 3966 }
3634 3967
3635 warn "... clearing $pkg"; 3968 trace "... clearing $pkg";
3636 clear_package $pkg; 3969 clear_package $pkg;
3637 } 3970 }
3638 3971
3639 warn "unloading all perl modules loaded from $LIBDIR"; 3972 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3640 while (my ($k, $v) = each %INC) { 3973 while (my ($k, $v) = each %INC) {
3641 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3974 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3642 3975
3643 warn "... unloading $k"; 3976 trace "... unloading $k";
3644 delete $INC{$k}; 3977 delete $INC{$k};
3645 3978
3646 $k =~ s/\.pm$//; 3979 $k =~ s/\.pm$//;
3647 $k =~ s/\//::/g; 3980 $k =~ s/\//::/g;
3648 3981
3651 } 3984 }
3652 3985
3653 clear_package $k; 3986 clear_package $k;
3654 } 3987 }
3655 3988
3656 warn "getting rid of safe::, as good as possible"; 3989 trace "perl_reload: getting rid of safe::, as good as possible";
3657 clear_package "safe::$_" 3990 clear_package "safe::$_"
3658 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3991 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3659 3992
3660 warn "unloading cf.pm \"a bit\""; 3993 trace "perl_reload: unloading cf.pm \"a bit\"";
3661 delete $INC{"cf.pm"}; 3994 delete $INC{"cf.pm"};
3662 delete $INC{"cf/pod.pm"}; 3995 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3663 3996
3664 # don't, removes xs symbols, too, 3997 # don't, removes xs symbols, too,
3665 # and global variables created in xs 3998 # and global variables created in xs
3666 #clear_package __PACKAGE__; 3999 #clear_package __PACKAGE__;
3667 4000
3668 warn "unload completed, starting to reload now"; 4001 info "perl_reload: unload completed, starting to reload now";
3669 4002
3670 warn "reloading cf.pm"; 4003 trace "perl_reload: reloading cf.pm";
3671 require cf; 4004 require cf;
3672 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4005 cf::_connect_to_perl_1;
3673 4006
3674 warn "loading config and database again"; 4007 trace "perl_reload: loading config and database again";
3675 cf::reload_config; 4008 cf::reload_config;
3676 4009
3677 warn "loading extensions"; 4010 trace "perl_reload: loading extensions";
3678 cf::load_extensions; 4011 cf::load_extensions;
3679 4012
4013 if ($REATTACH_ON_RELOAD) {
3680 warn "reattaching attachments to objects/players"; 4014 trace "perl_reload: reattaching attachments to objects/players";
3681 _global_reattach; # objects, sockets 4015 _global_reattach; # objects, sockets
3682 warn "reattaching attachments to maps"; 4016 trace "perl_reload: reattaching attachments to maps";
3683 reattach $_ for values %MAP; 4017 reattach $_ for values %MAP;
3684 warn "reattaching attachments to players"; 4018 trace "perl_reload: reattaching attachments to players";
3685 reattach $_ for values %PLAYER; 4019 reattach $_ for values %PLAYER;
4020 }
3686 4021
3687 warn "leaving sync_job"; 4022 cf::_post_init 1;
4023
4024 trace "perl_reload: leaving sync_job";
3688 4025
3689 1 4026 1
3690 } or do { 4027 } or do {
3691 warn $@; 4028 error $@;
3692 cf::cleanup "error while reloading, exiting."; 4029 cf::cleanup "perl_reload: error, exiting.";
3693 }; 4030 };
3694 4031
3695 warn "reloaded";
3696 --$RELOAD; 4032 --$RELOAD;
3697 } 4033 }
4034
4035 $t1 = AE::time - $t1;
4036 info "perl_reload: completed in ${t1}s\n";
3698}; 4037};
3699 4038
3700our $RELOAD_WATCHER; # used only during reload 4039our $RELOAD_WATCHER; # used only during reload
3701 4040
3702sub reload_perl() { 4041sub reload_perl() {
3703 # doing reload synchronously and two reloads happen back-to-back, 4042 # doing reload synchronously and two reloads happen back-to-back,
3704 # coro crashes during coro_state_free->destroy here. 4043 # coro crashes during coro_state_free->destroy here.
3705 4044
4045 $RELOAD_WATCHER ||= cf::async {
4046 Coro::AIO::aio_wait cache_extensions;
4047
3706 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4048 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3707 do_reload_perl; 4049 do_reload_perl;
3708 undef $RELOAD_WATCHER; 4050 undef $RELOAD_WATCHER;
4051 };
3709 }; 4052 };
3710} 4053}
3711 4054
3712register_command "reload" => sub { 4055register_command "reload" => sub {
3713 my ($who, $arg) = @_; 4056 my ($who, $arg) = @_;
3719 reload_perl; 4062 reload_perl;
3720 }; 4063 };
3721 } 4064 }
3722}; 4065};
3723 4066
3724unshift @INC, $LIBDIR; 4067#############################################################################
3725 4068
3726my $bug_warning = 0; 4069my $bug_warning = 0;
3727 4070
3728our @WAIT_FOR_TICK; 4071our @WAIT_FOR_TICK;
3729our @WAIT_FOR_TICK_BEGIN; 4072our @WAIT_FOR_TICK_BEGIN;
3730 4073
3731sub wait_for_tick { 4074sub wait_for_tick() {
3732 return if tick_inhibit || $Coro::current == $Coro::main; 4075 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3733 4076
3734 my $signal = new Coro::Signal; 4077 my $signal = new Coro::Signal;
3735 push @WAIT_FOR_TICK, $signal; 4078 push @WAIT_FOR_TICK, $signal;
3736 $signal->wait; 4079 $signal->wait;
3737} 4080}
3738 4081
3739sub wait_for_tick_begin { 4082sub wait_for_tick_begin() {
3740 return if tick_inhibit || $Coro::current == $Coro::main; 4083 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3741 4084
3742 my $signal = new Coro::Signal; 4085 my $signal = new Coro::Signal;
3743 push @WAIT_FOR_TICK_BEGIN, $signal; 4086 push @WAIT_FOR_TICK_BEGIN, $signal;
3744 $signal->wait; 4087 $signal->wait;
3745} 4088}
3751 return; 4094 return;
3752 } 4095 }
3753 4096
3754 cf::server_tick; # one server iteration 4097 cf::server_tick; # one server iteration
3755 4098
4099 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4100
3756 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4101 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3757 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4102 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3758 Coro::async_pool { 4103 Coro::async_pool {
3759 $Coro::current->{desc} = "runtime saver"; 4104 $Coro::current->{desc} = "runtime saver";
3760 write_runtime_sync 4105 write_runtime_sync
3761 or warn "ERROR: unable to write runtime file: $!"; 4106 or error "ERROR: unable to write runtime file: $!";
3762 }; 4107 };
3763 } 4108 }
3764 4109
3765 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4110 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3766 $sig->send; 4111 $sig->send;
3774 4119
3775 if (0) { 4120 if (0) {
3776 if ($NEXT_TICK) { 4121 if ($NEXT_TICK) {
3777 my $jitter = $TICK_START - $NEXT_TICK; 4122 my $jitter = $TICK_START - $NEXT_TICK;
3778 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4123 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3779 warn "jitter $JITTER\n";#d# 4124 debug "jitter $JITTER\n";#d#
3780 } 4125 }
3781 } 4126 }
3782} 4127}
3783 4128
3784{ 4129{
3785 # configure BDB 4130 # configure BDB
3786 4131
3787 BDB::min_parallel 8; 4132 BDB::min_parallel 16;
3788 BDB::max_poll_reqs $TICK * 0.1; 4133 BDB::max_poll_reqs $TICK * 0.1;
3789 $AnyEvent::BDB::WATCHER->priority (1); 4134 $AnyEvent::BDB::WATCHER->priority (1);
3790 4135
3791 unless ($DB_ENV) { 4136 unless ($DB_ENV) {
3792 $DB_ENV = BDB::db_env_create; 4137 $DB_ENV = BDB::db_env_create;
3829 IO::AIO::min_parallel 8; 4174 IO::AIO::min_parallel 8;
3830 IO::AIO::max_poll_time $TICK * 0.1; 4175 IO::AIO::max_poll_time $TICK * 0.1;
3831 undef $AnyEvent::AIO::WATCHER; 4176 undef $AnyEvent::AIO::WATCHER;
3832} 4177}
3833 4178
3834my $_log_backtrace; 4179our $_log_backtrace;
4180our $_log_backtrace_last;
3835 4181
3836sub _log_backtrace { 4182sub _log_backtrace {
3837 my ($msg, @addr) = @_; 4183 my ($msg, @addr) = @_;
3838 4184
3839 $msg =~ s/\n//; 4185 $msg =~ s/\n$//;
3840 4186
4187 if ($_log_backtrace_last eq $msg) {
4188 LOG llevInfo, "[ABT] $msg\n";
4189 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3841 # limit the # of concurrent backtraces 4190 # limit the # of concurrent backtraces
3842 if ($_log_backtrace < 2) { 4191 } elsif ($_log_backtrace < 2) {
4192 $_log_backtrace_last = $msg;
3843 ++$_log_backtrace; 4193 ++$_log_backtrace;
3844 my $perl_bt = Carp::longmess $msg; 4194 my $perl_bt = Carp::longmess $msg;
3845 async { 4195 async {
3846 $Coro::current->{desc} = "abt $msg"; 4196 $Coro::current->{desc} = "abt $msg";
3847 4197
3867 LOG llevInfo, "[ABT] $_\n" for @bt; 4217 LOG llevInfo, "[ABT] $_\n" for @bt;
3868 --$_log_backtrace; 4218 --$_log_backtrace;
3869 }; 4219 };
3870 } else { 4220 } else {
3871 LOG llevInfo, "[ABT] $msg\n"; 4221 LOG llevInfo, "[ABT] $msg\n";
3872 LOG llevInfo, "[ABT] [suppressed]\n"; 4222 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3873 } 4223 }
3874} 4224}
3875 4225
3876# load additional modules 4226# load additional modules
3877use cf::pod; 4227require "cf/$_.pm" for @EXTRA_MODULES;
4228cf::_connect_to_perl_2;
3878 4229
3879END { cf::emergency_save } 4230END { cf::emergency_save }
3880 4231
38811 42321
3882 4233

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines