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

Diff Legend

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