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.338 by root, Tue Aug 21 01:07:47 2007 UTC vs.
Revision 1.523 by root, Sat Apr 17 02:39:46 2010 UTC

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

Diff Legend

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