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.279 by root, Mon Jun 11 22:16:53 2007 UTC vs.
Revision 1.476 by root, Wed Sep 2 16:54:20 2009 UTC

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

Diff Legend

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