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.306 by root, Sat Jul 14 14:33:30 2007 UTC vs.
Revision 1.503 by root, Sat Jan 30 23:46:39 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;
34use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
35 66
36# configure various modules to our taste 67# configure various modules to our taste
37# 68#
38$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
39Coro::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";
40Compress::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
41 77
42$Event::Eval = 1; # no idea why this is required, but it is 78# strictly for debugging
43 79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 80
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 82
51our %COMMAND = (); 83our %COMMAND = ();
52our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
… …
55our %EXTCMD = (); 87our %EXTCMD = ();
56our %EXTICMD = (); 88our %EXTICMD = ();
57our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
58our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
59 91
60our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
61our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
62 96
63our $CONFDIR = confdir; 97our $CONFDIR = confdir;
64our $DATADIR = datadir; 98our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
68our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE;
74 112
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 115our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
82 117
118our $BDB_DEADLOCK_WATCHER;
119our $BDB_CHECKPOINT_WATCHER;
83our $BDB_POLL_WATCHER; 120our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 121our $DB_ENV;
122
123our @EXTRA_MODULES = qw(pod match mapscript);
85 124
86our %CFG; 125our %CFG;
87 126
88our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 128our $RUNTIME;
129our $NOW;
90 130
91our %PLAYER; # all users 131our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 132our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 133our $LINK_MAP; # the special {link} map, which is always available
94 134
95# 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 ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 136our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 137
98our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
140our $JITTER; # average jitter
100our $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 :)
101 147
102binmode STDOUT; 148binmode STDOUT;
103binmode STDERR; 149binmode STDERR;
104 150
105# read virtual server time, if available 151# read virtual server time, if available
106unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 152unless ($RUNTIME || !-e $RUNTIMEFILE) {
107 open my $fh, "<", "$LOCALDIR/runtime" 153 open my $fh, "<", $RUNTIMEFILE
108 or die "unable to read runtime file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
109 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
110} 156}
157
158eval "sub TICK() { $TICK } 1" or die;
111 159
112mkdir $_ 160mkdir $_
113 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
114 162
115our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
116 164
117sub 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::"} };
118 177
119############################################################################# 178#############################################################################
120 179
121=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
122 181
… …
158 217
159The raw value load value from the last tick. 218The raw value load value from the last tick.
160 219
161=item %cf::CFG 220=item %cf::CFG
162 221
163Configuration for the server, loaded from C</etc/crossfire/config>, or 222Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 223from wherever your confdir points to.
165 224
166=item cf::wait_for_tick, cf::wait_for_tick_begin 225=item cf::wait_for_tick, cf::wait_for_tick_begin
167 226
168These 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
169returns 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
170per 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.
171 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
172=back 243=back
173 244
174=cut 245=cut
175 246
176BEGIN { 247$Coro::State::WARNHOOK = sub {
177 *CORE::GLOBAL::warn = sub {
178 my $msg = join "", @_; 248 my $msg = join "", @_;
179 249
180 $msg .= "\n" 250 $msg .= "\n"
181 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
182 252
183 $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;
184 254
185 utf8::encode $msg;
186 LOG llevError, $msg; 255 LOG llevError, $msg;
187 }; 256};
188} 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};
189 271
190@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
191@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
192@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
193@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
200for my $pkg (qw( 282for my $pkg (qw(
201 cf::global cf::attachable 283 cf::global cf::attachable
202 cf::object cf::object::player 284 cf::object cf::object::player
203 cf::client cf::player 285 cf::client cf::player
204 cf::arch cf::living 286 cf::arch cf::living
287 cf::map cf::mapspace
205 cf::map cf::party cf::region 288 cf::party cf::region
206)) { 289)) {
207 no strict 'refs';
208 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
209} 291}
210 292
211$Event::DIED = sub { 293$EV::DIED = sub {
212 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
213}; 295};
214 296
215############################################################################# 297#############################################################################
216 298
217=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
… …
239 $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;
240 $d 322 $d
241 } || "[unable to dump $_[0]: '$@']"; 323 } || "[unable to dump $_[0]: '$@']";
242} 324}
243 325
244=item $ref = cf::from_json $json 326=item $ref = cf::decode_json $json
245 327
246Converts a JSON string into the corresponding perl data structure. 328Converts a JSON string into the corresponding perl data structure.
247 329
248=item $json = cf::to_json $ref 330=item $json = cf::encode_json $ref
249 331
250Converts a perl data structure into its JSON representation. 332Converts a perl data structure into its JSON representation.
251 333
252=cut 334=cut
253 335
254our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
255 337
256sub to_json ($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
257sub 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}
258 354
259=item cf::lock_wait $string 355=item cf::lock_wait $string
260 356
261Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
262 358
263=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
264 360
265Wait 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
266a 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,
267for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
268returned. 364returned.
269 365
366Locks are *not* recursive, locking from the same coro twice results in a
367deadlocked coro.
368
270Lock 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
271uses map_find and cf::map::load uses map_load). 370uses map_find and cf::map::load uses map_load).
272 371
273=item $locked = cf::lock_active $string 372=item $locked = cf::lock_active $string
274 373
275Return 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.
276 375
277=cut 376=cut
278 377
279our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
280 379
281sub lock_wait($) { 380sub lock_wait($) {
282 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
283
284 # wait for lock, if any
285 while ($LOCK{$key}) {
286 push @{ $LOCK{$key} }, $Coro::current;
287 Coro::schedule;
288 }
289} 382}
290 383
291sub lock_acquire($) { 384sub lock_acquire($) {
292 my ($key) = @_; 385 $LOCKS->guard ($_[0])
293
294 # wait, to be sure we are not locked
295 lock_wait $key;
296
297 $LOCK{$key} = [];
298
299 Coro::guard {
300 # wake up all waiters, to be on the safe side
301 $_->ready for @{ delete $LOCK{$key} };
302 }
303} 386}
304 387
305sub lock_active($) { 388sub lock_active($) {
306 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
307
308 ! ! $LOCK{$key}
309} 390}
310 391
311sub freeze_mainloop { 392sub freeze_mainloop {
312 return unless $TICK_WATCHER->is_active; 393 tick_inhibit_inc;
313 394
314 my $guard = Coro::guard { 395 &Guard::guard (\&tick_inhibit_dec);
315 $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 }
316 }; 462 }
317 $TICK_WATCHER->stop; 463};
318 $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;
319} 478}
320 479
321=item cf::async { BLOCK } 480=item cf::async { BLOCK }
322 481
323Currently the same as Coro::async_pool, meaning you cannot use 482Currently the same as Coro::async_pool, meaning you cannot use
… …
328 487
329BEGIN { *async = \&Coro::async_pool } 488BEGIN { *async = \&Coro::async_pool }
330 489
331=item cf::sync_job { BLOCK } 490=item cf::sync_job { BLOCK }
332 491
333The design of Crossfire TRT requires that the main coroutine ($Coro::main) 492The design of Deliantra requires that the main coroutine ($Coro::main)
334is always able to handle events or runnable, as Crossfire TRT is only 493is always able to handle events or runnable, as Deliantra is only
335partly 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
336acceptable. 495acceptable.
337 496
338If 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
339the given BLOCK in another coroutine while waiting for the result. The 498the given BLOCK in another coroutine while waiting for the result. The
… …
344 503
345sub sync_job(&) { 504sub sync_job(&) {
346 my ($job) = @_; 505 my ($job) = @_;
347 506
348 if ($Coro::current == $Coro::main) { 507 if ($Coro::current == $Coro::main) {
349 my $time = Event::time; 508 my $time = EV::time;
350 509
351 # this is the main coro, too bad, we have to block 510 # this is the main coro, too bad, we have to block
352 # till the operation succeeds, freezing the server :/ 511 # till the operation succeeds, freezing the server :/
353 512
354 # TODO: use suspend/resume instead 513 LOG llevError, Carp::longmess "sync job";#d#
355 # (but this is cancel-safe) 514
356 my $freeze_guard = freeze_mainloop; 515 my $freeze_guard = freeze_mainloop;
357 516
358 my $busy = 1; 517 my $busy = 1;
359 my @res; 518 my @res;
360 519
361 (async { 520 (async {
521 $Coro::current->desc ("sync job coro");
362 @res = eval { $job->() }; 522 @res = eval { $job->() };
363 warn $@ if $@; 523 warn $@ if $@;
364 undef $busy; 524 undef $busy;
365 })->prio (Coro::PRIO_MAX); 525 })->prio (Coro::PRIO_MAX);
366 526
367 while ($busy) { 527 while ($busy) {
368 Coro::cede or Event::one_event; 528 if (Coro::nready) {
529 Coro::cede_notself;
530 } else {
531 EV::loop EV::LOOP_ONESHOT;
369 } 532 }
533 }
370 534
371 $time = Event::time - $time; 535 my $time = EV::time - $time;
372 536
373 LOG llevError | logBacktrace, Carp::longmess "long sync job"
374 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
375
376 $tick_start += $time; # do not account sync jobs to server load 537 $TICK_START += $time; # do not account sync jobs to server load
377 538
378 wantarray ? @res : $res[0] 539 wantarray ? @res : $res[0]
379 } else { 540 } else {
380 # we are in another coroutine, how wonderful, everything just works 541 # we are in another coroutine, how wonderful, everything just works
381 542
… …
406=item fork_call { }, $args 567=item fork_call { }, $args
407 568
408Executes the given code block with the given arguments in a seperate 569Executes the given code block with the given arguments in a seperate
409process, returning the results. Everything must be serialisable with 570process, returning the results. Everything must be serialisable with
410Coro::Storable. May, of course, block. Note that the executed sub may 571Coro::Storable. May, of course, block. Note that the executed sub may
411never block itself or use any form of Event handling. 572never block itself or use any form of event handling.
412 573
413=cut 574=cut
414
415sub _store_scalar {
416 open my $fh, ">", \my $buf
417 or die "fork_call: cannot open fh-to-buf in child : $!";
418 Storable::store_fd $_[0], $fh;
419 close $fh;
420
421 $buf
422}
423 575
424sub fork_call(&@) { 576sub fork_call(&@) {
425 my ($cb, @args) = @_; 577 my ($cb, @args) = @_;
426 578
427# 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,
428# or die "socketpair: $!"; 580 # otherwise perl prematurely frees the stuff :/
429 pipe my $fh1, my $fh2 581 # TODO: investigate and fix (likely this will be rather laborious)
430 or die "pipe: $!";
431 582
432 if (my $pid = fork) { 583 my @res = Coro::Util::fork_eval {
433 close $fh2;
434
435 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
436 warn "pst<$res>" unless $res =~ /^pst/;
437 $res = Coro::Storable::thaw $res;
438
439 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
440
441 Carp::confess $$res unless "ARRAY" eq ref $res;
442
443 return wantarray ? @$res : $res->[-1];
444 } else {
445 reset_signals; 584 reset_signals;
446 local $SIG{__WARN__}; 585 &$cb
447 local $SIG{__DIE__}; 586 }, @args;
448 # just in case, this hack effectively disables event
449 # in the child. cleaner and slower would be canceling all watchers,
450 # but this works for the time being.
451 local $Coro::idle;
452 $Coro::current->prio (Coro::PRIO_MAX);
453 587
454 eval { 588 wantarray ? @res : $res[-1]
455 close $fh1; 589}
456 590
457 my @res = eval { $cb->(@args) }; 591=item $coin = coin_from_name $name
458 592
459 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 593=cut
460 close $fh2;
461 };
462 594
463 warn $@ if $@; 595our %coin_alias = (
464 _exit 0; 596 "silver" => "silvercoin",
465 } 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
466} 616}
467 617
468=item $value = cf::db_get $family => $key 618=item $value = cf::db_get $family => $key
469 619
470Returns a single value from the environment database. 620Returns a single value from the environment database.
… …
472=item cf::db_put $family => $key => $value 622=item cf::db_put $family => $key => $value
473 623
474Stores 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
475data 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).
476 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
477=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}
478 650
479our $DB; 651our $DB;
480 652
481sub db_init { 653sub db_init {
482 unless ($DB) {
483 $DB = BDB::db_create $DB_ENV;
484
485 cf::sync_job { 654 cf::sync_job {
486 eval { 655 $DB ||= db_table "db";
487 $DB->set_flags (BDB::CHKSUM);
488
489 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
490 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
491 cf::cleanup "db_open(db): $!" if $!;
492 };
493 cf::cleanup "db_open(db): $@" if $@;
494 };
495 } 656 };
496} 657}
497 658
498sub db_get($$) { 659sub db_get($$) {
499 my $key = "$_[0]/$_[1]"; 660 my $key = "$_[0]/$_[1]";
500 661
… …
550 if (1) { 711 if (1) {
551 $md5 = 712 $md5 =
552 join "\x00", 713 join "\x00",
553 $processversion, 714 $processversion,
554 map { 715 map {
555 Coro::cede; 716 cf::cede_to_tick;
556 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 717 ($src->[$_], Digest::MD5::md5_hex $data[$_])
557 } 0.. $#$src; 718 } 0.. $#$src;
558 719
559 720
560 my $dbmd5 = db_get cache => "$id/md5"; 721 my $dbmd5 = db_get cache => "$id/md5";
… …
598 759
599############################################################################# 760#############################################################################
600 761
601=head2 ATTACHABLE OBJECTS 762=head2 ATTACHABLE OBJECTS
602 763
603Many 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
604attach callbacks/event handlers (a collection of which is called an "attachment") 765attach callbacks/event handlers (a collection of which is called an "attachment")
605to it. All such attachable objects support the following methods. 766to it. All such attachable objects support the following methods.
606 767
607In 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>
608C<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
609Crossfire TRT). 770Deliantra).
610 771
611=over 4 772=over 4
612 773
613=item $attachable->attach ($attachment, key => $value...) 774=item $attachable->attach ($attachment, key => $value...)
614 775
… …
658=item cf::CLASS::attachment $name, ... 819=item cf::CLASS::attachment $name, ...
659 820
660Register an attachment by C<$name> through which attachable objects of the 821Register an attachment by C<$name> through which attachable objects of the
661given CLASS can refer to this attachment. 822given CLASS can refer to this attachment.
662 823
663Some classes such as crossfire maps and objects can specify attachments 824Some classes such as deliantra maps and objects can specify attachments
664that 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.
665 826
666These calls expect any number of the following handler/hook descriptions: 827These calls expect any number of the following handler/hook descriptions:
667 828
668=over 4 829=over 4
… …
866 "; 1027 ";
867 die if $@; 1028 die if $@;
868} 1029}
869 1030
870our $override; 1031our $override;
871our @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?
872 1033
873sub override { 1034sub override {
874 $override = 1; 1035 $override = 1;
875 @invoke_results = (); 1036 @INVOKE_RESULTS = (@_);
876} 1037}
877 1038
878sub do_invoke { 1039sub do_invoke {
879 my $event = shift; 1040 my $event = shift;
880 my $callbacks = shift; 1041 my $callbacks = shift;
881 1042
882 @invoke_results = (); 1043 @INVOKE_RESULTS = ();
883 1044
884 local $override; 1045 local $override;
885 1046
886 for (@$callbacks) { 1047 for (@$callbacks) {
887 eval { &{$_->[1]} }; 1048 eval { &{$_->[1]} };
… …
896 } 1057 }
897 1058
898 0 1059 0
899} 1060}
900 1061
901=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1062=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
902 1063
903=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1064=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
904 1065
905Generate an object-specific event with the given arguments. 1066Generate an object-specific event with the given arguments.
906 1067
907This 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
908removed 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
909results (if you must, access C<@cf::invoke_results> directly). 1070results (if you must, access C<@cf::INVOKE_RESULTS> directly).
910 1071
911=back 1072=back
912 1073
913=cut 1074=cut
914 1075
915############################################################################# 1076#############################################################################
916# 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}
917 1120
918sub reattach { 1121sub reattach {
919 # basically do the same as instantiate, without calling instantiate 1122 # basically do the same as instantiate, without calling instantiate
920 my ($obj) = @_; 1123 my ($obj) = @_;
921 1124
1125 # no longer needed after getting rid of delete_package?
922 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
923 1127
924 my $registry = $obj->registry; 1128 my $registry = $obj->registry;
925 1129
926 @$registry = (); 1130 @$registry = ();
927 1131
… …
942cf::attachable->attach ( 1146cf::attachable->attach (
943 prio => -1000000, 1147 prio => -1000000,
944 on_instantiate => sub { 1148 on_instantiate => sub {
945 my ($obj, $data) = @_; 1149 my ($obj, $data) = @_;
946 1150
947 $data = from_json $data; 1151 $data = decode_json $data;
948 1152
949 for (@$data) { 1153 for (@$data) {
950 my ($name, $args) = @$_; 1154 my ($name, $args) = @$_;
951 1155
952 $obj->attach ($name, %{$args || {} }); 1156 $obj->attach ($name, %{$args || {} });
… …
968sub object_freezer_save { 1172sub object_freezer_save {
969 my ($filename, $rdata, $objs) = @_; 1173 my ($filename, $rdata, $objs) = @_;
970 1174
971 sync_job { 1175 sync_job {
972 if (length $$rdata) { 1176 if (length $$rdata) {
1177 utf8::decode (my $decname = $filename);
973 warn sprintf "saving %s (%d,%d)\n", 1178 warn sprintf "saving %s (%d,%d)\n",
974 $filename, length $$rdata, scalar @$objs; 1179 $decname, length $$rdata, scalar @$objs;
975 1180
976 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
977 chmod SAVE_MODE, $fh; 1182 aio_chmod $fh, SAVE_MODE;
978 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
979 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 }
980 close $fh; 1188 aio_close $fh;
981 1189
982 if (@$objs) { 1190 if (@$objs) {
983 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) {
984 chmod SAVE_MODE, $fh; 1192 aio_chmod $fh, SAVE_MODE;
985 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1193 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
986 aio_write $fh, 0, (length $data), $data, 0; 1194 aio_write $fh, 0, (length $data), $data, 0;
987 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 }
988 close $fh; 1199 aio_close $fh;
989 aio_rename "$filename.pst~", "$filename.pst"; 1200 aio_rename "$filename.pst~", "$filename.pst";
990 } 1201 }
991 } else { 1202 } else {
992 aio_unlink "$filename.pst"; 1203 aio_unlink "$filename.pst";
993 } 1204 }
994 1205
995 aio_rename "$filename~", $filename; 1206 aio_rename "$filename~", $filename;
1207
1208 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC;
996 } else { 1210 } else {
997 warn "FATAL: $filename~: $!\n"; 1211 warn "unable to save objects: $filename~: $!\n";
998 } 1212 }
999 } else { 1213 } else {
1000 aio_unlink $filename; 1214 aio_unlink $filename;
1001 aio_unlink "$filename.pst"; 1215 aio_unlink "$filename.pst";
1002 } 1216 }
1003 } 1217 };
1004} 1218}
1005 1219
1006sub object_freezer_as_string { 1220sub object_freezer_as_string {
1007 my ($rdata, $objs) = @_; 1221 my ($rdata, $objs) = @_;
1008 1222
… …
1020 or return; 1234 or return;
1021 1235
1022 unless (aio_stat "$filename.pst") { 1236 unless (aio_stat "$filename.pst") {
1023 (aio_load "$filename.pst", $av) >= 0 1237 (aio_load "$filename.pst", $av) >= 0
1024 or return; 1238 or return;
1239
1025 $av = eval { (Storable::thaw $av)->{objs} }; 1240 my $st = eval { Coro::Storable::thaw $av };
1241 $av = $st->{objs};
1026 } 1242 }
1027 1243
1244 utf8::decode (my $decname = $filename);
1028 warn sprintf "loading %s (%d)\n", 1245 warn sprintf "loading %s (%d,%d)\n",
1029 $filename, length $data, scalar @{$av || []}; 1246 $decname, length $data, scalar @{$av || []};
1247
1030 return ($data, $av); 1248 ($data, $av)
1031} 1249}
1032 1250
1033=head2 COMMAND CALLBACKS 1251=head2 COMMAND CALLBACKS
1034 1252
1035=over 4 1253=over 4
… …
1089 my ($name, $cb) = @_; 1307 my ($name, $cb) = @_;
1090 1308
1091 $EXTICMD{$name} = $cb; 1309 $EXTICMD{$name} = $cb;
1092} 1310}
1093 1311
1312use File::Glob ();
1313
1094cf::player->attach ( 1314cf::player->attach (
1095 on_command => sub { 1315 on_command => sub {
1096 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1097 1317
1098 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
… …
1108 my ($pl, $buf) = @_; 1328 my ($pl, $buf) = @_;
1109 1329
1110 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1330 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1111 1331
1112 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
1113 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1340 if (my $cb = $EXTCMD{$type}) {
1114 if (my %reply = $cb->($pl, $msg)) { 1341 @reply = $cb->($pl, @payload);
1115 $pl->ext_reply ($msg->{msgid}, %reply);
1116 }
1117 } 1342 }
1343
1344 $pl->ext_reply ($reply, @reply)
1345 if $reply;
1346
1118 } else { 1347 } else {
1119 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1348 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1120 } 1349 }
1121 1350
1122 cf::override; 1351 cf::override;
1123 }, 1352 },
1124); 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}
1125 1367
1126sub load_extensions { 1368sub load_extensions {
1127 cf::sync_job { 1369 cf::sync_job {
1128 my %todo; 1370 my %todo;
1129 1371
… …
1149 1391
1150 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1151 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1152 1394
1153 $ext{source} = 1395 $ext{source} =
1154 "package $pkg; use strict; use utf8;\n" 1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1155 . "#line 1 \"$path\"\n{\n" 1397 . "#line 1 \"$path\"\n{\n"
1156 . $source 1398 . $source
1157 . "\n};\n1"; 1399 . "\n};\n1";
1158 1400
1159 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
… …
1175 my $msg = $@ ? "$v->{path}: $@\n" 1417 my $msg = $@ ? "$v->{path}: $@\n"
1176 : "$v->{base}: extension inactive.\n"; 1418 : "$v->{base}: extension inactive.\n";
1177 1419
1178 if (exists $v->{meta}{mandatory}) { 1420 if (exists $v->{meta}{mandatory}) {
1179 warn $msg; 1421 warn $msg;
1180 warn "mandatory extension failed to load, exiting.\n"; 1422 cf::cleanup "mandatory extension failed to load, exiting.";
1181 exit 1;
1182 } 1423 }
1183 1424
1184 warn $msg; 1425 warn $msg;
1185 } 1426 }
1186 1427
… …
1200 1441
1201=back 1442=back
1202 1443
1203=head2 CORE EXTENSIONS 1444=head2 CORE EXTENSIONS
1204 1445
1205Functions and methods that extend core crossfire objects. 1446Functions and methods that extend core deliantra objects.
1206 1447
1207=cut 1448=cut
1208 1449
1209package cf::player; 1450package cf::player;
1210 1451
1211use Coro::AIO; 1452use Coro::AIO;
1212 1453
1213=head3 cf::player 1454=head3 cf::player
1214 1455
1215=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}
1216 1471
1217=item cf::player::find $login 1472=item cf::player::find $login
1218 1473
1219Returns the given player object, loading it if necessary (might block). 1474Returns the given player object, loading it if necessary (might block).
1220 1475
… …
1239 1494
1240sub exists($) { 1495sub exists($) {
1241 my ($login) = @_; 1496 my ($login) = @_;
1242 1497
1243 $cf::PLAYER{$login} 1498 $cf::PLAYER{$login}
1244 or cf::sync_job { !aio_stat path $login } 1499 or !aio_stat path $login
1245} 1500}
1246 1501
1247sub find($) { 1502sub find($) {
1248 return $cf::PLAYER{$_[0]} || do { 1503 return $cf::PLAYER{$_[0]} || do {
1249 my $login = $_[0]; 1504 my $login = $_[0];
… …
1256 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1511 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1257 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1512 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1258 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1513 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1259 aio_unlink +(playerdir $login) . "/$login.pl"; 1514 aio_unlink +(playerdir $login) . "/$login.pl";
1260 1515
1261 my $pl = load_pl path $login 1516 my $f = new_from_file cf::object::thawer path $login
1262 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;
1263 $cf::PLAYER{$login} = $pl 1524 $cf::PLAYER{$login} = $pl
1264 } 1525 }
1265 } 1526 }
1266} 1527}
1267 1528
… …
1276 return if $pl->{deny_save}; 1537 return if $pl->{deny_save};
1277 1538
1278 aio_mkdir playerdir $pl, 0770; 1539 aio_mkdir playerdir $pl, 0770;
1279 $pl->{last_save} = $cf::RUNTIME; 1540 $pl->{last_save} = $cf::RUNTIME;
1280 1541
1542 cf::get_slot 0.01;
1543
1281 $pl->save_pl ($path); 1544 $pl->save_pl ($path);
1282 Coro::cede; 1545 cf::cede_to_tick;
1283} 1546}
1284 1547
1285sub new($) { 1548sub new($) {
1286 my ($login) = @_; 1549 my ($login) = @_;
1287 1550
… …
1293 $cf::PLAYER{$login} = $self; 1556 $cf::PLAYER{$login} = $self;
1294 1557
1295 $self 1558 $self
1296} 1559}
1297 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
1298=item $pl->quit_character 1571=item $pl->quit_character
1299 1572
1300Nukes the player without looking back. If logged in, the connection will 1573Nukes the player without looking back. If logged in, the connection will
1301be destroyed. May block for a long time. 1574be destroyed. May block for a long time.
1302 1575
… …
1306 my ($pl) = @_; 1579 my ($pl) = @_;
1307 1580
1308 my $name = $pl->ob->name; 1581 my $name = $pl->ob->name;
1309 1582
1310 $pl->{deny_save} = 1; 1583 $pl->{deny_save} = 1;
1311 $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
1312 1585
1313 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1586 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1314 $pl->deactivate; 1587 $pl->deactivate;
1588 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1589 $pl->ob->check_score;
1315 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1590 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1316 $pl->ns->destroy if $pl->ns; 1591 $pl->ns->destroy if $pl->ns;
1317 1592
1318 my $path = playerdir $pl; 1593 my $path = playerdir $pl;
1319 my $temp = "$path~$cf::RUNTIME~deleting~"; 1594 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1355 or return []; 1630 or return [];
1356 1631
1357 my @logins; 1632 my @logins;
1358 1633
1359 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") {
1360 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1640 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1361 aio_read $fh, 0, 512, my $buf, 0 or next; 1641 aio_read $fh, 0, 512, my $buf, 0 or next;
1362 $buf !~ /^password -------------$/m or next; # official not-valid tag 1642 $buf !~ /^password -------------$/m or next; # official not-valid tag
1643 }
1363 1644
1364 utf8::decode $login; 1645 utf8::decode $login;
1365 push @logins, $login; 1646 push @logins, $login;
1366 } 1647 }
1367 1648
… …
1394 } 1675 }
1395 1676
1396 \@paths 1677 \@paths
1397} 1678}
1398 1679
1399=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1680=item $protocol_xml = $player->expand_cfpod ($cfpod)
1400 1681
1401Expand crossfire pod fragments into protocol xml. 1682Expand deliantra pod fragments into protocol xml.
1402 1683
1403=cut
1404
1405sub expand_cfpod {
1406 ((my $self), (local $_)) = @_;
1407
1408 # escape & and <
1409 s/&/&amp;/g;
1410 s/(?<![BIUGH])</&lt;/g;
1411
1412 # this is buggy, it needs to properly take care of nested <'s
1413
1414 1 while
1415 # replace B<>, I<>, U<> etc.
1416 s/B<([^\>]*)>/<b>$1<\/b>/
1417 || s/I<([^\>]*)>/<i>$1<\/i>/
1418 || s/U<([^\>]*)>/<u>$1<\/u>/
1419 # replace G<male|female> tags
1420 || s{G<([^>|]*)\|([^>]*)>}{
1421 $self->gender ? $2 : $1
1422 }ge
1423 # replace H<hint text>
1424 || s{H<([^\>]*)>}
1425 {
1426 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1427 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1428 "")
1429 [$self->{hintmode}]
1430 }ge;
1431
1432 # create single paragraphs (very hackish)
1433 s/(?<=\S)\n(?=\w)/ /g;
1434
1435 # compress some whitespace
1436 s/\s+\n/\n/g; # ws line-ends
1437 s/\n\n+/\n/g; # double lines
1438 s/^\n+//; # beginning lines
1439 s/\n+$//; # ending lines
1440
1441 $_
1442}
1443
1444sub hintmode {
1445 $_[0]{hintmode} = $_[1] if @_ > 1;
1446 $_[0]{hintmode}
1447}
1448
1449=item $player->ext_reply ($msgid, %msg) 1684=item $player->ext_reply ($msgid, @msg)
1450 1685
1451Sends an ext reply to the player. 1686Sends an ext reply to the player.
1452 1687
1453=cut 1688=cut
1454 1689
1455sub ext_reply($$%) { 1690sub ext_reply($$@) {
1456 my ($self, $id, %msg) = @_; 1691 my ($self, $id, @msg) = @_;
1457 1692
1458 $msg{msgid} = $id; 1693 $self->ns->ext_reply ($id, @msg)
1459 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1460} 1694}
1461 1695
1462=item $player->ext_event ($type, %msg) 1696=item $player->ext_msg ($type, @msg)
1463 1697
1464Sends an ext event to the client. 1698Sends an ext event to the client.
1465 1699
1466=cut 1700=cut
1467 1701
1468sub ext_event($$%) { 1702sub ext_msg($$@) {
1469 my ($self, $type, %msg) = @_; 1703 my ($self, $type, @msg) = @_;
1470 1704
1471 $self->ns->ext_event ($type, %msg); 1705 $self->ns->ext_msg ($type, @msg);
1472} 1706}
1473 1707
1474=head3 cf::region 1708=head3 cf::region
1475 1709
1476=over 4 1710=over 4
… …
1520our $MAX_RESET = 3600; 1754our $MAX_RESET = 3600;
1521our $DEFAULT_RESET = 3000; 1755our $DEFAULT_RESET = 3000;
1522 1756
1523sub generate_random_map { 1757sub generate_random_map {
1524 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
1525 # mit "rum" bekleckern, nicht 1762 # mit "rum" bekleckern, nicht
1526 $self->_create_random_map ( 1763 $self->_create_random_map (
1527 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1764 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1528 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1765 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1529 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1766 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1619 $self->init; # pass $1 etc. 1856 $self->init; # pass $1 etc.
1620 return $self; 1857 return $self;
1621 } 1858 }
1622 } 1859 }
1623 1860
1624 Carp::carp "unable to resolve path '$path' (base '$base')."; 1861 Carp::cluck "unable to resolve path '$path' (base '$base').";
1625 () 1862 ()
1626} 1863}
1627 1864
1628sub init { 1865sub init {
1629 my ($self) = @_; 1866 my ($self) = @_;
… …
1651 1888
1652# the temporary/swap location 1889# the temporary/swap location
1653sub save_path { 1890sub save_path {
1654 my ($self) = @_; 1891 my ($self) = @_;
1655 1892
1656 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1893 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1657 "$TMPDIR/$path.map" 1894 "$TMPDIR/$path.map"
1658} 1895}
1659 1896
1660# the unique path, undef == no special unique path 1897# the unique path, undef == no special unique path
1661sub uniq_path { 1898sub uniq_path {
1662 my ($self) = @_; 1899 my ($self) = @_;
1663 1900
1664 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1901 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1665 "$UNIQUEDIR/$path" 1902 "$UNIQUEDIR/$path"
1666}
1667
1668# and all this just because we cannot iterate over
1669# all maps in C++...
1670sub change_all_map_light {
1671 my ($change) = @_;
1672
1673 $_->change_map_light ($change)
1674 for grep $_->outdoor, values %cf::MAP;
1675} 1903}
1676 1904
1677sub decay_objects { 1905sub decay_objects {
1678 my ($self) = @_; 1906 my ($self) = @_;
1679 1907
… …
1692 1920
1693sub load_header_from($) { 1921sub load_header_from($) {
1694 my ($self, $path) = @_; 1922 my ($self, $path) = @_;
1695 1923
1696 utf8::encode $path; 1924 utf8::encode $path;
1697 #aio_open $path, O_RDONLY, 0 1925 my $f = new_from_file cf::object::thawer $path
1698 # or return;
1699
1700 $self->_load_header ($path)
1701 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;
1702 1933
1703 $self->{load_path} = $path; 1934 $self->{load_path} = $path;
1704 1935
1705 1 1936 1
1706} 1937}
… …
1760sub find { 1991sub find {
1761 my ($path, $origin) = @_; 1992 my ($path, $origin) = @_;
1762 1993
1763 $path = normalise $path, $origin && $origin->path; 1994 $path = normalise $path, $origin && $origin->path;
1764 1995
1996 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1765 cf::lock_wait "map_find:$path"; 1997 my $guard2 = cf::lock_acquire "map_find:$path";
1766 1998
1767 $cf::MAP{$path} || do { 1999 $cf::MAP{$path} || do {
1768 my $guard = cf::lock_acquire "map_find:$path";
1769 my $map = new_from_path cf::map $path 2000 my $map = new_from_path cf::map $path
1770 or return; 2001 or return;
1771 2002
1772 $map->{last_save} = $cf::RUNTIME; 2003 $map->{last_save} = $cf::RUNTIME;
1773 2004
… …
1775 or return; 2006 or return;
1776 2007
1777 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2008 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1778 # doing this can freeze the server in a sync job, obviously 2009 # doing this can freeze the server in a sync job, obviously
1779 #$cf::WAIT_FOR_TICK->wait; 2010 #$cf::WAIT_FOR_TICK->wait;
2011 undef $guard2;
2012 undef $guard1;
1780 $map->reset; 2013 $map->reset;
1781 undef $guard;
1782 return find $path; 2014 return find $path;
1783 } 2015 }
1784 2016
1785 $cf::MAP{$path} = $map 2017 $cf::MAP{$path} = $map
1786 } 2018 }
1787} 2019}
1788 2020
1789sub pre_load { } 2021sub pre_load { }
1790sub post_load { } 2022#sub post_load { } # XS
1791 2023
1792sub load { 2024sub load {
1793 my ($self) = @_; 2025 my ($self) = @_;
1794 2026
1795 local $self->{deny_reset} = 1; # loading can take a long time 2027 local $self->{deny_reset} = 1; # loading can take a long time
1796 2028
1797 my $path = $self->{path}; 2029 my $path = $self->{path};
1798 2030
1799 { 2031 {
1800 my $guard = cf::lock_acquire "map_load:$path"; 2032 my $guard = cf::lock_acquire "map_data:$path";
1801 2033
2034 return unless $self->valid;
1802 return if $self->in_memory != cf::MAP_SWAPPED; 2035 return unless $self->in_memory == cf::MAP_SWAPPED;
1803 2036
1804 $self->in_memory (cf::MAP_LOADING); 2037 $self->in_memory (cf::MAP_LOADING);
1805 2038
1806 $self->alloc; 2039 $self->alloc;
1807 2040
1808 $self->pre_load; 2041 $self->pre_load;
1809 Coro::cede; 2042 cf::cede_to_tick;
1810 2043
2044 my $f = new_from_file cf::object::thawer $self->{load_path};
2045 $f->skip_block;
1811 $self->_load_objects ($self->{load_path}, 1) 2046 $self->_load_objects ($f)
1812 or return; 2047 or return;
1813 2048
1814 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2049 $self->post_load_original
1815 if delete $self->{load_original}; 2050 if delete $self->{load_original};
1816 2051
1817 if (my $uniq = $self->uniq_path) { 2052 if (my $uniq = $self->uniq_path) {
1818 utf8::encode $uniq; 2053 utf8::encode $uniq;
1819 if (aio_open $uniq, O_RDONLY, 0) { 2054 unless (aio_stat $uniq) {
2055 if (my $f = new_from_file cf::object::thawer $uniq) {
1820 $self->clear_unique_items; 2056 $self->clear_unique_items;
1821 $self->_load_objects ($uniq, 0); 2057 $self->_load_objects ($f);
2058 $f->resolve_delayed_derefs;
2059 }
1822 } 2060 }
1823 } 2061 }
1824 2062
1825 Coro::cede; 2063 $f->resolve_delayed_derefs;
2064
2065 cf::cede_to_tick;
1826 # now do the right thing for maps 2066 # now do the right thing for maps
1827 $self->link_multipart_objects; 2067 $self->link_multipart_objects;
1828 $self->difficulty ($self->estimate_difficulty) 2068 $self->difficulty ($self->estimate_difficulty)
1829 unless $self->difficulty; 2069 unless $self->difficulty;
1830 Coro::cede; 2070 cf::cede_to_tick;
1831 2071
1832 unless ($self->{deny_activate}) { 2072 unless ($self->{deny_activate}) {
1833 $self->decay_objects; 2073 $self->decay_objects;
1834 $self->fix_auto_apply; 2074 $self->fix_auto_apply;
1835 $self->update_buttons; 2075 $self->update_buttons;
1836 Coro::cede; 2076 cf::cede_to_tick;
1837 $self->set_darkness_map;
1838 Coro::cede;
1839 $self->activate; 2077 $self->activate;
1840 } 2078 }
1841 2079
2080 $self->{last_save} = $cf::RUNTIME;
2081 $self->last_access ($cf::RUNTIME);
2082
1842 $self->in_memory (cf::MAP_IN_MEMORY); 2083 $self->in_memory (cf::MAP_ACTIVE);
1843 } 2084 }
1844 2085
1845 $self->post_load; 2086 $self->post_load;
1846} 2087}
1847 2088
… …
1856 2097
1857 $self 2098 $self
1858} 2099}
1859 2100
1860# 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
1861sub load_diag { 2102sub load_neighbours {
1862 my ($map) = @_; 2103 my ($map) = @_;
1863 2104
1864 my @diag; # diagonal neighbours 2105 my @neigh; # diagonal neighbours
1865 2106
1866 for (0 .. 3) { 2107 for (0 .. 3) {
1867 my $neigh = $map->tile_path ($_) 2108 my $neigh = $map->tile_path ($_)
1868 or next; 2109 or next;
1869 $neigh = find $neigh, $map 2110 $neigh = find $neigh, $map
1870 or next; 2111 or next;
1871 $neigh->load; 2112 $neigh->load;
1872 2113
2114 push @neigh,
1873 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2115 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1874 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2116 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1875 } 2117 }
1876 2118
1877 for (@diag) { 2119 for (grep defined $_->[0], @neigh) {
2120 my ($path, $origin) = @$_;
1878 my $neigh = find @$_ 2121 my $neigh = find $path, $origin
1879 or next; 2122 or next;
1880 $neigh->load; 2123 $neigh->load;
1881 } 2124 }
1882} 2125}
1883 2126
… …
1888} 2131}
1889 2132
1890sub do_load_sync { 2133sub do_load_sync {
1891 my ($map) = @_; 2134 my ($map) = @_;
1892 2135
2136 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2137 if $Coro::current == $Coro::main;
2138
1893 cf::sync_job { $map->load }; 2139 cf::sync_job { $map->load };
1894} 2140}
1895 2141
1896our %MAP_PREFETCH; 2142our %MAP_PREFETCH;
1897our $MAP_PREFETCHER = undef; 2143our $MAP_PREFETCHER = undef;
1898 2144
1899sub find_async { 2145sub find_async {
1900 my ($path, $origin) = @_; 2146 my ($path, $origin, $load) = @_;
1901 2147
1902 $path = normalise $path, $origin && $origin->{path}; 2148 $path = normalise $path, $origin && $origin->{path};
1903 2149
1904 if (my $map = $cf::MAP{$path}) { 2150 if (my $map = $cf::MAP{$path}) {
1905 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2151 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1906 } 2152 }
1907 2153
1908 undef $MAP_PREFETCH{$path}; 2154 $MAP_PREFETCH{$path} |= $load;
2155
1909 $MAP_PREFETCHER ||= cf::async { 2156 $MAP_PREFETCHER ||= cf::async {
2157 $Coro::current->{desc} = "map prefetcher";
2158
1910 while (%MAP_PREFETCH) { 2159 while (%MAP_PREFETCH) {
1911 for my $path (keys %MAP_PREFETCH) { 2160 while (my ($k, $v) = each %MAP_PREFETCH) {
1912 my $map = find $path 2161 if (my $map = find $k) {
1913 or next;
1914 $map->load; 2162 $map->load if $v;
2163 }
1915 2164
1916 delete $MAP_PREFETCH{$path}; 2165 delete $MAP_PREFETCH{$k};
1917 } 2166 }
1918 } 2167 }
1919 undef $MAP_PREFETCHER; 2168 undef $MAP_PREFETCHER;
1920 }; 2169 };
1921 $MAP_PREFETCHER->prio (6); 2170 $MAP_PREFETCHER->prio (6);
… …
1924} 2173}
1925 2174
1926sub save { 2175sub save {
1927 my ($self) = @_; 2176 my ($self) = @_;
1928 2177
1929 my $lock = cf::lock_acquire "map_data:" . $self->path; 2178 my $lock = cf::lock_acquire "map_data:$self->{path}";
1930 2179
1931 $self->{last_save} = $cf::RUNTIME; 2180 $self->{last_save} = $cf::RUNTIME;
1932 2181
1933 return unless $self->dirty; 2182 return unless $self->dirty;
1934 2183
… …
1940 return if $self->{deny_save}; 2189 return if $self->{deny_save};
1941 2190
1942 local $self->{last_access} = $self->last_access;#d# 2191 local $self->{last_access} = $self->last_access;#d#
1943 2192
1944 cf::async { 2193 cf::async {
2194 $Coro::current->{desc} = "map player save";
1945 $_->contr->save for $self->players; 2195 $_->contr->save for $self->players;
1946 }; 2196 };
2197
2198 cf::get_slot 0.02;
1947 2199
1948 if ($uniq) { 2200 if ($uniq) {
1949 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2201 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1950 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2202 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1951 } else { 2203 } else {
… …
1957 my ($self) = @_; 2209 my ($self) = @_;
1958 2210
1959 # save first because save cedes 2211 # save first because save cedes
1960 $self->save; 2212 $self->save;
1961 2213
1962 my $lock = cf::lock_acquire "map_data:" . $self->path; 2214 my $lock = cf::lock_acquire "map_data:$self->{path}";
1963 2215
1964 return if $self->players; 2216 return if $self->players;
1965 return if $self->in_memory != cf::MAP_IN_MEMORY; 2217 return if $self->in_memory != cf::MAP_ACTIVE;
1966 return if $self->{deny_save}; 2218 return if $self->{deny_save};
1967 2219
2220 $self->in_memory (cf::MAP_SWAPPED);
2221
2222 $self->deactivate;
2223 $_->clear_links_to ($self) for values %cf::MAP;
1968 $self->clear; 2224 $self->clear;
1969 $self->in_memory (cf::MAP_SWAPPED);
1970} 2225}
1971 2226
1972sub reset_at { 2227sub reset_at {
1973 my ($self) = @_; 2228 my ($self) = @_;
1974 2229
… …
1992 2247
1993 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2248 my $lock = cf::lock_acquire "map_data:$self->{path}";
1994 2249
1995 return if $self->players; 2250 return if $self->players;
1996 2251
1997 warn "resetting map ", $self->path; 2252 warn "resetting map ", $self->path, "\n";
1998 2253
1999 $self->in_memory (cf::MAP_SWAPPED); 2254 $self->in_memory (cf::MAP_SWAPPED);
2000 2255
2001 # need to save uniques path 2256 # need to save uniques path
2002 unless ($self->{deny_save}) { 2257 unless ($self->{deny_save}) {
… …
2006 if $uniq; 2261 if $uniq;
2007 } 2262 }
2008 2263
2009 delete $cf::MAP{$self->path}; 2264 delete $cf::MAP{$self->path};
2010 2265
2266 $self->deactivate;
2267 $_->clear_links_to ($self) for values %cf::MAP;
2011 $self->clear; 2268 $self->clear;
2012
2013 $_->clear_links_to ($self) for values %cf::MAP;
2014 2269
2015 $self->unlink_save; 2270 $self->unlink_save;
2016 $self->destroy; 2271 $self->destroy;
2017} 2272}
2018 2273
2019my $nuke_counter = "aaaa"; 2274my $nuke_counter = "aaaa";
2020 2275
2021sub nuke { 2276sub nuke {
2022 my ($self) = @_; 2277 my ($self) = @_;
2023 2278
2279 {
2280 my $lock = cf::lock_acquire "map_data:$self->{path}";
2281
2024 delete $cf::MAP{$self->path}; 2282 delete $cf::MAP{$self->path};
2025 2283
2026 $self->unlink_save; 2284 $self->unlink_save;
2027 2285
2028 bless $self, "cf::map"; 2286 bless $self, "cf::map";
2029 delete $self->{deny_reset}; 2287 delete $self->{deny_reset};
2030 $self->{deny_save} = 1; 2288 $self->{deny_save} = 1;
2031 $self->reset_timeout (1); 2289 $self->reset_timeout (1);
2032 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2290 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2033 2291
2034 $cf::MAP{$self->path} = $self; 2292 $cf::MAP{$self->path} = $self;
2293 }
2035 2294
2036 $self->reset; # polite request, might not happen 2295 $self->reset; # polite request, might not happen
2037} 2296}
2038 2297
2039=item $maps = cf::map::tmp_maps 2298=item $maps = cf::map::tmp_maps
… …
2081 2340
2082sub unique_maps() { 2341sub unique_maps() {
2083 [ 2342 [
2084 map { 2343 map {
2085 utf8::decode $_; 2344 utf8::decode $_;
2086 /\.map$/ 2345 s/\.map$//; # TODO future compatibility hack
2346 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2347 ? ()
2087 ? normalise $_ 2348 : normalise $_
2088 : ()
2089 } @{ aio_readdir $UNIQUEDIR or [] } 2349 } @{ aio_readdir $UNIQUEDIR or [] }
2090 ] 2350 ]
2091} 2351}
2092 2352
2093package 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}
2094 2384
2095=back 2385=back
2096 2386
2097=head3 cf::object 2387=head3 cf::object
2098 2388
… …
2102 2392
2103=over 4 2393=over 4
2104 2394
2105=item $ob->inv_recursive 2395=item $ob->inv_recursive
2106 2396
2107Returns 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.
2108 2399
2109=cut 2400=cut
2110 2401
2111sub inv_recursive_; 2402sub inv_recursive_;
2112sub inv_recursive_ { 2403sub inv_recursive_ {
… …
2115 2406
2116sub inv_recursive { 2407sub inv_recursive {
2117 inv_recursive_ inv $_[0] 2408 inv_recursive_ inv $_[0]
2118} 2409}
2119 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
2120package cf; 2439package cf;
2121 2440
2122=back 2441=back
2123 2442
2124=head3 cf::object::player 2443=head3 cf::object::player
… …
2130Sends 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>
2131can 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
2132dialogue with the given NPC character. 2451dialogue with the given NPC character.
2133 2452
2134=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};
2135 2468
2136# rough implementation of a future "reply" method that works 2469# rough implementation of a future "reply" method that works
2137# with dialog boxes. 2470# with dialog boxes.
2138#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
2139sub cf::object::player::reply($$$;$) { 2472sub cf::object::player::reply($$$;$) {
… …
2146 2479
2147 } else { 2480 } else {
2148 my $pl = $self->contr; 2481 my $pl = $self->contr;
2149 2482
2150 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2483 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151 my $diag = $pl->{npc_dialog}; 2484 my $dialog = $pl->{npc_dialog};
2152 $diag->{pl}->ext_reply ( 2485 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2153 $diag->{id},
2154 msgtype => "reply",
2155 msg => $diag->{pl}->expand_cfpod ($msg),
2156 add_topics => []
2157 );
2158 2486
2159 } else { 2487 } else {
2160 $msg = $npc->name . " says: $msg" if $npc; 2488 $msg = $npc->name . " says: $msg" if $npc;
2161 $self->message ($msg, $flags); 2489 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2162 } 2490 }
2163 } 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 (@_);
2164} 2502}
2165 2503
2166=item $player_object->may ("access") 2504=item $player_object->may ("access")
2167 2505
2168Returns wether the given player is authorized to access resource "access" 2506Returns wether the given player is authorized to access resource "access"
… …
2181 2519
2182=item $player_object->enter_link 2520=item $player_object->enter_link
2183 2521
2184Freezes 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}>).
2185 2523
2186The 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.
2187I<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.
2188 2528
2189Will never block. 2529Will never block.
2190 2530
2191=item $player_object->leave_link ($map, $x, $y) 2531=item $player_object->leave_link ($map, $x, $y)
2192 2532
… …
2244 ($x, $y) = (-1, -1) 2584 ($x, $y) = (-1, -1)
2245 unless (defined $x) && (defined $y); 2585 unless (defined $x) && (defined $y);
2246 2586
2247 # use -1 or undef as default coordinates, not 0, 0 2587 # use -1 or undef as default coordinates, not 0, 0
2248 ($x, $y) = ($map->enter_x, $map->enter_y) 2588 ($x, $y) = ($map->enter_x, $map->enter_y)
2249 if $x <=0 && $y <= 0; 2589 if $x <= 0 && $y <= 0;
2250 2590
2251 $map->load; 2591 $map->load;
2252 $map->load_diag; 2592 $map->load_neighbours;
2253 2593
2254 return unless $self->contr->active; 2594 return unless $self->contr->active;
2255 $self->activate_recursive;
2256 2595
2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2596 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2258 $self->enter_map ($map, $x, $y); 2597 $self->enter_map ($map, $x, $y);
2598
2599 # only activate afterwards, to support waiting in hooks
2600 $self->activate_recursive;
2259} 2601}
2260 2602
2261=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2603=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2262 2604
2263Moves 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
2264her, loading and preparing them map, calling the provided $check callback 2606her, loading and preparing them map, calling the provided $check callback
2265that 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
2266the new (success) or old (failed) map position. In either case, $done will 2608the new (success) or old (failed) map position. In either case, $done will
2267be called at the end of this process. 2609be called at the end of this process.
2268 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 >>.
2613
2269=cut 2614=cut
2270 2615
2271our $GOTOGEN; 2616our $GOTOGEN;
2272 2617
2273sub cf::object::player::goto { 2618sub cf::object::player::goto {
… …
2277 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2622 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2278 2623
2279 $self->enter_link; 2624 $self->enter_link;
2280 2625
2281 (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
2282 my $map = eval { 2648 my $map = eval {
2283 my $map = cf::map::find $path; 2649 my $map = defined $path ? cf::map::find $path : undef;
2284 2650
2285 if ($map) { 2651 if ($map) {
2286 $map = $map->customise_for ($self); 2652 $map = $map->customise_for ($self);
2287 $map = $check->($map) if $check && $map; 2653 $map = $check->($map) if $check && $map;
2288 } else { 2654 } else {
2289 $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);
2290 } 2656 }
2291 2657
2292 $map 2658 $map
2293 }; 2659 };
2294 2660
… …
2330} 2696}
2331 2697
2332sub prepare_random_map { 2698sub prepare_random_map {
2333 my ($exit) = @_; 2699 my ($exit) = @_;
2334 2700
2335 my $guard = cf::lock_acquire "exit_prepare:$exit";
2336
2337 # all this does is basically replace the /! path by 2701 # all this does is basically replace the /! path by
2338 # a new random map path (?random/...) with a seed 2702 # a new random map path (?random/...) with a seed
2339 # that depends on the exit object 2703 # that depends on the exit object
2340 2704
2341 my $rmp = parse_random_map_params $exit->msg; 2705 my $rmp = parse_random_map_params $exit->msg;
… …
2343 if ($exit->map) { 2707 if ($exit->map) {
2344 $rmp->{region} = $exit->region->name; 2708 $rmp->{region} = $exit->region->name;
2345 $rmp->{origin_map} = $exit->map->path; 2709 $rmp->{origin_map} = $exit->map->path;
2346 $rmp->{origin_x} = $exit->x; 2710 $rmp->{origin_x} = $exit->x;
2347 $rmp->{origin_y} = $exit->y; 2711 $rmp->{origin_y} = $exit->y;
2712
2713 $exit->map->touch;
2348 } 2714 }
2349 2715
2350 $rmp->{random_seed} ||= $exit->random_seed; 2716 $rmp->{random_seed} ||= $exit->random_seed;
2351 2717
2352 my $data = cf::to_json $rmp; 2718 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2353 my $md5 = Digest::MD5::md5_hex $data; 2719 my $md5 = Digest::MD5::md5_hex $data;
2354 my $meta = "$RANDOMDIR/$md5.meta"; 2720 my $meta = "$RANDOMDIR/$md5.meta";
2355 2721
2356 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2722 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2357 aio_write $fh, 0, (length $data), $data, 0; 2723 aio_write $fh, 0, (length $data), $data, 0;
2358 undef $fh; 2724 undef $fh;
2359 aio_rename "$meta~", $meta; 2725 aio_rename "$meta~", $meta;
2360 2726
2727 my $slaying = "?random/$md5";
2728
2729 if ($exit->valid) {
2361 $exit->slaying ("?random/$md5"); 2730 $exit->slaying ("?random/$md5");
2362 $exit->msg (undef); 2731 $exit->msg (undef);
2732 }
2363 } 2733 }
2364} 2734}
2365 2735
2366sub cf::object::player::enter_exit { 2736sub cf::object::player::enter_exit {
2367 my ($self, $exit) = @_; 2737 my ($self, $exit) = @_;
2368 2738
2369 return unless $self->type == cf::PLAYER; 2739 return unless $self->type == cf::PLAYER;
2370 2740
2371 if ($exit->slaying eq "/!") {
2372 #TODO: this should de-fi-ni-te-ly not be a sync-job
2373 # the problem is that $exit might not survive long enough
2374 # so it needs to be done right now, right here
2375 cf::sync_job { prepare_random_map $exit };
2376 }
2377
2378 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2379 my $hp = $exit->stats->hp;
2380 my $sp = $exit->stats->sp;
2381
2382 $self->enter_link; 2741 $self->enter_link;
2383 2742
2384 # if exit is damned, update players death & WoR home-position
2385 $self->contr->savebed ($slaying, $hp, $sp)
2386 if $exit->flag (FLAG_DAMNED);
2387
2388 (async { 2743 (async {
2389 $self->deactivate_recursive; # just to be sure 2744 $Coro::current->{desc} = "enter_exit";
2745
2390 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
2391 $self->goto ($slaying, $hp, $sp); 2761 $self->goto ($map, $x, $y);
2392 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
2393 1; 2767 1
2394 }) { 2768 }) {
2395 $self->message ("Something went wrong deep within the crossfire server. " 2769 $self->message ("Something went wrong deep within the deliantra server. "
2396 . "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. "
2397 . "Please report this to the dungeon master!", 2771 . "Please report this to the dungeon master!",
2398 cf::NDI_UNIQUE | cf::NDI_RED); 2772 cf::NDI_UNIQUE | cf::NDI_RED);
2399 2773
2400 warn "ERROR in enter_exit: $@"; 2774 warn "ERROR in enter_exit: $@";
… …
2419 2793
2420 utf8::encode $text; 2794 utf8::encode $text;
2421 $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);
2422} 2796}
2423 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
2424=item $client->send_msg ($color, $type, $msg, [extra...]) 2823=item $client->send_msg ($channel, $msg, $color, [extra...])
2425 2824
2426Send 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
2427client 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
2428the 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
2429the message unless the client supports the msg packet. 2828the message unless the client supports the msg packet.
2430 2829
2431=cut 2830=cut
2432 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
2433sub cf::client::send_msg { 2946sub cf::client::send_msg {
2434 my ($self, $color, $type, $msg, @extra) = @_; 2947 my ($self, $channel, $msg, $color, @extra) = @_;
2435 2948
2436 $msg = $self->pl->expand_cfpod ($msg); 2949 $msg = $self->pl->expand_cfpod ($msg)
2950 unless $color & cf::NDI_VERBATIM;
2951
2952 $color &= cf::NDI_CLIENT_MASK; # just in case...
2953
2954 # check predefined channels, for the benefit of C
2955 if ($CHANNEL{$channel}) {
2956 $channel = $CHANNEL{$channel};
2957
2958 $self->ext_msg (channel_info => $channel);
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);
2966 }
2967
2968 $channel = $channel->{id};
2969 }
2437 2970
2438 return unless @extra || length $msg; 2971 return unless @extra || length $msg;
2439 2972
2440 if ($self->can_msg) { 2973 # default colour, mask it out
2441 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2974 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2442 } else { 2975 if $color & cf::NDI_DEF;
2443 # replace some tags by gcfclient-compatible ones
2444 for ($msg) {
2445 1 while
2446 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2447 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2448 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2449 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2450 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2451 }
2452 2976
2453 if ($color >= 0) { 2977 my $pkt = "msg "
2454 if (0 && $msg =~ /\[/) { 2978 . $self->{json_coder}->encode (
2455 $self->send_packet ("drawextinfo $color 4 0 $msg") 2979 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2456 } else { 2980 );
2457 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2458 $self->send_packet ("drawinfo $color $msg")
2459 }
2460 }
2461 }
2462}
2463 2981
2982 $self->send_big_packet ($pkt);
2983}
2984
2464=item $client->ext_event ($type, %msg) 2985=item $client->ext_msg ($type, @msg)
2465 2986
2466Sends an ext event to the client. 2987Sends an ext event to the client.
2467 2988
2468=cut 2989=cut
2469 2990
2470sub cf::client::ext_event($$%) { 2991sub cf::client::ext_msg($$@) {
2471 my ($self, $type, %msg) = @_; 2992 my ($self, $type, @msg) = @_;
2472 2993
2473 return unless $self->extcmd; 2994 if ($self->extcmd == 2) {
2474 2995 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2996 } elsif ($self->extcmd == 1) { # TODO: remove
2475 $msg{msgtype} = "event_$type"; 2997 push @msg, msgtype => "event_$type";
2476 $self->send_packet ("ext " . $self->{json_coder}->encode (\%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 }
2477} 3018}
2478 3019
2479=item $success = $client->query ($flags, "text", \&cb) 3020=item $success = $client->query ($flags, "text", \&cb)
2480 3021
2481Queues a query to the client, calling the given callback with 3022Queues a query to the client, calling the given callback with
… …
2536 my ($ns, $buf) = @_; 3077 my ($ns, $buf) = @_;
2537 3078
2538 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3079 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2539 3080
2540 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
2541 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3089 if (my $cb = $EXTICMD{$type}) {
2542 if (my %reply = $cb->($ns, $msg)) { 3090 @reply = $cb->($ns, @payload);
2543 $reply{msgid} = $msg->{msgid};
2544 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2545 }
2546 } 3091 }
3092
3093 $ns->ext_reply ($reply, @reply)
3094 if $reply;
3095
2547 } else { 3096 } else {
2548 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";
2549 } 3098 }
2550 3099
2551 cf::override; 3100 cf::override;
… …
2598our $safe = new Safe "safe"; 3147our $safe = new Safe "safe";
2599our $safe_hole = new Safe::Hole; 3148our $safe_hole = new Safe::Hole;
2600 3149
2601$SIG{FPE} = 'IGNORE'; 3150$SIG{FPE} = 'IGNORE';
2602 3151
2603$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));
2604 3157
2605# here we export the classes and methods available to script code 3158# here we export the classes and methods available to script code
2606 3159
2607=pod 3160=pod
2608 3161
2609The following functions and methods are available within a safe environment: 3162The following functions and methods are available within a safe environment:
2610 3163
2611 cf::object 3164 cf::object
2612 contr pay_amount pay_player map x y force_find force_add 3165 contr pay_amount pay_player map x y force_find force_add destroy
2613 insert remove 3166 insert remove name archname title slaying race decrease split
3167 value
2614 3168
2615 cf::object::player 3169 cf::object::player
2616 player 3170 player
2617 3171
2618 cf::player 3172 cf::player
… …
2623 3177
2624=cut 3178=cut
2625 3179
2626for ( 3180for (
2627 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3181 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2628 insert remove)], 3182 insert remove inv nrof name archname title slaying race
3183 decrease split destroy change_exp value msg lore send_msg)],
2629 ["cf::object::player" => qw(player)], 3184 ["cf::object::player" => qw(player)],
2630 ["cf::player" => qw(peaceful)], 3185 ["cf::player" => qw(peaceful send_msg)],
2631 ["cf::map" => qw(trigger)], 3186 ["cf::map" => qw(trigger)],
2632) { 3187) {
2633 no strict 'refs'; 3188 no strict 'refs';
2634 my ($pkg, @funs) = @$_; 3189 my ($pkg, @funs) = @$_;
2635 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3190 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
2653 3208
2654 my $qcode = $code; 3209 my $qcode = $code;
2655 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3210 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2656 $qcode =~ s/\n/\\n/g; 3211 $qcode =~ s/\n/\\n/g;
2657 3212
3213 %vars = (_dummy => 0) unless %vars;
3214
3215 my @res;
2658 local $_; 3216 local $_;
2659 local @safe::cf::_safe_eval_args = values %vars;
2660 3217
2661 my $eval = 3218 my $eval =
2662 "do {\n" 3219 "do {\n"
2663 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3220 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2664 . "#line 0 \"{$qcode}\"\n" 3221 . "#line 0 \"{$qcode}\"\n"
2665 . $code 3222 . $code
2666 . "\n}" 3223 . "\n}"
2667 ; 3224 ;
2668 3225
3226 if ($CFG{safe_eval}) {
2669 sub_generation_inc; 3227 sub_generation_inc;
3228 local @safe::cf::_safe_eval_args = values %vars;
2670 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3229 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2671 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 }
2672 3235
2673 if ($@) { 3236 if ($@) {
2674 warn "$@"; 3237 warn "$@";
2675 warn "while executing safe code '$code'\n"; 3238 warn "while executing safe code '$code'\n";
2676 warn "with arguments " . (join " ", %vars) . "\n"; 3239 warn "with arguments " . (join " ", %vars) . "\n";
… …
2695=cut 3258=cut
2696 3259
2697sub register_script_function { 3260sub register_script_function {
2698 my ($fun, $cb) = @_; 3261 my ($fun, $cb) = @_;
2699 3262
2700 no strict 'refs'; 3263 $fun = "safe::$fun" if $CFG{safe_eval};
2701 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3264 *$fun = $safe_hole->wrap ($cb);
2702} 3265}
2703 3266
2704=back 3267=back
2705 3268
2706=cut 3269=cut
… …
2708############################################################################# 3271#############################################################################
2709# the server's init and main functions 3272# the server's init and main functions
2710 3273
2711sub load_facedata($) { 3274sub load_facedata($) {
2712 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;
2713 3282
2714 warn "loading facedata from $path\n"; 3283 warn "loading facedata from $path\n";
2715 3284
2716 my $facedata; 3285 my $facedata;
2717 0 < aio_load $path, $facedata 3286 0 < aio_load $path, $facedata
… …
2720 $facedata = Coro::Storable::thaw $facedata; 3289 $facedata = Coro::Storable::thaw $facedata;
2721 3290
2722 $facedata->{version} == 2 3291 $facedata->{version} == 2
2723 or cf::cleanup "$path: version mismatch, cannot proceed."; 3292 or cf::cleanup "$path: version mismatch, cannot proceed.";
2724 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
2725 { 3303 {
2726 my $faces = $facedata->{faceinfo}; 3304 my $faces = $facedata->{faceinfo};
2727 3305
2728 while (my ($face, $info) = each %$faces) { 3306 while (my ($face, $info) = each %$faces) {
2729 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3307 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3308
2730 cf::face::set_visibility $idx, $info->{visibility}; 3309 cf::face::set_visibility $idx, $info->{visibility};
2731 cf::face::set_magicmap $idx, $info->{magicmap}; 3310 cf::face::set_magicmap $idx, $info->{magicmap};
2732 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3311 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2733 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3312 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2734 3313
2735 cf::cede_to_tick; 3314 cf::cede_to_tick;
2736 } 3315 }
2737 3316
2738 while (my ($face, $info) = each %$faces) { 3317 while (my ($face, $info) = each %$faces) {
2739 next unless $info->{smooth}; 3318 next unless $info->{smooth};
3319
2740 my $idx = cf::face::find $face 3320 my $idx = cf::face::find $face
2741 or next; 3321 or next;
3322
2742 if (my $smooth = cf::face::find $info->{smooth}) { 3323 if (my $smooth = cf::face::find $info->{smooth}) {
2743 cf::face::set_smooth $idx, $smooth; 3324 cf::face::set_smooth $idx, $smooth;
2744 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3325 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2745 } else { 3326 } else {
2746 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3327 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
2760 3341
2761 cf::anim::invalidate_all; # d'oh 3342 cf::anim::invalidate_all; # d'oh
2762 } 3343 }
2763 3344
2764 { 3345 {
2765 # TODO: for gcfclient pleasure, we should give resources
2766 # that gcfclient doesn't grok a >10000 face index.
2767 my $res = $facedata->{resource}; 3346 my $res = $facedata->{resource};
2768 my $enc = JSON::XS->new->utf8->canonical;
2769 3347
2770 while (my ($name, $info) = each %$res) { 3348 while (my ($name, $info) = each %$res) {
2771 my $meta = $enc->encode ({ 3349 if (defined $info->{type}) {
2772 name => $name,
2773 type => $info->{type},
2774 copyright => $info->{copyright}, #TODO#
2775 });
2776 my $data = pack "(w/a*)*", $meta, $info->{data};
2777 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2778
2779 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3350 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3351
3352 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
2780 cf::face::set_type $idx, 1; 3353 cf::face::set_type $idx, $info->{type};
2781 cf::face::set_data $idx, 0, $data, $chk; 3354 } else {
3355 $RESOURCE{$name} = $info;
3356 }
2782 3357
2783 cf::cede_to_tick; 3358 cf::cede_to_tick;
2784 } 3359 }
2785 } 3360 }
2786 3361
3362 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3363
2787 1 3364 1
2788} 3365}
2789 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
2790sub 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
2791 load_resource_file "$MAPDIR/regions" 3410 load_resource_file "$MAPDIR/regions"
2792 or die "unable to load regions file\n"; 3411 or die "unable to load regions file\n";
2793 3412
2794 for (cf::region::list) { 3413 for (cf::region::list) {
2795 $_->{match} = qr/$_->{match}/ 3414 $_->{match} = qr/$_->{match}/
… …
2803} 3422}
2804 3423
2805sub reload_archetypes { 3424sub reload_archetypes {
2806 load_resource_file "$DATADIR/archetypes" 3425 load_resource_file "$DATADIR/archetypes"
2807 or die "unable to load archetypes\n"; 3426 or die "unable to load archetypes\n";
2808 #d# NEED to laod twice to resolve forward references
2809 # this really needs to be done in an extra post-pass
2810 # (which needs to be synchronous, so solve it differently)
2811 load_resource_file "$DATADIR/archetypes"
2812 or die "unable to load archetypes\n";
2813} 3427}
2814 3428
2815sub reload_treasures { 3429sub reload_treasures {
2816 load_resource_file "$DATADIR/treasures" 3430 load_resource_file "$DATADIR/treasures"
2817 or die "unable to load treasurelists\n"; 3431 or die "unable to load treasurelists\n";
2818} 3432}
2819 3433
2820sub reload_resources { 3434sub reload_resources {
2821 warn "reloading resource files...\n"; 3435 warn "reloading resource files...\n";
2822 3436
3437 reload_facedata;
3438 reload_archetypes;
2823 reload_regions; 3439 reload_regions;
2824 reload_facedata;
2825 #reload_archetypes;#d#
2826 reload_archetypes;
2827 reload_treasures; 3440 reload_treasures;
2828 3441
2829 warn "finished reloading resource files\n"; 3442 warn "finished reloading resource files\n";
2830} 3443}
2831 3444
2832sub init { 3445sub reload_config {
2833 reload_resources; 3446 warn "reloading config file...\n";
2834}
2835 3447
2836sub cfg_load {
2837 open my $fh, "<:utf8", "$CONFDIR/config" 3448 open my $fh, "<:utf8", "$CONFDIR/config"
2838 or return; 3449 or return;
2839 3450
2840 local $/; 3451 local $/;
2841 *CFG = YAML::Syck::Load <$fh>; 3452 *CFG = YAML::XS::Load scalar <$fh>;
2842 3453
2843 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3454 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2844 3455
2845 $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};
2846 $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};
… …
2850 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3461 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2851 and die "WARNING: m(un)lockall failed: $!\n"; 3462 and die "WARNING: m(un)lockall failed: $!\n";
2852 }; 3463 };
2853 warn $@ if $@; 3464 warn $@ if $@;
2854 } 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;
2855} 3496}
2856 3497
2857sub 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
2858 # we must not ever block the main coroutine 3513 # we must not ever block the main coroutine
2859 local $Coro::idle = sub { 3514 local $Coro::idle = sub {
2860 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#
2861 (async { 3516 (async {
2862 Event::one_event; 3517 $Coro::current->{desc} = "IDLE BUG HANDLER";
3518 EV::loop EV::LOOP_ONESHOT;
2863 })->prio (Coro::PRIO_MAX); 3519 })->prio (Coro::PRIO_MAX);
2864 }; 3520 };
2865 3521
2866 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;
2867 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
2868 load_extensions; 3541 load_extensions;
2869 3542
2870 $TICK_WATCHER->start; 3543 utime time, time, $RUNTIMEFILE;
2871 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;
2872} 3553}
2873 3554
2874############################################################################# 3555#############################################################################
2875# initialisation and cleanup 3556# initialisation and cleanup
2876 3557
2877# install some emergency cleanup handlers 3558# install some emergency cleanup handlers
2878BEGIN { 3559BEGIN {
3560 our %SIGWATCHER = ();
2879 for my $signal (qw(INT HUP TERM)) { 3561 for my $signal (qw(INT HUP TERM)) {
2880 Event->signal ( 3562 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2881 reentrant => 0,
2882 data => WF_AUTOCANCEL,
2883 signal => $signal,
2884 prio => 0,
2885 cb => sub {
2886 cf::cleanup "SIG$signal"; 3563 cf::cleanup "SIG$signal";
2887 },
2888 ); 3564 };
2889 } 3565 }
2890} 3566}
2891 3567
2892sub write_runtime { 3568sub write_runtime_sync {
2893 my $runtime = "$LOCALDIR/runtime";
2894
2895 # first touch the runtime file to show we are still running: 3569 # first touch the runtime file to show we are still running:
2896 # the fsync below can take a very very long time. 3570 # the fsync below can take a very very long time.
2897 3571
2898 IO::AIO::aio_utime $runtime, undef, undef; 3572 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2899 3573
2900 my $guard = cf::lock_acquire "write_runtime"; 3574 my $guard = cf::lock_acquire "write_runtime";
2901 3575
2902 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3576 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2903 or return; 3577 or return;
2904 3578
2905 my $value = $cf::RUNTIME + 90 + 10; 3579 my $value = $cf::RUNTIME + 90 + 10;
2906 # 10 is the runtime save interval, for a monotonic clock 3580 # 10 is the runtime save interval, for a monotonic clock
2907 # 60 allows for the watchdog to kill the server. 3581 # 60 allows for the watchdog to kill the server.
… …
2917 aio_utime $fh, undef, undef; 3591 aio_utime $fh, undef, undef;
2918 3592
2919 close $fh 3593 close $fh
2920 or return; 3594 or return;
2921 3595
2922 aio_rename "$runtime~", $runtime 3596 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2923 and return; 3597 and return;
2924 3598
2925 warn "runtime file written.\n"; 3599 warn "runtime file written.\n";
2926 3600
2927 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 };
2928} 3652}
2929 3653
2930sub emergency_save() { 3654sub emergency_save() {
2931 my $freeze_guard = cf::freeze_mainloop; 3655 my $freeze_guard = cf::freeze_mainloop;
2932 3656
2933 warn "enter emergency perl save\n"; 3657 warn "emergency_perl_save: enter\n";
2934 3658
2935 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
2936 # use a peculiar iteration method to avoid tripping on perl 3665 # use a peculiar iteration method to avoid tripping on perl
2937 # refcount bugs in for. also avoids problems with players 3666 # refcount bugs in for. also avoids problems with players
2938 # and maps saved/destroyed asynchronously. 3667 # and maps saved/destroyed asynchronously.
2939 warn "begin emergency player save\n"; 3668 warn "emergency_perl_save: begin player save\n";
2940 for my $login (keys %cf::PLAYER) { 3669 for my $login (keys %cf::PLAYER) {
2941 my $pl = $cf::PLAYER{$login} or next; 3670 my $pl = $cf::PLAYER{$login} or next;
2942 $pl->valid or next; 3671 $pl->valid or next;
3672 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2943 $pl->save; 3673 $pl->save;
2944 } 3674 }
2945 warn "end emergency player save\n"; 3675 warn "emergency_perl_save: end player save\n";
2946 3676
2947 warn "begin emergency map save\n"; 3677 warn "emergency_perl_save: begin map save\n";
2948 for my $path (keys %cf::MAP) { 3678 for my $path (keys %cf::MAP) {
2949 my $map = $cf::MAP{$path} or next; 3679 my $map = $cf::MAP{$path} or next;
2950 $map->valid or next; 3680 $map->valid or next;
2951 $map->save; 3681 $map->save;
2952 } 3682 }
2953 warn "end emergency map save\n"; 3683 warn "emergency_perl_save: end map save\n";
2954 3684
2955 warn "begin emergency database checkpoint\n"; 3685 warn "emergency_perl_save: begin database checkpoint\n";
2956 BDB::db_env_txn_checkpoint $DB_ENV; 3686 BDB::db_env_txn_checkpoint $DB_ENV;
2957 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";
2958 }; 3692 };
2959 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
2960 warn "leave emergency perl save\n"; 3699 warn "emergency_perl_save: leave\n";
2961} 3700}
2962 3701
2963sub post_cleanup { 3702sub post_cleanup {
2964 my ($make_core) = @_; 3703 my ($make_core) = @_;
2965 3704
2966 warn Carp::longmess "post_cleanup backtrace" 3705 warn Carp::longmess "post_cleanup backtrace"
2967 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#
2968} 3736}
2969 3737
2970sub do_reload_perl() { 3738sub do_reload_perl() {
2971 # can/must only be called in main 3739 # can/must only be called in main
2972 if ($Coro::current != $Coro::main) { 3740 if ($Coro::current != $Coro::main) {
2973 warn "can only reload from main coroutine"; 3741 warn "can only reload from main coroutine";
2974 return; 3742 return;
2975 } 3743 }
2976 3744
3745 return if $RELOAD++;
3746
3747 my $t1 = EV::time;
3748
3749 while ($RELOAD) {
2977 warn "reloading..."; 3750 warn "reloading...";
2978 3751
2979 warn "entering sync_job"; 3752 warn "entering sync_job";
2980 3753
2981 cf::sync_job { 3754 cf::sync_job {
2982 cf::write_runtime; # external watchdog should not bark 3755 cf::write_runtime_sync; # external watchdog should not bark
2983 cf::emergency_save; 3756 cf::emergency_save;
2984 cf::write_runtime; # external watchdog should not bark 3757 cf::write_runtime_sync; # external watchdog should not bark
2985 3758
2986 warn "syncing database to disk"; 3759 warn "syncing database to disk";
2987 BDB::db_env_txn_checkpoint $DB_ENV; 3760 BDB::db_env_txn_checkpoint $DB_ENV;
2988 3761
2989 # 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
2990 3763
2991 warn "cancelling all WF_AUTOCANCEL watchers";
2992 for (Event::all_watchers) {
2993 $_->cancel if $_->data & WF_AUTOCANCEL;
2994 }
2995
2996 warn "flushing outstanding aio requests"; 3764 warn "flushing outstanding aio requests";
2997 for (;;) {
2998 BDB::flush;
2999 IO::AIO::flush;
3000 Coro::cede;
3001 last unless IO::AIO::nreqs || BDB::nreqs; 3765 while (IO::AIO::nreqs || BDB::nreqs) {
3002 warn "iterate..."; 3766 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3003 }
3004
3005 ++$RELOAD;
3006
3007 warn "cancelling all extension coros";
3008 $_->cancel for values %EXT_CORO;
3009 %EXT_CORO = ();
3010
3011 warn "removing commands";
3012 %COMMAND = ();
3013
3014 warn "removing ext/exti commands";
3015 %EXTCMD = ();
3016 %EXTICMD = ();
3017
3018 warn "unloading/nuking all extensions";
3019 for my $pkg (@EXTS) {
3020 warn "... unloading $pkg";
3021
3022 if (my $cb = $pkg->can ("unload")) {
3023 eval {
3024 $cb->($pkg);
3025 1
3026 } or warn "$pkg unloaded, but with errors: $@";
3027 } 3767 }
3028 3768
3029 warn "... nuking $pkg"; 3769 warn "cancelling all extension coros";
3030 Symbol::delete_package $pkg; 3770 $_->cancel for values %EXT_CORO;
3031 } 3771 %EXT_CORO = ();
3032 3772
3033 warn "unloading all perl modules loaded from $LIBDIR"; 3773 warn "removing commands";
3034 while (my ($k, $v) = each %INC) { 3774 %COMMAND = ();
3035 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3036 3775
3776 warn "removing ext/exti commands";
3777 %EXTCMD = ();
3778 %EXTICMD = ();
3779
3780 warn "unloading/nuking all extensions";
3781 for my $pkg (@EXTS) {
3037 warn "... unloading $k"; 3782 warn "... unloading $pkg";
3038 delete $INC{$k};
3039 3783
3040 $k =~ s/\.pm$//;
3041 $k =~ s/\//::/g;
3042
3043 if (my $cb = $k->can ("unload_module")) { 3784 if (my $cb = $pkg->can ("unload")) {
3785 eval {
3044 $cb->(); 3786 $cb->($pkg);
3787 1
3788 } or warn "$pkg unloaded, but with errors: $@";
3789 }
3790
3791 warn "... clearing $pkg";
3792 clear_package $pkg;
3045 } 3793 }
3046 3794
3047 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;
3048 } 3810 }
3049 3811
3050 warn "getting rid of safe::, as good as possible"; 3812 warn "getting rid of safe::, as good as possible";
3051 Symbol::delete_package "safe::$_" 3813 clear_package "safe::$_"
3052 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);
3053 3815
3054 warn "unloading cf.pm \"a bit\""; 3816 warn "unloading cf.pm \"a bit\"";
3055 delete $INC{"cf.pm"}; 3817 delete $INC{"cf.pm"};
3056 delete $INC{"cf/pod.pm"}; 3818 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3057 3819
3058 # don't, removes xs symbols, too, 3820 # don't, removes xs symbols, too,
3059 # and global variables created in xs 3821 # and global variables created in xs
3060 #Symbol::delete_package __PACKAGE__; 3822 #clear_package __PACKAGE__;
3061 3823
3062 warn "unload completed, starting to reload now"; 3824 warn "unload completed, starting to reload now";
3063 3825
3064 warn "reloading cf.pm"; 3826 warn "reloading cf.pm";
3065 require cf; 3827 require cf;
3066 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3828 cf::_connect_to_perl_1;
3067 3829
3068 warn "loading config and database again"; 3830 warn "loading config and database again";
3069 cf::cfg_load; 3831 cf::reload_config;
3070 3832
3071 warn "loading extensions"; 3833 warn "loading extensions";
3072 cf::load_extensions; 3834 cf::load_extensions;
3073 3835
3836 if ($REATTACH_ON_RELOAD) {
3074 warn "reattaching attachments to objects/players"; 3837 warn "reattaching attachments to objects/players";
3075 _global_reattach; # objects, sockets 3838 _global_reattach; # objects, sockets
3076 warn "reattaching attachments to maps"; 3839 warn "reattaching attachments to maps";
3077 reattach $_ for values %MAP; 3840 reattach $_ for values %MAP;
3078 warn "reattaching attachments to players"; 3841 warn "reattaching attachments to players";
3079 reattach $_ for values %PLAYER; 3842 reattach $_ for values %PLAYER;
3843 }
3080 3844
3845 warn "running post_init jobs";
3846 (pop @POST_INIT)->(1) while @POST_INIT;
3847
3081 warn "leaving sync_job"; 3848 warn "leaving sync_job";
3082 3849
3083 1 3850 1
3084 } or do { 3851 } or do {
3085 warn $@; 3852 warn $@;
3086 warn "error while reloading, exiting."; 3853 cf::cleanup "error while reloading, exiting.";
3087 exit 1;
3088 }; 3854 };
3089 3855
3090 warn "reloaded"; 3856 warn "reloaded";
3857 --$RELOAD;
3858 }
3859
3860 $t1 = EV::time - $t1;
3861 warn "reload completed in ${t1}s\n";
3091}; 3862};
3092 3863
3093our $RELOAD_WATCHER; # used only during reload 3864our $RELOAD_WATCHER; # used only during reload
3094 3865
3095sub reload_perl() { 3866sub reload_perl() {
3096 # doing reload synchronously and two reloads happen back-to-back, 3867 # doing reload synchronously and two reloads happen back-to-back,
3097 # coro crashes during coro_state_free->destroy here. 3868 # coro crashes during coro_state_free->destroy here.
3098 3869
3099 $RELOAD_WATCHER ||= Event->timer ( 3870 $RELOAD_WATCHER ||= cf::async {
3100 reentrant => 0, 3871 Coro::AIO::aio_wait cache_extensions;
3101 after => 0, 3872
3102 data => WF_AUTOCANCEL, 3873 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3103 cb => sub {
3104 do_reload_perl; 3874 do_reload_perl;
3105 undef $RELOAD_WATCHER; 3875 undef $RELOAD_WATCHER;
3106 }, 3876 };
3107 ); 3877 };
3108} 3878}
3109 3879
3110register_command "reload" => sub { 3880register_command "reload" => sub {
3111 my ($who, $arg) = @_; 3881 my ($who, $arg) = @_;
3112 3882
3113 if ($who->flag (FLAG_WIZ)) { 3883 if ($who->flag (FLAG_WIZ)) {
3114 $who->message ("reloading server."); 3884 $who->message ("reloading server.");
3885 async {
3886 $Coro::current->{desc} = "perl_reload";
3115 async { reload_perl }; 3887 reload_perl;
3888 };
3116 } 3889 }
3117}; 3890};
3118 3891
3119unshift @INC, $LIBDIR; 3892unshift @INC, $LIBDIR;
3120 3893
… …
3122 3895
3123our @WAIT_FOR_TICK; 3896our @WAIT_FOR_TICK;
3124our @WAIT_FOR_TICK_BEGIN; 3897our @WAIT_FOR_TICK_BEGIN;
3125 3898
3126sub wait_for_tick { 3899sub wait_for_tick {
3127 return unless $TICK_WATCHER->is_active;
3128 return if $Coro::current == $Coro::main; 3900 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3129 3901
3130 my $signal = new Coro::Signal; 3902 my $signal = new Coro::Signal;
3131 push @WAIT_FOR_TICK, $signal; 3903 push @WAIT_FOR_TICK, $signal;
3132 $signal->wait; 3904 $signal->wait;
3133} 3905}
3134 3906
3135sub wait_for_tick_begin { 3907sub wait_for_tick_begin {
3136 return unless $TICK_WATCHER->is_active;
3137 return if $Coro::current == $Coro::main; 3908 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3138 3909
3139 my $signal = new Coro::Signal; 3910 my $signal = new Coro::Signal;
3140 push @WAIT_FOR_TICK_BEGIN, $signal; 3911 push @WAIT_FOR_TICK_BEGIN, $signal;
3141 $signal->wait; 3912 $signal->wait;
3142} 3913}
3143 3914
3144 my $min = 1e6;#d# 3915sub tick {
3145 my $avg = 10;
3146$TICK_WATCHER = Event->timer (
3147 reentrant => 0,
3148 parked => 1,
3149 prio => 0,
3150 at => $NEXT_TICK || $TICK,
3151 data => WF_AUTOCANCEL,
3152 cb => sub {
3153 if ($Coro::current != $Coro::main) { 3916 if ($Coro::current != $Coro::main) {
3154 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"
3155 unless ++$bug_warning > 10; 3918 unless ++$bug_warning > 10;
3156 return; 3919 return;
3157 } 3920 }
3158 3921
3159 $NOW = $tick_start = Event::time;
3160
3161 cf::server_tick; # one server iteration 3922 cf::server_tick; # one server iteration
3162 3923
3163 0 && sync_job {#d# 3924 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
3164 for(1..10) {
3165 my $t = Event::time;
3166 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3167 or die;
3168 3925
3169 $map->width (50); 3926 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3170 $map->height (50); 3927 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3171 $map->alloc; 3928 Coro::async_pool {
3172 $map->_load_objects ("/tmp/x.map", 1); 3929 $Coro::current->{desc} = "runtime saver";
3173 my $t = Event::time - $t; 3930 write_runtime_sync
3174 3931 or warn "ERROR: unable to write runtime file: $!";
3175 #next unless $t < 0.0013;#d#
3176 if ($t < $min) {
3177 $min = $t;
3178 }
3179 $avg = $avg * 0.99 + $t * 0.01;
3180 }
3181 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3182 exit 0;
3183 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3184 }; 3932 };
3933 }
3185 3934
3186 $RUNTIME += $TICK;
3187 $NEXT_TICK += $TICK;
3188
3189 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3190 $NEXT_RUNTIME_WRITE = $NOW + 10;
3191 Coro::async_pool {
3192 write_runtime
3193 or warn "ERROR: unable to write runtime file: $!";
3194 };
3195 }
3196
3197# my $AFTER = Event::time;
3198# warn $AFTER - $NOW;#d#
3199
3200 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3935 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3201 $sig->send; 3936 $sig->send;
3202 } 3937 }
3203 while (my $sig = shift @WAIT_FOR_TICK) { 3938 while (my $sig = shift @WAIT_FOR_TICK) {
3204 $sig->send; 3939 $sig->send;
3205 } 3940 }
3206 3941
3207 $NOW = Event::time; 3942 $LOAD = ($NOW - $TICK_START) / $TICK;
3208
3209 # if we are delayed by four ticks or more, skip them all
3210 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3211
3212 $TICK_WATCHER->at ($NEXT_TICK);
3213 $TICK_WATCHER->start;
3214
3215 $LOAD = ($NOW - $tick_start) / $TICK;
3216 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3943 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3217 3944
3218 _post_tick; 3945 if (0) {
3219 3946 if ($NEXT_TICK) {
3220 3947 my $jitter = $TICK_START - $NEXT_TICK;
3948 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3949 warn "jitter $JITTER\n";#d#
3950 }
3221 }, 3951 }
3222); 3952}
3223 3953
3224{ 3954{
3225 BDB::max_poll_time $TICK * 0.1; 3955 # configure BDB
3226 $BDB_POLL_WATCHER = Event->io ( 3956
3227 reentrant => 0,
3228 fd => BDB::poll_fileno,
3229 poll => 'r',
3230 prio => 0,
3231 data => WF_AUTOCANCEL,
3232 cb => \&BDB::poll_cb,
3233 );
3234 BDB::min_parallel 8; 3957 BDB::min_parallel 16;
3235 3958 BDB::max_poll_reqs $TICK * 0.1;
3236 BDB::set_sync_prepare { 3959 $AnyEvent::BDB::WATCHER->priority (1);
3237 my $status;
3238 my $current = $Coro::current;
3239 (
3240 sub {
3241 $status = $!;
3242 $current->ready; undef $current;
3243 },
3244 sub {
3245 Coro::schedule while defined $current;
3246 $! = $status;
3247 },
3248 )
3249 };
3250 3960
3251 unless ($DB_ENV) { 3961 unless ($DB_ENV) {
3252 $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);
3253 3968
3254 cf::sync_job { 3969 cf::sync_job {
3255 eval { 3970 eval {
3256 BDB::db_env_open 3971 BDB::db_env_open
3257 $DB_ENV, 3972 $DB_ENV,
… …
3259 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
3260 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3975 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3261 0666; 3976 0666;
3262 3977
3263 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3978 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3264
3265 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3266 $DB_ENV->set_lk_detect;
3267 }; 3979 };
3268 3980
3269 cf::cleanup "db_env_open(db): $@" if $@; 3981 cf::cleanup "db_env_open(db): $@" if $@;
3270 }; 3982 };
3271 } 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 };
3272} 3994}
3273 3995
3274{ 3996{
3997 # configure IO::AIO
3998
3275 IO::AIO::min_parallel 8; 3999 IO::AIO::min_parallel 8;
3276
3277 undef $Coro::AIO::WATCHER;
3278 IO::AIO::max_poll_time $TICK * 0.1; 4000 IO::AIO::max_poll_time $TICK * 0.1;
3279 $AIO_POLL_WATCHER = Event->io ( 4001 undef $AnyEvent::AIO::WATCHER;
3280 reentrant => 0,
3281 data => WF_AUTOCANCEL,
3282 fd => IO::AIO::poll_fileno,
3283 poll => 'r',
3284 prio => 6,
3285 cb => \&IO::AIO::poll_cb,
3286 );
3287} 4002}
3288 4003
3289my $_log_backtrace; 4004my $_log_backtrace;
3290 4005
3291sub _log_backtrace { 4006sub _log_backtrace {
… …
3294 $msg =~ s/\n//; 4009 $msg =~ s/\n//;
3295 4010
3296 # limit the # of concurrent backtraces 4011 # limit the # of concurrent backtraces
3297 if ($_log_backtrace < 2) { 4012 if ($_log_backtrace < 2) {
3298 ++$_log_backtrace; 4013 ++$_log_backtrace;
4014 my $perl_bt = Carp::longmess $msg;
3299 async { 4015 async {
4016 $Coro::current->{desc} = "abt $msg";
4017
3300 my @bt = fork_call { 4018 my @bt = fork_call {
3301 @addr = map { sprintf "%x", $_ } @addr; 4019 @addr = map { sprintf "%x", $_ } @addr;
3302 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4020 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3303 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 |"
3304 or die "addr2line: $!"; 4022 or die "addr2line: $!";
… …
3312 } 4030 }
3313 4031
3314 @funcs 4032 @funcs
3315 }; 4033 };
3316 4034
3317 LOG llevInfo, "[ABT] $msg\n"; 4035 LOG llevInfo, "[ABT] $perl_bt\n";
4036 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3318 LOG llevInfo, "[ABT] $_\n" for @bt; 4037 LOG llevInfo, "[ABT] $_\n" for @bt;
3319 --$_log_backtrace; 4038 --$_log_backtrace;
3320 }; 4039 };
3321 } else { 4040 } else {
3322 LOG llevInfo, "[ABT] $msg\n"; 4041 LOG llevInfo, "[ABT] $msg\n";
3323 LOG llevInfo, "[ABT] [suppressed]\n"; 4042 LOG llevInfo, "[ABT] [suppressed]\n";
3324 } 4043 }
3325} 4044}
3326 4045
3327# load additional modules 4046# load additional modules
3328use cf::pod; 4047require "cf/$_.pm" for @EXTRA_MODULES;
4048cf::_connect_to_perl_2;
3329 4049
3330END { cf::emergency_save } 4050END { cf::emergency_save }
3331 4051
33321 40521
3333 4053

Diff Legend

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