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

Diff Legend

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