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.372 by root, Sat Sep 15 13:25:33 2007 UTC vs.
Revision 1.494 by root, Mon Oct 26 05:18:00 2009 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
25use 5.10.0;
3use utf8; 26use utf8;
4use strict; 27use strict qw(vars subs);
5 28
6use Symbol; 29use Symbol;
7use List::Util; 30use List::Util;
8use Socket; 31use Socket;
9use Storable; 32use EV;
10use Event;
11use Opcode; 33use Opcode;
12use Safe; 34use Safe;
13use Safe::Hole; 35use Safe::Hole;
36use Storable ();
37use Carp ();
14 38
39use Guard ();
15use Coro 3.64 (); 40use Coro ();
16use Coro::State; 41use Coro::State;
17use Coro::Handle; 42use Coro::Handle;
43use Coro::EV;
18use Coro::Event; 44use Coro::AnyEvent;
19use Coro::Timer; 45use Coro::Timer;
20use Coro::Signal; 46use Coro::Signal;
21use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
22use Coro::AIO; 50use Coro::AIO;
51use Coro::BDB 1.6;
23use Coro::Storable; 52use Coro::Storable;
24use Coro::Util (); 53use Coro::Util ();
25 54
26use JSON::XS (); 55use JSON::XS 2.01 ();
27use BDB (); 56use BDB ();
28use Data::Dumper; 57use Data::Dumper;
29use Digest::MD5; 58use Digest::MD5;
30use Fcntl; 59use Fcntl;
31use YAML::Syck (); 60use YAML::XS ();
32use IO::AIO 2.32 (); 61use IO::AIO ();
33use Time::HiRes; 62use Time::HiRes;
34use Compress::LZF; 63use Compress::LZF;
35use Digest::MD5 (); 64use Digest::MD5 ();
65
66AnyEvent::detect;
36 67
37# configure various modules to our taste 68# configure various modules to our taste
38# 69#
39$Storable::canonical = 1; # reduce rsync transfers 70$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 71Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
72
73$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
74
75# make sure c-lzf reinitialises itself
76Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 77Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42 78
43$Event::Eval = 1; # no idea why this is required, but it is 79# strictly for debugging
44 80$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 81
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 83
52our %COMMAND = (); 84our %COMMAND = ();
53our %COMMAND_TIME = (); 85our %COMMAND_TIME = ();
… …
56our %EXTCMD = (); 88our %EXTCMD = ();
57our %EXTICMD = (); 89our %EXTICMD = ();
58our %EXT_CORO = (); # coroutines bound to extensions 90our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps 91our %EXT_MAP = (); # pluggable maps
60 92
61our $RELOAD; # number of reloads so far 93our $RELOAD; # number of reloads so far, non-zero while in reload
62our @EVENT; 94our @EVENT;
95our @REFLECT; # set by XS
96our %REFLECT; # set by us
63 97
64our $CONFDIR = confdir; 98our $CONFDIR = confdir;
65our $DATADIR = datadir; 99our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 103our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 104our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 105our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 106our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 107our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 108our $BDBDIR = "$LOCALDIR/db";
109our $PIDFILE = "$LOCALDIR/pid";
110our $RUNTIMEFILE = "$LOCALDIR/runtime";
111
112our %RESOURCE;
75 113
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 114our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 115our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 116our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 117our $USE_FSYNC = 1; # use fsync to write maps - default on
83 118
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 119our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 120our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 121our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 122our $DB_ENV;
89 123
124our @EXTRA_MODULES = qw(pod match mapscript);
125
90our %CFG; 126our %CFG;
91 127
92our $UPTIME; $UPTIME ||= time; 128our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 129our $RUNTIME;
130our $NOW;
94 131
95our (%PLAYER, %PLAYER_LOADING); # all users 132our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 133our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 134our $LINK_MAP; # the special {link} map, which is always available
98 135
99# used to convert map paths into valid unix filenames by replacing / by ∕ 136# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 137our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 138
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 139our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 140our $LOADAVG; # same thing, but with alpha-smoothing
141our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 142our $TICK_START; # for load detecting purposes
143
144our @POST_INIT;
145
146our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
147our $REALLY_UNLOOP; # never set to true, please :)
105 148
106binmode STDOUT; 149binmode STDOUT;
107binmode STDERR; 150binmode STDERR;
108 151
109# read virtual server time, if available 152# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 153unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 154 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 155 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 156 $RUNTIME = <$fh> + 0.;
114} 157}
158
159eval "sub TICK() { $TICK } 1" or die;
115 160
116mkdir $_ 161mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 162 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
118 163
119our $EMERGENCY_POSITION; 164our $EMERGENCY_POSITION;
120 165
121sub cf::map::normalise; 166sub cf::map::normalise;
167
168#############################################################################
169
170%REFLECT = ();
171for (@REFLECT) {
172 my $reflect = JSON::XS::decode_json $_;
173 $REFLECT{$reflect->{class}} = $reflect;
174}
175
176# this is decidedly evil
177$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
122 178
123############################################################################# 179#############################################################################
124 180
125=head2 GLOBAL VARIABLES 181=head2 GLOBAL VARIABLES
126 182
… …
162 218
163The raw value load value from the last tick. 219The raw value load value from the last tick.
164 220
165=item %cf::CFG 221=item %cf::CFG
166 222
167Configuration for the server, loaded from C</etc/crossfire/config>, or 223Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 224from wherever your confdir points to.
169 225
170=item cf::wait_for_tick, cf::wait_for_tick_begin 226=item cf::wait_for_tick, cf::wait_for_tick_begin
171 227
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 228These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
173returns directly I<after> the tick processing (and consequently, can only wake one process 229returns directly I<after> the tick processing (and consequently, can only wake one process
174per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 230per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
175 231
176=item @cf::INVOKE_RESULTS 232=item @cf::INVOKE_RESULTS
177 233
178This array contains the results of the last C<invoke ()> call. When 234This array contains the results of the last C<invoke ()> call. When
179C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 235C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call. 236that call.
181 237
238=item %cf::REFLECT
239
240Contains, for each (C++) class name, a hash reference with information
241about object members (methods, scalars, arrays and flags) and other
242metadata, which is useful for introspection.
243
182=back 244=back
183 245
184=cut 246=cut
185 247
186BEGIN { 248$Coro::State::WARNHOOK = sub {
187 *CORE::GLOBAL::warn = sub {
188 my $msg = join "", @_; 249 my $msg = join "", @_;
189 250
190 $msg .= "\n" 251 $msg .= "\n"
191 unless $msg =~ /\n$/; 252 unless $msg =~ /\n$/;
192 253
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 254 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 255
195 LOG llevError, $msg; 256 LOG llevError, $msg;
196 }; 257};
197} 258
259$Coro::State::DIEHOOK = sub {
260 return unless $^S eq 0; # "eq", not "=="
261
262 warn Carp::longmess $_[0];
263
264 if ($Coro::current == $Coro::main) {#d#
265 warn "DIEHOOK called in main context, Coro bug?\n";#d#
266 return;#d#
267 }#d#
268
269 # kill coroutine otherwise
270 Coro::terminate
271};
198 272
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 273@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 274@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 275@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 276@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
209for my $pkg (qw( 283for my $pkg (qw(
210 cf::global cf::attachable 284 cf::global cf::attachable
211 cf::object cf::object::player 285 cf::object cf::object::player
212 cf::client cf::player 286 cf::client cf::player
213 cf::arch cf::living 287 cf::arch cf::living
288 cf::map cf::mapspace
214 cf::map cf::party cf::region 289 cf::party cf::region
215)) { 290)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 291 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 292}
219 293
220$Event::DIED = sub { 294$EV::DIED = sub {
221 warn "error in event callback: @_"; 295 Carp::cluck "error in event callback: @_";
222}; 296};
223 297
224############################################################################# 298#############################################################################
225 299
226=head2 UTILITY FUNCTIONS 300=head2 UTILITY FUNCTIONS
… …
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 322 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 323 $d
250 } || "[unable to dump $_[0]: '$@']"; 324 } || "[unable to dump $_[0]: '$@']";
251} 325}
252 326
253=item $ref = cf::from_json $json 327=item $ref = cf::decode_json $json
254 328
255Converts a JSON string into the corresponding perl data structure. 329Converts a JSON string into the corresponding perl data structure.
256 330
257=item $json = cf::to_json $ref 331=item $json = cf::encode_json $ref
258 332
259Converts a perl data structure into its JSON representation. 333Converts a perl data structure into its JSON representation.
260 334
261=cut 335=cut
262 336
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 337our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 338
265sub to_json ($) { $json_coder->encode ($_[0]) } 339sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 340sub decode_json($) { $json_coder->decode ($_[0]) }
341
342=item cf::post_init { BLOCK }
343
344Execute the given codeblock, I<after> all extensions have been (re-)loaded,
345but I<before> the server starts ticking again.
346
347The cdoeblock will have a single boolean argument to indicate whether this
348is a reload or not.
349
350=cut
351
352sub post_init(&) {
353 push @POST_INIT, shift;
354}
267 355
268=item cf::lock_wait $string 356=item cf::lock_wait $string
269 357
270Wait until the given lock is available. See cf::lock_acquire. 358Wait until the given lock is available. See cf::lock_acquire.
271 359
272=item my $lock = cf::lock_acquire $string 360=item my $lock = cf::lock_acquire $string
273 361
274Wait until the given lock is available and then acquires it and returns 362Wait until the given lock is available and then acquires it and returns
275a Coro::guard object. If the guard object gets destroyed (goes out of scope, 363a L<Guard> object. If the guard object gets destroyed (goes out of scope,
276for example when the coroutine gets canceled), the lock is automatically 364for example when the coroutine gets canceled), the lock is automatically
277returned. 365returned.
278 366
279Locks are *not* recursive, locking from the same coro twice results in a 367Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro. 368deadlocked coro.
… …
286 374
287Return true if the lock is currently active, i.e. somebody has locked it. 375Return true if the lock is currently active, i.e. somebody has locked it.
288 376
289=cut 377=cut
290 378
291our %LOCK; 379our $LOCKS = new Coro::SemaphoreSet;
292our %LOCKER;#d#
293 380
294sub lock_wait($) { 381sub lock_wait($) {
295 my ($key) = @_; 382 $LOCKS->wait ($_[0]);
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
301
302 # wait for lock, if any
303 while ($LOCK{$key}) {
304 push @{ $LOCK{$key} }, $Coro::current;
305 Coro::schedule;
306 }
307} 383}
308 384
309sub lock_acquire($) { 385sub lock_acquire($) {
310 my ($key) = @_; 386 $LOCKS->guard ($_[0])
311
312 # wait, to be sure we are not locked
313 lock_wait $key;
314
315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
317
318 Coro::guard {
319 delete $LOCKER{$key};#d#
320 # wake up all waiters, to be on the safe side
321 $_->ready for @{ delete $LOCK{$key} };
322 }
323} 387}
324 388
325sub lock_active($) { 389sub lock_active($) {
326 my ($key) = @_; 390 $LOCKS->count ($_[0]) < 1
327
328 ! ! $LOCK{$key}
329} 391}
330 392
331sub freeze_mainloop { 393sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 394 tick_inhibit_inc;
333 395
334 my $guard = Coro::guard { 396 &Guard::guard (\&tick_inhibit_dec);
335 $TICK_WATCHER->start; 397}
336 }; 398
337 $TICK_WATCHER->stop; 399=item cf::periodic $interval, $cb
338 $guard 400
401Like EV::periodic, but randomly selects a starting point so that the actions
402get spread over timer.
403
404=cut
405
406sub periodic($$) {
407 my ($interval, $cb) = @_;
408
409 my $start = rand List::Util::min 180, $interval;
410
411 EV::periodic $start, $interval, 0, $cb
339} 412}
340 413
341=item cf::get_slot $time[, $priority[, $name]] 414=item cf::get_slot $time[, $priority[, $name]]
342 415
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 416Allocate $time seconds of blocking CPU time at priority C<$priority>:
… …
354our @SLOT_QUEUE; 427our @SLOT_QUEUE;
355our $SLOT_QUEUE; 428our $SLOT_QUEUE;
356 429
357$SLOT_QUEUE->cancel if $SLOT_QUEUE; 430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async { 431$SLOT_QUEUE = Coro::async {
432 $Coro::current->desc ("timeslot manager");
433
359 my $signal = new Coro::Signal; 434 my $signal = new Coro::Signal;
360 435
361 while () { 436 while () {
362 next_job: 437 next_job:
363 my $avail = cf::till_tick; 438 my $avail = cf::till_tick;
… …
371 } 446 }
372 } 447 }
373 } 448 }
374 449
375 if (@SLOT_QUEUE) { 450 if (@SLOT_QUEUE) {
376 # we do not use wait_For_tick() as it returns immediately when tick is inactive 451 # we do not use wait_for_tick() as it returns immediately when tick is inactive
377 push @cf::WAIT_FOR_TICK, $signal; 452 push @cf::WAIT_FOR_TICK, $signal;
378 $signal->wait; 453 $signal->wait;
379 } else { 454 } else {
380 Coro::schedule; 455 Coro::schedule;
381 } 456 }
382 } 457 }
383}; 458};
384 459
385sub get_slot($;$$) { 460sub get_slot($;$$) {
461 return if tick_inhibit || $Coro::current == $Coro::main;
462
386 my ($time, $pri, $name) = @_; 463 my ($time, $pri, $name) = @_;
387 464
388 $time = $TICK * .6 if $time > $TICK * .6; 465 $time = $TICK * .6 if $time > $TICK * .6;
389 my $sig = new Coro::Signal; 466 my $sig = new Coro::Signal;
390 467
… …
404 481
405BEGIN { *async = \&Coro::async_pool } 482BEGIN { *async = \&Coro::async_pool }
406 483
407=item cf::sync_job { BLOCK } 484=item cf::sync_job { BLOCK }
408 485
409The design of Crossfire TRT requires that the main coroutine ($Coro::main) 486The design of Deliantra requires that the main coroutine ($Coro::main)
410is always able to handle events or runnable, as Crossfire TRT is only 487is always able to handle events or runnable, as Deliantra is only
411partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 488partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
412acceptable. 489acceptable.
413 490
414If it must be done, put the blocking parts into C<sync_job>. This will run 491If it must be done, put the blocking parts into C<sync_job>. This will run
415the given BLOCK in another coroutine while waiting for the result. The 492the given BLOCK in another coroutine while waiting for the result. The
… …
420 497
421sub sync_job(&) { 498sub sync_job(&) {
422 my ($job) = @_; 499 my ($job) = @_;
423 500
424 if ($Coro::current == $Coro::main) { 501 if ($Coro::current == $Coro::main) {
425 my $time = Event::time; 502 my $time = EV::time;
426 503
427 # this is the main coro, too bad, we have to block 504 # this is the main coro, too bad, we have to block
428 # till the operation succeeds, freezing the server :/ 505 # till the operation succeeds, freezing the server :/
429 506
430 # TODO: use suspend/resume instead 507 LOG llevError, Carp::longmess "sync job";#d#
431 # (but this is cancel-safe) 508
432 my $freeze_guard = freeze_mainloop; 509 my $freeze_guard = freeze_mainloop;
433 510
434 my $busy = 1; 511 my $busy = 1;
435 my @res; 512 my @res;
436 513
437 (async { 514 (async {
515 $Coro::current->desc ("sync job coro");
438 @res = eval { $job->() }; 516 @res = eval { $job->() };
439 warn $@ if $@; 517 warn $@ if $@;
440 undef $busy; 518 undef $busy;
441 })->prio (Coro::PRIO_MAX); 519 })->prio (Coro::PRIO_MAX);
442 520
443 while ($busy) { 521 while ($busy) {
444 Coro::cede or Event::one_event; 522 if (Coro::nready) {
523 Coro::cede_notself;
524 } else {
525 EV::loop EV::LOOP_ONESHOT;
445 } 526 }
527 }
446 528
447 $time = Event::time - $time; 529 my $time = EV::time - $time;
448 530
449 LOG llevError | logBacktrace, Carp::longmess "long sync job"
450 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
451
452 $tick_start += $time; # do not account sync jobs to server load 531 $TICK_START += $time; # do not account sync jobs to server load
453 532
454 wantarray ? @res : $res[0] 533 wantarray ? @res : $res[0]
455 } else { 534 } else {
456 # we are in another coroutine, how wonderful, everything just works 535 # we are in another coroutine, how wonderful, everything just works
457 536
… …
482=item fork_call { }, $args 561=item fork_call { }, $args
483 562
484Executes the given code block with the given arguments in a seperate 563Executes the given code block with the given arguments in a seperate
485process, returning the results. Everything must be serialisable with 564process, returning the results. Everything must be serialisable with
486Coro::Storable. May, of course, block. Note that the executed sub may 565Coro::Storable. May, of course, block. Note that the executed sub may
487never block itself or use any form of Event handling. 566never block itself or use any form of event handling.
488 567
489=cut 568=cut
490 569
491sub fork_call(&@) { 570sub fork_call(&@) {
492 my ($cb, @args) = @_; 571 my ($cb, @args) = @_;
… …
499 reset_signals; 578 reset_signals;
500 &$cb 579 &$cb
501 }, @args; 580 }, @args;
502 581
503 wantarray ? @res : $res[-1] 582 wantarray ? @res : $res[-1]
583}
584
585=item $coin = coin_from_name $name
586
587=cut
588
589our %coin_alias = (
590 "silver" => "silvercoin",
591 "silvercoin" => "silvercoin",
592 "silvercoins" => "silvercoin",
593 "gold" => "goldcoin",
594 "goldcoin" => "goldcoin",
595 "goldcoins" => "goldcoin",
596 "platinum" => "platinacoin",
597 "platinumcoin" => "platinacoin",
598 "platinumcoins" => "platinacoin",
599 "platina" => "platinacoin",
600 "platinacoin" => "platinacoin",
601 "platinacoins" => "platinacoin",
602 "royalty" => "royalty",
603 "royalties" => "royalty",
604);
605
606sub coin_from_name($) {
607 $coin_alias{$_[0]}
608 ? cf::arch::find $coin_alias{$_[0]}
609 : undef
504} 610}
505 611
506=item $value = cf::db_get $family => $key 612=item $value = cf::db_get $family => $key
507 613
508Returns a single value from the environment database. 614Returns a single value from the environment database.
… …
647 753
648############################################################################# 754#############################################################################
649 755
650=head2 ATTACHABLE OBJECTS 756=head2 ATTACHABLE OBJECTS
651 757
652Many objects in crossfire are so-called attachable objects. That means you can 758Many objects in deliantra are so-called attachable objects. That means you can
653attach callbacks/event handlers (a collection of which is called an "attachment") 759attach callbacks/event handlers (a collection of which is called an "attachment")
654to it. All such attachable objects support the following methods. 760to it. All such attachable objects support the following methods.
655 761
656In the following description, CLASS can be any of C<global>, C<object> 762In the following description, CLASS can be any of C<global>, C<object>
657C<player>, C<client> or C<map> (i.e. the attachable objects in 763C<player>, C<client> or C<map> (i.e. the attachable objects in
658Crossfire TRT). 764Deliantra).
659 765
660=over 4 766=over 4
661 767
662=item $attachable->attach ($attachment, key => $value...) 768=item $attachable->attach ($attachment, key => $value...)
663 769
… …
707=item cf::CLASS::attachment $name, ... 813=item cf::CLASS::attachment $name, ...
708 814
709Register an attachment by C<$name> through which attachable objects of the 815Register an attachment by C<$name> through which attachable objects of the
710given CLASS can refer to this attachment. 816given CLASS can refer to this attachment.
711 817
712Some classes such as crossfire maps and objects can specify attachments 818Some classes such as deliantra maps and objects can specify attachments
713that are attached at load/instantiate time, thus the need for a name. 819that are attached at load/instantiate time, thus the need for a name.
714 820
715These calls expect any number of the following handler/hook descriptions: 821These calls expect any number of the following handler/hook descriptions:
716 822
717=over 4 823=over 4
… …
945 } 1051 }
946 1052
947 0 1053 0
948} 1054}
949 1055
950=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1056=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
951 1057
952=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1058=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
953 1059
954Generate an object-specific event with the given arguments. 1060Generate an object-specific event with the given arguments.
955 1061
… …
961 1067
962=cut 1068=cut
963 1069
964############################################################################# 1070#############################################################################
965# object support 1071# object support
966#
967 1072
1073sub _object_equal($$);
1074sub _object_equal($$) {
1075 my ($a, $b) = @_;
1076
1077 return 0 unless (ref $a) eq (ref $b);
1078
1079 if ("HASH" eq ref $a) {
1080 my @ka = keys %$a;
1081 my @kb = keys %$b;
1082
1083 return 0 if @ka != @kb;
1084
1085 for (0 .. $#ka) {
1086 return 0 unless $ka[$_] eq $kb[$_];
1087 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1088 }
1089
1090 } elsif ("ARRAY" eq ref $a) {
1091
1092 return 0 if @$a != @$b;
1093
1094 for (0 .. $#$a) {
1095 return 0 unless _object_equal $a->[$_], $b->[$_];
1096 }
1097
1098 } elsif ($a ne $b) {
1099 return 0;
1100 }
1101
1102 1
1103}
1104
1105our $SLOW_MERGES;#d#
968sub _can_merge { 1106sub _can_merge {
969 my ($ob1, $ob2) = @_; 1107 my ($ob1, $ob2) = @_;
970 1108
971 local $Storable::canonical = 1; 1109 ++$SLOW_MERGES;#d#
972 my $fob1 = Storable::freeze $ob1;
973 my $fob2 = Storable::freeze $ob2;
974 1110
975 $fob1 eq $fob2 1111 # we do the slow way here
1112 return _object_equal $ob1, $ob2
976} 1113}
977 1114
978sub reattach { 1115sub reattach {
979 # basically do the same as instantiate, without calling instantiate 1116 # basically do the same as instantiate, without calling instantiate
980 my ($obj) = @_; 1117 my ($obj) = @_;
981 1118
1119 # no longer needed after getting rid of delete_package?
982 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1120 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
983 1121
984 my $registry = $obj->registry; 1122 my $registry = $obj->registry;
985 1123
986 @$registry = (); 1124 @$registry = ();
987 1125
… …
1002cf::attachable->attach ( 1140cf::attachable->attach (
1003 prio => -1000000, 1141 prio => -1000000,
1004 on_instantiate => sub { 1142 on_instantiate => sub {
1005 my ($obj, $data) = @_; 1143 my ($obj, $data) = @_;
1006 1144
1007 $data = from_json $data; 1145 $data = decode_json $data;
1008 1146
1009 for (@$data) { 1147 for (@$data) {
1010 my ($name, $args) = @$_; 1148 my ($name, $args) = @$_;
1011 1149
1012 $obj->attach ($name, %{$args || {} }); 1150 $obj->attach ($name, %{$args || {} });
… …
1025 }, 1163 },
1026); 1164);
1027 1165
1028sub object_freezer_save { 1166sub object_freezer_save {
1029 my ($filename, $rdata, $objs) = @_; 1167 my ($filename, $rdata, $objs) = @_;
1030
1031 my $guard = cf::lock_acquire "io";
1032 1168
1033 sync_job { 1169 sync_job {
1034 if (length $$rdata) { 1170 if (length $$rdata) {
1035 utf8::decode (my $decname = $filename); 1171 utf8::decode (my $decname = $filename);
1036 warn sprintf "saving %s (%d,%d)\n", 1172 warn sprintf "saving %s (%d,%d)\n",
1037 $decname, length $$rdata, scalar @$objs; 1173 $decname, length $$rdata, scalar @$objs;
1038 1174
1039 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1175 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1040 chmod SAVE_MODE, $fh; 1176 aio_chmod $fh, SAVE_MODE;
1041 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1177 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1042 aio_fsync $fh if $cf::USE_FSYNC; 1178 if ($cf::USE_FSYNC) {
1179 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;
1180 aio_fsync $fh;
1181 }
1043 close $fh; 1182 aio_close $fh;
1044 1183
1045 if (@$objs) { 1184 if (@$objs) {
1046 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1185 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1047 chmod SAVE_MODE, $fh; 1186 aio_chmod $fh, SAVE_MODE;
1048 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1187 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1049 aio_write $fh, 0, (length $data), $data, 0; 1188 aio_write $fh, 0, (length $data), $data, 0;
1050 aio_fsync $fh if $cf::USE_FSYNC; 1189 if ($cf::USE_FSYNC) {
1190 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;
1191 aio_fsync $fh;
1192 }
1051 close $fh; 1193 aio_close $fh;
1052 aio_rename "$filename.pst~", "$filename.pst"; 1194 aio_rename "$filename.pst~", "$filename.pst";
1053 } 1195 }
1054 } else { 1196 } else {
1055 aio_unlink "$filename.pst"; 1197 aio_unlink "$filename.pst";
1056 } 1198 }
1057 1199
1058 aio_rename "$filename~", $filename; 1200 aio_rename "$filename~", $filename;
1201
1202 $filename =~ s%/[^/]+$%%;
1203 aio_pathsync $filename if $cf::USE_FSYNC;
1059 } else { 1204 } else {
1060 warn "FATAL: $filename~: $!\n"; 1205 warn "unable to save objects: $filename~: $!\n";
1061 } 1206 }
1062 } else { 1207 } else {
1063 aio_unlink $filename; 1208 aio_unlink $filename;
1064 aio_unlink "$filename.pst"; 1209 aio_unlink "$filename.pst";
1065 } 1210 }
1066 }; 1211 };
1067
1068 undef $guard;
1069} 1212}
1070 1213
1071sub object_freezer_as_string { 1214sub object_freezer_as_string {
1072 my ($rdata, $objs) = @_; 1215 my ($rdata, $objs) = @_;
1073 1216
… …
1078 1221
1079sub object_thawer_load { 1222sub object_thawer_load {
1080 my ($filename) = @_; 1223 my ($filename) = @_;
1081 1224
1082 my ($data, $av); 1225 my ($data, $av);
1083
1084 my $guard = cf::lock_acquire "io";
1085 1226
1086 (aio_load $filename, $data) >= 0 1227 (aio_load $filename, $data) >= 0
1087 or return; 1228 or return;
1088 1229
1089 unless (aio_stat "$filename.pst") { 1230 unless (aio_stat "$filename.pst") {
1090 (aio_load "$filename.pst", $av) >= 0 1231 (aio_load "$filename.pst", $av) >= 0
1091 or return; 1232 or return;
1092 1233
1093 undef $guard;
1094 $av = eval { (Storable::thaw $av)->{objs} }; 1234 my $st = eval { Coro::Storable::thaw $av };
1235 $av = $st->{objs};
1095 } 1236 }
1096 1237
1097 utf8::decode (my $decname = $filename); 1238 utf8::decode (my $decname = $filename);
1098 warn sprintf "loading %s (%d,%d)\n", 1239 warn sprintf "loading %s (%d,%d)\n",
1099 $decname, length $data, scalar @{$av || []}; 1240 $decname, length $data, scalar @{$av || []};
… …
1160 my ($name, $cb) = @_; 1301 my ($name, $cb) = @_;
1161 1302
1162 $EXTICMD{$name} = $cb; 1303 $EXTICMD{$name} = $cb;
1163} 1304}
1164 1305
1306use File::Glob ();
1307
1165cf::player->attach ( 1308cf::player->attach (
1166 on_command => sub { 1309 on_command => sub {
1167 my ($pl, $name, $params) = @_; 1310 my ($pl, $name, $params) = @_;
1168 1311
1169 my $cb = $COMMAND{$name} 1312 my $cb = $COMMAND{$name}
… …
1201 1344
1202 cf::override; 1345 cf::override;
1203 }, 1346 },
1204); 1347);
1205 1348
1349# "readahead" all extensions
1350sub cache_extensions {
1351 my $grp = IO::AIO::aio_group;
1352
1353 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1354 for (grep /\.ext$/, @{$_[0]}) {
1355 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1356 }
1357 };
1358
1359 $grp
1360}
1361
1206sub load_extensions { 1362sub load_extensions {
1207 cf::sync_job { 1363 cf::sync_job {
1208 my %todo; 1364 my %todo;
1209 1365
1210 for my $path (<$LIBDIR/*.ext>) { 1366 for my $path (<$LIBDIR/*.ext>) {
… …
1229 1385
1230 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1386 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1231 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1387 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1232 1388
1233 $ext{source} = 1389 $ext{source} =
1234 "package $pkg; use strict; use utf8;\n" 1390 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1235 . "#line 1 \"$path\"\n{\n" 1391 . "#line 1 \"$path\"\n{\n"
1236 . $source 1392 . $source
1237 . "\n};\n1"; 1393 . "\n};\n1";
1238 1394
1239 $todo{$base} = \%ext; 1395 $todo{$base} = \%ext;
… …
1255 my $msg = $@ ? "$v->{path}: $@\n" 1411 my $msg = $@ ? "$v->{path}: $@\n"
1256 : "$v->{base}: extension inactive.\n"; 1412 : "$v->{base}: extension inactive.\n";
1257 1413
1258 if (exists $v->{meta}{mandatory}) { 1414 if (exists $v->{meta}{mandatory}) {
1259 warn $msg; 1415 warn $msg;
1260 warn "mandatory extension failed to load, exiting.\n"; 1416 cf::cleanup "mandatory extension failed to load, exiting.";
1261 exit 1;
1262 } 1417 }
1263 1418
1264 warn $msg; 1419 warn $msg;
1265 } 1420 }
1266 1421
… …
1280 1435
1281=back 1436=back
1282 1437
1283=head2 CORE EXTENSIONS 1438=head2 CORE EXTENSIONS
1284 1439
1285Functions and methods that extend core crossfire objects. 1440Functions and methods that extend core deliantra objects.
1286 1441
1287=cut 1442=cut
1288 1443
1289package cf::player; 1444package cf::player;
1290 1445
… …
1333 1488
1334sub exists($) { 1489sub exists($) {
1335 my ($login) = @_; 1490 my ($login) = @_;
1336 1491
1337 $cf::PLAYER{$login} 1492 $cf::PLAYER{$login}
1338 or cf::sync_job { !aio_stat path $login } 1493 or !aio_stat path $login
1339} 1494}
1340 1495
1341sub find($) { 1496sub find($) {
1342 return $cf::PLAYER{$_[0]} || do { 1497 return $cf::PLAYER{$_[0]} || do {
1343 my $login = $_[0]; 1498 my $login = $_[0];
… …
1355 my $f = new_from_file cf::object::thawer path $login 1510 my $f = new_from_file cf::object::thawer path $login
1356 or return; 1511 or return;
1357 1512
1358 my $pl = cf::player::load_pl $f 1513 my $pl = cf::player::load_pl $f
1359 or return; 1514 or return;
1515
1360 local $cf::PLAYER_LOADING{$login} = $pl; 1516 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs; 1517 $f->resolve_delayed_derefs;
1362 $cf::PLAYER{$login} = $pl 1518 $cf::PLAYER{$login} = $pl
1363 } 1519 }
1364 } 1520 }
… …
1374 1530
1375 return if $pl->{deny_save}; 1531 return if $pl->{deny_save};
1376 1532
1377 aio_mkdir playerdir $pl, 0770; 1533 aio_mkdir playerdir $pl, 0770;
1378 $pl->{last_save} = $cf::RUNTIME; 1534 $pl->{last_save} = $cf::RUNTIME;
1535
1536 cf::get_slot 0.01;
1379 1537
1380 $pl->save_pl ($path); 1538 $pl->save_pl ($path);
1381 cf::cede_to_tick; 1539 cf::cede_to_tick;
1382} 1540}
1383 1541
… …
1415 my ($pl) = @_; 1573 my ($pl) = @_;
1416 1574
1417 my $name = $pl->ob->name; 1575 my $name = $pl->ob->name;
1418 1576
1419 $pl->{deny_save} = 1; 1577 $pl->{deny_save} = 1;
1420 $pl->password ("*"); # this should lock out the player until we nuked the dir 1578 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1421 1579
1422 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1580 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1423 $pl->deactivate; 1581 $pl->deactivate;
1582 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1583 $pl->ob->check_score;
1424 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1584 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1425 $pl->ns->destroy if $pl->ns; 1585 $pl->ns->destroy if $pl->ns;
1426 1586
1427 my $path = playerdir $pl; 1587 my $path = playerdir $pl;
1428 my $temp = "$path~$cf::RUNTIME~deleting~"; 1588 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1467 1627
1468 for my $login (@$dirs) { 1628 for my $login (@$dirs) {
1469 my $path = path $login; 1629 my $path = path $login;
1470 1630
1471 # a .pst is a dead give-away for a valid player 1631 # a .pst is a dead give-away for a valid player
1472 unless (-e "$path.pst") { 1632 # if no pst file found, open and chekc for blocked users
1633 if (aio_stat "$path.pst") {
1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1634 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1474 aio_read $fh, 0, 512, my $buf, 0 or next; 1635 aio_read $fh, 0, 512, my $buf, 0 or next;
1475 $buf !~ /^password -------------$/m or next; # official not-valid tag 1636 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 } 1637 }
1477 1638
… …
1508 } 1669 }
1509 1670
1510 \@paths 1671 \@paths
1511} 1672}
1512 1673
1513=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1674=item $protocol_xml = $player->expand_cfpod ($cfpod)
1514 1675
1515Expand crossfire pod fragments into protocol xml. 1676Expand deliantra pod fragments into protocol xml.
1516
1517=cut
1518
1519sub expand_cfpod {
1520 ((my $self), (local $_)) = @_;
1521
1522 # escape & and <
1523 s/&/&amp;/g;
1524 s/(?<![BIUGHT])</&lt;/g;
1525
1526 # this is buggy, it needs to properly take care of nested <'s
1527
1528 1 while
1529 # replace B<>, I<>, U<> etc.
1530 s/B<([^\>]*)>/<b>$1<\/b>/
1531 || s/I<([^\>]*)>/<i>$1<\/i>/
1532 || s/U<([^\>]*)>/<u>$1<\/u>/
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1534 # replace G<male|female> tags
1535 || s{G<([^>|]*)\|([^>]*)>}{
1536 $self->gender ? $2 : $1
1537 }ge
1538 # replace H<hint text>
1539 || s{H<([^\>]*)>}
1540 {
1541 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1542 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1543 "")
1544 [$self->{hintmode}]
1545 }ge;
1546
1547 # create single paragraphs (very hackish)
1548 s/(?<=\S)\n(?=\w)/ /g;
1549
1550 # compress some whitespace
1551 s/\s+\n/\n/g; # ws line-ends
1552 s/\n\n+/\n/g; # double lines
1553 s/^\n+//; # beginning lines
1554 s/\n+$//; # ending lines
1555
1556 $_
1557}
1558
1559sub hintmode {
1560 $_[0]{hintmode} = $_[1] if @_ > 1;
1561 $_[0]{hintmode}
1562}
1563 1677
1564=item $player->ext_reply ($msgid, @msg) 1678=item $player->ext_reply ($msgid, @msg)
1565 1679
1566Sends an ext reply to the player. 1680Sends an ext reply to the player.
1567 1681
… …
1634our $MAX_RESET = 3600; 1748our $MAX_RESET = 3600;
1635our $DEFAULT_RESET = 3000; 1749our $DEFAULT_RESET = 3000;
1636 1750
1637sub generate_random_map { 1751sub generate_random_map {
1638 my ($self, $rmp) = @_; 1752 my ($self, $rmp) = @_;
1753
1754 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1755
1639 # mit "rum" bekleckern, nicht 1756 # mit "rum" bekleckern, nicht
1640 $self->_create_random_map ( 1757 $self->_create_random_map (
1641 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1758 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1642 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1759 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1643 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1760 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1765 1882
1766# the temporary/swap location 1883# the temporary/swap location
1767sub save_path { 1884sub save_path {
1768 my ($self) = @_; 1885 my ($self) = @_;
1769 1886
1770 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1887 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1771 "$TMPDIR/$path.map" 1888 "$TMPDIR/$path.map"
1772} 1889}
1773 1890
1774# the unique path, undef == no special unique path 1891# the unique path, undef == no special unique path
1775sub uniq_path { 1892sub uniq_path {
1776 my ($self) = @_; 1893 my ($self) = @_;
1777 1894
1778 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1895 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1779 "$UNIQUEDIR/$path" 1896 "$UNIQUEDIR/$path"
1780}
1781
1782# and all this just because we cannot iterate over
1783# all maps in C++...
1784sub change_all_map_light {
1785 my ($change) = @_;
1786
1787 $_->change_map_light ($change)
1788 for grep $_->outdoor, values %cf::MAP;
1789} 1897}
1790 1898
1791sub decay_objects { 1899sub decay_objects {
1792 my ($self) = @_; 1900 my ($self) = @_;
1793 1901
… …
1877sub find { 1985sub find {
1878 my ($path, $origin) = @_; 1986 my ($path, $origin) = @_;
1879 1987
1880 $path = normalise $path, $origin && $origin->path; 1988 $path = normalise $path, $origin && $origin->path;
1881 1989
1882 cf::lock_wait "map_data:$path";#d#remove 1990 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1883 cf::lock_wait "map_find:$path"; 1991 my $guard2 = cf::lock_acquire "map_find:$path";
1884 1992
1885 $cf::MAP{$path} || do { 1993 $cf::MAP{$path} || do {
1886 my $guard1 = cf::lock_acquire "map_find:$path";
1887 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1888
1889 my $map = new_from_path cf::map $path 1994 my $map = new_from_path cf::map $path
1890 or return; 1995 or return;
1891 1996
1892 $map->{last_save} = $cf::RUNTIME; 1997 $map->{last_save} = $cf::RUNTIME;
1893 1998
… …
1895 or return; 2000 or return;
1896 2001
1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2002 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1898 # doing this can freeze the server in a sync job, obviously 2003 # doing this can freeze the server in a sync job, obviously
1899 #$cf::WAIT_FOR_TICK->wait; 2004 #$cf::WAIT_FOR_TICK->wait;
2005 undef $guard2;
1900 undef $guard1; 2006 undef $guard1;
1901 undef $guard2;
1902 $map->reset; 2007 $map->reset;
1903 return find $path; 2008 return find $path;
1904 } 2009 }
1905 2010
1906 $cf::MAP{$path} = $map 2011 $cf::MAP{$path} = $map
… …
1933 my $f = new_from_file cf::object::thawer $self->{load_path}; 2038 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block; 2039 $f->skip_block;
1935 $self->_load_objects ($f) 2040 $self->_load_objects ($f)
1936 or return; 2041 or return;
1937 2042
1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2043 $self->post_load_original
1939 if delete $self->{load_original}; 2044 if delete $self->{load_original};
1940 2045
1941 if (my $uniq = $self->uniq_path) { 2046 if (my $uniq = $self->uniq_path) {
1942 utf8::encode $uniq; 2047 utf8::encode $uniq;
1943 unless (aio_stat $uniq) { 2048 unless (aio_stat $uniq) {
… …
1961 unless ($self->{deny_activate}) { 2066 unless ($self->{deny_activate}) {
1962 $self->decay_objects; 2067 $self->decay_objects;
1963 $self->fix_auto_apply; 2068 $self->fix_auto_apply;
1964 $self->update_buttons; 2069 $self->update_buttons;
1965 cf::cede_to_tick; 2070 cf::cede_to_tick;
1966 $self->set_darkness_map;
1967 cf::cede_to_tick;
1968 $self->activate; 2071 $self->activate;
1969 } 2072 }
1970 2073
1971 $self->{last_save} = $cf::RUNTIME; 2074 $self->{last_save} = $cf::RUNTIME;
1972 $self->last_access ($cf::RUNTIME); 2075 $self->last_access ($cf::RUNTIME);
1973 2076
1974 $self->in_memory (cf::MAP_IN_MEMORY); 2077 $self->in_memory (cf::MAP_ACTIVE);
1975 } 2078 }
1976 2079
1977 $self->post_load; 2080 $self->post_load;
1978} 2081}
1979 2082
… …
2037 my ($path, $origin, $load) = @_; 2140 my ($path, $origin, $load) = @_;
2038 2141
2039 $path = normalise $path, $origin && $origin->{path}; 2142 $path = normalise $path, $origin && $origin->{path};
2040 2143
2041 if (my $map = $cf::MAP{$path}) { 2144 if (my $map = $cf::MAP{$path}) {
2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2145 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2043 } 2146 }
2044 2147
2045 $MAP_PREFETCH{$path} |= $load; 2148 $MAP_PREFETCH{$path} |= $load;
2046 2149
2047 $MAP_PREFETCHER ||= cf::async { 2150 $MAP_PREFETCHER ||= cf::async {
2151 $Coro::current->{desc} = "map prefetcher";
2152
2048 while (%MAP_PREFETCH) { 2153 while (%MAP_PREFETCH) {
2049 while (my ($k, $v) = each %MAP_PREFETCH) { 2154 while (my ($k, $v) = each %MAP_PREFETCH) {
2050 if (my $map = find $k) { 2155 if (my $map = find $k) {
2051 $map->load if $v; 2156 $map->load if $v;
2052 } 2157 }
… …
2078 return if $self->{deny_save}; 2183 return if $self->{deny_save};
2079 2184
2080 local $self->{last_access} = $self->last_access;#d# 2185 local $self->{last_access} = $self->last_access;#d#
2081 2186
2082 cf::async { 2187 cf::async {
2188 $Coro::current->{desc} = "map player save";
2083 $_->contr->save for $self->players; 2189 $_->contr->save for $self->players;
2084 }; 2190 };
2191
2192 cf::get_slot 0.02;
2085 2193
2086 if ($uniq) { 2194 if ($uniq) {
2087 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2195 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2088 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2196 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2089 } else { 2197 } else {
… …
2098 $self->save; 2206 $self->save;
2099 2207
2100 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2208 my $lock = cf::lock_acquire "map_data:$self->{path}";
2101 2209
2102 return if $self->players; 2210 return if $self->players;
2103 return if $self->in_memory != cf::MAP_IN_MEMORY; 2211 return if $self->in_memory != cf::MAP_ACTIVE;
2104 return if $self->{deny_save}; 2212 return if $self->{deny_save};
2105 2213
2106 $self->in_memory (cf::MAP_SWAPPED); 2214 $self->in_memory (cf::MAP_SWAPPED);
2107 2215
2108 $self->deactivate; 2216 $self->deactivate;
… …
2133 2241
2134 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2135 2243
2136 return if $self->players; 2244 return if $self->players;
2137 2245
2138 warn "resetting map ", $self->path; 2246 warn "resetting map ", $self->path, "\n";
2139 2247
2140 $self->in_memory (cf::MAP_SWAPPED); 2248 $self->in_memory (cf::MAP_SWAPPED);
2141 2249
2142 # need to save uniques path 2250 # need to save uniques path
2143 unless ($self->{deny_save}) { 2251 unless ($self->{deny_save}) {
… …
2226 2334
2227sub unique_maps() { 2335sub unique_maps() {
2228 [ 2336 [
2229 map { 2337 map {
2230 utf8::decode $_; 2338 utf8::decode $_;
2231 /\.map$/ 2339 s/\.map$//; # TODO future compatibility hack
2340 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2341 ? ()
2232 ? normalise $_ 2342 : normalise $_
2233 : ()
2234 } @{ aio_readdir $UNIQUEDIR or [] } 2343 } @{ aio_readdir $UNIQUEDIR or [] }
2235 ] 2344 ]
2236} 2345}
2237 2346
2238package cf; 2347=item cf::map::static_maps
2348
2349Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2350file in the shared directory excluding F</styles> and F</editor>). May
2351block.
2352
2353=cut
2354
2355sub static_maps() {
2356 my @dirs = "";
2357 my @maps;
2358
2359 while (@dirs) {
2360 my $dir = shift @dirs;
2361
2362 next if $dir eq "/styles" || $dir eq "/editor";
2363
2364 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2365 or return;
2366
2367 for (@$files) {
2368 s/\.map$// or next;
2369 utf8::decode $_;
2370 push @maps, "$dir/$_";
2371 }
2372
2373 push @dirs, map "$dir/$_", @$dirs;
2374 }
2375
2376 \@maps
2377}
2239 2378
2240=back 2379=back
2241 2380
2242=head3 cf::object 2381=head3 cf::object
2243 2382
… …
2247 2386
2248=over 4 2387=over 4
2249 2388
2250=item $ob->inv_recursive 2389=item $ob->inv_recursive
2251 2390
2252Returns the inventory of the object _and_ their inventories, recursively. 2391Returns the inventory of the object I<and> their inventories, recursively,
2392but I<not> the object itself.
2253 2393
2254=cut 2394=cut
2255 2395
2256sub inv_recursive_; 2396sub inv_recursive_;
2257sub inv_recursive_ { 2397sub inv_recursive_ {
… …
2262 inv_recursive_ inv $_[0] 2402 inv_recursive_ inv $_[0]
2263} 2403}
2264 2404
2265=item $ref = $ob->ref 2405=item $ref = $ob->ref
2266 2406
2267creates and returns a persistent reference to an objetc that can be stored as a string. 2407Creates and returns a persistent reference to an object that can be stored as a string.
2268 2408
2269=item $ob = cf::object::deref ($refstring) 2409=item $ob = cf::object::deref ($refstring)
2270 2410
2271returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2411returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2272even if the object actually exists. May block. 2412even if the object actually exists. May block.
… …
2274=cut 2414=cut
2275 2415
2276sub deref { 2416sub deref {
2277 my ($ref) = @_; 2417 my ($ref) = @_;
2278 2418
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2419 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2); 2420 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2421 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return; 2422 or return;
2286 $pl->ob->uuid eq $uuid 2423 $pl->ob->uuid eq $uuid
2287 or return; 2424 or return;
… …
2307can be C<undef>. Does the right thing when the player is currently in a 2444can be C<undef>. Does the right thing when the player is currently in a
2308dialogue with the given NPC character. 2445dialogue with the given NPC character.
2309 2446
2310=cut 2447=cut
2311 2448
2449our $SAY_CHANNEL = {
2450 id => "say",
2451 title => "Map",
2452 reply => "say ",
2453 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2454};
2455
2456our $CHAT_CHANNEL = {
2457 id => "chat",
2458 title => "Chat",
2459 reply => "chat ",
2460 tooltip => "Player chat and shouts, global to the server.",
2461};
2462
2312# rough implementation of a future "reply" method that works 2463# rough implementation of a future "reply" method that works
2313# with dialog boxes. 2464# with dialog boxes.
2314#TODO: the first argument must go, split into a $npc->reply_to ( method 2465#TODO: the first argument must go, split into a $npc->reply_to ( method
2315sub cf::object::player::reply($$$;$) { 2466sub cf::object::player::reply($$$;$) {
2316 my ($self, $npc, $msg, $flags) = @_; 2467 my ($self, $npc, $msg, $flags) = @_;
… …
2327 my $dialog = $pl->{npc_dialog}; 2478 my $dialog = $pl->{npc_dialog};
2328 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2479 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2329 2480
2330 } else { 2481 } else {
2331 $msg = $npc->name . " says: $msg" if $npc; 2482 $msg = $npc->name . " says: $msg" if $npc;
2332 $self->message ($msg, $flags); 2483 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2333 } 2484 }
2334 } 2485 }
2335} 2486}
2336 2487
2337=item $object->send_msg ($channel, $msg, $color, [extra...]) 2488=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2362 2513
2363=item $player_object->enter_link 2514=item $player_object->enter_link
2364 2515
2365Freezes the player and moves him/her to a special map (C<{link}>). 2516Freezes the player and moves him/her to a special map (C<{link}>).
2366 2517
2367The player should be reasonably safe there for short amounts of time. You 2518The player should be reasonably safe there for short amounts of time (e.g.
2368I<MUST> call C<leave_link> as soon as possible, though. 2519for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2520though, as the palyer cannot control the character while it is on the link
2521map.
2369 2522
2370Will never block. 2523Will never block.
2371 2524
2372=item $player_object->leave_link ($map, $x, $y) 2525=item $player_object->leave_link ($map, $x, $y)
2373 2526
… …
2425 ($x, $y) = (-1, -1) 2578 ($x, $y) = (-1, -1)
2426 unless (defined $x) && (defined $y); 2579 unless (defined $x) && (defined $y);
2427 2580
2428 # use -1 or undef as default coordinates, not 0, 0 2581 # use -1 or undef as default coordinates, not 0, 0
2429 ($x, $y) = ($map->enter_x, $map->enter_y) 2582 ($x, $y) = ($map->enter_x, $map->enter_y)
2430 if $x <=0 && $y <= 0; 2583 if $x <= 0 && $y <= 0;
2431 2584
2432 $map->load; 2585 $map->load;
2433 $map->load_neighbours; 2586 $map->load_neighbours;
2434 2587
2435 return unless $self->contr->active; 2588 return unless $self->contr->active;
2436 $self->activate_recursive;
2437 2589
2438 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2590 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2439 $self->enter_map ($map, $x, $y); 2591 $self->enter_map ($map, $x, $y);
2592
2593 # only activate afterwards, to support waiting in hooks
2594 $self->activate_recursive;
2440} 2595}
2441 2596
2442=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2597=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2443 2598
2444Moves the player to the given map-path and coordinates by first freezing 2599Moves the player to the given map-path and coordinates by first freezing
2445her, loading and preparing them map, calling the provided $check callback 2600her, loading and preparing them map, calling the provided $check callback
2446that has to return the map if sucecssful, and then unfreezes the player on 2601that has to return the map if sucecssful, and then unfreezes the player on
2447the new (success) or old (failed) map position. In either case, $done will 2602the new (success) or old (failed) map position. In either case, $done will
2448be called at the end of this process. 2603be called at the end of this process.
2449 2604
2605Note that $check will be called with a potentially non-loaded map, so if
2606it needs a loaded map it has to call C<< ->load >>.
2607
2450=cut 2608=cut
2451 2609
2452our $GOTOGEN; 2610our $GOTOGEN;
2453 2611
2454sub cf::object::player::goto { 2612sub cf::object::player::goto {
… …
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2616 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459 2617
2460 $self->enter_link; 2618 $self->enter_link;
2461 2619
2462 (async { 2620 (async {
2621 $Coro::current->{desc} = "player::goto $path $x $y";
2622
2463 # *tag paths override both path and x|y 2623 # *tag paths override both path and x|y
2464 if ($path =~ /^\*(.*)$/) { 2624 if ($path =~ /^\*(.*)$/) {
2465 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2625 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466 my $ob = $obs[rand @obs]; 2626 my $ob = $obs[rand @obs];
2467 2627
… …
2530} 2690}
2531 2691
2532sub prepare_random_map { 2692sub prepare_random_map {
2533 my ($exit) = @_; 2693 my ($exit) = @_;
2534 2694
2535 my $guard = cf::lock_acquire "exit_prepare:$exit";
2536
2537 # all this does is basically replace the /! path by 2695 # all this does is basically replace the /! path by
2538 # a new random map path (?random/...) with a seed 2696 # a new random map path (?random/...) with a seed
2539 # that depends on the exit object 2697 # that depends on the exit object
2540 2698
2541 my $rmp = parse_random_map_params $exit->msg; 2699 my $rmp = parse_random_map_params $exit->msg;
… …
2543 if ($exit->map) { 2701 if ($exit->map) {
2544 $rmp->{region} = $exit->region->name; 2702 $rmp->{region} = $exit->region->name;
2545 $rmp->{origin_map} = $exit->map->path; 2703 $rmp->{origin_map} = $exit->map->path;
2546 $rmp->{origin_x} = $exit->x; 2704 $rmp->{origin_x} = $exit->x;
2547 $rmp->{origin_y} = $exit->y; 2705 $rmp->{origin_y} = $exit->y;
2706
2707 $exit->map->touch;
2548 } 2708 }
2549 2709
2550 $rmp->{random_seed} ||= $exit->random_seed; 2710 $rmp->{random_seed} ||= $exit->random_seed;
2551 2711
2552 my $data = cf::to_json $rmp; 2712 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2553 my $md5 = Digest::MD5::md5_hex $data; 2713 my $md5 = Digest::MD5::md5_hex $data;
2554 my $meta = "$RANDOMDIR/$md5.meta"; 2714 my $meta = "$RANDOMDIR/$md5.meta";
2555 2715
2556 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2716 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2557 aio_write $fh, 0, (length $data), $data, 0; 2717 aio_write $fh, 0, (length $data), $data, 0;
2558 undef $fh; 2718 undef $fh;
2559 aio_rename "$meta~", $meta; 2719 aio_rename "$meta~", $meta;
2560 2720
2721 my $slaying = "?random/$md5";
2722
2723 if ($exit->valid) {
2561 $exit->slaying ("?random/$md5"); 2724 $exit->slaying ("?random/$md5");
2562 $exit->msg (undef); 2725 $exit->msg (undef);
2726 }
2563 } 2727 }
2564} 2728}
2565 2729
2566sub cf::object::player::enter_exit { 2730sub cf::object::player::enter_exit {
2567 my ($self, $exit) = @_; 2731 my ($self, $exit) = @_;
2568 2732
2569 return unless $self->type == cf::PLAYER; 2733 return unless $self->type == cf::PLAYER;
2570 2734
2571 if ($exit->slaying eq "/!") {
2572 #TODO: this should de-fi-ni-te-ly not be a sync-job
2573 # the problem is that $exit might not survive long enough
2574 # so it needs to be done right now, right here
2575 cf::sync_job { prepare_random_map $exit };
2576 }
2577
2578 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2579 my $hp = $exit->stats->hp;
2580 my $sp = $exit->stats->sp;
2581
2582 $self->enter_link; 2735 $self->enter_link;
2583 2736
2584 # if exit is damned, update players death & WoR home-position
2585 $self->contr->savebed ($slaying, $hp, $sp)
2586 if $exit->flag (FLAG_DAMNED);
2587
2588 (async { 2737 (async {
2589 $self->deactivate_recursive; # just to be sure 2738 $Coro::current->{desc} = "enter_exit";
2739
2590 unless (eval { 2740 unless (eval {
2741 $self->deactivate_recursive; # just to be sure
2742
2743 # random map handling
2744 {
2745 my $guard = cf::lock_acquire "exit_prepare:$exit";
2746
2747 prepare_random_map $exit
2748 if $exit->slaying eq "/!";
2749 }
2750
2751 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2752 my $x = $exit->stats->hp;
2753 my $y = $exit->stats->sp;
2754
2591 $self->goto ($slaying, $hp, $sp); 2755 $self->goto ($map, $x, $y);
2592 2756
2757 # if exit is damned, update players death & WoR home-position
2758 $self->contr->savebed ($map, $x, $y)
2759 if $exit->flag (cf::FLAG_DAMNED);
2760
2593 1; 2761 1
2594 }) { 2762 }) {
2595 $self->message ("Something went wrong deep within the crossfire server. " 2763 $self->message ("Something went wrong deep within the deliantra server. "
2596 . "I'll try to bring you back to the map you were before. " 2764 . "I'll try to bring you back to the map you were before. "
2597 . "Please report this to the dungeon master!", 2765 . "Please report this to the dungeon master!",
2598 cf::NDI_UNIQUE | cf::NDI_RED); 2766 cf::NDI_UNIQUE | cf::NDI_RED);
2599 2767
2600 warn "ERROR in enter_exit: $@"; 2768 warn "ERROR in enter_exit: $@";
… …
2617sub cf::client::send_drawinfo { 2785sub cf::client::send_drawinfo {
2618 my ($self, $text, $flags) = @_; 2786 my ($self, $text, $flags) = @_;
2619 2787
2620 utf8::encode $text; 2788 utf8::encode $text;
2621 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2789 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2790}
2791
2792=item $client->send_big_packet ($pkt)
2793
2794Like C<send_packet>, but tries to compress large packets, and fragments
2795them as required.
2796
2797=cut
2798
2799our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2800
2801sub cf::client::send_big_packet {
2802 my ($self, $pkt) = @_;
2803
2804 # try lzf for large packets
2805 $pkt = "lzf " . Compress::LZF::compress $pkt
2806 if 1024 <= length $pkt and $self->{can_lzf};
2807
2808 # split very large packets
2809 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2810 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2811 $pkt = "frag";
2812 }
2813
2814 $self->send_packet ($pkt);
2622} 2815}
2623 2816
2624=item $client->send_msg ($channel, $msg, $color, [extra...]) 2817=item $client->send_msg ($channel, $msg, $color, [extra...])
2625 2818
2626Send a drawinfo or msg packet to the client, formatting the msg for the 2819Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2628the message, with C<log> being the default. If C<$color> is negative, suppress 2821the message, with C<log> being the default. If C<$color> is negative, suppress
2629the message unless the client supports the msg packet. 2822the message unless the client supports the msg packet.
2630 2823
2631=cut 2824=cut
2632 2825
2826# non-persistent channels (usually the info channel)
2633our %CHANNEL = ( 2827our %CHANNEL = (
2828 "c/motd" => {
2829 id => "infobox",
2830 title => "MOTD",
2831 reply => undef,
2832 tooltip => "The message of the day",
2833 },
2634 "c/identify" => { 2834 "c/identify" => {
2635 id => "identify", 2835 id => "infobox",
2636 title => "Identify", 2836 title => "Identify",
2637 reply => undef, 2837 reply => undef,
2638 tooltip => "Items recently identified", 2838 tooltip => "Items recently identified",
2639 }, 2839 },
2640 "c/examine" => { 2840 "c/examine" => {
2641 id => "examine", 2841 id => "infobox",
2642 title => "Examine", 2842 title => "Examine",
2643 reply => undef, 2843 reply => undef,
2644 tooltip => "Signs and other items you examined", 2844 tooltip => "Signs and other items you examined",
2645 }, 2845 },
2846 "c/shopinfo" => {
2847 id => "infobox",
2848 title => "Shop Info",
2849 reply => undef,
2850 tooltip => "What your bargaining skill tells you about the shop",
2851 },
2852 "c/book" => {
2853 id => "infobox",
2854 title => "Book",
2855 reply => undef,
2856 tooltip => "The contents of a note or book",
2857 },
2858 "c/lookat" => {
2859 id => "infobox",
2860 title => "Look",
2861 reply => undef,
2862 tooltip => "What you saw there",
2863 },
2864 "c/who" => {
2865 id => "infobox",
2866 title => "Players",
2867 reply => undef,
2868 tooltip => "Shows players who are currently online",
2869 },
2870 "c/body" => {
2871 id => "infobox",
2872 title => "Body Parts",
2873 reply => undef,
2874 tooltip => "Shows which body parts you posess and are available",
2875 },
2876 "c/statistics" => {
2877 id => "infobox",
2878 title => "Statistics",
2879 reply => undef,
2880 tooltip => "Shows your primary statistics",
2881 },
2882 "c/skills" => {
2883 id => "infobox",
2884 title => "Skills",
2885 reply => undef,
2886 tooltip => "Shows your experience per skill and item power",
2887 },
2888 "c/shopitems" => {
2889 id => "infobox",
2890 title => "Shop Items",
2891 reply => undef,
2892 tooltip => "Shows the items currently for sale in this shop",
2893 },
2894 "c/resistances" => {
2895 id => "infobox",
2896 title => "Resistances",
2897 reply => undef,
2898 tooltip => "Shows your resistances",
2899 },
2900 "c/pets" => {
2901 id => "infobox",
2902 title => "Pets",
2903 reply => undef,
2904 tooltip => "Shows information abotu your pets/a specific pet",
2905 },
2906 "c/perceiveself" => {
2907 id => "infobox",
2908 title => "Perceive Self",
2909 reply => undef,
2910 tooltip => "You gained detailed knowledge about yourself",
2911 },
2912 "c/uptime" => {
2913 id => "infobox",
2914 title => "Uptime",
2915 reply => undef,
2916 tooltip => "How long the server has been running since last restart",
2917 },
2918 "c/mapinfo" => {
2919 id => "infobox",
2920 title => "Map Info",
2921 reply => undef,
2922 tooltip => "Information related to the maps",
2923 },
2924 "c/party" => {
2925 id => "party",
2926 title => "Party",
2927 reply => "gsay ",
2928 tooltip => "Messages and chat related to your party",
2929 },
2930 "c/death" => {
2931 id => "death",
2932 title => "Death",
2933 reply => undef,
2934 tooltip => "Reason for and more info about your most recent death",
2935 },
2936 "c/say" => $SAY_CHANNEL,
2937 "c/chat" => $CHAT_CHANNEL,
2646); 2938);
2647 2939
2648sub cf::client::send_msg { 2940sub cf::client::send_msg {
2649 my ($self, $channel, $msg, $color, @extra) = @_; 2941 my ($self, $channel, $msg, $color, @extra) = @_;
2650 2942
2651 $msg = $self->pl->expand_cfpod ($msg); 2943 $msg = $self->pl->expand_cfpod ($msg)
2944 unless $color & cf::NDI_VERBATIM;
2652 2945
2653 $color &= cf::NDI_CLIENT_MASK; # just in case... 2946 $color &= cf::NDI_CLIENT_MASK; # just in case...
2654 2947
2655 # check predefined channels, for the benefit of C 2948 # check predefined channels, for the benefit of C
2656 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2949 if ($CHANNEL{$channel}) {
2950 $channel = $CHANNEL{$channel};
2657 2951
2952 $self->ext_msg (channel_info => $channel);
2953 $channel = $channel->{id};
2954
2658 if (ref $channel) { 2955 } elsif (ref $channel) {
2659 # send meta info to client, if not yet sent 2956 # send meta info to client, if not yet sent
2660 unless (exists $self->{channel}{$channel->{id}}) { 2957 unless (exists $self->{channel}{$channel->{id}}) {
2661 $self->{channel}{$channel->{id}} = $channel; 2958 $self->{channel}{$channel->{id}} = $channel;
2662 $self->ext_msg (channel_info => $channel) 2959 $self->ext_msg (channel_info => $channel);
2663 if $self->can_msg;
2664 } 2960 }
2665 2961
2666 $channel = $channel->{id}; 2962 $channel = $channel->{id};
2667 } 2963 }
2668 2964
2669 return unless @extra || length $msg; 2965 return unless @extra || length $msg;
2670 2966
2671 if ($self->can_msg) {
2672 # default colour, mask it out 2967 # default colour, mask it out
2673 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2968 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2674 if $color & cf::NDI_DEF; 2969 if $color & cf::NDI_DEF;
2675 2970
2676 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2971 my $pkt = "msg "
2972 . $self->{json_coder}->encode (
2677 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2973 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2678 } else { 2974 );
2679 if ($color >= 0) {
2680 # replace some tags by gcfclient-compatible ones
2681 for ($msg) {
2682 1 while
2683 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2684 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2685 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2686 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2687 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2688 }
2689 2975
2690 $color &= cf::NDI_COLOR_MASK; 2976 $self->send_big_packet ($pkt);
2691
2692 utf8::encode $msg;
2693
2694 if (0 && $msg =~ /\[/) {
2695 # COMMAND/INFO
2696 $self->send_packet ("drawextinfo $color 10 8 $msg")
2697 } else {
2698 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2699 $self->send_packet ("drawinfo $color $msg")
2700 }
2701 }
2702 }
2703} 2977}
2704 2978
2705=item $client->ext_msg ($type, @msg) 2979=item $client->ext_msg ($type, @msg)
2706 2980
2707Sends an ext event to the client. 2981Sends an ext event to the client.
… …
2710 2984
2711sub cf::client::ext_msg($$@) { 2985sub cf::client::ext_msg($$@) {
2712 my ($self, $type, @msg) = @_; 2986 my ($self, $type, @msg) = @_;
2713 2987
2714 if ($self->extcmd == 2) { 2988 if ($self->extcmd == 2) {
2715 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2989 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2716 } elsif ($self->extcmd == 1) { # TODO: remove 2990 } elsif ($self->extcmd == 1) { # TODO: remove
2717 push @msg, msgtype => "event_$type"; 2991 push @msg, msgtype => "event_$type";
2718 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2992 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2719 } 2993 }
2720} 2994}
2721 2995
2722=item $client->ext_reply ($msgid, @msg) 2996=item $client->ext_reply ($msgid, @msg)
2723 2997
… …
2727 3001
2728sub cf::client::ext_reply($$@) { 3002sub cf::client::ext_reply($$@) {
2729 my ($self, $id, @msg) = @_; 3003 my ($self, $id, @msg) = @_;
2730 3004
2731 if ($self->extcmd == 2) { 3005 if ($self->extcmd == 2) {
2732 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3006 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2733 } elsif ($self->extcmd == 1) { 3007 } elsif ($self->extcmd == 1) {
2734 #TODO: version 1, remove 3008 #TODO: version 1, remove
2735 unshift @msg, msgtype => "reply", msgid => $id; 3009 unshift @msg, msgtype => "reply", msgid => $id;
2736 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3010 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2737 } 3011 }
2738} 3012}
2739 3013
2740=item $success = $client->query ($flags, "text", \&cb) 3014=item $success = $client->query ($flags, "text", \&cb)
2741 3015
… …
2880=pod 3154=pod
2881 3155
2882The following functions and methods are available within a safe environment: 3156The following functions and methods are available within a safe environment:
2883 3157
2884 cf::object 3158 cf::object
2885 contr pay_amount pay_player map x y force_find force_add 3159 contr pay_amount pay_player map x y force_find force_add destroy
2886 insert remove name archname title slaying race decrease_ob_nr 3160 insert remove name archname title slaying race decrease split
3161 value
2887 3162
2888 cf::object::player 3163 cf::object::player
2889 player 3164 player
2890 3165
2891 cf::player 3166 cf::player
… …
2896 3171
2897=cut 3172=cut
2898 3173
2899for ( 3174for (
2900 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3175 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2901 insert remove inv name archname title slaying race 3176 insert remove inv nrof name archname title slaying race
2902 decrease_ob_nr)], 3177 decrease split destroy change_exp value msg lore send_msg)],
2903 ["cf::object::player" => qw(player)], 3178 ["cf::object::player" => qw(player)],
2904 ["cf::player" => qw(peaceful)], 3179 ["cf::player" => qw(peaceful send_msg)],
2905 ["cf::map" => qw(trigger)], 3180 ["cf::map" => qw(trigger)],
2906) { 3181) {
2907 no strict 'refs'; 3182 no strict 'refs';
2908 my ($pkg, @funs) = @$_; 3183 my ($pkg, @funs) = @$_;
2909 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3184 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
2926 my ($code, %vars) = @_; 3201 my ($code, %vars) = @_;
2927 3202
2928 my $qcode = $code; 3203 my $qcode = $code;
2929 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3204 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2930 $qcode =~ s/\n/\\n/g; 3205 $qcode =~ s/\n/\\n/g;
3206
3207 %vars = (_dummy => 0) unless %vars;
2931 3208
2932 local $_; 3209 local $_;
2933 local @safe::cf::_safe_eval_args = values %vars; 3210 local @safe::cf::_safe_eval_args = values %vars;
2934 3211
2935 my $eval = 3212 my $eval =
… …
3012 { 3289 {
3013 my $faces = $facedata->{faceinfo}; 3290 my $faces = $facedata->{faceinfo};
3014 3291
3015 while (my ($face, $info) = each %$faces) { 3292 while (my ($face, $info) = each %$faces) {
3016 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3293 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3294
3017 cf::face::set_visibility $idx, $info->{visibility}; 3295 cf::face::set_visibility $idx, $info->{visibility};
3018 cf::face::set_magicmap $idx, $info->{magicmap}; 3296 cf::face::set_magicmap $idx, $info->{magicmap};
3019 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3297 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3020 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3298 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3021 3299
3022 cf::cede_to_tick; 3300 cf::cede_to_tick;
3023 } 3301 }
3024 3302
3025 while (my ($face, $info) = each %$faces) { 3303 while (my ($face, $info) = each %$faces) {
3026 next unless $info->{smooth}; 3304 next unless $info->{smooth};
3305
3027 my $idx = cf::face::find $face 3306 my $idx = cf::face::find $face
3028 or next; 3307 or next;
3308
3029 if (my $smooth = cf::face::find $info->{smooth}) { 3309 if (my $smooth = cf::face::find $info->{smooth}) {
3030 cf::face::set_smooth $idx, $smooth; 3310 cf::face::set_smooth $idx, $smooth;
3031 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3311 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3032 } else { 3312 } else {
3033 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3313 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3051 { 3331 {
3052 # TODO: for gcfclient pleasure, we should give resources 3332 # TODO: for gcfclient pleasure, we should give resources
3053 # that gcfclient doesn't grok a >10000 face index. 3333 # that gcfclient doesn't grok a >10000 face index.
3054 my $res = $facedata->{resource}; 3334 my $res = $facedata->{resource};
3055 3335
3056 my $soundconf = delete $res->{"res/sound.conf"};
3057
3058 while (my ($name, $info) = each %$res) { 3336 while (my ($name, $info) = each %$res) {
3337 if (defined $info->{type}) {
3059 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3338 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3060 my $data; 3339 my $data;
3061 3340
3062 if ($info->{type} & 1) { 3341 if ($info->{type} & 1) {
3063 # prepend meta info 3342 # prepend meta info
3064 3343
3065 my $meta = $enc->encode ({ 3344 my $meta = $enc->encode ({
3066 name => $name, 3345 name => $name,
3067 %{ $info->{meta} || {} }, 3346 %{ $info->{meta} || {} },
3068 }); 3347 });
3069 3348
3070 $data = pack "(w/a*)*", $meta, $info->{data}; 3349 $data = pack "(w/a*)*", $meta, $info->{data};
3350 } else {
3351 $data = $info->{data};
3352 }
3353
3354 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3355 cf::face::set_type $idx, $info->{type};
3071 } else { 3356 } else {
3072 $data = $info->{data}; 3357 $RESOURCE{$name} = $info;
3073 } 3358 }
3074 3359
3075 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3076 cf::face::set_type $idx, $info->{type};
3077
3078 cf::cede_to_tick; 3360 cf::cede_to_tick;
3079 } 3361 }
3080
3081 if ($soundconf) {
3082 $soundconf = $enc->decode (delete $soundconf->{data});
3083
3084 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3085 my $sound = $soundconf->{compat}[$_]
3086 or next;
3087
3088 my $face = cf::face::find "sound/$sound->[1]";
3089 cf::sound::set $sound->[0] => $face;
3090 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3091 }
3092
3093 while (my ($k, $v) = each %{$soundconf->{event}}) {
3094 my $face = cf::face::find "sound/$v";
3095 cf::sound::set $k => $face;
3096 }
3097 }
3098 } 3362 }
3363
3364 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3099 3365
3100 1 3366 1
3101} 3367}
3368
3369cf::global->attach (on_resource_update => sub {
3370 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3371 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3372
3373 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3374 my $sound = $soundconf->{compat}[$_]
3375 or next;
3376
3377 my $face = cf::face::find "sound/$sound->[1]";
3378 cf::sound::set $sound->[0] => $face;
3379 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3380 }
3381
3382 while (my ($k, $v) = each %{$soundconf->{event}}) {
3383 my $face = cf::face::find "sound/$v";
3384 cf::sound::set $k => $face;
3385 }
3386 }
3387});
3102 3388
3103register_exticmd fx_want => sub { 3389register_exticmd fx_want => sub {
3104 my ($ns, $want) = @_; 3390 my ($ns, $want) = @_;
3105 3391
3106 while (my ($k, $v) = each %$want) { 3392 while (my ($k, $v) = each %$want) {
3107 $ns->fx_want ($k, $v); 3393 $ns->fx_want ($k, $v);
3108 } 3394 }
3109}; 3395};
3396
3397sub load_resource_file($) {
3398 my $guard = lock_acquire "load_resource_file";
3399
3400 my $status = load_resource_file_ $_[0];
3401 get_slot 0.1, 100;
3402 cf::arch::commit_load;
3403
3404 $status
3405}
3110 3406
3111sub reload_regions { 3407sub reload_regions {
3112 # HACK to clear player env face cache, we need some signal framework 3408 # HACK to clear player env face cache, we need some signal framework
3113 # for this (global event?) 3409 # for this (global event?)
3114 %ext::player_env::MUSIC_FACE_CACHE = (); 3410 %ext::player_env::MUSIC_FACE_CACHE = ();
… …
3128} 3424}
3129 3425
3130sub reload_archetypes { 3426sub reload_archetypes {
3131 load_resource_file "$DATADIR/archetypes" 3427 load_resource_file "$DATADIR/archetypes"
3132 or die "unable to load archetypes\n"; 3428 or die "unable to load archetypes\n";
3133 #d# NEED to laod twice to resolve forward references
3134 # this really needs to be done in an extra post-pass
3135 # (which needs to be synchronous, so solve it differently)
3136 load_resource_file "$DATADIR/archetypes"
3137 or die "unable to load archetypes\n";
3138} 3429}
3139 3430
3140sub reload_treasures { 3431sub reload_treasures {
3141 load_resource_file "$DATADIR/treasures" 3432 load_resource_file "$DATADIR/treasures"
3142 or die "unable to load treasurelists\n"; 3433 or die "unable to load treasurelists\n";
3143} 3434}
3144 3435
3145sub reload_resources { 3436sub reload_resources {
3146 warn "reloading resource files...\n"; 3437 warn "reloading resource files...\n";
3147 3438
3439 reload_facedata;
3440 reload_archetypes;
3148 reload_regions; 3441 reload_regions;
3149 reload_facedata;
3150 #reload_archetypes;#d#
3151 reload_archetypes;
3152 reload_treasures; 3442 reload_treasures;
3153 3443
3154 warn "finished reloading resource files\n"; 3444 warn "finished reloading resource files\n";
3155} 3445}
3156 3446
3157sub init {
3158 reload_resources;
3159}
3160
3161sub reload_config { 3447sub reload_config {
3448 warn "reloading config file...\n";
3449
3162 open my $fh, "<:utf8", "$CONFDIR/config" 3450 open my $fh, "<:utf8", "$CONFDIR/config"
3163 or return; 3451 or return;
3164 3452
3165 local $/; 3453 local $/;
3166 *CFG = YAML::Syck::Load <$fh>; 3454 *CFG = YAML::XS::Load scalar <$fh>;
3167 3455
3168 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3456 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3169 3457
3170 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3458 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3171 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3459 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3175 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3463 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3176 and die "WARNING: m(un)lockall failed: $!\n"; 3464 and die "WARNING: m(un)lockall failed: $!\n";
3177 }; 3465 };
3178 warn $@ if $@; 3466 warn $@ if $@;
3179 } 3467 }
3468
3469 warn "finished reloading resource files\n";
3470}
3471
3472sub pidfile() {
3473 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3474 or die "$PIDFILE: $!";
3475 flock $fh, &Fcntl::LOCK_EX
3476 or die "$PIDFILE: flock: $!";
3477 $fh
3478}
3479
3480# make sure only one server instance is running at any one time
3481sub atomic {
3482 my $fh = pidfile;
3483
3484 my $pid = <$fh>;
3485 kill 9, $pid if $pid > 0;
3486
3487 seek $fh, 0, 0;
3488 print $fh $$;
3489}
3490
3491sub main_loop {
3492 warn "EV::loop starting\n";
3493 if (1) {
3494 EV::loop;
3495 }
3496 warn "EV::loop returned\n";
3497 goto &main_loop unless $REALLY_UNLOOP;
3180} 3498}
3181 3499
3182sub main { 3500sub main {
3501 cf::init_globals; # initialise logging
3502
3503 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3504 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3505 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3506 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3507
3508 cf::init_experience;
3509 cf::init_anim;
3510 cf::init_attackmess;
3511 cf::init_dynamic;
3512
3513 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3514
3183 # we must not ever block the main coroutine 3515 # we must not ever block the main coroutine
3184 local $Coro::idle = sub { 3516 local $Coro::idle = sub {
3185 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3517 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3186 (async { 3518 (async {
3187 Event::one_event; 3519 $Coro::current->{desc} = "IDLE BUG HANDLER";
3520 EV::loop EV::LOOP_ONESHOT;
3188 })->prio (Coro::PRIO_MAX); 3521 })->prio (Coro::PRIO_MAX);
3189 }; 3522 };
3190 3523
3524 evthread_start IO::AIO::poll_fileno;
3525
3526 cf::sync_job {
3527 reload_resources;
3191 reload_config; 3528 reload_config;
3192 db_init; 3529 db_init;
3530
3531 cf::load_settings;
3532 cf::load_materials;
3533 cf::init_uuid;
3534 cf::init_signals;
3535 cf::init_commands;
3536 cf::init_skills;
3537
3538 cf::init_beforeplay;
3539
3540 atomic;
3541
3193 load_extensions; 3542 load_extensions;
3194 3543
3195 $TICK_WATCHER->start; 3544 utime time, time, $RUNTIMEFILE;
3196 Event::loop; 3545
3546 # no (long-running) fork's whatsoever before this point(!)
3547 use POSIX ();
3548 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3549
3550 (pop @POST_INIT)->(0) while @POST_INIT;
3551 };
3552
3553 main_loop;
3197} 3554}
3198 3555
3199############################################################################# 3556#############################################################################
3200# initialisation and cleanup 3557# initialisation and cleanup
3201 3558
3202# install some emergency cleanup handlers 3559# install some emergency cleanup handlers
3203BEGIN { 3560BEGIN {
3561 our %SIGWATCHER = ();
3204 for my $signal (qw(INT HUP TERM)) { 3562 for my $signal (qw(INT HUP TERM)) {
3205 Event->signal ( 3563 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3206 reentrant => 0,
3207 data => WF_AUTOCANCEL,
3208 signal => $signal,
3209 prio => 0,
3210 cb => sub {
3211 cf::cleanup "SIG$signal"; 3564 cf::cleanup "SIG$signal";
3212 },
3213 ); 3565 };
3214 } 3566 }
3215} 3567}
3216 3568
3217sub write_runtime { 3569sub write_runtime_sync {
3218 my $runtime = "$LOCALDIR/runtime";
3219
3220 # first touch the runtime file to show we are still running: 3570 # first touch the runtime file to show we are still running:
3221 # the fsync below can take a very very long time. 3571 # the fsync below can take a very very long time.
3222 3572
3223 IO::AIO::aio_utime $runtime, undef, undef; 3573 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3224 3574
3225 my $guard = cf::lock_acquire "write_runtime"; 3575 my $guard = cf::lock_acquire "write_runtime";
3226 3576
3227 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3577 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3228 or return; 3578 or return;
3229 3579
3230 my $value = $cf::RUNTIME + 90 + 10; 3580 my $value = $cf::RUNTIME + 90 + 10;
3231 # 10 is the runtime save interval, for a monotonic clock 3581 # 10 is the runtime save interval, for a monotonic clock
3232 # 60 allows for the watchdog to kill the server. 3582 # 60 allows for the watchdog to kill the server.
… …
3242 aio_utime $fh, undef, undef; 3592 aio_utime $fh, undef, undef;
3243 3593
3244 close $fh 3594 close $fh
3245 or return; 3595 or return;
3246 3596
3247 aio_rename "$runtime~", $runtime 3597 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3248 and return; 3598 and return;
3249 3599
3250 warn "runtime file written.\n"; 3600 warn "runtime file written.\n";
3251 3601
3252 1 3602 1
3603}
3604
3605our $uuid_lock;
3606our $uuid_skip;
3607
3608sub write_uuid_sync($) {
3609 $uuid_skip ||= $_[0];
3610
3611 return if $uuid_lock;
3612 local $uuid_lock = 1;
3613
3614 my $uuid = "$LOCALDIR/uuid";
3615
3616 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3617 or return;
3618
3619 my $value = uuid_seq uuid_cur;
3620
3621 unless ($value) {
3622 warn "cowardly refusing to write zero uuid value!\n";
3623 return;
3624 }
3625
3626 my $value = uuid_str $value + $uuid_skip;
3627 $uuid_skip = 0;
3628
3629 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3630 and return;
3631
3632 # always fsync - this file is important
3633 aio_fsync $fh
3634 and return;
3635
3636 close $fh
3637 or return;
3638
3639 aio_rename "$uuid~", $uuid
3640 and return;
3641
3642 warn "uuid file written ($value).\n";
3643
3644 1
3645
3646}
3647
3648sub write_uuid($$) {
3649 my ($skip, $sync) = @_;
3650
3651 $sync ? write_uuid_sync $skip
3652 : async { write_uuid_sync $skip };
3253} 3653}
3254 3654
3255sub emergency_save() { 3655sub emergency_save() {
3256 my $freeze_guard = cf::freeze_mainloop; 3656 my $freeze_guard = cf::freeze_mainloop;
3257 3657
3258 warn "enter emergency perl save\n"; 3658 warn "emergency_perl_save: enter\n";
3259 3659
3260 cf::sync_job { 3660 cf::sync_job {
3661 # this is a trade-off: we want to be very quick here, so
3662 # save all maps without fsync, and later call a global sync
3663 # (which in turn might be very very slow)
3664 local $USE_FSYNC = 0;
3665
3261 # use a peculiar iteration method to avoid tripping on perl 3666 # use a peculiar iteration method to avoid tripping on perl
3262 # refcount bugs in for. also avoids problems with players 3667 # refcount bugs in for. also avoids problems with players
3263 # and maps saved/destroyed asynchronously. 3668 # and maps saved/destroyed asynchronously.
3264 warn "begin emergency player save\n"; 3669 warn "emergency_perl_save: begin player save\n";
3265 for my $login (keys %cf::PLAYER) { 3670 for my $login (keys %cf::PLAYER) {
3266 my $pl = $cf::PLAYER{$login} or next; 3671 my $pl = $cf::PLAYER{$login} or next;
3267 $pl->valid or next; 3672 $pl->valid or next;
3673 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3268 $pl->save; 3674 $pl->save;
3269 } 3675 }
3270 warn "end emergency player save\n"; 3676 warn "emergency_perl_save: end player save\n";
3271 3677
3272 warn "begin emergency map save\n"; 3678 warn "emergency_perl_save: begin map save\n";
3273 for my $path (keys %cf::MAP) { 3679 for my $path (keys %cf::MAP) {
3274 my $map = $cf::MAP{$path} or next; 3680 my $map = $cf::MAP{$path} or next;
3275 $map->valid or next; 3681 $map->valid or next;
3276 $map->save; 3682 $map->save;
3277 } 3683 }
3278 warn "end emergency map save\n"; 3684 warn "emergency_perl_save: end map save\n";
3279 3685
3280 warn "begin emergency database checkpoint\n"; 3686 warn "emergency_perl_save: begin database checkpoint\n";
3281 BDB::db_env_txn_checkpoint $DB_ENV; 3687 BDB::db_env_txn_checkpoint $DB_ENV;
3282 warn "end emergency database checkpoint\n"; 3688 warn "emergency_perl_save: end database checkpoint\n";
3689
3690 warn "emergency_perl_save: begin write uuid\n";
3691 write_uuid_sync 1;
3692 warn "emergency_perl_save: end write uuid\n";
3283 }; 3693 };
3284 3694
3695 warn "emergency_perl_save: starting sync()\n";
3696 IO::AIO::aio_sync sub {
3697 warn "emergency_perl_save: finished sync()\n";
3698 };
3699
3285 warn "leave emergency perl save\n"; 3700 warn "emergency_perl_save: leave\n";
3286} 3701}
3287 3702
3288sub post_cleanup { 3703sub post_cleanup {
3289 my ($make_core) = @_; 3704 my ($make_core) = @_;
3290 3705
3291 warn Carp::longmess "post_cleanup backtrace" 3706 warn Carp::longmess "post_cleanup backtrace"
3292 if $make_core; 3707 if $make_core;
3708
3709 my $fh = pidfile;
3710 unlink $PIDFILE if <$fh> == $$;
3711}
3712
3713# a safer delete_package, copied from Symbol
3714sub clear_package($) {
3715 my $pkg = shift;
3716
3717 # expand to full symbol table name if needed
3718 unless ($pkg =~ /^main::.*::$/) {
3719 $pkg = "main$pkg" if $pkg =~ /^::/;
3720 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3721 $pkg .= '::' unless $pkg =~ /::$/;
3722 }
3723
3724 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3725 my $stem_symtab = *{$stem}{HASH};
3726
3727 defined $stem_symtab and exists $stem_symtab->{$leaf}
3728 or return;
3729
3730 # clear all symbols
3731 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3732 for my $name (keys %$leaf_symtab) {
3733 _gv_clear *{"$pkg$name"};
3734# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3735 }
3736 warn "cleared package $pkg\n";#d#
3293} 3737}
3294 3738
3295sub do_reload_perl() { 3739sub do_reload_perl() {
3296 # can/must only be called in main 3740 # can/must only be called in main
3297 if ($Coro::current != $Coro::main) { 3741 if ($Coro::current != $Coro::main) {
3298 warn "can only reload from main coroutine"; 3742 warn "can only reload from main coroutine";
3299 return; 3743 return;
3300 } 3744 }
3301 3745
3746 return if $RELOAD++;
3747
3748 my $t1 = EV::time;
3749
3750 while ($RELOAD) {
3302 warn "reloading..."; 3751 warn "reloading...";
3303 3752
3304 warn "entering sync_job"; 3753 warn "entering sync_job";
3305 3754
3306 cf::sync_job { 3755 cf::sync_job {
3307 cf::write_runtime; # external watchdog should not bark 3756 cf::write_runtime_sync; # external watchdog should not bark
3308 cf::emergency_save; 3757 cf::emergency_save;
3309 cf::write_runtime; # external watchdog should not bark 3758 cf::write_runtime_sync; # external watchdog should not bark
3310 3759
3311 warn "syncing database to disk"; 3760 warn "syncing database to disk";
3312 BDB::db_env_txn_checkpoint $DB_ENV; 3761 BDB::db_env_txn_checkpoint $DB_ENV;
3313 3762
3314 # if anything goes wrong in here, we should simply crash as we already saved 3763 # if anything goes wrong in here, we should simply crash as we already saved
3315 3764
3316 warn "cancelling all WF_AUTOCANCEL watchers";
3317 for (Event::all_watchers) {
3318 $_->cancel if $_->data & WF_AUTOCANCEL;
3319 }
3320
3321 warn "flushing outstanding aio requests"; 3765 warn "flushing outstanding aio requests";
3322 for (;;) {
3323 BDB::flush;
3324 IO::AIO::flush;
3325 Coro::cede;
3326 last unless IO::AIO::nreqs || BDB::nreqs; 3766 while (IO::AIO::nreqs || BDB::nreqs) {
3327 warn "iterate..."; 3767 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3328 }
3329
3330 ++$RELOAD;
3331
3332 warn "cancelling all extension coros";
3333 $_->cancel for values %EXT_CORO;
3334 %EXT_CORO = ();
3335
3336 warn "removing commands";
3337 %COMMAND = ();
3338
3339 warn "removing ext/exti commands";
3340 %EXTCMD = ();
3341 %EXTICMD = ();
3342
3343 warn "unloading/nuking all extensions";
3344 for my $pkg (@EXTS) {
3345 warn "... unloading $pkg";
3346
3347 if (my $cb = $pkg->can ("unload")) {
3348 eval {
3349 $cb->($pkg);
3350 1
3351 } or warn "$pkg unloaded, but with errors: $@";
3352 } 3768 }
3353 3769
3354 warn "... nuking $pkg"; 3770 warn "cancelling all extension coros";
3355 Symbol::delete_package $pkg; 3771 $_->cancel for values %EXT_CORO;
3356 } 3772 %EXT_CORO = ();
3357 3773
3358 warn "unloading all perl modules loaded from $LIBDIR"; 3774 warn "removing commands";
3359 while (my ($k, $v) = each %INC) { 3775 %COMMAND = ();
3360 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3361 3776
3777 warn "removing ext/exti commands";
3778 %EXTCMD = ();
3779 %EXTICMD = ();
3780
3781 warn "unloading/nuking all extensions";
3782 for my $pkg (@EXTS) {
3362 warn "... unloading $k"; 3783 warn "... unloading $pkg";
3363 delete $INC{$k};
3364 3784
3365 $k =~ s/\.pm$//;
3366 $k =~ s/\//::/g;
3367
3368 if (my $cb = $k->can ("unload_module")) { 3785 if (my $cb = $pkg->can ("unload")) {
3786 eval {
3369 $cb->(); 3787 $cb->($pkg);
3788 1
3789 } or warn "$pkg unloaded, but with errors: $@";
3790 }
3791
3792 warn "... clearing $pkg";
3793 clear_package $pkg;
3370 } 3794 }
3371 3795
3372 Symbol::delete_package $k; 3796 warn "unloading all perl modules loaded from $LIBDIR";
3797 while (my ($k, $v) = each %INC) {
3798 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3799
3800 warn "... unloading $k";
3801 delete $INC{$k};
3802
3803 $k =~ s/\.pm$//;
3804 $k =~ s/\//::/g;
3805
3806 if (my $cb = $k->can ("unload_module")) {
3807 $cb->();
3808 }
3809
3810 clear_package $k;
3373 } 3811 }
3374 3812
3375 warn "getting rid of safe::, as good as possible"; 3813 warn "getting rid of safe::, as good as possible";
3376 Symbol::delete_package "safe::$_" 3814 clear_package "safe::$_"
3377 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3815 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3378 3816
3379 warn "unloading cf.pm \"a bit\""; 3817 warn "unloading cf.pm \"a bit\"";
3380 delete $INC{"cf.pm"}; 3818 delete $INC{"cf.pm"};
3381 delete $INC{"cf/pod.pm"}; 3819 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3382 3820
3383 # don't, removes xs symbols, too, 3821 # don't, removes xs symbols, too,
3384 # and global variables created in xs 3822 # and global variables created in xs
3385 #Symbol::delete_package __PACKAGE__; 3823 #clear_package __PACKAGE__;
3386 3824
3387 warn "unload completed, starting to reload now"; 3825 warn "unload completed, starting to reload now";
3388 3826
3389 warn "reloading cf.pm"; 3827 warn "reloading cf.pm";
3390 require cf; 3828 require cf;
3391 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3829 cf::_connect_to_perl_1;
3392 3830
3393 warn "loading config and database again"; 3831 warn "loading config and database again";
3394 cf::reload_config; 3832 cf::reload_config;
3395 3833
3396 warn "loading extensions"; 3834 warn "loading extensions";
3397 cf::load_extensions; 3835 cf::load_extensions;
3398 3836
3837 if ($REATTACH_ON_RELOAD) {
3399 warn "reattaching attachments to objects/players"; 3838 warn "reattaching attachments to objects/players";
3400 _global_reattach; # objects, sockets 3839 _global_reattach; # objects, sockets
3401 warn "reattaching attachments to maps"; 3840 warn "reattaching attachments to maps";
3402 reattach $_ for values %MAP; 3841 reattach $_ for values %MAP;
3403 warn "reattaching attachments to players"; 3842 warn "reattaching attachments to players";
3404 reattach $_ for values %PLAYER; 3843 reattach $_ for values %PLAYER;
3844 }
3405 3845
3846 warn "running post_init jobs";
3847 (pop @POST_INIT)->(1) while @POST_INIT;
3848
3406 warn "leaving sync_job"; 3849 warn "leaving sync_job";
3407 3850
3408 1 3851 1
3409 } or do { 3852 } or do {
3410 warn $@; 3853 warn $@;
3411 warn "error while reloading, exiting."; 3854 cf::cleanup "error while reloading, exiting.";
3412 exit 1;
3413 }; 3855 };
3414 3856
3415 warn "reloaded"; 3857 warn "reloaded";
3858 --$RELOAD;
3859 }
3860
3861 $t1 = EV::time - $t1;
3862 warn "reload completed in ${t1}s\n";
3416}; 3863};
3417 3864
3418our $RELOAD_WATCHER; # used only during reload 3865our $RELOAD_WATCHER; # used only during reload
3419 3866
3420sub reload_perl() { 3867sub reload_perl() {
3421 # doing reload synchronously and two reloads happen back-to-back, 3868 # doing reload synchronously and two reloads happen back-to-back,
3422 # coro crashes during coro_state_free->destroy here. 3869 # coro crashes during coro_state_free->destroy here.
3423 3870
3424 $RELOAD_WATCHER ||= Event->timer ( 3871 $RELOAD_WATCHER ||= cf::async {
3425 reentrant => 0, 3872 Coro::AIO::aio_wait cache_extensions;
3426 after => 0, 3873
3427 data => WF_AUTOCANCEL, 3874 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3428 cb => sub {
3429 do_reload_perl; 3875 do_reload_perl;
3430 undef $RELOAD_WATCHER; 3876 undef $RELOAD_WATCHER;
3431 }, 3877 };
3432 ); 3878 };
3433} 3879}
3434 3880
3435register_command "reload" => sub { 3881register_command "reload" => sub {
3436 my ($who, $arg) = @_; 3882 my ($who, $arg) = @_;
3437 3883
3438 if ($who->flag (FLAG_WIZ)) { 3884 if ($who->flag (FLAG_WIZ)) {
3439 $who->message ("reloading server."); 3885 $who->message ("reloading server.");
3886 async {
3887 $Coro::current->{desc} = "perl_reload";
3440 async { reload_perl }; 3888 reload_perl;
3889 };
3441 } 3890 }
3442}; 3891};
3443 3892
3444unshift @INC, $LIBDIR; 3893unshift @INC, $LIBDIR;
3445 3894
… …
3447 3896
3448our @WAIT_FOR_TICK; 3897our @WAIT_FOR_TICK;
3449our @WAIT_FOR_TICK_BEGIN; 3898our @WAIT_FOR_TICK_BEGIN;
3450 3899
3451sub wait_for_tick { 3900sub wait_for_tick {
3452 return unless $TICK_WATCHER->is_active;
3453 return if $Coro::current == $Coro::main; 3901 return if tick_inhibit || $Coro::current == $Coro::main;
3454 3902
3455 my $signal = new Coro::Signal; 3903 my $signal = new Coro::Signal;
3456 push @WAIT_FOR_TICK, $signal; 3904 push @WAIT_FOR_TICK, $signal;
3457 $signal->wait; 3905 $signal->wait;
3458} 3906}
3459 3907
3460sub wait_for_tick_begin { 3908sub wait_for_tick_begin {
3461 return unless $TICK_WATCHER->is_active;
3462 return if $Coro::current == $Coro::main; 3909 return if tick_inhibit || $Coro::current == $Coro::main;
3463 3910
3464 my $signal = new Coro::Signal; 3911 my $signal = new Coro::Signal;
3465 push @WAIT_FOR_TICK_BEGIN, $signal; 3912 push @WAIT_FOR_TICK_BEGIN, $signal;
3466 $signal->wait; 3913 $signal->wait;
3467} 3914}
3468 3915
3469$TICK_WATCHER = Event->timer ( 3916sub tick {
3470 reentrant => 0,
3471 parked => 1,
3472 prio => 0,
3473 at => $NEXT_TICK || $TICK,
3474 data => WF_AUTOCANCEL,
3475 cb => sub {
3476 if ($Coro::current != $Coro::main) { 3917 if ($Coro::current != $Coro::main) {
3477 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3918 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3478 unless ++$bug_warning > 10; 3919 unless ++$bug_warning > 10;
3479 return; 3920 return;
3480 } 3921 }
3481 3922
3482 $NOW = $tick_start = Event::time;
3483
3484 cf::server_tick; # one server iteration 3923 cf::server_tick; # one server iteration
3485 3924
3486 $RUNTIME += $TICK;
3487 $NEXT_TICK += $TICK;
3488
3489 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3925 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3490 $NEXT_RUNTIME_WRITE = $NOW + 10; 3926 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3491 Coro::async_pool { 3927 Coro::async_pool {
3928 $Coro::current->{desc} = "runtime saver";
3492 write_runtime 3929 write_runtime_sync
3493 or warn "ERROR: unable to write runtime file: $!"; 3930 or warn "ERROR: unable to write runtime file: $!";
3494 };
3495 } 3931 };
3932 }
3496 3933
3497 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3934 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3498 $sig->send; 3935 $sig->send;
3499 } 3936 }
3500 while (my $sig = shift @WAIT_FOR_TICK) { 3937 while (my $sig = shift @WAIT_FOR_TICK) {
3501 $sig->send; 3938 $sig->send;
3502 } 3939 }
3503 3940
3504 $NOW = Event::time; 3941 $LOAD = ($NOW - $TICK_START) / $TICK;
3505
3506 # if we are delayed by four ticks or more, skip them all
3507 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3508
3509 $TICK_WATCHER->at ($NEXT_TICK);
3510 $TICK_WATCHER->start;
3511
3512 $LOAD = ($NOW - $tick_start) / $TICK;
3513 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3942 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3514 3943
3515 _post_tick; 3944 if (0) {
3945 if ($NEXT_TICK) {
3946 my $jitter = $TICK_START - $NEXT_TICK;
3947 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3948 warn "jitter $JITTER\n";#d#
3949 }
3516 }, 3950 }
3517); 3951}
3518 3952
3519{ 3953{
3954 # configure BDB
3955
3520 BDB::min_parallel 8; 3956 BDB::min_parallel 8;
3521 BDB::max_poll_time $TICK * 0.1; 3957 BDB::max_poll_reqs $TICK * 0.1;
3522 $BDB_POLL_WATCHER = Event->io ( 3958 $AnyEvent::BDB::WATCHER->priority (1);
3523 reentrant => 0,
3524 fd => BDB::poll_fileno,
3525 poll => 'r',
3526 prio => 0,
3527 data => WF_AUTOCANCEL,
3528 cb => \&BDB::poll_cb,
3529 );
3530
3531 BDB::set_sync_prepare {
3532 my $status;
3533 my $current = $Coro::current;
3534 (
3535 sub {
3536 $status = $!;
3537 $current->ready; undef $current;
3538 },
3539 sub {
3540 Coro::schedule while defined $current;
3541 $! = $status;
3542 },
3543 )
3544 };
3545 3959
3546 unless ($DB_ENV) { 3960 unless ($DB_ENV) {
3547 $DB_ENV = BDB::db_env_create; 3961 $DB_ENV = BDB::db_env_create;
3548 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3962 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3549 | BDB::LOG_AUTOREMOVE, 1); 3963 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3964 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3550 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3965 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3551 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3966 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3552 3967
3553 cf::sync_job { 3968 cf::sync_job {
3554 eval { 3969 eval {
… …
3564 3979
3565 cf::cleanup "db_env_open(db): $@" if $@; 3980 cf::cleanup "db_env_open(db): $@" if $@;
3566 }; 3981 };
3567 } 3982 }
3568 3983
3569 $BDB_DEADLOCK_WATCHER = Event->timer ( 3984 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3570 after => 3,
3571 interval => 1,
3572 hard => 1,
3573 prio => 0,
3574 data => WF_AUTOCANCEL,
3575 cb => sub {
3576 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3985 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3577 },
3578 ); 3986 };
3579 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3987 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3580 after => 11,
3581 interval => 60,
3582 hard => 1,
3583 prio => 0,
3584 data => WF_AUTOCANCEL,
3585 cb => sub {
3586 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3988 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3587 },
3588 ); 3989 };
3589 $BDB_TRICKLE_WATCHER = Event->timer ( 3990 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3590 after => 5,
3591 interval => 10,
3592 hard => 1,
3593 prio => 0,
3594 data => WF_AUTOCANCEL,
3595 cb => sub {
3596 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3991 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3597 },
3598 ); 3992 };
3599} 3993}
3600 3994
3601{ 3995{
3996 # configure IO::AIO
3997
3602 IO::AIO::min_parallel 8; 3998 IO::AIO::min_parallel 8;
3603
3604 undef $Coro::AIO::WATCHER;
3605 IO::AIO::max_poll_time $TICK * 0.1; 3999 IO::AIO::max_poll_time $TICK * 0.1;
3606 $AIO_POLL_WATCHER = Event->io ( 4000 undef $AnyEvent::AIO::WATCHER;
3607 reentrant => 0,
3608 data => WF_AUTOCANCEL,
3609 fd => IO::AIO::poll_fileno,
3610 poll => 'r',
3611 prio => 6,
3612 cb => \&IO::AIO::poll_cb,
3613 );
3614} 4001}
3615 4002
3616my $_log_backtrace; 4003my $_log_backtrace;
3617 4004
3618sub _log_backtrace { 4005sub _log_backtrace {
… …
3621 $msg =~ s/\n//; 4008 $msg =~ s/\n//;
3622 4009
3623 # limit the # of concurrent backtraces 4010 # limit the # of concurrent backtraces
3624 if ($_log_backtrace < 2) { 4011 if ($_log_backtrace < 2) {
3625 ++$_log_backtrace; 4012 ++$_log_backtrace;
4013 my $perl_bt = Carp::longmess $msg;
3626 async { 4014 async {
4015 $Coro::current->{desc} = "abt $msg";
4016
3627 my @bt = fork_call { 4017 my @bt = fork_call {
3628 @addr = map { sprintf "%x", $_ } @addr; 4018 @addr = map { sprintf "%x", $_ } @addr;
3629 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4019 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3630 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4020 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3631 or die "addr2line: $!"; 4021 or die "addr2line: $!";
… …
3639 } 4029 }
3640 4030
3641 @funcs 4031 @funcs
3642 }; 4032 };
3643 4033
3644 LOG llevInfo, "[ABT] $msg\n"; 4034 LOG llevInfo, "[ABT] $perl_bt\n";
4035 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3645 LOG llevInfo, "[ABT] $_\n" for @bt; 4036 LOG llevInfo, "[ABT] $_\n" for @bt;
3646 --$_log_backtrace; 4037 --$_log_backtrace;
3647 }; 4038 };
3648 } else { 4039 } else {
3649 LOG llevInfo, "[ABT] $msg\n"; 4040 LOG llevInfo, "[ABT] $msg\n";
3650 LOG llevInfo, "[ABT] [suppressed]\n"; 4041 LOG llevInfo, "[ABT] [suppressed]\n";
3651 } 4042 }
3652} 4043}
3653 4044
3654# load additional modules 4045# load additional modules
3655use cf::pod; 4046require "cf/$_.pm" for @EXTRA_MODULES;
4047cf::_connect_to_perl_2;
3656 4048
3657END { cf::emergency_save } 4049END { cf::emergency_save }
3658 4050
36591 40511
3660 4052

Diff Legend

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