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

Diff Legend

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