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.391 by root, Fri Oct 26 04:22:05 2007 UTC vs.
Revision 1.532 by root, Thu Apr 29 07:32:34 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 Event; 32use EV;
10use Opcode; 33use Opcode;
11use Safe; 34use Safe;
12use Safe::Hole; 35use Safe::Hole;
13use Storable (); 36use Storable ();
37use Carp ();
14 38
39use Guard ();
15use Coro 4.1 (); 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.51 (); 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; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
75 118
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $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 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 121our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
83 123
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 127our $DB_ENV;
89 128
129our @EXTRA_MODULES = qw(pod match mapscript);
130
90our %CFG; 131our %CFG;
91 132
92our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 134our $RUNTIME;
135our $NOW;
94 136
95our (%PLAYER, %PLAYER_LOADING); # all users 137our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 138our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 139our $LINK_MAP; # the special {link} map, which is always available
98 140
99# used to convert map paths into valid unix filenames by replacing / by ∕ 141# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 142our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 143
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
146our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
148
149our @POST_INIT;
150
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
105 153
106binmode STDOUT; 154binmode STDOUT;
107binmode STDERR; 155binmode STDERR;
108 156
109# read virtual server time, if available 157# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
114} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
115 165
116mkdir $_ 166mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
118 168
119our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
120 170
121sub cf::map::normalise; 171sub cf::map::normalise;
172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
122 187
123############################################################################# 188#############################################################################
124 189
125=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
126 191
162 227
163The raw value load value from the last tick. 228The raw value load value from the last tick.
164 229
165=item %cf::CFG 230=item %cf::CFG
166 231
167Configuration for the server, loaded from C</etc/crossfire/config>, or 232Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 233from wherever your confdir points to.
169 234
170=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
171 236
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
173returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one process
174per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
175 240
176=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
177 242
178This array contains the results of the last C<invoke ()> call. When 243This array contains the results of the last C<invoke ()> call. When
179C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call. 245that call.
181 246
247=item %cf::REFLECT
248
249Contains, for each (C++) class name, a hash reference with information
250about object members (methods, scalars, arrays and flags) and other
251metadata, which is useful for introspection.
252
182=back 253=back
183 254
184=cut 255=cut
185 256
186BEGIN { 257sub error(@) { LOG llevError, join "", @_ }
187 *CORE::GLOBAL::warn = sub { 258sub warn (@) { LOG llevWarn , join "", @_ }
259sub info (@) { LOG llevInfo , join "", @_ }
260sub debug(@) { LOG llevDebug, join "", @_ }
261sub trace(@) { LOG llevTrace, join "", @_ }
262
263$Coro::State::WARNHOOK = sub {
188 my $msg = join "", @_; 264 my $msg = join "", @_;
189 265
190 $msg .= "\n" 266 $msg .= "\n"
191 unless $msg =~ /\n$/; 267 unless $msg =~ /\n$/;
192 268
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 269 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 270
195 LOG llevError, $msg; 271 LOG llevWarn, $msg;
196 }; 272};
197} 273
274$Coro::State::DIEHOOK = sub {
275 return unless $^S eq 0; # "eq", not "=="
276
277 error Carp::longmess $_[0];
278
279 if (in_main) {#d#
280 error "DIEHOOK called in main context, Coro bug?\n";#d#
281 return;#d#
282 }#d#
283
284 # kill coroutine otherwise
285 Coro::terminate
286};
198 287
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 288@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 289@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 290@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 291@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 298for my $pkg (qw(
210 cf::global cf::attachable 299 cf::global cf::attachable
211 cf::object cf::object::player 300 cf::object cf::object::player
212 cf::client cf::player 301 cf::client cf::player
213 cf::arch cf::living 302 cf::arch cf::living
303 cf::map cf::mapspace
214 cf::map cf::party cf::region 304 cf::party cf::region
215)) { 305)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 306 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 307}
219 308
220$Event::DIED = sub { 309$EV::DIED = sub {
221 warn "error in event callback: @_"; 310 Carp::cluck "error in event callback: @_";
222}; 311};
223 312
224############################################################################# 313#############################################################################
225 314
226=head2 UTILITY FUNCTIONS 315=head2 UTILITY FUNCTIONS
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 337 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 338 $d
250 } || "[unable to dump $_[0]: '$@']"; 339 } || "[unable to dump $_[0]: '$@']";
251} 340}
252 341
253=item $ref = cf::from_json $json 342=item $ref = cf::decode_json $json
254 343
255Converts a JSON string into the corresponding perl data structure. 344Converts a JSON string into the corresponding perl data structure.
256 345
257=item $json = cf::to_json $ref 346=item $json = cf::encode_json $ref
258 347
259Converts a perl data structure into its JSON representation. 348Converts a perl data structure into its JSON representation.
260 349
261=cut 350=cut
262 351
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 352our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 353
265sub to_json ($) { $json_coder->encode ($_[0]) } 354sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 355sub decode_json($) { $json_coder->decode ($_[0]) }
356
357=item cf::post_init { BLOCK }
358
359Execute the given codeblock, I<after> all extensions have been (re-)loaded,
360but I<before> the server starts ticking again.
361
362The cdoeblock will have a single boolean argument to indicate whether this
363is a reload or not.
364
365=cut
366
367sub post_init(&) {
368 push @POST_INIT, shift;
369}
267 370
268=item cf::lock_wait $string 371=item cf::lock_wait $string
269 372
270Wait until the given lock is available. See cf::lock_acquire. 373Wait until the given lock is available. See cf::lock_acquire.
271 374
272=item my $lock = cf::lock_acquire $string 375=item my $lock = cf::lock_acquire $string
273 376
274Wait until the given lock is available and then acquires it and returns 377Wait until the given lock is available and then acquires it and returns
275a Coro::guard object. If the guard object gets destroyed (goes out of scope, 378a L<Guard> object. If the guard object gets destroyed (goes out of scope,
276for example when the coroutine gets canceled), the lock is automatically 379for example when the coroutine gets canceled), the lock is automatically
277returned. 380returned.
278 381
279Locks are *not* recursive, locking from the same coro twice results in a 382Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro. 383deadlocked coro.
286 389
287Return true if the lock is currently active, i.e. somebody has locked it. 390Return true if the lock is currently active, i.e. somebody has locked it.
288 391
289=cut 392=cut
290 393
291our %LOCK; 394our $LOCKS = new Coro::SemaphoreSet;
292our %LOCKER;#d#
293 395
294sub lock_wait($) { 396sub lock_wait($) {
295 my ($key) = @_; 397 $LOCKS->wait ($_[0]);
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
301
302 # wait for lock, if any
303 while ($LOCK{$key}) {
304 push @{ $LOCK{$key} }, $Coro::current;
305 Coro::schedule;
306 }
307} 398}
308 399
309sub lock_acquire($) { 400sub lock_acquire($) {
310 my ($key) = @_; 401 $LOCKS->guard ($_[0])
311
312 # wait, to be sure we are not locked
313 lock_wait $key;
314
315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
317
318 Coro::guard {
319 delete $LOCKER{$key};#d#
320 # wake up all waiters, to be on the safe side
321 $_->ready for @{ delete $LOCK{$key} };
322 }
323} 402}
324 403
325sub lock_active($) { 404sub lock_active($) {
326 my ($key) = @_; 405 $LOCKS->count ($_[0]) < 1
327
328 ! ! $LOCK{$key}
329} 406}
330 407
331sub freeze_mainloop { 408sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 409 tick_inhibit_inc;
333 410
334 my $guard = Coro::guard { 411 &Guard::guard (\&tick_inhibit_dec);
335 $TICK_WATCHER->start; 412}
336 }; 413
337 $TICK_WATCHER->stop; 414=item cf::periodic $interval, $cb
338 $guard 415
416Like EV::periodic, but randomly selects a starting point so that the actions
417get spread over time.
418
419=cut
420
421sub periodic($$) {
422 my ($interval, $cb) = @_;
423
424 my $start = rand List::Util::min 180, $interval;
425
426 EV::periodic $start, $interval, 0, $cb
339} 427}
340 428
341=item cf::get_slot $time[, $priority[, $name]] 429=item cf::get_slot $time[, $priority[, $name]]
342 430
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 431Allocate $time seconds of blocking CPU time at priority C<$priority>:
351 439
352=cut 440=cut
353 441
354our @SLOT_QUEUE; 442our @SLOT_QUEUE;
355our $SLOT_QUEUE; 443our $SLOT_QUEUE;
444our $SLOT_DECAY = 0.9;
356 445
357$SLOT_QUEUE->cancel if $SLOT_QUEUE; 446$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async { 447$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager"); 448 $Coro::current->desc ("timeslot manager");
360 449
361 my $signal = new Coro::Signal; 450 my $signal = new Coro::Signal;
451 my $busy;
362 452
363 while () { 453 while () {
364 next_job: 454 next_job:
455
365 my $avail = cf::till_tick; 456 my $avail = cf::till_tick;
366 if ($avail > 0.01) { 457
367 for (0 .. $#SLOT_QUEUE) { 458 for (0 .. $#SLOT_QUEUE) {
368 if ($SLOT_QUEUE[$_][0] < $avail) { 459 if ($SLOT_QUEUE[$_][0] <= $avail) {
460 $busy = 0;
369 my $job = splice @SLOT_QUEUE, $_, 1, (); 461 my $job = splice @SLOT_QUEUE, $_, 1, ();
370 $job->[2]->send; 462 $job->[2]->send;
371 Coro::cede; 463 Coro::cede;
372 goto next_job; 464 goto next_job;
373 } 465 } else {
466 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
374 } 467 }
375 } 468 }
376 469
377 if (@SLOT_QUEUE) { 470 if (@SLOT_QUEUE) {
378 # we do not use wait_for_tick() as it returns immediately when tick is inactive 471 # we do not use wait_for_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal; 472 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait; 473 $signal->wait;
381 } else { 474 } else {
475 $busy = 0;
382 Coro::schedule; 476 Coro::schedule;
383 } 477 }
384 } 478 }
385}; 479};
386 480
387sub get_slot($;$$) { 481sub get_slot($;$$) {
482 return if tick_inhibit || $Coro::current == $Coro::main;
483
388 my ($time, $pri, $name) = @_; 484 my ($time, $pri, $name) = @_;
389 485
390 $time = $TICK * .6 if $time > $TICK * .6; 486 $time = clamp $time, 0.01, $TICK * .6;
487
391 my $sig = new Coro::Signal; 488 my $sig = new Coro::Signal;
392 489
393 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 490 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
394 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 491 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
395 $SLOT_QUEUE->ready; 492 $SLOT_QUEUE->ready;
406 503
407BEGIN { *async = \&Coro::async_pool } 504BEGIN { *async = \&Coro::async_pool }
408 505
409=item cf::sync_job { BLOCK } 506=item cf::sync_job { BLOCK }
410 507
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 508The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 509is always able to handle events or runnable, as Deliantra is only
413partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 510partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 511acceptable.
415 512
416If it must be done, put the blocking parts into C<sync_job>. This will run 513If it must be done, put the blocking parts into C<sync_job>. This will run
417the given BLOCK in another coroutine while waiting for the result. The 514the given BLOCK in another coroutine while waiting for the result. The
422 519
423sub sync_job(&) { 520sub sync_job(&) {
424 my ($job) = @_; 521 my ($job) = @_;
425 522
426 if ($Coro::current == $Coro::main) { 523 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 524 my $time = AE::time;
428 525
429 # this is the main coro, too bad, we have to block 526 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 527 # till the operation succeeds, freezing the server :/
431 528
432 LOG llevError, Carp::longmess "sync job";#d# 529 LOG llevError, Carp::longmess "sync job";#d#
433 530
434 # TODO: use suspend/resume instead
435 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 531 my $freeze_guard = freeze_mainloop;
437 532
438 my $busy = 1; 533 my $busy = 1;
439 my @res; 534 my @res;
440 535
441 (async { 536 (async {
442 $Coro::current->desc ("sync job coro"); 537 $Coro::current->desc ("sync job coro");
443 @res = eval { $job->() }; 538 @res = eval { $job->() };
444 warn $@ if $@; 539 error $@ if $@;
445 undef $busy; 540 undef $busy;
446 })->prio (Coro::PRIO_MAX); 541 })->prio (Coro::PRIO_MAX);
447 542
448 while ($busy) { 543 while ($busy) {
449 if (Coro::nready) { 544 if (Coro::nready) {
450 Coro::cede_notself; 545 Coro::cede_notself;
451 } else { 546 } else {
452 Event::one_event; 547 EV::loop EV::LOOP_ONESHOT;
453 } 548 }
454 } 549 }
455 550
456 $time = Event::time - $time; 551 my $time = AE::time - $time;
457 552
458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
459 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
460
461 $tick_start += $time; # do not account sync jobs to server load 553 $TICK_START += $time; # do not account sync jobs to server load
462 554
463 wantarray ? @res : $res[0] 555 wantarray ? @res : $res[0]
464 } else { 556 } else {
465 # we are in another coroutine, how wonderful, everything just works 557 # we are in another coroutine, how wonderful, everything just works
466 558
491=item fork_call { }, $args 583=item fork_call { }, $args
492 584
493Executes the given code block with the given arguments in a seperate 585Executes the given code block with the given arguments in a seperate
494process, returning the results. Everything must be serialisable with 586process, returning the results. Everything must be serialisable with
495Coro::Storable. May, of course, block. Note that the executed sub may 587Coro::Storable. May, of course, block. Note that the executed sub may
496never block itself or use any form of Event handling. 588never block itself or use any form of event handling.
497 589
498=cut 590=cut
499 591
500sub fork_call(&@) { 592sub fork_call(&@) {
501 my ($cb, @args) = @_; 593 my ($cb, @args) = @_;
508 reset_signals; 600 reset_signals;
509 &$cb 601 &$cb
510 }, @args; 602 }, @args;
511 603
512 wantarray ? @res : $res[-1] 604 wantarray ? @res : $res[-1]
605}
606
607sub objinfo {
608 (
609 "counter value" => cf::object::object_count,
610 "objects created" => cf::object::create_count,
611 "objects destroyed" => cf::object::destroy_count,
612 "freelist size" => cf::object::free_count,
613 "allocated objects" => cf::object::objects_size,
614 "active objects" => cf::object::actives_size,
615 )
616}
617
618=item $coin = coin_from_name $name
619
620=cut
621
622our %coin_alias = (
623 "silver" => "silvercoin",
624 "silvercoin" => "silvercoin",
625 "silvercoins" => "silvercoin",
626 "gold" => "goldcoin",
627 "goldcoin" => "goldcoin",
628 "goldcoins" => "goldcoin",
629 "platinum" => "platinacoin",
630 "platinumcoin" => "platinacoin",
631 "platinumcoins" => "platinacoin",
632 "platina" => "platinacoin",
633 "platinacoin" => "platinacoin",
634 "platinacoins" => "platinacoin",
635 "royalty" => "royalty",
636 "royalties" => "royalty",
637);
638
639sub coin_from_name($) {
640 $coin_alias{$_[0]}
641 ? cf::arch::find $coin_alias{$_[0]}
642 : undef
513} 643}
514 644
515=item $value = cf::db_get $family => $key 645=item $value = cf::db_get $family => $key
516 646
517Returns a single value from the environment database. 647Returns a single value from the environment database.
625 755
626 my $t1 = Time::HiRes::time; 756 my $t1 = Time::HiRes::time;
627 my $data = $process->(\@data); 757 my $data = $process->(\@data);
628 my $t2 = Time::HiRes::time; 758 my $t2 = Time::HiRes::time;
629 759
630 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 760 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
631 761
632 db_put cache => "$id/data", $data; 762 db_put cache => "$id/data", $data;
633 db_put cache => "$id/md5" , $md5; 763 db_put cache => "$id/md5" , $md5;
634 db_put cache => "$id/meta", $meta; 764 db_put cache => "$id/meta", $meta;
635 765
645 775
646=cut 776=cut
647 777
648sub datalog($@) { 778sub datalog($@) {
649 my ($type, %kv) = @_; 779 my ($type, %kv) = @_;
650 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 780 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
651} 781}
652 782
653=back 783=back
654 784
655=cut 785=cut
656 786
657############################################################################# 787#############################################################################
658 788
659=head2 ATTACHABLE OBJECTS 789=head2 ATTACHABLE OBJECTS
660 790
661Many objects in crossfire are so-called attachable objects. That means you can 791Many objects in deliantra are so-called attachable objects. That means you can
662attach callbacks/event handlers (a collection of which is called an "attachment") 792attach callbacks/event handlers (a collection of which is called an "attachment")
663to it. All such attachable objects support the following methods. 793to it. All such attachable objects support the following methods.
664 794
665In the following description, CLASS can be any of C<global>, C<object> 795In the following description, CLASS can be any of C<global>, C<object>
666C<player>, C<client> or C<map> (i.e. the attachable objects in 796C<player>, C<client> or C<map> (i.e. the attachable objects in
667Crossfire TRT). 797Deliantra).
668 798
669=over 4 799=over 4
670 800
671=item $attachable->attach ($attachment, key => $value...) 801=item $attachable->attach ($attachment, key => $value...)
672 802
716=item cf::CLASS::attachment $name, ... 846=item cf::CLASS::attachment $name, ...
717 847
718Register an attachment by C<$name> through which attachable objects of the 848Register an attachment by C<$name> through which attachable objects of the
719given CLASS can refer to this attachment. 849given CLASS can refer to this attachment.
720 850
721Some classes such as crossfire maps and objects can specify attachments 851Some classes such as deliantra maps and objects can specify attachments
722that are attached at load/instantiate time, thus the need for a name. 852that are attached at load/instantiate time, thus the need for a name.
723 853
724These calls expect any number of the following handler/hook descriptions: 854These calls expect any number of the following handler/hook descriptions:
725 855
726=over 4 856=over 4
850 980
851 } elsif (exists $cb_id{$type}) { 981 } elsif (exists $cb_id{$type}) {
852 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 982 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
853 983
854 } elsif (ref $type) { 984 } elsif (ref $type) {
855 warn "attaching objects not supported, ignoring.\n"; 985 error "attaching objects not supported, ignoring.\n";
856 986
857 } else { 987 } else {
858 shift @arg; 988 shift @arg;
859 warn "attach argument '$type' not supported, ignoring.\n"; 989 error "attach argument '$type' not supported, ignoring.\n";
860 } 990 }
861 } 991 }
862} 992}
863 993
864sub _object_attach { 994sub _object_attach {
874 _attach $registry, $klass, @attach; 1004 _attach $registry, $klass, @attach;
875 } 1005 }
876 1006
877 $obj->{$name} = \%arg; 1007 $obj->{$name} = \%arg;
878 } else { 1008 } else {
879 warn "object uses attachment '$name' which is not available, postponing.\n"; 1009 info "object uses attachment '$name' which is not available, postponing.\n";
880 } 1010 }
881 1011
882 $obj->{_attachment}{$name} = undef; 1012 $obj->{_attachment}{$name} = undef;
883} 1013}
884 1014
943 1073
944 for (@$callbacks) { 1074 for (@$callbacks) {
945 eval { &{$_->[1]} }; 1075 eval { &{$_->[1]} };
946 1076
947 if ($@) { 1077 if ($@) {
948 warn "$@";
949 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1078 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
950 override; 1079 override;
951 } 1080 }
952 1081
953 return 1 if $override; 1082 return 1 if $override;
954 } 1083 }
955 1084
956 0 1085 0
957} 1086}
958 1087
959=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1088=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
960 1089
961=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1090=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
962 1091
963Generate an object-specific event with the given arguments. 1092Generate an object-specific event with the given arguments.
964 1093
1017 1146
1018sub reattach { 1147sub reattach {
1019 # basically do the same as instantiate, without calling instantiate 1148 # basically do the same as instantiate, without calling instantiate
1020 my ($obj) = @_; 1149 my ($obj) = @_;
1021 1150
1151 # no longer needed after getting rid of delete_package?
1022 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1152 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1023 1153
1024 my $registry = $obj->registry; 1154 my $registry = $obj->registry;
1025 1155
1026 @$registry = (); 1156 @$registry = ();
1027 1157
1032 for (@$attach) { 1162 for (@$attach) {
1033 my ($klass, @attach) = @$_; 1163 my ($klass, @attach) = @$_;
1034 _attach $registry, $klass, @attach; 1164 _attach $registry, $klass, @attach;
1035 } 1165 }
1036 } else { 1166 } else {
1037 warn "object uses attachment '$name' that is not available, postponing.\n"; 1167 info "object uses attachment '$name' that is not available, postponing.\n";
1038 } 1168 }
1039 } 1169 }
1040} 1170}
1041 1171
1042cf::attachable->attach ( 1172cf::attachable->attach (
1043 prio => -1000000, 1173 prio => -1000000,
1044 on_instantiate => sub { 1174 on_instantiate => sub {
1045 my ($obj, $data) = @_; 1175 my ($obj, $data) = @_;
1046 1176
1047 $data = from_json $data; 1177 $data = decode_json $data;
1048 1178
1049 for (@$data) { 1179 for (@$data) {
1050 my ($name, $args) = @$_; 1180 my ($name, $args) = @$_;
1051 1181
1052 $obj->attach ($name, %{$args || {} }); 1182 $obj->attach ($name, %{$args || {} });
1069 my ($filename, $rdata, $objs) = @_; 1199 my ($filename, $rdata, $objs) = @_;
1070 1200
1071 sync_job { 1201 sync_job {
1072 if (length $$rdata) { 1202 if (length $$rdata) {
1073 utf8::decode (my $decname = $filename); 1203 utf8::decode (my $decname = $filename);
1074 warn sprintf "saving %s (%d,%d)\n", 1204 trace sprintf "saving %s (%d,%d)\n",
1075 $decname, length $$rdata, scalar @$objs; 1205 $decname, length $$rdata, scalar @$objs
1206 if $VERBOSE_IO;
1076 1207
1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1208 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1078 chmod SAVE_MODE, $fh; 1209 aio_chmod $fh, SAVE_MODE;
1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1210 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1080 aio_fsync $fh if $cf::USE_FSYNC; 1211 if ($cf::USE_FSYNC) {
1212 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;
1213 aio_fsync $fh;
1214 }
1081 close $fh; 1215 aio_close $fh;
1082 1216
1083 if (@$objs) { 1217 if (@$objs) {
1084 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1218 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1085 chmod SAVE_MODE, $fh; 1219 aio_chmod $fh, SAVE_MODE;
1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1220 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1087 aio_write $fh, 0, (length $data), $data, 0; 1221 aio_write $fh, 0, (length $data), $data, 0;
1088 aio_fsync $fh if $cf::USE_FSYNC; 1222 if ($cf::USE_FSYNC) {
1223 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;
1224 aio_fsync $fh;
1225 }
1089 close $fh; 1226 aio_close $fh;
1090 aio_rename "$filename.pst~", "$filename.pst"; 1227 aio_rename "$filename.pst~", "$filename.pst";
1091 } 1228 }
1092 } else { 1229 } else {
1093 aio_unlink "$filename.pst"; 1230 aio_unlink "$filename.pst";
1094 } 1231 }
1095 1232
1096 aio_rename "$filename~", $filename; 1233 aio_rename "$filename~", $filename;
1234
1235 $filename =~ s%/[^/]+$%%;
1236 aio_pathsync $filename if $cf::USE_FSYNC;
1097 } else { 1237 } else {
1098 warn "FATAL: $filename~: $!\n"; 1238 error "unable to save objects: $filename~: $!\n";
1099 } 1239 }
1100 } else { 1240 } else {
1101 aio_unlink $filename; 1241 aio_unlink $filename;
1102 aio_unlink "$filename.pst"; 1242 aio_unlink "$filename.pst";
1103 } 1243 }
1127 my $st = eval { Coro::Storable::thaw $av }; 1267 my $st = eval { Coro::Storable::thaw $av };
1128 $av = $st->{objs}; 1268 $av = $st->{objs};
1129 } 1269 }
1130 1270
1131 utf8::decode (my $decname = $filename); 1271 utf8::decode (my $decname = $filename);
1132 warn sprintf "loading %s (%d,%d)\n", 1272 trace sprintf "loading %s (%d,%d)\n",
1133 $decname, length $data, scalar @{$av || []}; 1273 $decname, length $data, scalar @{$av || []}
1274 if $VERBOSE_IO;
1134 1275
1135 ($data, $av) 1276 ($data, $av)
1136} 1277}
1137 1278
1138=head2 COMMAND CALLBACKS 1279=head2 COMMAND CALLBACKS
1194 my ($name, $cb) = @_; 1335 my ($name, $cb) = @_;
1195 1336
1196 $EXTICMD{$name} = $cb; 1337 $EXTICMD{$name} = $cb;
1197} 1338}
1198 1339
1340use File::Glob ();
1341
1199cf::player->attach ( 1342cf::player->attach (
1200 on_command => sub { 1343 on_unknown_command => sub {
1201 my ($pl, $name, $params) = @_; 1344 my ($pl, $name, $params) = @_;
1202 1345
1203 my $cb = $COMMAND{$name} 1346 my $cb = $COMMAND{$name}
1204 or return; 1347 or return;
1205 1348
1228 1371
1229 $pl->ext_reply ($reply, @reply) 1372 $pl->ext_reply ($reply, @reply)
1230 if $reply; 1373 if $reply;
1231 1374
1232 } else { 1375 } else {
1233 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1376 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1234 } 1377 }
1235 1378
1236 cf::override; 1379 cf::override;
1237 }, 1380 },
1238); 1381);
1239 1382
1383# "readahead" all extensions
1384sub cache_extensions {
1385 my $grp = IO::AIO::aio_group;
1386
1387 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1388 for (grep /\.ext$/, @{$_[0]}) {
1389 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1390 }
1391 };
1392
1393 $grp
1394}
1395
1240sub load_extensions { 1396sub load_extensions {
1397 info "loading extensions...";
1398
1241 cf::sync_job { 1399 cf::sync_job {
1242 my %todo; 1400 my %todo;
1243 1401
1244 for my $path (<$LIBDIR/*.ext>) { 1402 for my $path (<$LIBDIR/*.ext>) {
1245 next unless -r $path; 1403 next unless -r $path;
1263 1421
1264 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1422 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1265 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1423 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1266 1424
1267 $ext{source} = 1425 $ext{source} =
1268 "package $pkg; use strict; use utf8;\n" 1426 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1269 . "#line 1 \"$path\"\n{\n" 1427 . "#line 1 \"$path\"\n{\n"
1270 . $source 1428 . $source
1271 . "\n};\n1"; 1429 . "\n};\n1";
1272 1430
1273 $todo{$base} = \%ext; 1431 $todo{$base} = \%ext;
1274 } 1432 }
1275 1433
1434 my $pass = 0;
1276 my %done; 1435 my %done;
1277 while (%todo) { 1436 while (%todo) {
1278 my $progress; 1437 my $progress;
1279 1438
1439 ++$pass;
1440
1441 ext:
1280 while (my ($k, $v) = each %todo) { 1442 while (my ($k, $v) = each %todo) {
1281 for (split /,\s*/, $v->{meta}{depends}) { 1443 for (split /,\s*/, $v->{meta}{depends}) {
1282 goto skip 1444 next ext
1283 unless exists $done{$_}; 1445 unless exists $done{$_};
1284 } 1446 }
1285 1447
1286 warn "... loading '$k' into '$v->{pkg}'\n"; 1448 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1287 1449
1288 unless (eval $v->{source}) { 1450 my $active = eval $v->{source};
1451
1452 if (length $@) {
1289 my $msg = $@ ? "$v->{path}: $@\n" 1453 error "$v->{path}: $@\n";
1290 : "$v->{base}: extension inactive.\n";
1291 1454
1455 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1292 if (exists $v->{meta}{mandatory}) { 1456 if exists $v->{meta}{mandatory};
1293 warn $msg; 1457
1294 warn "mandatory extension failed to load, exiting.\n"; 1458 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1295 exit 1; 1459 delete $todo{$k};
1296 } 1460 } else {
1297 1461 $done{$k} = delete $todo{$k};
1298 warn $msg; 1462 push @EXTS, $v->{pkg};
1463 $progress = 1;
1464
1465 info "$v->{base}: extension inactive.\n"
1466 unless $active;
1299 } 1467 }
1300
1301 $done{$k} = delete $todo{$k};
1302 push @EXTS, $v->{pkg};
1303 $progress = 1;
1304 } 1468 }
1305 1469
1306 skip: 1470 unless ($progress) {
1307 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1471 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1308 unless $progress; 1472
1473 while (my ($k, $v) = each %todo) {
1474 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1475 if exists $v->{meta}{mandatory};
1476 }
1477 }
1309 } 1478 }
1310 }; 1479 };
1311} 1480}
1312 1481
1313############################################################################# 1482#############################################################################
1314 1483
1315=back 1484=back
1316 1485
1317=head2 CORE EXTENSIONS 1486=head2 CORE EXTENSIONS
1318 1487
1319Functions and methods that extend core crossfire objects. 1488Functions and methods that extend core deliantra objects.
1320 1489
1321=cut 1490=cut
1322 1491
1323package cf::player; 1492package cf::player;
1324 1493
1367 1536
1368sub exists($) { 1537sub exists($) {
1369 my ($login) = @_; 1538 my ($login) = @_;
1370 1539
1371 $cf::PLAYER{$login} 1540 $cf::PLAYER{$login}
1372 or cf::sync_job { !aio_stat path $login } 1541 or !aio_stat path $login
1373} 1542}
1374 1543
1375sub find($) { 1544sub find($) {
1376 return $cf::PLAYER{$_[0]} || do { 1545 return $cf::PLAYER{$_[0]} || do {
1377 my $login = $_[0]; 1546 my $login = $_[0];
1389 my $f = new_from_file cf::object::thawer path $login 1558 my $f = new_from_file cf::object::thawer path $login
1390 or return; 1559 or return;
1391 1560
1392 my $pl = cf::player::load_pl $f 1561 my $pl = cf::player::load_pl $f
1393 or return; 1562 or return;
1563
1394 local $cf::PLAYER_LOADING{$login} = $pl; 1564 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs; 1565 $f->resolve_delayed_derefs;
1396 $cf::PLAYER{$login} = $pl 1566 $cf::PLAYER{$login} = $pl
1397 } 1567 }
1398 } 1568 }
1399} 1569}
1400 1570
1571cf::player->attach (
1572 on_load => sub {
1573 my ($pl, $path) = @_;
1574
1575 # restore slots saved in save, below
1576 my $slots = delete $pl->{_slots};
1577
1578 $pl->ob->current_weapon ($slots->[0]);
1579 $pl->combat_ob ($slots->[1]);
1580 $pl->ranged_ob ($slots->[2]);
1581 },
1582);
1583
1401sub save($) { 1584sub save($) {
1402 my ($pl) = @_; 1585 my ($pl) = @_;
1403 1586
1404 return if $pl->{deny_save}; 1587 return if $pl->{deny_save};
1405 1588
1408 1591
1409 return if $pl->{deny_save}; 1592 return if $pl->{deny_save};
1410 1593
1411 aio_mkdir playerdir $pl, 0770; 1594 aio_mkdir playerdir $pl, 0770;
1412 $pl->{last_save} = $cf::RUNTIME; 1595 $pl->{last_save} = $cf::RUNTIME;
1596
1597 cf::get_slot 0.01;
1598
1599 # save slots, to be restored later
1600 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1413 1601
1414 $pl->save_pl ($path); 1602 $pl->save_pl ($path);
1415 cf::cede_to_tick; 1603 cf::cede_to_tick;
1416} 1604}
1417 1605
1449 my ($pl) = @_; 1637 my ($pl) = @_;
1450 1638
1451 my $name = $pl->ob->name; 1639 my $name = $pl->ob->name;
1452 1640
1453 $pl->{deny_save} = 1; 1641 $pl->{deny_save} = 1;
1454 $pl->password ("*"); # this should lock out the player until we nuked the dir 1642 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1455 1643
1456 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1644 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1457 $pl->deactivate; 1645 $pl->deactivate;
1646 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1458 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1647 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1459 $pl->ns->destroy if $pl->ns; 1648 $pl->ns->destroy if $pl->ns;
1460 1649
1461 my $path = playerdir $pl; 1650 my $path = playerdir $pl;
1462 my $temp = "$path~$cf::RUNTIME~deleting~"; 1651 my $temp = "$path~$cf::RUNTIME~deleting~";
1501 1690
1502 for my $login (@$dirs) { 1691 for my $login (@$dirs) {
1503 my $path = path $login; 1692 my $path = path $login;
1504 1693
1505 # a .pst is a dead give-away for a valid player 1694 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") { 1695 # if no pst file found, open and chekc for blocked users
1696 if (aio_stat "$path.pst") {
1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1697 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1508 aio_read $fh, 0, 512, my $buf, 0 or next; 1698 aio_read $fh, 0, 512, my $buf, 0 or next;
1509 $buf !~ /^password -------------$/m or next; # official not-valid tag 1699 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 } 1700 }
1511 1701
1515 1705
1516 \@logins 1706 \@logins
1517} 1707}
1518 1708
1519=item $player->maps 1709=item $player->maps
1710
1711=item cf::player::maps $login
1520 1712
1521Returns an arrayref of map paths that are private for this 1713Returns an arrayref of map paths that are private for this
1522player. May block. 1714player. May block.
1523 1715
1524=cut 1716=cut
1542 } 1734 }
1543 1735
1544 \@paths 1736 \@paths
1545} 1737}
1546 1738
1547=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1739=item $protocol_xml = $player->expand_cfpod ($cfpod)
1548 1740
1549Expand crossfire pod fragments into protocol xml. 1741Expand deliantra pod fragments into protocol xml.
1550
1551=cut
1552
1553 use re 'eval';
1554
1555my $group;
1556my $interior; $interior = qr{
1557 (?:
1558 \ (.*?)\ (?{ $group = $^N })
1559 | < (??{$interior}) >
1560 )
1561}x;
1562
1563sub expand_cfpod {
1564 my ($self, $pod) = @_;
1565
1566 my $xml;
1567
1568 while () {
1569 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?=[^<]) )+ )/xgcs) {
1570 $group = $1;
1571
1572 $group =~ s/&/&amp;/g;
1573 $group =~ s/</&lt;/g;
1574
1575 $xml .= $group;
1576 } elsif ($pod =~ m%\G
1577 ([BCGHITU])
1578 <
1579 (?:
1580 ([^<>]*) (?{ $group = $^N })
1581 | < $interior >
1582 )
1583 >
1584 %gcsx
1585 ) {
1586 my ($code, $data) = ($1, $group);
1587
1588 if ($code eq "B") {
1589 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1590 } elsif ($code eq "I") {
1591 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1592 } elsif ($code eq "U") {
1593 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1594 } elsif ($code eq "C") {
1595 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1596 } elsif ($code eq "T") {
1597 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1598 } elsif ($code eq "G") {
1599 my ($male, $female) = split /\|/, $data;
1600 $data = $self->gender ? $female : $male;
1601 $xml .= expand_cfpod ($self, $data);
1602 } elsif ($code eq "H") {
1603 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1604 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1605 "")
1606 [$self->{hintmode}];
1607 } else {
1608 $xml .= "error processing '$code($data)' directive";
1609 }
1610 } else {
1611 if ($pod =~ /\G(.+)/) {
1612 warn "parse error while expanding $pod (at $1)";
1613 }
1614 last;
1615 }
1616 }
1617
1618 for ($xml) {
1619 # create single paragraphs (very hackish)
1620 s/(?<=\S)\n(?=\w)/ /g;
1621
1622 # compress some whitespace
1623 s/\s+\n/\n/g; # ws line-ends
1624 s/\n\n+/\n/g; # double lines
1625 s/^\n+//; # beginning lines
1626 s/\n+$//; # ending lines
1627 }
1628
1629 $xml
1630}
1631
1632sub hintmode {
1633 $_[0]{hintmode} = $_[1] if @_ > 1;
1634 $_[0]{hintmode}
1635}
1636 1742
1637=item $player->ext_reply ($msgid, @msg) 1743=item $player->ext_reply ($msgid, @msg)
1638 1744
1639Sends an ext reply to the player. 1745Sends an ext reply to the player.
1640 1746
1672 1778
1673=cut 1779=cut
1674 1780
1675sub find_by_path($) { 1781sub find_by_path($) {
1676 my ($path) = @_; 1782 my ($path) = @_;
1783
1784 $path =~ s/^~[^\/]*//; # skip ~login
1677 1785
1678 my ($match, $specificity); 1786 my ($match, $specificity);
1679 1787
1680 for my $region (list) { 1788 for my $region (list) {
1681 if ($region->{match} && $path =~ $region->{match}) { 1789 if ($region->{match} && $path =~ $region->{match}) {
1707our $MAX_RESET = 3600; 1815our $MAX_RESET = 3600;
1708our $DEFAULT_RESET = 3000; 1816our $DEFAULT_RESET = 3000;
1709 1817
1710sub generate_random_map { 1818sub generate_random_map {
1711 my ($self, $rmp) = @_; 1819 my ($self, $rmp) = @_;
1820
1821 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1822
1712 # mit "rum" bekleckern, nicht 1823 # mit "rum" bekleckern, nicht
1713 $self->_create_random_map ( 1824 $self->_create_random_map (
1714 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1825 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1715 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1826 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1716 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1827 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1717 $rmp->{exit_on_final_map}, 1828 $rmp->{exit_on_final_map},
1718 $rmp->{xsize}, $rmp->{ysize}, 1829 $rmp->{xsize}, $rmp->{ysize},
1719 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1830 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1720 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1831 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1742 1853
1743 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1854 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1744} 1855}
1745 1856
1746# also paths starting with '/' 1857# also paths starting with '/'
1747$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1858$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1748 1859
1749sub thawer_merge { 1860sub thawer_merge {
1750 my ($self, $merge) = @_; 1861 my ($self, $merge) = @_;
1751 1862
1752 # we have to keep some variables in memory intact 1863 # we have to keep some variables in memory intact
1838 1949
1839# the temporary/swap location 1950# the temporary/swap location
1840sub save_path { 1951sub save_path {
1841 my ($self) = @_; 1952 my ($self) = @_;
1842 1953
1843 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1954 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1844 "$TMPDIR/$path.map" 1955 "$TMPDIR/$path.map"
1845} 1956}
1846 1957
1847# the unique path, undef == no special unique path 1958# the unique path, undef == no special unique path
1848sub uniq_path { 1959sub uniq_path {
1849 my ($self) = @_; 1960 my ($self) = @_;
1850 1961
1851 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1962 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1852 "$UNIQUEDIR/$path" 1963 "$UNIQUEDIR/$path"
1853}
1854
1855# and all this just because we cannot iterate over
1856# all maps in C++...
1857sub change_all_map_light {
1858 my ($change) = @_;
1859
1860 $_->change_map_light ($change)
1861 for grep $_->outdoor, values %cf::MAP;
1862} 1964}
1863 1965
1864sub decay_objects { 1966sub decay_objects {
1865 my ($self) = @_; 1967 my ($self) = @_;
1866 1968
1950sub find { 2052sub find {
1951 my ($path, $origin) = @_; 2053 my ($path, $origin) = @_;
1952 2054
1953 $path = normalise $path, $origin && $origin->path; 2055 $path = normalise $path, $origin && $origin->path;
1954 2056
1955 cf::lock_wait "map_data:$path";#d#remove 2057 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1956 cf::lock_wait "map_find:$path"; 2058 my $guard2 = cf::lock_acquire "map_find:$path";
1957 2059
1958 $cf::MAP{$path} || do { 2060 $cf::MAP{$path} || do {
1959 my $guard1 = cf::lock_acquire "map_find:$path";
1960 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1961
1962 my $map = new_from_path cf::map $path 2061 my $map = new_from_path cf::map $path
1963 or return; 2062 or return;
1964 2063
1965 $map->{last_save} = $cf::RUNTIME; 2064 $map->{last_save} = $cf::RUNTIME;
1966 2065
1968 or return; 2067 or return;
1969 2068
1970 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2069 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1971 # doing this can freeze the server in a sync job, obviously 2070 # doing this can freeze the server in a sync job, obviously
1972 #$cf::WAIT_FOR_TICK->wait; 2071 #$cf::WAIT_FOR_TICK->wait;
2072 undef $guard2;
1973 undef $guard1; 2073 undef $guard1;
1974 undef $guard2;
1975 $map->reset; 2074 $map->reset;
1976 return find $path; 2075 return find $path;
1977 } 2076 }
1978 2077
1979 $cf::MAP{$path} = $map 2078 $cf::MAP{$path} = $map
1980 } 2079 }
1981} 2080}
1982 2081
1983sub pre_load { } 2082sub pre_load { }
1984sub post_load { } 2083#sub post_load { } # XS
1985 2084
1986sub load { 2085sub load {
1987 my ($self) = @_; 2086 my ($self) = @_;
1988 2087
1989 local $self->{deny_reset} = 1; # loading can take a long time 2088 local $self->{deny_reset} = 1; # loading can take a long time
2006 my $f = new_from_file cf::object::thawer $self->{load_path}; 2105 my $f = new_from_file cf::object::thawer $self->{load_path};
2007 $f->skip_block; 2106 $f->skip_block;
2008 $self->_load_objects ($f) 2107 $self->_load_objects ($f)
2009 or return; 2108 or return;
2010 2109
2011 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2110 $self->post_load_original
2012 if delete $self->{load_original}; 2111 if delete $self->{load_original};
2013 2112
2014 if (my $uniq = $self->uniq_path) { 2113 if (my $uniq = $self->uniq_path) {
2015 utf8::encode $uniq; 2114 utf8::encode $uniq;
2016 unless (aio_stat $uniq) { 2115 unless (aio_stat $uniq) {
2034 unless ($self->{deny_activate}) { 2133 unless ($self->{deny_activate}) {
2035 $self->decay_objects; 2134 $self->decay_objects;
2036 $self->fix_auto_apply; 2135 $self->fix_auto_apply;
2037 $self->update_buttons; 2136 $self->update_buttons;
2038 cf::cede_to_tick; 2137 cf::cede_to_tick;
2039 $self->set_darkness_map;
2040 cf::cede_to_tick;
2041 $self->activate; 2138 $self->activate;
2042 } 2139 }
2043 2140
2044 $self->{last_save} = $cf::RUNTIME; 2141 $self->{last_save} = $cf::RUNTIME;
2045 $self->last_access ($cf::RUNTIME); 2142 $self->last_access ($cf::RUNTIME);
2046 2143
2047 $self->in_memory (cf::MAP_IN_MEMORY); 2144 $self->in_memory (cf::MAP_ACTIVE);
2048 } 2145 }
2049 2146
2050 $self->post_load; 2147 $self->post_load;
2051} 2148}
2052 2149
2150# customize the map for a given player, i.e.
2151# return the _real_ map. used by e.g. per-player
2152# maps to change the path to ~playername/mappath
2053sub customise_for { 2153sub customise_for {
2054 my ($self, $ob) = @_; 2154 my ($self, $ob) = @_;
2055 2155
2056 return find "~" . $ob->name . "/" . $self->{path} 2156 return find "~" . $ob->name . "/" . $self->{path}
2057 if $self->per_player; 2157 if $self->per_player;
2073 or next; 2173 or next;
2074 $neigh = find $neigh, $map 2174 $neigh = find $neigh, $map
2075 or next; 2175 or next;
2076 $neigh->load; 2176 $neigh->load;
2077 2177
2178 # now find the diagonal neighbours
2078 push @neigh, 2179 push @neigh,
2079 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2180 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2080 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2181 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2081 } 2182 }
2082 2183
2110 my ($path, $origin, $load) = @_; 2211 my ($path, $origin, $load) = @_;
2111 2212
2112 $path = normalise $path, $origin && $origin->{path}; 2213 $path = normalise $path, $origin && $origin->{path};
2113 2214
2114 if (my $map = $cf::MAP{$path}) { 2215 if (my $map = $cf::MAP{$path}) {
2115 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2216 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2116 } 2217 }
2117 2218
2118 $MAP_PREFETCH{$path} |= $load; 2219 $MAP_PREFETCH{$path} |= $load;
2119 2220
2120 $MAP_PREFETCHER ||= cf::async { 2221 $MAP_PREFETCHER ||= cf::async {
2134 $MAP_PREFETCHER->prio (6); 2235 $MAP_PREFETCHER->prio (6);
2135 2236
2136 () 2237 ()
2137} 2238}
2138 2239
2240# common code, used by both ->save and ->swapout
2139sub save { 2241sub _save {
2140 my ($self) = @_; 2242 my ($self) = @_;
2141
2142 my $lock = cf::lock_acquire "map_data:$self->{path}";
2143 2243
2144 $self->{last_save} = $cf::RUNTIME; 2244 $self->{last_save} = $cf::RUNTIME;
2145 2245
2146 return unless $self->dirty; 2246 return unless $self->dirty;
2147 2247
2156 2256
2157 cf::async { 2257 cf::async {
2158 $Coro::current->{desc} = "map player save"; 2258 $Coro::current->{desc} = "map player save";
2159 $_->contr->save for $self->players; 2259 $_->contr->save for $self->players;
2160 }; 2260 };
2261
2262 cf::get_slot 0.02;
2161 2263
2162 if ($uniq) { 2264 if ($uniq) {
2163 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2265 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2164 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2266 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2165 } else { 2267 } else {
2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2268 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2167 } 2269 }
2168} 2270}
2169 2271
2272sub save {
2273 my ($self) = @_;
2274
2275 my $lock = cf::lock_acquire "map_data:$self->{path}";
2276
2277 $self->_save;
2278}
2279
2170sub swap_out { 2280sub swap_out {
2171 my ($self) = @_; 2281 my ($self) = @_;
2172 2282
2173 # save first because save cedes
2174 $self->save;
2175
2176 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2283 my $lock = cf::lock_acquire "map_data:$self->{path}";
2177 2284
2285 return if $self->in_memory != cf::MAP_ACTIVE;
2286 return if $self->{deny_save};
2178 return if $self->players; 2287 return if $self->players;
2179 return if $self->in_memory != cf::MAP_IN_MEMORY;
2180 return if $self->{deny_save};
2181 2288
2289 # first deactivate the map and "unlink" it from the core
2290 $self->deactivate;
2291 $_->clear_links_to ($self) for values %cf::MAP;
2182 $self->in_memory (cf::MAP_SWAPPED); 2292 $self->in_memory (cf::MAP_SWAPPED);
2293
2294 # then atomically save
2295 $self->_save;
2296
2297 # then free the map
2298 $self->clear;
2299}
2300
2301sub reset_at {
2302 my ($self) = @_;
2303
2304 # TODO: safety, remove and allow resettable per-player maps
2305 return 1e99 if $self->{deny_reset};
2306
2307 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2308 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2309
2310 $time + $to
2311}
2312
2313sub should_reset {
2314 my ($self) = @_;
2315
2316 $self->reset_at <= $cf::RUNTIME
2317}
2318
2319sub reset {
2320 my ($self) = @_;
2321
2322 my $lock = cf::lock_acquire "map_data:$self->{path}";
2323
2324 return if $self->players;
2325
2326 cf::trace "resetting map ", $self->path, "\n";
2327
2328 $self->in_memory (cf::MAP_SWAPPED);
2329
2330 # need to save uniques path
2331 unless ($self->{deny_save}) {
2332 my $uniq = $self->uniq_path; utf8::encode $uniq;
2333
2334 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2335 if $uniq;
2336 }
2337
2338 delete $cf::MAP{$self->path};
2183 2339
2184 $self->deactivate; 2340 $self->deactivate;
2185 $_->clear_links_to ($self) for values %cf::MAP; 2341 $_->clear_links_to ($self) for values %cf::MAP;
2186 $self->clear; 2342 $self->clear;
2187}
2188
2189sub reset_at {
2190 my ($self) = @_;
2191
2192 # TODO: safety, remove and allow resettable per-player maps
2193 return 1e99 if $self->{deny_reset};
2194
2195 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2196 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2197
2198 $time + $to
2199}
2200
2201sub should_reset {
2202 my ($self) = @_;
2203
2204 $self->reset_at <= $cf::RUNTIME
2205}
2206
2207sub reset {
2208 my ($self) = @_;
2209
2210 my $lock = cf::lock_acquire "map_data:$self->{path}";
2211
2212 return if $self->players;
2213
2214 warn "resetting map ", $self->path;
2215
2216 $self->in_memory (cf::MAP_SWAPPED);
2217
2218 # need to save uniques path
2219 unless ($self->{deny_save}) {
2220 my $uniq = $self->uniq_path; utf8::encode $uniq;
2221
2222 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2223 if $uniq;
2224 }
2225
2226 delete $cf::MAP{$self->path};
2227
2228 $self->deactivate;
2229 $_->clear_links_to ($self) for values %cf::MAP;
2230 $self->clear;
2231 2343
2232 $self->unlink_save; 2344 $self->unlink_save;
2233 $self->destroy; 2345 $self->destroy;
2234} 2346}
2235 2347
2243 2355
2244 delete $cf::MAP{$self->path}; 2356 delete $cf::MAP{$self->path};
2245 2357
2246 $self->unlink_save; 2358 $self->unlink_save;
2247 2359
2248 bless $self, "cf::map"; 2360 bless $self, "cf::map::wrap";
2249 delete $self->{deny_reset}; 2361 delete $self->{deny_reset};
2250 $self->{deny_save} = 1; 2362 $self->{deny_save} = 1;
2251 $self->reset_timeout (1); 2363 $self->reset_timeout (1);
2252 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2364 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2253 2365
2302 2414
2303sub unique_maps() { 2415sub unique_maps() {
2304 [ 2416 [
2305 map { 2417 map {
2306 utf8::decode $_; 2418 utf8::decode $_;
2307 /\.map$/ 2419 s/\.map$//; # TODO future compatibility hack
2420 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2421 ? ()
2308 ? normalise $_ 2422 : normalise $_
2309 : ()
2310 } @{ aio_readdir $UNIQUEDIR or [] } 2423 } @{ aio_readdir $UNIQUEDIR or [] }
2311 ] 2424 ]
2312} 2425}
2313 2426
2314package cf; 2427=item cf::map::static_maps
2428
2429Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2430file in the shared directory excluding F</styles> and F</editor>). May
2431block.
2432
2433=cut
2434
2435sub static_maps() {
2436 my @dirs = "";
2437 my @maps;
2438
2439 while (@dirs) {
2440 my $dir = shift @dirs;
2441
2442 next if $dir eq "/styles" || $dir eq "/editor";
2443
2444 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2445 or return;
2446
2447 for (@$files) {
2448 s/\.map$// or next;
2449 utf8::decode $_;
2450 push @maps, "$dir/$_";
2451 }
2452
2453 push @dirs, map "$dir/$_", @$dirs;
2454 }
2455
2456 \@maps
2457}
2315 2458
2316=back 2459=back
2317 2460
2318=head3 cf::object 2461=head3 cf::object
2319 2462
2323 2466
2324=over 4 2467=over 4
2325 2468
2326=item $ob->inv_recursive 2469=item $ob->inv_recursive
2327 2470
2328Returns the inventory of the object _and_ their inventories, recursively. 2471Returns the inventory of the object I<and> their inventories, recursively,
2472but I<not> the object itself.
2329 2473
2330=cut 2474=cut
2331 2475
2332sub inv_recursive_; 2476sub inv_recursive_;
2333sub inv_recursive_ { 2477sub inv_recursive_ {
2338 inv_recursive_ inv $_[0] 2482 inv_recursive_ inv $_[0]
2339} 2483}
2340 2484
2341=item $ref = $ob->ref 2485=item $ref = $ob->ref
2342 2486
2343creates and returns a persistent reference to an objetc that can be stored as a string. 2487Creates and returns a persistent reference to an object that can be stored as a string.
2344 2488
2345=item $ob = cf::object::deref ($refstring) 2489=item $ob = cf::object::deref ($refstring)
2346 2490
2347returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2491returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2348even if the object actually exists. May block. 2492even if the object actually exists. May block.
2380can be C<undef>. Does the right thing when the player is currently in a 2524can be C<undef>. Does the right thing when the player is currently in a
2381dialogue with the given NPC character. 2525dialogue with the given NPC character.
2382 2526
2383=cut 2527=cut
2384 2528
2529our $SAY_CHANNEL = {
2530 id => "say",
2531 title => "Map",
2532 reply => "say ",
2533 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2534};
2535
2536our $CHAT_CHANNEL = {
2537 id => "chat",
2538 title => "Chat",
2539 reply => "chat ",
2540 tooltip => "Player chat and shouts, global to the server.",
2541};
2542
2385# rough implementation of a future "reply" method that works 2543# rough implementation of a future "reply" method that works
2386# with dialog boxes. 2544# with dialog boxes.
2387#TODO: the first argument must go, split into a $npc->reply_to ( method 2545#TODO: the first argument must go, split into a $npc->reply_to ( method
2388sub cf::object::player::reply($$$;$) { 2546sub cf::object::player::reply($$$;$) {
2389 my ($self, $npc, $msg, $flags) = @_; 2547 my ($self, $npc, $msg, $flags) = @_;
2400 my $dialog = $pl->{npc_dialog}; 2558 my $dialog = $pl->{npc_dialog};
2401 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2559 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2402 2560
2403 } else { 2561 } else {
2404 $msg = $npc->name . " says: $msg" if $npc; 2562 $msg = $npc->name . " says: $msg" if $npc;
2405 $self->message ($msg, $flags); 2563 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2406 } 2564 }
2407 } 2565 }
2408} 2566}
2409 2567
2410=item $object->send_msg ($channel, $msg, $color, [extra...]) 2568=item $object->send_msg ($channel, $msg, $color, [extra...])
2435 2593
2436=item $player_object->enter_link 2594=item $player_object->enter_link
2437 2595
2438Freezes the player and moves him/her to a special map (C<{link}>). 2596Freezes the player and moves him/her to a special map (C<{link}>).
2439 2597
2440The player should be reasonably safe there for short amounts of time. You 2598The player should be reasonably safe there for short amounts of time (e.g.
2441I<MUST> call C<leave_link> as soon as possible, though. 2599for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2600though, as the player cannot control the character while it is on the link
2601map.
2442 2602
2443Will never block. 2603Will never block.
2444 2604
2445=item $player_object->leave_link ($map, $x, $y) 2605=item $player_object->leave_link ($map, $x, $y)
2446 2606
2466sub cf::object::player::enter_link { 2626sub cf::object::player::enter_link {
2467 my ($self) = @_; 2627 my ($self) = @_;
2468 2628
2469 $self->deactivate_recursive; 2629 $self->deactivate_recursive;
2470 2630
2631 ++$self->{_link_recursion};
2632
2471 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2633 return if UNIVERSAL::isa $self->map, "ext::map_link";
2472 2634
2473 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2635 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2474 if $self->map && $self->map->{path} ne "{link}"; 2636 if $self->map && $self->map->{path} ne "{link}";
2475 2637
2476 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2638 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2477} 2639}
2478 2640
2479sub cf::object::player::leave_link { 2641sub cf::object::player::leave_link {
2480 my ($self, $map, $x, $y) = @_; 2642 my ($self, $map, $x, $y) = @_;
2481 2643
2498 ($x, $y) = (-1, -1) 2660 ($x, $y) = (-1, -1)
2499 unless (defined $x) && (defined $y); 2661 unless (defined $x) && (defined $y);
2500 2662
2501 # use -1 or undef as default coordinates, not 0, 0 2663 # use -1 or undef as default coordinates, not 0, 0
2502 ($x, $y) = ($map->enter_x, $map->enter_y) 2664 ($x, $y) = ($map->enter_x, $map->enter_y)
2503 if $x <=0 && $y <= 0; 2665 if $x <= 0 && $y <= 0;
2504 2666
2505 $map->load; 2667 $map->load;
2506 $map->load_neighbours; 2668 $map->load_neighbours;
2507 2669
2508 return unless $self->contr->active; 2670 return unless $self->contr->active;
2509 $self->activate_recursive;
2510 2671
2511 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2672 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2512 $self->enter_map ($map, $x, $y); 2673 if ($self->enter_map ($map, $x, $y)) {
2513} 2674 # entering was successful
2675 delete $self->{_link_recursion};
2676 # only activate afterwards, to support waiting in hooks
2677 $self->activate_recursive;
2678 }
2514 2679
2680}
2681
2515=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2682=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2516 2683
2517Moves the player to the given map-path and coordinates by first freezing 2684Moves the player to the given map-path and coordinates by first freezing
2518her, loading and preparing them map, calling the provided $check callback 2685her, loading and preparing them map, calling the provided $check callback
2519that has to return the map if sucecssful, and then unfreezes the player on 2686that has to return the map if sucecssful, and then unfreezes the player on
2520the new (success) or old (failed) map position. In either case, $done will 2687the new (success) or old (failed) map position. In either case, $done will
2521be called at the end of this process. 2688be called at the end of this process.
2522 2689
2690Note that $check will be called with a potentially non-loaded map, so if
2691it needs a loaded map it has to call C<< ->load >>.
2692
2523=cut 2693=cut
2524 2694
2525our $GOTOGEN; 2695our $GOTOGEN;
2526 2696
2527sub cf::object::player::goto { 2697sub cf::object::player::goto {
2528 my ($self, $path, $x, $y, $check, $done) = @_; 2698 my ($self, $path, $x, $y, $check, $done) = @_;
2699
2700 if ($self->{_link_recursion} >= $MAX_LINKS) {
2701 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2702 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2703 ($path, $x, $y) = @$EMERGENCY_POSITION;
2704 }
2529 2705
2530 # do generation counting so two concurrent goto's will be executed in-order 2706 # do generation counting so two concurrent goto's will be executed in-order
2531 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2707 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2532 2708
2533 $self->enter_link; 2709 $self->enter_link;
2557 my $map = eval { 2733 my $map = eval {
2558 my $map = defined $path ? cf::map::find $path : undef; 2734 my $map = defined $path ? cf::map::find $path : undef;
2559 2735
2560 if ($map) { 2736 if ($map) {
2561 $map = $map->customise_for ($self); 2737 $map = $map->customise_for ($self);
2562 $map = $check->($map) if $check && $map; 2738 $map = $check->($map, $x, $y, $self) if $check && $map;
2563 } else { 2739 } else {
2564 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2740 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2565 } 2741 }
2566 2742
2567 $map 2743 $map
2575 if ($gen == $self->{_goto_generation}) { 2751 if ($gen == $self->{_goto_generation}) {
2576 delete $self->{_goto_generation}; 2752 delete $self->{_goto_generation};
2577 $self->leave_link ($map, $x, $y); 2753 $self->leave_link ($map, $x, $y);
2578 } 2754 }
2579 2755
2580 $done->() if $done; 2756 $done->($self) if $done;
2581 })->prio (1); 2757 })->prio (1);
2582} 2758}
2583 2759
2584=item $player_object->enter_exit ($exit_object) 2760=item $player_object->enter_exit ($exit_object)
2585 2761
2605} 2781}
2606 2782
2607sub prepare_random_map { 2783sub prepare_random_map {
2608 my ($exit) = @_; 2784 my ($exit) = @_;
2609 2785
2610 my $guard = cf::lock_acquire "exit_prepare:$exit";
2611
2612 # all this does is basically replace the /! path by 2786 # all this does is basically replace the /! path by
2613 # a new random map path (?random/...) with a seed 2787 # a new random map path (?random/...) with a seed
2614 # that depends on the exit object 2788 # that depends on the exit object
2615 2789
2616 my $rmp = parse_random_map_params $exit->msg; 2790 my $rmp = parse_random_map_params $exit->msg;
2618 if ($exit->map) { 2792 if ($exit->map) {
2619 $rmp->{region} = $exit->region->name; 2793 $rmp->{region} = $exit->region->name;
2620 $rmp->{origin_map} = $exit->map->path; 2794 $rmp->{origin_map} = $exit->map->path;
2621 $rmp->{origin_x} = $exit->x; 2795 $rmp->{origin_x} = $exit->x;
2622 $rmp->{origin_y} = $exit->y; 2796 $rmp->{origin_y} = $exit->y;
2797
2798 $exit->map->touch;
2623 } 2799 }
2624 2800
2625 $rmp->{random_seed} ||= $exit->random_seed; 2801 $rmp->{random_seed} ||= $exit->random_seed;
2626 2802
2627 my $data = cf::to_json $rmp; 2803 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2628 my $md5 = Digest::MD5::md5_hex $data; 2804 my $md5 = Digest::MD5::md5_hex $data;
2629 my $meta = "$RANDOMDIR/$md5.meta"; 2805 my $meta = "$RANDOMDIR/$md5.meta";
2630 2806
2631 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2807 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2632 aio_write $fh, 0, (length $data), $data, 0; 2808 aio_write $fh, 0, (length $data), $data, 0;
2633 undef $fh; 2809 undef $fh;
2634 aio_rename "$meta~", $meta; 2810 aio_rename "$meta~", $meta;
2635 2811
2812 my $slaying = "?random/$md5";
2813
2814 if ($exit->valid) {
2636 $exit->slaying ("?random/$md5"); 2815 $exit->slaying ("?random/$md5");
2637 $exit->msg (undef); 2816 $exit->msg (undef);
2817 }
2638 } 2818 }
2639} 2819}
2640 2820
2641sub cf::object::player::enter_exit { 2821sub cf::object::player::enter_exit {
2642 my ($self, $exit) = @_; 2822 my ($self, $exit) = @_;
2643 2823
2644 return unless $self->type == cf::PLAYER; 2824 return unless $self->type == cf::PLAYER;
2645 2825
2646 if ($exit->slaying eq "/!") {
2647 #TODO: this should de-fi-ni-te-ly not be a sync-job
2648 # the problem is that $exit might not survive long enough
2649 # so it needs to be done right now, right here
2650 cf::sync_job { prepare_random_map $exit };
2651 }
2652
2653 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2654 my $hp = $exit->stats->hp;
2655 my $sp = $exit->stats->sp;
2656
2657 $self->enter_link; 2826 $self->enter_link;
2658 2827
2659 # if exit is damned, update players death & WoR home-position
2660 $self->contr->savebed ($slaying, $hp, $sp)
2661 if $exit->flag (FLAG_DAMNED);
2662
2663 (async { 2828 (async {
2664 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2829 $Coro::current->{desc} = "enter_exit";
2665 2830
2666 $self->deactivate_recursive; # just to be sure
2667 unless (eval { 2831 unless (eval {
2832 $self->deactivate_recursive; # just to be sure
2833
2834 # random map handling
2835 {
2836 my $guard = cf::lock_acquire "exit_prepare:$exit";
2837
2838 prepare_random_map $exit
2839 if $exit->slaying eq "/!";
2840 }
2841
2842 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2843 my $x = $exit->stats->hp;
2844 my $y = $exit->stats->sp;
2845
2668 $self->goto ($slaying, $hp, $sp); 2846 $self->goto ($map, $x, $y);
2669 2847
2848 # if exit is damned, update players death & WoR home-position
2849 $self->contr->savebed ($map, $x, $y)
2850 if $exit->flag (cf::FLAG_DAMNED);
2851
2670 1; 2852 1
2671 }) { 2853 }) {
2672 $self->message ("Something went wrong deep within the crossfire server. " 2854 $self->message ("Something went wrong deep within the deliantra server. "
2673 . "I'll try to bring you back to the map you were before. " 2855 . "I'll try to bring you back to the map you were before. "
2674 . "Please report this to the dungeon master!", 2856 . "Please report this to the dungeon master!",
2675 cf::NDI_UNIQUE | cf::NDI_RED); 2857 cf::NDI_UNIQUE | cf::NDI_RED);
2676 2858
2677 warn "ERROR in enter_exit: $@"; 2859 error "ERROR in enter_exit: $@";
2678 $self->leave_link; 2860 $self->leave_link;
2679 } 2861 }
2680 })->prio (1); 2862 })->prio (1);
2681} 2863}
2682 2864
2694sub cf::client::send_drawinfo { 2876sub cf::client::send_drawinfo {
2695 my ($self, $text, $flags) = @_; 2877 my ($self, $text, $flags) = @_;
2696 2878
2697 utf8::encode $text; 2879 utf8::encode $text;
2698 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2880 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2881}
2882
2883=item $client->send_big_packet ($pkt)
2884
2885Like C<send_packet>, but tries to compress large packets, and fragments
2886them as required.
2887
2888=cut
2889
2890our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2891
2892sub cf::client::send_big_packet {
2893 my ($self, $pkt) = @_;
2894
2895 # try lzf for large packets
2896 $pkt = "lzf " . Compress::LZF::compress $pkt
2897 if 1024 <= length $pkt and $self->{can_lzf};
2898
2899 # split very large packets
2900 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2901 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2902 $pkt = "frag";
2903 }
2904
2905 $self->send_packet ($pkt);
2699} 2906}
2700 2907
2701=item $client->send_msg ($channel, $msg, $color, [extra...]) 2908=item $client->send_msg ($channel, $msg, $color, [extra...])
2702 2909
2703Send a drawinfo or msg packet to the client, formatting the msg for the 2910Send a drawinfo or msg packet to the client, formatting the msg for the
2707 2914
2708=cut 2915=cut
2709 2916
2710# non-persistent channels (usually the info channel) 2917# non-persistent channels (usually the info channel)
2711our %CHANNEL = ( 2918our %CHANNEL = (
2919 "c/motd" => {
2920 id => "infobox",
2921 title => "MOTD",
2922 reply => undef,
2923 tooltip => "The message of the day",
2924 },
2712 "c/identify" => { 2925 "c/identify" => {
2713 id => "infobox", 2926 id => "infobox",
2714 title => "Identify", 2927 title => "Identify",
2715 reply => undef, 2928 reply => undef,
2716 tooltip => "Items recently identified", 2929 tooltip => "Items recently identified",
2718 "c/examine" => { 2931 "c/examine" => {
2719 id => "infobox", 2932 id => "infobox",
2720 title => "Examine", 2933 title => "Examine",
2721 reply => undef, 2934 reply => undef,
2722 tooltip => "Signs and other items you examined", 2935 tooltip => "Signs and other items you examined",
2936 },
2937 "c/shopinfo" => {
2938 id => "infobox",
2939 title => "Shop Info",
2940 reply => undef,
2941 tooltip => "What your bargaining skill tells you about the shop",
2723 }, 2942 },
2724 "c/book" => { 2943 "c/book" => {
2725 id => "infobox", 2944 id => "infobox",
2726 title => "Book", 2945 title => "Book",
2727 reply => undef, 2946 reply => undef,
2743 id => "infobox", 2962 id => "infobox",
2744 title => "Body Parts", 2963 title => "Body Parts",
2745 reply => undef, 2964 reply => undef,
2746 tooltip => "Shows which body parts you posess and are available", 2965 tooltip => "Shows which body parts you posess and are available",
2747 }, 2966 },
2967 "c/statistics" => {
2968 id => "infobox",
2969 title => "Statistics",
2970 reply => undef,
2971 tooltip => "Shows your primary statistics",
2972 },
2973 "c/skills" => {
2974 id => "infobox",
2975 title => "Skills",
2976 reply => undef,
2977 tooltip => "Shows your experience per skill and item power",
2978 },
2979 "c/shopitems" => {
2980 id => "infobox",
2981 title => "Shop Items",
2982 reply => undef,
2983 tooltip => "Shows the items currently for sale in this shop",
2984 },
2985 "c/resistances" => {
2986 id => "infobox",
2987 title => "Resistances",
2988 reply => undef,
2989 tooltip => "Shows your resistances",
2990 },
2991 "c/pets" => {
2992 id => "infobox",
2993 title => "Pets",
2994 reply => undef,
2995 tooltip => "Shows information abotu your pets/a specific pet",
2996 },
2997 "c/perceiveself" => {
2998 id => "infobox",
2999 title => "Perceive Self",
3000 reply => undef,
3001 tooltip => "You gained detailed knowledge about yourself",
3002 },
2748 "c/uptime" => { 3003 "c/uptime" => {
2749 id => "infobox", 3004 id => "infobox",
2750 title => "Uptime", 3005 title => "Uptime",
2751 reply => undef, 3006 reply => undef,
2752 tooltip => "How long the server has been running since last restart", 3007 tooltip => "How long the server has been running since last restart",
2755 id => "infobox", 3010 id => "infobox",
2756 title => "Map Info", 3011 title => "Map Info",
2757 reply => undef, 3012 reply => undef,
2758 tooltip => "Information related to the maps", 3013 tooltip => "Information related to the maps",
2759 }, 3014 },
3015 "c/party" => {
3016 id => "party",
3017 title => "Party",
3018 reply => "gsay ",
3019 tooltip => "Messages and chat related to your party",
3020 },
3021 "c/death" => {
3022 id => "death",
3023 title => "Death",
3024 reply => undef,
3025 tooltip => "Reason for and more info about your most recent death",
3026 },
3027 "c/say" => $SAY_CHANNEL,
3028 "c/chat" => $CHAT_CHANNEL,
2760); 3029);
2761 3030
2762sub cf::client::send_msg { 3031sub cf::client::send_msg {
2763 my ($self, $channel, $msg, $color, @extra) = @_; 3032 my ($self, $channel, $msg, $color, @extra) = @_;
2764 3033
2765 $msg = $self->pl->expand_cfpod ($msg); 3034 $msg = $self->pl->expand_cfpod ($msg)
3035 unless $color & cf::NDI_VERBATIM;
2766 3036
2767 $color &= cf::NDI_CLIENT_MASK; # just in case... 3037 $color &= cf::NDI_CLIENT_MASK; # just in case...
2768 3038
2769 # check predefined channels, for the benefit of C 3039 # check predefined channels, for the benefit of C
2770 if ($CHANNEL{$channel}) { 3040 if ($CHANNEL{$channel}) {
2771 $channel = $CHANNEL{$channel}; 3041 $channel = $CHANNEL{$channel};
2772 3042
2773 $self->ext_msg (channel_info => $channel) 3043 $self->ext_msg (channel_info => $channel);
2774 if $self->can_msg;
2775
2776 $channel = $channel->{id}; 3044 $channel = $channel->{id};
2777 3045
2778 } elsif (ref $channel) { 3046 } elsif (ref $channel) {
2779 # send meta info to client, if not yet sent 3047 # send meta info to client, if not yet sent
2780 unless (exists $self->{channel}{$channel->{id}}) { 3048 unless (exists $self->{channel}{$channel->{id}}) {
2781 $self->{channel}{$channel->{id}} = $channel; 3049 $self->{channel}{$channel->{id}} = $channel;
2782 $self->ext_msg (channel_info => $channel) 3050 $self->ext_msg (channel_info => $channel);
2783 if $self->can_msg;
2784 } 3051 }
2785 3052
2786 $channel = $channel->{id}; 3053 $channel = $channel->{id};
2787 } 3054 }
2788 3055
2789 return unless @extra || length $msg; 3056 return unless @extra || length $msg;
2790 3057
2791 if ($self->can_msg) {
2792 # default colour, mask it out 3058 # default colour, mask it out
2793 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3059 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2794 if $color & cf::NDI_DEF; 3060 if $color & cf::NDI_DEF;
2795 3061
2796 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3062 my $pkt = "msg "
3063 . $self->{json_coder}->encode (
2797 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3064 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2798 } else { 3065 );
2799 if ($color >= 0) {
2800 # replace some tags by gcfclient-compatible ones
2801 for ($msg) {
2802 1 while
2803 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2804 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2805 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2806 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2807 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2808 }
2809 3066
2810 $color &= cf::NDI_COLOR_MASK; 3067 $self->send_big_packet ($pkt);
2811
2812 utf8::encode $msg;
2813
2814 if (0 && $msg =~ /\[/) {
2815 # COMMAND/INFO
2816 $self->send_packet ("drawextinfo $color 10 8 $msg")
2817 } else {
2818 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2819 $self->send_packet ("drawinfo $color $msg")
2820 }
2821 }
2822 }
2823} 3068}
2824 3069
2825=item $client->ext_msg ($type, @msg) 3070=item $client->ext_msg ($type, @msg)
2826 3071
2827Sends an ext event to the client. 3072Sends an ext event to the client.
2830 3075
2831sub cf::client::ext_msg($$@) { 3076sub cf::client::ext_msg($$@) {
2832 my ($self, $type, @msg) = @_; 3077 my ($self, $type, @msg) = @_;
2833 3078
2834 if ($self->extcmd == 2) { 3079 if ($self->extcmd == 2) {
2835 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3080 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2836 } elsif ($self->extcmd == 1) { # TODO: remove 3081 } elsif ($self->extcmd == 1) { # TODO: remove
2837 push @msg, msgtype => "event_$type"; 3082 push @msg, msgtype => "event_$type";
2838 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3083 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2839 } 3084 }
2840} 3085}
2841 3086
2842=item $client->ext_reply ($msgid, @msg) 3087=item $client->ext_reply ($msgid, @msg)
2843 3088
2847 3092
2848sub cf::client::ext_reply($$@) { 3093sub cf::client::ext_reply($$@) {
2849 my ($self, $id, @msg) = @_; 3094 my ($self, $id, @msg) = @_;
2850 3095
2851 if ($self->extcmd == 2) { 3096 if ($self->extcmd == 2) {
2852 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3097 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2853 } elsif ($self->extcmd == 1) { 3098 } elsif ($self->extcmd == 1) {
2854 #TODO: version 1, remove 3099 #TODO: version 1, remove
2855 unshift @msg, msgtype => "reply", msgid => $id; 3100 unshift @msg, msgtype => "reply", msgid => $id;
2856 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3101 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2857 } 3102 }
2858} 3103}
2859 3104
2860=item $success = $client->query ($flags, "text", \&cb) 3105=item $success = $client->query ($flags, "text", \&cb)
2861 3106
2932 3177
2933 $ns->ext_reply ($reply, @reply) 3178 $ns->ext_reply ($reply, @reply)
2934 if $reply; 3179 if $reply;
2935 3180
2936 } else { 3181 } else {
2937 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3182 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2938 } 3183 }
2939 3184
2940 cf::override; 3185 cf::override;
2941 }, 3186 },
2942); 3187);
2962 3207
2963 $coro 3208 $coro
2964} 3209}
2965 3210
2966cf::client->attach ( 3211cf::client->attach (
2967 on_destroy => sub { 3212 on_client_destroy => sub {
2968 my ($ns) = @_; 3213 my ($ns) = @_;
2969 3214
2970 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3215 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2971 }, 3216 },
2972); 3217);
2988our $safe_hole = new Safe::Hole; 3233our $safe_hole = new Safe::Hole;
2989 3234
2990$SIG{FPE} = 'IGNORE'; 3235$SIG{FPE} = 'IGNORE';
2991 3236
2992$safe->permit_only (Opcode::opset qw( 3237$safe->permit_only (Opcode::opset qw(
2993 :base_core :base_mem :base_orig :base_math 3238 :base_core :base_mem :base_orig :base_math :base_loop
2994 grepstart grepwhile mapstart mapwhile 3239 grepstart grepwhile mapstart mapwhile
2995 sort time 3240 sort time
2996)); 3241));
2997 3242
2998# here we export the classes and methods available to script code 3243# here we export the classes and methods available to script code
3001 3246
3002The following functions and methods are available within a safe environment: 3247The following functions and methods are available within a safe environment:
3003 3248
3004 cf::object 3249 cf::object
3005 contr pay_amount pay_player map x y force_find force_add destroy 3250 contr pay_amount pay_player map x y force_find force_add destroy
3006 insert remove name archname title slaying race decrease_ob_nr 3251 insert remove name archname title slaying race decrease split
3252 value
3007 3253
3008 cf::object::player 3254 cf::object::player
3009 player 3255 player
3010 3256
3011 cf::player 3257 cf::player
3016 3262
3017=cut 3263=cut
3018 3264
3019for ( 3265for (
3020 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3266 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3021 insert remove inv name archname title slaying race 3267 insert remove inv nrof name archname title slaying race
3022 decrease_ob_nr destroy)], 3268 decrease split destroy change_exp value msg lore send_msg)],
3023 ["cf::object::player" => qw(player)], 3269 ["cf::object::player" => qw(player)],
3024 ["cf::player" => qw(peaceful)], 3270 ["cf::player" => qw(peaceful send_msg)],
3025 ["cf::map" => qw(trigger)], 3271 ["cf::map" => qw(trigger)],
3026) { 3272) {
3027 no strict 'refs'; 3273 no strict 'refs';
3028 my ($pkg, @funs) = @$_; 3274 my ($pkg, @funs) = @$_;
3029 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3275 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3047 3293
3048 my $qcode = $code; 3294 my $qcode = $code;
3049 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3295 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3050 $qcode =~ s/\n/\\n/g; 3296 $qcode =~ s/\n/\\n/g;
3051 3297
3298 %vars = (_dummy => 0) unless %vars;
3299
3300 my @res;
3052 local $_; 3301 local $_;
3053 local @safe::cf::_safe_eval_args = values %vars;
3054 3302
3055 my $eval = 3303 my $eval =
3056 "do {\n" 3304 "do {\n"
3057 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3305 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3058 . "#line 0 \"{$qcode}\"\n" 3306 . "#line 0 \"{$qcode}\"\n"
3059 . $code 3307 . $code
3060 . "\n}" 3308 . "\n}"
3061 ; 3309 ;
3062 3310
3311 if ($CFG{safe_eval}) {
3063 sub_generation_inc; 3312 sub_generation_inc;
3313 local @safe::cf::_safe_eval_args = values %vars;
3064 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3314 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3065 sub_generation_inc; 3315 sub_generation_inc;
3316 } else {
3317 local @cf::_safe_eval_args = values %vars;
3318 @res = wantarray ? eval eval : scalar eval $eval;
3319 }
3066 3320
3067 if ($@) { 3321 if ($@) {
3068 warn "$@"; 3322 warn "$@",
3069 warn "while executing safe code '$code'\n"; 3323 "while executing safe code '$code'\n",
3070 warn "with arguments " . (join " ", %vars) . "\n"; 3324 "with arguments " . (join " ", %vars) . "\n";
3071 } 3325 }
3072 3326
3073 wantarray ? @res : $res[0] 3327 wantarray ? @res : $res[0]
3074} 3328}
3075 3329
3089=cut 3343=cut
3090 3344
3091sub register_script_function { 3345sub register_script_function {
3092 my ($fun, $cb) = @_; 3346 my ($fun, $cb) = @_;
3093 3347
3094 no strict 'refs'; 3348 $fun = "safe::$fun" if $CFG{safe_eval};
3095 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3349 *$fun = $safe_hole->wrap ($cb);
3096} 3350}
3097 3351
3098=back 3352=back
3099 3353
3100=cut 3354=cut
3109 # for this (global event?) 3363 # for this (global event?)
3110 %ext::player_env::MUSIC_FACE_CACHE = (); 3364 %ext::player_env::MUSIC_FACE_CACHE = ();
3111 3365
3112 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3366 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3113 3367
3114 warn "loading facedata from $path\n"; 3368 trace "loading facedata from $path\n";
3115 3369
3116 my $facedata; 3370 my $facedata;
3117 0 < aio_load $path, $facedata 3371 0 < aio_load $path, $facedata
3118 or die "$path: $!"; 3372 or die "$path: $!";
3119 3373
3121 3375
3122 $facedata->{version} == 2 3376 $facedata->{version} == 2
3123 or cf::cleanup "$path: version mismatch, cannot proceed."; 3377 or cf::cleanup "$path: version mismatch, cannot proceed.";
3124 3378
3125 # patch in the exptable 3379 # patch in the exptable
3380 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3126 $facedata->{resource}{"res/exp_table"} = { 3381 $facedata->{resource}{"res/exp_table"} = {
3127 type => FT_RSRC, 3382 type => FT_RSRC,
3128 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3383 data => $exp_table,
3384 hash => (Digest::MD5::md5 $exp_table),
3129 }; 3385 };
3130 cf::cede_to_tick; 3386 cf::cede_to_tick;
3131 3387
3132 { 3388 {
3133 my $faces = $facedata->{faceinfo}; 3389 my $faces = $facedata->{faceinfo};
3134 3390
3135 while (my ($face, $info) = each %$faces) { 3391 while (my ($face, $info) = each %$faces) {
3136 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3392 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3393
3137 cf::face::set_visibility $idx, $info->{visibility}; 3394 cf::face::set_visibility $idx, $info->{visibility};
3138 cf::face::set_magicmap $idx, $info->{magicmap}; 3395 cf::face::set_magicmap $idx, $info->{magicmap};
3139 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3396 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3140 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3397 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3141 3398
3142 cf::cede_to_tick; 3399 cf::cede_to_tick;
3143 } 3400 }
3144 3401
3145 while (my ($face, $info) = each %$faces) { 3402 while (my ($face, $info) = each %$faces) {
3146 next unless $info->{smooth}; 3403 next unless $info->{smooth};
3404
3147 my $idx = cf::face::find $face 3405 my $idx = cf::face::find $face
3148 or next; 3406 or next;
3407
3149 if (my $smooth = cf::face::find $info->{smooth}) { 3408 if (my $smooth = cf::face::find $info->{smooth}) {
3150 cf::face::set_smooth $idx, $smooth; 3409 cf::face::set_smooth $idx, $smooth;
3151 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3410 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3152 } else { 3411 } else {
3153 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3412 error "smooth face '$info->{smooth}' not found for face '$face'";
3154 } 3413 }
3155 3414
3156 cf::cede_to_tick; 3415 cf::cede_to_tick;
3157 } 3416 }
3158 } 3417 }
3167 3426
3168 cf::anim::invalidate_all; # d'oh 3427 cf::anim::invalidate_all; # d'oh
3169 } 3428 }
3170 3429
3171 { 3430 {
3172 # TODO: for gcfclient pleasure, we should give resources
3173 # that gcfclient doesn't grok a >10000 face index.
3174 my $res = $facedata->{resource}; 3431 my $res = $facedata->{resource};
3175 3432
3176 my $soundconf = delete $res->{"res/sound.conf"};
3177
3178 while (my ($name, $info) = each %$res) { 3433 while (my ($name, $info) = each %$res) {
3434 if (defined $info->{type}) {
3179 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3435 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3180 my $data;
3181 3436
3182 if ($info->{type} & 1) { 3437 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3183 # prepend meta info 3438 cf::face::set_type $idx, $info->{type};
3184
3185 my $meta = $enc->encode ({
3186 name => $name,
3187 %{ $info->{meta} || {} },
3188 });
3189
3190 $data = pack "(w/a*)*", $meta, $info->{data};
3191 } else { 3439 } else {
3192 $data = $info->{data}; 3440 $RESOURCE{$name} = $info; # unused
3193 } 3441 }
3194 3442
3195 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3196 cf::face::set_type $idx, $info->{type};
3197
3198 cf::cede_to_tick; 3443 cf::cede_to_tick;
3199 } 3444 }
3200
3201 if ($soundconf) {
3202 $soundconf = $enc->decode (delete $soundconf->{data});
3203
3204 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3205 my $sound = $soundconf->{compat}[$_]
3206 or next;
3207
3208 my $face = cf::face::find "sound/$sound->[1]";
3209 cf::sound::set $sound->[0] => $face;
3210 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3211 }
3212
3213 while (my ($k, $v) = each %{$soundconf->{event}}) {
3214 my $face = cf::face::find "sound/$v";
3215 cf::sound::set $k => $face;
3216 }
3217 }
3218 } 3445 }
3446
3447 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3219 3448
3220 1 3449 1
3221} 3450}
3222 3451
3223register_exticmd fx_want => sub { 3452register_exticmd fx_want => sub {
3225 3454
3226 while (my ($k, $v) = each %$want) { 3455 while (my ($k, $v) = each %$want) {
3227 $ns->fx_want ($k, $v); 3456 $ns->fx_want ($k, $v);
3228 } 3457 }
3229}; 3458};
3459
3460sub load_resource_file($) {
3461 my $guard = lock_acquire "load_resource_file";
3462
3463 my $status = load_resource_file_ $_[0];
3464 get_slot 0.1, 100;
3465 cf::arch::commit_load;
3466
3467 $status
3468}
3230 3469
3231sub reload_regions { 3470sub reload_regions {
3232 # HACK to clear player env face cache, we need some signal framework 3471 # HACK to clear player env face cache, we need some signal framework
3233 # for this (global event?) 3472 # for this (global event?)
3234 %ext::player_env::MUSIC_FACE_CACHE = (); 3473 %ext::player_env::MUSIC_FACE_CACHE = ();
3248} 3487}
3249 3488
3250sub reload_archetypes { 3489sub reload_archetypes {
3251 load_resource_file "$DATADIR/archetypes" 3490 load_resource_file "$DATADIR/archetypes"
3252 or die "unable to load archetypes\n"; 3491 or die "unable to load archetypes\n";
3253 #d# NEED to laod twice to resolve forward references
3254 # this really needs to be done in an extra post-pass
3255 # (which needs to be synchronous, so solve it differently)
3256 load_resource_file "$DATADIR/archetypes"
3257 or die "unable to load archetypes\n";
3258} 3492}
3259 3493
3260sub reload_treasures { 3494sub reload_treasures {
3261 load_resource_file "$DATADIR/treasures" 3495 load_resource_file "$DATADIR/treasures"
3262 or die "unable to load treasurelists\n"; 3496 or die "unable to load treasurelists\n";
3263} 3497}
3264 3498
3499sub reload_sound {
3500 trace "loading sound config from $DATADIR/sound\n";
3501
3502 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3503 or die "$DATADIR/sound $!";
3504
3505 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3506
3507 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3508 my $sound = $soundconf->{compat}[$_]
3509 or next;
3510
3511 my $face = cf::face::find "sound/$sound->[1]";
3512 cf::sound::set $sound->[0] => $face;
3513 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3514 }
3515
3516 while (my ($k, $v) = each %{$soundconf->{event}}) {
3517 my $face = cf::face::find "sound/$v";
3518 cf::sound::set $k => $face;
3519 }
3520}
3521
3265sub reload_resources { 3522sub reload_resources {
3266 warn "reloading resource files...\n"; 3523 trace "reloading resource files...\n";
3267 3524
3525 reload_facedata;
3526 reload_sound;
3527 reload_archetypes;
3268 reload_regions; 3528 reload_regions;
3269 reload_facedata;
3270 #reload_archetypes;#d#
3271 reload_archetypes;
3272 reload_treasures; 3529 reload_treasures;
3273 3530
3274 warn "finished reloading resource files\n"; 3531 trace "finished reloading resource files\n";
3275}
3276
3277sub init {
3278 reload_resources;
3279} 3532}
3280 3533
3281sub reload_config { 3534sub reload_config {
3535 trace "reloading config file...\n";
3536
3282 open my $fh, "<:utf8", "$CONFDIR/config" 3537 open my $fh, "<:utf8", "$CONFDIR/config"
3283 or return; 3538 or return;
3284 3539
3285 local $/; 3540 local $/;
3286 *CFG = YAML::Syck::Load <$fh>; 3541 *CFG = YAML::XS::Load scalar <$fh>;
3287 3542
3288 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3543 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3289 3544
3290 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3545 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3291 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3546 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3292 3547
3293 if (exists $CFG{mlockall}) { 3548 if (exists $CFG{mlockall}) {
3295 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3550 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3296 and die "WARNING: m(un)lockall failed: $!\n"; 3551 and die "WARNING: m(un)lockall failed: $!\n";
3297 }; 3552 };
3298 warn $@ if $@; 3553 warn $@ if $@;
3299 } 3554 }
3555
3556 trace "finished reloading resource files\n";
3557}
3558
3559sub pidfile() {
3560 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3561 or die "$PIDFILE: $!";
3562 flock $fh, &Fcntl::LOCK_EX
3563 or die "$PIDFILE: flock: $!";
3564 $fh
3565}
3566
3567# make sure only one server instance is running at any one time
3568sub atomic {
3569 my $fh = pidfile;
3570
3571 my $pid = <$fh>;
3572 kill 9, $pid if $pid > 0;
3573
3574 seek $fh, 0, 0;
3575 print $fh $$;
3576}
3577
3578sub main_loop {
3579 trace "EV::loop starting\n";
3580 if (1) {
3581 EV::loop;
3582 }
3583 trace "EV::loop returned\n";
3584 goto &main_loop unless $REALLY_UNLOOP;
3300} 3585}
3301 3586
3302sub main { 3587sub main {
3588 cf::init_globals; # initialise logging
3589
3590 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3591 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3592 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3593 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3594
3595 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3596
3303 # we must not ever block the main coroutine 3597 # we must not ever block the main coroutine
3304 local $Coro::idle = sub { 3598 local $Coro::idle = sub {
3305 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3599 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3306 (async { 3600 (async {
3307 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3601 $Coro::current->{desc} = "IDLE BUG HANDLER";
3308 Event::one_event; 3602 EV::loop EV::LOOP_ONESHOT;
3309 })->prio (Coro::PRIO_MAX); 3603 })->prio (Coro::PRIO_MAX);
3310 }; 3604 };
3311 3605
3606 evthread_start IO::AIO::poll_fileno;
3607
3608 cf::sync_job {
3609 cf::init_experience;
3610 cf::init_anim;
3611 cf::init_attackmess;
3612 cf::init_dynamic;
3613
3614 cf::load_settings;
3615 cf::load_materials;
3616
3617 reload_resources;
3312 reload_config; 3618 reload_config;
3313 db_init; 3619 db_init;
3620
3621 cf::init_uuid;
3622 cf::init_signals;
3623 cf::init_skills;
3624
3625 cf::init_beforeplay;
3626
3627 atomic;
3628
3314 load_extensions; 3629 load_extensions;
3315 3630
3316 $TICK_WATCHER->start; 3631 utime time, time, $RUNTIMEFILE;
3317 Event::loop; 3632
3633 # no (long-running) fork's whatsoever before this point(!)
3634 use POSIX ();
3635 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3636
3637 (pop @POST_INIT)->(0) while @POST_INIT;
3638 };
3639
3640 cf::object::thawer::errors_are_fatal 0;
3641 info "parse errors in files are no longer fatal from this point on.\n";
3642
3643 main_loop;
3318} 3644}
3319 3645
3320############################################################################# 3646#############################################################################
3321# initialisation and cleanup 3647# initialisation and cleanup
3322 3648
3323# install some emergency cleanup handlers 3649# install some emergency cleanup handlers
3324BEGIN { 3650BEGIN {
3651 our %SIGWATCHER = ();
3325 for my $signal (qw(INT HUP TERM)) { 3652 for my $signal (qw(INT HUP TERM)) {
3326 Event->signal ( 3653 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3327 reentrant => 0,
3328 data => WF_AUTOCANCEL,
3329 signal => $signal,
3330 prio => 0,
3331 cb => sub {
3332 cf::cleanup "SIG$signal"; 3654 cf::cleanup "SIG$signal";
3333 },
3334 ); 3655 };
3335 } 3656 }
3336} 3657}
3337 3658
3338sub write_runtime { 3659sub write_runtime_sync {
3339 my $runtime = "$LOCALDIR/runtime"; 3660 my $t0 = AE::time;
3340 3661
3341 # first touch the runtime file to show we are still running: 3662 # first touch the runtime file to show we are still running:
3342 # the fsync below can take a very very long time. 3663 # the fsync below can take a very very long time.
3343 3664
3344 IO::AIO::aio_utime $runtime, undef, undef; 3665 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3345 3666
3346 my $guard = cf::lock_acquire "write_runtime"; 3667 my $guard = cf::lock_acquire "write_runtime";
3347 3668
3348 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3669 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3349 or return; 3670 or return;
3350 3671
3351 my $value = $cf::RUNTIME + 90 + 10; 3672 my $value = $cf::RUNTIME + 90 + 10;
3352 # 10 is the runtime save interval, for a monotonic clock 3673 # 10 is the runtime save interval, for a monotonic clock
3353 # 60 allows for the watchdog to kill the server. 3674 # 60 allows for the watchdog to kill the server.
3363 aio_utime $fh, undef, undef; 3684 aio_utime $fh, undef, undef;
3364 3685
3365 close $fh 3686 close $fh
3366 or return; 3687 or return;
3367 3688
3368 aio_rename "$runtime~", $runtime 3689 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3369 and return; 3690 and return;
3370 3691
3371 warn "runtime file written.\n"; 3692 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3372 3693
3373 1 3694 1
3695}
3696
3697our $uuid_lock;
3698our $uuid_skip;
3699
3700sub write_uuid_sync($) {
3701 $uuid_skip ||= $_[0];
3702
3703 return if $uuid_lock;
3704 local $uuid_lock = 1;
3705
3706 my $uuid = "$LOCALDIR/uuid";
3707
3708 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3709 or return;
3710
3711 my $value = uuid_seq uuid_cur;
3712
3713 unless ($value) {
3714 info "cowardly refusing to write zero uuid value!\n";
3715 return;
3716 }
3717
3718 my $value = uuid_str $value + $uuid_skip;
3719 $uuid_skip = 0;
3720
3721 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3722 and return;
3723
3724 # always fsync - this file is important
3725 aio_fsync $fh
3726 and return;
3727
3728 close $fh
3729 or return;
3730
3731 aio_rename "$uuid~", $uuid
3732 and return;
3733
3734 trace "uuid file written ($value).\n";
3735
3736 1
3737
3738}
3739
3740sub write_uuid($$) {
3741 my ($skip, $sync) = @_;
3742
3743 $sync ? write_uuid_sync $skip
3744 : async { write_uuid_sync $skip };
3374} 3745}
3375 3746
3376sub emergency_save() { 3747sub emergency_save() {
3377 my $freeze_guard = cf::freeze_mainloop; 3748 my $freeze_guard = cf::freeze_mainloop;
3378 3749
3379 warn "enter emergency perl save\n"; 3750 info "emergency_perl_save: enter\n";
3380 3751
3381 cf::sync_job { 3752 cf::sync_job {
3753 # this is a trade-off: we want to be very quick here, so
3754 # save all maps without fsync, and later call a global sync
3755 # (which in turn might be very very slow)
3756 local $USE_FSYNC = 0;
3757
3382 # use a peculiar iteration method to avoid tripping on perl 3758 # use a peculiar iteration method to avoid tripping on perl
3383 # refcount bugs in for. also avoids problems with players 3759 # refcount bugs in for. also avoids problems with players
3384 # and maps saved/destroyed asynchronously. 3760 # and maps saved/destroyed asynchronously.
3385 warn "begin emergency player save\n"; 3761 info "emergency_perl_save: begin player save\n";
3386 for my $login (keys %cf::PLAYER) { 3762 for my $login (keys %cf::PLAYER) {
3387 my $pl = $cf::PLAYER{$login} or next; 3763 my $pl = $cf::PLAYER{$login} or next;
3388 $pl->valid or next; 3764 $pl->valid or next;
3389 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3765 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3390 $pl->save; 3766 $pl->save;
3391 } 3767 }
3392 warn "end emergency player save\n"; 3768 info "emergency_perl_save: end player save\n";
3393 3769
3394 warn "begin emergency map save\n"; 3770 info "emergency_perl_save: begin map save\n";
3395 for my $path (keys %cf::MAP) { 3771 for my $path (keys %cf::MAP) {
3396 my $map = $cf::MAP{$path} or next; 3772 my $map = $cf::MAP{$path} or next;
3397 $map->valid or next; 3773 $map->valid or next;
3398 $map->save; 3774 $map->save;
3399 } 3775 }
3400 warn "end emergency map save\n"; 3776 info "emergency_perl_save: end map save\n";
3401 3777
3402 warn "begin emergency database checkpoint\n"; 3778 info "emergency_perl_save: begin database checkpoint\n";
3403 BDB::db_env_txn_checkpoint $DB_ENV; 3779 BDB::db_env_txn_checkpoint $DB_ENV;
3404 warn "end emergency database checkpoint\n"; 3780 info "emergency_perl_save: end database checkpoint\n";
3781
3782 info "emergency_perl_save: begin write uuid\n";
3783 write_uuid_sync 1;
3784 info "emergency_perl_save: end write uuid\n";
3405 }; 3785 };
3406 3786
3407 warn "leave emergency perl save\n"; 3787 info "emergency_perl_save: starting sync()\n";
3788 IO::AIO::aio_sync sub {
3789 info "emergency_perl_save: finished sync()\n";
3790 };
3791
3792 info "emergency_perl_save: leave\n";
3408} 3793}
3409 3794
3410sub post_cleanup { 3795sub post_cleanup {
3411 my ($make_core) = @_; 3796 my ($make_core) = @_;
3412 3797
3413 warn Carp::longmess "post_cleanup backtrace" 3798 error Carp::longmess "post_cleanup backtrace"
3414 if $make_core; 3799 if $make_core;
3800
3801 my $fh = pidfile;
3802 unlink $PIDFILE if <$fh> == $$;
3803}
3804
3805# a safer delete_package, copied from Symbol
3806sub clear_package($) {
3807 my $pkg = shift;
3808
3809 # expand to full symbol table name if needed
3810 unless ($pkg =~ /^main::.*::$/) {
3811 $pkg = "main$pkg" if $pkg =~ /^::/;
3812 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3813 $pkg .= '::' unless $pkg =~ /::$/;
3814 }
3815
3816 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3817 my $stem_symtab = *{$stem}{HASH};
3818
3819 defined $stem_symtab and exists $stem_symtab->{$leaf}
3820 or return;
3821
3822 # clear all symbols
3823 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3824 for my $name (keys %$leaf_symtab) {
3825 _gv_clear *{"$pkg$name"};
3826# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3827 }
3415} 3828}
3416 3829
3417sub do_reload_perl() { 3830sub do_reload_perl() {
3418 # can/must only be called in main 3831 # can/must only be called in main
3419 if ($Coro::current != $Coro::main) { 3832 if (in_main) {
3420 warn "can only reload from main coroutine"; 3833 error "can only reload from main coroutine";
3421 return; 3834 return;
3422 } 3835 }
3423 3836
3837 return if $RELOAD++;
3838
3839 my $t1 = AE::time;
3840
3841 while ($RELOAD) {
3424 warn "reloading..."; 3842 info "reloading...";
3425 3843
3426 warn "entering sync_job"; 3844 trace "entering sync_job";
3427 3845
3428 cf::sync_job { 3846 cf::sync_job {
3429 cf::write_runtime; # external watchdog should not bark 3847 cf::write_runtime_sync; # external watchdog should not bark
3430 cf::emergency_save; 3848 cf::emergency_save;
3431 cf::write_runtime; # external watchdog should not bark 3849 cf::write_runtime_sync; # external watchdog should not bark
3432 3850
3433 warn "syncing database to disk"; 3851 trace "syncing database to disk";
3434 BDB::db_env_txn_checkpoint $DB_ENV; 3852 BDB::db_env_txn_checkpoint $DB_ENV;
3435 3853
3436 # if anything goes wrong in here, we should simply crash as we already saved 3854 # if anything goes wrong in here, we should simply crash as we already saved
3437 3855
3438 warn "cancelling all WF_AUTOCANCEL watchers";
3439 for (Event::all_watchers) {
3440 $_->cancel if $_->data & WF_AUTOCANCEL;
3441 }
3442
3443 warn "flushing outstanding aio requests"; 3856 trace "flushing outstanding aio requests";
3444 for (;;) {
3445 BDB::flush;
3446 IO::AIO::flush;
3447 Coro::cede_notself;
3448 last unless IO::AIO::nreqs || BDB::nreqs; 3857 while (IO::AIO::nreqs || BDB::nreqs) {
3449 warn "iterate..."; 3858 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3450 }
3451
3452 ++$RELOAD;
3453
3454 warn "cancelling all extension coros";
3455 $_->cancel for values %EXT_CORO;
3456 %EXT_CORO = ();
3457
3458 warn "removing commands";
3459 %COMMAND = ();
3460
3461 warn "removing ext/exti commands";
3462 %EXTCMD = ();
3463 %EXTICMD = ();
3464
3465 warn "unloading/nuking all extensions";
3466 for my $pkg (@EXTS) {
3467 warn "... unloading $pkg";
3468
3469 if (my $cb = $pkg->can ("unload")) {
3470 eval {
3471 $cb->($pkg);
3472 1
3473 } or warn "$pkg unloaded, but with errors: $@";
3474 } 3859 }
3475 3860
3476 warn "... nuking $pkg"; 3861 trace "cancelling all extension coros";
3477 Symbol::delete_package $pkg; 3862 $_->cancel for values %EXT_CORO;
3478 } 3863 %EXT_CORO = ();
3479 3864
3480 warn "unloading all perl modules loaded from $LIBDIR"; 3865 trace "removing commands";
3481 while (my ($k, $v) = each %INC) { 3866 %COMMAND = ();
3482 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3483 3867
3868 trace "removing ext/exti commands";
3869 %EXTCMD = ();
3870 %EXTICMD = ();
3871
3872 trace "unloading/nuking all extensions";
3873 for my $pkg (@EXTS) {
3484 warn "... unloading $k"; 3874 trace "... unloading $pkg";
3485 delete $INC{$k};
3486 3875
3487 $k =~ s/\.pm$//;
3488 $k =~ s/\//::/g;
3489
3490 if (my $cb = $k->can ("unload_module")) { 3876 if (my $cb = $pkg->can ("unload")) {
3877 eval {
3491 $cb->(); 3878 $cb->($pkg);
3879 1
3880 } or error "$pkg unloaded, but with errors: $@";
3881 }
3882
3883 trace "... clearing $pkg";
3884 clear_package $pkg;
3492 } 3885 }
3493 3886
3494 Symbol::delete_package $k; 3887 trace "unloading all perl modules loaded from $LIBDIR";
3888 while (my ($k, $v) = each %INC) {
3889 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3890
3891 trace "... unloading $k";
3892 delete $INC{$k};
3893
3894 $k =~ s/\.pm$//;
3895 $k =~ s/\//::/g;
3896
3897 if (my $cb = $k->can ("unload_module")) {
3898 $cb->();
3899 }
3900
3901 clear_package $k;
3495 } 3902 }
3496 3903
3497 warn "getting rid of safe::, as good as possible"; 3904 trace "getting rid of safe::, as good as possible";
3498 Symbol::delete_package "safe::$_" 3905 clear_package "safe::$_"
3499 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3906 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3500 3907
3501 warn "unloading cf.pm \"a bit\""; 3908 trace "unloading cf.pm \"a bit\"";
3502 delete $INC{"cf.pm"}; 3909 delete $INC{"cf.pm"};
3503 delete $INC{"cf/pod.pm"}; 3910 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3504 3911
3505 # don't, removes xs symbols, too, 3912 # don't, removes xs symbols, too,
3506 # and global variables created in xs 3913 # and global variables created in xs
3507 #Symbol::delete_package __PACKAGE__; 3914 #clear_package __PACKAGE__;
3508 3915
3509 warn "unload completed, starting to reload now"; 3916 info "unload completed, starting to reload now";
3510 3917
3511 warn "reloading cf.pm"; 3918 trace "reloading cf.pm";
3512 require cf; 3919 require cf;
3513 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3920 cf::_connect_to_perl_1;
3514 3921
3515 warn "loading config and database again"; 3922 trace "loading config and database again";
3516 cf::reload_config; 3923 cf::reload_config;
3517 3924
3518 warn "loading extensions"; 3925 trace "loading extensions";
3519 cf::load_extensions; 3926 cf::load_extensions;
3520 3927
3928 if ($REATTACH_ON_RELOAD) {
3521 warn "reattaching attachments to objects/players"; 3929 trace "reattaching attachments to objects/players";
3522 _global_reattach; # objects, sockets 3930 _global_reattach; # objects, sockets
3523 warn "reattaching attachments to maps"; 3931 trace "reattaching attachments to maps";
3524 reattach $_ for values %MAP; 3932 reattach $_ for values %MAP;
3525 warn "reattaching attachments to players"; 3933 trace "reattaching attachments to players";
3526 reattach $_ for values %PLAYER; 3934 reattach $_ for values %PLAYER;
3935 }
3527 3936
3937 trace "running post_init jobs";
3938 (pop @POST_INIT)->(1) while @POST_INIT;
3939
3528 warn "leaving sync_job"; 3940 trace "leaving sync_job";
3529 3941
3530 1 3942 1
3531 } or do { 3943 } or do {
3532 warn $@; 3944 error $@;
3533 warn "error while reloading, exiting."; 3945 cf::cleanup "error while reloading, exiting.";
3534 exit 1; 3946 };
3947
3948 info "reloaded";
3949 --$RELOAD;
3535 }; 3950 }
3536 3951
3537 warn "reloaded"; 3952 $t1 = AE::time - $t1;
3953 info "reload completed in ${t1}s\n";
3538}; 3954};
3539 3955
3540our $RELOAD_WATCHER; # used only during reload 3956our $RELOAD_WATCHER; # used only during reload
3541 3957
3542sub reload_perl() { 3958sub reload_perl() {
3543 # doing reload synchronously and two reloads happen back-to-back, 3959 # doing reload synchronously and two reloads happen back-to-back,
3544 # coro crashes during coro_state_free->destroy here. 3960 # coro crashes during coro_state_free->destroy here.
3545 3961
3546 $RELOAD_WATCHER ||= Event->timer ( 3962 $RELOAD_WATCHER ||= cf::async {
3547 reentrant => 0, 3963 Coro::AIO::aio_wait cache_extensions;
3548 after => 0, 3964
3549 data => WF_AUTOCANCEL, 3965 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3550 cb => sub {
3551 do_reload_perl; 3966 do_reload_perl;
3552 undef $RELOAD_WATCHER; 3967 undef $RELOAD_WATCHER;
3553 }, 3968 };
3554 ); 3969 };
3555} 3970}
3556 3971
3557register_command "reload" => sub { 3972register_command "reload" => sub {
3558 my ($who, $arg) = @_; 3973 my ($who, $arg) = @_;
3559 3974
3572 3987
3573our @WAIT_FOR_TICK; 3988our @WAIT_FOR_TICK;
3574our @WAIT_FOR_TICK_BEGIN; 3989our @WAIT_FOR_TICK_BEGIN;
3575 3990
3576sub wait_for_tick { 3991sub wait_for_tick {
3577 return unless $TICK_WATCHER->is_active;
3578 return if $Coro::current == $Coro::main; 3992 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3579 3993
3580 my $signal = new Coro::Signal; 3994 my $signal = new Coro::Signal;
3581 push @WAIT_FOR_TICK, $signal; 3995 push @WAIT_FOR_TICK, $signal;
3582 $signal->wait; 3996 $signal->wait;
3583} 3997}
3584 3998
3585sub wait_for_tick_begin { 3999sub wait_for_tick_begin {
3586 return unless $TICK_WATCHER->is_active;
3587 return if $Coro::current == $Coro::main; 4000 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3588 4001
3589 my $signal = new Coro::Signal; 4002 my $signal = new Coro::Signal;
3590 push @WAIT_FOR_TICK_BEGIN, $signal; 4003 push @WAIT_FOR_TICK_BEGIN, $signal;
3591 $signal->wait; 4004 $signal->wait;
3592} 4005}
3593 4006
3594$TICK_WATCHER = Event->timer ( 4007sub tick {
3595 reentrant => 0,
3596 parked => 1,
3597 prio => 0,
3598 at => $NEXT_TICK || $TICK,
3599 data => WF_AUTOCANCEL,
3600 cb => sub {
3601 if ($Coro::current != $Coro::main) { 4008 if ($Coro::current != $Coro::main) {
3602 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4009 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3603 unless ++$bug_warning > 10; 4010 unless ++$bug_warning > 10;
3604 return; 4011 return;
3605 } 4012 }
3606 4013
3607 $NOW = $tick_start = Event::time;
3608
3609 cf::server_tick; # one server iteration 4014 cf::server_tick; # one server iteration
3610 4015
3611 $RUNTIME += $TICK; 4016 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3612 $NEXT_TICK += $TICK;
3613 4017
3614 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4018 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3615 $NEXT_RUNTIME_WRITE = $NOW + 10; 4019 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3616 Coro::async_pool { 4020 Coro::async_pool {
3617 $Coro::current->{desc} = "runtime saver"; 4021 $Coro::current->{desc} = "runtime saver";
3618 write_runtime 4022 write_runtime_sync
3619 or warn "ERROR: unable to write runtime file: $!"; 4023 or error "ERROR: unable to write runtime file: $!";
3620 };
3621 } 4024 };
4025 }
3622 4026
3623 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4027 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3624 $sig->send; 4028 $sig->send;
3625 } 4029 }
3626 while (my $sig = shift @WAIT_FOR_TICK) { 4030 while (my $sig = shift @WAIT_FOR_TICK) {
3627 $sig->send; 4031 $sig->send;
3628 } 4032 }
3629 4033
3630 $NOW = Event::time; 4034 $LOAD = ($NOW - $TICK_START) / $TICK;
3631
3632 # if we are delayed by four ticks or more, skip them all
3633 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3634
3635 $TICK_WATCHER->at ($NEXT_TICK);
3636 $TICK_WATCHER->start;
3637
3638 $LOAD = ($NOW - $tick_start) / $TICK;
3639 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4035 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3640 4036
3641 _post_tick; 4037 if (0) {
4038 if ($NEXT_TICK) {
4039 my $jitter = $TICK_START - $NEXT_TICK;
4040 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4041 debug "jitter $JITTER\n";#d#
4042 }
3642 }, 4043 }
3643); 4044}
3644 4045
3645{ 4046{
4047 # configure BDB
4048
3646 BDB::min_parallel 8; 4049 BDB::min_parallel 16;
3647 BDB::max_poll_time $TICK * 0.1; 4050 BDB::max_poll_reqs $TICK * 0.1;
3648 $BDB_POLL_WATCHER = Event->io ( 4051 $AnyEvent::BDB::WATCHER->priority (1);
3649 reentrant => 0,
3650 fd => BDB::poll_fileno,
3651 poll => 'r',
3652 prio => 0,
3653 data => WF_AUTOCANCEL,
3654 cb => \&BDB::poll_cb,
3655 );
3656
3657 BDB::set_sync_prepare {
3658 my $status;
3659 my $current = $Coro::current;
3660 (
3661 sub {
3662 $status = $!;
3663 $current->ready; undef $current;
3664 },
3665 sub {
3666 Coro::schedule while defined $current;
3667 $! = $status;
3668 },
3669 )
3670 };
3671 4052
3672 unless ($DB_ENV) { 4053 unless ($DB_ENV) {
3673 $DB_ENV = BDB::db_env_create; 4054 $DB_ENV = BDB::db_env_create;
3674 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4055 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3675 | BDB::LOG_AUTOREMOVE, 1); 4056 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4057 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3676 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4058 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3677 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4059 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3678 4060
3679 cf::sync_job { 4061 cf::sync_job {
3680 eval { 4062 eval {
3690 4072
3691 cf::cleanup "db_env_open(db): $@" if $@; 4073 cf::cleanup "db_env_open(db): $@" if $@;
3692 }; 4074 };
3693 } 4075 }
3694 4076
3695 $BDB_DEADLOCK_WATCHER = Event->timer ( 4077 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3696 after => 3,
3697 interval => 1,
3698 hard => 1,
3699 prio => 0,
3700 data => WF_AUTOCANCEL,
3701 cb => sub {
3702 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 4078 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3703 },
3704 ); 4079 };
3705 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4080 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3706 after => 11,
3707 interval => 60,
3708 hard => 1,
3709 prio => 0,
3710 data => WF_AUTOCANCEL,
3711 cb => sub {
3712 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4081 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3713 },
3714 ); 4082 };
3715 $BDB_TRICKLE_WATCHER = Event->timer ( 4083 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3716 after => 5,
3717 interval => 10,
3718 hard => 1,
3719 prio => 0,
3720 data => WF_AUTOCANCEL,
3721 cb => sub {
3722 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4084 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3723 },
3724 ); 4085 };
3725} 4086}
3726 4087
3727{ 4088{
4089 # configure IO::AIO
4090
3728 IO::AIO::min_parallel 8; 4091 IO::AIO::min_parallel 8;
3729
3730 undef $Coro::AIO::WATCHER;
3731 IO::AIO::max_poll_time $TICK * 0.1; 4092 IO::AIO::max_poll_time $TICK * 0.1;
3732 $AIO_POLL_WATCHER = Event->io ( 4093 undef $AnyEvent::AIO::WATCHER;
3733 reentrant => 0,
3734 data => WF_AUTOCANCEL,
3735 fd => IO::AIO::poll_fileno,
3736 poll => 'r',
3737 prio => 0,
3738 cb => \&IO::AIO::poll_cb,
3739 );
3740} 4094}
3741 4095
3742my $_log_backtrace; 4096my $_log_backtrace;
3743 4097
3744sub _log_backtrace { 4098sub _log_backtrace {
3747 $msg =~ s/\n//; 4101 $msg =~ s/\n//;
3748 4102
3749 # limit the # of concurrent backtraces 4103 # limit the # of concurrent backtraces
3750 if ($_log_backtrace < 2) { 4104 if ($_log_backtrace < 2) {
3751 ++$_log_backtrace; 4105 ++$_log_backtrace;
4106 my $perl_bt = Carp::longmess $msg;
3752 async { 4107 async {
3753 $Coro::current->{desc} = "abt $msg"; 4108 $Coro::current->{desc} = "abt $msg";
3754 4109
3755 my @bt = fork_call { 4110 my @bt = fork_call {
3756 @addr = map { sprintf "%x", $_ } @addr; 4111 @addr = map { sprintf "%x", $_ } @addr;
3767 } 4122 }
3768 4123
3769 @funcs 4124 @funcs
3770 }; 4125 };
3771 4126
3772 LOG llevInfo, "[ABT] $msg\n"; 4127 LOG llevInfo, "[ABT] $perl_bt\n";
4128 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3773 LOG llevInfo, "[ABT] $_\n" for @bt; 4129 LOG llevInfo, "[ABT] $_\n" for @bt;
3774 --$_log_backtrace; 4130 --$_log_backtrace;
3775 }; 4131 };
3776 } else { 4132 } else {
3777 LOG llevInfo, "[ABT] $msg\n"; 4133 LOG llevInfo, "[ABT] $msg\n";
3778 LOG llevInfo, "[ABT] [suppressed]\n"; 4134 LOG llevInfo, "[ABT] [suppressed]\n";
3779 } 4135 }
3780} 4136}
3781 4137
3782# load additional modules 4138# load additional modules
3783use cf::pod; 4139require "cf/$_.pm" for @EXTRA_MODULES;
4140cf::_connect_to_perl_2;
3784 4141
3785END { cf::emergency_save } 4142END { cf::emergency_save }
3786 4143
37871 41441
3788 4145

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines