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.335 by root, Mon Aug 20 22:21:48 2007 UTC vs.
Revision 1.514 by root, Mon Apr 12 17:13:36 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines