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.428 by root, Thu May 1 06:33:19 2008 UTC vs.
Revision 1.569 by root, Wed May 4 07:36:40 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,2011 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 utf8; 25use common::sense;
25use strict;
26 26
27use Symbol; 27use Symbol;
28use List::Util; 28use List::Util;
29use Socket; 29use Socket;
30use EV 3.2; 30use EV;
31use Opcode; 31use Opcode;
32use Safe; 32use Safe;
33use Safe::Hole; 33use Safe::Hole;
34use Storable (); 34use Storable ();
35use Carp ();
35 36
37use Guard ();
36use Coro 4.50 (); 38use Coro ();
37use Coro::State; 39use Coro::State;
38use Coro::Handle; 40use Coro::Handle;
39use Coro::EV; 41use Coro::EV;
42use Coro::AnyEvent;
40use Coro::Timer; 43use Coro::Timer;
41use Coro::Signal; 44use Coro::Signal;
42use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
43use Coro::AIO; 48use Coro::AIO;
44use Coro::BDB; 49use Coro::BDB 1.6;
45use Coro::Storable; 50use Coro::Storable;
46use Coro::Util (); 51use Coro::Util ();
47 52
48use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
49use BDB (); 54use BDB ();
50use Data::Dumper; 55use Data::Dumper;
51use Digest::MD5;
52use Fcntl; 56use Fcntl;
53use YAML (); 57use YAML::XS ();
54use IO::AIO 2.51 (); 58use IO::AIO ();
55use Time::HiRes; 59use Time::HiRes;
56use Compress::LZF; 60use Compress::LZF;
57use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
58 64
59# configure various modules to our taste 65# configure various modules to our taste
60# 66#
61$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
63Compress::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
64 75
65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
66 78
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
68 82
69our %COMMAND = (); 83our %COMMAND = ();
70our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
71 85
72our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
73our %EXTCMD = (); 87our %EXTCMD = ();
74our %EXTICMD = (); 88our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
77 91
78our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
80 96
81our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
82our $DATADIR = datadir; 99our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
86our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime";
112
92our %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;
93 120
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 123our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
99 125
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 129our $DB_ENV;
105 130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
106our %CFG; 133our %CFG;
107 134
108our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 136our $RUNTIME;
110our $NOW; 137our $NOW;
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 146our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 147our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 148our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 149our $TICK_START; # for load detecting purposes
123 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 :)
155
124binmode STDOUT; 156binmode STDOUT;
125binmode STDERR; 157binmode STDERR;
126 158
127# read virtual server time, if available 159# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 160unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 161 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 162 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 163 $RUNTIME = <$fh> + 0.;
132} 164}
165
166eval "sub TICK() { $TICK } 1" or die;
133 167
134mkdir $_ 168mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 169 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136 170
137our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
138 172
139sub 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::"} };
140 189
141############################################################################# 190#############################################################################
142 191
143=head2 GLOBAL VARIABLES 192=head2 GLOBAL VARIABLES
144 193
186from wherever your confdir points to. 235from wherever your confdir points to.
187 236
188=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
189 238
190These 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
191returns 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
192per 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.
193 242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
247
194=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
195 249
196This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
197C<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
198that call. 252that call.
199 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
200=back 260=back
201 261
202=cut 262=cut
203 263
204BEGIN { 264sub error(@) { LOG llevError, join "", @_ }
205 *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 {
206 my $msg = join "", @_; 271 my $msg = join "", @_;
207 272
208 $msg .= "\n" 273 $msg .= "\n"
209 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
210 275
211 $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;
212 277
213 LOG llevError, $msg; 278 LOG llevWarn, $msg;
214 }; 279};
215}
216 280
217$Coro::State::DIEHOOK = sub { 281$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "==" 282 return unless $^S eq 0; # "eq", not "=="
219 283
220 if ($Coro::current == $Coro::main) {#d# 284 error Carp::longmess $_[0];
285
286 if (in_main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d# 287 error "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d# 288 return;#d#
223 }#d# 289 }#d#
224 290
225 # kill coroutine otherwise 291 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate 292 Coro::terminate
228}; 293};
229
230$SIG{__DIE__} = sub { }; #d#?
231 294
232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 295@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 296@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 297@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 298@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
242for my $pkg (qw( 305for my $pkg (qw(
243 cf::global cf::attachable 306 cf::global cf::attachable
244 cf::object cf::object::player 307 cf::object cf::object::player
245 cf::client cf::player 308 cf::client cf::player
246 cf::arch cf::living 309 cf::arch cf::living
310 cf::map cf::mapspace
247 cf::map cf::party cf::region 311 cf::party cf::region
248)) { 312)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 314}
252 315
253$EV::DIED = sub { 316$EV::DIED = sub {
254 warn "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
255}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
256 324
257############################################################################# 325#############################################################################
258 326
259=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
260 328
281 $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;
282 $d 350 $d
283 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
284} 352}
285 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
286=item $ref = cf::decode_json $json 368=item $ref = cf::decode_json $json
287 369
288Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
289 371
290=item $json = cf::encode_json $ref 372=item $json = cf::encode_json $ref
296our $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
297 379
298sub encode_json($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
300 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
301=item cf::lock_wait $string 445=item cf::lock_wait $string
302 446
303Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
304 448
305=item my $lock = cf::lock_acquire $string 449=item my $lock = cf::lock_acquire $string
306 450
307Wait 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
308a 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,
309for example when the coroutine gets canceled), the lock is automatically 453for example when the coroutine gets canceled), the lock is automatically
310returned. 454returned.
311 455
312Locks 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
313deadlocked coro. 457deadlocked coro.
319 463
320Return 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.
321 465
322=cut 466=cut
323 467
324our %LOCK; 468our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 469
327sub lock_wait($) { 470sub lock_wait($) {
328 my ($key) = @_; 471 $LOCKS->wait ($_[0]);
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
334
335 # wait for lock, if any
336 while ($LOCK{$key}) {
337 push @{ $LOCK{$key} }, $Coro::current;
338 Coro::schedule;
339 }
340} 472}
341 473
342sub lock_acquire($) { 474sub lock_acquire($) {
343 my ($key) = @_; 475 $LOCKS->guard ($_[0])
344
345 # wait, to be sure we are not locked
346 lock_wait $key;
347
348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
350
351 Coro::guard {
352 delete $LOCKER{$key};#d#
353 # wake up all waiters, to be on the safe side
354 $_->ready for @{ delete $LOCK{$key} };
355 }
356} 476}
357 477
358sub lock_active($) { 478sub lock_active($) {
359 my ($key) = @_; 479 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 480}
363 481
364sub freeze_mainloop { 482sub freeze_mainloop {
365 tick_inhibit_inc; 483 tick_inhibit_inc;
366 484
367 Coro::guard \&tick_inhibit_dec; 485 &Guard::guard (\&tick_inhibit_dec);
368} 486}
369 487
370=item cf::periodic $interval, $cb 488=item cf::periodic $interval, $cb
371 489
372Like 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
373get spread over timer. 491get spread over time.
374 492
375=cut 493=cut
376 494
377sub periodic($$) { 495sub periodic($$) {
378 my ($interval, $cb) = @_; 496 my ($interval, $cb) = @_;
382 EV::periodic $start, $interval, 0, $cb 500 EV::periodic $start, $interval, 0, $cb
383} 501}
384 502
385=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
386 504
387Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
388This 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
389of 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.
390 512
391The 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
392used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
393 515
394Useful for short background jobs. 516Useful for short background jobs.
395 517
396=cut 518=cut
397 519
398our @SLOT_QUEUE; 520our @SLOT_QUEUE;
399our $SLOT_QUEUE; 521our $SLOT_QUEUE;
522our $SLOT_DECAY = 0.9;
400 523
401$SLOT_QUEUE->cancel if $SLOT_QUEUE; 524$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async { 525$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager"); 526 $Coro::current->desc ("timeslot manager");
404 527
405 my $signal = new Coro::Signal; 528 my $signal = new Coro::Signal;
529 my $busy;
406 530
407 while () { 531 while () {
408 next_job: 532 next_job:
533
409 my $avail = cf::till_tick; 534 my $avail = cf::till_tick;
410 if ($avail > 0.01) { 535
411 for (0 .. $#SLOT_QUEUE) { 536 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) { 537 if ($SLOT_QUEUE[$_][0] <= $avail) {
538 $busy = 0;
413 my $job = splice @SLOT_QUEUE, $_, 1, (); 539 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send; 540 $job->[2]->send;
415 Coro::cede; 541 Coro::cede;
416 goto next_job; 542 goto next_job;
417 } 543 } else {
544 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
418 } 545 }
419 } 546 }
420 547
421 if (@SLOT_QUEUE) { 548 if (@SLOT_QUEUE) {
422 # 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
423 push @cf::WAIT_FOR_TICK, $signal; 550 push @cf::WAIT_FOR_TICK, $signal;
424 $signal->wait; 551 $signal->wait;
425 } else { 552 } else {
553 $busy = 0;
426 Coro::schedule; 554 Coro::schedule;
427 } 555 }
428 } 556 }
429}; 557};
430 558
431sub get_slot($;$$) { 559sub get_slot($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main; 560 return if tick_inhibit || $Coro::current == $Coro::main;
433 561
434 my ($time, $pri, $name) = @_; 562 my ($time, $pri, $name) = @_;
435 563
436 $time = $TICK * .6 if $time > $TICK * .6; 564 $time = clamp $time, 0.01, $TICK * .6;
565
437 my $sig = new Coro::Signal; 566 my $sig = new Coro::Signal;
438 567
439 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 568 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
440 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 569 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
441 $SLOT_QUEUE->ready; 570 $SLOT_QUEUE->ready;
467=cut 596=cut
468 597
469sub sync_job(&) { 598sub sync_job(&) {
470 my ($job) = @_; 599 my ($job) = @_;
471 600
472 if ($Coro::current == $Coro::main) { 601 if (in_main) {
473 my $time = EV::time; 602 my $time = AE::time;
474 603
475 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
476 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
477 606
478 LOG llevError, Carp::longmess "sync job";#d# 607 #LOG llevError, Carp::longmess "sync job";#d#
479 608
480 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
481 610
482 my $busy = 1; 611 my $busy = 1;
483 my @res; 612 my @res;
484 613
485 (async { 614 (async {
486 $Coro::current->desc ("sync job coro"); 615 $Coro::current->desc ("sync job coro");
487 @res = eval { $job->() }; 616 @res = eval { $job->() };
488 warn $@ if $@; 617 error $@ if $@;
489 undef $busy; 618 undef $busy;
490 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
491 620
492 while ($busy) { 621 while ($busy) {
493 if (Coro::nready) { 622 if (Coro::nready) {
495 } else { 624 } else {
496 EV::loop EV::LOOP_ONESHOT; 625 EV::loop EV::LOOP_ONESHOT;
497 } 626 }
498 } 627 }
499 628
500 my $time = EV::time - $time; 629 my $time = AE::time - $time;
501 630
502 $TICK_START += $time; # do not account sync jobs to server load 631 $TICK_START += $time; # do not account sync jobs to server load
503 632
504 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
505 } else { 634 } else {
527 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
528 657
529 $coro 658 $coro
530} 659}
531 660
532=item fork_call { }, $args 661=item fork_call { }, @args
533 662
534Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
535process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
536Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
537never block itself or use any form of event handling. 666never block itself or use any form of event handling.
538 667
539=cut 668=cut
540 669
670sub post_fork {
671 reset_signals;
672}
673
541sub fork_call(&@) { 674sub fork_call(&@) {
542 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
543 676
544 # 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,
545 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
546 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
547 680
548 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
549 reset_signals; 682 cf::post_fork;
550 &$cb 683 &$cb
551 }, @args; 684 } @args;
552 685
553 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 )
554} 698}
555 699
556=item $coin = coin_from_name $name 700=item $coin = coin_from_name $name
557 701
558=cut 702=cut
595within each server. 739within each server.
596 740
597=cut 741=cut
598 742
599sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
600 my ($name) = @_; 747 my ($name) = @_;
601 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
602 749
603 eval { 750 eval {
604 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
614} 761}
615 762
616our $DB; 763our $DB;
617 764
618sub db_init { 765sub db_init {
619 cf::sync_job {
620 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
621 };
622} 767}
623 768
624sub db_get($$) { 769sub db_get($$) {
625 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
626 771
627 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
628 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
629 776
630 $! ? () 777 $! ? ()
631 : $data 778 : $data
632 }
633} 779}
634 780
635sub db_put($$$) { 781sub db_put($$$) {
636 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
637 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
665 811
666 my @data; 812 my @data;
667 my $md5; 813 my $md5;
668 814
669 for (0 .. $#$src) { 815 for (0 .. $#$src) {
670 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
671 or Carp::croak "$src->[$_]: $!";
672 } 817 }
673 818
674 # if processing is expensive, check 819 # if processing is expensive, check
675 # checksum first 820 # checksum first
676 if (1) { 821 if (1) {
693 838
694 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
695 my $data = $process->(\@data); 840 my $data = $process->(\@data);
696 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
697 842
698 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
699 844
700 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
701 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
702 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
703 848
713 858
714=cut 859=cut
715 860
716sub datalog($@) { 861sub datalog($@) {
717 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
718 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
719} 864}
720 865
721=back 866=back
722 867
723=cut 868=cut
724 869
725############################################################################# 870#############################################################################
726 871
727=head2 ATTACHABLE OBJECTS 872=head2 ATTACHABLE OBJECTS
728 873
729Many objects in crossfire are so-called attachable objects. That means you can 874Many objects in deliantra are so-called attachable objects. That means you can
730attach callbacks/event handlers (a collection of which is called an "attachment") 875attach callbacks/event handlers (a collection of which is called an "attachment")
731to it. All such attachable objects support the following methods. 876to it. All such attachable objects support the following methods.
732 877
733In the following description, CLASS can be any of C<global>, C<object> 878In the following description, CLASS can be any of C<global>, C<object>
734C<player>, C<client> or C<map> (i.e. the attachable objects in 879C<player>, C<client> or C<map> (i.e. the attachable objects in
784=item cf::CLASS::attachment $name, ... 929=item cf::CLASS::attachment $name, ...
785 930
786Register an attachment by C<$name> through which attachable objects of the 931Register an attachment by C<$name> through which attachable objects of the
787given CLASS can refer to this attachment. 932given CLASS can refer to this attachment.
788 933
789Some classes such as crossfire maps and objects can specify attachments 934Some classes such as deliantra maps and objects can specify attachments
790that are attached at load/instantiate time, thus the need for a name. 935that are attached at load/instantiate time, thus the need for a name.
791 936
792These calls expect any number of the following handler/hook descriptions: 937These calls expect any number of the following handler/hook descriptions:
793 938
794=over 4 939=over 4
918 1063
919 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
920 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
921 1066
922 } elsif (ref $type) { 1067 } elsif (ref $type) {
923 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
924 1069
925 } else { 1070 } else {
926 shift @arg; 1071 shift @arg;
927 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
928 } 1073 }
929 } 1074 }
930} 1075}
931 1076
932sub _object_attach { 1077sub _object_attach {
942 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
943 } 1088 }
944 1089
945 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
946 } else { 1091 } else {
947 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
948 } 1093 }
949 1094
950 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
951} 1096}
952 1097
1011 1156
1012 for (@$callbacks) { 1157 for (@$callbacks) {
1013 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
1014 1159
1015 if ($@) { 1160 if ($@) {
1016 warn "$@";
1017 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1018 override; 1162 override;
1019 } 1163 }
1020 1164
1021 return 1 if $override; 1165 return 1 if $override;
1022 } 1166 }
1085 1229
1086sub reattach { 1230sub reattach {
1087 # basically do the same as instantiate, without calling instantiate 1231 # basically do the same as instantiate, without calling instantiate
1088 my ($obj) = @_; 1232 my ($obj) = @_;
1089 1233
1234 # no longer needed after getting rid of delete_package?
1090 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1235 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1091 1236
1092 my $registry = $obj->registry; 1237 my $registry = $obj->registry;
1093 1238
1094 @$registry = (); 1239 @$registry = ();
1095 1240
1100 for (@$attach) { 1245 for (@$attach) {
1101 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
1102 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
1103 } 1248 }
1104 } else { 1249 } else {
1105 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
1106 } 1251 }
1107 } 1252 }
1108} 1253}
1109 1254
1110cf::attachable->attach ( 1255cf::attachable->attach (
1137 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1138 1283
1139 sync_job { 1284 sync_job {
1140 if (length $$rdata) { 1285 if (length $$rdata) {
1141 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1142 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1143 $decname, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1144 1290
1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1146 aio_chmod $fh, SAVE_MODE; 1292 aio_chmod $fh, SAVE_MODE;
1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1148 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 }
1149 aio_close $fh; 1298 aio_close $fh;
1150 1299
1151 if (@$objs) { 1300 if (@$objs) {
1152 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) {
1153 aio_chmod $fh, SAVE_MODE; 1302 aio_chmod $fh, SAVE_MODE;
1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1303 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1155 aio_write $fh, 0, (length $data), $data, 0; 1304 aio_write $fh, 0, (length $data), $data, 0;
1156 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 }
1157 aio_close $fh; 1309 aio_close $fh;
1158 aio_rename "$filename.pst~", "$filename.pst"; 1310 aio_rename "$filename.pst~", "$filename.pst";
1159 } 1311 }
1160 } else { 1312 } else {
1161 aio_unlink "$filename.pst"; 1313 aio_unlink "$filename.pst";
1162 } 1314 }
1163 1315
1164 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1317
1318 $filename =~ s%/[^/]+$%%;
1319 aio_pathsync $filename if $cf::USE_FSYNC;
1165 } else { 1320 } else {
1166 warn "FATAL: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1167 } 1322 }
1168 } else { 1323 } else {
1169 aio_unlink $filename; 1324 aio_unlink $filename;
1170 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1171 } 1326 }
1195 my $st = eval { Coro::Storable::thaw $av }; 1350 my $st = eval { Coro::Storable::thaw $av };
1196 $av = $st->{objs}; 1351 $av = $st->{objs};
1197 } 1352 }
1198 1353
1199 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1200 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1201 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1202 1358
1203 ($data, $av) 1359 ($data, $av)
1204} 1360}
1205 1361
1206=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
1262 my ($name, $cb) = @_; 1418 my ($name, $cb) = @_;
1263 1419
1264 $EXTICMD{$name} = $cb; 1420 $EXTICMD{$name} = $cb;
1265} 1421}
1266 1422
1423use File::Glob ();
1424
1267cf::player->attach ( 1425cf::player->attach (
1268 on_command => sub { 1426 on_unknown_command => sub {
1269 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1270 1428
1271 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1272 or return; 1430 or return;
1273 1431
1296 1454
1297 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1298 if $reply; 1456 if $reply;
1299 1457
1300 } else { 1458 } else {
1301 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1302 } 1460 }
1303 1461
1304 cf::override; 1462 cf::override;
1305 }, 1463 },
1306); 1464);
1307 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
1308sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1309 cf::sync_job { 1482 cf::sync_job {
1310 my %todo; 1483 my %todo;
1311 1484
1312 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1313 next unless -r $path; 1486 next unless -r $path;
1331 1504
1332 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334 1507
1335 $ext{source} = 1508 $ext{source} =
1336 "package $pkg; use strict; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1337 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1338 . $source 1511 . $source
1339 . "\n};\n1"; 1512 . "\n};\n1";
1340 1513
1341 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
1342 } 1515 }
1343 1516
1517 my $pass = 0;
1344 my %done; 1518 my %done;
1345 while (%todo) { 1519 while (%todo) {
1346 my $progress; 1520 my $progress;
1347 1521
1522 ++$pass;
1523
1524 ext:
1348 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
1349 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1350 goto skip 1527 next ext
1351 unless exists $done{$_}; 1528 unless exists $done{$_};
1352 } 1529 }
1353 1530
1354 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1355 1532
1356 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
1357 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
1358 : "$v->{base}: extension inactive.\n";
1359 1537
1360 if (exists $v->{meta}{mandatory}) {
1361 warn $msg;
1362 cf::cleanup "mandatory extension failed to load, exiting."; 1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1363 } 1539 if exists $v->{meta}{mandatory};
1364 1540
1365 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;
1366 } 1550 }
1367
1368 $done{$k} = delete $todo{$k};
1369 push @EXTS, $v->{pkg};
1370 $progress = 1;
1371 } 1551 }
1372 1552
1373 skip: 1553 unless ($progress) {
1374 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1375 unless $progress; 1555
1556 while (my ($k, $v) = each %todo) {
1557 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1558 if exists $v->{meta}{mandatory};
1559 }
1560
1561 last;
1562 }
1376 } 1563 }
1377 }; 1564 };
1378} 1565}
1379 1566
1380############################################################################# 1567#############################################################################
1381 1568
1382=back 1569=back
1383 1570
1384=head2 CORE EXTENSIONS 1571=head2 CORE EXTENSIONS
1385 1572
1386Functions and methods that extend core crossfire objects. 1573Functions and methods that extend core deliantra objects.
1387 1574
1388=cut 1575=cut
1389 1576
1390package cf::player; 1577package cf::player;
1391 1578
1434 1621
1435sub exists($) { 1622sub exists($) {
1436 my ($login) = @_; 1623 my ($login) = @_;
1437 1624
1438 $cf::PLAYER{$login} 1625 $cf::PLAYER{$login}
1439 or cf::sync_job { !aio_stat path $login } 1626 or !aio_stat path $login
1440} 1627}
1441 1628
1442sub find($) { 1629sub find($) {
1443 return $cf::PLAYER{$_[0]} || do { 1630 return $cf::PLAYER{$_[0]} || do {
1444 my $login = $_[0]; 1631 my $login = $_[0];
1464 $cf::PLAYER{$login} = $pl 1651 $cf::PLAYER{$login} = $pl
1465 } 1652 }
1466 } 1653 }
1467} 1654}
1468 1655
1656cf::player->attach (
1657 on_load => sub {
1658 my ($pl, $path) = @_;
1659
1660 # restore slots saved in save, below
1661 my $slots = delete $pl->{_slots};
1662
1663 $pl->ob->current_weapon ($slots->[0]);
1664 $pl->combat_ob ($slots->[1]);
1665 $pl->ranged_ob ($slots->[2]);
1666 },
1667);
1668
1469sub save($) { 1669sub save($) {
1470 my ($pl) = @_; 1670 my ($pl) = @_;
1471 1671
1472 return if $pl->{deny_save}; 1672 return if $pl->{deny_save};
1473 1673
1478 1678
1479 aio_mkdir playerdir $pl, 0770; 1679 aio_mkdir playerdir $pl, 0770;
1480 $pl->{last_save} = $cf::RUNTIME; 1680 $pl->{last_save} = $cf::RUNTIME;
1481 1681
1482 cf::get_slot 0.01; 1682 cf::get_slot 0.01;
1683
1684 # save slots, to be restored later
1685 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1483 1686
1484 $pl->save_pl ($path); 1687 $pl->save_pl ($path);
1485 cf::cede_to_tick; 1688 cf::cede_to_tick;
1486} 1689}
1487 1690
1519 my ($pl) = @_; 1722 my ($pl) = @_;
1520 1723
1521 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1522 1725
1523 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1524 $pl->password ("*"); # this should lock out the player until we nuked the dir 1727 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1525 1728
1526 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1527 $pl->deactivate; 1730 $pl->deactivate;
1731
1732 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1528 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1529 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1530 1737
1531 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1532 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1533 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
1587 \@logins 1794 \@logins
1588} 1795}
1589 1796
1590=item $player->maps 1797=item $player->maps
1591 1798
1799=item cf::player::maps $login
1800
1592Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1593player. May block. 1802player. May block.
1594 1803
1595=cut 1804=cut
1596 1805
1613 } 1822 }
1614 1823
1615 \@paths 1824 \@paths
1616} 1825}
1617 1826
1618=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1827=item $protocol_xml = $player->expand_cfpod ($cfpod)
1619 1828
1620Expand crossfire pod fragments into protocol xml. 1829Expand deliantra pod fragments into protocol xml.
1621
1622=cut
1623
1624use re 'eval';
1625
1626my $group;
1627my $interior; $interior = qr{
1628 # match a pod interior sequence sans C<< >>
1629 (?:
1630 \ (.*?)\ (?{ $group = $^N })
1631 | < (??{$interior}) >
1632 )
1633}x;
1634
1635sub expand_cfpod {
1636 my ($self, $pod) = @_;
1637
1638 my $xml;
1639
1640 while () {
1641 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1642 $group = $1;
1643
1644 $group =~ s/&/&amp;/g;
1645 $group =~ s/</&lt;/g;
1646
1647 $xml .= $group;
1648 } elsif ($pod =~ m%\G
1649 ([BCGHITU])
1650 <
1651 (?:
1652 ([^<>]*) (?{ $group = $^N })
1653 | < $interior >
1654 )
1655 >
1656 %gcsx
1657 ) {
1658 my ($code, $data) = ($1, $group);
1659
1660 if ($code eq "B") {
1661 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1662 } elsif ($code eq "I") {
1663 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1664 } elsif ($code eq "U") {
1665 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1666 } elsif ($code eq "C") {
1667 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1668 } elsif ($code eq "T") {
1669 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1670 } elsif ($code eq "G") {
1671 my ($male, $female) = split /\|/, $data;
1672 $data = $self->gender ? $female : $male;
1673 $xml .= expand_cfpod ($self, $data);
1674 } elsif ($code eq "H") {
1675 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1676 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1677 "")
1678 [$self->{hintmode}];
1679 } else {
1680 $xml .= "error processing '$code($data)' directive";
1681 }
1682 } else {
1683 if ($pod =~ /\G(.+)/) {
1684 warn "parse error while expanding $pod (at $1)";
1685 }
1686 last;
1687 }
1688 }
1689
1690 for ($xml) {
1691 # create single paragraphs (very hackish)
1692 s/(?<=\S)\n(?=\w)/ /g;
1693
1694 # compress some whitespace
1695 s/\s+\n/\n/g; # ws line-ends
1696 s/\n\n+/\n/g; # double lines
1697 s/^\n+//; # beginning lines
1698 s/\n+$//; # ending lines
1699 }
1700
1701 $xml
1702}
1703
1704no re 'eval';
1705
1706sub hintmode {
1707 $_[0]{hintmode} = $_[1] if @_ > 1;
1708 $_[0]{hintmode}
1709}
1710 1830
1711=item $player->ext_reply ($msgid, @msg) 1831=item $player->ext_reply ($msgid, @msg)
1712 1832
1713Sends an ext reply to the player. 1833Sends an ext reply to the player.
1714 1834
1746 1866
1747=cut 1867=cut
1748 1868
1749sub find_by_path($) { 1869sub find_by_path($) {
1750 my ($path) = @_; 1870 my ($path) = @_;
1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1751 1873
1752 my ($match, $specificity); 1874 my ($match, $specificity);
1753 1875
1754 for my $region (list) { 1876 for my $region (list) {
1755 if ($region->{match} && $path =~ $region->{match}) { 1877 if ($region->{match} && $path =~ $region->{match}) {
1784sub generate_random_map { 1906sub generate_random_map {
1785 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1786 1908
1787 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1909 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1788 1910
1789 # mit "rum" bekleckern, nicht
1790 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1791 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1792 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1793 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1794 $rmp->{exit_on_final_map},
1795 $rmp->{xsize}, $rmp->{ysize},
1796 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1797 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1798 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1799 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1800 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1801 (cf::region::find $rmp->{region}), $rmp->{custom}
1802 )
1803} 1912}
1804 1913
1805=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1806 1915
1807Register a handler for the map path matching the given regex at the 1916Register a handler for the map path matching the given regex at the
1812 1921
1813sub register { 1922sub register {
1814 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1815 my $pkg = caller; 1924 my $pkg = caller;
1816 1925
1817 no strict;
1818 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1819 1927
1820 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1821} 1929}
1822 1930
1823# also paths starting with '/' 1931# also paths starting with '/'
1824$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1825 1933
1826sub thawer_merge { 1934sub thawer_merge {
1827 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1828 1936
1829 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
1834} 1942}
1835 1943
1836sub normalise { 1944sub normalise {
1837 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1838 1946
1839 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1840 1948
1841 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1842 1950
1843 # map plan: 1951 # map plan:
1844 # 1952 #
1859 $base =~ s{[^/]+/?$}{}; 1967 $base =~ s{[^/]+/?$}{};
1860 $path = "$base/$path"; 1968 $path = "$base/$path";
1861 } 1969 }
1862 1970
1863 for ($path) { 1971 for ($path) {
1864 redo if s{//}{/};
1865 redo if s{/\.?/}{/}; 1972 redo if s{/\.?/}{/};
1866 redo if s{/[^/]+/\.\./}{/}; 1973 redo if s{/[^/]+/\.\./}{/};
1867 } 1974 }
1868 1975
1869 $path 1976 $path
1883 $self->init; # pass $1 etc. 1990 $self->init; # pass $1 etc.
1884 return $self; 1991 return $self;
1885 } 1992 }
1886 } 1993 }
1887 1994
1888 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1995 Carp::cluck "unable to resolve path '$path' (base '$base')";
1889 () 1996 ()
1890} 1997}
1891 1998
1999# may re-bless or do other evil things
1892sub init { 2000sub init {
1893 my ($self) = @_; 2001 my ($self) = @_;
1894 2002
1895 $self 2003 $self
1896} 2004}
1927 2035
1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2036 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1929 "$UNIQUEDIR/$path" 2037 "$UNIQUEDIR/$path"
1930} 2038}
1931 2039
1932# and all this just because we cannot iterate over
1933# all maps in C++...
1934sub change_all_map_light {
1935 my ($change) = @_;
1936
1937 $_->change_map_light ($change)
1938 for grep $_->outdoor, values %cf::MAP;
1939}
1940
1941sub decay_objects { 2040sub decay_objects {
1942 my ($self) = @_; 2041 my ($self) = @_;
1943 2042
1944 return if $self->{deny_reset}; 2043 return if $self->{deny_reset};
1945 2044
1970 $self->{load_path} = $path; 2069 $self->{load_path} = $path;
1971 2070
1972 1 2071 1
1973} 2072}
1974 2073
2074# used to laod the header of an original map
1975sub load_header_orig { 2075sub load_header_orig {
1976 my ($self) = @_; 2076 my ($self) = @_;
1977 2077
1978 $self->load_header_from ($self->load_path) 2078 $self->load_header_from ($self->load_path)
1979} 2079}
1980 2080
2081# used to laod the header of an instantiated map
1981sub load_header_temp { 2082sub load_header_temp {
1982 my ($self) = @_; 2083 my ($self) = @_;
1983 2084
1984 $self->load_header_from ($self->save_path) 2085 $self->load_header_from ($self->save_path)
1985} 2086}
1986 2087
2088# called after loading the header from an instantiated map
1987sub prepare_temp { 2089sub prepare_temp {
1988 my ($self) = @_; 2090 my ($self) = @_;
1989 2091
1990 $self->last_access ((delete $self->{last_access}) 2092 $self->last_access ((delete $self->{last_access})
1991 || $cf::RUNTIME); #d# 2093 || $cf::RUNTIME); #d#
1992 # safety 2094 # safety
1993 $self->{instantiate_time} = $cf::RUNTIME 2095 $self->{instantiate_time} = $cf::RUNTIME
1994 if $self->{instantiate_time} > $cf::RUNTIME; 2096 if $self->{instantiate_time} > $cf::RUNTIME;
1995} 2097}
1996 2098
2099# called after loading the header from an original map
1997sub prepare_orig { 2100sub prepare_orig {
1998 my ($self) = @_; 2101 my ($self) = @_;
1999 2102
2000 $self->{load_original} = 1; 2103 $self->{load_original} = 1;
2001 $self->{instantiate_time} = $cf::RUNTIME; 2104 $self->{instantiate_time} = $cf::RUNTIME;
2025 2128
2026sub find; 2129sub find;
2027sub find { 2130sub find {
2028 my ($path, $origin) = @_; 2131 my ($path, $origin) = @_;
2029 2132
2133 cf::cede_to_tick;
2134
2030 $path = normalise $path, $origin && $origin->path; 2135 $path = normalise $path, $origin;
2031 2136
2032 cf::lock_wait "map_data:$path";#d#remove 2137 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2033 cf::lock_wait "map_find:$path"; 2138 my $guard2 = cf::lock_acquire "map_find:$path";
2034 2139
2035 $cf::MAP{$path} || do { 2140 $cf::MAP{$path} || do {
2036 my $guard1 = cf::lock_acquire "map_find:$path";
2037 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2038
2039 my $map = new_from_path cf::map $path 2141 my $map = new_from_path cf::map $path
2040 or return; 2142 or return;
2041 2143
2042 $map->{last_save} = $cf::RUNTIME; 2144 $map->{last_save} = $cf::RUNTIME;
2043 2145
2045 or return; 2147 or return;
2046 2148
2047 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2149 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2048 # doing this can freeze the server in a sync job, obviously 2150 # doing this can freeze the server in a sync job, obviously
2049 #$cf::WAIT_FOR_TICK->wait; 2151 #$cf::WAIT_FOR_TICK->wait;
2152 undef $guard2;
2050 undef $guard1; 2153 undef $guard1;
2051 undef $guard2;
2052 $map->reset; 2154 $map->reset;
2053 return find $path; 2155 return find $path;
2054 } 2156 }
2055 2157
2056 $cf::MAP{$path} = $map 2158 $cf::MAP{$path} = $map
2057 } 2159 }
2058} 2160}
2059 2161
2060sub pre_load { } 2162sub pre_load { }
2061sub post_load { } 2163#sub post_load { } # XS
2062 2164
2063sub load { 2165sub load {
2064 my ($self) = @_; 2166 my ($self) = @_;
2065 2167
2066 local $self->{deny_reset} = 1; # loading can take a long time 2168 local $self->{deny_reset} = 1; # loading can take a long time
2071 my $guard = cf::lock_acquire "map_data:$path"; 2173 my $guard = cf::lock_acquire "map_data:$path";
2072 2174
2073 return unless $self->valid; 2175 return unless $self->valid;
2074 return unless $self->in_memory == cf::MAP_SWAPPED; 2176 return unless $self->in_memory == cf::MAP_SWAPPED;
2075 2177
2076 $self->in_memory (cf::MAP_LOADING);
2077
2078 $self->alloc; 2178 $self->alloc;
2079 2179
2080 $self->pre_load; 2180 $self->pre_load;
2081 cf::cede_to_tick; 2181 cf::cede_to_tick;
2082 2182
2183 if (exists $self->{load_path}) {
2083 my $f = new_from_file cf::object::thawer $self->{load_path}; 2184 my $f = new_from_file cf::object::thawer $self->{load_path};
2084 $f->skip_block; 2185 $f->skip_block;
2085 $self->_load_objects ($f) 2186 $self->_load_objects ($f)
2086 or return; 2187 or return;
2087 2188
2088 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2189 $self->post_load_original
2089 if delete $self->{load_original}; 2190 if delete $self->{load_original};
2090 2191
2091 if (my $uniq = $self->uniq_path) { 2192 if (my $uniq = $self->uniq_path) {
2092 utf8::encode $uniq; 2193 utf8::encode $uniq;
2093 unless (aio_stat $uniq) { 2194 unless (aio_stat $uniq) {
2094 if (my $f = new_from_file cf::object::thawer $uniq) { 2195 if (my $f = new_from_file cf::object::thawer $uniq) {
2095 $self->clear_unique_items; 2196 $self->clear_unique_items;
2096 $self->_load_objects ($f); 2197 $self->_load_objects ($f);
2097 $f->resolve_delayed_derefs; 2198 $f->resolve_delayed_derefs;
2199 }
2098 } 2200 }
2099 } 2201 }
2100 }
2101 2202
2102 $f->resolve_delayed_derefs; 2203 $f->resolve_delayed_derefs;
2204 } else {
2205 $self->post_load_original
2206 if delete $self->{load_original};
2207 }
2208
2209 $self->in_memory (cf::MAP_INACTIVE);
2103 2210
2104 cf::cede_to_tick; 2211 cf::cede_to_tick;
2105 # now do the right thing for maps 2212 # now do the right thing for maps
2106 $self->link_multipart_objects; 2213 $self->link_multipart_objects;
2107 $self->difficulty ($self->estimate_difficulty) 2214 $self->difficulty ($self->estimate_difficulty)
2111 unless ($self->{deny_activate}) { 2218 unless ($self->{deny_activate}) {
2112 $self->decay_objects; 2219 $self->decay_objects;
2113 $self->fix_auto_apply; 2220 $self->fix_auto_apply;
2114 $self->update_buttons; 2221 $self->update_buttons;
2115 cf::cede_to_tick; 2222 cf::cede_to_tick;
2116 $self->set_darkness_map; 2223 #$self->activate; # no longer activate maps automatically
2117 cf::cede_to_tick;
2118 $self->activate;
2119 } 2224 }
2120 2225
2121 $self->{last_save} = $cf::RUNTIME; 2226 $self->{last_save} = $cf::RUNTIME;
2122 $self->last_access ($cf::RUNTIME); 2227 $self->last_access ($cf::RUNTIME);
2123
2124 $self->in_memory (cf::MAP_ACTIVE);
2125 } 2228 }
2126 2229
2127 $self->post_load; 2230 $self->post_load;
2128}
2129 2231
2232 1
2233}
2234
2235# customize the map for a given player, i.e.
2236# return the _real_ map. used by e.g. per-player
2237# maps to change the path to ~playername/mappath
2130sub customise_for { 2238sub customise_for {
2131 my ($self, $ob) = @_; 2239 my ($self, $ob) = @_;
2132 2240
2133 return find "~" . $ob->name . "/" . $self->{path} 2241 return find "~" . $ob->name . "/" . $self->{path}
2134 if $self->per_player; 2242 if $self->per_player;
2150 or next; 2258 or next;
2151 $neigh = find $neigh, $map 2259 $neigh = find $neigh, $map
2152 or next; 2260 or next;
2153 $neigh->load; 2261 $neigh->load;
2154 2262
2263 # now find the diagonal neighbours
2155 push @neigh, 2264 push @neigh,
2156 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2265 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2157 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2266 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2158 } 2267 }
2159 2268
2166} 2275}
2167 2276
2168sub find_sync { 2277sub find_sync {
2169 my ($path, $origin) = @_; 2278 my ($path, $origin) = @_;
2170 2279
2171 cf::sync_job { find $path, $origin } 2280 # it's a bug to call this from the main context
2281 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2282 if $Coro::current == $Coro::main;
2283
2284 find $path, $origin
2172} 2285}
2173 2286
2174sub do_load_sync { 2287sub do_load_sync {
2175 my ($map) = @_; 2288 my ($map) = @_;
2176 2289
2290 # it's a bug to call this from the main context
2177 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2291 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2178 if $Coro::current == $Coro::main; 2292 if $Coro::current == $Coro::main;
2179 2293
2180 cf::sync_job { $map->load }; 2294 $map->load;
2181} 2295}
2182 2296
2183our %MAP_PREFETCH; 2297our %MAP_PREFETCH;
2184our $MAP_PREFETCHER = undef; 2298our $MAP_PREFETCHER = undef;
2185 2299
2186sub find_async { 2300sub find_async {
2187 my ($path, $origin, $load) = @_; 2301 my ($path, $origin, $load) = @_;
2188 2302
2189 $path = normalise $path, $origin && $origin->{path}; 2303 $path = normalise $path, $origin;
2190 2304
2191 if (my $map = $cf::MAP{$path}) { 2305 if (my $map = $cf::MAP{$path}) {
2192 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2306 return $map if !$load || $map->linkable;
2193 } 2307 }
2194 2308
2195 $MAP_PREFETCH{$path} |= $load; 2309 $MAP_PREFETCH{$path} |= $load;
2196 2310
2197 $MAP_PREFETCHER ||= cf::async { 2311 $MAP_PREFETCHER ||= cf::async {
2211 $MAP_PREFETCHER->prio (6); 2325 $MAP_PREFETCHER->prio (6);
2212 2326
2213 () 2327 ()
2214} 2328}
2215 2329
2330# common code, used by both ->save and ->swapout
2216sub save { 2331sub _save {
2217 my ($self) = @_; 2332 my ($self) = @_;
2218
2219 my $lock = cf::lock_acquire "map_data:$self->{path}";
2220 2333
2221 $self->{last_save} = $cf::RUNTIME; 2334 $self->{last_save} = $cf::RUNTIME;
2222 2335
2223 return unless $self->dirty; 2336 return unless $self->dirty;
2224 2337
2244 } else { 2357 } else {
2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2358 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2246 } 2359 }
2247} 2360}
2248 2361
2362sub save {
2363 my ($self) = @_;
2364
2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2366
2367 $self->_save;
2368}
2369
2249sub swap_out { 2370sub swap_out {
2250 my ($self) = @_; 2371 my ($self) = @_;
2251 2372
2252 # save first because save cedes
2253 $self->save;
2254
2255 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2373 my $lock = cf::lock_acquire "map_data:$self->{path}";
2256 2374
2375 return if !$self->linkable;
2376 return if $self->{deny_save};
2257 return if $self->players; 2377 return if $self->players;
2258 return if $self->in_memory != cf::MAP_ACTIVE;
2259 return if $self->{deny_save};
2260 2378
2379 # first deactivate the map and "unlink" it from the core
2380 $self->deactivate;
2381 $_->clear_links_to ($self) for values %cf::MAP;
2261 $self->in_memory (cf::MAP_SWAPPED); 2382 $self->in_memory (cf::MAP_SWAPPED);
2383
2384 # then atomically save
2385 $self->_save;
2386
2387 # then free the map
2388 $self->clear;
2389}
2390
2391sub reset_at {
2392 my ($self) = @_;
2393
2394 # TODO: safety, remove and allow resettable per-player maps
2395 return 1e99 if $self->{deny_reset};
2396
2397 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2398 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2399
2400 $time + $to
2401}
2402
2403sub should_reset {
2404 my ($self) = @_;
2405
2406 $self->reset_at <= $cf::RUNTIME
2407}
2408
2409sub reset {
2410 my ($self) = @_;
2411
2412 my $lock = cf::lock_acquire "map_data:$self->{path}";
2413
2414 return if $self->players;
2415
2416 cf::trace "resetting map ", $self->path, "\n";
2417
2418 $self->in_memory (cf::MAP_SWAPPED);
2419
2420 # need to save uniques path
2421 unless ($self->{deny_save}) {
2422 my $uniq = $self->uniq_path; utf8::encode $uniq;
2423
2424 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2425 if $uniq;
2426 }
2427
2428 delete $cf::MAP{$self->path};
2262 2429
2263 $self->deactivate; 2430 $self->deactivate;
2264 $_->clear_links_to ($self) for values %cf::MAP; 2431 $_->clear_links_to ($self) for values %cf::MAP;
2265 $self->clear; 2432 $self->clear;
2266}
2267
2268sub reset_at {
2269 my ($self) = @_;
2270
2271 # TODO: safety, remove and allow resettable per-player maps
2272 return 1e99 if $self->{deny_reset};
2273
2274 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2275 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2276
2277 $time + $to
2278}
2279
2280sub should_reset {
2281 my ($self) = @_;
2282
2283 $self->reset_at <= $cf::RUNTIME
2284}
2285
2286sub reset {
2287 my ($self) = @_;
2288
2289 my $lock = cf::lock_acquire "map_data:$self->{path}";
2290
2291 return if $self->players;
2292
2293 warn "resetting map ", $self->path;
2294
2295 $self->in_memory (cf::MAP_SWAPPED);
2296
2297 # need to save uniques path
2298 unless ($self->{deny_save}) {
2299 my $uniq = $self->uniq_path; utf8::encode $uniq;
2300
2301 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2302 if $uniq;
2303 }
2304
2305 delete $cf::MAP{$self->path};
2306
2307 $self->deactivate;
2308 $_->clear_links_to ($self) for values %cf::MAP;
2309 $self->clear;
2310 2433
2311 $self->unlink_save; 2434 $self->unlink_save;
2312 $self->destroy; 2435 $self->destroy;
2313} 2436}
2314 2437
2322 2445
2323 delete $cf::MAP{$self->path}; 2446 delete $cf::MAP{$self->path};
2324 2447
2325 $self->unlink_save; 2448 $self->unlink_save;
2326 2449
2327 bless $self, "cf::map"; 2450 bless $self, "cf::map::wrap";
2328 delete $self->{deny_reset}; 2451 delete $self->{deny_reset};
2329 $self->{deny_save} = 1; 2452 $self->{deny_save} = 1;
2330 $self->reset_timeout (1); 2453 $self->reset_timeout (1);
2331 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2454 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2332 2455
2389 : normalise $_ 2512 : normalise $_
2390 } @{ aio_readdir $UNIQUEDIR or [] } 2513 } @{ aio_readdir $UNIQUEDIR or [] }
2391 ] 2514 ]
2392} 2515}
2393 2516
2517=item cf::map::static_maps
2518
2519Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2520file in the shared directory excluding F</styles> and F</editor>). May
2521block.
2522
2523=cut
2524
2525sub static_maps() {
2526 my @dirs = "";
2527 my @maps;
2528
2529 while (@dirs) {
2530 my $dir = shift @dirs;
2531
2532 next if $dir eq "/styles" || $dir eq "/editor";
2533
2534 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2535 or return;
2536
2537 for (@$files) {
2538 s/\.map$// or next;
2539 utf8::decode $_;
2540 push @maps, "$dir/$_";
2541 }
2542
2543 push @dirs, map "$dir/$_", @$dirs;
2544 }
2545
2546 \@maps
2547}
2548
2394=back 2549=back
2395 2550
2396=head3 cf::object 2551=head3 cf::object
2397 2552
2398=cut 2553=cut
2463 2618
2464our $SAY_CHANNEL = { 2619our $SAY_CHANNEL = {
2465 id => "say", 2620 id => "say",
2466 title => "Map", 2621 title => "Map",
2467 reply => "say ", 2622 reply => "say ",
2468 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2623 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2469}; 2624};
2470 2625
2471our $CHAT_CHANNEL = { 2626our $CHAT_CHANNEL = {
2472 id => "chat", 2627 id => "chat",
2473 title => "Chat", 2628 title => "Chat",
2528 2683
2529=item $player_object->enter_link 2684=item $player_object->enter_link
2530 2685
2531Freezes the player and moves him/her to a special map (C<{link}>). 2686Freezes the player and moves him/her to a special map (C<{link}>).
2532 2687
2533The player should be reasonably safe there for short amounts of time. You 2688The player should be reasonably safe there for short amounts of time (e.g.
2534I<MUST> call C<leave_link> as soon as possible, though. 2689for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2690though, as the player cannot control the character while it is on the link
2691map.
2535 2692
2536Will never block. 2693Will never block.
2537 2694
2538=item $player_object->leave_link ($map, $x, $y) 2695=item $player_object->leave_link ($map, $x, $y)
2539 2696
2559sub cf::object::player::enter_link { 2716sub cf::object::player::enter_link {
2560 my ($self) = @_; 2717 my ($self) = @_;
2561 2718
2562 $self->deactivate_recursive; 2719 $self->deactivate_recursive;
2563 2720
2721 ++$self->{_link_recursion};
2722
2564 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2723 return if UNIVERSAL::isa $self->map, "ext::map_link";
2565 2724
2566 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2725 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2567 if $self->map && $self->map->{path} ne "{link}"; 2726 if $self->map && $self->map->{path} ne "{link}";
2568 2727
2569 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2728 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2570} 2729}
2571 2730
2572sub cf::object::player::leave_link { 2731sub cf::object::player::leave_link {
2573 my ($self, $map, $x, $y) = @_; 2732 my ($self, $map, $x, $y) = @_;
2574 2733
2591 ($x, $y) = (-1, -1) 2750 ($x, $y) = (-1, -1)
2592 unless (defined $x) && (defined $y); 2751 unless (defined $x) && (defined $y);
2593 2752
2594 # use -1 or undef as default coordinates, not 0, 0 2753 # use -1 or undef as default coordinates, not 0, 0
2595 ($x, $y) = ($map->enter_x, $map->enter_y) 2754 ($x, $y) = ($map->enter_x, $map->enter_y)
2596 if $x <=0 && $y <= 0; 2755 if $x <= 0 && $y <= 0;
2597 2756
2598 $map->load; 2757 $map->load;
2599 $map->load_neighbours; 2758 $map->load_neighbours;
2600 2759
2601 return unless $self->contr->active; 2760 return unless $self->contr->active;
2602 $self->activate_recursive;
2603 2761
2604 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2762 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2605 $self->enter_map ($map, $x, $y); 2763 if ($self->enter_map ($map, $x, $y)) {
2606} 2764 # entering was successful
2765 delete $self->{_link_recursion};
2766 # only activate afterwards, to support waiting in hooks
2767 $self->activate_recursive;
2768 }
2607 2769
2770}
2771
2608=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2772=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2609 2773
2610Moves the player to the given map-path and coordinates by first freezing 2774Moves the player to the given map-path and coordinates by first freezing
2611her, loading and preparing them map, calling the provided $check callback 2775her, loading and preparing them map, calling the provided $check callback
2612that has to return the map if sucecssful, and then unfreezes the player on 2776that has to return the map if sucecssful, and then unfreezes the player on
2613the new (success) or old (failed) map position. In either case, $done will 2777the new (success) or old (failed) map position. In either case, $done will
2614be called at the end of this process. 2778be called at the end of this process.
2615 2779
2780Note that $check will be called with a potentially non-loaded map, so if
2781it needs a loaded map it has to call C<< ->load >>.
2782
2616=cut 2783=cut
2617 2784
2618our $GOTOGEN; 2785our $GOTOGEN;
2619 2786
2620sub cf::object::player::goto { 2787sub cf::object::player::goto {
2621 my ($self, $path, $x, $y, $check, $done) = @_; 2788 my ($self, $path, $x, $y, $check, $done) = @_;
2789
2790 if ($self->{_link_recursion} >= $MAX_LINKS) {
2791 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2792 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2793 ($path, $x, $y) = @$EMERGENCY_POSITION;
2794 }
2622 2795
2623 # do generation counting so two concurrent goto's will be executed in-order 2796 # do generation counting so two concurrent goto's will be executed in-order
2624 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2797 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2625 2798
2626 $self->enter_link; 2799 $self->enter_link;
2646 ($path, $x, $y) = (undef, undef, undef); 2819 ($path, $x, $y) = (undef, undef, undef);
2647 } 2820 }
2648 } 2821 }
2649 2822
2650 my $map = eval { 2823 my $map = eval {
2651 my $map = defined $path ? cf::map::find $path : undef; 2824 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2652 2825
2653 if ($map) { 2826 if ($map) {
2654 $map = $map->customise_for ($self); 2827 $map = $map->customise_for ($self);
2655 $map = $check->($map) if $check && $map; 2828 $map = $check->($map, $x, $y, $self) if $check && $map;
2656 } else { 2829 } else {
2657 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2830 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2658 } 2831 }
2659 2832
2660 $map 2833 $map
2668 if ($gen == $self->{_goto_generation}) { 2841 if ($gen == $self->{_goto_generation}) {
2669 delete $self->{_goto_generation}; 2842 delete $self->{_goto_generation};
2670 $self->leave_link ($map, $x, $y); 2843 $self->leave_link ($map, $x, $y);
2671 } 2844 }
2672 2845
2673 $done->() if $done; 2846 $done->($self) if $done;
2674 })->prio (1); 2847 })->prio (1);
2675} 2848}
2676 2849
2677=item $player_object->enter_exit ($exit_object) 2850=item $player_object->enter_exit ($exit_object)
2678 2851
2698} 2871}
2699 2872
2700sub prepare_random_map { 2873sub prepare_random_map {
2701 my ($exit) = @_; 2874 my ($exit) = @_;
2702 2875
2703 my $guard = cf::lock_acquire "exit_prepare:$exit";
2704
2705 # all this does is basically replace the /! path by 2876 # all this does is basically replace the /! path by
2706 # a new random map path (?random/...) with a seed 2877 # a new random map path (?random/...) with a seed
2707 # that depends on the exit object 2878 # that depends on the exit object
2708 2879
2709 my $rmp = parse_random_map_params $exit->msg; 2880 my $rmp = parse_random_map_params $exit->msg;
2711 if ($exit->map) { 2882 if ($exit->map) {
2712 $rmp->{region} = $exit->region->name; 2883 $rmp->{region} = $exit->region->name;
2713 $rmp->{origin_map} = $exit->map->path; 2884 $rmp->{origin_map} = $exit->map->path;
2714 $rmp->{origin_x} = $exit->x; 2885 $rmp->{origin_x} = $exit->x;
2715 $rmp->{origin_y} = $exit->y; 2886 $rmp->{origin_y} = $exit->y;
2887
2888 $exit->map->touch;
2716 } 2889 }
2717 2890
2718 $rmp->{random_seed} ||= $exit->random_seed; 2891 $rmp->{random_seed} ||= $exit->random_seed;
2719 2892
2720 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp); 2893 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2724 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2897 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2725 aio_write $fh, 0, (length $data), $data, 0; 2898 aio_write $fh, 0, (length $data), $data, 0;
2726 undef $fh; 2899 undef $fh;
2727 aio_rename "$meta~", $meta; 2900 aio_rename "$meta~", $meta;
2728 2901
2902 my $slaying = "?random/$md5";
2903
2904 if ($exit->valid) {
2729 $exit->slaying ("?random/$md5"); 2905 $exit->slaying ("?random/$md5");
2730 $exit->msg (undef); 2906 $exit->msg (undef);
2907 }
2731 } 2908 }
2732} 2909}
2733 2910
2734sub cf::object::player::enter_exit { 2911sub cf::object::player::enter_exit {
2735 my ($self, $exit) = @_; 2912 my ($self, $exit) = @_;
2736 2913
2737 return unless $self->type == cf::PLAYER; 2914 return unless $self->type == cf::PLAYER;
2738 2915
2739 if ($exit->slaying eq "/!") {
2740 #TODO: this should de-fi-ni-te-ly not be a sync-job
2741 # the problem is that $exit might not survive long enough
2742 # so it needs to be done right now, right here
2743 cf::sync_job { prepare_random_map $exit };
2744 }
2745
2746 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2747 my $hp = $exit->stats->hp;
2748 my $sp = $exit->stats->sp;
2749
2750 $self->enter_link; 2916 $self->enter_link;
2751 2917
2752 # if exit is damned, update players death & WoR home-position
2753 $self->contr->savebed ($slaying, $hp, $sp)
2754 if $exit->flag (FLAG_DAMNED);
2755
2756 (async { 2918 (async {
2757 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2919 $Coro::current->{desc} = "enter_exit";
2758 2920
2759 $self->deactivate_recursive; # just to be sure
2760 unless (eval { 2921 unless (eval {
2922 $self->deactivate_recursive; # just to be sure
2923
2924 my $map = cf::map::normalise $exit->slaying, $exit->map;
2925 my $x = $exit->stats->hp;
2926 my $y = $exit->stats->sp;
2927
2928 # special map handling
2929 my $slaying = $exit->slaying;
2930
2931 # special map handling
2932 if ($slaying eq "/!") {
2933 my $guard = cf::lock_acquire "exit_prepare:$exit";
2934
2935 prepare_random_map $exit
2936 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2937
2938 $map = $exit->slaying;
2939
2940 } elsif ($slaying eq '!up') {
2941 $map = $exit->map->tile_path (cf::TILE_UP);
2942 $x = $exit->x;
2943 $y = $exit->y;
2944
2945 } elsif ($slaying eq '!down') {
2946 $map = $exit->map->tile_path (cf::TILE_DOWN);
2947 $x = $exit->x;
2948 $y = $exit->y;
2949 }
2950
2761 $self->goto ($slaying, $hp, $sp); 2951 $self->goto ($map, $x, $y);
2762 2952
2953 # if exit is damned, update players death & WoR home-position
2954 $self->contr->savebed ($map, $x, $y)
2955 if $exit->flag (cf::FLAG_DAMNED);
2956
2763 1; 2957 1
2764 }) { 2958 }) {
2765 $self->message ("Something went wrong deep within the crossfire server. " 2959 $self->message ("Something went wrong deep within the deliantra server. "
2766 . "I'll try to bring you back to the map you were before. " 2960 . "I'll try to bring you back to the map you were before. "
2767 . "Please report this to the dungeon master!", 2961 . "Please report this to the dungeon master!",
2768 cf::NDI_UNIQUE | cf::NDI_RED); 2962 cf::NDI_UNIQUE | cf::NDI_RED);
2769 2963
2770 warn "ERROR in enter_exit: $@"; 2964 error "ERROR in enter_exit: $@";
2771 $self->leave_link; 2965 $self->leave_link;
2772 } 2966 }
2773 })->prio (1); 2967 })->prio (1);
2774} 2968}
2775 2969
2787sub cf::client::send_drawinfo { 2981sub cf::client::send_drawinfo {
2788 my ($self, $text, $flags) = @_; 2982 my ($self, $text, $flags) = @_;
2789 2983
2790 utf8::encode $text; 2984 utf8::encode $text;
2791 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2985 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2986}
2987
2988=item $client->send_big_packet ($pkt)
2989
2990Like C<send_packet>, but tries to compress large packets, and fragments
2991them as required.
2992
2993=cut
2994
2995our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2996
2997sub cf::client::send_big_packet {
2998 my ($self, $pkt) = @_;
2999
3000 # try lzf for large packets
3001 $pkt = "lzf " . Compress::LZF::compress $pkt
3002 if 1024 <= length $pkt and $self->{can_lzf};
3003
3004 # split very large packets
3005 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3006 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3007 $pkt = "frag";
3008 }
3009
3010 $self->send_packet ($pkt);
2792} 3011}
2793 3012
2794=item $client->send_msg ($channel, $msg, $color, [extra...]) 3013=item $client->send_msg ($channel, $msg, $color, [extra...])
2795 3014
2796Send a drawinfo or msg packet to the client, formatting the msg for the 3015Send a drawinfo or msg packet to the client, formatting the msg for the
2800 3019
2801=cut 3020=cut
2802 3021
2803# non-persistent channels (usually the info channel) 3022# non-persistent channels (usually the info channel)
2804our %CHANNEL = ( 3023our %CHANNEL = (
3024 "c/motd" => {
3025 id => "infobox",
3026 title => "MOTD",
3027 reply => undef,
3028 tooltip => "The message of the day",
3029 },
2805 "c/identify" => { 3030 "c/identify" => {
2806 id => "infobox", 3031 id => "infobox",
2807 title => "Identify", 3032 title => "Identify",
2808 reply => undef, 3033 reply => undef,
2809 tooltip => "Items recently identified", 3034 tooltip => "Items recently identified",
2811 "c/examine" => { 3036 "c/examine" => {
2812 id => "infobox", 3037 id => "infobox",
2813 title => "Examine", 3038 title => "Examine",
2814 reply => undef, 3039 reply => undef,
2815 tooltip => "Signs and other items you examined", 3040 tooltip => "Signs and other items you examined",
3041 },
3042 "c/shopinfo" => {
3043 id => "infobox",
3044 title => "Shop Info",
3045 reply => undef,
3046 tooltip => "What your bargaining skill tells you about the shop",
2816 }, 3047 },
2817 "c/book" => { 3048 "c/book" => {
2818 id => "infobox", 3049 id => "infobox",
2819 title => "Book", 3050 title => "Book",
2820 reply => undef, 3051 reply => undef,
2836 id => "infobox", 3067 id => "infobox",
2837 title => "Body Parts", 3068 title => "Body Parts",
2838 reply => undef, 3069 reply => undef,
2839 tooltip => "Shows which body parts you posess and are available", 3070 tooltip => "Shows which body parts you posess and are available",
2840 }, 3071 },
3072 "c/statistics" => {
3073 id => "infobox",
3074 title => "Statistics",
3075 reply => undef,
3076 tooltip => "Shows your primary statistics",
3077 },
3078 "c/skills" => {
3079 id => "infobox",
3080 title => "Skills",
3081 reply => undef,
3082 tooltip => "Shows your experience per skill and item power",
3083 },
3084 "c/shopitems" => {
3085 id => "infobox",
3086 title => "Shop Items",
3087 reply => undef,
3088 tooltip => "Shows the items currently for sale in this shop",
3089 },
3090 "c/resistances" => {
3091 id => "infobox",
3092 title => "Resistances",
3093 reply => undef,
3094 tooltip => "Shows your resistances",
3095 },
3096 "c/pets" => {
3097 id => "infobox",
3098 title => "Pets",
3099 reply => undef,
3100 tooltip => "Shows information abotu your pets/a specific pet",
3101 },
3102 "c/perceiveself" => {
3103 id => "infobox",
3104 title => "Perceive Self",
3105 reply => undef,
3106 tooltip => "You gained detailed knowledge about yourself",
3107 },
2841 "c/uptime" => { 3108 "c/uptime" => {
2842 id => "infobox", 3109 id => "infobox",
2843 title => "Uptime", 3110 title => "Uptime",
2844 reply => undef, 3111 reply => undef,
2845 tooltip => "How long the server has been running since last restart", 3112 tooltip => "How long the server has been running since last restart",
2854 id => "party", 3121 id => "party",
2855 title => "Party", 3122 title => "Party",
2856 reply => "gsay ", 3123 reply => "gsay ",
2857 tooltip => "Messages and chat related to your party", 3124 tooltip => "Messages and chat related to your party",
2858 }, 3125 },
3126 "c/death" => {
3127 id => "death",
3128 title => "Death",
3129 reply => undef,
3130 tooltip => "Reason for and more info about your most recent death",
3131 },
3132 "c/say" => $SAY_CHANNEL,
3133 "c/chat" => $CHAT_CHANNEL,
2859); 3134);
2860 3135
2861sub cf::client::send_msg { 3136sub cf::client::send_msg {
2862 my ($self, $channel, $msg, $color, @extra) = @_; 3137 my ($self, $channel, $msg, $color, @extra) = @_;
2863 3138
2864 $msg = $self->pl->expand_cfpod ($msg); 3139 $msg = $self->pl->expand_cfpod ($msg)
3140 unless $color & cf::NDI_VERBATIM;
2865 3141
2866 $color &= cf::NDI_CLIENT_MASK; # just in case... 3142 $color &= cf::NDI_CLIENT_MASK; # just in case...
2867 3143
2868 # check predefined channels, for the benefit of C 3144 # check predefined channels, for the benefit of C
2869 if ($CHANNEL{$channel}) { 3145 if ($CHANNEL{$channel}) {
2870 $channel = $CHANNEL{$channel}; 3146 $channel = $CHANNEL{$channel};
2871 3147
2872 $self->ext_msg (channel_info => $channel) 3148 $self->ext_msg (channel_info => $channel);
2873 if $self->can_msg;
2874
2875 $channel = $channel->{id}; 3149 $channel = $channel->{id};
2876 3150
2877 } elsif (ref $channel) { 3151 } elsif (ref $channel) {
2878 # send meta info to client, if not yet sent 3152 # send meta info to client, if not yet sent
2879 unless (exists $self->{channel}{$channel->{id}}) { 3153 unless (exists $self->{channel}{$channel->{id}}) {
2880 $self->{channel}{$channel->{id}} = $channel; 3154 $self->{channel}{$channel->{id}} = $channel;
2881 $self->ext_msg (channel_info => $channel) 3155 $self->ext_msg (channel_info => $channel);
2882 if $self->can_msg;
2883 } 3156 }
2884 3157
2885 $channel = $channel->{id}; 3158 $channel = $channel->{id};
2886 } 3159 }
2887 3160
2888 return unless @extra || length $msg; 3161 return unless @extra || length $msg;
2889 3162
2890 if ($self->can_msg) {
2891 # default colour, mask it out 3163 # default colour, mask it out
2892 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3164 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2893 if $color & cf::NDI_DEF; 3165 if $color & cf::NDI_DEF;
2894 3166
2895 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3167 my $pkt = "msg "
3168 . $self->{json_coder}->encode (
2896 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3169 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2897 } else { 3170 );
2898 if ($color >= 0) {
2899 # replace some tags by gcfclient-compatible ones
2900 for ($msg) {
2901 1 while
2902 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2903 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2904 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2905 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2906 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2907 }
2908 3171
2909 $color &= cf::NDI_COLOR_MASK; 3172 $self->send_big_packet ($pkt);
2910
2911 utf8::encode $msg;
2912
2913 if (0 && $msg =~ /\[/) {
2914 # COMMAND/INFO
2915 $self->send_packet ("drawextinfo $color 10 8 $msg")
2916 } else {
2917 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2918 $self->send_packet ("drawinfo $color $msg")
2919 }
2920 }
2921 }
2922} 3173}
2923 3174
2924=item $client->ext_msg ($type, @msg) 3175=item $client->ext_msg ($type, @msg)
2925 3176
2926Sends an ext event to the client. 3177Sends an ext event to the client.
2929 3180
2930sub cf::client::ext_msg($$@) { 3181sub cf::client::ext_msg($$@) {
2931 my ($self, $type, @msg) = @_; 3182 my ($self, $type, @msg) = @_;
2932 3183
2933 if ($self->extcmd == 2) { 3184 if ($self->extcmd == 2) {
2934 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3185 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2935 } elsif ($self->extcmd == 1) { # TODO: remove 3186 } elsif ($self->extcmd == 1) { # TODO: remove
2936 push @msg, msgtype => "event_$type"; 3187 push @msg, msgtype => "event_$type";
2937 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3188 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2938 } 3189 }
2939} 3190}
2940 3191
2941=item $client->ext_reply ($msgid, @msg) 3192=item $client->ext_reply ($msgid, @msg)
2942 3193
2946 3197
2947sub cf::client::ext_reply($$@) { 3198sub cf::client::ext_reply($$@) {
2948 my ($self, $id, @msg) = @_; 3199 my ($self, $id, @msg) = @_;
2949 3200
2950 if ($self->extcmd == 2) { 3201 if ($self->extcmd == 2) {
2951 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3202 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2952 } elsif ($self->extcmd == 1) { 3203 } elsif ($self->extcmd == 1) {
2953 #TODO: version 1, remove 3204 #TODO: version 1, remove
2954 unshift @msg, msgtype => "reply", msgid => $id; 3205 unshift @msg, msgtype => "reply", msgid => $id;
2955 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3206 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2956 } 3207 }
2957} 3208}
2958 3209
2959=item $success = $client->query ($flags, "text", \&cb) 3210=item $success = $client->query ($flags, "text", \&cb)
2960 3211
3031 3282
3032 $ns->ext_reply ($reply, @reply) 3283 $ns->ext_reply ($reply, @reply)
3033 if $reply; 3284 if $reply;
3034 3285
3035 } else { 3286 } else {
3036 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3287 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3037 } 3288 }
3038 3289
3039 cf::override; 3290 cf::override;
3040 }, 3291 },
3041); 3292);
3061 3312
3062 $coro 3313 $coro
3063} 3314}
3064 3315
3065cf::client->attach ( 3316cf::client->attach (
3066 on_destroy => sub { 3317 on_client_destroy => sub {
3067 my ($ns) = @_; 3318 my ($ns) = @_;
3068 3319
3069 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3320 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3070 }, 3321 },
3071); 3322);
3087our $safe_hole = new Safe::Hole; 3338our $safe_hole = new Safe::Hole;
3088 3339
3089$SIG{FPE} = 'IGNORE'; 3340$SIG{FPE} = 'IGNORE';
3090 3341
3091$safe->permit_only (Opcode::opset qw( 3342$safe->permit_only (Opcode::opset qw(
3092 :base_core :base_mem :base_orig :base_math 3343 :base_core :base_mem :base_orig :base_math :base_loop
3093 grepstart grepwhile mapstart mapwhile 3344 grepstart grepwhile mapstart mapwhile
3094 sort time 3345 sort time
3095)); 3346));
3096 3347
3097# here we export the classes and methods available to script code 3348# here we export the classes and methods available to script code
3101The following functions and methods are available within a safe environment: 3352The following functions and methods are available within a safe environment:
3102 3353
3103 cf::object 3354 cf::object
3104 contr pay_amount pay_player map x y force_find force_add destroy 3355 contr pay_amount pay_player map x y force_find force_add destroy
3105 insert remove name archname title slaying race decrease split 3356 insert remove name archname title slaying race decrease split
3357 value
3106 3358
3107 cf::object::player 3359 cf::object::player
3108 player 3360 player
3109 3361
3110 cf::player 3362 cf::player
3115 3367
3116=cut 3368=cut
3117 3369
3118for ( 3370for (
3119 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3371 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3120 insert remove inv name archname title slaying race 3372 insert remove inv nrof name archname title slaying race
3121 decrease split destroy)], 3373 decrease split destroy change_exp value msg lore send_msg)],
3122 ["cf::object::player" => qw(player)], 3374 ["cf::object::player" => qw(player)],
3123 ["cf::player" => qw(peaceful)], 3375 ["cf::player" => qw(peaceful send_msg)],
3124 ["cf::map" => qw(trigger)], 3376 ["cf::map" => qw(trigger)],
3125) { 3377) {
3126 no strict 'refs';
3127 my ($pkg, @funs) = @$_; 3378 my ($pkg, @funs) = @$_;
3128 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3379 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3129 for @funs; 3380 for @funs;
3130} 3381}
3131 3382
3146 3397
3147 my $qcode = $code; 3398 my $qcode = $code;
3148 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3399 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3149 $qcode =~ s/\n/\\n/g; 3400 $qcode =~ s/\n/\\n/g;
3150 3401
3402 %vars = (_dummy => 0) unless %vars;
3403
3404 my @res;
3151 local $_; 3405 local $_;
3152 local @safe::cf::_safe_eval_args = values %vars;
3153 3406
3154 my $eval = 3407 my $eval =
3155 "do {\n" 3408 "do {\n"
3156 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3409 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3157 . "#line 0 \"{$qcode}\"\n" 3410 . "#line 0 \"{$qcode}\"\n"
3158 . $code 3411 . $code
3159 . "\n}" 3412 . "\n}"
3160 ; 3413 ;
3161 3414
3415 if ($CFG{safe_eval}) {
3162 sub_generation_inc; 3416 sub_generation_inc;
3417 local @safe::cf::_safe_eval_args = values %vars;
3163 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3418 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3164 sub_generation_inc; 3419 sub_generation_inc;
3420 } else {
3421 local @cf::_safe_eval_args = values %vars;
3422 @res = wantarray ? eval eval : scalar eval $eval;
3423 }
3165 3424
3166 if ($@) { 3425 if ($@) {
3167 warn "$@"; 3426 warn "$@",
3168 warn "while executing safe code '$code'\n"; 3427 "while executing safe code '$code'\n",
3169 warn "with arguments " . (join " ", %vars) . "\n"; 3428 "with arguments " . (join " ", %vars) . "\n";
3170 } 3429 }
3171 3430
3172 wantarray ? @res : $res[0] 3431 wantarray ? @res : $res[0]
3173} 3432}
3174 3433
3188=cut 3447=cut
3189 3448
3190sub register_script_function { 3449sub register_script_function {
3191 my ($fun, $cb) = @_; 3450 my ($fun, $cb) = @_;
3192 3451
3193 no strict 'refs'; 3452 $fun = "safe::$fun" if $CFG{safe_eval};
3194 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3453 *$fun = $safe_hole->wrap ($cb);
3195} 3454}
3196 3455
3197=back 3456=back
3198 3457
3199=cut 3458=cut
3208 # for this (global event?) 3467 # for this (global event?)
3209 %ext::player_env::MUSIC_FACE_CACHE = (); 3468 %ext::player_env::MUSIC_FACE_CACHE = ();
3210 3469
3211 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3470 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3212 3471
3213 warn "loading facedata from $path\n"; 3472 trace "loading facedata from $path\n";
3214 3473
3215 my $facedata; 3474 my $facedata = decode_storable load_file $path;
3216 0 < aio_load $path, $facedata
3217 or die "$path: $!";
3218
3219 $facedata = Coro::Storable::thaw $facedata;
3220 3475
3221 $facedata->{version} == 2 3476 $facedata->{version} == 2
3222 or cf::cleanup "$path: version mismatch, cannot proceed."; 3477 or cf::cleanup "$path: version mismatch, cannot proceed.";
3223 3478
3224 # patch in the exptable 3479 # patch in the exptable
3480 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3225 $facedata->{resource}{"res/exp_table"} = { 3481 $facedata->{resource}{"res/exp_table"} = {
3226 type => FT_RSRC, 3482 type => FT_RSRC,
3227 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3483 data => $exp_table,
3484 hash => (Digest::MD5::md5 $exp_table),
3228 }; 3485 };
3229 cf::cede_to_tick; 3486 cf::cede_to_tick;
3230 3487
3231 { 3488 {
3232 my $faces = $facedata->{faceinfo}; 3489 my $faces = $facedata->{faceinfo};
3234 while (my ($face, $info) = each %$faces) { 3491 while (my ($face, $info) = each %$faces) {
3235 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3492 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3236 3493
3237 cf::face::set_visibility $idx, $info->{visibility}; 3494 cf::face::set_visibility $idx, $info->{visibility};
3238 cf::face::set_magicmap $idx, $info->{magicmap}; 3495 cf::face::set_magicmap $idx, $info->{magicmap};
3239 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3496 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3240 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3497 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3498 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3241 3499
3242 cf::cede_to_tick; 3500 cf::cede_to_tick;
3243 } 3501 }
3244 3502
3245 while (my ($face, $info) = each %$faces) { 3503 while (my ($face, $info) = each %$faces) {
3250 3508
3251 if (my $smooth = cf::face::find $info->{smooth}) { 3509 if (my $smooth = cf::face::find $info->{smooth}) {
3252 cf::face::set_smooth $idx, $smooth; 3510 cf::face::set_smooth $idx, $smooth;
3253 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3511 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3254 } else { 3512 } else {
3255 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3513 error "smooth face '$info->{smooth}' not found for face '$face'";
3256 } 3514 }
3257 3515
3258 cf::cede_to_tick; 3516 cf::cede_to_tick;
3259 } 3517 }
3260 } 3518 }
3269 3527
3270 cf::anim::invalidate_all; # d'oh 3528 cf::anim::invalidate_all; # d'oh
3271 } 3529 }
3272 3530
3273 { 3531 {
3274 # TODO: for gcfclient pleasure, we should give resources
3275 # that gcfclient doesn't grok a >10000 face index.
3276 my $res = $facedata->{resource}; 3532 my $res = $facedata->{resource};
3277 3533
3278 while (my ($name, $info) = each %$res) { 3534 while (my ($name, $info) = each %$res) {
3279 if (defined $info->{type}) { 3535 if (defined $info->{type}) {
3280 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3536 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3281 my $data;
3282 3537
3283 if ($info->{type} & 1) { 3538 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3284 # prepend meta info
3285
3286 my $meta = $enc->encode ({
3287 name => $name,
3288 %{ $info->{meta} || {} },
3289 });
3290
3291 $data = pack "(w/a*)*", $meta, $info->{data};
3292 } else {
3293 $data = $info->{data};
3294 }
3295
3296 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3297 cf::face::set_type $idx, $info->{type}; 3539 cf::face::set_type $idx, $info->{type};
3298 } else { 3540 } else {
3299 $RESOURCE{$name} = $info; 3541 $RESOURCE{$name} = $info; # unused
3300 } 3542 }
3301 3543
3302 cf::cede_to_tick; 3544 cf::cede_to_tick;
3303 } 3545 }
3304 } 3546 }
3305 3547
3306 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3548 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3307 3549
3308 1 3550 1
3309} 3551}
3310
3311cf::global->attach (on_resource_update => sub {
3312 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3313 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3314
3315 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3316 my $sound = $soundconf->{compat}[$_]
3317 or next;
3318
3319 my $face = cf::face::find "sound/$sound->[1]";
3320 cf::sound::set $sound->[0] => $face;
3321 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3322 }
3323
3324 while (my ($k, $v) = each %{$soundconf->{event}}) {
3325 my $face = cf::face::find "sound/$v";
3326 cf::sound::set $k => $face;
3327 }
3328 }
3329});
3330 3552
3331register_exticmd fx_want => sub { 3553register_exticmd fx_want => sub {
3332 my ($ns, $want) = @_; 3554 my ($ns, $want) = @_;
3333 3555
3334 while (my ($k, $v) = each %$want) { 3556 while (my ($k, $v) = each %$want) {
3373sub reload_treasures { 3595sub reload_treasures {
3374 load_resource_file "$DATADIR/treasures" 3596 load_resource_file "$DATADIR/treasures"
3375 or die "unable to load treasurelists\n"; 3597 or die "unable to load treasurelists\n";
3376} 3598}
3377 3599
3600sub reload_sound {
3601 trace "loading sound config from $DATADIR/sound\n";
3602
3603 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3604
3605 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3606 my $sound = $soundconf->{compat}[$_]
3607 or next;
3608
3609 my $face = cf::face::find "sound/$sound->[1]";
3610 cf::sound::set $sound->[0] => $face;
3611 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3612 }
3613
3614 while (my ($k, $v) = each %{$soundconf->{event}}) {
3615 my $face = cf::face::find "sound/$v";
3616 cf::sound::set $k => $face;
3617 }
3618}
3619
3378sub reload_resources { 3620sub reload_resources {
3379 warn "reloading resource files...\n"; 3621 trace "reloading resource files...\n";
3380 3622
3623 reload_exp_table;
3624 reload_materials;
3381 reload_facedata; 3625 reload_facedata;
3626 reload_sound;
3382 reload_archetypes; 3627 reload_archetypes;
3383 reload_regions; 3628 reload_regions;
3384 reload_treasures; 3629 reload_treasures;
3385 3630
3386 warn "finished reloading resource files\n"; 3631 trace "finished reloading resource files\n";
3387}
3388
3389sub init {
3390 my $guard = freeze_mainloop;
3391
3392 reload_resources;
3393} 3632}
3394 3633
3395sub reload_config { 3634sub reload_config {
3396 open my $fh, "<:utf8", "$CONFDIR/config" 3635 trace "reloading config file...\n";
3397 or return;
3398 3636
3399 local $/; 3637 my $config = load_file "$CONFDIR/config";
3400 *CFG = YAML::Load <$fh>; 3638 utf8::decode $config;
3639 *CFG = decode_yaml $config;
3401 3640
3402 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3641 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3403 3642
3404 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3643 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3405 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3644 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3406 3645
3407 if (exists $CFG{mlockall}) { 3646 if (exists $CFG{mlockall}) {
3411 }; 3650 };
3412 warn $@ if $@; 3651 warn $@ if $@;
3413 } 3652 }
3414} 3653}
3415 3654
3655sub pidfile() {
3656 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3657 or die "$PIDFILE: $!";
3658 flock $fh, &Fcntl::LOCK_EX
3659 or die "$PIDFILE: flock: $!";
3660 $fh
3661}
3662
3663# make sure only one server instance is running at any one time
3664sub atomic {
3665 my $fh = pidfile;
3666
3667 my $pid = <$fh>;
3668 kill 9, $pid if $pid > 0;
3669
3670 seek $fh, 0, 0;
3671 print $fh $$;
3672}
3673
3674sub main_loop {
3675 trace "EV::loop starting\n";
3676 if (1) {
3677 EV::loop;
3678 }
3679 trace "EV::loop returned\n";
3680 goto &main_loop unless $REALLY_UNLOOP;
3681}
3682
3416sub main { 3683sub main {
3684 cf::init_globals; # initialise logging
3685
3686 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3687 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3688 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3689 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3690
3691 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3692
3417 # we must not ever block the main coroutine 3693 # we must not ever block the main coroutine
3418 local $Coro::idle = sub { 3694 local $Coro::idle = sub {
3419 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3695 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3420 (async { 3696 (async {
3421 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3697 $Coro::current->{desc} = "IDLE BUG HANDLER";
3422 EV::loop EV::LOOP_ONESHOT; 3698 EV::loop EV::LOOP_ONESHOT;
3423 })->prio (Coro::PRIO_MAX); 3699 })->prio (Coro::PRIO_MAX);
3424 }; 3700 };
3425 3701
3426 { 3702 evthread_start IO::AIO::poll_fileno;
3427 my $guard = freeze_mainloop; 3703
3704 cf::sync_job {
3705 cf::incloader::init ();
3706
3707 cf::init_anim;
3708 cf::init_attackmess;
3709 cf::init_dynamic;
3710
3711 cf::load_settings;
3712
3713 reload_resources;
3428 reload_config; 3714 reload_config;
3429 db_init; 3715 db_init;
3716
3717 cf::init_uuid;
3718 cf::init_signals;
3719 cf::init_skills;
3720
3721 cf::init_beforeplay;
3722
3723 atomic;
3724
3430 load_extensions; 3725 load_extensions;
3431 3726
3432 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3727 utime time, time, $RUNTIMEFILE;
3433 evthread_start IO::AIO::poll_fileno; 3728
3729 # no (long-running) fork's whatsoever before this point(!)
3730 use POSIX ();
3731 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3732
3733 cf::_post_init 0;
3434 } 3734 };
3435 3735
3436 EV::loop; 3736 cf::object::thawer::errors_are_fatal 0;
3737 info "parse errors in files are no longer fatal from this point on.\n";
3738
3739 my $free_main; $free_main = EV::idle sub {
3740 undef $free_main;
3741 undef &main; # free gobs of memory :)
3742 };
3743
3744 goto &main_loop;
3437} 3745}
3438 3746
3439############################################################################# 3747#############################################################################
3440# initialisation and cleanup 3748# initialisation and cleanup
3441 3749
3442# install some emergency cleanup handlers 3750# install some emergency cleanup handlers
3443BEGIN { 3751BEGIN {
3444 our %SIGWATCHER = (); 3752 our %SIGWATCHER = ();
3445 for my $signal (qw(INT HUP TERM)) { 3753 for my $signal (qw(INT HUP TERM)) {
3446 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3754 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3447 cf::cleanup "SIG$signal"; 3755 cf::cleanup "SIG$signal";
3448 }; 3756 };
3449 } 3757 }
3450} 3758}
3451 3759
3452sub write_runtime_sync { 3760sub write_runtime_sync {
3453 my $runtime = "$LOCALDIR/runtime"; 3761 my $t0 = AE::time;
3454 3762
3455 # first touch the runtime file to show we are still running: 3763 # first touch the runtime file to show we are still running:
3456 # the fsync below can take a very very long time. 3764 # the fsync below can take a very very long time.
3457 3765
3458 IO::AIO::aio_utime $runtime, undef, undef; 3766 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3459 3767
3460 my $guard = cf::lock_acquire "write_runtime"; 3768 my $guard = cf::lock_acquire "write_runtime";
3461 3769
3462 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3770 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3463 or return; 3771 or return;
3464 3772
3465 my $value = $cf::RUNTIME + 90 + 10; 3773 my $value = $cf::RUNTIME + 90 + 10;
3466 # 10 is the runtime save interval, for a monotonic clock 3774 # 10 is the runtime save interval, for a monotonic clock
3467 # 60 allows for the watchdog to kill the server. 3775 # 60 allows for the watchdog to kill the server.
3477 aio_utime $fh, undef, undef; 3785 aio_utime $fh, undef, undef;
3478 3786
3479 close $fh 3787 close $fh
3480 or return; 3788 or return;
3481 3789
3482 aio_rename "$runtime~", $runtime 3790 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3483 and return; 3791 and return;
3484 3792
3485 warn "runtime file written.\n"; 3793 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3486 3794
3487 1 3795 1
3488} 3796}
3489 3797
3490our $uuid_lock; 3798our $uuid_lock;
3499 my $uuid = "$LOCALDIR/uuid"; 3807 my $uuid = "$LOCALDIR/uuid";
3500 3808
3501 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3809 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3502 or return; 3810 or return;
3503 3811
3504 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3812 my $value = uuid_seq uuid_cur;
3813
3814 unless ($value) {
3815 info "cowardly refusing to write zero uuid value!\n";
3816 return;
3817 }
3818
3819 my $value = uuid_str $value + $uuid_skip;
3505 $uuid_skip = 0; 3820 $uuid_skip = 0;
3506 3821
3507 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3822 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3508 and return; 3823 and return;
3509 3824
3515 or return; 3830 or return;
3516 3831
3517 aio_rename "$uuid~", $uuid 3832 aio_rename "$uuid~", $uuid
3518 and return; 3833 and return;
3519 3834
3520 warn "uuid file written ($value).\n"; 3835 trace "uuid file written ($value).\n";
3521 3836
3522 1 3837 1
3523 3838
3524} 3839}
3525 3840
3531} 3846}
3532 3847
3533sub emergency_save() { 3848sub emergency_save() {
3534 my $freeze_guard = cf::freeze_mainloop; 3849 my $freeze_guard = cf::freeze_mainloop;
3535 3850
3536 warn "enter emergency perl save\n"; 3851 info "emergency_perl_save: enter\n";
3852
3853 # this is a trade-off: we want to be very quick here, so
3854 # save all maps without fsync, and later call a global sync
3855 # (which in turn might be very very slow)
3856 local $USE_FSYNC = 0;
3537 3857
3538 cf::sync_job { 3858 cf::sync_job {
3859 cf::write_runtime_sync; # external watchdog should not bark
3860
3539 # use a peculiar iteration method to avoid tripping on perl 3861 # use a peculiar iteration method to avoid tripping on perl
3540 # refcount bugs in for. also avoids problems with players 3862 # refcount bugs in for. also avoids problems with players
3541 # and maps saved/destroyed asynchronously. 3863 # and maps saved/destroyed asynchronously.
3542 warn "begin emergency player save\n"; 3864 info "emergency_perl_save: begin player save\n";
3543 for my $login (keys %cf::PLAYER) { 3865 for my $login (keys %cf::PLAYER) {
3544 my $pl = $cf::PLAYER{$login} or next; 3866 my $pl = $cf::PLAYER{$login} or next;
3545 $pl->valid or next; 3867 $pl->valid or next;
3546 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3868 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3547 $pl->save; 3869 $pl->save;
3548 } 3870 }
3549 warn "end emergency player save\n"; 3871 info "emergency_perl_save: end player save\n";
3550 3872
3551 warn "begin emergency map save\n"; 3873 cf::write_runtime_sync; # external watchdog should not bark
3874
3875 info "emergency_perl_save: begin map save\n";
3552 for my $path (keys %cf::MAP) { 3876 for my $path (keys %cf::MAP) {
3553 my $map = $cf::MAP{$path} or next; 3877 my $map = $cf::MAP{$path} or next;
3554 $map->valid or next; 3878 $map->valid or next;
3555 $map->save; 3879 $map->save;
3556 } 3880 }
3557 warn "end emergency map save\n"; 3881 info "emergency_perl_save: end map save\n";
3558 3882
3559 warn "begin emergency database checkpoint\n"; 3883 cf::write_runtime_sync; # external watchdog should not bark
3884
3885 info "emergency_perl_save: begin database checkpoint\n";
3560 BDB::db_env_txn_checkpoint $DB_ENV; 3886 BDB::db_env_txn_checkpoint $DB_ENV;
3561 warn "end emergency database checkpoint\n"; 3887 info "emergency_perl_save: end database checkpoint\n";
3562 3888
3563 warn "begin write uuid\n"; 3889 info "emergency_perl_save: begin write uuid\n";
3564 write_uuid_sync 1; 3890 write_uuid_sync 1;
3565 warn "end write uuid\n"; 3891 info "emergency_perl_save: end write uuid\n";
3892
3893 cf::write_runtime_sync; # external watchdog should not bark
3894
3895 trace "emergency_perl_save: syncing database to disk";
3896 BDB::db_env_txn_checkpoint $DB_ENV;
3897
3898 info "emergency_perl_save: starting sync\n";
3899 IO::AIO::aio_sync sub {
3900 info "emergency_perl_save: finished sync\n";
3901 };
3902
3903 cf::write_runtime_sync; # external watchdog should not bark
3904
3905 trace "emergency_perl_save: flushing outstanding aio requests";
3906 while (IO::AIO::nreqs || BDB::nreqs) {
3907 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3908 }
3909
3910 cf::write_runtime_sync; # external watchdog should not bark
3566 }; 3911 };
3567 3912
3568 warn "leave emergency perl save\n"; 3913 info "emergency_perl_save: leave\n";
3569} 3914}
3570 3915
3571sub post_cleanup { 3916sub post_cleanup {
3572 my ($make_core) = @_; 3917 my ($make_core) = @_;
3573 3918
3919 IO::AIO::flush;
3920
3574 warn Carp::longmess "post_cleanup backtrace" 3921 error Carp::longmess "post_cleanup backtrace"
3575 if $make_core; 3922 if $make_core;
3923
3924 my $fh = pidfile;
3925 unlink $PIDFILE if <$fh> == $$;
3926}
3927
3928# a safer delete_package, copied from Symbol
3929sub clear_package($) {
3930 my $pkg = shift;
3931
3932 # expand to full symbol table name if needed
3933 unless ($pkg =~ /^main::.*::$/) {
3934 $pkg = "main$pkg" if $pkg =~ /^::/;
3935 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3936 $pkg .= '::' unless $pkg =~ /::$/;
3937 }
3938
3939 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3940 my $stem_symtab = *{$stem}{HASH};
3941
3942 defined $stem_symtab and exists $stem_symtab->{$leaf}
3943 or return;
3944
3945 # clear all symbols
3946 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3947 for my $name (keys %$leaf_symtab) {
3948 _gv_clear *{"$pkg$name"};
3949# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3950 }
3576} 3951}
3577 3952
3578sub do_reload_perl() { 3953sub do_reload_perl() {
3579 # can/must only be called in main 3954 # can/must only be called in main
3580 if ($Coro::current != $Coro::main) { 3955 unless (in_main) {
3581 warn "can only reload from main coroutine"; 3956 error "can only reload from main coroutine";
3582 return; 3957 return;
3583 } 3958 }
3584 3959
3585 warn "reloading..."; 3960 return if $RELOAD++;
3586 3961
3587 warn "entering sync_job"; 3962 my $t1 = AE::time;
3588 3963
3964 while ($RELOAD) {
3965 cf::get_slot 0.1, -1, "reload_perl";
3966 info "perl_reload: reloading...";
3967
3968 trace "perl_reload: entering sync_job";
3969
3589 cf::sync_job { 3970 cf::sync_job {
3590 cf::write_runtime_sync; # external watchdog should not bark
3591 cf::emergency_save; 3971 #cf::emergency_save;
3592 cf::write_runtime_sync; # external watchdog should not bark
3593 3972
3594 warn "syncing database to disk";
3595 BDB::db_env_txn_checkpoint $DB_ENV;
3596
3597 # if anything goes wrong in here, we should simply crash as we already saved
3598
3599 warn "flushing outstanding aio requests";
3600 for (;;) {
3601 BDB::flush;
3602 IO::AIO::flush;
3603 Coro::cede_notself;
3604 last unless IO::AIO::nreqs || BDB::nreqs;
3605 warn "iterate...";
3606 }
3607
3608 ++$RELOAD;
3609
3610 warn "cancelling all extension coros"; 3973 trace "perl_reload: cancelling all extension coros";
3611 $_->cancel for values %EXT_CORO; 3974 $_->cancel for values %EXT_CORO;
3612 %EXT_CORO = (); 3975 %EXT_CORO = ();
3613 3976
3614 warn "removing commands"; 3977 trace "perl_reload: removing commands";
3615 %COMMAND = (); 3978 %COMMAND = ();
3616 3979
3617 warn "removing ext/exti commands"; 3980 trace "perl_reload: removing ext/exti commands";
3618 %EXTCMD = (); 3981 %EXTCMD = ();
3619 %EXTICMD = (); 3982 %EXTICMD = ();
3620 3983
3621 warn "unloading/nuking all extensions"; 3984 trace "perl_reload: unloading/nuking all extensions";
3622 for my $pkg (@EXTS) { 3985 for my $pkg (@EXTS) {
3623 warn "... unloading $pkg"; 3986 trace "... unloading $pkg";
3624 3987
3625 if (my $cb = $pkg->can ("unload")) { 3988 if (my $cb = $pkg->can ("unload")) {
3626 eval { 3989 eval {
3627 $cb->($pkg); 3990 $cb->($pkg);
3628 1 3991 1
3629 } or warn "$pkg unloaded, but with errors: $@"; 3992 } or error "$pkg unloaded, but with errors: $@";
3993 }
3994
3995 trace "... clearing $pkg";
3996 clear_package $pkg;
3630 } 3997 }
3631 3998
3632 warn "... nuking $pkg";
3633 Symbol::delete_package $pkg;
3634 }
3635
3636 warn "unloading all perl modules loaded from $LIBDIR"; 3999 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3637 while (my ($k, $v) = each %INC) { 4000 while (my ($k, $v) = each %INC) {
3638 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4001 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3639 4002
3640 warn "... unloading $k"; 4003 trace "... unloading $k";
3641 delete $INC{$k}; 4004 delete $INC{$k};
3642 4005
3643 $k =~ s/\.pm$//; 4006 $k =~ s/\.pm$//;
3644 $k =~ s/\//::/g; 4007 $k =~ s/\//::/g;
3645 4008
3646 if (my $cb = $k->can ("unload_module")) { 4009 if (my $cb = $k->can ("unload_module")) {
3647 $cb->(); 4010 $cb->();
4011 }
4012
4013 clear_package $k;
3648 } 4014 }
3649 4015
3650 Symbol::delete_package $k;
3651 }
3652
3653 warn "getting rid of safe::, as good as possible"; 4016 trace "perl_reload: getting rid of safe::, as good as possible";
3654 Symbol::delete_package "safe::$_" 4017 clear_package "safe::$_"
3655 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4018 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3656 4019
3657 warn "unloading cf.pm \"a bit\""; 4020 trace "perl_reload: unloading cf.pm \"a bit\"";
3658 delete $INC{"cf.pm"}; 4021 delete $INC{"cf.pm"};
3659 delete $INC{"cf/pod.pm"}; 4022 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3660 4023
3661 # don't, removes xs symbols, too, 4024 # don't, removes xs symbols, too,
3662 # and global variables created in xs 4025 # and global variables created in xs
3663 #Symbol::delete_package __PACKAGE__; 4026 #clear_package __PACKAGE__;
3664 4027
3665 warn "unload completed, starting to reload now"; 4028 info "perl_reload: unload completed, starting to reload now";
3666 4029
3667 warn "reloading cf.pm"; 4030 trace "perl_reload: reloading cf.pm";
3668 require cf; 4031 require cf;
3669 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4032 cf::_connect_to_perl_1;
3670 4033
3671 warn "loading config and database again"; 4034 trace "perl_reload: loading config and database again";
3672 cf::reload_config; 4035 cf::reload_config;
3673 4036
3674 warn "loading extensions"; 4037 trace "perl_reload: loading extensions";
3675 cf::load_extensions; 4038 cf::load_extensions;
3676 4039
4040 if ($REATTACH_ON_RELOAD) {
3677 warn "reattaching attachments to objects/players"; 4041 trace "perl_reload: reattaching attachments to objects/players";
3678 _global_reattach; # objects, sockets 4042 _global_reattach; # objects, sockets
3679 warn "reattaching attachments to maps"; 4043 trace "perl_reload: reattaching attachments to maps";
3680 reattach $_ for values %MAP; 4044 reattach $_ for values %MAP;
3681 warn "reattaching attachments to players"; 4045 trace "perl_reload: reattaching attachments to players";
3682 reattach $_ for values %PLAYER; 4046 reattach $_ for values %PLAYER;
4047 }
3683 4048
3684 warn "leaving sync_job"; 4049 cf::_post_init 1;
3685 4050
4051 trace "perl_reload: leaving sync_job";
4052
3686 1 4053 1
3687 } or do { 4054 } or do {
3688 warn $@; 4055 error $@;
3689 cf::cleanup "error while reloading, exiting."; 4056 cf::cleanup "perl_reload: error, exiting.";
4057 };
4058
4059 --$RELOAD;
3690 }; 4060 }
3691 4061
3692 warn "reloaded"; 4062 $t1 = AE::time - $t1;
4063 info "perl_reload: completed in ${t1}s\n";
3693}; 4064};
3694 4065
3695our $RELOAD_WATCHER; # used only during reload 4066our $RELOAD_WATCHER; # used only during reload
3696 4067
3697sub reload_perl() { 4068sub reload_perl() {
3698 # doing reload synchronously and two reloads happen back-to-back, 4069 # doing reload synchronously and two reloads happen back-to-back,
3699 # coro crashes during coro_state_free->destroy here. 4070 # coro crashes during coro_state_free->destroy here.
3700 4071
4072 $RELOAD_WATCHER ||= cf::async {
4073 Coro::AIO::aio_wait cache_extensions;
4074
3701 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4075 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3702 do_reload_perl; 4076 do_reload_perl;
3703 undef $RELOAD_WATCHER; 4077 undef $RELOAD_WATCHER;
4078 };
3704 }; 4079 };
3705} 4080}
3706 4081
3707register_command "reload" => sub { 4082register_command "reload" => sub {
3708 my ($who, $arg) = @_; 4083 my ($who, $arg) = @_;
3714 reload_perl; 4089 reload_perl;
3715 }; 4090 };
3716 } 4091 }
3717}; 4092};
3718 4093
3719unshift @INC, $LIBDIR; 4094#############################################################################
3720 4095
3721my $bug_warning = 0; 4096my $bug_warning = 0;
3722 4097
3723our @WAIT_FOR_TICK; 4098our @WAIT_FOR_TICK;
3724our @WAIT_FOR_TICK_BEGIN; 4099our @WAIT_FOR_TICK_BEGIN;
3725 4100
3726sub wait_for_tick { 4101sub wait_for_tick() {
3727 return if tick_inhibit || $Coro::current == $Coro::main; 4102 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3728 4103
3729 my $signal = new Coro::Signal; 4104 my $signal = new Coro::Signal;
3730 push @WAIT_FOR_TICK, $signal; 4105 push @WAIT_FOR_TICK, $signal;
3731 $signal->wait; 4106 $signal->wait;
3732} 4107}
3733 4108
3734sub wait_for_tick_begin { 4109sub wait_for_tick_begin() {
3735 return if tick_inhibit || $Coro::current == $Coro::main; 4110 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3736 4111
3737 my $signal = new Coro::Signal; 4112 my $signal = new Coro::Signal;
3738 push @WAIT_FOR_TICK_BEGIN, $signal; 4113 push @WAIT_FOR_TICK_BEGIN, $signal;
3739 $signal->wait; 4114 $signal->wait;
3740} 4115}
3746 return; 4121 return;
3747 } 4122 }
3748 4123
3749 cf::server_tick; # one server iteration 4124 cf::server_tick; # one server iteration
3750 4125
4126 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4127
3751 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4128 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3752 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4129 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3753 Coro::async_pool { 4130 Coro::async_pool {
3754 $Coro::current->{desc} = "runtime saver"; 4131 $Coro::current->{desc} = "runtime saver";
3755 write_runtime_sync 4132 write_runtime_sync
3756 or warn "ERROR: unable to write runtime file: $!"; 4133 or error "ERROR: unable to write runtime file: $!";
3757 }; 4134 };
3758 } 4135 }
3759 4136
3760 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4137 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3761 $sig->send; 4138 $sig->send;
3769 4146
3770 if (0) { 4147 if (0) {
3771 if ($NEXT_TICK) { 4148 if ($NEXT_TICK) {
3772 my $jitter = $TICK_START - $NEXT_TICK; 4149 my $jitter = $TICK_START - $NEXT_TICK;
3773 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4150 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3774 warn "jitter $JITTER\n";#d# 4151 debug "jitter $JITTER\n";#d#
3775 } 4152 }
3776 } 4153 }
3777} 4154}
3778 4155
3779{ 4156{
3780 # configure BDB 4157 # configure BDB
3781 4158
3782 BDB::min_parallel 8; 4159 BDB::min_parallel 16;
3783 BDB::max_poll_reqs $TICK * 0.1; 4160 BDB::max_poll_reqs $TICK * 0.1;
3784 $Coro::BDB::WATCHER->priority (1); 4161 $AnyEvent::BDB::WATCHER->priority (1);
3785 4162
3786 unless ($DB_ENV) { 4163 unless ($DB_ENV) {
3787 $DB_ENV = BDB::db_env_create; 4164 $DB_ENV = BDB::db_env_create;
3788 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4165 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3789 | BDB::LOG_AUTOREMOVE, 1); 4166 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4167 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3790 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4168 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3791 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4169 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3792 4170
3793 cf::sync_job { 4171 cf::sync_job {
3794 eval { 4172 eval {
3820{ 4198{
3821 # configure IO::AIO 4199 # configure IO::AIO
3822 4200
3823 IO::AIO::min_parallel 8; 4201 IO::AIO::min_parallel 8;
3824 IO::AIO::max_poll_time $TICK * 0.1; 4202 IO::AIO::max_poll_time $TICK * 0.1;
3825 $Coro::AIO::WATCHER->priority (1); 4203 undef $AnyEvent::AIO::WATCHER;
3826} 4204}
3827 4205
3828my $_log_backtrace; 4206our $_log_backtrace;
4207our $_log_backtrace_last;
3829 4208
3830sub _log_backtrace { 4209sub _log_backtrace {
3831 my ($msg, @addr) = @_; 4210 my ($msg, @addr) = @_;
3832 4211
3833 $msg =~ s/\n//; 4212 $msg =~ s/\n$//;
3834 4213
4214 if ($_log_backtrace_last eq $msg) {
4215 LOG llevInfo, "[ABT] $msg\n";
4216 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3835 # limit the # of concurrent backtraces 4217 # limit the # of concurrent backtraces
3836 if ($_log_backtrace < 2) { 4218 } elsif ($_log_backtrace < 2) {
4219 $_log_backtrace_last = $msg;
3837 ++$_log_backtrace; 4220 ++$_log_backtrace;
4221 my $perl_bt = Carp::longmess $msg;
3838 async { 4222 async {
3839 $Coro::current->{desc} = "abt $msg"; 4223 $Coro::current->{desc} = "abt $msg";
3840 4224
3841 my @bt = fork_call { 4225 my @bt = fork_call {
3842 @addr = map { sprintf "%x", $_ } @addr; 4226 @addr = map { sprintf "%x", $_ } @addr;
3853 } 4237 }
3854 4238
3855 @funcs 4239 @funcs
3856 }; 4240 };
3857 4241
3858 LOG llevInfo, "[ABT] $msg\n"; 4242 LOG llevInfo, "[ABT] $perl_bt\n";
4243 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3859 LOG llevInfo, "[ABT] $_\n" for @bt; 4244 LOG llevInfo, "[ABT] $_\n" for @bt;
3860 --$_log_backtrace; 4245 --$_log_backtrace;
3861 }; 4246 };
3862 } else { 4247 } else {
3863 LOG llevInfo, "[ABT] $msg\n"; 4248 LOG llevInfo, "[ABT] $msg\n";
3864 LOG llevInfo, "[ABT] [suppressed]\n"; 4249 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3865 } 4250 }
3866} 4251}
3867 4252
3868# load additional modules 4253# load additional modules
3869use cf::pod; 4254require "cf/$_.pm" for @EXTRA_MODULES;
4255cf::_connect_to_perl_2;
3870 4256
3871END { cf::emergency_save } 4257END { cf::emergency_save }
3872 4258
38731 42591
3874 4260

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines