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.348 by root, Thu Aug 30 08:34:40 2007 UTC vs.
Revision 1.529 by root, Wed Apr 28 11:28:22 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines