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

Diff Legend

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