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.398 by root, Wed Dec 5 11:08:34 2007 UTC vs.
Revision 1.548 by root, Mon May 10 21:40:22 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
3use utf8; 25use common::sense;
4use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use EV; 30use EV;
10use Opcode; 31use Opcode;
11use Safe; 32use Safe;
12use Safe::Hole; 33use Safe::Hole;
13use Storable (); 34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 4.1 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
18use Coro::EV; 41use Coro::EV;
42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
24use Coro::Util (); 51use Coro::Util ();
25 52
26use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
27use BDB (); 54use BDB ();
28use Data::Dumper; 55use Data::Dumper;
29use Digest::MD5;
30use Fcntl; 56use Fcntl;
31use YAML::Syck (); 57use YAML::XS ();
32use IO::AIO 2.51 (); 58use IO::AIO ();
33use Time::HiRes; 59use Time::HiRes;
34use Compress::LZF; 60use Compress::LZF;
35use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
36 64
37# configure various modules to our taste 65# configure various modules to our taste
38# 66#
39$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42 75
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 76# strictly for debugging
44$YAML::Syck::ImplicitUnicode = 1; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45
46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
47 78
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
49 82
50our %COMMAND = (); 83our %COMMAND = ();
51our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
52 85
53our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
54our %EXTCMD = (); 87our %EXTCMD = ();
55our %EXTICMD = (); 88our %EXTICMD = ();
56our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
57our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
58 91
59our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
60our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
61 96
62our $CONFDIR = confdir; 97our $CONFDIR = confdir;
63our $DATADIR = datadir; 98our $DATADIR = datadir;
64our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
65our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
66our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
67our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE; # 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;
73 118
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER;
76our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 121our $NEXT_TICK;
79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
81 123
82our $BDB_POLL_WATCHER;
83our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
84our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
85our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
86our $DB_ENV; 127our $DB_ENV;
87 128
129our @EXTRA_MODULES = qw(pod match mapscript incloader);
130
88our %CFG; 131our %CFG;
89 132
90our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
91our $RUNTIME; 134our $RUNTIME;
135our $NOW;
92 136
93our (%PLAYER, %PLAYER_LOADING); # all users 137our (%PLAYER, %PLAYER_LOADING); # all users
94our (%MAP, %MAP_LOADING ); # all maps 138our (%MAP, %MAP_LOADING ); # all maps
95our $LINK_MAP; # the special {link} map, which is always available 139our $LINK_MAP; # the special {link} map, which is always available
96 140
97# 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 ∕
98our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 142our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
99 143
100our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
101our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
146our $JITTER; # average jitter
102our $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 :)
103 153
104binmode STDOUT; 154binmode STDOUT;
105binmode STDERR; 155binmode STDERR;
106 156
107# read virtual server time, if available 157# read virtual server time, if available
108unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
109 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
110 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
111 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
112} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
113 165
114mkdir $_ 166mkdir $_
115 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
116 168
117our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
118 170
119sub 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::"} };
120 187
121############################################################################# 188#############################################################################
122 189
123=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
124 191
166from wherever your confdir points to. 233from wherever your confdir points to.
167 234
168=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
169 236
170These 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
171returns 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 thread
172per 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.
173 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
174=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
175 247
176This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
177C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 249C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
178that call. 250that call.
179 251
252=item %cf::REFLECT
253
254Contains, for each (C++) class name, a hash reference with information
255about object members (methods, scalars, arrays and flags) and other
256metadata, which is useful for introspection.
257
180=back 258=back
181 259
182=cut 260=cut
183 261
184BEGIN { 262sub error(@) { LOG llevError, join "", @_ }
185 *CORE::GLOBAL::warn = sub { 263sub warn (@) { LOG llevWarn , join "", @_ }
264sub info (@) { LOG llevInfo , join "", @_ }
265sub debug(@) { LOG llevDebug, join "", @_ }
266sub trace(@) { LOG llevTrace, join "", @_ }
267
268$Coro::State::WARNHOOK = sub {
186 my $msg = join "", @_; 269 my $msg = join "", @_;
187 270
188 $msg .= "\n" 271 $msg .= "\n"
189 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
190 273
191 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 274 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
192 275
193 LOG llevError, $msg; 276 LOG llevWarn, $msg;
194 }; 277};
195} 278
279$Coro::State::DIEHOOK = sub {
280 return unless $^S eq 0; # "eq", not "=="
281
282 error Carp::longmess $_[0];
283
284 if (in_main) {#d#
285 error "DIEHOOK called in main context, Coro bug?\n";#d#
286 return;#d#
287 }#d#
288
289 # kill coroutine otherwise
290 Coro::terminate
291};
196 292
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 296@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
207for my $pkg (qw( 303for my $pkg (qw(
208 cf::global cf::attachable 304 cf::global cf::attachable
209 cf::object cf::object::player 305 cf::object cf::object::player
210 cf::client cf::player 306 cf::client cf::player
211 cf::arch cf::living 307 cf::arch cf::living
308 cf::map cf::mapspace
212 cf::map cf::party cf::region 309 cf::party cf::region
213)) { 310)) {
214 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 312}
217 313
218$EV::DIED = sub { 314$EV::DIED = sub {
219 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
220}; 316};
221 317
222############################################################################# 318#############################################################################
223 319
224=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 357our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 358
263sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
264sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
265 361
362=item $ref = cf::yaml_load $scalar
363
364Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365
366=cut
367
368sub fork_call(&@);
369
370sub yaml_load($) {
371 fork_call { YAML::XS::Load $_[0] } @_
372}
373
374=item cf::post_init { BLOCK }
375
376Execute the given codeblock, I<after> all extensions have been (re-)loaded,
377but I<before> the server starts ticking again.
378
379The codeblock will have a single boolean argument to indicate whether this
380is a reload or not.
381
382=cut
383
384sub post_init(&) {
385 push @POST_INIT, shift;
386}
387
266=item cf::lock_wait $string 388=item cf::lock_wait $string
267 389
268Wait until the given lock is available. See cf::lock_acquire. 390Wait until the given lock is available. See cf::lock_acquire.
269 391
270=item my $lock = cf::lock_acquire $string 392=item my $lock = cf::lock_acquire $string
271 393
272Wait until the given lock is available and then acquires it and returns 394Wait until the given lock is available and then acquires it and returns
273a Coro::guard object. If the guard object gets destroyed (goes out of scope, 395a L<Guard> object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 396for example when the coroutine gets canceled), the lock is automatically
275returned. 397returned.
276 398
277Locks are *not* recursive, locking from the same coro twice results in a 399Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro. 400deadlocked coro.
284 406
285Return true if the lock is currently active, i.e. somebody has locked it. 407Return true if the lock is currently active, i.e. somebody has locked it.
286 408
287=cut 409=cut
288 410
289our %LOCK; 411our $LOCKS = new Coro::SemaphoreSet;
290our %LOCKER;#d#
291 412
292sub lock_wait($) { 413sub lock_wait($) {
293 my ($key) = @_; 414 $LOCKS->wait ($_[0]);
294
295 if ($LOCKER{$key} == $Coro::current) {#d#
296 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
297 return;#d#
298 }#d#
299
300 # wait for lock, if any
301 while ($LOCK{$key}) {
302 push @{ $LOCK{$key} }, $Coro::current;
303 Coro::schedule;
304 }
305} 415}
306 416
307sub lock_acquire($) { 417sub lock_acquire($) {
308 my ($key) = @_; 418 $LOCKS->guard ($_[0])
309
310 # wait, to be sure we are not locked
311 lock_wait $key;
312
313 $LOCK{$key} = [];
314 $LOCKER{$key} = $Coro::current;#d#
315
316 Coro::guard {
317 delete $LOCKER{$key};#d#
318 # wake up all waiters, to be on the safe side
319 $_->ready for @{ delete $LOCK{$key} };
320 }
321} 419}
322 420
323sub lock_active($) { 421sub lock_active($) {
324 my ($key) = @_; 422 $LOCKS->count ($_[0]) < 1
325
326 ! ! $LOCK{$key}
327} 423}
328 424
329sub freeze_mainloop { 425sub freeze_mainloop {
330 return unless $TICK_WATCHER->is_active; 426 tick_inhibit_inc;
331 427
332 my $guard = Coro::guard { 428 &Guard::guard (\&tick_inhibit_dec);
333 $TICK_WATCHER->start;
334 };
335 $TICK_WATCHER->stop;
336 $guard
337} 429}
338 430
339=item cf::periodic $interval, $cb 431=item cf::periodic $interval, $cb
340 432
341Like EV::periodic, but randomly selects a starting point so that the actions 433Like EV::periodic, but randomly selects a starting point so that the actions
342get spread over timer. 434get spread over time.
343 435
344=cut 436=cut
345 437
346sub periodic($$) { 438sub periodic($$) {
347 my ($interval, $cb) = @_; 439 my ($interval, $cb) = @_;
364 456
365=cut 457=cut
366 458
367our @SLOT_QUEUE; 459our @SLOT_QUEUE;
368our $SLOT_QUEUE; 460our $SLOT_QUEUE;
461our $SLOT_DECAY = 0.9;
369 462
370$SLOT_QUEUE->cancel if $SLOT_QUEUE; 463$SLOT_QUEUE->cancel if $SLOT_QUEUE;
371$SLOT_QUEUE = Coro::async { 464$SLOT_QUEUE = Coro::async {
372 $Coro::current->desc ("timeslot manager"); 465 $Coro::current->desc ("timeslot manager");
373 466
374 my $signal = new Coro::Signal; 467 my $signal = new Coro::Signal;
468 my $busy;
375 469
376 while () { 470 while () {
377 next_job: 471 next_job:
472
378 my $avail = cf::till_tick; 473 my $avail = cf::till_tick;
379 if ($avail > 0.01) { 474
380 for (0 .. $#SLOT_QUEUE) { 475 for (0 .. $#SLOT_QUEUE) {
381 if ($SLOT_QUEUE[$_][0] < $avail) { 476 if ($SLOT_QUEUE[$_][0] <= $avail) {
477 $busy = 0;
382 my $job = splice @SLOT_QUEUE, $_, 1, (); 478 my $job = splice @SLOT_QUEUE, $_, 1, ();
383 $job->[2]->send; 479 $job->[2]->send;
384 Coro::cede; 480 Coro::cede;
385 goto next_job; 481 goto next_job;
386 } 482 } else {
483 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
387 } 484 }
388 } 485 }
389 486
390 if (@SLOT_QUEUE) { 487 if (@SLOT_QUEUE) {
391 # we do not use wait_for_tick() as it returns immediately when tick is inactive 488 # we do not use wait_for_tick() as it returns immediately when tick is inactive
392 push @cf::WAIT_FOR_TICK, $signal; 489 push @cf::WAIT_FOR_TICK, $signal;
393 $signal->wait; 490 $signal->wait;
394 } else { 491 } else {
492 $busy = 0;
395 Coro::schedule; 493 Coro::schedule;
396 } 494 }
397 } 495 }
398}; 496};
399 497
400sub get_slot($;$$) { 498sub get_slot($;$$) {
499 return if tick_inhibit || $Coro::current == $Coro::main;
500
401 my ($time, $pri, $name) = @_; 501 my ($time, $pri, $name) = @_;
402 502
403 $time = $TICK * .6 if $time > $TICK * .6; 503 $time = clamp $time, 0.01, $TICK * .6;
504
404 my $sig = new Coro::Signal; 505 my $sig = new Coro::Signal;
405 506
406 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 507 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
407 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 508 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
408 $SLOT_QUEUE->ready; 509 $SLOT_QUEUE->ready;
434=cut 535=cut
435 536
436sub sync_job(&) { 537sub sync_job(&) {
437 my ($job) = @_; 538 my ($job) = @_;
438 539
439 if ($Coro::current == $Coro::main) { 540 if (in_main) {
440 my $time = EV::time; 541 my $time = AE::time;
441 542
442 # this is the main coro, too bad, we have to block 543 # this is the main coro, too bad, we have to block
443 # till the operation succeeds, freezing the server :/ 544 # till the operation succeeds, freezing the server :/
444 545
445 LOG llevError, Carp::longmess "sync job";#d# 546 #LOG llevError, Carp::longmess "sync job";#d#
446 547
447 # TODO: use suspend/resume instead
448 # (but this is cancel-safe)
449 my $freeze_guard = freeze_mainloop; 548 my $freeze_guard = freeze_mainloop;
450 549
451 my $busy = 1; 550 my $busy = 1;
452 my @res; 551 my @res;
453 552
454 (async { 553 (async {
455 $Coro::current->desc ("sync job coro"); 554 $Coro::current->desc ("sync job coro");
456 @res = eval { $job->() }; 555 @res = eval { $job->() };
457 warn $@ if $@; 556 error $@ if $@;
458 undef $busy; 557 undef $busy;
459 })->prio (Coro::PRIO_MAX); 558 })->prio (Coro::PRIO_MAX);
460 559
461 while ($busy) { 560 while ($busy) {
462 if (Coro::nready) { 561 if (Coro::nready) {
464 } else { 563 } else {
465 EV::loop EV::LOOP_ONESHOT; 564 EV::loop EV::LOOP_ONESHOT;
466 } 565 }
467 } 566 }
468 567
469 $time = EV::time - $time; 568 my $time = AE::time - $time;
470 569
471 LOG llevError | logBacktrace, Carp::longmess "long sync job"
472 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
473
474 $tick_start += $time; # do not account sync jobs to server load 570 $TICK_START += $time; # do not account sync jobs to server load
475 571
476 wantarray ? @res : $res[0] 572 wantarray ? @res : $res[0]
477 } else { 573 } else {
478 # we are in another coroutine, how wonderful, everything just works 574 # we are in another coroutine, how wonderful, everything just works
479 575
499 $EXT_CORO{$coro+0} = $coro; 595 $EXT_CORO{$coro+0} = $coro;
500 596
501 $coro 597 $coro
502} 598}
503 599
504=item fork_call { }, $args 600=item fork_call { }, @args
505 601
506Executes the given code block with the given arguments in a seperate 602Executes the given code block with the given arguments in a seperate
507process, returning the results. Everything must be serialisable with 603process, returning the results. Everything must be serialisable with
508Coro::Storable. May, of course, block. Note that the executed sub may 604Coro::Storable. May, of course, block. Note that the executed sub may
509never block itself or use any form of event handling. 605never block itself or use any form of event handling.
510 606
511=cut 607=cut
512 608
609sub post_fork {
610 reset_signals;
611}
612
513sub fork_call(&@) { 613sub fork_call(&@) {
514 my ($cb, @args) = @_; 614 my ($cb, @args) = @_;
515 615
516 # we seemingly have to make a local copy of the whole thing, 616 # we seemingly have to make a local copy of the whole thing,
517 # otherwise perl prematurely frees the stuff :/ 617 # otherwise perl prematurely frees the stuff :/
518 # TODO: investigate and fix (likely this will be rather laborious) 618 # TODO: investigate and fix (likely this will be rather laborious)
519 619
520 my @res = Coro::Util::fork_eval { 620 my @res = Coro::Util::fork_eval {
521 reset_signals; 621 cf::post_fork;
522 &$cb 622 &$cb
523 }, @args; 623 } @args;
524 624
525 wantarray ? @res : $res[-1] 625 wantarray ? @res : $res[-1]
626}
627
628sub objinfo {
629 (
630 "counter value" => cf::object::object_count,
631 "objects created" => cf::object::create_count,
632 "objects destroyed" => cf::object::destroy_count,
633 "freelist size" => cf::object::free_count,
634 "allocated objects" => cf::object::objects_size,
635 "active objects" => cf::object::actives_size,
636 )
637}
638
639=item $coin = coin_from_name $name
640
641=cut
642
643our %coin_alias = (
644 "silver" => "silvercoin",
645 "silvercoin" => "silvercoin",
646 "silvercoins" => "silvercoin",
647 "gold" => "goldcoin",
648 "goldcoin" => "goldcoin",
649 "goldcoins" => "goldcoin",
650 "platinum" => "platinacoin",
651 "platinumcoin" => "platinacoin",
652 "platinumcoins" => "platinacoin",
653 "platina" => "platinacoin",
654 "platinacoin" => "platinacoin",
655 "platinacoins" => "platinacoin",
656 "royalty" => "royalty",
657 "royalties" => "royalty",
658);
659
660sub coin_from_name($) {
661 $coin_alias{$_[0]}
662 ? cf::arch::find $coin_alias{$_[0]}
663 : undef
526} 664}
527 665
528=item $value = cf::db_get $family => $key 666=item $value = cf::db_get $family => $key
529 667
530Returns a single value from the environment database. 668Returns a single value from the environment database.
540within each server. 678within each server.
541 679
542=cut 680=cut
543 681
544sub db_table($) { 682sub db_table($) {
683 cf::error "db_get called from main context"
684 if $Coro::current == $Coro::main;
685
545 my ($name) = @_; 686 my ($name) = @_;
546 my $db = BDB::db_create $DB_ENV; 687 my $db = BDB::db_create $DB_ENV;
547 688
548 eval { 689 eval {
549 $db->set_flags (BDB::CHKSUM); 690 $db->set_flags (BDB::CHKSUM);
559} 700}
560 701
561our $DB; 702our $DB;
562 703
563sub db_init { 704sub db_init {
564 cf::sync_job {
565 $DB ||= db_table "db"; 705 $DB ||= db_table "db";
566 };
567} 706}
568 707
569sub db_get($$) { 708sub db_get($$) {
570 my $key = "$_[0]/$_[1]"; 709 my $key = "$_[0]/$_[1]";
571 710
572 cf::sync_job { 711 cf::error "db_get called from main context"
712 if $Coro::current == $Coro::main;
713
573 BDB::db_get $DB, undef, $key, my $data; 714 BDB::db_get $DB, undef, $key, my $data;
574 715
575 $! ? () 716 $! ? ()
576 : $data 717 : $data
577 }
578} 718}
579 719
580sub db_put($$$) { 720sub db_put($$$) {
581 BDB::dbreq_pri 4; 721 BDB::dbreq_pri 4;
582 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 722 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
638 778
639 my $t1 = Time::HiRes::time; 779 my $t1 = Time::HiRes::time;
640 my $data = $process->(\@data); 780 my $data = $process->(\@data);
641 my $t2 = Time::HiRes::time; 781 my $t2 = Time::HiRes::time;
642 782
643 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 783 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
644 784
645 db_put cache => "$id/data", $data; 785 db_put cache => "$id/data", $data;
646 db_put cache => "$id/md5" , $md5; 786 db_put cache => "$id/md5" , $md5;
647 db_put cache => "$id/meta", $meta; 787 db_put cache => "$id/meta", $meta;
648 788
658 798
659=cut 799=cut
660 800
661sub datalog($@) { 801sub datalog($@) {
662 my ($type, %kv) = @_; 802 my ($type, %kv) = @_;
663 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 803 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
664} 804}
665 805
666=back 806=back
667 807
668=cut 808=cut
669 809
670############################################################################# 810#############################################################################
671 811
672=head2 ATTACHABLE OBJECTS 812=head2 ATTACHABLE OBJECTS
673 813
674Many objects in crossfire are so-called attachable objects. That means you can 814Many objects in deliantra are so-called attachable objects. That means you can
675attach callbacks/event handlers (a collection of which is called an "attachment") 815attach callbacks/event handlers (a collection of which is called an "attachment")
676to it. All such attachable objects support the following methods. 816to it. All such attachable objects support the following methods.
677 817
678In the following description, CLASS can be any of C<global>, C<object> 818In the following description, CLASS can be any of C<global>, C<object>
679C<player>, C<client> or C<map> (i.e. the attachable objects in 819C<player>, C<client> or C<map> (i.e. the attachable objects in
729=item cf::CLASS::attachment $name, ... 869=item cf::CLASS::attachment $name, ...
730 870
731Register an attachment by C<$name> through which attachable objects of the 871Register an attachment by C<$name> through which attachable objects of the
732given CLASS can refer to this attachment. 872given CLASS can refer to this attachment.
733 873
734Some classes such as crossfire maps and objects can specify attachments 874Some classes such as deliantra maps and objects can specify attachments
735that are attached at load/instantiate time, thus the need for a name. 875that are attached at load/instantiate time, thus the need for a name.
736 876
737These calls expect any number of the following handler/hook descriptions: 877These calls expect any number of the following handler/hook descriptions:
738 878
739=over 4 879=over 4
863 1003
864 } elsif (exists $cb_id{$type}) { 1004 } elsif (exists $cb_id{$type}) {
865 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1005 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
866 1006
867 } elsif (ref $type) { 1007 } elsif (ref $type) {
868 warn "attaching objects not supported, ignoring.\n"; 1008 error "attaching objects not supported, ignoring.\n";
869 1009
870 } else { 1010 } else {
871 shift @arg; 1011 shift @arg;
872 warn "attach argument '$type' not supported, ignoring.\n"; 1012 error "attach argument '$type' not supported, ignoring.\n";
873 } 1013 }
874 } 1014 }
875} 1015}
876 1016
877sub _object_attach { 1017sub _object_attach {
887 _attach $registry, $klass, @attach; 1027 _attach $registry, $klass, @attach;
888 } 1028 }
889 1029
890 $obj->{$name} = \%arg; 1030 $obj->{$name} = \%arg;
891 } else { 1031 } else {
892 warn "object uses attachment '$name' which is not available, postponing.\n"; 1032 info "object uses attachment '$name' which is not available, postponing.\n";
893 } 1033 }
894 1034
895 $obj->{_attachment}{$name} = undef; 1035 $obj->{_attachment}{$name} = undef;
896} 1036}
897 1037
956 1096
957 for (@$callbacks) { 1097 for (@$callbacks) {
958 eval { &{$_->[1]} }; 1098 eval { &{$_->[1]} };
959 1099
960 if ($@) { 1100 if ($@) {
961 warn "$@";
962 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1101 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
963 override; 1102 override;
964 } 1103 }
965 1104
966 return 1 if $override; 1105 return 1 if $override;
967 } 1106 }
968 1107
969 0 1108 0
970} 1109}
971 1110
972=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1111=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
973 1112
974=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1113=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
975 1114
976Generate an object-specific event with the given arguments. 1115Generate an object-specific event with the given arguments.
977 1116
1030 1169
1031sub reattach { 1170sub reattach {
1032 # basically do the same as instantiate, without calling instantiate 1171 # basically do the same as instantiate, without calling instantiate
1033 my ($obj) = @_; 1172 my ($obj) = @_;
1034 1173
1174 # no longer needed after getting rid of delete_package?
1035 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1175 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1036 1176
1037 my $registry = $obj->registry; 1177 my $registry = $obj->registry;
1038 1178
1039 @$registry = (); 1179 @$registry = ();
1040 1180
1045 for (@$attach) { 1185 for (@$attach) {
1046 my ($klass, @attach) = @$_; 1186 my ($klass, @attach) = @$_;
1047 _attach $registry, $klass, @attach; 1187 _attach $registry, $klass, @attach;
1048 } 1188 }
1049 } else { 1189 } else {
1050 warn "object uses attachment '$name' that is not available, postponing.\n"; 1190 info "object uses attachment '$name' that is not available, postponing.\n";
1051 } 1191 }
1052 } 1192 }
1053} 1193}
1054 1194
1055cf::attachable->attach ( 1195cf::attachable->attach (
1082 my ($filename, $rdata, $objs) = @_; 1222 my ($filename, $rdata, $objs) = @_;
1083 1223
1084 sync_job { 1224 sync_job {
1085 if (length $$rdata) { 1225 if (length $$rdata) {
1086 utf8::decode (my $decname = $filename); 1226 utf8::decode (my $decname = $filename);
1087 warn sprintf "saving %s (%d,%d)\n", 1227 trace sprintf "saving %s (%d,%d)\n",
1088 $decname, length $$rdata, scalar @$objs; 1228 $decname, length $$rdata, scalar @$objs
1229 if $VERBOSE_IO;
1089 1230
1090 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1231 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1091 chmod SAVE_MODE, $fh; 1232 aio_chmod $fh, SAVE_MODE;
1092 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1233 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1093 aio_fsync $fh if $cf::USE_FSYNC; 1234 if ($cf::USE_FSYNC) {
1235 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;
1236 aio_fsync $fh;
1237 }
1094 close $fh; 1238 aio_close $fh;
1095 1239
1096 if (@$objs) { 1240 if (@$objs) {
1097 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1241 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1098 chmod SAVE_MODE, $fh; 1242 aio_chmod $fh, SAVE_MODE;
1099 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1243 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1100 aio_write $fh, 0, (length $data), $data, 0; 1244 aio_write $fh, 0, (length $data), $data, 0;
1101 aio_fsync $fh if $cf::USE_FSYNC; 1245 if ($cf::USE_FSYNC) {
1246 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;
1247 aio_fsync $fh;
1248 }
1102 close $fh; 1249 aio_close $fh;
1103 aio_rename "$filename.pst~", "$filename.pst"; 1250 aio_rename "$filename.pst~", "$filename.pst";
1104 } 1251 }
1105 } else { 1252 } else {
1106 aio_unlink "$filename.pst"; 1253 aio_unlink "$filename.pst";
1107 } 1254 }
1108 1255
1109 aio_rename "$filename~", $filename; 1256 aio_rename "$filename~", $filename;
1257
1258 $filename =~ s%/[^/]+$%%;
1259 aio_pathsync $filename if $cf::USE_FSYNC;
1110 } else { 1260 } else {
1111 warn "FATAL: $filename~: $!\n"; 1261 error "unable to save objects: $filename~: $!\n";
1112 } 1262 }
1113 } else { 1263 } else {
1114 aio_unlink $filename; 1264 aio_unlink $filename;
1115 aio_unlink "$filename.pst"; 1265 aio_unlink "$filename.pst";
1116 } 1266 }
1140 my $st = eval { Coro::Storable::thaw $av }; 1290 my $st = eval { Coro::Storable::thaw $av };
1141 $av = $st->{objs}; 1291 $av = $st->{objs};
1142 } 1292 }
1143 1293
1144 utf8::decode (my $decname = $filename); 1294 utf8::decode (my $decname = $filename);
1145 warn sprintf "loading %s (%d,%d)\n", 1295 trace sprintf "loading %s (%d,%d)\n",
1146 $decname, length $data, scalar @{$av || []}; 1296 $decname, length $data, scalar @{$av || []}
1297 if $VERBOSE_IO;
1147 1298
1148 ($data, $av) 1299 ($data, $av)
1149} 1300}
1150 1301
1151=head2 COMMAND CALLBACKS 1302=head2 COMMAND CALLBACKS
1207 my ($name, $cb) = @_; 1358 my ($name, $cb) = @_;
1208 1359
1209 $EXTICMD{$name} = $cb; 1360 $EXTICMD{$name} = $cb;
1210} 1361}
1211 1362
1363use File::Glob ();
1364
1212cf::player->attach ( 1365cf::player->attach (
1213 on_command => sub { 1366 on_unknown_command => sub {
1214 my ($pl, $name, $params) = @_; 1367 my ($pl, $name, $params) = @_;
1215 1368
1216 my $cb = $COMMAND{$name} 1369 my $cb = $COMMAND{$name}
1217 or return; 1370 or return;
1218 1371
1241 1394
1242 $pl->ext_reply ($reply, @reply) 1395 $pl->ext_reply ($reply, @reply)
1243 if $reply; 1396 if $reply;
1244 1397
1245 } else { 1398 } else {
1246 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1399 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1247 } 1400 }
1248 1401
1249 cf::override; 1402 cf::override;
1250 }, 1403 },
1251); 1404);
1252 1405
1406# "readahead" all extensions
1407sub cache_extensions {
1408 my $grp = IO::AIO::aio_group;
1409
1410 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1411 for (grep /\.ext$/, @{$_[0]}) {
1412 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1413 }
1414 };
1415
1416 $grp
1417}
1418
1253sub load_extensions { 1419sub load_extensions {
1420 info "loading extensions...";
1421
1254 cf::sync_job { 1422 cf::sync_job {
1255 my %todo; 1423 my %todo;
1256 1424
1257 for my $path (<$LIBDIR/*.ext>) { 1425 for my $path (<$LIBDIR/*.ext>) {
1258 next unless -r $path; 1426 next unless -r $path;
1276 1444
1277 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1445 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1278 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1446 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1279 1447
1280 $ext{source} = 1448 $ext{source} =
1281 "package $pkg; use strict; use utf8;\n" 1449 "package $pkg; use common::sense;\n"
1282 . "#line 1 \"$path\"\n{\n" 1450 . "#line 1 \"$path\"\n{\n"
1283 . $source 1451 . $source
1284 . "\n};\n1"; 1452 . "\n};\n1";
1285 1453
1286 $todo{$base} = \%ext; 1454 $todo{$base} = \%ext;
1287 } 1455 }
1288 1456
1457 my $pass = 0;
1289 my %done; 1458 my %done;
1290 while (%todo) { 1459 while (%todo) {
1291 my $progress; 1460 my $progress;
1292 1461
1462 ++$pass;
1463
1464 ext:
1293 while (my ($k, $v) = each %todo) { 1465 while (my ($k, $v) = each %todo) {
1294 for (split /,\s*/, $v->{meta}{depends}) { 1466 for (split /,\s*/, $v->{meta}{depends}) {
1295 goto skip 1467 next ext
1296 unless exists $done{$_}; 1468 unless exists $done{$_};
1297 } 1469 }
1298 1470
1299 warn "... loading '$k' into '$v->{pkg}'\n"; 1471 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1300 1472
1301 unless (eval $v->{source}) { 1473 my $active = eval $v->{source};
1474
1475 if (length $@) {
1302 my $msg = $@ ? "$v->{path}: $@\n" 1476 error "$v->{path}: $@\n";
1303 : "$v->{base}: extension inactive.\n";
1304 1477
1478 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1305 if (exists $v->{meta}{mandatory}) { 1479 if exists $v->{meta}{mandatory};
1306 warn $msg; 1480
1307 warn "mandatory extension failed to load, exiting.\n"; 1481 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1308 exit 1; 1482 delete $todo{$k};
1309 } 1483 } else {
1310 1484 $done{$k} = delete $todo{$k};
1311 warn $msg; 1485 push @EXTS, $v->{pkg};
1486 $progress = 1;
1487
1488 info "$v->{base}: extension inactive.\n"
1489 unless $active;
1312 } 1490 }
1313
1314 $done{$k} = delete $todo{$k};
1315 push @EXTS, $v->{pkg};
1316 $progress = 1;
1317 } 1491 }
1318 1492
1319 skip: 1493 unless ($progress) {
1320 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1494 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1321 unless $progress; 1495
1496 while (my ($k, $v) = each %todo) {
1497 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1498 if exists $v->{meta}{mandatory};
1499 }
1500 }
1322 } 1501 }
1323 }; 1502 };
1324} 1503}
1325 1504
1326############################################################################# 1505#############################################################################
1327 1506
1328=back 1507=back
1329 1508
1330=head2 CORE EXTENSIONS 1509=head2 CORE EXTENSIONS
1331 1510
1332Functions and methods that extend core crossfire objects. 1511Functions and methods that extend core deliantra objects.
1333 1512
1334=cut 1513=cut
1335 1514
1336package cf::player; 1515package cf::player;
1337 1516
1380 1559
1381sub exists($) { 1560sub exists($) {
1382 my ($login) = @_; 1561 my ($login) = @_;
1383 1562
1384 $cf::PLAYER{$login} 1563 $cf::PLAYER{$login}
1385 or cf::sync_job { !aio_stat path $login } 1564 or !aio_stat path $login
1386} 1565}
1387 1566
1388sub find($) { 1567sub find($) {
1389 return $cf::PLAYER{$_[0]} || do { 1568 return $cf::PLAYER{$_[0]} || do {
1390 my $login = $_[0]; 1569 my $login = $_[0];
1402 my $f = new_from_file cf::object::thawer path $login 1581 my $f = new_from_file cf::object::thawer path $login
1403 or return; 1582 or return;
1404 1583
1405 my $pl = cf::player::load_pl $f 1584 my $pl = cf::player::load_pl $f
1406 or return; 1585 or return;
1586
1407 local $cf::PLAYER_LOADING{$login} = $pl; 1587 local $cf::PLAYER_LOADING{$login} = $pl;
1408 $f->resolve_delayed_derefs; 1588 $f->resolve_delayed_derefs;
1409 $cf::PLAYER{$login} = $pl 1589 $cf::PLAYER{$login} = $pl
1410 } 1590 }
1411 } 1591 }
1412} 1592}
1413 1593
1594cf::player->attach (
1595 on_load => sub {
1596 my ($pl, $path) = @_;
1597
1598 # restore slots saved in save, below
1599 my $slots = delete $pl->{_slots};
1600
1601 $pl->ob->current_weapon ($slots->[0]);
1602 $pl->combat_ob ($slots->[1]);
1603 $pl->ranged_ob ($slots->[2]);
1604 },
1605);
1606
1414sub save($) { 1607sub save($) {
1415 my ($pl) = @_; 1608 my ($pl) = @_;
1416 1609
1417 return if $pl->{deny_save}; 1610 return if $pl->{deny_save};
1418 1611
1421 1614
1422 return if $pl->{deny_save}; 1615 return if $pl->{deny_save};
1423 1616
1424 aio_mkdir playerdir $pl, 0770; 1617 aio_mkdir playerdir $pl, 0770;
1425 $pl->{last_save} = $cf::RUNTIME; 1618 $pl->{last_save} = $cf::RUNTIME;
1619
1620 cf::get_slot 0.01;
1621
1622 # save slots, to be restored later
1623 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1426 1624
1427 $pl->save_pl ($path); 1625 $pl->save_pl ($path);
1428 cf::cede_to_tick; 1626 cf::cede_to_tick;
1429} 1627}
1430 1628
1462 my ($pl) = @_; 1660 my ($pl) = @_;
1463 1661
1464 my $name = $pl->ob->name; 1662 my $name = $pl->ob->name;
1465 1663
1466 $pl->{deny_save} = 1; 1664 $pl->{deny_save} = 1;
1467 $pl->password ("*"); # this should lock out the player until we nuked the dir 1665 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1468 1666
1469 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1667 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1470 $pl->deactivate; 1668 $pl->deactivate;
1669
1670 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1671 ext::highscore::check ($pl->ob);
1672
1471 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1673 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1472 $pl->ns->destroy if $pl->ns; 1674 $pl->ns->destroy if $pl->ns;
1473 1675
1474 my $path = playerdir $pl; 1676 my $path = playerdir $pl;
1475 my $temp = "$path~$cf::RUNTIME~deleting~"; 1677 my $temp = "$path~$cf::RUNTIME~deleting~";
1514 1716
1515 for my $login (@$dirs) { 1717 for my $login (@$dirs) {
1516 my $path = path $login; 1718 my $path = path $login;
1517 1719
1518 # a .pst is a dead give-away for a valid player 1720 # a .pst is a dead give-away for a valid player
1519 unless (-e "$path.pst") { 1721 # if no pst file found, open and chekc for blocked users
1722 if (aio_stat "$path.pst") {
1520 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1723 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1521 aio_read $fh, 0, 512, my $buf, 0 or next; 1724 aio_read $fh, 0, 512, my $buf, 0 or next;
1522 $buf !~ /^password -------------$/m or next; # official not-valid tag 1725 $buf !~ /^password -------------$/m or next; # official not-valid tag
1523 } 1726 }
1524 1727
1528 1731
1529 \@logins 1732 \@logins
1530} 1733}
1531 1734
1532=item $player->maps 1735=item $player->maps
1736
1737=item cf::player::maps $login
1533 1738
1534Returns an arrayref of map paths that are private for this 1739Returns an arrayref of map paths that are private for this
1535player. May block. 1740player. May block.
1536 1741
1537=cut 1742=cut
1555 } 1760 }
1556 1761
1557 \@paths 1762 \@paths
1558} 1763}
1559 1764
1560=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1765=item $protocol_xml = $player->expand_cfpod ($cfpod)
1561 1766
1562Expand crossfire pod fragments into protocol xml. 1767Expand deliantra pod fragments into protocol xml.
1563
1564=cut
1565
1566use re 'eval';
1567
1568my $group;
1569my $interior; $interior = qr{
1570 # match a pod interior sequence sans C<< >>
1571 (?:
1572 \ (.*?)\ (?{ $group = $^N })
1573 | < (??{$interior}) >
1574 )
1575}x;
1576
1577sub expand_cfpod {
1578 my ($self, $pod) = @_;
1579
1580 my $xml;
1581
1582 while () {
1583 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1584 $group = $1;
1585
1586 $group =~ s/&/&amp;/g;
1587 $group =~ s/</&lt;/g;
1588
1589 $xml .= $group;
1590 } elsif ($pod =~ m%\G
1591 ([BCGHITU])
1592 <
1593 (?:
1594 ([^<>]*) (?{ $group = $^N })
1595 | < $interior >
1596 )
1597 >
1598 %gcsx
1599 ) {
1600 my ($code, $data) = ($1, $group);
1601
1602 if ($code eq "B") {
1603 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1604 } elsif ($code eq "I") {
1605 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1606 } elsif ($code eq "U") {
1607 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1608 } elsif ($code eq "C") {
1609 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1610 } elsif ($code eq "T") {
1611 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1612 } elsif ($code eq "G") {
1613 my ($male, $female) = split /\|/, $data;
1614 $data = $self->gender ? $female : $male;
1615 $xml .= expand_cfpod ($self, $data);
1616 } elsif ($code eq "H") {
1617 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1618 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1619 "")
1620 [$self->{hintmode}];
1621 } else {
1622 $xml .= "error processing '$code($data)' directive";
1623 }
1624 } else {
1625 if ($pod =~ /\G(.+)/) {
1626 warn "parse error while expanding $pod (at $1)";
1627 }
1628 last;
1629 }
1630 }
1631
1632 for ($xml) {
1633 # create single paragraphs (very hackish)
1634 s/(?<=\S)\n(?=\w)/ /g;
1635
1636 # compress some whitespace
1637 s/\s+\n/\n/g; # ws line-ends
1638 s/\n\n+/\n/g; # double lines
1639 s/^\n+//; # beginning lines
1640 s/\n+$//; # ending lines
1641 }
1642
1643 $xml
1644}
1645
1646no re 'eval';
1647
1648sub hintmode {
1649 $_[0]{hintmode} = $_[1] if @_ > 1;
1650 $_[0]{hintmode}
1651}
1652 1768
1653=item $player->ext_reply ($msgid, @msg) 1769=item $player->ext_reply ($msgid, @msg)
1654 1770
1655Sends an ext reply to the player. 1771Sends an ext reply to the player.
1656 1772
1688 1804
1689=cut 1805=cut
1690 1806
1691sub find_by_path($) { 1807sub find_by_path($) {
1692 my ($path) = @_; 1808 my ($path) = @_;
1809
1810 $path =~ s/^~[^\/]*//; # skip ~login
1693 1811
1694 my ($match, $specificity); 1812 my ($match, $specificity);
1695 1813
1696 for my $region (list) { 1814 for my $region (list) {
1697 if ($region->{match} && $path =~ $region->{match}) { 1815 if ($region->{match} && $path =~ $region->{match}) {
1723our $MAX_RESET = 3600; 1841our $MAX_RESET = 3600;
1724our $DEFAULT_RESET = 3000; 1842our $DEFAULT_RESET = 3000;
1725 1843
1726sub generate_random_map { 1844sub generate_random_map {
1727 my ($self, $rmp) = @_; 1845 my ($self, $rmp) = @_;
1846
1847 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1848
1728 # mit "rum" bekleckern, nicht 1849 # mit "rum" bekleckern, nicht
1729 $self->_create_random_map ( 1850 $self->_create_random_map (
1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1851 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1852 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1853 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1733 $rmp->{exit_on_final_map}, 1854 $rmp->{exit_on_final_map},
1734 $rmp->{xsize}, $rmp->{ysize}, 1855 $rmp->{xsize}, $rmp->{ysize},
1735 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1856 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1736 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1857 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1751 1872
1752sub register { 1873sub register {
1753 my (undef, $regex, $prio) = @_; 1874 my (undef, $regex, $prio) = @_;
1754 my $pkg = caller; 1875 my $pkg = caller;
1755 1876
1756 no strict;
1757 push @{"$pkg\::ISA"}, __PACKAGE__; 1877 push @{"$pkg\::ISA"}, __PACKAGE__;
1758 1878
1759 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1879 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1760} 1880}
1761 1881
1762# also paths starting with '/' 1882# also paths starting with '/'
1763$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1883$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1764 1884
1765sub thawer_merge { 1885sub thawer_merge {
1766 my ($self, $merge) = @_; 1886 my ($self, $merge) = @_;
1767 1887
1768 # we have to keep some variables in memory intact 1888 # we have to keep some variables in memory intact
1773} 1893}
1774 1894
1775sub normalise { 1895sub normalise {
1776 my ($path, $base) = @_; 1896 my ($path, $base) = @_;
1777 1897
1778 $path = "$path"; # make sure its a string 1898 $path = "$path"; # make sure it's a string
1779 1899
1780 $path =~ s/\.map$//; 1900 $path =~ s/\.map$//;
1781 1901
1782 # map plan: 1902 # map plan:
1783 # 1903 #
1822 $self->init; # pass $1 etc. 1942 $self->init; # pass $1 etc.
1823 return $self; 1943 return $self;
1824 } 1944 }
1825 } 1945 }
1826 1946
1827 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1947 Carp::cluck "unable to resolve path '$path' (base '$base')";
1828 () 1948 ()
1829} 1949}
1830 1950
1831sub init { 1951sub init {
1832 my ($self) = @_; 1952 my ($self) = @_;
1854 1974
1855# the temporary/swap location 1975# the temporary/swap location
1856sub save_path { 1976sub save_path {
1857 my ($self) = @_; 1977 my ($self) = @_;
1858 1978
1859 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1979 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1860 "$TMPDIR/$path.map" 1980 "$TMPDIR/$path.map"
1861} 1981}
1862 1982
1863# the unique path, undef == no special unique path 1983# the unique path, undef == no special unique path
1864sub uniq_path { 1984sub uniq_path {
1865 my ($self) = @_; 1985 my ($self) = @_;
1866 1986
1867 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1987 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1868 "$UNIQUEDIR/$path" 1988 "$UNIQUEDIR/$path"
1869}
1870
1871# and all this just because we cannot iterate over
1872# all maps in C++...
1873sub change_all_map_light {
1874 my ($change) = @_;
1875
1876 $_->change_map_light ($change)
1877 for grep $_->outdoor, values %cf::MAP;
1878} 1989}
1879 1990
1880sub decay_objects { 1991sub decay_objects {
1881 my ($self) = @_; 1992 my ($self) = @_;
1882 1993
1964 2075
1965sub find; 2076sub find;
1966sub find { 2077sub find {
1967 my ($path, $origin) = @_; 2078 my ($path, $origin) = @_;
1968 2079
2080 cf::cede_to_tick;
2081
1969 $path = normalise $path, $origin && $origin->path; 2082 $path = normalise $path, $origin && $origin->path;
1970 2083
1971 cf::lock_wait "map_data:$path";#d#remove 2084 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1972 cf::lock_wait "map_find:$path"; 2085 my $guard2 = cf::lock_acquire "map_find:$path";
1973 2086
1974 $cf::MAP{$path} || do { 2087 $cf::MAP{$path} || do {
1975 my $guard1 = cf::lock_acquire "map_find:$path";
1976 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1977
1978 my $map = new_from_path cf::map $path 2088 my $map = new_from_path cf::map $path
1979 or return; 2089 or return;
1980 2090
1981 $map->{last_save} = $cf::RUNTIME; 2091 $map->{last_save} = $cf::RUNTIME;
1982 2092
1984 or return; 2094 or return;
1985 2095
1986 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2096 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1987 # doing this can freeze the server in a sync job, obviously 2097 # doing this can freeze the server in a sync job, obviously
1988 #$cf::WAIT_FOR_TICK->wait; 2098 #$cf::WAIT_FOR_TICK->wait;
2099 undef $guard2;
1989 undef $guard1; 2100 undef $guard1;
1990 undef $guard2;
1991 $map->reset; 2101 $map->reset;
1992 return find $path; 2102 return find $path;
1993 } 2103 }
1994 2104
1995 $cf::MAP{$path} = $map 2105 $cf::MAP{$path} = $map
1996 } 2106 }
1997} 2107}
1998 2108
1999sub pre_load { } 2109sub pre_load { }
2000sub post_load { } 2110#sub post_load { } # XS
2001 2111
2002sub load { 2112sub load {
2003 my ($self) = @_; 2113 my ($self) = @_;
2004 2114
2005 local $self->{deny_reset} = 1; # loading can take a long time 2115 local $self->{deny_reset} = 1; # loading can take a long time
2022 my $f = new_from_file cf::object::thawer $self->{load_path}; 2132 my $f = new_from_file cf::object::thawer $self->{load_path};
2023 $f->skip_block; 2133 $f->skip_block;
2024 $self->_load_objects ($f) 2134 $self->_load_objects ($f)
2025 or return; 2135 or return;
2026 2136
2027 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2137 $self->post_load_original
2028 if delete $self->{load_original}; 2138 if delete $self->{load_original};
2029 2139
2030 if (my $uniq = $self->uniq_path) { 2140 if (my $uniq = $self->uniq_path) {
2031 utf8::encode $uniq; 2141 utf8::encode $uniq;
2032 unless (aio_stat $uniq) { 2142 unless (aio_stat $uniq) {
2050 unless ($self->{deny_activate}) { 2160 unless ($self->{deny_activate}) {
2051 $self->decay_objects; 2161 $self->decay_objects;
2052 $self->fix_auto_apply; 2162 $self->fix_auto_apply;
2053 $self->update_buttons; 2163 $self->update_buttons;
2054 cf::cede_to_tick; 2164 cf::cede_to_tick;
2055 $self->set_darkness_map;
2056 cf::cede_to_tick;
2057 $self->activate; 2165 $self->activate;
2058 } 2166 }
2059 2167
2060 $self->{last_save} = $cf::RUNTIME; 2168 $self->{last_save} = $cf::RUNTIME;
2061 $self->last_access ($cf::RUNTIME); 2169 $self->last_access ($cf::RUNTIME);
2062 2170
2063 $self->in_memory (cf::MAP_IN_MEMORY); 2171 $self->in_memory (cf::MAP_ACTIVE);
2064 } 2172 }
2065 2173
2066 $self->post_load; 2174 $self->post_load;
2067} 2175}
2068 2176
2177# customize the map for a given player, i.e.
2178# return the _real_ map. used by e.g. per-player
2179# maps to change the path to ~playername/mappath
2069sub customise_for { 2180sub customise_for {
2070 my ($self, $ob) = @_; 2181 my ($self, $ob) = @_;
2071 2182
2072 return find "~" . $ob->name . "/" . $self->{path} 2183 return find "~" . $ob->name . "/" . $self->{path}
2073 if $self->per_player; 2184 if $self->per_player;
2089 or next; 2200 or next;
2090 $neigh = find $neigh, $map 2201 $neigh = find $neigh, $map
2091 or next; 2202 or next;
2092 $neigh->load; 2203 $neigh->load;
2093 2204
2205 # now find the diagonal neighbours
2094 push @neigh, 2206 push @neigh,
2095 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2207 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2096 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2208 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2097 } 2209 }
2098 2210
2105} 2217}
2106 2218
2107sub find_sync { 2219sub find_sync {
2108 my ($path, $origin) = @_; 2220 my ($path, $origin) = @_;
2109 2221
2110 cf::sync_job { find $path, $origin } 2222 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2223 if $Coro::current == $Coro::main;
2224
2225 find $path, $origin
2111} 2226}
2112 2227
2113sub do_load_sync { 2228sub do_load_sync {
2114 my ($map) = @_; 2229 my ($map) = @_;
2115 2230
2116 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2231 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2117 if $Coro::current == $Coro::main; 2232 if $Coro::current == $Coro::main;
2118 2233
2119 cf::sync_job { $map->load }; 2234 $map->load;
2120} 2235}
2121 2236
2122our %MAP_PREFETCH; 2237our %MAP_PREFETCH;
2123our $MAP_PREFETCHER = undef; 2238our $MAP_PREFETCHER = undef;
2124 2239
2126 my ($path, $origin, $load) = @_; 2241 my ($path, $origin, $load) = @_;
2127 2242
2128 $path = normalise $path, $origin && $origin->{path}; 2243 $path = normalise $path, $origin && $origin->{path};
2129 2244
2130 if (my $map = $cf::MAP{$path}) { 2245 if (my $map = $cf::MAP{$path}) {
2131 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2246 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2132 } 2247 }
2133 2248
2134 $MAP_PREFETCH{$path} |= $load; 2249 $MAP_PREFETCH{$path} |= $load;
2135 2250
2136 $MAP_PREFETCHER ||= cf::async { 2251 $MAP_PREFETCHER ||= cf::async {
2150 $MAP_PREFETCHER->prio (6); 2265 $MAP_PREFETCHER->prio (6);
2151 2266
2152 () 2267 ()
2153} 2268}
2154 2269
2270# common code, used by both ->save and ->swapout
2155sub save { 2271sub _save {
2156 my ($self) = @_; 2272 my ($self) = @_;
2157
2158 my $lock = cf::lock_acquire "map_data:$self->{path}";
2159 2273
2160 $self->{last_save} = $cf::RUNTIME; 2274 $self->{last_save} = $cf::RUNTIME;
2161 2275
2162 return unless $self->dirty; 2276 return unless $self->dirty;
2163 2277
2172 2286
2173 cf::async { 2287 cf::async {
2174 $Coro::current->{desc} = "map player save"; 2288 $Coro::current->{desc} = "map player save";
2175 $_->contr->save for $self->players; 2289 $_->contr->save for $self->players;
2176 }; 2290 };
2291
2292 cf::get_slot 0.02;
2177 2293
2178 if ($uniq) { 2294 if ($uniq) {
2179 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2295 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2180 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2296 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2181 } else { 2297 } else {
2182 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2298 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2183 } 2299 }
2184} 2300}
2185 2301
2302sub save {
2303 my ($self) = @_;
2304
2305 my $lock = cf::lock_acquire "map_data:$self->{path}";
2306
2307 $self->_save;
2308}
2309
2186sub swap_out { 2310sub swap_out {
2187 my ($self) = @_; 2311 my ($self) = @_;
2188 2312
2189 # save first because save cedes
2190 $self->save;
2191
2192 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2313 my $lock = cf::lock_acquire "map_data:$self->{path}";
2193 2314
2315 return if $self->in_memory != cf::MAP_ACTIVE;
2316 return if $self->{deny_save};
2194 return if $self->players; 2317 return if $self->players;
2195 return if $self->in_memory != cf::MAP_IN_MEMORY;
2196 return if $self->{deny_save};
2197 2318
2319 # first deactivate the map and "unlink" it from the core
2320 $self->deactivate;
2321 $_->clear_links_to ($self) for values %cf::MAP;
2198 $self->in_memory (cf::MAP_SWAPPED); 2322 $self->in_memory (cf::MAP_SWAPPED);
2323
2324 # then atomically save
2325 $self->_save;
2326
2327 # then free the map
2328 $self->clear;
2329}
2330
2331sub reset_at {
2332 my ($self) = @_;
2333
2334 # TODO: safety, remove and allow resettable per-player maps
2335 return 1e99 if $self->{deny_reset};
2336
2337 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2338 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2339
2340 $time + $to
2341}
2342
2343sub should_reset {
2344 my ($self) = @_;
2345
2346 $self->reset_at <= $cf::RUNTIME
2347}
2348
2349sub reset {
2350 my ($self) = @_;
2351
2352 my $lock = cf::lock_acquire "map_data:$self->{path}";
2353
2354 return if $self->players;
2355
2356 cf::trace "resetting map ", $self->path, "\n";
2357
2358 $self->in_memory (cf::MAP_SWAPPED);
2359
2360 # need to save uniques path
2361 unless ($self->{deny_save}) {
2362 my $uniq = $self->uniq_path; utf8::encode $uniq;
2363
2364 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2365 if $uniq;
2366 }
2367
2368 delete $cf::MAP{$self->path};
2199 2369
2200 $self->deactivate; 2370 $self->deactivate;
2201 $_->clear_links_to ($self) for values %cf::MAP; 2371 $_->clear_links_to ($self) for values %cf::MAP;
2202 $self->clear; 2372 $self->clear;
2203}
2204
2205sub reset_at {
2206 my ($self) = @_;
2207
2208 # TODO: safety, remove and allow resettable per-player maps
2209 return 1e99 if $self->{deny_reset};
2210
2211 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2212 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2213
2214 $time + $to
2215}
2216
2217sub should_reset {
2218 my ($self) = @_;
2219
2220 $self->reset_at <= $cf::RUNTIME
2221}
2222
2223sub reset {
2224 my ($self) = @_;
2225
2226 my $lock = cf::lock_acquire "map_data:$self->{path}";
2227
2228 return if $self->players;
2229
2230 warn "resetting map ", $self->path;
2231
2232 $self->in_memory (cf::MAP_SWAPPED);
2233
2234 # need to save uniques path
2235 unless ($self->{deny_save}) {
2236 my $uniq = $self->uniq_path; utf8::encode $uniq;
2237
2238 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2239 if $uniq;
2240 }
2241
2242 delete $cf::MAP{$self->path};
2243
2244 $self->deactivate;
2245 $_->clear_links_to ($self) for values %cf::MAP;
2246 $self->clear;
2247 2373
2248 $self->unlink_save; 2374 $self->unlink_save;
2249 $self->destroy; 2375 $self->destroy;
2250} 2376}
2251 2377
2259 2385
2260 delete $cf::MAP{$self->path}; 2386 delete $cf::MAP{$self->path};
2261 2387
2262 $self->unlink_save; 2388 $self->unlink_save;
2263 2389
2264 bless $self, "cf::map"; 2390 bless $self, "cf::map::wrap";
2265 delete $self->{deny_reset}; 2391 delete $self->{deny_reset};
2266 $self->{deny_save} = 1; 2392 $self->{deny_save} = 1;
2267 $self->reset_timeout (1); 2393 $self->reset_timeout (1);
2268 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2394 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2269 2395
2318 2444
2319sub unique_maps() { 2445sub unique_maps() {
2320 [ 2446 [
2321 map { 2447 map {
2322 utf8::decode $_; 2448 utf8::decode $_;
2323 /\.map$/ 2449 s/\.map$//; # TODO future compatibility hack
2450 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2451 ? ()
2324 ? normalise $_ 2452 : normalise $_
2325 : ()
2326 } @{ aio_readdir $UNIQUEDIR or [] } 2453 } @{ aio_readdir $UNIQUEDIR or [] }
2327 ] 2454 ]
2328} 2455}
2329 2456
2330package cf; 2457=item cf::map::static_maps
2458
2459Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2460file in the shared directory excluding F</styles> and F</editor>). May
2461block.
2462
2463=cut
2464
2465sub static_maps() {
2466 my @dirs = "";
2467 my @maps;
2468
2469 while (@dirs) {
2470 my $dir = shift @dirs;
2471
2472 next if $dir eq "/styles" || $dir eq "/editor";
2473
2474 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2475 or return;
2476
2477 for (@$files) {
2478 s/\.map$// or next;
2479 utf8::decode $_;
2480 push @maps, "$dir/$_";
2481 }
2482
2483 push @dirs, map "$dir/$_", @$dirs;
2484 }
2485
2486 \@maps
2487}
2331 2488
2332=back 2489=back
2333 2490
2334=head3 cf::object 2491=head3 cf::object
2335 2492
2339 2496
2340=over 4 2497=over 4
2341 2498
2342=item $ob->inv_recursive 2499=item $ob->inv_recursive
2343 2500
2344Returns the inventory of the object _and_ their inventories, recursively. 2501Returns the inventory of the object I<and> their inventories, recursively,
2502but I<not> the object itself.
2345 2503
2346=cut 2504=cut
2347 2505
2348sub inv_recursive_; 2506sub inv_recursive_;
2349sub inv_recursive_ { 2507sub inv_recursive_ {
2354 inv_recursive_ inv $_[0] 2512 inv_recursive_ inv $_[0]
2355} 2513}
2356 2514
2357=item $ref = $ob->ref 2515=item $ref = $ob->ref
2358 2516
2359creates and returns a persistent reference to an objetc that can be stored as a string. 2517Creates and returns a persistent reference to an object that can be stored as a string.
2360 2518
2361=item $ob = cf::object::deref ($refstring) 2519=item $ob = cf::object::deref ($refstring)
2362 2520
2363returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2521returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2364even if the object actually exists. May block. 2522even if the object actually exists. May block.
2396can be C<undef>. Does the right thing when the player is currently in a 2554can be C<undef>. Does the right thing when the player is currently in a
2397dialogue with the given NPC character. 2555dialogue with the given NPC character.
2398 2556
2399=cut 2557=cut
2400 2558
2559our $SAY_CHANNEL = {
2560 id => "say",
2561 title => "Map",
2562 reply => "say ",
2563 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2564};
2565
2566our $CHAT_CHANNEL = {
2567 id => "chat",
2568 title => "Chat",
2569 reply => "chat ",
2570 tooltip => "Player chat and shouts, global to the server.",
2571};
2572
2401# rough implementation of a future "reply" method that works 2573# rough implementation of a future "reply" method that works
2402# with dialog boxes. 2574# with dialog boxes.
2403#TODO: the first argument must go, split into a $npc->reply_to ( method 2575#TODO: the first argument must go, split into a $npc->reply_to ( method
2404sub cf::object::player::reply($$$;$) { 2576sub cf::object::player::reply($$$;$) {
2405 my ($self, $npc, $msg, $flags) = @_; 2577 my ($self, $npc, $msg, $flags) = @_;
2416 my $dialog = $pl->{npc_dialog}; 2588 my $dialog = $pl->{npc_dialog};
2417 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2589 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2418 2590
2419 } else { 2591 } else {
2420 $msg = $npc->name . " says: $msg" if $npc; 2592 $msg = $npc->name . " says: $msg" if $npc;
2421 $self->message ($msg, $flags); 2593 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2422 } 2594 }
2423 } 2595 }
2424} 2596}
2425 2597
2426=item $object->send_msg ($channel, $msg, $color, [extra...]) 2598=item $object->send_msg ($channel, $msg, $color, [extra...])
2451 2623
2452=item $player_object->enter_link 2624=item $player_object->enter_link
2453 2625
2454Freezes the player and moves him/her to a special map (C<{link}>). 2626Freezes the player and moves him/her to a special map (C<{link}>).
2455 2627
2456The player should be reasonably safe there for short amounts of time. You 2628The player should be reasonably safe there for short amounts of time (e.g.
2457I<MUST> call C<leave_link> as soon as possible, though. 2629for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2630though, as the player cannot control the character while it is on the link
2631map.
2458 2632
2459Will never block. 2633Will never block.
2460 2634
2461=item $player_object->leave_link ($map, $x, $y) 2635=item $player_object->leave_link ($map, $x, $y)
2462 2636
2482sub cf::object::player::enter_link { 2656sub cf::object::player::enter_link {
2483 my ($self) = @_; 2657 my ($self) = @_;
2484 2658
2485 $self->deactivate_recursive; 2659 $self->deactivate_recursive;
2486 2660
2661 ++$self->{_link_recursion};
2662
2487 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2663 return if UNIVERSAL::isa $self->map, "ext::map_link";
2488 2664
2489 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2665 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2490 if $self->map && $self->map->{path} ne "{link}"; 2666 if $self->map && $self->map->{path} ne "{link}";
2491 2667
2492 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2668 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2493} 2669}
2494 2670
2495sub cf::object::player::leave_link { 2671sub cf::object::player::leave_link {
2496 my ($self, $map, $x, $y) = @_; 2672 my ($self, $map, $x, $y) = @_;
2497 2673
2514 ($x, $y) = (-1, -1) 2690 ($x, $y) = (-1, -1)
2515 unless (defined $x) && (defined $y); 2691 unless (defined $x) && (defined $y);
2516 2692
2517 # use -1 or undef as default coordinates, not 0, 0 2693 # use -1 or undef as default coordinates, not 0, 0
2518 ($x, $y) = ($map->enter_x, $map->enter_y) 2694 ($x, $y) = ($map->enter_x, $map->enter_y)
2519 if $x <=0 && $y <= 0; 2695 if $x <= 0 && $y <= 0;
2520 2696
2521 $map->load; 2697 $map->load;
2522 $map->load_neighbours; 2698 $map->load_neighbours;
2523 2699
2524 return unless $self->contr->active; 2700 return unless $self->contr->active;
2525 $self->activate_recursive;
2526 2701
2527 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2702 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2528 $self->enter_map ($map, $x, $y); 2703 if ($self->enter_map ($map, $x, $y)) {
2529} 2704 # entering was successful
2705 delete $self->{_link_recursion};
2706 # only activate afterwards, to support waiting in hooks
2707 $self->activate_recursive;
2708 }
2530 2709
2710}
2711
2531=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2712=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2532 2713
2533Moves the player to the given map-path and coordinates by first freezing 2714Moves the player to the given map-path and coordinates by first freezing
2534her, loading and preparing them map, calling the provided $check callback 2715her, loading and preparing them map, calling the provided $check callback
2535that has to return the map if sucecssful, and then unfreezes the player on 2716that has to return the map if sucecssful, and then unfreezes the player on
2536the new (success) or old (failed) map position. In either case, $done will 2717the new (success) or old (failed) map position. In either case, $done will
2537be called at the end of this process. 2718be called at the end of this process.
2538 2719
2720Note that $check will be called with a potentially non-loaded map, so if
2721it needs a loaded map it has to call C<< ->load >>.
2722
2539=cut 2723=cut
2540 2724
2541our $GOTOGEN; 2725our $GOTOGEN;
2542 2726
2543sub cf::object::player::goto { 2727sub cf::object::player::goto {
2544 my ($self, $path, $x, $y, $check, $done) = @_; 2728 my ($self, $path, $x, $y, $check, $done) = @_;
2729
2730 if ($self->{_link_recursion} >= $MAX_LINKS) {
2731 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2732 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2733 ($path, $x, $y) = @$EMERGENCY_POSITION;
2734 }
2545 2735
2546 # do generation counting so two concurrent goto's will be executed in-order 2736 # do generation counting so two concurrent goto's will be executed in-order
2547 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2737 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2548 2738
2549 $self->enter_link; 2739 $self->enter_link;
2573 my $map = eval { 2763 my $map = eval {
2574 my $map = defined $path ? cf::map::find $path : undef; 2764 my $map = defined $path ? cf::map::find $path : undef;
2575 2765
2576 if ($map) { 2766 if ($map) {
2577 $map = $map->customise_for ($self); 2767 $map = $map->customise_for ($self);
2578 $map = $check->($map) if $check && $map; 2768 $map = $check->($map, $x, $y, $self) if $check && $map;
2579 } else { 2769 } else {
2580 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2770 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2581 } 2771 }
2582 2772
2583 $map 2773 $map
2591 if ($gen == $self->{_goto_generation}) { 2781 if ($gen == $self->{_goto_generation}) {
2592 delete $self->{_goto_generation}; 2782 delete $self->{_goto_generation};
2593 $self->leave_link ($map, $x, $y); 2783 $self->leave_link ($map, $x, $y);
2594 } 2784 }
2595 2785
2596 $done->() if $done; 2786 $done->($self) if $done;
2597 })->prio (1); 2787 })->prio (1);
2598} 2788}
2599 2789
2600=item $player_object->enter_exit ($exit_object) 2790=item $player_object->enter_exit ($exit_object)
2601 2791
2621} 2811}
2622 2812
2623sub prepare_random_map { 2813sub prepare_random_map {
2624 my ($exit) = @_; 2814 my ($exit) = @_;
2625 2815
2626 my $guard = cf::lock_acquire "exit_prepare:$exit";
2627
2628 # all this does is basically replace the /! path by 2816 # all this does is basically replace the /! path by
2629 # a new random map path (?random/...) with a seed 2817 # a new random map path (?random/...) with a seed
2630 # that depends on the exit object 2818 # that depends on the exit object
2631 2819
2632 my $rmp = parse_random_map_params $exit->msg; 2820 my $rmp = parse_random_map_params $exit->msg;
2634 if ($exit->map) { 2822 if ($exit->map) {
2635 $rmp->{region} = $exit->region->name; 2823 $rmp->{region} = $exit->region->name;
2636 $rmp->{origin_map} = $exit->map->path; 2824 $rmp->{origin_map} = $exit->map->path;
2637 $rmp->{origin_x} = $exit->x; 2825 $rmp->{origin_x} = $exit->x;
2638 $rmp->{origin_y} = $exit->y; 2826 $rmp->{origin_y} = $exit->y;
2827
2828 $exit->map->touch;
2639 } 2829 }
2640 2830
2641 $rmp->{random_seed} ||= $exit->random_seed; 2831 $rmp->{random_seed} ||= $exit->random_seed;
2642 2832
2643 my $data = cf::encode_json $rmp; 2833 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2644 my $md5 = Digest::MD5::md5_hex $data; 2834 my $md5 = Digest::MD5::md5_hex $data;
2645 my $meta = "$RANDOMDIR/$md5.meta"; 2835 my $meta = "$RANDOMDIR/$md5.meta";
2646 2836
2647 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2837 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2648 aio_write $fh, 0, (length $data), $data, 0; 2838 aio_write $fh, 0, (length $data), $data, 0;
2649 undef $fh; 2839 undef $fh;
2650 aio_rename "$meta~", $meta; 2840 aio_rename "$meta~", $meta;
2651 2841
2842 my $slaying = "?random/$md5";
2843
2844 if ($exit->valid) {
2652 $exit->slaying ("?random/$md5"); 2845 $exit->slaying ("?random/$md5");
2653 $exit->msg (undef); 2846 $exit->msg (undef);
2847 }
2654 } 2848 }
2655} 2849}
2656 2850
2657sub cf::object::player::enter_exit { 2851sub cf::object::player::enter_exit {
2658 my ($self, $exit) = @_; 2852 my ($self, $exit) = @_;
2659 2853
2660 return unless $self->type == cf::PLAYER; 2854 return unless $self->type == cf::PLAYER;
2661 2855
2662 if ($exit->slaying eq "/!") {
2663 #TODO: this should de-fi-ni-te-ly not be a sync-job
2664 # the problem is that $exit might not survive long enough
2665 # so it needs to be done right now, right here
2666 cf::sync_job { prepare_random_map $exit };
2667 }
2668
2669 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2670 my $hp = $exit->stats->hp;
2671 my $sp = $exit->stats->sp;
2672
2673 $self->enter_link; 2856 $self->enter_link;
2674 2857
2675 # if exit is damned, update players death & WoR home-position
2676 $self->contr->savebed ($slaying, $hp, $sp)
2677 if $exit->flag (FLAG_DAMNED);
2678
2679 (async { 2858 (async {
2680 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2859 $Coro::current->{desc} = "enter_exit";
2681 2860
2682 $self->deactivate_recursive; # just to be sure
2683 unless (eval { 2861 unless (eval {
2862 $self->deactivate_recursive; # just to be sure
2863
2864 # random map handling
2865 {
2866 my $guard = cf::lock_acquire "exit_prepare:$exit";
2867
2868 prepare_random_map $exit
2869 if $exit->slaying eq "/!";
2870 }
2871
2872 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2873 my $x = $exit->stats->hp;
2874 my $y = $exit->stats->sp;
2875
2684 $self->goto ($slaying, $hp, $sp); 2876 $self->goto ($map, $x, $y);
2685 2877
2878 # if exit is damned, update players death & WoR home-position
2879 $self->contr->savebed ($map, $x, $y)
2880 if $exit->flag (cf::FLAG_DAMNED);
2881
2686 1; 2882 1
2687 }) { 2883 }) {
2688 $self->message ("Something went wrong deep within the crossfire server. " 2884 $self->message ("Something went wrong deep within the deliantra server. "
2689 . "I'll try to bring you back to the map you were before. " 2885 . "I'll try to bring you back to the map you were before. "
2690 . "Please report this to the dungeon master!", 2886 . "Please report this to the dungeon master!",
2691 cf::NDI_UNIQUE | cf::NDI_RED); 2887 cf::NDI_UNIQUE | cf::NDI_RED);
2692 2888
2693 warn "ERROR in enter_exit: $@"; 2889 error "ERROR in enter_exit: $@";
2694 $self->leave_link; 2890 $self->leave_link;
2695 } 2891 }
2696 })->prio (1); 2892 })->prio (1);
2697} 2893}
2698 2894
2710sub cf::client::send_drawinfo { 2906sub cf::client::send_drawinfo {
2711 my ($self, $text, $flags) = @_; 2907 my ($self, $text, $flags) = @_;
2712 2908
2713 utf8::encode $text; 2909 utf8::encode $text;
2714 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2910 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2911}
2912
2913=item $client->send_big_packet ($pkt)
2914
2915Like C<send_packet>, but tries to compress large packets, and fragments
2916them as required.
2917
2918=cut
2919
2920our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2921
2922sub cf::client::send_big_packet {
2923 my ($self, $pkt) = @_;
2924
2925 # try lzf for large packets
2926 $pkt = "lzf " . Compress::LZF::compress $pkt
2927 if 1024 <= length $pkt and $self->{can_lzf};
2928
2929 # split very large packets
2930 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2931 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2932 $pkt = "frag";
2933 }
2934
2935 $self->send_packet ($pkt);
2715} 2936}
2716 2937
2717=item $client->send_msg ($channel, $msg, $color, [extra...]) 2938=item $client->send_msg ($channel, $msg, $color, [extra...])
2718 2939
2719Send a drawinfo or msg packet to the client, formatting the msg for the 2940Send a drawinfo or msg packet to the client, formatting the msg for the
2723 2944
2724=cut 2945=cut
2725 2946
2726# non-persistent channels (usually the info channel) 2947# non-persistent channels (usually the info channel)
2727our %CHANNEL = ( 2948our %CHANNEL = (
2949 "c/motd" => {
2950 id => "infobox",
2951 title => "MOTD",
2952 reply => undef,
2953 tooltip => "The message of the day",
2954 },
2728 "c/identify" => { 2955 "c/identify" => {
2729 id => "infobox", 2956 id => "infobox",
2730 title => "Identify", 2957 title => "Identify",
2731 reply => undef, 2958 reply => undef,
2732 tooltip => "Items recently identified", 2959 tooltip => "Items recently identified",
2734 "c/examine" => { 2961 "c/examine" => {
2735 id => "infobox", 2962 id => "infobox",
2736 title => "Examine", 2963 title => "Examine",
2737 reply => undef, 2964 reply => undef,
2738 tooltip => "Signs and other items you examined", 2965 tooltip => "Signs and other items you examined",
2966 },
2967 "c/shopinfo" => {
2968 id => "infobox",
2969 title => "Shop Info",
2970 reply => undef,
2971 tooltip => "What your bargaining skill tells you about the shop",
2739 }, 2972 },
2740 "c/book" => { 2973 "c/book" => {
2741 id => "infobox", 2974 id => "infobox",
2742 title => "Book", 2975 title => "Book",
2743 reply => undef, 2976 reply => undef,
2759 id => "infobox", 2992 id => "infobox",
2760 title => "Body Parts", 2993 title => "Body Parts",
2761 reply => undef, 2994 reply => undef,
2762 tooltip => "Shows which body parts you posess and are available", 2995 tooltip => "Shows which body parts you posess and are available",
2763 }, 2996 },
2997 "c/statistics" => {
2998 id => "infobox",
2999 title => "Statistics",
3000 reply => undef,
3001 tooltip => "Shows your primary statistics",
3002 },
3003 "c/skills" => {
3004 id => "infobox",
3005 title => "Skills",
3006 reply => undef,
3007 tooltip => "Shows your experience per skill and item power",
3008 },
3009 "c/shopitems" => {
3010 id => "infobox",
3011 title => "Shop Items",
3012 reply => undef,
3013 tooltip => "Shows the items currently for sale in this shop",
3014 },
3015 "c/resistances" => {
3016 id => "infobox",
3017 title => "Resistances",
3018 reply => undef,
3019 tooltip => "Shows your resistances",
3020 },
3021 "c/pets" => {
3022 id => "infobox",
3023 title => "Pets",
3024 reply => undef,
3025 tooltip => "Shows information abotu your pets/a specific pet",
3026 },
3027 "c/perceiveself" => {
3028 id => "infobox",
3029 title => "Perceive Self",
3030 reply => undef,
3031 tooltip => "You gained detailed knowledge about yourself",
3032 },
2764 "c/uptime" => { 3033 "c/uptime" => {
2765 id => "infobox", 3034 id => "infobox",
2766 title => "Uptime", 3035 title => "Uptime",
2767 reply => undef, 3036 reply => undef,
2768 tooltip => "How long the server has been running since last restart", 3037 tooltip => "How long the server has been running since last restart",
2771 id => "infobox", 3040 id => "infobox",
2772 title => "Map Info", 3041 title => "Map Info",
2773 reply => undef, 3042 reply => undef,
2774 tooltip => "Information related to the maps", 3043 tooltip => "Information related to the maps",
2775 }, 3044 },
3045 "c/party" => {
3046 id => "party",
3047 title => "Party",
3048 reply => "gsay ",
3049 tooltip => "Messages and chat related to your party",
3050 },
3051 "c/death" => {
3052 id => "death",
3053 title => "Death",
3054 reply => undef,
3055 tooltip => "Reason for and more info about your most recent death",
3056 },
3057 "c/say" => $SAY_CHANNEL,
3058 "c/chat" => $CHAT_CHANNEL,
2776); 3059);
2777 3060
2778sub cf::client::send_msg { 3061sub cf::client::send_msg {
2779 my ($self, $channel, $msg, $color, @extra) = @_; 3062 my ($self, $channel, $msg, $color, @extra) = @_;
2780 3063
2781 $msg = $self->pl->expand_cfpod ($msg); 3064 $msg = $self->pl->expand_cfpod ($msg)
3065 unless $color & cf::NDI_VERBATIM;
2782 3066
2783 $color &= cf::NDI_CLIENT_MASK; # just in case... 3067 $color &= cf::NDI_CLIENT_MASK; # just in case...
2784 3068
2785 # check predefined channels, for the benefit of C 3069 # check predefined channels, for the benefit of C
2786 if ($CHANNEL{$channel}) { 3070 if ($CHANNEL{$channel}) {
2787 $channel = $CHANNEL{$channel}; 3071 $channel = $CHANNEL{$channel};
2788 3072
2789 $self->ext_msg (channel_info => $channel) 3073 $self->ext_msg (channel_info => $channel);
2790 if $self->can_msg;
2791
2792 $channel = $channel->{id}; 3074 $channel = $channel->{id};
2793 3075
2794 } elsif (ref $channel) { 3076 } elsif (ref $channel) {
2795 # send meta info to client, if not yet sent 3077 # send meta info to client, if not yet sent
2796 unless (exists $self->{channel}{$channel->{id}}) { 3078 unless (exists $self->{channel}{$channel->{id}}) {
2797 $self->{channel}{$channel->{id}} = $channel; 3079 $self->{channel}{$channel->{id}} = $channel;
2798 $self->ext_msg (channel_info => $channel) 3080 $self->ext_msg (channel_info => $channel);
2799 if $self->can_msg;
2800 } 3081 }
2801 3082
2802 $channel = $channel->{id}; 3083 $channel = $channel->{id};
2803 } 3084 }
2804 3085
2805 return unless @extra || length $msg; 3086 return unless @extra || length $msg;
2806 3087
2807 if ($self->can_msg) {
2808 # default colour, mask it out 3088 # default colour, mask it out
2809 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3089 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2810 if $color & cf::NDI_DEF; 3090 if $color & cf::NDI_DEF;
2811 3091
2812 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3092 my $pkt = "msg "
3093 . $self->{json_coder}->encode (
2813 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3094 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2814 } else { 3095 );
2815 if ($color >= 0) {
2816 # replace some tags by gcfclient-compatible ones
2817 for ($msg) {
2818 1 while
2819 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2820 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2821 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2822 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2823 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2824 }
2825 3096
2826 $color &= cf::NDI_COLOR_MASK; 3097 $self->send_big_packet ($pkt);
2827
2828 utf8::encode $msg;
2829
2830 if (0 && $msg =~ /\[/) {
2831 # COMMAND/INFO
2832 $self->send_packet ("drawextinfo $color 10 8 $msg")
2833 } else {
2834 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2835 $self->send_packet ("drawinfo $color $msg")
2836 }
2837 }
2838 }
2839} 3098}
2840 3099
2841=item $client->ext_msg ($type, @msg) 3100=item $client->ext_msg ($type, @msg)
2842 3101
2843Sends an ext event to the client. 3102Sends an ext event to the client.
2846 3105
2847sub cf::client::ext_msg($$@) { 3106sub cf::client::ext_msg($$@) {
2848 my ($self, $type, @msg) = @_; 3107 my ($self, $type, @msg) = @_;
2849 3108
2850 if ($self->extcmd == 2) { 3109 if ($self->extcmd == 2) {
2851 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3110 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2852 } elsif ($self->extcmd == 1) { # TODO: remove 3111 } elsif ($self->extcmd == 1) { # TODO: remove
2853 push @msg, msgtype => "event_$type"; 3112 push @msg, msgtype => "event_$type";
2854 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3113 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2855 } 3114 }
2856} 3115}
2857 3116
2858=item $client->ext_reply ($msgid, @msg) 3117=item $client->ext_reply ($msgid, @msg)
2859 3118
2863 3122
2864sub cf::client::ext_reply($$@) { 3123sub cf::client::ext_reply($$@) {
2865 my ($self, $id, @msg) = @_; 3124 my ($self, $id, @msg) = @_;
2866 3125
2867 if ($self->extcmd == 2) { 3126 if ($self->extcmd == 2) {
2868 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3127 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2869 } elsif ($self->extcmd == 1) { 3128 } elsif ($self->extcmd == 1) {
2870 #TODO: version 1, remove 3129 #TODO: version 1, remove
2871 unshift @msg, msgtype => "reply", msgid => $id; 3130 unshift @msg, msgtype => "reply", msgid => $id;
2872 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3131 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2873 } 3132 }
2874} 3133}
2875 3134
2876=item $success = $client->query ($flags, "text", \&cb) 3135=item $success = $client->query ($flags, "text", \&cb)
2877 3136
2948 3207
2949 $ns->ext_reply ($reply, @reply) 3208 $ns->ext_reply ($reply, @reply)
2950 if $reply; 3209 if $reply;
2951 3210
2952 } else { 3211 } else {
2953 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3212 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2954 } 3213 }
2955 3214
2956 cf::override; 3215 cf::override;
2957 }, 3216 },
2958); 3217);
2978 3237
2979 $coro 3238 $coro
2980} 3239}
2981 3240
2982cf::client->attach ( 3241cf::client->attach (
2983 on_destroy => sub { 3242 on_client_destroy => sub {
2984 my ($ns) = @_; 3243 my ($ns) = @_;
2985 3244
2986 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3245 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2987 }, 3246 },
2988); 3247);
3004our $safe_hole = new Safe::Hole; 3263our $safe_hole = new Safe::Hole;
3005 3264
3006$SIG{FPE} = 'IGNORE'; 3265$SIG{FPE} = 'IGNORE';
3007 3266
3008$safe->permit_only (Opcode::opset qw( 3267$safe->permit_only (Opcode::opset qw(
3009 :base_core :base_mem :base_orig :base_math 3268 :base_core :base_mem :base_orig :base_math :base_loop
3010 grepstart grepwhile mapstart mapwhile 3269 grepstart grepwhile mapstart mapwhile
3011 sort time 3270 sort time
3012)); 3271));
3013 3272
3014# here we export the classes and methods available to script code 3273# here we export the classes and methods available to script code
3017 3276
3018The following functions and methods are available within a safe environment: 3277The following functions and methods are available within a safe environment:
3019 3278
3020 cf::object 3279 cf::object
3021 contr pay_amount pay_player map x y force_find force_add destroy 3280 contr pay_amount pay_player map x y force_find force_add destroy
3022 insert remove name archname title slaying race decrease_ob_nr 3281 insert remove name archname title slaying race decrease split
3282 value
3023 3283
3024 cf::object::player 3284 cf::object::player
3025 player 3285 player
3026 3286
3027 cf::player 3287 cf::player
3032 3292
3033=cut 3293=cut
3034 3294
3035for ( 3295for (
3036 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3296 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3037 insert remove inv name archname title slaying race 3297 insert remove inv nrof name archname title slaying race
3038 decrease_ob_nr destroy)], 3298 decrease split destroy change_exp value msg lore send_msg)],
3039 ["cf::object::player" => qw(player)], 3299 ["cf::object::player" => qw(player)],
3040 ["cf::player" => qw(peaceful)], 3300 ["cf::player" => qw(peaceful send_msg)],
3041 ["cf::map" => qw(trigger)], 3301 ["cf::map" => qw(trigger)],
3042) { 3302) {
3043 no strict 'refs';
3044 my ($pkg, @funs) = @$_; 3303 my ($pkg, @funs) = @$_;
3045 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3304 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3046 for @funs; 3305 for @funs;
3047} 3306}
3048 3307
3063 3322
3064 my $qcode = $code; 3323 my $qcode = $code;
3065 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3324 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3066 $qcode =~ s/\n/\\n/g; 3325 $qcode =~ s/\n/\\n/g;
3067 3326
3327 %vars = (_dummy => 0) unless %vars;
3328
3329 my @res;
3068 local $_; 3330 local $_;
3069 local @safe::cf::_safe_eval_args = values %vars;
3070 3331
3071 my $eval = 3332 my $eval =
3072 "do {\n" 3333 "do {\n"
3073 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3334 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3074 . "#line 0 \"{$qcode}\"\n" 3335 . "#line 0 \"{$qcode}\"\n"
3075 . $code 3336 . $code
3076 . "\n}" 3337 . "\n}"
3077 ; 3338 ;
3078 3339
3340 if ($CFG{safe_eval}) {
3079 sub_generation_inc; 3341 sub_generation_inc;
3342 local @safe::cf::_safe_eval_args = values %vars;
3080 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3343 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3081 sub_generation_inc; 3344 sub_generation_inc;
3345 } else {
3346 local @cf::_safe_eval_args = values %vars;
3347 @res = wantarray ? eval eval : scalar eval $eval;
3348 }
3082 3349
3083 if ($@) { 3350 if ($@) {
3084 warn "$@"; 3351 warn "$@",
3085 warn "while executing safe code '$code'\n"; 3352 "while executing safe code '$code'\n",
3086 warn "with arguments " . (join " ", %vars) . "\n"; 3353 "with arguments " . (join " ", %vars) . "\n";
3087 } 3354 }
3088 3355
3089 wantarray ? @res : $res[0] 3356 wantarray ? @res : $res[0]
3090} 3357}
3091 3358
3105=cut 3372=cut
3106 3373
3107sub register_script_function { 3374sub register_script_function {
3108 my ($fun, $cb) = @_; 3375 my ($fun, $cb) = @_;
3109 3376
3110 no strict 'refs'; 3377 $fun = "safe::$fun" if $CFG{safe_eval};
3111 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3378 *$fun = $safe_hole->wrap ($cb);
3112} 3379}
3113 3380
3114=back 3381=back
3115 3382
3116=cut 3383=cut
3125 # for this (global event?) 3392 # for this (global event?)
3126 %ext::player_env::MUSIC_FACE_CACHE = (); 3393 %ext::player_env::MUSIC_FACE_CACHE = ();
3127 3394
3128 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3395 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3129 3396
3130 warn "loading facedata from $path\n"; 3397 trace "loading facedata from $path\n";
3131 3398
3132 my $facedata;
3133 0 < aio_load $path, $facedata 3399 0 < aio_load $path, my $facedata
3134 or die "$path: $!"; 3400 or die "$path: $!";
3135 3401
3136 $facedata = Coro::Storable::thaw $facedata; 3402 $facedata = Coro::Storable::thaw $facedata;
3137 3403
3138 $facedata->{version} == 2 3404 $facedata->{version} == 2
3139 or cf::cleanup "$path: version mismatch, cannot proceed."; 3405 or cf::cleanup "$path: version mismatch, cannot proceed.";
3140 3406
3141 # patch in the exptable 3407 # patch in the exptable
3408 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3142 $facedata->{resource}{"res/exp_table"} = { 3409 $facedata->{resource}{"res/exp_table"} = {
3143 type => FT_RSRC, 3410 type => FT_RSRC,
3144 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3411 data => $exp_table,
3412 hash => (Digest::MD5::md5 $exp_table),
3145 }; 3413 };
3146 cf::cede_to_tick; 3414 cf::cede_to_tick;
3147 3415
3148 { 3416 {
3149 my $faces = $facedata->{faceinfo}; 3417 my $faces = $facedata->{faceinfo};
3150 3418
3151 while (my ($face, $info) = each %$faces) { 3419 while (my ($face, $info) = each %$faces) {
3152 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3420 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3421
3153 cf::face::set_visibility $idx, $info->{visibility}; 3422 cf::face::set_visibility $idx, $info->{visibility};
3154 cf::face::set_magicmap $idx, $info->{magicmap}; 3423 cf::face::set_magicmap $idx, $info->{magicmap};
3155 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3424 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3156 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3425 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3157 3426
3158 cf::cede_to_tick; 3427 cf::cede_to_tick;
3159 } 3428 }
3160 3429
3161 while (my ($face, $info) = each %$faces) { 3430 while (my ($face, $info) = each %$faces) {
3162 next unless $info->{smooth}; 3431 next unless $info->{smooth};
3432
3163 my $idx = cf::face::find $face 3433 my $idx = cf::face::find $face
3164 or next; 3434 or next;
3435
3165 if (my $smooth = cf::face::find $info->{smooth}) { 3436 if (my $smooth = cf::face::find $info->{smooth}) {
3166 cf::face::set_smooth $idx, $smooth; 3437 cf::face::set_smooth $idx, $smooth;
3167 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3438 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3168 } else { 3439 } else {
3169 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3440 error "smooth face '$info->{smooth}' not found for face '$face'";
3170 } 3441 }
3171 3442
3172 cf::cede_to_tick; 3443 cf::cede_to_tick;
3173 } 3444 }
3174 } 3445 }
3183 3454
3184 cf::anim::invalidate_all; # d'oh 3455 cf::anim::invalidate_all; # d'oh
3185 } 3456 }
3186 3457
3187 { 3458 {
3188 # TODO: for gcfclient pleasure, we should give resources
3189 # that gcfclient doesn't grok a >10000 face index.
3190 my $res = $facedata->{resource}; 3459 my $res = $facedata->{resource};
3191 3460
3192 my $soundconf = delete $res->{"res/sound.conf"};
3193
3194 while (my ($name, $info) = each %$res) { 3461 while (my ($name, $info) = each %$res) {
3462 if (defined $info->{type}) {
3195 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3463 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3196 my $data;
3197 3464
3198 if ($info->{type} & 1) { 3465 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3199 # prepend meta info 3466 cf::face::set_type $idx, $info->{type};
3200
3201 my $meta = $enc->encode ({
3202 name => $name,
3203 %{ $info->{meta} || {} },
3204 });
3205
3206 $data = pack "(w/a*)*", $meta, $info->{data};
3207 } else { 3467 } else {
3208 $data = $info->{data}; 3468 $RESOURCE{$name} = $info; # unused
3209 } 3469 }
3210 3470
3211 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3212 cf::face::set_type $idx, $info->{type};
3213
3214 cf::cede_to_tick; 3471 cf::cede_to_tick;
3215 } 3472 }
3216
3217 if ($soundconf) {
3218 $soundconf = $enc->decode (delete $soundconf->{data});
3219
3220 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3221 my $sound = $soundconf->{compat}[$_]
3222 or next;
3223
3224 my $face = cf::face::find "sound/$sound->[1]";
3225 cf::sound::set $sound->[0] => $face;
3226 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3227 }
3228
3229 while (my ($k, $v) = each %{$soundconf->{event}}) {
3230 my $face = cf::face::find "sound/$v";
3231 cf::sound::set $k => $face;
3232 }
3233 }
3234 } 3473 }
3474
3475 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3235 3476
3236 1 3477 1
3237} 3478}
3238 3479
3239register_exticmd fx_want => sub { 3480register_exticmd fx_want => sub {
3241 3482
3242 while (my ($k, $v) = each %$want) { 3483 while (my ($k, $v) = each %$want) {
3243 $ns->fx_want ($k, $v); 3484 $ns->fx_want ($k, $v);
3244 } 3485 }
3245}; 3486};
3487
3488sub load_resource_file($) {
3489 my $guard = lock_acquire "load_resource_file";
3490
3491 my $status = load_resource_file_ $_[0];
3492 get_slot 0.1, 100;
3493 cf::arch::commit_load;
3494
3495 $status
3496}
3246 3497
3247sub reload_regions { 3498sub reload_regions {
3248 # HACK to clear player env face cache, we need some signal framework 3499 # HACK to clear player env face cache, we need some signal framework
3249 # for this (global event?) 3500 # for this (global event?)
3250 %ext::player_env::MUSIC_FACE_CACHE = (); 3501 %ext::player_env::MUSIC_FACE_CACHE = ();
3264} 3515}
3265 3516
3266sub reload_archetypes { 3517sub reload_archetypes {
3267 load_resource_file "$DATADIR/archetypes" 3518 load_resource_file "$DATADIR/archetypes"
3268 or die "unable to load archetypes\n"; 3519 or die "unable to load archetypes\n";
3269 #d# NEED to laod twice to resolve forward references
3270 # this really needs to be done in an extra post-pass
3271 # (which needs to be synchronous, so solve it differently)
3272 load_resource_file "$DATADIR/archetypes"
3273 or die "unable to load archetypes\n";
3274} 3520}
3275 3521
3276sub reload_treasures { 3522sub reload_treasures {
3277 load_resource_file "$DATADIR/treasures" 3523 load_resource_file "$DATADIR/treasures"
3278 or die "unable to load treasurelists\n"; 3524 or die "unable to load treasurelists\n";
3279} 3525}
3280 3526
3527sub reload_sound {
3528 trace "loading sound config from $DATADIR/sound\n";
3529
3530 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3531 or die "$DATADIR/sound $!";
3532
3533 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3534
3535 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3536 my $sound = $soundconf->{compat}[$_]
3537 or next;
3538
3539 my $face = cf::face::find "sound/$sound->[1]";
3540 cf::sound::set $sound->[0] => $face;
3541 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3542 }
3543
3544 while (my ($k, $v) = each %{$soundconf->{event}}) {
3545 my $face = cf::face::find "sound/$v";
3546 cf::sound::set $k => $face;
3547 }
3548}
3549
3281sub reload_resources { 3550sub reload_resources {
3282 warn "reloading resource files...\n"; 3551 trace "reloading resource files...\n";
3283 3552
3553 reload_exp_table;
3554 reload_materials;
3555 reload_facedata;
3556 reload_sound;
3557 reload_archetypes;
3284 reload_regions; 3558 reload_regions;
3285 reload_facedata;
3286 #reload_archetypes;#d#
3287 reload_archetypes;
3288 reload_treasures; 3559 reload_treasures;
3289 3560
3290 warn "finished reloading resource files\n"; 3561 trace "finished reloading resource files\n";
3291}
3292
3293sub init {
3294 reload_resources;
3295} 3562}
3296 3563
3297sub reload_config { 3564sub reload_config {
3298 open my $fh, "<:utf8", "$CONFDIR/config" 3565 trace "reloading config file...\n";
3299 or return;
3300 3566
3301 local $/; 3567 0 < aio_load "$CONFDIR/config", my $config
3302 *CFG = YAML::Syck::Load <$fh>; 3568 or die "$CONFDIR/config: $!";
3303 3569
3570 utf8::decode $config;
3571 *CFG = yaml_load $config;
3572
3304 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3573 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3305 3574
3306 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3575 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3307 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3576 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3308 3577
3309 if (exists $CFG{mlockall}) { 3578 if (exists $CFG{mlockall}) {
3313 }; 3582 };
3314 warn $@ if $@; 3583 warn $@ if $@;
3315 } 3584 }
3316} 3585}
3317 3586
3587sub pidfile() {
3588 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3589 or die "$PIDFILE: $!";
3590 flock $fh, &Fcntl::LOCK_EX
3591 or die "$PIDFILE: flock: $!";
3592 $fh
3593}
3594
3595# make sure only one server instance is running at any one time
3596sub atomic {
3597 my $fh = pidfile;
3598
3599 my $pid = <$fh>;
3600 kill 9, $pid if $pid > 0;
3601
3602 seek $fh, 0, 0;
3603 print $fh $$;
3604}
3605
3606sub main_loop {
3607 trace "EV::loop starting\n";
3608 if (1) {
3609 EV::loop;
3610 }
3611 trace "EV::loop returned\n";
3612 goto &main_loop unless $REALLY_UNLOOP;
3613}
3614
3318sub main { 3615sub main {
3616 cf::init_globals; # initialise logging
3617
3618 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3619 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3620 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3621 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3622
3623 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3624
3319 # we must not ever block the main coroutine 3625 # we must not ever block the main coroutine
3320 local $Coro::idle = sub { 3626 local $Coro::idle = sub {
3321 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3627 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3322 (async { 3628 (async {
3323 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3629 $Coro::current->{desc} = "IDLE BUG HANDLER";
3324 EV::loop EV::LOOP_ONESHOT; 3630 EV::loop EV::LOOP_ONESHOT;
3325 })->prio (Coro::PRIO_MAX); 3631 })->prio (Coro::PRIO_MAX);
3326 }; 3632 };
3327 3633
3634 evthread_start IO::AIO::poll_fileno;
3635
3636 cf::sync_job {
3637 cf::incloader::init ();
3638
3639 cf::init_anim;
3640 cf::init_attackmess;
3641 cf::init_dynamic;
3642
3643 cf::load_settings;
3644
3645 reload_resources;
3328 reload_config; 3646 reload_config;
3329 db_init; 3647 db_init;
3648
3649 cf::init_uuid;
3650 cf::init_signals;
3651 cf::init_skills;
3652
3653 cf::init_beforeplay;
3654
3655 atomic;
3656
3330 load_extensions; 3657 load_extensions;
3331 3658
3332 $TICK_WATCHER->start; 3659 utime time, time, $RUNTIMEFILE;
3333 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3660
3334 EV::loop; 3661 # no (long-running) fork's whatsoever before this point(!)
3662 use POSIX ();
3663 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3664
3665 (pop @POST_INIT)->(0) while @POST_INIT;
3666 };
3667
3668 cf::object::thawer::errors_are_fatal 0;
3669 info "parse errors in files are no longer fatal from this point on.\n";
3670
3671 my $free_main; $free_main = EV::idle sub {
3672 undef $free_main;
3673 undef &main; # free gobs of memory :)
3674 };
3675
3676 goto &main_loop;
3335} 3677}
3336 3678
3337############################################################################# 3679#############################################################################
3338# initialisation and cleanup 3680# initialisation and cleanup
3339 3681
3340# install some emergency cleanup handlers 3682# install some emergency cleanup handlers
3341BEGIN { 3683BEGIN {
3342 our %SIGWATCHER = (); 3684 our %SIGWATCHER = ();
3343 for my $signal (qw(INT HUP TERM)) { 3685 for my $signal (qw(INT HUP TERM)) {
3344 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3686 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3345 cf::cleanup "SIG$signal"; 3687 cf::cleanup "SIG$signal";
3346 }; 3688 };
3347 } 3689 }
3348} 3690}
3349 3691
3350sub write_runtime { 3692sub write_runtime_sync {
3351 my $runtime = "$LOCALDIR/runtime"; 3693 my $t0 = AE::time;
3352 3694
3353 # first touch the runtime file to show we are still running: 3695 # first touch the runtime file to show we are still running:
3354 # the fsync below can take a very very long time. 3696 # the fsync below can take a very very long time.
3355 3697
3356 IO::AIO::aio_utime $runtime, undef, undef; 3698 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3357 3699
3358 my $guard = cf::lock_acquire "write_runtime"; 3700 my $guard = cf::lock_acquire "write_runtime";
3359 3701
3360 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3702 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3361 or return; 3703 or return;
3362 3704
3363 my $value = $cf::RUNTIME + 90 + 10; 3705 my $value = $cf::RUNTIME + 90 + 10;
3364 # 10 is the runtime save interval, for a monotonic clock 3706 # 10 is the runtime save interval, for a monotonic clock
3365 # 60 allows for the watchdog to kill the server. 3707 # 60 allows for the watchdog to kill the server.
3375 aio_utime $fh, undef, undef; 3717 aio_utime $fh, undef, undef;
3376 3718
3377 close $fh 3719 close $fh
3378 or return; 3720 or return;
3379 3721
3380 aio_rename "$runtime~", $runtime 3722 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3381 and return; 3723 and return;
3382 3724
3383 warn "runtime file written.\n"; 3725 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3384 3726
3385 1 3727 1
3728}
3729
3730our $uuid_lock;
3731our $uuid_skip;
3732
3733sub write_uuid_sync($) {
3734 $uuid_skip ||= $_[0];
3735
3736 return if $uuid_lock;
3737 local $uuid_lock = 1;
3738
3739 my $uuid = "$LOCALDIR/uuid";
3740
3741 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3742 or return;
3743
3744 my $value = uuid_seq uuid_cur;
3745
3746 unless ($value) {
3747 info "cowardly refusing to write zero uuid value!\n";
3748 return;
3749 }
3750
3751 my $value = uuid_str $value + $uuid_skip;
3752 $uuid_skip = 0;
3753
3754 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3755 and return;
3756
3757 # always fsync - this file is important
3758 aio_fsync $fh
3759 and return;
3760
3761 close $fh
3762 or return;
3763
3764 aio_rename "$uuid~", $uuid
3765 and return;
3766
3767 trace "uuid file written ($value).\n";
3768
3769 1
3770
3771}
3772
3773sub write_uuid($$) {
3774 my ($skip, $sync) = @_;
3775
3776 $sync ? write_uuid_sync $skip
3777 : async { write_uuid_sync $skip };
3386} 3778}
3387 3779
3388sub emergency_save() { 3780sub emergency_save() {
3389 my $freeze_guard = cf::freeze_mainloop; 3781 my $freeze_guard = cf::freeze_mainloop;
3390 3782
3391 warn "enter emergency perl save\n"; 3783 info "emergency_perl_save: enter\n";
3784
3785 # this is a trade-off: we want to be very quick here, so
3786 # save all maps without fsync, and later call a global sync
3787 # (which in turn might be very very slow)
3788 local $USE_FSYNC = 0;
3392 3789
3393 cf::sync_job { 3790 cf::sync_job {
3791 cf::write_runtime_sync; # external watchdog should not bark
3792
3394 # use a peculiar iteration method to avoid tripping on perl 3793 # use a peculiar iteration method to avoid tripping on perl
3395 # refcount bugs in for. also avoids problems with players 3794 # refcount bugs in for. also avoids problems with players
3396 # and maps saved/destroyed asynchronously. 3795 # and maps saved/destroyed asynchronously.
3397 warn "begin emergency player save\n"; 3796 info "emergency_perl_save: begin player save\n";
3398 for my $login (keys %cf::PLAYER) { 3797 for my $login (keys %cf::PLAYER) {
3399 my $pl = $cf::PLAYER{$login} or next; 3798 my $pl = $cf::PLAYER{$login} or next;
3400 $pl->valid or next; 3799 $pl->valid or next;
3401 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3800 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3402 $pl->save; 3801 $pl->save;
3403 } 3802 }
3404 warn "end emergency player save\n"; 3803 info "emergency_perl_save: end player save\n";
3405 3804
3406 warn "begin emergency map save\n"; 3805 cf::write_runtime_sync; # external watchdog should not bark
3806
3807 info "emergency_perl_save: begin map save\n";
3407 for my $path (keys %cf::MAP) { 3808 for my $path (keys %cf::MAP) {
3408 my $map = $cf::MAP{$path} or next; 3809 my $map = $cf::MAP{$path} or next;
3409 $map->valid or next; 3810 $map->valid or next;
3410 $map->save; 3811 $map->save;
3411 } 3812 }
3412 warn "end emergency map save\n"; 3813 info "emergency_perl_save: end map save\n";
3413 3814
3414 warn "begin emergency database checkpoint\n"; 3815 cf::write_runtime_sync; # external watchdog should not bark
3816
3817 info "emergency_perl_save: begin database checkpoint\n";
3415 BDB::db_env_txn_checkpoint $DB_ENV; 3818 BDB::db_env_txn_checkpoint $DB_ENV;
3416 warn "end emergency database checkpoint\n"; 3819 info "emergency_perl_save: end database checkpoint\n";
3820
3821 info "emergency_perl_save: begin write uuid\n";
3822 write_uuid_sync 1;
3823 info "emergency_perl_save: end write uuid\n";
3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3826
3827 trace "emergency_perl_save: syncing database to disk";
3828 BDB::db_env_txn_checkpoint $DB_ENV;
3829
3830 info "emergency_perl_save: starting sync\n";
3831 IO::AIO::aio_sync sub {
3832 info "emergency_perl_save: finished sync\n";
3833 };
3834
3835 cf::write_runtime_sync; # external watchdog should not bark
3836
3837 trace "emergency_perl_save: flushing outstanding aio requests";
3838 while (IO::AIO::nreqs || BDB::nreqs) {
3839 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3840 }
3841
3842 cf::write_runtime_sync; # external watchdog should not bark
3417 }; 3843 };
3418 3844
3419 warn "leave emergency perl save\n"; 3845 info "emergency_perl_save: leave\n";
3420} 3846}
3421 3847
3422sub post_cleanup { 3848sub post_cleanup {
3423 my ($make_core) = @_; 3849 my ($make_core) = @_;
3424 3850
3851 IO::AIO::flush;
3852
3425 warn Carp::longmess "post_cleanup backtrace" 3853 error Carp::longmess "post_cleanup backtrace"
3426 if $make_core; 3854 if $make_core;
3855
3856 my $fh = pidfile;
3857 unlink $PIDFILE if <$fh> == $$;
3858}
3859
3860# a safer delete_package, copied from Symbol
3861sub clear_package($) {
3862 my $pkg = shift;
3863
3864 # expand to full symbol table name if needed
3865 unless ($pkg =~ /^main::.*::$/) {
3866 $pkg = "main$pkg" if $pkg =~ /^::/;
3867 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3868 $pkg .= '::' unless $pkg =~ /::$/;
3869 }
3870
3871 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3872 my $stem_symtab = *{$stem}{HASH};
3873
3874 defined $stem_symtab and exists $stem_symtab->{$leaf}
3875 or return;
3876
3877 # clear all symbols
3878 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3879 for my $name (keys %$leaf_symtab) {
3880 _gv_clear *{"$pkg$name"};
3881# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3882 }
3427} 3883}
3428 3884
3429sub do_reload_perl() { 3885sub do_reload_perl() {
3430 # can/must only be called in main 3886 # can/must only be called in main
3431 if ($Coro::current != $Coro::main) { 3887 unless (in_main) {
3432 warn "can only reload from main coroutine"; 3888 error "can only reload from main coroutine";
3433 return; 3889 return;
3434 } 3890 }
3435 3891
3892 return if $RELOAD++;
3893
3894 my $t1 = AE::time;
3895
3896 while ($RELOAD) {
3897 cf::get_slot 0.1, -1, "reload_perl";
3436 warn "reloading..."; 3898 info "reloading...";
3437 3899
3438 warn "entering sync_job"; 3900 trace "entering sync_job";
3439 3901
3440 cf::sync_job { 3902 cf::sync_job {
3441 cf::write_runtime; # external watchdog should not bark
3442 cf::emergency_save; 3903 #cf::emergency_save;
3443 cf::write_runtime; # external watchdog should not bark
3444 3904
3445 warn "syncing database to disk";
3446 BDB::db_env_txn_checkpoint $DB_ENV;
3447
3448 # if anything goes wrong in here, we should simply crash as we already saved
3449
3450 warn "flushing outstanding aio requests";
3451 for (;;) {
3452 BDB::flush;
3453 IO::AIO::flush;
3454 Coro::cede_notself;
3455 last unless IO::AIO::nreqs || BDB::nreqs;
3456 warn "iterate...";
3457 }
3458
3459 ++$RELOAD;
3460
3461 warn "cancelling all extension coros"; 3905 trace "cancelling all extension coros";
3462 $_->cancel for values %EXT_CORO; 3906 $_->cancel for values %EXT_CORO;
3463 %EXT_CORO = (); 3907 %EXT_CORO = ();
3464 3908
3465 warn "removing commands"; 3909 trace "removing commands";
3466 %COMMAND = (); 3910 %COMMAND = ();
3467 3911
3468 warn "removing ext/exti commands"; 3912 trace "removing ext/exti commands";
3469 %EXTCMD = (); 3913 %EXTCMD = ();
3470 %EXTICMD = (); 3914 %EXTICMD = ();
3471 3915
3472 warn "unloading/nuking all extensions"; 3916 trace "unloading/nuking all extensions";
3473 for my $pkg (@EXTS) { 3917 for my $pkg (@EXTS) {
3474 warn "... unloading $pkg"; 3918 trace "... unloading $pkg";
3475 3919
3476 if (my $cb = $pkg->can ("unload")) { 3920 if (my $cb = $pkg->can ("unload")) {
3477 eval { 3921 eval {
3478 $cb->($pkg); 3922 $cb->($pkg);
3479 1 3923 1
3480 } or warn "$pkg unloaded, but with errors: $@"; 3924 } or error "$pkg unloaded, but with errors: $@";
3925 }
3926
3927 trace "... clearing $pkg";
3928 clear_package $pkg;
3481 } 3929 }
3482 3930
3483 warn "... nuking $pkg";
3484 Symbol::delete_package $pkg;
3485 }
3486
3487 warn "unloading all perl modules loaded from $LIBDIR"; 3931 trace "unloading all perl modules loaded from $LIBDIR";
3488 while (my ($k, $v) = each %INC) { 3932 while (my ($k, $v) = each %INC) {
3489 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3933 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3490 3934
3491 warn "... unloading $k"; 3935 trace "... unloading $k";
3492 delete $INC{$k}; 3936 delete $INC{$k};
3493 3937
3494 $k =~ s/\.pm$//; 3938 $k =~ s/\.pm$//;
3495 $k =~ s/\//::/g; 3939 $k =~ s/\//::/g;
3496 3940
3497 if (my $cb = $k->can ("unload_module")) { 3941 if (my $cb = $k->can ("unload_module")) {
3498 $cb->(); 3942 $cb->();
3943 }
3944
3945 clear_package $k;
3499 } 3946 }
3500 3947
3501 Symbol::delete_package $k;
3502 }
3503
3504 warn "getting rid of safe::, as good as possible"; 3948 trace "getting rid of safe::, as good as possible";
3505 Symbol::delete_package "safe::$_" 3949 clear_package "safe::$_"
3506 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3950 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3507 3951
3508 warn "unloading cf.pm \"a bit\""; 3952 trace "unloading cf.pm \"a bit\"";
3509 delete $INC{"cf.pm"}; 3953 delete $INC{"cf.pm"};
3510 delete $INC{"cf/pod.pm"}; 3954 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3511 3955
3512 # don't, removes xs symbols, too, 3956 # don't, removes xs symbols, too,
3513 # and global variables created in xs 3957 # and global variables created in xs
3514 #Symbol::delete_package __PACKAGE__; 3958 #clear_package __PACKAGE__;
3515 3959
3516 warn "unload completed, starting to reload now"; 3960 info "unload completed, starting to reload now";
3517 3961
3518 warn "reloading cf.pm"; 3962 trace "reloading cf.pm";
3519 require cf; 3963 require cf;
3520 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3964 cf::_connect_to_perl_1;
3521 3965
3522 warn "loading config and database again"; 3966 trace "loading config and database again";
3523 cf::reload_config; 3967 cf::reload_config;
3524 3968
3525 warn "loading extensions"; 3969 trace "loading extensions";
3526 cf::load_extensions; 3970 cf::load_extensions;
3527 3971
3972 if ($REATTACH_ON_RELOAD) {
3528 warn "reattaching attachments to objects/players"; 3973 trace "reattaching attachments to objects/players";
3529 _global_reattach; # objects, sockets 3974 _global_reattach; # objects, sockets
3530 warn "reattaching attachments to maps"; 3975 trace "reattaching attachments to maps";
3531 reattach $_ for values %MAP; 3976 reattach $_ for values %MAP;
3532 warn "reattaching attachments to players"; 3977 trace "reattaching attachments to players";
3533 reattach $_ for values %PLAYER; 3978 reattach $_ for values %PLAYER;
3979 }
3534 3980
3981 trace "running post_init jobs";
3982 (pop @POST_INIT)->(1) while @POST_INIT;
3983
3535 warn "leaving sync_job"; 3984 trace "leaving sync_job";
3536 3985
3537 1 3986 1
3538 } or do { 3987 } or do {
3539 warn $@; 3988 error $@;
3540 warn "error while reloading, exiting."; 3989 cf::cleanup "error while reloading, exiting.";
3541 exit 1; 3990 };
3991
3992 info "reloaded";
3993 --$RELOAD;
3542 }; 3994 }
3543 3995
3544 warn "reloaded"; 3996 $t1 = AE::time - $t1;
3997 info "reload completed in ${t1}s\n";
3545}; 3998};
3546 3999
3547our $RELOAD_WATCHER; # used only during reload 4000our $RELOAD_WATCHER; # used only during reload
3548 4001
3549sub reload_perl() { 4002sub reload_perl() {
3550 # doing reload synchronously and two reloads happen back-to-back, 4003 # doing reload synchronously and two reloads happen back-to-back,
3551 # coro crashes during coro_state_free->destroy here. 4004 # coro crashes during coro_state_free->destroy here.
3552 4005
4006 $RELOAD_WATCHER ||= cf::async {
4007 Coro::AIO::aio_wait cache_extensions;
4008
3553 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4009 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
4010 do_reload_perl;
3554 undef $RELOAD_WATCHER; 4011 undef $RELOAD_WATCHER;
3555 do_reload_perl; 4012 };
3556 }; 4013 };
3557} 4014}
3558 4015
3559register_command "reload" => sub { 4016register_command "reload" => sub {
3560 my ($who, $arg) = @_; 4017 my ($who, $arg) = @_;
3566 reload_perl; 4023 reload_perl;
3567 }; 4024 };
3568 } 4025 }
3569}; 4026};
3570 4027
3571unshift @INC, $LIBDIR; 4028#############################################################################
3572 4029
3573my $bug_warning = 0; 4030my $bug_warning = 0;
3574 4031
3575our @WAIT_FOR_TICK; 4032our @WAIT_FOR_TICK;
3576our @WAIT_FOR_TICK_BEGIN; 4033our @WAIT_FOR_TICK_BEGIN;
3577 4034
3578sub wait_for_tick { 4035sub wait_for_tick() {
3579 return unless $TICK_WATCHER->is_active;
3580 return if $Coro::current == $Coro::main; 4036 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3581 4037
3582 my $signal = new Coro::Signal; 4038 my $signal = new Coro::Signal;
3583 push @WAIT_FOR_TICK, $signal; 4039 push @WAIT_FOR_TICK, $signal;
3584 $signal->wait; 4040 $signal->wait;
3585} 4041}
3586 4042
3587sub wait_for_tick_begin { 4043sub wait_for_tick_begin() {
3588 return unless $TICK_WATCHER->is_active;
3589 return if $Coro::current == $Coro::main; 4044 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3590 4045
3591 my $signal = new Coro::Signal; 4046 my $signal = new Coro::Signal;
3592 push @WAIT_FOR_TICK_BEGIN, $signal; 4047 push @WAIT_FOR_TICK_BEGIN, $signal;
3593 $signal->wait; 4048 $signal->wait;
3594} 4049}
3595 4050
3596$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 4051sub tick {
3597 if ($Coro::current != $Coro::main) { 4052 if ($Coro::current != $Coro::main) {
3598 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4053 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3599 unless ++$bug_warning > 10; 4054 unless ++$bug_warning > 10;
3600 return; 4055 return;
3601 } 4056 }
3602 4057
3603 $NOW = $tick_start = EV::now;
3604
3605 cf::server_tick; # one server iteration 4058 cf::server_tick; # one server iteration
3606 4059
3607 $RUNTIME += $TICK; 4060 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3608 $NEXT_TICK += $TICK;
3609 4061
3610 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4062 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3611 $NEXT_RUNTIME_WRITE = $NOW + 10; 4063 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3612 Coro::async_pool { 4064 Coro::async_pool {
3613 $Coro::current->{desc} = "runtime saver"; 4065 $Coro::current->{desc} = "runtime saver";
3614 write_runtime 4066 write_runtime_sync
3615 or warn "ERROR: unable to write runtime file: $!"; 4067 or error "ERROR: unable to write runtime file: $!";
3616 }; 4068 };
3617 } 4069 }
3618 4070
3619 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4071 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3620 $sig->send; 4072 $sig->send;
3621 } 4073 }
3622 while (my $sig = shift @WAIT_FOR_TICK) { 4074 while (my $sig = shift @WAIT_FOR_TICK) {
3623 $sig->send; 4075 $sig->send;
3624 } 4076 }
3625 4077
3626 $LOAD = ($NOW - $tick_start) / $TICK; 4078 $LOAD = ($NOW - $TICK_START) / $TICK;
3627 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4079 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3628 4080
3629 _post_tick; 4081 if (0) {
3630}; 4082 if ($NEXT_TICK) {
3631$TICK_WATCHER->priority (EV::MAXPRI); 4083 my $jitter = $TICK_START - $NEXT_TICK;
4084 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4085 debug "jitter $JITTER\n";#d#
4086 }
4087 }
4088}
3632 4089
3633{ 4090{
4091 # configure BDB
4092
3634 BDB::min_parallel 8; 4093 BDB::min_parallel 16;
3635 BDB::max_poll_time $TICK * 0.1; 4094 BDB::max_poll_reqs $TICK * 0.1;
3636 $BDB_POLL_WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb; 4095 $AnyEvent::BDB::WATCHER->priority (1);
3637
3638 BDB::set_sync_prepare {
3639 my $status;
3640 my $current = $Coro::current;
3641 (
3642 sub {
3643 $status = $!;
3644 $current->ready; undef $current;
3645 },
3646 sub {
3647 Coro::schedule while defined $current;
3648 $! = $status;
3649 },
3650 )
3651 };
3652 4096
3653 unless ($DB_ENV) { 4097 unless ($DB_ENV) {
3654 $DB_ENV = BDB::db_env_create; 4098 $DB_ENV = BDB::db_env_create;
3655 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4099 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3656 | BDB::LOG_AUTOREMOVE, 1); 4100 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4101 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3657 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4102 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3658 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4103 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3659 4104
3660 cf::sync_job { 4105 cf::sync_job {
3661 eval { 4106 eval {
3683 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4128 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3684 }; 4129 };
3685} 4130}
3686 4131
3687{ 4132{
4133 # configure IO::AIO
4134
3688 IO::AIO::min_parallel 8; 4135 IO::AIO::min_parallel 8;
3689
3690 undef $Coro::AIO::WATCHER;
3691 IO::AIO::max_poll_time $TICK * 0.1; 4136 IO::AIO::max_poll_time $TICK * 0.1;
3692 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb; 4137 undef $AnyEvent::AIO::WATCHER;
3693} 4138}
3694 4139
3695my $_log_backtrace; 4140my $_log_backtrace;
3696 4141
3697sub _log_backtrace { 4142sub _log_backtrace {
3700 $msg =~ s/\n//; 4145 $msg =~ s/\n//;
3701 4146
3702 # limit the # of concurrent backtraces 4147 # limit the # of concurrent backtraces
3703 if ($_log_backtrace < 2) { 4148 if ($_log_backtrace < 2) {
3704 ++$_log_backtrace; 4149 ++$_log_backtrace;
4150 my $perl_bt = Carp::longmess $msg;
3705 async { 4151 async {
3706 $Coro::current->{desc} = "abt $msg"; 4152 $Coro::current->{desc} = "abt $msg";
3707 4153
3708 my @bt = fork_call { 4154 my @bt = fork_call {
3709 @addr = map { sprintf "%x", $_ } @addr; 4155 @addr = map { sprintf "%x", $_ } @addr;
3720 } 4166 }
3721 4167
3722 @funcs 4168 @funcs
3723 }; 4169 };
3724 4170
3725 LOG llevInfo, "[ABT] $msg\n"; 4171 LOG llevInfo, "[ABT] $perl_bt\n";
4172 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3726 LOG llevInfo, "[ABT] $_\n" for @bt; 4173 LOG llevInfo, "[ABT] $_\n" for @bt;
3727 --$_log_backtrace; 4174 --$_log_backtrace;
3728 }; 4175 };
3729 } else { 4176 } else {
3730 LOG llevInfo, "[ABT] $msg\n"; 4177 LOG llevInfo, "[ABT] $msg\n";
3731 LOG llevInfo, "[ABT] [suppressed]\n"; 4178 LOG llevInfo, "[ABT] [suppressed]\n";
3732 } 4179 }
3733} 4180}
3734 4181
3735# load additional modules 4182# load additional modules
3736use cf::pod; 4183require "cf/$_.pm" for @EXTRA_MODULES;
4184cf::_connect_to_perl_2;
3737 4185
3738END { cf::emergency_save } 4186END { cf::emergency_save }
3739 4187
37401 41881
3741 4189

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines