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.267 by root, Sat May 19 00:08:11 2007 UTC vs.
Revision 1.542 by root, Wed May 5 09:05:03 2010 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
3use utf8; 25use common::sense;
4use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 3.61 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
51use Coro::Util ();
24 52
53use JSON::XS 2.01 ();
25use BDB (); 54use BDB ();
26use Data::Dumper; 55use Data::Dumper;
27use Digest::MD5;
28use Fcntl; 56use Fcntl;
29use YAML::Syck (); 57use YAML::XS ();
30use IO::AIO 2.32 (); 58use IO::AIO ();
31use Time::HiRes; 59use Time::HiRes;
32use Compress::LZF; 60use Compress::LZF;
61use Digest::MD5 ();
62
63AnyEvent::detect;
33 64
34# configure various modules to our taste 65# configure various modules to our taste
35# 66#
36$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
37Coro::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";
38Compress::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
39 75
40$Event::Eval = 1; # no idea why this is required, but it is 76# strictly for debugging
41 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
43$YAML::Syck::ImplicitUnicode = 1;
44
45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46 78
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
48 82
49our %COMMAND = (); 83our %COMMAND = ();
50our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
51 85
52our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 87our %EXTCMD = ();
88our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
56 91
57our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
58our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
59 96
60our $CONFDIR = confdir; 97our $CONFDIR = confdir;
61our $DATADIR = datadir; 98our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
71 118
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
73our $TICK_WATCHER;
74our $AIO_POLL_WATCHER;
75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
76our $NEXT_TICK; 121our $NEXT_TICK;
77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
79 123
124our $BDB_DEADLOCK_WATCHER;
125our $BDB_CHECKPOINT_WATCHER;
80our $BDB_POLL_WATCHER; 126our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 127our $DB_ENV;
128
129our @EXTRA_MODULES = qw(pod match mapscript);
82 130
83our %CFG; 131our %CFG;
84 132
85our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 134our $RUNTIME;
135our $NOW;
87 136
88our %PLAYER; # all users 137our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 138our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 139our $LINK_MAP; # the special {link} map, which is always available
91 140
92# used to convert map paths into valid unix filenames by replacing / by ∕ 141# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 142our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 143
95our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
146our $JITTER; # average jitter
97our $tick_start; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
148
149our @POST_INIT;
150
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
98 153
99binmode STDOUT; 154binmode STDOUT;
100binmode STDERR; 155binmode STDERR;
101 156
102# read virtual server time, if available 157# read virtual server time, if available
103unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
104 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
105 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
106 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
107} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
108 165
109mkdir $_ 166mkdir $_
110 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
111 168
112our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
113 170
114sub cf::map::normalise; 171sub cf::map::normalise;
172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
115 187
116############################################################################# 188#############################################################################
117 189
118=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
119 191
… …
155 227
156The raw value load value from the last tick. 228The raw value load value from the last tick.
157 229
158=item %cf::CFG 230=item %cf::CFG
159 231
160Configuration for the server, loaded from C</etc/crossfire/config>, or 232Configuration for the server, loaded from C</etc/deliantra-server/config>, or
161from wherever your confdir points to. 233from wherever your confdir points to.
162 234
163=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
164 236
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
166returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one process
167per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 240
241=item @cf::INVOKE_RESULTS
242
243This array contains the results of the last C<invoke ()> call. When
244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
245that call.
246
247=item %cf::REFLECT
248
249Contains, for each (C++) class name, a hash reference with information
250about object members (methods, scalars, arrays and flags) and other
251metadata, which is useful for introspection.
252
169=back 253=back
170 254
171=cut 255=cut
172 256
173BEGIN { 257sub error(@) { LOG llevError, join "", @_ }
174 *CORE::GLOBAL::warn = sub { 258sub warn (@) { LOG llevWarn , join "", @_ }
259sub info (@) { LOG llevInfo , join "", @_ }
260sub debug(@) { LOG llevDebug, join "", @_ }
261sub trace(@) { LOG llevTrace, join "", @_ }
262
263$Coro::State::WARNHOOK = sub {
175 my $msg = join "", @_; 264 my $msg = join "", @_;
176 265
177 $msg .= "\n" 266 $msg .= "\n"
178 unless $msg =~ /\n$/; 267 unless $msg =~ /\n$/;
179 268
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 269 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181 270
182 utf8::encode $msg;
183 LOG llevError, $msg; 271 LOG llevWarn, $msg;
184 }; 272};
185} 273
274$Coro::State::DIEHOOK = sub {
275 return unless $^S eq 0; # "eq", not "=="
276
277 error Carp::longmess $_[0];
278
279 if (in_main) {#d#
280 error "DIEHOOK called in main context, Coro bug?\n";#d#
281 return;#d#
282 }#d#
283
284 # kill coroutine otherwise
285 Coro::terminate
286};
186 287
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 288@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 289@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 290@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 291@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
191@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 292@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
293@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
192@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 294@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
193 295
194# we bless all objects into (empty) derived classes to force a method lookup 296# we bless all objects into (empty) derived classes to force a method lookup
195# within the Safe compartment. 297# within the Safe compartment.
196for my $pkg (qw( 298for my $pkg (qw(
197 cf::global cf::attachable 299 cf::global cf::attachable
198 cf::object cf::object::player 300 cf::object cf::object::player
199 cf::client cf::player 301 cf::client cf::player
200 cf::arch cf::living 302 cf::arch cf::living
303 cf::map cf::mapspace
201 cf::map cf::party cf::region 304 cf::party cf::region
202)) { 305)) {
203 no strict 'refs';
204 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 306 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
205} 307}
206 308
207$Event::DIED = sub { 309$EV::DIED = sub {
208 warn "error in event callback: @_"; 310 Carp::cluck "error in event callback: @_";
209}; 311};
312
313#############################################################################
210 314
211=head2 UTILITY FUNCTIONS 315=head2 UTILITY FUNCTIONS
212 316
213=over 4 317=over 4
214 318
… …
233 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 337 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
234 $d 338 $d
235 } || "[unable to dump $_[0]: '$@']"; 339 } || "[unable to dump $_[0]: '$@']";
236} 340}
237 341
238use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
239
240=item $ref = cf::from_json $json 342=item $ref = cf::decode_json $json
241 343
242Converts a JSON string into the corresponding perl data structure. 344Converts a JSON string into the corresponding perl data structure.
243 345
244=item $json = cf::to_json $ref 346=item $json = cf::encode_json $ref
245 347
246Converts a perl data structure into its JSON representation. 348Converts a perl data structure into its JSON representation.
247 349
350=cut
351
352our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
353
354sub encode_json($) { $json_coder->encode ($_[0]) }
355sub decode_json($) { $json_coder->decode ($_[0]) }
356
357=item cf::post_init { BLOCK }
358
359Execute the given codeblock, I<after> all extensions have been (re-)loaded,
360but I<before> the server starts ticking again.
361
362The cdoeblock will have a single boolean argument to indicate whether this
363is a reload or not.
364
365=cut
366
367sub post_init(&) {
368 push @POST_INIT, shift;
369}
370
248=item cf::lock_wait $string 371=item cf::lock_wait $string
249 372
250Wait until the given lock is available. See cf::lock_acquire. 373Wait until the given lock is available. See cf::lock_acquire.
251 374
252=item my $lock = cf::lock_acquire $string 375=item my $lock = cf::lock_acquire $string
253 376
254Wait until the given lock is available and then acquires it and returns 377Wait until the given lock is available and then acquires it and returns
255a Coro::guard object. If the guard object gets destroyed (goes out of scope, 378a L<Guard> object. If the guard object gets destroyed (goes out of scope,
256for example when the coroutine gets canceled), the lock is automatically 379for example when the coroutine gets canceled), the lock is automatically
257returned. 380returned.
258 381
382Locks are *not* recursive, locking from the same coro twice results in a
383deadlocked coro.
384
259Lock names should begin with a unique identifier (for example, cf::map::find 385Lock names should begin with a unique identifier (for example, cf::map::find
260uses map_find and cf::map::load uses map_load). 386uses map_find and cf::map::load uses map_load).
261 387
262=item $locked = cf::lock_active $string 388=item $locked = cf::lock_active $string
263 389
264Return true if the lock is currently active, i.e. somebody has locked it. 390Return true if the lock is currently active, i.e. somebody has locked it.
265 391
266=cut 392=cut
267 393
268our %LOCK; 394our $LOCKS = new Coro::SemaphoreSet;
269 395
270sub lock_wait($) { 396sub lock_wait($) {
271 my ($key) = @_; 397 $LOCKS->wait ($_[0]);
272
273 # wait for lock, if any
274 while ($LOCK{$key}) {
275 push @{ $LOCK{$key} }, $Coro::current;
276 Coro::schedule;
277 }
278} 398}
279 399
280sub lock_acquire($) { 400sub lock_acquire($) {
281 my ($key) = @_; 401 $LOCKS->guard ($_[0])
282
283 # wait, to be sure we are not locked
284 lock_wait $key;
285
286 $LOCK{$key} = [];
287
288 Coro::guard {
289 # wake up all waiters, to be on the safe side
290 $_->ready for @{ delete $LOCK{$key} };
291 }
292} 402}
293 403
294sub lock_active($) { 404sub lock_active($) {
295 my ($key) = @_; 405 $LOCKS->count ($_[0]) < 1
296
297 ! ! $LOCK{$key}
298} 406}
299 407
300sub freeze_mainloop { 408sub freeze_mainloop {
301 return unless $TICK_WATCHER->is_active; 409 tick_inhibit_inc;
302 410
303 my $guard = Coro::guard { 411 &Guard::guard (\&tick_inhibit_dec);
304 $TICK_WATCHER->start; 412}
413
414=item cf::periodic $interval, $cb
415
416Like EV::periodic, but randomly selects a starting point so that the actions
417get spread over time.
418
419=cut
420
421sub periodic($$) {
422 my ($interval, $cb) = @_;
423
424 my $start = rand List::Util::min 180, $interval;
425
426 EV::periodic $start, $interval, 0, $cb
427}
428
429=item cf::get_slot $time[, $priority[, $name]]
430
431Allocate $time seconds of blocking CPU time at priority C<$priority>:
432This call blocks and returns only when you have at least C<$time> seconds
433of cpu time till the next tick. The slot is only valid till the next cede.
434
435The optional C<$name> can be used to identify the job to run. It might be
436used for statistical purposes and should identify the same time-class.
437
438Useful for short background jobs.
439
440=cut
441
442our @SLOT_QUEUE;
443our $SLOT_QUEUE;
444our $SLOT_DECAY = 0.9;
445
446$SLOT_QUEUE->cancel if $SLOT_QUEUE;
447$SLOT_QUEUE = Coro::async {
448 $Coro::current->desc ("timeslot manager");
449
450 my $signal = new Coro::Signal;
451 my $busy;
452
453 while () {
454 next_job:
455
456 my $avail = cf::till_tick;
457
458 for (0 .. $#SLOT_QUEUE) {
459 if ($SLOT_QUEUE[$_][0] <= $avail) {
460 $busy = 0;
461 my $job = splice @SLOT_QUEUE, $_, 1, ();
462 $job->[2]->send;
463 Coro::cede;
464 goto next_job;
465 } else {
466 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
467 }
468 }
469
470 if (@SLOT_QUEUE) {
471 # we do not use wait_for_tick() as it returns immediately when tick is inactive
472 push @cf::WAIT_FOR_TICK, $signal;
473 $signal->wait;
474 } else {
475 $busy = 0;
476 Coro::schedule;
477 }
305 }; 478 }
306 $TICK_WATCHER->stop; 479};
307 $guard 480
481sub get_slot($;$$) {
482 return if tick_inhibit || $Coro::current == $Coro::main;
483
484 my ($time, $pri, $name) = @_;
485
486 $time = clamp $time, 0.01, $TICK * .6;
487
488 my $sig = new Coro::Signal;
489
490 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
491 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
492 $SLOT_QUEUE->ready;
493 $sig->wait;
308} 494}
309 495
310=item cf::async { BLOCK } 496=item cf::async { BLOCK }
311 497
312Currently the same as Coro::async_pool, meaning you cannot use 498Currently the same as Coro::async_pool, meaning you cannot use
… …
317 503
318BEGIN { *async = \&Coro::async_pool } 504BEGIN { *async = \&Coro::async_pool }
319 505
320=item cf::sync_job { BLOCK } 506=item cf::sync_job { BLOCK }
321 507
322The design of crossfire+ requires that the main coro ($Coro::main) is 508The design of Deliantra requires that the main coroutine ($Coro::main)
323always able to handle events or runnable, as crossfire+ is only partly 509is always able to handle events or runnable, as Deliantra is only
324reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 510partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
511acceptable.
325 512
326If it must be done, put the blocking parts into C<sync_job>. This will run 513If it must be done, put the blocking parts into C<sync_job>. This will run
327the given BLOCK in another coroutine while waiting for the result. The 514the given BLOCK in another coroutine while waiting for the result. The
328server will be frozen during this time, so the block should either finish 515server will be frozen during this time, so the block should either finish
329fast or be very important. 516fast or be very important.
… …
331=cut 518=cut
332 519
333sub sync_job(&) { 520sub sync_job(&) {
334 my ($job) = @_; 521 my ($job) = @_;
335 522
336 if ($Coro::current == $Coro::main) { 523 if (in_main) {
337 my $time = Event::time; 524 my $time = AE::time;
338 525
339 # this is the main coro, too bad, we have to block 526 # this is the main coro, too bad, we have to block
340 # till the operation succeeds, freezing the server :/ 527 # till the operation succeeds, freezing the server :/
341 528
342 # TODO: use suspend/resume instead 529 #LOG llevError, Carp::longmess "sync job";#d#
343 # (but this is cancel-safe) 530
344 my $freeze_guard = freeze_mainloop; 531 my $freeze_guard = freeze_mainloop;
345 532
346 my $busy = 1; 533 my $busy = 1;
347 my @res; 534 my @res;
348 535
349 (async { 536 (async {
537 $Coro::current->desc ("sync job coro");
350 @res = eval { $job->() }; 538 @res = eval { $job->() };
351 warn $@ if $@; 539 error $@ if $@;
352 undef $busy; 540 undef $busy;
353 })->prio (Coro::PRIO_MAX); 541 })->prio (Coro::PRIO_MAX);
354 542
355 while ($busy) { 543 while ($busy) {
356 Coro::cede or Event::one_event; 544 if (Coro::nready) {
545 Coro::cede_notself;
546 } else {
547 EV::loop EV::LOOP_ONESHOT;
357 } 548 }
549 }
358 550
359 $time = Event::time - $time; 551 my $time = AE::time - $time;
360 552
361 LOG llevError | logBacktrace, Carp::longmess "long sync job"
362 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
363
364 $tick_start += $time; # do not account sync jobs to server load 553 $TICK_START += $time; # do not account sync jobs to server load
365 554
366 wantarray ? @res : $res[0] 555 wantarray ? @res : $res[0]
367 } else { 556 } else {
368 # we are in another coroutine, how wonderful, everything just works 557 # we are in another coroutine, how wonderful, everything just works
369 558
… …
389 $EXT_CORO{$coro+0} = $coro; 578 $EXT_CORO{$coro+0} = $coro;
390 579
391 $coro 580 $coro
392} 581}
393 582
394sub write_runtime { 583=item fork_call { }, $args
395 my $runtime = "$LOCALDIR/runtime";
396 584
397 # first touch the runtime file to show we are still running: 585Executes the given code block with the given arguments in a seperate
398 # the fsync below can take a very very long time. 586process, returning the results. Everything must be serialisable with
587Coro::Storable. May, of course, block. Note that the executed sub may
588never block itself or use any form of event handling.
399 589
400 if (my $fh = aio_open $runtime, O_WRONLY, 0) { 590=cut
401 utime undef, undef, $fh; 591
592sub fork_call(&@) {
593 my ($cb, @args) = @_;
594
595 # we seemingly have to make a local copy of the whole thing,
596 # otherwise perl prematurely frees the stuff :/
597 # TODO: investigate and fix (likely this will be rather laborious)
598
599 my @res = Coro::Util::fork_eval {
600 reset_signals;
601 &$cb
602 }, @args;
603
604 wantarray ? @res : $res[-1]
605}
606
607sub objinfo {
608 (
609 "counter value" => cf::object::object_count,
610 "objects created" => cf::object::create_count,
611 "objects destroyed" => cf::object::destroy_count,
612 "freelist size" => cf::object::free_count,
613 "allocated objects" => cf::object::objects_size,
614 "active objects" => cf::object::actives_size,
615 )
616}
617
618=item $coin = coin_from_name $name
619
620=cut
621
622our %coin_alias = (
623 "silver" => "silvercoin",
624 "silvercoin" => "silvercoin",
625 "silvercoins" => "silvercoin",
626 "gold" => "goldcoin",
627 "goldcoin" => "goldcoin",
628 "goldcoins" => "goldcoin",
629 "platinum" => "platinacoin",
630 "platinumcoin" => "platinacoin",
631 "platinumcoins" => "platinacoin",
632 "platina" => "platinacoin",
633 "platinacoin" => "platinacoin",
634 "platinacoins" => "platinacoin",
635 "royalty" => "royalty",
636 "royalties" => "royalty",
637);
638
639sub coin_from_name($) {
640 $coin_alias{$_[0]}
641 ? cf::arch::find $coin_alias{$_[0]}
642 : undef
643}
644
645=item $value = cf::db_get $family => $key
646
647Returns a single value from the environment database.
648
649=item cf::db_put $family => $key => $value
650
651Stores the given C<$value> in the family. It can currently store binary
652data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
653
654=item $db = cf::db_table "name"
655
656Create and/or open a new database table. The string must not be "db" and must be unique
657within each server.
658
659=cut
660
661sub db_table($) {
662 cf::error "db_get called from main context"
663 if $Coro::current == $Coro::main;
664
665 my ($name) = @_;
666 my $db = BDB::db_create $DB_ENV;
667
668 eval {
669 $db->set_flags (BDB::CHKSUM);
670
671 utf8::encode $name;
672 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
673 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
674 cf::cleanup "db_open(db): $!" if $!;
402 } 675 };
676 cf::cleanup "db_open(db): $@" if $@;
403 677
404 my $guard = cf::lock_acquire "write_runtime"; 678 $db
679}
405 680
406 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 681our $DB;
407 or return;
408 682
409 my $value = $cf::RUNTIME + 90 + 10; 683sub db_init {
410 # 10 is the runtime save interval, for a monotonic clock 684 $DB ||= db_table "db";
411 # 60 allows for the watchdog to kill the server. 685}
412 686
413 (aio_write $fh, 0, (length $value), $value, 0) <= 0 687sub db_get($$) {
414 and return; 688 my $key = "$_[0]/$_[1]";
415 689
416 # always fsync - this file is important 690 cf::error "db_get called from main context"
417 aio_fsync $fh 691 if $Coro::current == $Coro::main;
418 and return;
419 692
420 # touch it again to show we are up-to-date 693 BDB::db_get $DB, undef, $key, my $data;
421 utime undef, undef, $fh;
422 694
423 close $fh 695 $! ? ()
424 or return; 696 : $data
697}
425 698
426 aio_rename "$runtime~", $runtime 699sub db_put($$$) {
427 and return; 700 BDB::dbreq_pri 4;
701 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
702}
428 703
429 warn "runtime file written.\n";#d# 704=item cf::cache $id => [$paths...], $processversion => $process
430 705
706Generic caching function that returns the value of the resource $id,
707caching and regenerating as required.
708
709This function can block.
710
711=cut
712
713sub cache {
714 my ($id, $src, $processversion, $process) = @_;
715
716 my $meta =
717 join "\x00",
718 $processversion,
719 map {
720 aio_stat $_
721 and Carp::croak "$_: $!";
722
723 ($_, (stat _)[7,9])
724 } @$src;
725
726 my $dbmeta = db_get cache => "$id/meta";
727 if ($dbmeta ne $meta) {
728 # changed, we may need to process
729
730 my @data;
731 my $md5;
732
733 for (0 .. $#$src) {
734 0 <= aio_load $src->[$_], $data[$_]
735 or Carp::croak "$src->[$_]: $!";
736 }
737
738 # if processing is expensive, check
739 # checksum first
740 if (1) {
741 $md5 =
742 join "\x00",
743 $processversion,
744 map {
745 cf::cede_to_tick;
746 ($src->[$_], Digest::MD5::md5_hex $data[$_])
747 } 0.. $#$src;
748
749
750 my $dbmd5 = db_get cache => "$id/md5";
751 if ($dbmd5 eq $md5) {
752 db_put cache => "$id/meta", $meta;
753
754 return db_get cache => "$id/data";
755 }
756 }
757
758 my $t1 = Time::HiRes::time;
759 my $data = $process->(\@data);
760 my $t2 = Time::HiRes::time;
761
762 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
763
764 db_put cache => "$id/data", $data;
765 db_put cache => "$id/md5" , $md5;
766 db_put cache => "$id/meta", $meta;
767
768 return $data;
431 1 769 }
770
771 db_get cache => "$id/data"
432} 772}
433 773
434=item cf::datalog type => key => value, ... 774=item cf::datalog type => key => value, ...
435 775
436Log a datalog packet of the given type with the given key-value pairs. 776Log a datalog packet of the given type with the given key-value pairs.
437 777
438=cut 778=cut
439 779
440sub datalog($@) { 780sub datalog($@) {
441 my ($type, %kv) = @_; 781 my ($type, %kv) = @_;
442 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 782 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
443} 783}
444 784
445=back 785=back
446 786
447=cut 787=cut
448 788
449############################################################################# 789#############################################################################
450 790
451=head2 ATTACHABLE OBJECTS 791=head2 ATTACHABLE OBJECTS
452 792
453Many objects in crossfire are so-called attachable objects. That means you can 793Many objects in deliantra are so-called attachable objects. That means you can
454attach callbacks/event handlers (a collection of which is called an "attachment") 794attach callbacks/event handlers (a collection of which is called an "attachment")
455to it. All such attachable objects support the following methods. 795to it. All such attachable objects support the following methods.
456 796
457In the following description, CLASS can be any of C<global>, C<object> 797In the following description, CLASS can be any of C<global>, C<object>
458C<player>, C<client> or C<map> (i.e. the attachable objects in 798C<player>, C<client> or C<map> (i.e. the attachable objects in
459crossfire+). 799Deliantra).
460 800
461=over 4 801=over 4
462 802
463=item $attachable->attach ($attachment, key => $value...) 803=item $attachable->attach ($attachment, key => $value...)
464 804
… …
508=item cf::CLASS::attachment $name, ... 848=item cf::CLASS::attachment $name, ...
509 849
510Register an attachment by C<$name> through which attachable objects of the 850Register an attachment by C<$name> through which attachable objects of the
511given CLASS can refer to this attachment. 851given CLASS can refer to this attachment.
512 852
513Some classes such as crossfire maps and objects can specify attachments 853Some classes such as deliantra maps and objects can specify attachments
514that are attached at load/instantiate time, thus the need for a name. 854that are attached at load/instantiate time, thus the need for a name.
515 855
516These calls expect any number of the following handler/hook descriptions: 856These calls expect any number of the following handler/hook descriptions:
517 857
518=over 4 858=over 4
… …
642 982
643 } elsif (exists $cb_id{$type}) { 983 } elsif (exists $cb_id{$type}) {
644 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 984 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
645 985
646 } elsif (ref $type) { 986 } elsif (ref $type) {
647 warn "attaching objects not supported, ignoring.\n"; 987 error "attaching objects not supported, ignoring.\n";
648 988
649 } else { 989 } else {
650 shift @arg; 990 shift @arg;
651 warn "attach argument '$type' not supported, ignoring.\n"; 991 error "attach argument '$type' not supported, ignoring.\n";
652 } 992 }
653 } 993 }
654} 994}
655 995
656sub _object_attach { 996sub _object_attach {
… …
666 _attach $registry, $klass, @attach; 1006 _attach $registry, $klass, @attach;
667 } 1007 }
668 1008
669 $obj->{$name} = \%arg; 1009 $obj->{$name} = \%arg;
670 } else { 1010 } else {
671 warn "object uses attachment '$name' that is not available, postponing.\n"; 1011 info "object uses attachment '$name' which is not available, postponing.\n";
672 } 1012 }
673 1013
674 $obj->{_attachment}{$name} = undef; 1014 $obj->{_attachment}{$name} = undef;
675} 1015}
676 1016
… …
716 "; 1056 ";
717 die if $@; 1057 die if $@;
718} 1058}
719 1059
720our $override; 1060our $override;
721our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 1061our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
722 1062
723sub override { 1063sub override {
724 $override = 1; 1064 $override = 1;
725 @invoke_results = (); 1065 @INVOKE_RESULTS = (@_);
726} 1066}
727 1067
728sub do_invoke { 1068sub do_invoke {
729 my $event = shift; 1069 my $event = shift;
730 my $callbacks = shift; 1070 my $callbacks = shift;
731 1071
732 @invoke_results = (); 1072 @INVOKE_RESULTS = ();
733 1073
734 local $override; 1074 local $override;
735 1075
736 for (@$callbacks) { 1076 for (@$callbacks) {
737 eval { &{$_->[1]} }; 1077 eval { &{$_->[1]} };
738 1078
739 if ($@) { 1079 if ($@) {
740 warn "$@";
741 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1080 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
742 override; 1081 override;
743 } 1082 }
744 1083
745 return 1 if $override; 1084 return 1 if $override;
746 } 1085 }
747 1086
748 0 1087 0
749} 1088}
750 1089
751=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1090=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
752 1091
753=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1092=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
754 1093
755Generate an object-specific event with the given arguments. 1094Generate an object-specific event with the given arguments.
756 1095
757This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1096This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
758removed in future versions), and there is no public API to access override 1097removed in future versions), and there is no public API to access override
759results (if you must, access C<@cf::invoke_results> directly). 1098results (if you must, access C<@cf::INVOKE_RESULTS> directly).
760 1099
761=back 1100=back
762 1101
763=cut 1102=cut
764 1103
765############################################################################# 1104#############################################################################
766# object support 1105# object support
1106
1107sub _object_equal($$);
1108sub _object_equal($$) {
1109 my ($a, $b) = @_;
1110
1111 return 0 unless (ref $a) eq (ref $b);
1112
1113 if ("HASH" eq ref $a) {
1114 my @ka = keys %$a;
1115 my @kb = keys %$b;
1116
1117 return 0 if @ka != @kb;
1118
1119 for (0 .. $#ka) {
1120 return 0 unless $ka[$_] eq $kb[$_];
1121 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1122 }
1123
1124 } elsif ("ARRAY" eq ref $a) {
1125
1126 return 0 if @$a != @$b;
1127
1128 for (0 .. $#$a) {
1129 return 0 unless _object_equal $a->[$_], $b->[$_];
1130 }
1131
1132 } elsif ($a ne $b) {
1133 return 0;
1134 }
1135
1136 1
1137}
1138
1139our $SLOW_MERGES;#d#
1140sub _can_merge {
1141 my ($ob1, $ob2) = @_;
1142
1143 ++$SLOW_MERGES;#d#
1144
1145 # we do the slow way here
1146 return _object_equal $ob1, $ob2
1147}
767 1148
768sub reattach { 1149sub reattach {
769 # basically do the same as instantiate, without calling instantiate 1150 # basically do the same as instantiate, without calling instantiate
770 my ($obj) = @_; 1151 my ($obj) = @_;
771 1152
1153 # no longer needed after getting rid of delete_package?
772 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1154 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
773 1155
774 my $registry = $obj->registry; 1156 my $registry = $obj->registry;
775 1157
776 @$registry = (); 1158 @$registry = ();
777 1159
… …
782 for (@$attach) { 1164 for (@$attach) {
783 my ($klass, @attach) = @$_; 1165 my ($klass, @attach) = @$_;
784 _attach $registry, $klass, @attach; 1166 _attach $registry, $klass, @attach;
785 } 1167 }
786 } else { 1168 } else {
787 warn "object uses attachment '$name' that is not available, postponing.\n"; 1169 info "object uses attachment '$name' that is not available, postponing.\n";
788 } 1170 }
789 } 1171 }
790} 1172}
791 1173
792cf::attachable->attach ( 1174cf::attachable->attach (
793 prio => -1000000, 1175 prio => -1000000,
794 on_instantiate => sub { 1176 on_instantiate => sub {
795 my ($obj, $data) = @_; 1177 my ($obj, $data) = @_;
796 1178
797 $data = from_json $data; 1179 $data = decode_json $data;
798 1180
799 for (@$data) { 1181 for (@$data) {
800 my ($name, $args) = @$_; 1182 my ($name, $args) = @$_;
801 1183
802 $obj->attach ($name, %{$args || {} }); 1184 $obj->attach ($name, %{$args || {} });
… …
818sub object_freezer_save { 1200sub object_freezer_save {
819 my ($filename, $rdata, $objs) = @_; 1201 my ($filename, $rdata, $objs) = @_;
820 1202
821 sync_job { 1203 sync_job {
822 if (length $$rdata) { 1204 if (length $$rdata) {
1205 utf8::decode (my $decname = $filename);
823 warn sprintf "saving %s (%d,%d)\n", 1206 trace sprintf "saving %s (%d,%d)\n",
824 $filename, length $$rdata, scalar @$objs; 1207 $decname, length $$rdata, scalar @$objs
1208 if $VERBOSE_IO;
825 1209
826 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1210 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
827 chmod SAVE_MODE, $fh; 1211 aio_chmod $fh, SAVE_MODE;
828 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1212 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
829 aio_fsync $fh if $cf::USE_FSYNC; 1213 if ($cf::USE_FSYNC) {
1214 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;
1215 aio_fsync $fh;
1216 }
830 close $fh; 1217 aio_close $fh;
831 1218
832 if (@$objs) { 1219 if (@$objs) {
833 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1220 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
834 chmod SAVE_MODE, $fh; 1221 aio_chmod $fh, SAVE_MODE;
835 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1222 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
836 aio_write $fh, 0, (length $data), $data, 0; 1223 aio_write $fh, 0, (length $data), $data, 0;
837 aio_fsync $fh if $cf::USE_FSYNC; 1224 if ($cf::USE_FSYNC) {
1225 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;
1226 aio_fsync $fh;
1227 }
838 close $fh; 1228 aio_close $fh;
839 aio_rename "$filename.pst~", "$filename.pst"; 1229 aio_rename "$filename.pst~", "$filename.pst";
840 } 1230 }
841 } else { 1231 } else {
842 aio_unlink "$filename.pst"; 1232 aio_unlink "$filename.pst";
843 } 1233 }
844 1234
845 aio_rename "$filename~", $filename; 1235 aio_rename "$filename~", $filename;
1236
1237 $filename =~ s%/[^/]+$%%;
1238 aio_pathsync $filename if $cf::USE_FSYNC;
846 } else { 1239 } else {
847 warn "FATAL: $filename~: $!\n"; 1240 error "unable to save objects: $filename~: $!\n";
848 } 1241 }
849 } else { 1242 } else {
850 aio_unlink $filename; 1243 aio_unlink $filename;
851 aio_unlink "$filename.pst"; 1244 aio_unlink "$filename.pst";
852 } 1245 }
853 } 1246 };
854} 1247}
855 1248
856sub object_freezer_as_string { 1249sub object_freezer_as_string {
857 my ($rdata, $objs) = @_; 1250 my ($rdata, $objs) = @_;
858 1251
… …
870 or return; 1263 or return;
871 1264
872 unless (aio_stat "$filename.pst") { 1265 unless (aio_stat "$filename.pst") {
873 (aio_load "$filename.pst", $av) >= 0 1266 (aio_load "$filename.pst", $av) >= 0
874 or return; 1267 or return;
1268
875 $av = eval { (Storable::thaw $av)->{objs} }; 1269 my $st = eval { Coro::Storable::thaw $av };
1270 $av = $st->{objs};
876 } 1271 }
877 1272
1273 utf8::decode (my $decname = $filename);
878 warn sprintf "loading %s (%d)\n", 1274 trace sprintf "loading %s (%d,%d)\n",
879 $filename, length $data, scalar @{$av || []};#d# 1275 $decname, length $data, scalar @{$av || []}
1276 if $VERBOSE_IO;
1277
880 return ($data, $av); 1278 ($data, $av)
881} 1279}
1280
1281=head2 COMMAND CALLBACKS
1282
1283=over 4
1284
1285=cut
882 1286
883############################################################################# 1287#############################################################################
884# command handling &c 1288# command handling &c
885 1289
886=item cf::register_command $name => \&callback($ob,$args); 1290=item cf::register_command $name => \&callback($ob,$args);
… …
899 push @{ $COMMAND{$name} }, [$caller, $cb]; 1303 push @{ $COMMAND{$name} }, [$caller, $cb];
900} 1304}
901 1305
902=item cf::register_extcmd $name => \&callback($pl,$packet); 1306=item cf::register_extcmd $name => \&callback($pl,$packet);
903 1307
904Register a callbackf ro execution when the client sends an extcmd packet. 1308Register a callback for execution when the client sends an (synchronous)
1309extcmd packet. Ext commands will be processed in the order they are
1310received by the server, like other user commands. The first argument is
1311the logged-in player. Ext commands can only be processed after a player
1312has logged in successfully.
905 1313
906If the callback returns something, it is sent back as if reply was being 1314If the callback returns something, it is sent back as if reply was being
907called. 1315called.
908 1316
1317=item cf::register_exticmd $name => \&callback($ns,$packet);
1318
1319Register a callback for execution when the client sends an (asynchronous)
1320exticmd packet. Exti commands are processed by the server as soon as they
1321are received, i.e. out of order w.r.t. other commands. The first argument
1322is a client socket. Exti commands can be received anytime, even before
1323log-in.
1324
1325If the callback returns something, it is sent back as if reply was being
1326called.
1327
909=cut 1328=cut
910 1329
911sub register_extcmd { 1330sub register_extcmd {
912 my ($name, $cb) = @_; 1331 my ($name, $cb) = @_;
913 1332
914 $EXTCMD{$name} = $cb; 1333 $EXTCMD{$name} = $cb;
915} 1334}
916 1335
1336sub register_exticmd {
1337 my ($name, $cb) = @_;
1338
1339 $EXTICMD{$name} = $cb;
1340}
1341
1342use File::Glob ();
1343
917cf::player->attach ( 1344cf::player->attach (
918 on_command => sub { 1345 on_unknown_command => sub {
919 my ($pl, $name, $params) = @_; 1346 my ($pl, $name, $params) = @_;
920 1347
921 my $cb = $COMMAND{$name} 1348 my $cb = $COMMAND{$name}
922 or return; 1349 or return;
923 1350
… …
928 cf::override; 1355 cf::override;
929 }, 1356 },
930 on_extcmd => sub { 1357 on_extcmd => sub {
931 my ($pl, $buf) = @_; 1358 my ($pl, $buf) = @_;
932 1359
933 my $msg = eval { from_json $buf }; 1360 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
934 1361
935 if (ref $msg) { 1362 if (ref $msg) {
1363 my ($type, $reply, @payload) =
1364 "ARRAY" eq ref $msg
1365 ? @$msg
1366 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1367
1368 my @reply;
1369
936 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1370 if (my $cb = $EXTCMD{$type}) {
937 if (my %reply = $cb->($pl, $msg)) { 1371 @reply = $cb->($pl, @payload);
938 $pl->ext_reply ($msg->{msgid}, %reply);
939 }
940 } 1372 }
1373
1374 $pl->ext_reply ($reply, @reply)
1375 if $reply;
1376
941 } else { 1377 } else {
942 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1378 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
943 } 1379 }
944 1380
945 cf::override; 1381 cf::override;
946 }, 1382 },
947); 1383);
948 1384
1385# "readahead" all extensions
949sub load_extension { 1386sub cache_extensions {
950 my ($path) = @_; 1387 my $grp = IO::AIO::aio_group;
951 1388
952 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 1389 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
953 my $base = $1; 1390 for (grep /\.ext$/, @{$_[0]}) {
954 my $pkg = $1; 1391 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
955 $pkg =~ s/[^[:word:]]/_/g;
956 $pkg = "ext::$pkg";
957
958 warn "... loading '$path' into '$pkg'\n";
959
960 open my $fh, "<:utf8", $path
961 or die "$path: $!";
962
963 my $source =
964 "package $pkg; use strict; use utf8;\n"
965 . "#line 1 \"$path\"\n{\n"
966 . (do { local $/; <$fh> })
967 . "\n};\n1";
968
969 unless (eval $source) {
970 my $msg = $@ ? "$path: $@\n"
971 : "extension disabled.\n";
972 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
973 warn $@;
974 warn "mandatory extension failed to load, exiting.\n";
975 exit 1;
976 } 1392 }
977 die $@;
978 } 1393 };
979 1394
980 push @EXTS, $pkg; 1395 $grp
981} 1396}
982 1397
983sub load_extensions { 1398sub load_extensions {
1399 info "loading extensions...";
1400
1401 cf::sync_job {
1402 my %todo;
1403
984 for my $ext (<$LIBDIR/*.ext>) { 1404 for my $path (<$LIBDIR/*.ext>) {
985 next unless -r $ext; 1405 next unless -r $path;
986 eval { 1406
987 load_extension $ext; 1407 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1408 my $base = $1;
1409 my $pkg = $1;
1410 $pkg =~ s/[^[:word:]]/_/g;
1411 $pkg = "ext::$pkg";
1412
1413 open my $fh, "<:utf8", $path
1414 or die "$path: $!";
1415
1416 my $source = do { local $/; <$fh> };
1417
1418 my %ext = (
1419 path => $path,
1420 base => $base,
1421 pkg => $pkg,
1422 );
1423
1424 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1425 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1426
1427 $ext{source} =
1428 "package $pkg; use common::sense;\n"
1429 . "#line 1 \"$path\"\n{\n"
1430 . $source
1431 . "\n};\n1";
1432
1433 $todo{$base} = \%ext;
1434 }
1435
1436 my $pass = 0;
1437 my %done;
1438 while (%todo) {
1439 my $progress;
1440
1441 ++$pass;
1442
1443 ext:
1444 while (my ($k, $v) = each %todo) {
1445 for (split /,\s*/, $v->{meta}{depends}) {
1446 next ext
1447 unless exists $done{$_};
1448 }
1449
1450 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1451
1452 my $active = eval $v->{source};
1453
1454 if (length $@) {
1455 error "$v->{path}: $@\n";
1456
1457 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1458 if exists $v->{meta}{mandatory};
1459
1460 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1461 delete $todo{$k};
1462 } else {
1463 $done{$k} = delete $todo{$k};
1464 push @EXTS, $v->{pkg};
1465 $progress = 1;
1466
1467 info "$v->{base}: extension inactive.\n"
1468 unless $active;
1469 }
988 1 1470 }
989 } or warn "$ext not loaded: $@"; 1471
1472 unless ($progress) {
1473 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1474
1475 while (my ($k, $v) = each %todo) {
1476 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1477 if exists $v->{meta}{mandatory};
1478 }
1479 }
1480 }
990 } 1481 };
991} 1482}
992 1483
993############################################################################# 1484#############################################################################
994 1485
1486=back
1487
995=head2 CORE EXTENSIONS 1488=head2 CORE EXTENSIONS
996 1489
997Functions and methods that extend core crossfire objects. 1490Functions and methods that extend core deliantra objects.
998 1491
999=cut 1492=cut
1000 1493
1001package cf::player; 1494package cf::player;
1002 1495
1003use Coro::AIO; 1496use Coro::AIO;
1004 1497
1005=head3 cf::player 1498=head3 cf::player
1006 1499
1007=over 4 1500=over 4
1501
1502=item cf::player::num_playing
1503
1504Returns the official number of playing players, as per the Crossfire metaserver rules.
1505
1506=cut
1507
1508sub num_playing {
1509 scalar grep
1510 $_->ob->map
1511 && !$_->hidden
1512 && !$_->ob->flag (cf::FLAG_WIZ),
1513 cf::player::list
1514}
1008 1515
1009=item cf::player::find $login 1516=item cf::player::find $login
1010 1517
1011Returns the given player object, loading it if necessary (might block). 1518Returns the given player object, loading it if necessary (might block).
1012 1519
… …
1031 1538
1032sub exists($) { 1539sub exists($) {
1033 my ($login) = @_; 1540 my ($login) = @_;
1034 1541
1035 $cf::PLAYER{$login} 1542 $cf::PLAYER{$login}
1036 or cf::sync_job { !aio_stat path $login } 1543 or !aio_stat path $login
1037} 1544}
1038 1545
1039sub find($) { 1546sub find($) {
1040 return $cf::PLAYER{$_[0]} || do { 1547 return $cf::PLAYER{$_[0]} || do {
1041 my $login = $_[0]; 1548 my $login = $_[0];
… …
1048 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1555 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1049 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1556 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1050 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1557 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1051 aio_unlink +(playerdir $login) . "/$login.pl"; 1558 aio_unlink +(playerdir $login) . "/$login.pl";
1052 1559
1053 my $pl = load_pl path $login 1560 my $f = new_from_file cf::object::thawer path $login
1054 or return; 1561 or return;
1562
1563 my $pl = cf::player::load_pl $f
1564 or return;
1565
1566 local $cf::PLAYER_LOADING{$login} = $pl;
1567 $f->resolve_delayed_derefs;
1055 $cf::PLAYER{$login} = $pl 1568 $cf::PLAYER{$login} = $pl
1056 } 1569 }
1057 } 1570 }
1058} 1571}
1572
1573cf::player->attach (
1574 on_load => sub {
1575 my ($pl, $path) = @_;
1576
1577 # restore slots saved in save, below
1578 my $slots = delete $pl->{_slots};
1579
1580 $pl->ob->current_weapon ($slots->[0]);
1581 $pl->combat_ob ($slots->[1]);
1582 $pl->ranged_ob ($slots->[2]);
1583 },
1584);
1059 1585
1060sub save($) { 1586sub save($) {
1061 my ($pl) = @_; 1587 my ($pl) = @_;
1062 1588
1063 return if $pl->{deny_save}; 1589 return if $pl->{deny_save};
… …
1068 return if $pl->{deny_save}; 1594 return if $pl->{deny_save};
1069 1595
1070 aio_mkdir playerdir $pl, 0770; 1596 aio_mkdir playerdir $pl, 0770;
1071 $pl->{last_save} = $cf::RUNTIME; 1597 $pl->{last_save} = $cf::RUNTIME;
1072 1598
1599 cf::get_slot 0.01;
1600
1601 # save slots, to be restored later
1602 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1603
1073 $pl->save_pl ($path); 1604 $pl->save_pl ($path);
1074 Coro::cede; 1605 cf::cede_to_tick;
1075} 1606}
1076 1607
1077sub new($) { 1608sub new($) {
1078 my ($login) = @_; 1609 my ($login) = @_;
1079 1610
… …
1085 $cf::PLAYER{$login} = $self; 1616 $cf::PLAYER{$login} = $self;
1086 1617
1087 $self 1618 $self
1088} 1619}
1089 1620
1621=item $player->send_msg ($channel, $msg, $color, [extra...])
1622
1623=cut
1624
1625sub send_msg {
1626 my $ns = shift->ns
1627 or return;
1628 $ns->send_msg (@_);
1629}
1630
1090=item $pl->quit_character 1631=item $pl->quit_character
1091 1632
1092Nukes the player without looking back. If logged in, the connection will 1633Nukes the player without looking back. If logged in, the connection will
1093be destroyed. May block for a long time. 1634be destroyed. May block for a long time.
1094 1635
… …
1098 my ($pl) = @_; 1639 my ($pl) = @_;
1099 1640
1100 my $name = $pl->ob->name; 1641 my $name = $pl->ob->name;
1101 1642
1102 $pl->{deny_save} = 1; 1643 $pl->{deny_save} = 1;
1103 $pl->password ("*"); # this should lock out the player until we nuked the dir 1644 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1104 1645
1105 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1646 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1106 $pl->deactivate; 1647 $pl->deactivate;
1648 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1107 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1649 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1108 $pl->ns->destroy if $pl->ns; 1650 $pl->ns->destroy if $pl->ns;
1109 1651
1110 my $path = playerdir $pl; 1652 my $path = playerdir $pl;
1111 my $temp = "$path~$cf::RUNTIME~deleting~"; 1653 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1147 or return []; 1689 or return [];
1148 1690
1149 my @logins; 1691 my @logins;
1150 1692
1151 for my $login (@$dirs) { 1693 for my $login (@$dirs) {
1694 my $path = path $login;
1695
1696 # a .pst is a dead give-away for a valid player
1697 # if no pst file found, open and chekc for blocked users
1698 if (aio_stat "$path.pst") {
1152 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1699 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1153 aio_read $fh, 0, 512, my $buf, 0 or next; 1700 aio_read $fh, 0, 512, my $buf, 0 or next;
1154 $buf !~ /^password -------------$/m or next; # official not-valid tag 1701 $buf !~ /^password -------------$/m or next; # official not-valid tag
1702 }
1155 1703
1156 utf8::decode $login; 1704 utf8::decode $login;
1157 push @logins, $login; 1705 push @logins, $login;
1158 } 1706 }
1159 1707
1160 \@logins 1708 \@logins
1161} 1709}
1162 1710
1163=item $player->maps 1711=item $player->maps
1712
1713=item cf::player::maps $login
1164 1714
1165Returns an arrayref of map paths that are private for this 1715Returns an arrayref of map paths that are private for this
1166player. May block. 1716player. May block.
1167 1717
1168=cut 1718=cut
… …
1186 } 1736 }
1187 1737
1188 \@paths 1738 \@paths
1189} 1739}
1190 1740
1741=item $protocol_xml = $player->expand_cfpod ($cfpod)
1742
1743Expand deliantra pod fragments into protocol xml.
1744
1191=item $player->ext_reply ($msgid, %msg) 1745=item $player->ext_reply ($msgid, @msg)
1192 1746
1193Sends an ext reply to the player. 1747Sends an ext reply to the player.
1194 1748
1195=cut 1749=cut
1196 1750
1197sub ext_reply($$%) { 1751sub ext_reply($$@) {
1198 my ($self, $id, %msg) = @_; 1752 my ($self, $id, @msg) = @_;
1199 1753
1200 $msg{msgid} = $id; 1754 $self->ns->ext_reply ($id, @msg)
1201
1202 $self->send ("ext " . cf::to_json \%msg);
1203} 1755}
1204 1756
1205=item $player->ext_event ($type, %msg) 1757=item $player->ext_msg ($type, @msg)
1206 1758
1207Sends an ext event to the client. 1759Sends an ext event to the client.
1208 1760
1209=cut 1761=cut
1210 1762
1211sub ext_event($$%) { 1763sub ext_msg($$@) {
1212 my ($self, $type, %msg) = @_; 1764 my ($self, $type, @msg) = @_;
1213 1765
1214 $self->ns->ext_event ($type, %msg); 1766 $self->ns->ext_msg ($type, @msg);
1215} 1767}
1216 1768
1217=head3 cf::region 1769=head3 cf::region
1218 1770
1219=over 4 1771=over 4
… …
1222 1774
1223package cf::region; 1775package cf::region;
1224 1776
1225=item cf::region::find_by_path $path 1777=item cf::region::find_by_path $path
1226 1778
1227Tries to decuce the probable region for a map knowing only its path. 1779Tries to decuce the likely region for a map knowing only its path.
1228 1780
1229=cut 1781=cut
1230 1782
1231sub find_by_path($) { 1783sub find_by_path($) {
1232 my ($path) = @_; 1784 my ($path) = @_;
1233 1785
1786 $path =~ s/^~[^\/]*//; # skip ~login
1787
1234 my ($match, $specificity); 1788 my ($match, $specificity);
1235 1789
1236 for my $region (list) { 1790 for my $region (list) {
1237 if ($region->match && $path =~ $region->match) { 1791 if ($region->{match} && $path =~ $region->{match}) {
1238 ($match, $specificity) = ($region, $region->specificity) 1792 ($match, $specificity) = ($region, $region->specificity)
1239 if $region->specificity > $specificity; 1793 if $region->specificity > $specificity;
1240 } 1794 }
1241 } 1795 }
1242 1796
… …
1263our $MAX_RESET = 3600; 1817our $MAX_RESET = 3600;
1264our $DEFAULT_RESET = 3000; 1818our $DEFAULT_RESET = 3000;
1265 1819
1266sub generate_random_map { 1820sub generate_random_map {
1267 my ($self, $rmp) = @_; 1821 my ($self, $rmp) = @_;
1822
1823 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1824
1268 # mit "rum" bekleckern, nicht 1825 # mit "rum" bekleckern, nicht
1269 $self->_create_random_map ( 1826 $self->_create_random_map (
1270 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1827 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1271 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1828 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1272 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1829 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1273 $rmp->{exit_on_final_map}, 1830 $rmp->{exit_on_final_map},
1274 $rmp->{xsize}, $rmp->{ysize}, 1831 $rmp->{xsize}, $rmp->{ysize},
1275 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1832 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1276 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1833 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1291 1848
1292sub register { 1849sub register {
1293 my (undef, $regex, $prio) = @_; 1850 my (undef, $regex, $prio) = @_;
1294 my $pkg = caller; 1851 my $pkg = caller;
1295 1852
1296 no strict;
1297 push @{"$pkg\::ISA"}, __PACKAGE__; 1853 push @{"$pkg\::ISA"}, __PACKAGE__;
1298 1854
1299 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1855 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1300} 1856}
1301 1857
1302# also paths starting with '/' 1858# also paths starting with '/'
1303$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1859$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1304 1860
1305sub thawer_merge { 1861sub thawer_merge {
1306 my ($self, $merge) = @_; 1862 my ($self, $merge) = @_;
1307 1863
1308 # we have to keep some variables in memory intact 1864 # we have to keep some variables in memory intact
1309 local $self->{path}; 1865 local $self->{path};
1310 local $self->{load_path}; 1866 local $self->{load_path};
1311 local $self->{deny_save};
1312 local $self->{deny_reset};
1313 1867
1314 $self->SUPER::thawer_merge ($merge); 1868 $self->SUPER::thawer_merge ($merge);
1315} 1869}
1316 1870
1317sub normalise { 1871sub normalise {
… …
1364 $self->init; # pass $1 etc. 1918 $self->init; # pass $1 etc.
1365 return $self; 1919 return $self;
1366 } 1920 }
1367 } 1921 }
1368 1922
1369 Carp::carp "unable to resolve path '$path' (base '$base')."; 1923 Carp::cluck "unable to resolve path '$path' (base '$base').";
1370 () 1924 ()
1371} 1925}
1372 1926
1373sub init { 1927sub init {
1374 my ($self) = @_; 1928 my ($self) = @_;
… …
1396 1950
1397# the temporary/swap location 1951# the temporary/swap location
1398sub save_path { 1952sub save_path {
1399 my ($self) = @_; 1953 my ($self) = @_;
1400 1954
1401 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1955 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1402 "$TMPDIR/$path.map" 1956 "$TMPDIR/$path.map"
1403} 1957}
1404 1958
1405# the unique path, undef == no special unique path 1959# the unique path, undef == no special unique path
1406sub uniq_path { 1960sub uniq_path {
1407 my ($self) = @_; 1961 my ($self) = @_;
1408 1962
1409 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1963 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1410 "$UNIQUEDIR/$path" 1964 "$UNIQUEDIR/$path"
1411} 1965}
1412 1966
1413# and all this just because we cannot iterate over 1967sub decay_objects {
1414# all maps in C++...
1415sub change_all_map_light {
1416 my ($change) = @_; 1968 my ($self) = @_;
1417 1969
1418 $_->change_map_light ($change) 1970 return if $self->{deny_reset};
1419 for grep $_->outdoor, values %cf::MAP; 1971
1972 $self->do_decay_objects;
1420} 1973}
1421 1974
1422sub unlink_save { 1975sub unlink_save {
1423 my ($self) = @_; 1976 my ($self) = @_;
1424 1977
… …
1429 1982
1430sub load_header_from($) { 1983sub load_header_from($) {
1431 my ($self, $path) = @_; 1984 my ($self, $path) = @_;
1432 1985
1433 utf8::encode $path; 1986 utf8::encode $path;
1434 #aio_open $path, O_RDONLY, 0 1987 my $f = new_from_file cf::object::thawer $path
1435 # or return;
1436
1437 $self->_load_header ($path)
1438 or return; 1988 or return;
1989
1990 $self->_load_header ($f)
1991 or return;
1992
1993 local $MAP_LOADING{$self->{path}} = $self;
1994 $f->resolve_delayed_derefs;
1439 1995
1440 $self->{load_path} = $path; 1996 $self->{load_path} = $path;
1441 1997
1442 1 1998 1
1443} 1999}
… …
1482 $self->load_header_orig 2038 $self->load_header_orig
1483 or return; 2039 or return;
1484 $self->prepare_orig; 2040 $self->prepare_orig;
1485 } 2041 }
1486 2042
2043 $self->{deny_reset} = 1
2044 if $self->no_reset;
2045
1487 $self->default_region (cf::region::find_by_path $self->{path}) 2046 $self->default_region (cf::region::find_by_path $self->{path})
1488 unless $self->default_region; 2047 unless $self->default_region;
1489 2048
1490 1 2049 1
1491} 2050}
… …
1494sub find { 2053sub find {
1495 my ($path, $origin) = @_; 2054 my ($path, $origin) = @_;
1496 2055
1497 $path = normalise $path, $origin && $origin->path; 2056 $path = normalise $path, $origin && $origin->path;
1498 2057
2058 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1499 cf::lock_wait "map_find:$path"; 2059 my $guard2 = cf::lock_acquire "map_find:$path";
1500 2060
1501 $cf::MAP{$path} || do { 2061 $cf::MAP{$path} || do {
1502 my $guard = cf::lock_acquire "map_find:$path";
1503 my $map = new_from_path cf::map $path 2062 my $map = new_from_path cf::map $path
1504 or return; 2063 or return;
1505 2064
1506 $map->{last_save} = $cf::RUNTIME; 2065 $map->{last_save} = $cf::RUNTIME;
1507 2066
1508 $map->load_header 2067 $map->load_header
1509 or return; 2068 or return;
1510 2069
1511 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 2070 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1512 # doing this can freeze the server in a sync job, obviously 2071 # doing this can freeze the server in a sync job, obviously
1513 #$cf::WAIT_FOR_TICK->wait; 2072 #$cf::WAIT_FOR_TICK->wait;
2073 undef $guard2;
2074 undef $guard1;
1514 $map->reset; 2075 $map->reset;
1515 undef $guard;
1516 return find $path; 2076 return find $path;
1517 } 2077 }
1518 2078
1519 $cf::MAP{$path} = $map 2079 $cf::MAP{$path} = $map
1520 } 2080 }
1521} 2081}
1522 2082
1523sub pre_load { } 2083sub pre_load { }
1524sub post_load { } 2084#sub post_load { } # XS
1525 2085
1526sub load { 2086sub load {
1527 my ($self) = @_; 2087 my ($self) = @_;
1528 2088
1529 local $self->{deny_reset} = 1; # loading can take a long time 2089 local $self->{deny_reset} = 1; # loading can take a long time
1530 2090
1531 my $path = $self->{path}; 2091 my $path = $self->{path};
1532 2092
1533 { 2093 {
1534 my $guard = cf::lock_acquire "map_load:$path"; 2094 my $guard = cf::lock_acquire "map_data:$path";
1535 2095
2096 return unless $self->valid;
1536 return if $self->in_memory != cf::MAP_SWAPPED; 2097 return unless $self->in_memory == cf::MAP_SWAPPED;
1537 2098
1538 $self->in_memory (cf::MAP_LOADING); 2099 $self->in_memory (cf::MAP_LOADING);
1539 2100
1540 $self->alloc; 2101 $self->alloc;
1541 2102
1542 $self->pre_load; 2103 $self->pre_load;
1543 Coro::cede; 2104 cf::cede_to_tick;
1544 2105
2106 my $f = new_from_file cf::object::thawer $self->{load_path};
2107 $f->skip_block;
1545 $self->_load_objects ($self->{load_path}, 1) 2108 $self->_load_objects ($f)
1546 or return; 2109 or return;
1547 2110
1548 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2111 $self->post_load_original
1549 if delete $self->{load_original}; 2112 if delete $self->{load_original};
1550 2113
1551 if (my $uniq = $self->uniq_path) { 2114 if (my $uniq = $self->uniq_path) {
1552 utf8::encode $uniq; 2115 utf8::encode $uniq;
1553 if (aio_open $uniq, O_RDONLY, 0) { 2116 unless (aio_stat $uniq) {
2117 if (my $f = new_from_file cf::object::thawer $uniq) {
1554 $self->clear_unique_items; 2118 $self->clear_unique_items;
1555 $self->_load_objects ($uniq, 0); 2119 $self->_load_objects ($f);
2120 $f->resolve_delayed_derefs;
2121 }
1556 } 2122 }
1557 } 2123 }
1558 2124
1559 Coro::cede; 2125 $f->resolve_delayed_derefs;
2126
2127 cf::cede_to_tick;
1560 # now do the right thing for maps 2128 # now do the right thing for maps
1561 $self->link_multipart_objects; 2129 $self->link_multipart_objects;
1562 $self->difficulty ($self->estimate_difficulty) 2130 $self->difficulty ($self->estimate_difficulty)
1563 unless $self->difficulty; 2131 unless $self->difficulty;
1564 Coro::cede; 2132 cf::cede_to_tick;
1565 2133
1566 unless ($self->{deny_activate}) { 2134 unless ($self->{deny_activate}) {
1567 $self->decay_objects; 2135 $self->decay_objects;
1568 $self->fix_auto_apply; 2136 $self->fix_auto_apply;
1569 $self->update_buttons; 2137 $self->update_buttons;
1570 Coro::cede; 2138 cf::cede_to_tick;
1571 $self->set_darkness_map;
1572 Coro::cede;
1573 $self->activate; 2139 $self->activate;
1574 } 2140 }
1575 2141
2142 $self->{last_save} = $cf::RUNTIME;
2143 $self->last_access ($cf::RUNTIME);
2144
1576 $self->in_memory (cf::MAP_IN_MEMORY); 2145 $self->in_memory (cf::MAP_ACTIVE);
1577 } 2146 }
1578 2147
1579 $self->post_load; 2148 $self->post_load;
1580} 2149}
1581 2150
2151# customize the map for a given player, i.e.
2152# return the _real_ map. used by e.g. per-player
2153# maps to change the path to ~playername/mappath
1582sub customise_for { 2154sub customise_for {
1583 my ($self, $ob) = @_; 2155 my ($self, $ob) = @_;
1584 2156
1585 return find "~" . $ob->name . "/" . $self->{path} 2157 return find "~" . $ob->name . "/" . $self->{path}
1586 if $self->per_player; 2158 if $self->per_player;
1587 2159
2160# return find "?party/" . $ob->name . "/" . $self->{path}
2161# if $self->per_party;
2162
1588 $self 2163 $self
1589} 2164}
1590 2165
1591# find and load all maps in the 3x3 area around a map 2166# find and load all maps in the 3x3 area around a map
1592sub load_diag { 2167sub load_neighbours {
1593 my ($map) = @_; 2168 my ($map) = @_;
1594 2169
1595 my @diag; # diagonal neighbours 2170 my @neigh; # diagonal neighbours
1596 2171
1597 for (0 .. 3) { 2172 for (0 .. 3) {
1598 my $neigh = $map->tile_path ($_) 2173 my $neigh = $map->tile_path ($_)
1599 or next; 2174 or next;
1600 $neigh = find $neigh, $map 2175 $neigh = find $neigh, $map
1601 or next; 2176 or next;
1602 $neigh->load; 2177 $neigh->load;
1603 2178
2179 # now find the diagonal neighbours
2180 push @neigh,
1604 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2181 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1605 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2182 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1606 } 2183 }
1607 2184
1608 for (@diag) { 2185 for (grep defined $_->[0], @neigh) {
2186 my ($path, $origin) = @$_;
1609 my $neigh = find @$_ 2187 my $neigh = find $path, $origin
1610 or next; 2188 or next;
1611 $neigh->load; 2189 $neigh->load;
1612 } 2190 }
1613} 2191}
1614 2192
1615sub find_sync { 2193sub find_sync {
1616 my ($path, $origin) = @_; 2194 my ($path, $origin) = @_;
1617 2195
1618 cf::sync_job { find $path, $origin } 2196 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2197 if $Coro::current == $Coro::main;
2198
2199 find $path, $origin
1619} 2200}
1620 2201
1621sub do_load_sync { 2202sub do_load_sync {
1622 my ($map) = @_; 2203 my ($map) = @_;
1623 2204
1624 cf::sync_job { $map->load }; 2205 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2206 if $Coro::current == $Coro::main;
2207
2208 $map->load;
1625} 2209}
1626 2210
1627our %MAP_PREFETCH; 2211our %MAP_PREFETCH;
1628our $MAP_PREFETCHER = undef; 2212our $MAP_PREFETCHER = undef;
1629 2213
1630sub find_async { 2214sub find_async {
1631 my ($path, $origin) = @_; 2215 my ($path, $origin, $load) = @_;
1632 2216
1633 $path = normalise $path, $origin && $origin->{path}; 2217 $path = normalise $path, $origin && $origin->{path};
1634 2218
1635 if (my $map = $cf::MAP{$path}) { 2219 if (my $map = $cf::MAP{$path}) {
1636 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2220 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1637 } 2221 }
1638 2222
1639 undef $MAP_PREFETCH{$path}; 2223 $MAP_PREFETCH{$path} |= $load;
2224
1640 $MAP_PREFETCHER ||= cf::async { 2225 $MAP_PREFETCHER ||= cf::async {
2226 $Coro::current->{desc} = "map prefetcher";
2227
1641 while (%MAP_PREFETCH) { 2228 while (%MAP_PREFETCH) {
1642 for my $path (keys %MAP_PREFETCH) { 2229 while (my ($k, $v) = each %MAP_PREFETCH) {
1643 my $map = find $path 2230 if (my $map = find $k) {
1644 or next;
1645 $map->load; 2231 $map->load if $v;
2232 }
1646 2233
1647 delete $MAP_PREFETCH{$path}; 2234 delete $MAP_PREFETCH{$k};
1648 } 2235 }
1649 } 2236 }
1650 undef $MAP_PREFETCHER; 2237 undef $MAP_PREFETCHER;
1651 }; 2238 };
1652 $MAP_PREFETCHER->prio (6); 2239 $MAP_PREFETCHER->prio (6);
1653 2240
1654 () 2241 ()
1655} 2242}
1656 2243
2244# common code, used by both ->save and ->swapout
1657sub save { 2245sub _save {
1658 my ($self) = @_; 2246 my ($self) = @_;
1659
1660 my $lock = cf::lock_acquire "map_data:" . $self->path;
1661 2247
1662 $self->{last_save} = $cf::RUNTIME; 2248 $self->{last_save} = $cf::RUNTIME;
1663 2249
1664 return unless $self->dirty; 2250 return unless $self->dirty;
1665 2251
… …
1671 return if $self->{deny_save}; 2257 return if $self->{deny_save};
1672 2258
1673 local $self->{last_access} = $self->last_access;#d# 2259 local $self->{last_access} = $self->last_access;#d#
1674 2260
1675 cf::async { 2261 cf::async {
2262 $Coro::current->{desc} = "map player save";
1676 $_->contr->save for $self->players; 2263 $_->contr->save for $self->players;
1677 }; 2264 };
2265
2266 cf::get_slot 0.02;
1678 2267
1679 if ($uniq) { 2268 if ($uniq) {
1680 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2269 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1681 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2270 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1682 } else { 2271 } else {
1683 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2272 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1684 } 2273 }
1685} 2274}
1686 2275
2276sub save {
2277 my ($self) = @_;
2278
2279 my $lock = cf::lock_acquire "map_data:$self->{path}";
2280
2281 $self->_save;
2282}
2283
1687sub swap_out { 2284sub swap_out {
1688 my ($self) = @_; 2285 my ($self) = @_;
1689 2286
1690 # save first because save cedes
1691 $self->save;
1692
1693 my $lock = cf::lock_acquire "map_data:" . $self->path; 2287 my $lock = cf::lock_acquire "map_data:$self->{path}";
1694 2288
2289 return if $self->in_memory != cf::MAP_ACTIVE;
2290 return if $self->{deny_save};
1695 return if $self->players; 2291 return if $self->players;
1696 return if $self->in_memory != cf::MAP_IN_MEMORY;
1697 return if $self->{deny_save};
1698 2292
2293 # first deactivate the map and "unlink" it from the core
2294 $self->deactivate;
2295 $_->clear_links_to ($self) for values %cf::MAP;
2296 $self->in_memory (cf::MAP_SWAPPED);
2297
2298 # then atomically save
2299 $self->_save;
2300
2301 # then free the map
1699 $self->clear; 2302 $self->clear;
1700 $self->in_memory (cf::MAP_SWAPPED);
1701} 2303}
1702 2304
1703sub reset_at { 2305sub reset_at {
1704 my ($self) = @_; 2306 my ($self) = @_;
1705 2307
1706 # TODO: safety, remove and allow resettable per-player maps 2308 # TODO: safety, remove and allow resettable per-player maps
1707 return 1e99 if $self->isa ("ext::map_per_player");#d#
1708 return 1e99 if $self->{deny_reset}; 2309 return 1e99 if $self->{deny_reset};
1709 2310
1710 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2311 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1711 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2312 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1712 2313
… …
1723 my ($self) = @_; 2324 my ($self) = @_;
1724 2325
1725 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2326 my $lock = cf::lock_acquire "map_data:$self->{path}";
1726 2327
1727 return if $self->players; 2328 return if $self->players;
1728 return if $self->isa ("ext::map_per_player");#d#
1729 2329
1730 warn "resetting map ", $self->path;#d# 2330 cf::trace "resetting map ", $self->path, "\n";
1731 2331
1732 $self->in_memory (cf::MAP_SWAPPED); 2332 $self->in_memory (cf::MAP_SWAPPED);
1733 2333
1734 # need to save uniques path 2334 # need to save uniques path
1735 unless ($self->{deny_save}) { 2335 unless ($self->{deny_save}) {
… …
1739 if $uniq; 2339 if $uniq;
1740 } 2340 }
1741 2341
1742 delete $cf::MAP{$self->path}; 2342 delete $cf::MAP{$self->path};
1743 2343
2344 $self->deactivate;
2345 $_->clear_links_to ($self) for values %cf::MAP;
1744 $self->clear; 2346 $self->clear;
1745
1746 $_->clear_links_to ($self) for values %cf::MAP;
1747 2347
1748 $self->unlink_save; 2348 $self->unlink_save;
1749 $self->destroy; 2349 $self->destroy;
1750} 2350}
1751 2351
1752my $nuke_counter = "aaaa"; 2352my $nuke_counter = "aaaa";
1753 2353
1754sub nuke { 2354sub nuke {
1755 my ($self) = @_; 2355 my ($self) = @_;
1756 2356
2357 {
2358 my $lock = cf::lock_acquire "map_data:$self->{path}";
2359
1757 delete $cf::MAP{$self->path}; 2360 delete $cf::MAP{$self->path};
1758 2361
1759 $self->unlink_save; 2362 $self->unlink_save;
1760 2363
1761 bless $self, "cf::map"; 2364 bless $self, "cf::map::wrap";
1762 delete $self->{deny_reset}; 2365 delete $self->{deny_reset};
1763 $self->{deny_save} = 1; 2366 $self->{deny_save} = 1;
1764 $self->reset_timeout (1); 2367 $self->reset_timeout (1);
1765 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2368 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1766 2369
1767 $cf::MAP{$self->path} = $self; 2370 $cf::MAP{$self->path} = $self;
2371 }
1768 2372
1769 $self->reset; # polite request, might not happen 2373 $self->reset; # polite request, might not happen
2374}
2375
2376=item $maps = cf::map::tmp_maps
2377
2378Returns an arrayref with all map paths of currently instantiated and saved
2379maps. May block.
2380
2381=cut
2382
2383sub tmp_maps() {
2384 [
2385 map {
2386 utf8::decode $_;
2387 /\.map$/
2388 ? normalise $_
2389 : ()
2390 } @{ aio_readdir $TMPDIR or [] }
2391 ]
2392}
2393
2394=item $maps = cf::map::random_maps
2395
2396Returns an arrayref with all map paths of currently instantiated and saved
2397random maps. May block.
2398
2399=cut
2400
2401sub random_maps() {
2402 [
2403 map {
2404 utf8::decode $_;
2405 /\.map$/
2406 ? normalise "?random/$_"
2407 : ()
2408 } @{ aio_readdir $RANDOMDIR or [] }
2409 ]
1770} 2410}
1771 2411
1772=item cf::map::unique_maps 2412=item cf::map::unique_maps
1773 2413
1774Returns an arrayref of paths of all shared maps that have 2414Returns an arrayref of paths of all shared maps that have
1775instantiated unique items. May block. 2415instantiated unique items. May block.
1776 2416
1777=cut 2417=cut
1778 2418
1779sub unique_maps() { 2419sub unique_maps() {
1780 my $files = aio_readdir $UNIQUEDIR 2420 [
1781 or return; 2421 map {
1782
1783 my @paths;
1784
1785 for (@$files) {
1786 utf8::decode $_; 2422 utf8::decode $_;
1787 next if /\.pst$/; 2423 s/\.map$//; # TODO future compatibility hack
1788 next unless /^$PATH_SEP/o; 2424 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
1789 2425 ? ()
1790 push @paths, cf::map::normalise $_; 2426 : normalise $_
2427 } @{ aio_readdir $UNIQUEDIR or [] }
1791 } 2428 ]
1792
1793 \@paths
1794} 2429}
1795 2430
1796package cf; 2431=item cf::map::static_maps
2432
2433Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2434file in the shared directory excluding F</styles> and F</editor>). May
2435block.
2436
2437=cut
2438
2439sub static_maps() {
2440 my @dirs = "";
2441 my @maps;
2442
2443 while (@dirs) {
2444 my $dir = shift @dirs;
2445
2446 next if $dir eq "/styles" || $dir eq "/editor";
2447
2448 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2449 or return;
2450
2451 for (@$files) {
2452 s/\.map$// or next;
2453 utf8::decode $_;
2454 push @maps, "$dir/$_";
2455 }
2456
2457 push @dirs, map "$dir/$_", @$dirs;
2458 }
2459
2460 \@maps
2461}
1797 2462
1798=back 2463=back
1799 2464
1800=head3 cf::object 2465=head3 cf::object
1801 2466
… …
1805 2470
1806=over 4 2471=over 4
1807 2472
1808=item $ob->inv_recursive 2473=item $ob->inv_recursive
1809 2474
1810Returns the inventory of the object _and_ their inventories, recursively. 2475Returns the inventory of the object I<and> their inventories, recursively,
2476but I<not> the object itself.
1811 2477
1812=cut 2478=cut
1813 2479
1814sub inv_recursive_; 2480sub inv_recursive_;
1815sub inv_recursive_ { 2481sub inv_recursive_ {
… …
1818 2484
1819sub inv_recursive { 2485sub inv_recursive {
1820 inv_recursive_ inv $_[0] 2486 inv_recursive_ inv $_[0]
1821} 2487}
1822 2488
2489=item $ref = $ob->ref
2490
2491Creates and returns a persistent reference to an object that can be stored as a string.
2492
2493=item $ob = cf::object::deref ($refstring)
2494
2495returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2496even if the object actually exists. May block.
2497
2498=cut
2499
2500sub deref {
2501 my ($ref) = @_;
2502
2503 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2504 my ($uuid, $name) = ($1, $2);
2505 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2506 or return;
2507 $pl->ob->uuid eq $uuid
2508 or return;
2509
2510 $pl->ob
2511 } else {
2512 warn "$ref: cannot resolve object reference\n";
2513 undef
2514 }
2515}
2516
1823package cf; 2517package cf;
1824 2518
1825=back 2519=back
1826 2520
1827=head3 cf::object::player 2521=head3 cf::object::player
… …
1833Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2527Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
1834can be C<undef>. Does the right thing when the player is currently in a 2528can be C<undef>. Does the right thing when the player is currently in a
1835dialogue with the given NPC character. 2529dialogue with the given NPC character.
1836 2530
1837=cut 2531=cut
2532
2533our $SAY_CHANNEL = {
2534 id => "say",
2535 title => "Map",
2536 reply => "say ",
2537 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2538};
2539
2540our $CHAT_CHANNEL = {
2541 id => "chat",
2542 title => "Chat",
2543 reply => "chat ",
2544 tooltip => "Player chat and shouts, global to the server.",
2545};
1838 2546
1839# rough implementation of a future "reply" method that works 2547# rough implementation of a future "reply" method that works
1840# with dialog boxes. 2548# with dialog boxes.
1841#TODO: the first argument must go, split into a $npc->reply_to ( method 2549#TODO: the first argument must go, split into a $npc->reply_to ( method
1842sub cf::object::player::reply($$$;$) { 2550sub cf::object::player::reply($$$;$) {
… …
1844 2552
1845 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2553 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1846 2554
1847 if ($self->{record_replies}) { 2555 if ($self->{record_replies}) {
1848 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2556 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2557
1849 } else { 2558 } else {
2559 my $pl = $self->contr;
2560
2561 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2562 my $dialog = $pl->{npc_dialog};
2563 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2564
2565 } else {
1850 $msg = $npc->name . " says: $msg" if $npc; 2566 $msg = $npc->name . " says: $msg" if $npc;
1851 $self->message ($msg, $flags); 2567 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2568 }
1852 } 2569 }
2570}
2571
2572=item $object->send_msg ($channel, $msg, $color, [extra...])
2573
2574=cut
2575
2576sub cf::object::send_msg {
2577 my $pl = shift->contr
2578 or return;
2579 $pl->send_msg (@_);
1853} 2580}
1854 2581
1855=item $player_object->may ("access") 2582=item $player_object->may ("access")
1856 2583
1857Returns wether the given player is authorized to access resource "access" 2584Returns wether the given player is authorized to access resource "access"
… …
1870 2597
1871=item $player_object->enter_link 2598=item $player_object->enter_link
1872 2599
1873Freezes the player and moves him/her to a special map (C<{link}>). 2600Freezes the player and moves him/her to a special map (C<{link}>).
1874 2601
1875The player should be reasonably safe there for short amounts of time. You 2602The player should be reasonably safe there for short amounts of time (e.g.
1876I<MUST> call C<leave_link> as soon as possible, though. 2603for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2604though, as the player cannot control the character while it is on the link
2605map.
1877 2606
1878Will never block. 2607Will never block.
1879 2608
1880=item $player_object->leave_link ($map, $x, $y) 2609=item $player_object->leave_link ($map, $x, $y)
1881 2610
… …
1901sub cf::object::player::enter_link { 2630sub cf::object::player::enter_link {
1902 my ($self) = @_; 2631 my ($self) = @_;
1903 2632
1904 $self->deactivate_recursive; 2633 $self->deactivate_recursive;
1905 2634
2635 ++$self->{_link_recursion};
2636
1906 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2637 return if UNIVERSAL::isa $self->map, "ext::map_link";
1907 2638
1908 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2639 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1909 if $self->map; 2640 if $self->map && $self->map->{path} ne "{link}";
1910 2641
1911 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2642 $self->enter_map ($LINK_MAP || link_map, 3, 3);
1912} 2643}
1913 2644
1914sub cf::object::player::leave_link { 2645sub cf::object::player::leave_link {
1915 my ($self, $map, $x, $y) = @_; 2646 my ($self, $map, $x, $y) = @_;
2647
2648 return unless $self->contr->active;
1916 2649
1917 my $link_pos = delete $self->{_link_pos}; 2650 my $link_pos = delete $self->{_link_pos};
1918 2651
1919 unless ($map) { 2652 unless ($map) {
1920 # restore original map position 2653 # restore original map position
… …
1931 ($x, $y) = (-1, -1) 2664 ($x, $y) = (-1, -1)
1932 unless (defined $x) && (defined $y); 2665 unless (defined $x) && (defined $y);
1933 2666
1934 # use -1 or undef as default coordinates, not 0, 0 2667 # use -1 or undef as default coordinates, not 0, 0
1935 ($x, $y) = ($map->enter_x, $map->enter_y) 2668 ($x, $y) = ($map->enter_x, $map->enter_y)
1936 if $x <=0 && $y <= 0; 2669 if $x <= 0 && $y <= 0;
1937 2670
1938 $map->load; 2671 $map->load;
1939 $map->load_diag; 2672 $map->load_neighbours;
1940 2673
1941 return unless $self->contr->active; 2674 return unless $self->contr->active;
1942 $self->activate_recursive;
1943 2675
1944 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2676 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1945 $self->enter_map ($map, $x, $y); 2677 if ($self->enter_map ($map, $x, $y)) {
1946} 2678 # entering was successful
1947 2679 delete $self->{_link_recursion};
1948cf::player->attach ( 2680 # only activate afterwards, to support waiting in hooks
1949 on_logout => sub { 2681 $self->activate_recursive;
1950 my ($pl) = @_;
1951
1952 # abort map switching before logout
1953 if ($pl->ob->{_link_pos}) {
1954 cf::sync_job {
1955 $pl->ob->leave_link
1956 };
1957 }
1958 }, 2682 }
1959 on_login => sub {
1960 my ($pl) = @_;
1961 2683
1962 # try to abort aborted map switching on player login :) 2684}
1963 # should happen only on crashes
1964 if ($pl->ob->{_link_pos}) {
1965 $pl->ob->enter_link;
1966 (async {
1967 $pl->ob->reply (undef,
1968 "There was an internal problem at your last logout, "
1969 . "the server will try to bring you to your intended destination in a second.",
1970 cf::NDI_RED);
1971 # we need this sleep as the login has a concurrent enter_exit running
1972 # and this sleep increases chances of the player not ending up in scorn
1973 Coro::Timer::sleep 1;
1974 $pl->ob->leave_link;
1975 })->prio (2);
1976 }
1977 },
1978);
1979 2685
1980=item $player_object->goto ($path, $x, $y) 2686=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
1981 2687
2688Moves the player to the given map-path and coordinates by first freezing
2689her, loading and preparing them map, calling the provided $check callback
2690that has to return the map if sucecssful, and then unfreezes the player on
2691the new (success) or old (failed) map position. In either case, $done will
2692be called at the end of this process.
2693
2694Note that $check will be called with a potentially non-loaded map, so if
2695it needs a loaded map it has to call C<< ->load >>.
2696
1982=cut 2697=cut
2698
2699our $GOTOGEN;
1983 2700
1984sub cf::object::player::goto { 2701sub cf::object::player::goto {
1985 my ($self, $path, $x, $y) = @_; 2702 my ($self, $path, $x, $y, $check, $done) = @_;
2703
2704 if ($self->{_link_recursion} >= $MAX_LINKS) {
2705 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2706 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2707 ($path, $x, $y) = @$EMERGENCY_POSITION;
2708 }
2709
2710 # do generation counting so two concurrent goto's will be executed in-order
2711 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1986 2712
1987 $self->enter_link; 2713 $self->enter_link;
1988 2714
1989 (async { 2715 (async {
2716 $Coro::current->{desc} = "player::goto $path $x $y";
2717
2718 # *tag paths override both path and x|y
2719 if ($path =~ /^\*(.*)$/) {
2720 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2721 my $ob = $obs[rand @obs];
2722
2723 # see if we actually can go there
2724 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2725 $ob = $obs[rand @obs];
2726 } else {
2727 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2728 }
2729 # else put us there anyways for now #d#
2730
2731 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2732 } else {
2733 ($path, $x, $y) = (undef, undef, undef);
2734 }
2735 }
2736
1990 my $map = eval { 2737 my $map = eval {
1991 my $map = cf::map::find $path; 2738 my $map = defined $path ? cf::map::find $path : undef;
2739
2740 if ($map) {
1992 $map = $map->customise_for ($self) if $map; 2741 $map = $map->customise_for ($self);
2742 $map = $check->($map, $x, $y, $self) if $check && $map;
2743 } else {
2744 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2745 }
2746
1993 $map 2747 $map
2748 };
2749
2750 if ($@) {
2751 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2752 LOG llevError | logBacktrace, Carp::longmess $@;
1994 } or 2753 }
1995 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1996 2754
2755 if ($gen == $self->{_goto_generation}) {
2756 delete $self->{_goto_generation};
1997 $self->leave_link ($map, $x, $y); 2757 $self->leave_link ($map, $x, $y);
2758 }
2759
2760 $done->($self) if $done;
1998 })->prio (1); 2761 })->prio (1);
1999} 2762}
2000 2763
2001=item $player_object->enter_exit ($exit_object) 2764=item $player_object->enter_exit ($exit_object)
2002 2765
… …
2022} 2785}
2023 2786
2024sub prepare_random_map { 2787sub prepare_random_map {
2025 my ($exit) = @_; 2788 my ($exit) = @_;
2026 2789
2027 my $guard = cf::lock_acquire "exit_prepare:$exit";
2028
2029 # all this does is basically replace the /! path by 2790 # all this does is basically replace the /! path by
2030 # a new random map path (?random/...) with a seed 2791 # a new random map path (?random/...) with a seed
2031 # that depends on the exit object 2792 # that depends on the exit object
2032 2793
2033 my $rmp = parse_random_map_params $exit->msg; 2794 my $rmp = parse_random_map_params $exit->msg;
… …
2035 if ($exit->map) { 2796 if ($exit->map) {
2036 $rmp->{region} = $exit->region->name; 2797 $rmp->{region} = $exit->region->name;
2037 $rmp->{origin_map} = $exit->map->path; 2798 $rmp->{origin_map} = $exit->map->path;
2038 $rmp->{origin_x} = $exit->x; 2799 $rmp->{origin_x} = $exit->x;
2039 $rmp->{origin_y} = $exit->y; 2800 $rmp->{origin_y} = $exit->y;
2801
2802 $exit->map->touch;
2040 } 2803 }
2041 2804
2042 $rmp->{random_seed} ||= $exit->random_seed; 2805 $rmp->{random_seed} ||= $exit->random_seed;
2043 2806
2044 my $data = cf::to_json $rmp; 2807 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2045 my $md5 = Digest::MD5::md5_hex $data; 2808 my $md5 = Digest::MD5::md5_hex $data;
2046 my $meta = "$RANDOMDIR/$md5.meta"; 2809 my $meta = "$RANDOMDIR/$md5.meta";
2047 2810
2048 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2811 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2049 aio_write $fh, 0, (length $data), $data, 0; 2812 aio_write $fh, 0, (length $data), $data, 0;
2050 undef $fh; 2813 undef $fh;
2051 aio_rename "$meta~", $meta; 2814 aio_rename "$meta~", $meta;
2052 2815
2816 my $slaying = "?random/$md5";
2817
2818 if ($exit->valid) {
2053 $exit->slaying ("?random/$md5"); 2819 $exit->slaying ("?random/$md5");
2054 $exit->msg (undef); 2820 $exit->msg (undef);
2821 }
2055 } 2822 }
2056} 2823}
2057 2824
2058sub cf::object::player::enter_exit { 2825sub cf::object::player::enter_exit {
2059 my ($self, $exit) = @_; 2826 my ($self, $exit) = @_;
2060 2827
2061 return unless $self->type == cf::PLAYER; 2828 return unless $self->type == cf::PLAYER;
2062 2829
2063 if ($exit->slaying eq "/!") {
2064 #TODO: this should de-fi-ni-te-ly not be a sync-job
2065 # the problem is that $exit might not survive long enough
2066 # so it needs to be done right now, right here
2067 cf::sync_job { prepare_random_map $exit };
2068 }
2069
2070 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2071 my $hp = $exit->stats->hp;
2072 my $sp = $exit->stats->sp;
2073
2074 $self->enter_link; 2830 $self->enter_link;
2075 2831
2076 (async { 2832 (async {
2077 $self->deactivate_recursive; # just to be sure 2833 $Coro::current->{desc} = "enter_exit";
2834
2078 unless (eval { 2835 unless (eval {
2836 $self->deactivate_recursive; # just to be sure
2837
2838 # random map handling
2839 {
2840 my $guard = cf::lock_acquire "exit_prepare:$exit";
2841
2842 prepare_random_map $exit
2843 if $exit->slaying eq "/!";
2844 }
2845
2846 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2847 my $x = $exit->stats->hp;
2848 my $y = $exit->stats->sp;
2849
2079 $self->goto ($slaying, $hp, $sp); 2850 $self->goto ($map, $x, $y);
2080 2851
2852 # if exit is damned, update players death & WoR home-position
2853 $self->contr->savebed ($map, $x, $y)
2854 if $exit->flag (cf::FLAG_DAMNED);
2855
2081 1; 2856 1
2082 }) { 2857 }) {
2083 $self->message ("Something went wrong deep within the crossfire server. " 2858 $self->message ("Something went wrong deep within the deliantra server. "
2084 . "I'll try to bring you back to the map you were before. " 2859 . "I'll try to bring you back to the map you were before. "
2085 . "Please report this to the dungeon master!", 2860 . "Please report this to the dungeon master!",
2086 cf::NDI_UNIQUE | cf::NDI_RED); 2861 cf::NDI_UNIQUE | cf::NDI_RED);
2087 2862
2088 warn "ERROR in enter_exit: $@"; 2863 error "ERROR in enter_exit: $@";
2089 $self->leave_link; 2864 $self->leave_link;
2090 } 2865 }
2091 })->prio (1); 2866 })->prio (1);
2092} 2867}
2093 2868
… …
2107 2882
2108 utf8::encode $text; 2883 utf8::encode $text;
2109 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2884 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2110} 2885}
2111 2886
2887=item $client->send_big_packet ($pkt)
2888
2889Like C<send_packet>, but tries to compress large packets, and fragments
2890them as required.
2891
2892=cut
2893
2894our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2895
2896sub cf::client::send_big_packet {
2897 my ($self, $pkt) = @_;
2898
2899 # try lzf for large packets
2900 $pkt = "lzf " . Compress::LZF::compress $pkt
2901 if 1024 <= length $pkt and $self->{can_lzf};
2902
2903 # split very large packets
2904 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2905 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2906 $pkt = "frag";
2907 }
2908
2909 $self->send_packet ($pkt);
2910}
2911
2912=item $client->send_msg ($channel, $msg, $color, [extra...])
2913
2914Send a drawinfo or msg packet to the client, formatting the msg for the
2915client if neccessary. C<$type> should be a string identifying the type of
2916the message, with C<log> being the default. If C<$color> is negative, suppress
2917the message unless the client supports the msg packet.
2918
2919=cut
2920
2921# non-persistent channels (usually the info channel)
2922our %CHANNEL = (
2923 "c/motd" => {
2924 id => "infobox",
2925 title => "MOTD",
2926 reply => undef,
2927 tooltip => "The message of the day",
2928 },
2929 "c/identify" => {
2930 id => "infobox",
2931 title => "Identify",
2932 reply => undef,
2933 tooltip => "Items recently identified",
2934 },
2935 "c/examine" => {
2936 id => "infobox",
2937 title => "Examine",
2938 reply => undef,
2939 tooltip => "Signs and other items you examined",
2940 },
2941 "c/shopinfo" => {
2942 id => "infobox",
2943 title => "Shop Info",
2944 reply => undef,
2945 tooltip => "What your bargaining skill tells you about the shop",
2946 },
2947 "c/book" => {
2948 id => "infobox",
2949 title => "Book",
2950 reply => undef,
2951 tooltip => "The contents of a note or book",
2952 },
2953 "c/lookat" => {
2954 id => "infobox",
2955 title => "Look",
2956 reply => undef,
2957 tooltip => "What you saw there",
2958 },
2959 "c/who" => {
2960 id => "infobox",
2961 title => "Players",
2962 reply => undef,
2963 tooltip => "Shows players who are currently online",
2964 },
2965 "c/body" => {
2966 id => "infobox",
2967 title => "Body Parts",
2968 reply => undef,
2969 tooltip => "Shows which body parts you posess and are available",
2970 },
2971 "c/statistics" => {
2972 id => "infobox",
2973 title => "Statistics",
2974 reply => undef,
2975 tooltip => "Shows your primary statistics",
2976 },
2977 "c/skills" => {
2978 id => "infobox",
2979 title => "Skills",
2980 reply => undef,
2981 tooltip => "Shows your experience per skill and item power",
2982 },
2983 "c/shopitems" => {
2984 id => "infobox",
2985 title => "Shop Items",
2986 reply => undef,
2987 tooltip => "Shows the items currently for sale in this shop",
2988 },
2989 "c/resistances" => {
2990 id => "infobox",
2991 title => "Resistances",
2992 reply => undef,
2993 tooltip => "Shows your resistances",
2994 },
2995 "c/pets" => {
2996 id => "infobox",
2997 title => "Pets",
2998 reply => undef,
2999 tooltip => "Shows information abotu your pets/a specific pet",
3000 },
3001 "c/perceiveself" => {
3002 id => "infobox",
3003 title => "Perceive Self",
3004 reply => undef,
3005 tooltip => "You gained detailed knowledge about yourself",
3006 },
3007 "c/uptime" => {
3008 id => "infobox",
3009 title => "Uptime",
3010 reply => undef,
3011 tooltip => "How long the server has been running since last restart",
3012 },
3013 "c/mapinfo" => {
3014 id => "infobox",
3015 title => "Map Info",
3016 reply => undef,
3017 tooltip => "Information related to the maps",
3018 },
3019 "c/party" => {
3020 id => "party",
3021 title => "Party",
3022 reply => "gsay ",
3023 tooltip => "Messages and chat related to your party",
3024 },
3025 "c/death" => {
3026 id => "death",
3027 title => "Death",
3028 reply => undef,
3029 tooltip => "Reason for and more info about your most recent death",
3030 },
3031 "c/say" => $SAY_CHANNEL,
3032 "c/chat" => $CHAT_CHANNEL,
3033);
3034
3035sub cf::client::send_msg {
3036 my ($self, $channel, $msg, $color, @extra) = @_;
3037
3038 $msg = $self->pl->expand_cfpod ($msg)
3039 unless $color & cf::NDI_VERBATIM;
3040
3041 $color &= cf::NDI_CLIENT_MASK; # just in case...
3042
3043 # check predefined channels, for the benefit of C
3044 if ($CHANNEL{$channel}) {
3045 $channel = $CHANNEL{$channel};
3046
3047 $self->ext_msg (channel_info => $channel);
3048 $channel = $channel->{id};
3049
3050 } elsif (ref $channel) {
3051 # send meta info to client, if not yet sent
3052 unless (exists $self->{channel}{$channel->{id}}) {
3053 $self->{channel}{$channel->{id}} = $channel;
3054 $self->ext_msg (channel_info => $channel);
3055 }
3056
3057 $channel = $channel->{id};
3058 }
3059
3060 return unless @extra || length $msg;
3061
3062 # default colour, mask it out
3063 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
3064 if $color & cf::NDI_DEF;
3065
3066 my $pkt = "msg "
3067 . $self->{json_coder}->encode (
3068 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
3069 );
3070
3071 $self->send_big_packet ($pkt);
3072}
3073
2112=item $client->ext_event ($type, %msg) 3074=item $client->ext_msg ($type, @msg)
2113 3075
2114Sends an exti event to the client. 3076Sends an ext event to the client.
2115 3077
2116=cut 3078=cut
2117 3079
2118sub cf::client::ext_event($$%) { 3080sub cf::client::ext_msg($$@) {
2119 my ($self, $type, %msg) = @_; 3081 my ($self, $type, @msg) = @_;
2120 3082
3083 if ($self->extcmd == 2) {
3084 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3085 } elsif ($self->extcmd == 1) { # TODO: remove
2121 $msg{msgtype} = "event_$type"; 3086 push @msg, msgtype => "event_$type";
2122 $self->send_packet ("ext " . cf::to_json \%msg); 3087 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3088 }
3089}
3090
3091=item $client->ext_reply ($msgid, @msg)
3092
3093Sends an ext reply to the client.
3094
3095=cut
3096
3097sub cf::client::ext_reply($$@) {
3098 my ($self, $id, @msg) = @_;
3099
3100 if ($self->extcmd == 2) {
3101 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3102 } elsif ($self->extcmd == 1) {
3103 #TODO: version 1, remove
3104 unshift @msg, msgtype => "reply", msgid => $id;
3105 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3106 }
2123} 3107}
2124 3108
2125=item $success = $client->query ($flags, "text", \&cb) 3109=item $success = $client->query ($flags, "text", \&cb)
2126 3110
2127Queues a query to the client, calling the given callback with 3111Queues a query to the client, calling the given callback with
2128the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 3112the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2129C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 3113C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2130 3114
2131Queries can fail, so check the return code. Or don't, as queries will become 3115Queries can fail, so check the return code. Or don't, as queries will
2132reliable at some point in the future. 3116become reliable at some point in the future.
2133 3117
2134=cut 3118=cut
2135 3119
2136sub cf::client::query { 3120sub cf::client::query {
2137 my ($self, $flags, $text, $cb) = @_; 3121 my ($self, $flags, $text, $cb) = @_;
… …
2145 utf8::encode $text; 3129 utf8::encode $text;
2146 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 3130 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2147 3131
2148 $self->send_packet ($self->{query_queue}[0][0]) 3132 $self->send_packet ($self->{query_queue}[0][0])
2149 if @{ $self->{query_queue} } == 1; 3133 if @{ $self->{query_queue} } == 1;
3134
3135 1
2150} 3136}
2151 3137
2152cf::client->attach ( 3138cf::client->attach (
3139 on_connect => sub {
3140 my ($ns) = @_;
3141
3142 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
3143 },
2153 on_reply => sub { 3144 on_reply => sub {
2154 my ($ns, $msg) = @_; 3145 my ($ns, $msg) = @_;
2155 3146
2156 # this weird shuffling is so that direct followup queries 3147 # this weird shuffling is so that direct followup queries
2157 # get handled first 3148 # get handled first
… …
2169 } else { 3160 } else {
2170 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 3161 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2171 } 3162 }
2172 } 3163 }
2173 }, 3164 },
3165 on_exticmd => sub {
3166 my ($ns, $buf) = @_;
3167
3168 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3169
3170 if (ref $msg) {
3171 my ($type, $reply, @payload) =
3172 "ARRAY" eq ref $msg
3173 ? @$msg
3174 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3175
3176 my @reply;
3177
3178 if (my $cb = $EXTICMD{$type}) {
3179 @reply = $cb->($ns, @payload);
3180 }
3181
3182 $ns->ext_reply ($reply, @reply)
3183 if $reply;
3184
3185 } else {
3186 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3187 }
3188
3189 cf::override;
3190 },
2174); 3191);
2175 3192
2176=item $client->async (\&cb) 3193=item $client->async (\&cb)
2177 3194
2178Create a new coroutine, running the specified callback. The coroutine will 3195Create a new coroutine, running the specified callback. The coroutine will
… …
2194 3211
2195 $coro 3212 $coro
2196} 3213}
2197 3214
2198cf::client->attach ( 3215cf::client->attach (
2199 on_destroy => sub { 3216 on_client_destroy => sub {
2200 my ($ns) = @_; 3217 my ($ns) = @_;
2201 3218
2202 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3219 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2203 }, 3220 },
2204); 3221);
… …
2219our $safe = new Safe "safe"; 3236our $safe = new Safe "safe";
2220our $safe_hole = new Safe::Hole; 3237our $safe_hole = new Safe::Hole;
2221 3238
2222$SIG{FPE} = 'IGNORE'; 3239$SIG{FPE} = 'IGNORE';
2223 3240
2224$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3241$safe->permit_only (Opcode::opset qw(
3242 :base_core :base_mem :base_orig :base_math :base_loop
3243 grepstart grepwhile mapstart mapwhile
3244 sort time
3245));
2225 3246
2226# here we export the classes and methods available to script code 3247# here we export the classes and methods available to script code
2227 3248
2228=pod 3249=pod
2229 3250
2230The following functions and methods are available within a safe environment: 3251The following functions and methods are available within a safe environment:
2231 3252
2232 cf::object contr pay_amount pay_player map 3253 cf::object
3254 contr pay_amount pay_player map x y force_find force_add destroy
3255 insert remove name archname title slaying race decrease split
3256 value
3257
2233 cf::object::player player 3258 cf::object::player
2234 cf::player peaceful 3259 player
2235 cf::map trigger 3260
3261 cf::player
3262 peaceful
3263
3264 cf::map
3265 trigger
2236 3266
2237=cut 3267=cut
2238 3268
2239for ( 3269for (
2240 ["cf::object" => qw(contr pay_amount pay_player map)], 3270 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3271 insert remove inv nrof name archname title slaying race
3272 decrease split destroy change_exp value msg lore send_msg)],
2241 ["cf::object::player" => qw(player)], 3273 ["cf::object::player" => qw(player)],
2242 ["cf::player" => qw(peaceful)], 3274 ["cf::player" => qw(peaceful send_msg)],
2243 ["cf::map" => qw(trigger)], 3275 ["cf::map" => qw(trigger)],
2244) { 3276) {
2245 no strict 'refs';
2246 my ($pkg, @funs) = @$_; 3277 my ($pkg, @funs) = @$_;
2247 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3278 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2248 for @funs; 3279 for @funs;
2249} 3280}
2250 3281
… …
2265 3296
2266 my $qcode = $code; 3297 my $qcode = $code;
2267 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3298 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2268 $qcode =~ s/\n/\\n/g; 3299 $qcode =~ s/\n/\\n/g;
2269 3300
3301 %vars = (_dummy => 0) unless %vars;
3302
3303 my @res;
2270 local $_; 3304 local $_;
2271 local @safe::cf::_safe_eval_args = values %vars;
2272 3305
2273 my $eval = 3306 my $eval =
2274 "do {\n" 3307 "do {\n"
2275 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3308 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2276 . "#line 0 \"{$qcode}\"\n" 3309 . "#line 0 \"{$qcode}\"\n"
2277 . $code 3310 . $code
2278 . "\n}" 3311 . "\n}"
2279 ; 3312 ;
2280 3313
3314 if ($CFG{safe_eval}) {
2281 sub_generation_inc; 3315 sub_generation_inc;
3316 local @safe::cf::_safe_eval_args = values %vars;
2282 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3317 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2283 sub_generation_inc; 3318 sub_generation_inc;
3319 } else {
3320 local @cf::_safe_eval_args = values %vars;
3321 @res = wantarray ? eval eval : scalar eval $eval;
3322 }
2284 3323
2285 if ($@) { 3324 if ($@) {
2286 warn "$@"; 3325 warn "$@",
2287 warn "while executing safe code '$code'\n"; 3326 "while executing safe code '$code'\n",
2288 warn "with arguments " . (join " ", %vars) . "\n"; 3327 "with arguments " . (join " ", %vars) . "\n";
2289 } 3328 }
2290 3329
2291 wantarray ? @res : $res[0] 3330 wantarray ? @res : $res[0]
2292} 3331}
2293 3332
… …
2307=cut 3346=cut
2308 3347
2309sub register_script_function { 3348sub register_script_function {
2310 my ($fun, $cb) = @_; 3349 my ($fun, $cb) = @_;
2311 3350
2312 no strict 'refs'; 3351 $fun = "safe::$fun" if $CFG{safe_eval};
2313 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3352 *$fun = $safe_hole->wrap ($cb);
2314} 3353}
2315 3354
2316=back 3355=back
2317 3356
2318=cut 3357=cut
2319
2320#############################################################################
2321
2322=head2 EXTENSION DATABASE SUPPORT
2323
2324Crossfire maintains a very simple database for extension use. It can
2325currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2326convert to/from binary).
2327
2328The parameter C<$family> should best start with the name of the extension
2329using it, it should be unique.
2330
2331=over 4
2332
2333=item $value = cf::db_get $family => $key
2334
2335Returns a single value from the database.
2336
2337=item cf::db_put $family => $key => $value
2338
2339Stores the given C<$value> in the family.
2340
2341=cut
2342
2343our $DB;
2344
2345sub db_init {
2346 unless ($DB) {
2347 $DB = BDB::db_create $DB_ENV;
2348
2349 cf::sync_job {
2350 eval {
2351 $DB->set_flags (BDB::CHKSUM);
2352
2353 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2354 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2355 cf::cleanup "db_open(db): $!" if $!;
2356 };
2357 cf::cleanup "db_open(db): $@" if $@;
2358 };
2359 }
2360}
2361
2362sub db_get($$) {
2363 my $key = "$_[0]/$_[1]";
2364
2365 cf::sync_job {
2366 BDB::db_get $DB, undef, $key, my $data;
2367
2368 $! ? ()
2369 : $data
2370 }
2371}
2372
2373sub db_put($$$) {
2374 BDB::dbreq_pri 4;
2375 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2376}
2377
2378=item cf::cache $id => [$paths...], $processversion => $process
2379
2380Generic caching function that returns the value of the resource $id,
2381caching and regenerating as required.
2382
2383This function can block.
2384
2385=cut
2386
2387sub cache {
2388 my ($id, $src, $processversion, $process) = @_;
2389
2390 my $meta =
2391 join "\x00",
2392 $processversion,
2393 map {
2394 aio_stat $_
2395 and Carp::croak "$_: $!";
2396
2397 ($_, (stat _)[7,9])
2398 } @$src;
2399
2400 my $dbmeta = db_get cache => "$id/meta";
2401 if ($dbmeta ne $meta) {
2402 # changed, we may need to process
2403
2404 my @data;
2405 my $md5;
2406
2407 for (0 .. $#$src) {
2408 0 <= aio_load $src->[$_], $data[$_]
2409 or Carp::croak "$src->[$_]: $!";
2410 }
2411
2412 # if processing is expensive, check
2413 # checksum first
2414 if (1) {
2415 $md5 =
2416 join "\x00",
2417 $processversion,
2418 map {
2419 Coro::cede;
2420 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2421 } 0.. $#$src;
2422
2423
2424 my $dbmd5 = db_get cache => "$id/md5";
2425 if ($dbmd5 eq $md5) {
2426 db_put cache => "$id/meta", $meta;
2427
2428 return db_get cache => "$id/data";
2429 }
2430 }
2431
2432 my $t1 = Time::HiRes::time;
2433 my $data = $process->(\@data);
2434 my $t2 = Time::HiRes::time;
2435
2436 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2437
2438 db_put cache => "$id/data", $data;
2439 db_put cache => "$id/md5" , $md5;
2440 db_put cache => "$id/meta", $meta;
2441
2442 return $data;
2443 }
2444
2445 db_get cache => "$id/data"
2446}
2447
2448=item fork_call { }, $args
2449
2450Executes the given code block with the given arguments in a seperate
2451process, returning the results. Everything must be serialisable with
2452Coro::Storable. May, of course, block. Note that the executed sub may
2453never block itself or use any form of Event handling.
2454
2455=cut
2456
2457sub fork_call(&@) {
2458 my ($cb, @args) = @_;
2459
2460# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2461# or die "socketpair: $!";
2462 pipe my $fh1, my $fh2
2463 or die "pipe: $!";
2464
2465 if (my $pid = fork) {
2466 close $fh2;
2467
2468 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2469 $res = Coro::Storable::thaw $res;
2470
2471 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2472
2473 die $$res unless "ARRAY" eq ref $res;
2474
2475 return wantarray ? @$res : $res->[-1];
2476 } else {
2477 reset_signals;
2478 local $SIG{__WARN__};
2479 local $SIG{__DIE__};
2480 eval {
2481 close $fh1;
2482
2483 my @res = eval { $cb->(@args) };
2484 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2485 };
2486
2487 warn $@ if $@;
2488 _exit 0;
2489 }
2490}
2491
2492
2493 3358
2494############################################################################# 3359#############################################################################
2495# the server's init and main functions 3360# the server's init and main functions
2496 3361
3362# async inc loader. yay.
3363sub inc_loader {
3364 my $mod = $_[1];
3365
3366 if (in_main && !tick_inhibit) {
3367 Carp::cluck "ERROR: attempted synchronous perl module load ($mod)";
3368 } else {
3369 debug "loading perl module $mod\n";
3370 }
3371
3372 # 1. find real file
3373 for my $dir (@ORIG_INC) {
3374 ref $dir and next;
3375 0 <= Coro::AIO::aio_load "$dir/$mod", my $data
3376 or next;
3377
3378 $data = "#line 1 $dir/$mod\n$data";
3379
3380 open my $fh, "<", \$data or die;
3381
3382 return $fh;
3383 }
3384
3385 ()
3386}
3387
3388sub init_inc {
3389 # save original @INC
3390 @ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC;
3391
3392 # make sure we can do scalar-opens
3393 open my $dummy, "<", \my $dummy2;
3394
3395 # execute some stuff so perl load's some of the core modules
3396 /Ü/ =~ /ü/i;
3397 eval { &Storable::nstore_fd };
3398
3399 @INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc.
3400
3401 debug "module loading will be asynchronous from this point on.";
3402}
3403
2497sub load_facedata($) { 3404sub load_facedata($) {
2498 my ($path) = @_; 3405 my ($path) = @_;
2499 3406
3407 # HACK to clear player env face cache, we need some signal framework
3408 # for this (global event?)
3409 %ext::player_env::MUSIC_FACE_CACHE = ();
3410
3411 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3412
2500 warn "loading facedata from $path\n"; 3413 trace "loading facedata from $path\n";
2501 3414
2502 my $facedata; 3415 my $facedata;
2503 0 < aio_load $path, $facedata 3416 0 < aio_load $path, $facedata
2504 or die "$path: $!"; 3417 or die "$path: $!";
2505 3418
2506 $facedata = Coro::Storable::thaw $facedata; 3419 $facedata = Coro::Storable::thaw $facedata;
2507 3420
2508 $facedata->{version} == 2 3421 $facedata->{version} == 2
2509 or cf::cleanup "$path: version mismatch, cannot proceed."; 3422 or cf::cleanup "$path: version mismatch, cannot proceed.";
2510 3423
3424 # patch in the exptable
3425 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3426 $facedata->{resource}{"res/exp_table"} = {
3427 type => FT_RSRC,
3428 data => $exp_table,
3429 hash => (Digest::MD5::md5 $exp_table),
3430 };
3431 cf::cede_to_tick;
3432
2511 { 3433 {
2512 my $faces = $facedata->{faceinfo}; 3434 my $faces = $facedata->{faceinfo};
2513 3435
2514 while (my ($face, $info) = each %$faces) { 3436 while (my ($face, $info) = each %$faces) {
2515 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3437 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3438
2516 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3439 cf::face::set_visibility $idx, $info->{visibility};
3440 cf::face::set_magicmap $idx, $info->{magicmap};
2517 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3441 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2518 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3442 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2519 Coro::cede; 3443
3444 cf::cede_to_tick;
2520 } 3445 }
2521 3446
2522 while (my ($face, $info) = each %$faces) { 3447 while (my ($face, $info) = each %$faces) {
2523 next unless $info->{smooth}; 3448 next unless $info->{smooth};
3449
2524 my $idx = cf::face::find $face 3450 my $idx = cf::face::find $face
2525 or next; 3451 or next;
3452
2526 if (my $smooth = cf::face::find $info->{smooth}) { 3453 if (my $smooth = cf::face::find $info->{smooth}) {
3454 cf::face::set_smooth $idx, $smooth;
2527 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3455 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2528 } else { 3456 } else {
2529 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3457 error "smooth face '$info->{smooth}' not found for face '$face'";
2530 } 3458 }
2531 Coro::cede; 3459
3460 cf::cede_to_tick;
2532 } 3461 }
2533 } 3462 }
2534 3463
2535 { 3464 {
2536 my $anims = $facedata->{animinfo}; 3465 my $anims = $facedata->{animinfo};
2537 3466
2538 while (my ($anim, $info) = each %$anims) { 3467 while (my ($anim, $info) = each %$anims) {
2539 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3468 cf::anim::set $anim, $info->{frames}, $info->{facings};
2540 Coro::cede; 3469 cf::cede_to_tick;
2541 } 3470 }
2542 3471
2543 cf::anim::invalidate_all; # d'oh 3472 cf::anim::invalidate_all; # d'oh
2544 } 3473 }
2545 3474
3475 {
3476 my $res = $facedata->{resource};
3477
3478 while (my ($name, $info) = each %$res) {
3479 if (defined $info->{type}) {
3480 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3481
3482 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3483 cf::face::set_type $idx, $info->{type};
3484 } else {
3485 $RESOURCE{$name} = $info; # unused
3486 }
3487
3488 cf::cede_to_tick;
3489 }
3490 }
3491
3492 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3493
2546 1 3494 1
2547} 3495}
2548 3496
3497register_exticmd fx_want => sub {
3498 my ($ns, $want) = @_;
3499
3500 while (my ($k, $v) = each %$want) {
3501 $ns->fx_want ($k, $v);
3502 }
3503};
3504
3505sub load_resource_file($) {
3506 my $guard = lock_acquire "load_resource_file";
3507
3508 my $status = load_resource_file_ $_[0];
3509 get_slot 0.1, 100;
3510 cf::arch::commit_load;
3511
3512 $status
3513}
3514
2549sub reload_regions { 3515sub reload_regions {
3516 # HACK to clear player env face cache, we need some signal framework
3517 # for this (global event?)
3518 %ext::player_env::MUSIC_FACE_CACHE = ();
3519
2550 load_resource_file "$MAPDIR/regions" 3520 load_resource_file "$MAPDIR/regions"
2551 or die "unable to load regions file\n"; 3521 or die "unable to load regions file\n";
3522
3523 for (cf::region::list) {
3524 $_->{match} = qr/$_->{match}/
3525 if exists $_->{match};
3526 }
2552} 3527}
2553 3528
2554sub reload_facedata { 3529sub reload_facedata {
2555 load_facedata "$DATADIR/facedata" 3530 load_facedata "$DATADIR/facedata"
2556 or die "unable to load facedata\n"; 3531 or die "unable to load facedata\n";
… …
2564sub reload_treasures { 3539sub reload_treasures {
2565 load_resource_file "$DATADIR/treasures" 3540 load_resource_file "$DATADIR/treasures"
2566 or die "unable to load treasurelists\n"; 3541 or die "unable to load treasurelists\n";
2567} 3542}
2568 3543
3544sub reload_sound {
3545 trace "loading sound config from $DATADIR/sound\n";
3546
3547 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3548 or die "$DATADIR/sound $!";
3549
3550 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3551
3552 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3553 my $sound = $soundconf->{compat}[$_]
3554 or next;
3555
3556 my $face = cf::face::find "sound/$sound->[1]";
3557 cf::sound::set $sound->[0] => $face;
3558 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3559 }
3560
3561 while (my ($k, $v) = each %{$soundconf->{event}}) {
3562 my $face = cf::face::find "sound/$v";
3563 cf::sound::set $k => $face;
3564 }
3565}
3566
2569sub reload_resources { 3567sub reload_resources {
2570 warn "reloading resource files...\n"; 3568 trace "reloading resource files...\n";
2571 3569
3570 reload_facedata;
3571 reload_sound;
3572 reload_archetypes;
2572 reload_regions; 3573 reload_regions;
2573 reload_facedata;
2574 reload_archetypes;
2575 reload_treasures; 3574 reload_treasures;
2576 3575
2577 warn "finished reloading resource files\n"; 3576 trace "finished reloading resource files\n";
2578} 3577}
2579 3578
2580sub init { 3579sub reload_config {
2581 reload_resources; 3580 trace "reloading config file...\n";
2582}
2583 3581
2584sub cfg_load {
2585 open my $fh, "<:utf8", "$CONFDIR/config" 3582 open my $fh, "<:utf8", "$CONFDIR/config"
2586 or return; 3583 or return;
2587 3584
2588 local $/; 3585 local $/;
2589 *CFG = YAML::Syck::Load <$fh>; 3586 *CFG = YAML::XS::Load scalar <$fh>;
2590 3587
2591 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3588 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
2592 3589
2593 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3590 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2594 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3591 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2595 3592
2596 if (exists $CFG{mlockall}) { 3593 if (exists $CFG{mlockall}) {
… …
2598 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3595 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2599 and die "WARNING: m(un)lockall failed: $!\n"; 3596 and die "WARNING: m(un)lockall failed: $!\n";
2600 }; 3597 };
2601 warn $@ if $@; 3598 warn $@ if $@;
2602 } 3599 }
3600
3601 trace "finished reloading resource files\n";
3602}
3603
3604sub pidfile() {
3605 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3606 or die "$PIDFILE: $!";
3607 flock $fh, &Fcntl::LOCK_EX
3608 or die "$PIDFILE: flock: $!";
3609 $fh
3610}
3611
3612# make sure only one server instance is running at any one time
3613sub atomic {
3614 my $fh = pidfile;
3615
3616 my $pid = <$fh>;
3617 kill 9, $pid if $pid > 0;
3618
3619 seek $fh, 0, 0;
3620 print $fh $$;
3621}
3622
3623sub main_loop {
3624 trace "EV::loop starting\n";
3625 if (1) {
3626 EV::loop;
3627 }
3628 trace "EV::loop returned\n";
3629 goto &main_loop unless $REALLY_UNLOOP;
2603} 3630}
2604 3631
2605sub main { 3632sub main {
3633 cf::init_globals; # initialise logging
3634
3635 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3636 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3637 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3638 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3639
3640 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3641
2606 # we must not ever block the main coroutine 3642 # we must not ever block the main coroutine
2607 local $Coro::idle = sub { 3643 local $Coro::idle = sub {
2608 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3644 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2609 (async { 3645 (async {
2610 Event::one_event; 3646 $Coro::current->{desc} = "IDLE BUG HANDLER";
3647 EV::loop EV::LOOP_ONESHOT;
2611 })->prio (Coro::PRIO_MAX); 3648 })->prio (Coro::PRIO_MAX);
2612 }; 3649 };
2613 3650
2614 cfg_load; 3651 evthread_start IO::AIO::poll_fileno;
3652
3653 cf::sync_job {
3654 init_inc;
3655
3656 cf::init_experience;
3657 cf::init_anim;
3658 cf::init_attackmess;
3659 cf::init_dynamic;
3660
3661 cf::load_settings;
3662 cf::load_materials;
3663
3664 reload_resources;
3665 reload_config;
2615 db_init; 3666 db_init;
3667
3668 cf::init_uuid;
3669 cf::init_signals;
3670 cf::init_skills;
3671
3672 cf::init_beforeplay;
3673
3674 atomic;
3675
2616 load_extensions; 3676 load_extensions;
2617 3677
2618 $TICK_WATCHER->start; 3678 utime time, time, $RUNTIMEFILE;
2619 Event::loop; 3679
3680 # no (long-running) fork's whatsoever before this point(!)
3681 use POSIX ();
3682 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3683
3684 (pop @POST_INIT)->(0) while @POST_INIT;
3685 };
3686
3687 cf::object::thawer::errors_are_fatal 0;
3688 info "parse errors in files are no longer fatal from this point on.\n";
3689
3690 my $free_main; $free_main = EV::idle sub {
3691 undef $free_main;
3692 undef &main; # free gobs of memory :)
3693 };
3694
3695 goto &main_loop;
2620} 3696}
2621 3697
2622############################################################################# 3698#############################################################################
2623# initialisation and cleanup 3699# initialisation and cleanup
2624 3700
2625# install some emergency cleanup handlers 3701# install some emergency cleanup handlers
2626BEGIN { 3702BEGIN {
3703 our %SIGWATCHER = ();
2627 for my $signal (qw(INT HUP TERM)) { 3704 for my $signal (qw(INT HUP TERM)) {
2628 Event->signal ( 3705 $SIGWATCHER{$signal} = AE::signal $signal, sub {
2629 reentrant => 0,
2630 data => WF_AUTOCANCEL,
2631 signal => $signal,
2632 prio => 0,
2633 cb => sub {
2634 cf::cleanup "SIG$signal"; 3706 cf::cleanup "SIG$signal";
2635 },
2636 ); 3707 };
3708 }
3709}
3710
3711sub write_runtime_sync {
3712 my $t0 = AE::time;
3713
3714 # first touch the runtime file to show we are still running:
3715 # the fsync below can take a very very long time.
3716
3717 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3718
3719 my $guard = cf::lock_acquire "write_runtime";
3720
3721 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3722 or return;
3723
3724 my $value = $cf::RUNTIME + 90 + 10;
3725 # 10 is the runtime save interval, for a monotonic clock
3726 # 60 allows for the watchdog to kill the server.
3727
3728 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3729 and return;
3730
3731 # always fsync - this file is important
3732 aio_fsync $fh
3733 and return;
3734
3735 # touch it again to show we are up-to-date
3736 aio_utime $fh, undef, undef;
3737
3738 close $fh
3739 or return;
3740
3741 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3742 and return;
3743
3744 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3745
2637 } 3746 1
3747}
3748
3749our $uuid_lock;
3750our $uuid_skip;
3751
3752sub write_uuid_sync($) {
3753 $uuid_skip ||= $_[0];
3754
3755 return if $uuid_lock;
3756 local $uuid_lock = 1;
3757
3758 my $uuid = "$LOCALDIR/uuid";
3759
3760 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3761 or return;
3762
3763 my $value = uuid_seq uuid_cur;
3764
3765 unless ($value) {
3766 info "cowardly refusing to write zero uuid value!\n";
3767 return;
3768 }
3769
3770 my $value = uuid_str $value + $uuid_skip;
3771 $uuid_skip = 0;
3772
3773 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3774 and return;
3775
3776 # always fsync - this file is important
3777 aio_fsync $fh
3778 and return;
3779
3780 close $fh
3781 or return;
3782
3783 aio_rename "$uuid~", $uuid
3784 and return;
3785
3786 trace "uuid file written ($value).\n";
3787
3788 1
3789
3790}
3791
3792sub write_uuid($$) {
3793 my ($skip, $sync) = @_;
3794
3795 $sync ? write_uuid_sync $skip
3796 : async { write_uuid_sync $skip };
2638} 3797}
2639 3798
2640sub emergency_save() { 3799sub emergency_save() {
2641 my $freeze_guard = cf::freeze_mainloop; 3800 my $freeze_guard = cf::freeze_mainloop;
2642 3801
2643 warn "enter emergency perl save\n"; 3802 info "emergency_perl_save: enter\n";
3803
3804 # this is a trade-off: we want to be very quick here, so
3805 # save all maps without fsync, and later call a global sync
3806 # (which in turn might be very very slow)
3807 local $USE_FSYNC = 0;
2644 3808
2645 cf::sync_job { 3809 cf::sync_job {
3810 cf::write_runtime_sync; # external watchdog should not bark
3811
2646 # use a peculiar iteration method to avoid tripping on perl 3812 # use a peculiar iteration method to avoid tripping on perl
2647 # refcount bugs in for. also avoids problems with players 3813 # refcount bugs in for. also avoids problems with players
2648 # and maps saved/destroyed asynchronously. 3814 # and maps saved/destroyed asynchronously.
2649 warn "begin emergency player save\n"; 3815 info "emergency_perl_save: begin player save\n";
2650 for my $login (keys %cf::PLAYER) { 3816 for my $login (keys %cf::PLAYER) {
2651 my $pl = $cf::PLAYER{$login} or next; 3817 my $pl = $cf::PLAYER{$login} or next;
2652 $pl->valid or next; 3818 $pl->valid or next;
3819 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2653 $pl->save; 3820 $pl->save;
2654 } 3821 }
2655 warn "end emergency player save\n"; 3822 info "emergency_perl_save: end player save\n";
2656 3823
2657 warn "begin emergency map save\n"; 3824 cf::write_runtime_sync; # external watchdog should not bark
3825
3826 info "emergency_perl_save: begin map save\n";
2658 for my $path (keys %cf::MAP) { 3827 for my $path (keys %cf::MAP) {
2659 my $map = $cf::MAP{$path} or next; 3828 my $map = $cf::MAP{$path} or next;
2660 $map->valid or next; 3829 $map->valid or next;
2661 $map->save; 3830 $map->save;
2662 } 3831 }
2663 warn "end emergency map save\n"; 3832 info "emergency_perl_save: end map save\n";
2664 3833
2665 warn "begin emergency database checkpoint\n"; 3834 cf::write_runtime_sync; # external watchdog should not bark
3835
3836 info "emergency_perl_save: begin database checkpoint\n";
2666 BDB::db_env_txn_checkpoint $DB_ENV; 3837 BDB::db_env_txn_checkpoint $DB_ENV;
2667 warn "end emergency database checkpoint\n"; 3838 info "emergency_perl_save: end database checkpoint\n";
3839
3840 info "emergency_perl_save: begin write uuid\n";
3841 write_uuid_sync 1;
3842 info "emergency_perl_save: end write uuid\n";
3843
3844 cf::write_runtime_sync; # external watchdog should not bark
3845
3846 trace "emergency_perl_save: syncing database to disk";
3847 BDB::db_env_txn_checkpoint $DB_ENV;
3848
3849 info "emergency_perl_save: starting sync\n";
3850 IO::AIO::aio_sync sub {
3851 info "emergency_perl_save: finished sync\n";
3852 };
3853
3854 cf::write_runtime_sync; # external watchdog should not bark
3855
3856 trace "emergency_perl_save: flushing outstanding aio requests";
3857 while (IO::AIO::nreqs || BDB::nreqs) {
3858 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3859 }
3860
3861 cf::write_runtime_sync; # external watchdog should not bark
2668 }; 3862 };
2669 3863
2670 warn "leave emergency perl save\n"; 3864 info "emergency_perl_save: leave\n";
2671} 3865}
2672 3866
2673sub post_cleanup { 3867sub post_cleanup {
2674 my ($make_core) = @_; 3868 my ($make_core) = @_;
2675 3869
3870 IO::AIO::flush;
3871
2676 warn Carp::longmess "post_cleanup backtrace" 3872 error Carp::longmess "post_cleanup backtrace"
2677 if $make_core; 3873 if $make_core;
3874
3875 my $fh = pidfile;
3876 unlink $PIDFILE if <$fh> == $$;
3877}
3878
3879# a safer delete_package, copied from Symbol
3880sub clear_package($) {
3881 my $pkg = shift;
3882
3883 # expand to full symbol table name if needed
3884 unless ($pkg =~ /^main::.*::$/) {
3885 $pkg = "main$pkg" if $pkg =~ /^::/;
3886 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3887 $pkg .= '::' unless $pkg =~ /::$/;
3888 }
3889
3890 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3891 my $stem_symtab = *{$stem}{HASH};
3892
3893 defined $stem_symtab and exists $stem_symtab->{$leaf}
3894 or return;
3895
3896 # clear all symbols
3897 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3898 for my $name (keys %$leaf_symtab) {
3899 _gv_clear *{"$pkg$name"};
3900# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3901 }
2678} 3902}
2679 3903
2680sub do_reload_perl() { 3904sub do_reload_perl() {
2681 # can/must only be called in main 3905 # can/must only be called in main
2682 if ($Coro::current != $Coro::main) { 3906 if (in_main) {
2683 warn "can only reload from main coroutine"; 3907 error "can only reload from main coroutine";
2684 return; 3908 return;
2685 } 3909 }
2686 3910
3911 return if $RELOAD++;
3912
3913 my $t1 = AE::time;
3914
3915 while ($RELOAD) {
2687 warn "reloading..."; 3916 info "reloading...";
2688 3917
2689 warn "entering sync_job"; 3918 trace "entering sync_job";
2690 3919
2691 cf::sync_job { 3920 cf::sync_job {
2692 cf::write_runtime; # external watchdog should not bark
2693 cf::emergency_save; 3921 cf::emergency_save;
2694 cf::write_runtime; # external watchdog should not bark
2695 3922
2696 warn "syncing database to disk";
2697 BDB::db_env_txn_checkpoint $DB_ENV;
2698
2699 # if anything goes wrong in here, we should simply crash as we already saved
2700
2701 warn "cancelling all WF_AUTOCANCEL watchers";
2702 for (Event::all_watchers) {
2703 $_->cancel if $_->data & WF_AUTOCANCEL;
2704 }
2705
2706 warn "flushing outstanding aio requests";
2707 for (;;) {
2708 BDB::flush;
2709 IO::AIO::flush;
2710 Coro::cede;
2711 last unless IO::AIO::nreqs || BDB::nreqs;
2712 warn "iterate...";
2713 }
2714
2715 ++$RELOAD;
2716
2717 warn "cancelling all extension coros"; 3923 trace "cancelling all extension coros";
2718 $_->cancel for values %EXT_CORO; 3924 $_->cancel for values %EXT_CORO;
2719 %EXT_CORO = (); 3925 %EXT_CORO = ();
2720 3926
2721 warn "removing commands"; 3927 trace "removing commands";
2722 %COMMAND = (); 3928 %COMMAND = ();
2723 3929
2724 warn "removing ext commands"; 3930 trace "removing ext/exti commands";
2725 %EXTCMD = (); 3931 %EXTCMD = ();
3932 %EXTICMD = ();
2726 3933
2727 warn "unloading/nuking all extensions"; 3934 trace "unloading/nuking all extensions";
2728 for my $pkg (@EXTS) { 3935 for my $pkg (@EXTS) {
2729 warn "... unloading $pkg"; 3936 trace "... unloading $pkg";
2730 3937
2731 if (my $cb = $pkg->can ("unload")) { 3938 if (my $cb = $pkg->can ("unload")) {
2732 eval { 3939 eval {
2733 $cb->($pkg); 3940 $cb->($pkg);
2734 1 3941 1
2735 } or warn "$pkg unloaded, but with errors: $@"; 3942 } or error "$pkg unloaded, but with errors: $@";
3943 }
3944
3945 trace "... clearing $pkg";
3946 clear_package $pkg;
2736 } 3947 }
2737 3948
2738 warn "... nuking $pkg";
2739 Symbol::delete_package $pkg;
2740 }
2741
2742 warn "unloading all perl modules loaded from $LIBDIR"; 3949 trace "unloading all perl modules loaded from $LIBDIR";
2743 while (my ($k, $v) = each %INC) { 3950 while (my ($k, $v) = each %INC) {
2744 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3951 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2745 3952
2746 warn "... unloading $k"; 3953 trace "... unloading $k";
2747 delete $INC{$k}; 3954 delete $INC{$k};
2748 3955
2749 $k =~ s/\.pm$//; 3956 $k =~ s/\.pm$//;
2750 $k =~ s/\//::/g; 3957 $k =~ s/\//::/g;
2751 3958
2752 if (my $cb = $k->can ("unload_module")) { 3959 if (my $cb = $k->can ("unload_module")) {
2753 $cb->(); 3960 $cb->();
3961 }
3962
3963 clear_package $k;
2754 } 3964 }
2755 3965
2756 Symbol::delete_package $k;
2757 }
2758
2759 warn "getting rid of safe::, as good as possible"; 3966 trace "getting rid of safe::, as good as possible";
2760 Symbol::delete_package "safe::$_" 3967 clear_package "safe::$_"
2761 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3968 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2762 3969
2763 warn "unloading cf.pm \"a bit\""; 3970 trace "unloading cf.pm \"a bit\"";
2764 delete $INC{"cf.pm"}; 3971 delete $INC{"cf.pm"};
2765 delete $INC{"cf/pod.pm"}; 3972 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
2766 3973
2767 # don't, removes xs symbols, too, 3974 # don't, removes xs symbols, too,
2768 # and global variables created in xs 3975 # and global variables created in xs
2769 #Symbol::delete_package __PACKAGE__; 3976 #clear_package __PACKAGE__;
2770 3977
2771 warn "unload completed, starting to reload now"; 3978 info "unload completed, starting to reload now";
2772 3979
2773 warn "reloading cf.pm"; 3980 trace "reloading cf.pm";
2774 require cf; 3981 require cf;
2775 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3982 cf::_connect_to_perl_1;
2776 3983
2777 warn "loading config and database again"; 3984 trace "loading config and database again";
2778 cf::cfg_load; 3985 cf::reload_config;
2779 3986
2780 warn "loading extensions"; 3987 trace "loading extensions";
2781 cf::load_extensions; 3988 cf::load_extensions;
2782 3989
3990 if ($REATTACH_ON_RELOAD) {
2783 warn "reattaching attachments to objects/players"; 3991 trace "reattaching attachments to objects/players";
2784 _global_reattach; # objects, sockets 3992 _global_reattach; # objects, sockets
2785 warn "reattaching attachments to maps"; 3993 trace "reattaching attachments to maps";
2786 reattach $_ for values %MAP; 3994 reattach $_ for values %MAP;
2787 warn "reattaching attachments to players"; 3995 trace "reattaching attachments to players";
2788 reattach $_ for values %PLAYER; 3996 reattach $_ for values %PLAYER;
3997 }
2789 3998
3999 trace "running post_init jobs";
4000 (pop @POST_INIT)->(1) while @POST_INIT;
4001
2790 warn "leaving sync_job"; 4002 trace "leaving sync_job";
2791 4003
2792 1 4004 1
2793 } or do { 4005 } or do {
2794 warn $@; 4006 error $@;
2795 warn "error while reloading, exiting."; 4007 cf::cleanup "error while reloading, exiting.";
2796 exit 1; 4008 };
4009
4010 info "reloaded";
4011 --$RELOAD;
2797 }; 4012 }
2798 4013
2799 warn "reloaded"; 4014 $t1 = AE::time - $t1;
4015 info "reload completed in ${t1}s\n";
2800}; 4016};
2801 4017
2802our $RELOAD_WATCHER; # used only during reload 4018our $RELOAD_WATCHER; # used only during reload
2803 4019
2804sub reload_perl() { 4020sub reload_perl() {
2805 # doing reload synchronously and two reloads happen back-to-back, 4021 # doing reload synchronously and two reloads happen back-to-back,
2806 # coro crashes during coro_state_free->destroy here. 4022 # coro crashes during coro_state_free->destroy here.
2807 4023
2808 $RELOAD_WATCHER ||= Event->timer ( 4024 $RELOAD_WATCHER ||= cf::async {
2809 reentrant => 0, 4025 Coro::AIO::aio_wait cache_extensions;
2810 after => 0, 4026
2811 data => WF_AUTOCANCEL, 4027 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
2812 cb => sub {
2813 do_reload_perl; 4028 do_reload_perl;
2814 undef $RELOAD_WATCHER; 4029 undef $RELOAD_WATCHER;
2815 }, 4030 };
2816 ); 4031 };
2817} 4032}
2818 4033
2819register_command "reload" => sub { 4034register_command "reload" => sub {
2820 my ($who, $arg) = @_; 4035 my ($who, $arg) = @_;
2821 4036
2822 if ($who->flag (FLAG_WIZ)) { 4037 if ($who->flag (FLAG_WIZ)) {
2823 $who->message ("reloading server."); 4038 $who->message ("reloading server.");
4039 async {
4040 $Coro::current->{desc} = "perl_reload";
2824 async { reload_perl }; 4041 reload_perl;
4042 };
2825 } 4043 }
2826}; 4044};
2827 4045
2828unshift @INC, $LIBDIR; 4046#############################################################################
2829 4047
2830my $bug_warning = 0; 4048my $bug_warning = 0;
2831 4049
2832our @WAIT_FOR_TICK; 4050our @WAIT_FOR_TICK;
2833our @WAIT_FOR_TICK_BEGIN; 4051our @WAIT_FOR_TICK_BEGIN;
2834 4052
2835sub wait_for_tick { 4053sub wait_for_tick {
2836 return unless $TICK_WATCHER->is_active;
2837 return if $Coro::current == $Coro::main; 4054 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
2838 4055
2839 my $signal = new Coro::Signal; 4056 my $signal = new Coro::Signal;
2840 push @WAIT_FOR_TICK, $signal; 4057 push @WAIT_FOR_TICK, $signal;
2841 $signal->wait; 4058 $signal->wait;
2842} 4059}
2843 4060
2844sub wait_for_tick_begin { 4061sub wait_for_tick_begin {
2845 return unless $TICK_WATCHER->is_active;
2846 return if $Coro::current == $Coro::main; 4062 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
2847 4063
2848 my $signal = new Coro::Signal; 4064 my $signal = new Coro::Signal;
2849 push @WAIT_FOR_TICK_BEGIN, $signal; 4065 push @WAIT_FOR_TICK_BEGIN, $signal;
2850 $signal->wait; 4066 $signal->wait;
2851} 4067}
2852 4068
2853$TICK_WATCHER = Event->timer ( 4069sub tick {
2854 reentrant => 0,
2855 parked => 1,
2856 prio => 0,
2857 at => $NEXT_TICK || $TICK,
2858 data => WF_AUTOCANCEL,
2859 cb => sub {
2860 if ($Coro::current != $Coro::main) { 4070 if ($Coro::current != $Coro::main) {
2861 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4071 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2862 unless ++$bug_warning > 10; 4072 unless ++$bug_warning > 10;
2863 return; 4073 return;
2864 } 4074 }
2865 4075
2866 $NOW = $tick_start = Event::time;
2867
2868 cf::server_tick; # one server iteration 4076 cf::server_tick; # one server iteration
2869 4077
2870 $RUNTIME += $TICK; 4078 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
2871 $NEXT_TICK += $TICK;
2872 4079
2873 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4080 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2874 $NEXT_RUNTIME_WRITE = $NOW + 10; 4081 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
2875 Coro::async_pool { 4082 Coro::async_pool {
4083 $Coro::current->{desc} = "runtime saver";
2876 write_runtime 4084 write_runtime_sync
2877 or warn "ERROR: unable to write runtime file: $!"; 4085 or error "ERROR: unable to write runtime file: $!";
2878 };
2879 } 4086 };
4087 }
2880 4088
2881# my $AFTER = Event::time;
2882# warn $AFTER - $NOW;#d#
2883
2884 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4089 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2885 $sig->send; 4090 $sig->send;
2886 } 4091 }
2887 while (my $sig = shift @WAIT_FOR_TICK) { 4092 while (my $sig = shift @WAIT_FOR_TICK) {
2888 $sig->send; 4093 $sig->send;
2889 } 4094 }
2890 4095
2891 $NOW = Event::time; 4096 $LOAD = ($NOW - $TICK_START) / $TICK;
2892
2893 # if we are delayed by four ticks or more, skip them all
2894 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2895
2896 $TICK_WATCHER->at ($NEXT_TICK);
2897 $TICK_WATCHER->start;
2898
2899 $LOAD = ($NOW - $tick_start) / $TICK;
2900 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4097 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2901 4098
2902 _post_tick; 4099 if (0) {
2903 4100 if ($NEXT_TICK) {
2904 4101 my $jitter = $TICK_START - $NEXT_TICK;
4102 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4103 debug "jitter $JITTER\n";#d#
4104 }
2905 }, 4105 }
2906); 4106}
2907 4107
2908{ 4108{
2909 BDB::max_poll_time $TICK * 0.1; 4109 # configure BDB
2910 $BDB_POLL_WATCHER = Event->io ( 4110
2911 reentrant => 0,
2912 fd => BDB::poll_fileno,
2913 poll => 'r',
2914 prio => 0,
2915 data => WF_AUTOCANCEL,
2916 cb => \&BDB::poll_cb,
2917 );
2918 BDB::min_parallel 8; 4111 BDB::min_parallel 16;
2919 4112 BDB::max_poll_reqs $TICK * 0.1;
2920 BDB::set_sync_prepare { 4113 $AnyEvent::BDB::WATCHER->priority (1);
2921 my $status;
2922 my $current = $Coro::current;
2923 (
2924 sub {
2925 $status = $!;
2926 $current->ready; undef $current;
2927 },
2928 sub {
2929 Coro::schedule while defined $current;
2930 $! = $status;
2931 },
2932 )
2933 };
2934 4114
2935 unless ($DB_ENV) { 4115 unless ($DB_ENV) {
2936 $DB_ENV = BDB::db_env_create; 4116 $DB_ENV = BDB::db_env_create;
4117 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4118 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4119 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4120 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4121 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
2937 4122
2938 cf::sync_job { 4123 cf::sync_job {
2939 eval { 4124 eval {
2940 BDB::db_env_open 4125 BDB::db_env_open
2941 $DB_ENV, 4126 $DB_ENV,
… …
2943 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4128 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2944 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4129 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2945 0666; 4130 0666;
2946 4131
2947 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4132 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2948
2949 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2950 $DB_ENV->set_lk_detect;
2951 }; 4133 };
2952 4134
2953 cf::cleanup "db_env_open(db): $@" if $@; 4135 cf::cleanup "db_env_open(db): $@" if $@;
2954 }; 4136 };
2955 } 4137 }
4138
4139 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4140 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4141 };
4142 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4143 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4144 };
4145 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4146 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4147 };
2956} 4148}
2957 4149
2958{ 4150{
4151 # configure IO::AIO
4152
2959 IO::AIO::min_parallel 8; 4153 IO::AIO::min_parallel 8;
2960
2961 undef $Coro::AIO::WATCHER;
2962 IO::AIO::max_poll_time $TICK * 0.1; 4154 IO::AIO::max_poll_time $TICK * 0.1;
2963 $AIO_POLL_WATCHER = Event->io ( 4155 undef $AnyEvent::AIO::WATCHER;
2964 reentrant => 0,
2965 data => WF_AUTOCANCEL,
2966 fd => IO::AIO::poll_fileno,
2967 poll => 'r',
2968 prio => 6,
2969 cb => \&IO::AIO::poll_cb,
2970 );
2971} 4156}
2972 4157
2973my $_log_backtrace; 4158my $_log_backtrace;
2974 4159
2975sub _log_backtrace { 4160sub _log_backtrace {
… …
2978 $msg =~ s/\n//; 4163 $msg =~ s/\n//;
2979 4164
2980 # limit the # of concurrent backtraces 4165 # limit the # of concurrent backtraces
2981 if ($_log_backtrace < 2) { 4166 if ($_log_backtrace < 2) {
2982 ++$_log_backtrace; 4167 ++$_log_backtrace;
4168 my $perl_bt = Carp::longmess $msg;
2983 async { 4169 async {
4170 $Coro::current->{desc} = "abt $msg";
4171
2984 my @bt = fork_call { 4172 my @bt = fork_call {
2985 @addr = map { sprintf "%x", $_ } @addr; 4173 @addr = map { sprintf "%x", $_ } @addr;
2986 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4174 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
2987 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4175 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
2988 or die "addr2line: $!"; 4176 or die "addr2line: $!";
… …
2996 } 4184 }
2997 4185
2998 @funcs 4186 @funcs
2999 }; 4187 };
3000 4188
3001 LOG llevInfo, "[ABT] $msg\n"; 4189 LOG llevInfo, "[ABT] $perl_bt\n";
4190 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3002 LOG llevInfo, "[ABT] $_\n" for @bt; 4191 LOG llevInfo, "[ABT] $_\n" for @bt;
3003 --$_log_backtrace; 4192 --$_log_backtrace;
3004 }; 4193 };
3005 } else { 4194 } else {
3006 LOG llevInfo, "[ABT] $msg\n"; 4195 LOG llevInfo, "[ABT] $msg\n";
3007 LOG llevInfo, "[ABT] [suppressed]\n"; 4196 LOG llevInfo, "[ABT] [suppressed]\n";
3008 } 4197 }
3009} 4198}
3010 4199
3011# load additional modules 4200# load additional modules
3012use cf::pod; 4201require "cf/$_.pm" for @EXTRA_MODULES;
4202cf::_connect_to_perl_2;
3013 4203
3014END { cf::emergency_save } 4204END { cf::emergency_save }
3015 4205
30161 42061
3017 4207

Diff Legend

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