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.345 by root, Tue Aug 28 19:30:11 2007 UTC vs.
Revision 1.522 by root, Sat Apr 17 02:22:14 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines