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.397 by root, Mon Nov 19 15:47:14 2007 UTC vs.
Revision 1.546 by root, Thu May 6 22:57:49 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
3use utf8; 25use common::sense;
4use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use EV; 30use EV;
10use Opcode; 31use Opcode;
11use Safe; 32use Safe;
12use Safe::Hole; 33use Safe::Hole;
13use Storable (); 34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 4.1 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
18use Coro::EV; 41use Coro::EV;
42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
24use Coro::Util (); 51use Coro::Util ();
25 52
26use JSON::XS (); 53use JSON::XS 2.01 ();
27use BDB (); 54use BDB ();
28use Data::Dumper; 55use Data::Dumper;
29use Digest::MD5;
30use Fcntl; 56use Fcntl;
31use YAML::Syck (); 57use YAML::XS ();
32use IO::AIO 2.51 (); 58use IO::AIO ();
33use Time::HiRes; 59use Time::HiRes;
34use Compress::LZF; 60use Compress::LZF;
35use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
36 64
37# configure various modules to our taste 65# configure various modules to our taste
38# 66#
39$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42 75
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 76# strictly for debugging
44$YAML::Syck::ImplicitUnicode = 1; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45
46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
47 78
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
49 82
50our %COMMAND = (); 83our %COMMAND = ();
51our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
52 85
53our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
54our %EXTCMD = (); 87our %EXTCMD = ();
55our %EXTICMD = (); 88our %EXTICMD = ();
56our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
57our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
58 91
59our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
60our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
61 96
62our $CONFDIR = confdir; 97our $CONFDIR = confdir;
63our $DATADIR = datadir; 98our $DATADIR = datadir;
64our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
65our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
66our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
67our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
73 118
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER;
76our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 121our $NEXT_TICK;
79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
81 123
82our $BDB_POLL_WATCHER;
83our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
84our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
85our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
86our $DB_ENV; 127our $DB_ENV;
87 128
129our @EXTRA_MODULES = qw(pod match mapscript incloader);
130
88our %CFG; 131our %CFG;
89 132
90our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
91our $RUNTIME; 134our $RUNTIME;
135our $NOW;
92 136
93our (%PLAYER, %PLAYER_LOADING); # all users 137our (%PLAYER, %PLAYER_LOADING); # all users
94our (%MAP, %MAP_LOADING ); # all maps 138our (%MAP, %MAP_LOADING ); # all maps
95our $LINK_MAP; # the special {link} map, which is always available 139our $LINK_MAP; # the special {link} map, which is always available
96 140
97# used to convert map paths into valid unix filenames by replacing / by ∕ 141# used to convert map paths into valid unix filenames by replacing / by ∕
98our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 142our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
99 143
100our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
101our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
146our $JITTER; # average jitter
102our $tick_start; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
148
149our @POST_INIT;
150
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
103 153
104binmode STDOUT; 154binmode STDOUT;
105binmode STDERR; 155binmode STDERR;
106 156
107# read virtual server time, if available 157# read virtual server time, if available
108unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
109 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
110 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
111 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
112} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
113 165
114mkdir $_ 166mkdir $_
115 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
116 168
117our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
118 170
119sub cf::map::normalise; 171sub cf::map::normalise;
172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
120 187
121############################################################################# 188#############################################################################
122 189
123=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
124 191
… …
166from wherever your confdir points to. 233from wherever your confdir points to.
167 234
168=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
169 236
170These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
171returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one thread
172per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
173 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
174=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
175 247
176This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
177C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 249C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
178that call. 250that call.
179 251
252=item %cf::REFLECT
253
254Contains, for each (C++) class name, a hash reference with information
255about object members (methods, scalars, arrays and flags) and other
256metadata, which is useful for introspection.
257
180=back 258=back
181 259
182=cut 260=cut
183 261
184BEGIN { 262sub error(@) { LOG llevError, join "", @_ }
185 *CORE::GLOBAL::warn = sub { 263sub warn (@) { LOG llevWarn , join "", @_ }
264sub info (@) { LOG llevInfo , join "", @_ }
265sub debug(@) { LOG llevDebug, join "", @_ }
266sub trace(@) { LOG llevTrace, join "", @_ }
267
268$Coro::State::WARNHOOK = sub {
186 my $msg = join "", @_; 269 my $msg = join "", @_;
187 270
188 $msg .= "\n" 271 $msg .= "\n"
189 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
190 273
191 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 274 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
192 275
193 LOG llevError, $msg; 276 LOG llevWarn, $msg;
194 }; 277};
195} 278
279$Coro::State::DIEHOOK = sub {
280 return unless $^S eq 0; # "eq", not "=="
281
282 error Carp::longmess $_[0];
283
284 if (in_main) {#d#
285 error "DIEHOOK called in main context, Coro bug?\n";#d#
286 return;#d#
287 }#d#
288
289 # kill coroutine otherwise
290 Coro::terminate
291};
196 292
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 296@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
207for my $pkg (qw( 303for my $pkg (qw(
208 cf::global cf::attachable 304 cf::global cf::attachable
209 cf::object cf::object::player 305 cf::object cf::object::player
210 cf::client cf::player 306 cf::client cf::player
211 cf::arch cf::living 307 cf::arch cf::living
308 cf::map cf::mapspace
212 cf::map cf::party cf::region 309 cf::party cf::region
213)) { 310)) {
214 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 312}
217 313
218$EV::DIED = sub { 314$EV::DIED = sub {
219 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
220}; 316};
221 317
222############################################################################# 318#############################################################################
223 319
224=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
… …
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 342 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 343 $d
248 } || "[unable to dump $_[0]: '$@']"; 344 } || "[unable to dump $_[0]: '$@']";
249} 345}
250 346
251=item $ref = cf::from_json $json 347=item $ref = cf::decode_json $json
252 348
253Converts a JSON string into the corresponding perl data structure. 349Converts a JSON string into the corresponding perl data structure.
254 350
255=item $json = cf::to_json $ref 351=item $json = cf::encode_json $ref
256 352
257Converts a perl data structure into its JSON representation. 353Converts a perl data structure into its JSON representation.
258 354
259=cut 355=cut
260 356
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 357our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 358
263sub to_json ($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
361
362=item cf::post_init { BLOCK }
363
364Execute the given codeblock, I<after> all extensions have been (re-)loaded,
365but I<before> the server starts ticking again.
366
367The cdoeblock will have a single boolean argument to indicate whether this
368is a reload or not.
369
370=cut
371
372sub post_init(&) {
373 push @POST_INIT, shift;
374}
265 375
266=item cf::lock_wait $string 376=item cf::lock_wait $string
267 377
268Wait until the given lock is available. See cf::lock_acquire. 378Wait until the given lock is available. See cf::lock_acquire.
269 379
270=item my $lock = cf::lock_acquire $string 380=item my $lock = cf::lock_acquire $string
271 381
272Wait until the given lock is available and then acquires it and returns 382Wait 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, 383a L<Guard> object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 384for example when the coroutine gets canceled), the lock is automatically
275returned. 385returned.
276 386
277Locks are *not* recursive, locking from the same coro twice results in a 387Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro. 388deadlocked coro.
… …
284 394
285Return true if the lock is currently active, i.e. somebody has locked it. 395Return true if the lock is currently active, i.e. somebody has locked it.
286 396
287=cut 397=cut
288 398
289our %LOCK; 399our $LOCKS = new Coro::SemaphoreSet;
290our %LOCKER;#d#
291 400
292sub lock_wait($) { 401sub lock_wait($) {
293 my ($key) = @_; 402 $LOCKS->wait ($_[0]);
294
295 if ($LOCKER{$key} == $Coro::current) {#d#
296 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
297 return;#d#
298 }#d#
299
300 # wait for lock, if any
301 while ($LOCK{$key}) {
302 push @{ $LOCK{$key} }, $Coro::current;
303 Coro::schedule;
304 }
305} 403}
306 404
307sub lock_acquire($) { 405sub lock_acquire($) {
308 my ($key) = @_; 406 $LOCKS->guard ($_[0])
309
310 # wait, to be sure we are not locked
311 lock_wait $key;
312
313 $LOCK{$key} = [];
314 $LOCKER{$key} = $Coro::current;#d#
315
316 Coro::guard {
317 delete $LOCKER{$key};#d#
318 # wake up all waiters, to be on the safe side
319 $_->ready for @{ delete $LOCK{$key} };
320 }
321} 407}
322 408
323sub lock_active($) { 409sub lock_active($) {
324 my ($key) = @_; 410 $LOCKS->count ($_[0]) < 1
325
326 ! ! $LOCK{$key}
327} 411}
328 412
329sub freeze_mainloop { 413sub freeze_mainloop {
330 return unless $TICK_WATCHER->is_active; 414 tick_inhibit_inc;
331 415
332 my $guard = Coro::guard { 416 &Guard::guard (\&tick_inhibit_dec);
333 $TICK_WATCHER->start;
334 };
335 $TICK_WATCHER->stop;
336 $guard
337} 417}
338 418
339=item cf::periodic $interval, $cb 419=item cf::periodic $interval, $cb
340 420
341Like EV::periodic, but randomly selects a starting point so that the actions 421Like EV::periodic, but randomly selects a starting point so that the actions
342get spread over timer. 422get spread over time.
343 423
344=cut 424=cut
345 425
346sub periodic($$) { 426sub periodic($$) {
347 my ($interval, $cb) = @_; 427 my ($interval, $cb) = @_;
… …
364 444
365=cut 445=cut
366 446
367our @SLOT_QUEUE; 447our @SLOT_QUEUE;
368our $SLOT_QUEUE; 448our $SLOT_QUEUE;
449our $SLOT_DECAY = 0.9;
369 450
370$SLOT_QUEUE->cancel if $SLOT_QUEUE; 451$SLOT_QUEUE->cancel if $SLOT_QUEUE;
371$SLOT_QUEUE = Coro::async { 452$SLOT_QUEUE = Coro::async {
372 $Coro::current->desc ("timeslot manager"); 453 $Coro::current->desc ("timeslot manager");
373 454
374 my $signal = new Coro::Signal; 455 my $signal = new Coro::Signal;
456 my $busy;
375 457
376 while () { 458 while () {
377 next_job: 459 next_job:
460
378 my $avail = cf::till_tick; 461 my $avail = cf::till_tick;
379 if ($avail > 0.01) { 462
380 for (0 .. $#SLOT_QUEUE) { 463 for (0 .. $#SLOT_QUEUE) {
381 if ($SLOT_QUEUE[$_][0] < $avail) { 464 if ($SLOT_QUEUE[$_][0] <= $avail) {
465 $busy = 0;
382 my $job = splice @SLOT_QUEUE, $_, 1, (); 466 my $job = splice @SLOT_QUEUE, $_, 1, ();
383 $job->[2]->send; 467 $job->[2]->send;
384 Coro::cede; 468 Coro::cede;
385 goto next_job; 469 goto next_job;
386 } 470 } else {
471 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
387 } 472 }
388 } 473 }
389 474
390 if (@SLOT_QUEUE) { 475 if (@SLOT_QUEUE) {
391 # we do not use wait_for_tick() as it returns immediately when tick is inactive 476 # we do not use wait_for_tick() as it returns immediately when tick is inactive
392 push @cf::WAIT_FOR_TICK, $signal; 477 push @cf::WAIT_FOR_TICK, $signal;
393 $signal->wait; 478 $signal->wait;
394 } else { 479 } else {
480 $busy = 0;
395 Coro::schedule; 481 Coro::schedule;
396 } 482 }
397 } 483 }
398}; 484};
399 485
400sub get_slot($;$$) { 486sub get_slot($;$$) {
487 return if tick_inhibit || $Coro::current == $Coro::main;
488
401 my ($time, $pri, $name) = @_; 489 my ($time, $pri, $name) = @_;
402 490
403 $time = $TICK * .6 if $time > $TICK * .6; 491 $time = clamp $time, 0.01, $TICK * .6;
492
404 my $sig = new Coro::Signal; 493 my $sig = new Coro::Signal;
405 494
406 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 495 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
407 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 496 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
408 $SLOT_QUEUE->ready; 497 $SLOT_QUEUE->ready;
… …
434=cut 523=cut
435 524
436sub sync_job(&) { 525sub sync_job(&) {
437 my ($job) = @_; 526 my ($job) = @_;
438 527
439 if ($Coro::current == $Coro::main) { 528 if (in_main) {
440 my $time = EV::time; 529 my $time = AE::time;
441 530
442 # this is the main coro, too bad, we have to block 531 # this is the main coro, too bad, we have to block
443 # till the operation succeeds, freezing the server :/ 532 # till the operation succeeds, freezing the server :/
444 533
445 LOG llevError, Carp::longmess "sync job";#d# 534 #LOG llevError, Carp::longmess "sync job";#d#
446 535
447 # TODO: use suspend/resume instead
448 # (but this is cancel-safe)
449 my $freeze_guard = freeze_mainloop; 536 my $freeze_guard = freeze_mainloop;
450 537
451 my $busy = 1; 538 my $busy = 1;
452 my @res; 539 my @res;
453 540
454 (async { 541 (async {
455 $Coro::current->desc ("sync job coro"); 542 $Coro::current->desc ("sync job coro");
456 @res = eval { $job->() }; 543 @res = eval { $job->() };
457 warn $@ if $@; 544 error $@ if $@;
458 undef $busy; 545 undef $busy;
459 })->prio (Coro::PRIO_MAX); 546 })->prio (Coro::PRIO_MAX);
460 547
461 while ($busy) { 548 while ($busy) {
462 if (Coro::nready) { 549 if (Coro::nready) {
… …
464 } else { 551 } else {
465 EV::loop EV::LOOP_ONESHOT; 552 EV::loop EV::LOOP_ONESHOT;
466 } 553 }
467 } 554 }
468 555
469 $time = EV::time - $time; 556 my $time = AE::time - $time;
470 557
471 LOG llevError | logBacktrace, Carp::longmess "long sync job"
472 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
473
474 $tick_start += $time; # do not account sync jobs to server load 558 $TICK_START += $time; # do not account sync jobs to server load
475 559
476 wantarray ? @res : $res[0] 560 wantarray ? @res : $res[0]
477 } else { 561 } else {
478 # we are in another coroutine, how wonderful, everything just works 562 # we are in another coroutine, how wonderful, everything just works
479 563
… …
523 }, @args; 607 }, @args;
524 608
525 wantarray ? @res : $res[-1] 609 wantarray ? @res : $res[-1]
526} 610}
527 611
612sub objinfo {
613 (
614 "counter value" => cf::object::object_count,
615 "objects created" => cf::object::create_count,
616 "objects destroyed" => cf::object::destroy_count,
617 "freelist size" => cf::object::free_count,
618 "allocated objects" => cf::object::objects_size,
619 "active objects" => cf::object::actives_size,
620 )
621}
622
623=item $coin = coin_from_name $name
624
625=cut
626
627our %coin_alias = (
628 "silver" => "silvercoin",
629 "silvercoin" => "silvercoin",
630 "silvercoins" => "silvercoin",
631 "gold" => "goldcoin",
632 "goldcoin" => "goldcoin",
633 "goldcoins" => "goldcoin",
634 "platinum" => "platinacoin",
635 "platinumcoin" => "platinacoin",
636 "platinumcoins" => "platinacoin",
637 "platina" => "platinacoin",
638 "platinacoin" => "platinacoin",
639 "platinacoins" => "platinacoin",
640 "royalty" => "royalty",
641 "royalties" => "royalty",
642);
643
644sub coin_from_name($) {
645 $coin_alias{$_[0]}
646 ? cf::arch::find $coin_alias{$_[0]}
647 : undef
648}
649
528=item $value = cf::db_get $family => $key 650=item $value = cf::db_get $family => $key
529 651
530Returns a single value from the environment database. 652Returns a single value from the environment database.
531 653
532=item cf::db_put $family => $key => $value 654=item cf::db_put $family => $key => $value
… …
540within each server. 662within each server.
541 663
542=cut 664=cut
543 665
544sub db_table($) { 666sub db_table($) {
667 cf::error "db_get called from main context"
668 if $Coro::current == $Coro::main;
669
545 my ($name) = @_; 670 my ($name) = @_;
546 my $db = BDB::db_create $DB_ENV; 671 my $db = BDB::db_create $DB_ENV;
547 672
548 eval { 673 eval {
549 $db->set_flags (BDB::CHKSUM); 674 $db->set_flags (BDB::CHKSUM);
… …
559} 684}
560 685
561our $DB; 686our $DB;
562 687
563sub db_init { 688sub db_init {
564 cf::sync_job {
565 $DB ||= db_table "db"; 689 $DB ||= db_table "db";
566 };
567} 690}
568 691
569sub db_get($$) { 692sub db_get($$) {
570 my $key = "$_[0]/$_[1]"; 693 my $key = "$_[0]/$_[1]";
571 694
572 cf::sync_job { 695 cf::error "db_get called from main context"
696 if $Coro::current == $Coro::main;
697
573 BDB::db_get $DB, undef, $key, my $data; 698 BDB::db_get $DB, undef, $key, my $data;
574 699
575 $! ? () 700 $! ? ()
576 : $data 701 : $data
577 }
578} 702}
579 703
580sub db_put($$$) { 704sub db_put($$$) {
581 BDB::dbreq_pri 4; 705 BDB::dbreq_pri 4;
582 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 706 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
638 762
639 my $t1 = Time::HiRes::time; 763 my $t1 = Time::HiRes::time;
640 my $data = $process->(\@data); 764 my $data = $process->(\@data);
641 my $t2 = Time::HiRes::time; 765 my $t2 = Time::HiRes::time;
642 766
643 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 767 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
644 768
645 db_put cache => "$id/data", $data; 769 db_put cache => "$id/data", $data;
646 db_put cache => "$id/md5" , $md5; 770 db_put cache => "$id/md5" , $md5;
647 db_put cache => "$id/meta", $meta; 771 db_put cache => "$id/meta", $meta;
648 772
… …
658 782
659=cut 783=cut
660 784
661sub datalog($@) { 785sub datalog($@) {
662 my ($type, %kv) = @_; 786 my ($type, %kv) = @_;
663 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 787 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
664} 788}
665 789
666=back 790=back
667 791
668=cut 792=cut
669 793
670############################################################################# 794#############################################################################
671 795
672=head2 ATTACHABLE OBJECTS 796=head2 ATTACHABLE OBJECTS
673 797
674Many objects in crossfire are so-called attachable objects. That means you can 798Many objects in deliantra are so-called attachable objects. That means you can
675attach callbacks/event handlers (a collection of which is called an "attachment") 799attach callbacks/event handlers (a collection of which is called an "attachment")
676to it. All such attachable objects support the following methods. 800to it. All such attachable objects support the following methods.
677 801
678In the following description, CLASS can be any of C<global>, C<object> 802In the following description, CLASS can be any of C<global>, C<object>
679C<player>, C<client> or C<map> (i.e. the attachable objects in 803C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
729=item cf::CLASS::attachment $name, ... 853=item cf::CLASS::attachment $name, ...
730 854
731Register an attachment by C<$name> through which attachable objects of the 855Register an attachment by C<$name> through which attachable objects of the
732given CLASS can refer to this attachment. 856given CLASS can refer to this attachment.
733 857
734Some classes such as crossfire maps and objects can specify attachments 858Some classes such as deliantra maps and objects can specify attachments
735that are attached at load/instantiate time, thus the need for a name. 859that are attached at load/instantiate time, thus the need for a name.
736 860
737These calls expect any number of the following handler/hook descriptions: 861These calls expect any number of the following handler/hook descriptions:
738 862
739=over 4 863=over 4
… …
863 987
864 } elsif (exists $cb_id{$type}) { 988 } elsif (exists $cb_id{$type}) {
865 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 989 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
866 990
867 } elsif (ref $type) { 991 } elsif (ref $type) {
868 warn "attaching objects not supported, ignoring.\n"; 992 error "attaching objects not supported, ignoring.\n";
869 993
870 } else { 994 } else {
871 shift @arg; 995 shift @arg;
872 warn "attach argument '$type' not supported, ignoring.\n"; 996 error "attach argument '$type' not supported, ignoring.\n";
873 } 997 }
874 } 998 }
875} 999}
876 1000
877sub _object_attach { 1001sub _object_attach {
… …
887 _attach $registry, $klass, @attach; 1011 _attach $registry, $klass, @attach;
888 } 1012 }
889 1013
890 $obj->{$name} = \%arg; 1014 $obj->{$name} = \%arg;
891 } else { 1015 } else {
892 warn "object uses attachment '$name' which is not available, postponing.\n"; 1016 info "object uses attachment '$name' which is not available, postponing.\n";
893 } 1017 }
894 1018
895 $obj->{_attachment}{$name} = undef; 1019 $obj->{_attachment}{$name} = undef;
896} 1020}
897 1021
… …
956 1080
957 for (@$callbacks) { 1081 for (@$callbacks) {
958 eval { &{$_->[1]} }; 1082 eval { &{$_->[1]} };
959 1083
960 if ($@) { 1084 if ($@) {
961 warn "$@";
962 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1085 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
963 override; 1086 override;
964 } 1087 }
965 1088
966 return 1 if $override; 1089 return 1 if $override;
967 } 1090 }
968 1091
969 0 1092 0
970} 1093}
971 1094
972=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1095=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
973 1096
974=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1097=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
975 1098
976Generate an object-specific event with the given arguments. 1099Generate an object-specific event with the given arguments.
977 1100
… …
1030 1153
1031sub reattach { 1154sub reattach {
1032 # basically do the same as instantiate, without calling instantiate 1155 # basically do the same as instantiate, without calling instantiate
1033 my ($obj) = @_; 1156 my ($obj) = @_;
1034 1157
1158 # no longer needed after getting rid of delete_package?
1035 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1159 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1036 1160
1037 my $registry = $obj->registry; 1161 my $registry = $obj->registry;
1038 1162
1039 @$registry = (); 1163 @$registry = ();
1040 1164
… …
1045 for (@$attach) { 1169 for (@$attach) {
1046 my ($klass, @attach) = @$_; 1170 my ($klass, @attach) = @$_;
1047 _attach $registry, $klass, @attach; 1171 _attach $registry, $klass, @attach;
1048 } 1172 }
1049 } else { 1173 } else {
1050 warn "object uses attachment '$name' that is not available, postponing.\n"; 1174 info "object uses attachment '$name' that is not available, postponing.\n";
1051 } 1175 }
1052 } 1176 }
1053} 1177}
1054 1178
1055cf::attachable->attach ( 1179cf::attachable->attach (
1056 prio => -1000000, 1180 prio => -1000000,
1057 on_instantiate => sub { 1181 on_instantiate => sub {
1058 my ($obj, $data) = @_; 1182 my ($obj, $data) = @_;
1059 1183
1060 $data = from_json $data; 1184 $data = decode_json $data;
1061 1185
1062 for (@$data) { 1186 for (@$data) {
1063 my ($name, $args) = @$_; 1187 my ($name, $args) = @$_;
1064 1188
1065 $obj->attach ($name, %{$args || {} }); 1189 $obj->attach ($name, %{$args || {} });
… …
1082 my ($filename, $rdata, $objs) = @_; 1206 my ($filename, $rdata, $objs) = @_;
1083 1207
1084 sync_job { 1208 sync_job {
1085 if (length $$rdata) { 1209 if (length $$rdata) {
1086 utf8::decode (my $decname = $filename); 1210 utf8::decode (my $decname = $filename);
1087 warn sprintf "saving %s (%d,%d)\n", 1211 trace sprintf "saving %s (%d,%d)\n",
1088 $decname, length $$rdata, scalar @$objs; 1212 $decname, length $$rdata, scalar @$objs
1213 if $VERBOSE_IO;
1089 1214
1090 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1215 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1091 chmod SAVE_MODE, $fh; 1216 aio_chmod $fh, SAVE_MODE;
1092 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1217 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1093 aio_fsync $fh if $cf::USE_FSYNC; 1218 if ($cf::USE_FSYNC) {
1219 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;
1220 aio_fsync $fh;
1221 }
1094 close $fh; 1222 aio_close $fh;
1095 1223
1096 if (@$objs) { 1224 if (@$objs) {
1097 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1225 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1098 chmod SAVE_MODE, $fh; 1226 aio_chmod $fh, SAVE_MODE;
1099 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1227 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1100 aio_write $fh, 0, (length $data), $data, 0; 1228 aio_write $fh, 0, (length $data), $data, 0;
1101 aio_fsync $fh if $cf::USE_FSYNC; 1229 if ($cf::USE_FSYNC) {
1230 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;
1231 aio_fsync $fh;
1232 }
1102 close $fh; 1233 aio_close $fh;
1103 aio_rename "$filename.pst~", "$filename.pst"; 1234 aio_rename "$filename.pst~", "$filename.pst";
1104 } 1235 }
1105 } else { 1236 } else {
1106 aio_unlink "$filename.pst"; 1237 aio_unlink "$filename.pst";
1107 } 1238 }
1108 1239
1109 aio_rename "$filename~", $filename; 1240 aio_rename "$filename~", $filename;
1241
1242 $filename =~ s%/[^/]+$%%;
1243 aio_pathsync $filename if $cf::USE_FSYNC;
1110 } else { 1244 } else {
1111 warn "FATAL: $filename~: $!\n"; 1245 error "unable to save objects: $filename~: $!\n";
1112 } 1246 }
1113 } else { 1247 } else {
1114 aio_unlink $filename; 1248 aio_unlink $filename;
1115 aio_unlink "$filename.pst"; 1249 aio_unlink "$filename.pst";
1116 } 1250 }
… …
1140 my $st = eval { Coro::Storable::thaw $av }; 1274 my $st = eval { Coro::Storable::thaw $av };
1141 $av = $st->{objs}; 1275 $av = $st->{objs};
1142 } 1276 }
1143 1277
1144 utf8::decode (my $decname = $filename); 1278 utf8::decode (my $decname = $filename);
1145 warn sprintf "loading %s (%d,%d)\n", 1279 trace sprintf "loading %s (%d,%d)\n",
1146 $decname, length $data, scalar @{$av || []}; 1280 $decname, length $data, scalar @{$av || []}
1281 if $VERBOSE_IO;
1147 1282
1148 ($data, $av) 1283 ($data, $av)
1149} 1284}
1150 1285
1151=head2 COMMAND CALLBACKS 1286=head2 COMMAND CALLBACKS
… …
1207 my ($name, $cb) = @_; 1342 my ($name, $cb) = @_;
1208 1343
1209 $EXTICMD{$name} = $cb; 1344 $EXTICMD{$name} = $cb;
1210} 1345}
1211 1346
1347use File::Glob ();
1348
1212cf::player->attach ( 1349cf::player->attach (
1213 on_command => sub { 1350 on_unknown_command => sub {
1214 my ($pl, $name, $params) = @_; 1351 my ($pl, $name, $params) = @_;
1215 1352
1216 my $cb = $COMMAND{$name} 1353 my $cb = $COMMAND{$name}
1217 or return; 1354 or return;
1218 1355
… …
1241 1378
1242 $pl->ext_reply ($reply, @reply) 1379 $pl->ext_reply ($reply, @reply)
1243 if $reply; 1380 if $reply;
1244 1381
1245 } else { 1382 } else {
1246 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1383 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1247 } 1384 }
1248 1385
1249 cf::override; 1386 cf::override;
1250 }, 1387 },
1251); 1388);
1252 1389
1390# "readahead" all extensions
1391sub cache_extensions {
1392 my $grp = IO::AIO::aio_group;
1393
1394 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1395 for (grep /\.ext$/, @{$_[0]}) {
1396 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1397 }
1398 };
1399
1400 $grp
1401}
1402
1253sub load_extensions { 1403sub load_extensions {
1404 info "loading extensions...";
1405
1254 cf::sync_job { 1406 cf::sync_job {
1255 my %todo; 1407 my %todo;
1256 1408
1257 for my $path (<$LIBDIR/*.ext>) { 1409 for my $path (<$LIBDIR/*.ext>) {
1258 next unless -r $path; 1410 next unless -r $path;
… …
1276 1428
1277 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1429 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1278 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1430 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1279 1431
1280 $ext{source} = 1432 $ext{source} =
1281 "package $pkg; use strict; use utf8;\n" 1433 "package $pkg; use common::sense;\n"
1282 . "#line 1 \"$path\"\n{\n" 1434 . "#line 1 \"$path\"\n{\n"
1283 . $source 1435 . $source
1284 . "\n};\n1"; 1436 . "\n};\n1";
1285 1437
1286 $todo{$base} = \%ext; 1438 $todo{$base} = \%ext;
1287 } 1439 }
1288 1440
1441 my $pass = 0;
1289 my %done; 1442 my %done;
1290 while (%todo) { 1443 while (%todo) {
1291 my $progress; 1444 my $progress;
1292 1445
1446 ++$pass;
1447
1448 ext:
1293 while (my ($k, $v) = each %todo) { 1449 while (my ($k, $v) = each %todo) {
1294 for (split /,\s*/, $v->{meta}{depends}) { 1450 for (split /,\s*/, $v->{meta}{depends}) {
1295 goto skip 1451 next ext
1296 unless exists $done{$_}; 1452 unless exists $done{$_};
1297 } 1453 }
1298 1454
1299 warn "... loading '$k' into '$v->{pkg}'\n"; 1455 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1300 1456
1301 unless (eval $v->{source}) { 1457 my $active = eval $v->{source};
1458
1459 if (length $@) {
1302 my $msg = $@ ? "$v->{path}: $@\n" 1460 error "$v->{path}: $@\n";
1303 : "$v->{base}: extension inactive.\n";
1304 1461
1462 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1305 if (exists $v->{meta}{mandatory}) { 1463 if exists $v->{meta}{mandatory};
1306 warn $msg; 1464
1307 warn "mandatory extension failed to load, exiting.\n"; 1465 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1308 exit 1; 1466 delete $todo{$k};
1309 } 1467 } else {
1310 1468 $done{$k} = delete $todo{$k};
1311 warn $msg; 1469 push @EXTS, $v->{pkg};
1470 $progress = 1;
1471
1472 info "$v->{base}: extension inactive.\n"
1473 unless $active;
1312 } 1474 }
1313
1314 $done{$k} = delete $todo{$k};
1315 push @EXTS, $v->{pkg};
1316 $progress = 1;
1317 } 1475 }
1318 1476
1319 skip: 1477 unless ($progress) {
1320 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1478 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1321 unless $progress; 1479
1480 while (my ($k, $v) = each %todo) {
1481 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1482 if exists $v->{meta}{mandatory};
1483 }
1484 }
1322 } 1485 }
1323 }; 1486 };
1324} 1487}
1325 1488
1326############################################################################# 1489#############################################################################
1327 1490
1328=back 1491=back
1329 1492
1330=head2 CORE EXTENSIONS 1493=head2 CORE EXTENSIONS
1331 1494
1332Functions and methods that extend core crossfire objects. 1495Functions and methods that extend core deliantra objects.
1333 1496
1334=cut 1497=cut
1335 1498
1336package cf::player; 1499package cf::player;
1337 1500
… …
1380 1543
1381sub exists($) { 1544sub exists($) {
1382 my ($login) = @_; 1545 my ($login) = @_;
1383 1546
1384 $cf::PLAYER{$login} 1547 $cf::PLAYER{$login}
1385 or cf::sync_job { !aio_stat path $login } 1548 or !aio_stat path $login
1386} 1549}
1387 1550
1388sub find($) { 1551sub find($) {
1389 return $cf::PLAYER{$_[0]} || do { 1552 return $cf::PLAYER{$_[0]} || do {
1390 my $login = $_[0]; 1553 my $login = $_[0];
… …
1402 my $f = new_from_file cf::object::thawer path $login 1565 my $f = new_from_file cf::object::thawer path $login
1403 or return; 1566 or return;
1404 1567
1405 my $pl = cf::player::load_pl $f 1568 my $pl = cf::player::load_pl $f
1406 or return; 1569 or return;
1570
1407 local $cf::PLAYER_LOADING{$login} = $pl; 1571 local $cf::PLAYER_LOADING{$login} = $pl;
1408 $f->resolve_delayed_derefs; 1572 $f->resolve_delayed_derefs;
1409 $cf::PLAYER{$login} = $pl 1573 $cf::PLAYER{$login} = $pl
1410 } 1574 }
1411 } 1575 }
1412} 1576}
1413 1577
1578cf::player->attach (
1579 on_load => sub {
1580 my ($pl, $path) = @_;
1581
1582 # restore slots saved in save, below
1583 my $slots = delete $pl->{_slots};
1584
1585 $pl->ob->current_weapon ($slots->[0]);
1586 $pl->combat_ob ($slots->[1]);
1587 $pl->ranged_ob ($slots->[2]);
1588 },
1589);
1590
1414sub save($) { 1591sub save($) {
1415 my ($pl) = @_; 1592 my ($pl) = @_;
1416 1593
1417 return if $pl->{deny_save}; 1594 return if $pl->{deny_save};
1418 1595
… …
1421 1598
1422 return if $pl->{deny_save}; 1599 return if $pl->{deny_save};
1423 1600
1424 aio_mkdir playerdir $pl, 0770; 1601 aio_mkdir playerdir $pl, 0770;
1425 $pl->{last_save} = $cf::RUNTIME; 1602 $pl->{last_save} = $cf::RUNTIME;
1603
1604 cf::get_slot 0.01;
1605
1606 # save slots, to be restored later
1607 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1426 1608
1427 $pl->save_pl ($path); 1609 $pl->save_pl ($path);
1428 cf::cede_to_tick; 1610 cf::cede_to_tick;
1429} 1611}
1430 1612
… …
1462 my ($pl) = @_; 1644 my ($pl) = @_;
1463 1645
1464 my $name = $pl->ob->name; 1646 my $name = $pl->ob->name;
1465 1647
1466 $pl->{deny_save} = 1; 1648 $pl->{deny_save} = 1;
1467 $pl->password ("*"); # this should lock out the player until we nuked the dir 1649 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1468 1650
1469 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1651 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1470 $pl->deactivate; 1652 $pl->deactivate;
1653 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1471 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1654 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1472 $pl->ns->destroy if $pl->ns; 1655 $pl->ns->destroy if $pl->ns;
1473 1656
1474 my $path = playerdir $pl; 1657 my $path = playerdir $pl;
1475 my $temp = "$path~$cf::RUNTIME~deleting~"; 1658 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1514 1697
1515 for my $login (@$dirs) { 1698 for my $login (@$dirs) {
1516 my $path = path $login; 1699 my $path = path $login;
1517 1700
1518 # a .pst is a dead give-away for a valid player 1701 # a .pst is a dead give-away for a valid player
1519 unless (-e "$path.pst") { 1702 # if no pst file found, open and chekc for blocked users
1703 if (aio_stat "$path.pst") {
1520 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1704 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1521 aio_read $fh, 0, 512, my $buf, 0 or next; 1705 aio_read $fh, 0, 512, my $buf, 0 or next;
1522 $buf !~ /^password -------------$/m or next; # official not-valid tag 1706 $buf !~ /^password -------------$/m or next; # official not-valid tag
1523 } 1707 }
1524 1708
… …
1528 1712
1529 \@logins 1713 \@logins
1530} 1714}
1531 1715
1532=item $player->maps 1716=item $player->maps
1717
1718=item cf::player::maps $login
1533 1719
1534Returns an arrayref of map paths that are private for this 1720Returns an arrayref of map paths that are private for this
1535player. May block. 1721player. May block.
1536 1722
1537=cut 1723=cut
… …
1555 } 1741 }
1556 1742
1557 \@paths 1743 \@paths
1558} 1744}
1559 1745
1560=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1746=item $protocol_xml = $player->expand_cfpod ($cfpod)
1561 1747
1562Expand crossfire pod fragments into protocol xml. 1748Expand deliantra pod fragments into protocol xml.
1563
1564=cut
1565
1566use re 'eval';
1567
1568my $group;
1569my $interior; $interior = qr{
1570 # match a pod interior sequence sans C<< >>
1571 (?:
1572 \ (.*?)\ (?{ $group = $^N })
1573 | < (??{$interior}) >
1574 )
1575}x;
1576
1577sub expand_cfpod {
1578 my ($self, $pod) = @_;
1579
1580 my $xml;
1581
1582 while () {
1583 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1584 $group = $1;
1585
1586 $group =~ s/&/&amp;/g;
1587 $group =~ s/</&lt;/g;
1588
1589 $xml .= $group;
1590 } elsif ($pod =~ m%\G
1591 ([BCGHITU])
1592 <
1593 (?:
1594 ([^<>]*) (?{ $group = $^N })
1595 | < $interior >
1596 )
1597 >
1598 %gcsx
1599 ) {
1600 my ($code, $data) = ($1, $group);
1601
1602 if ($code eq "B") {
1603 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1604 } elsif ($code eq "I") {
1605 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1606 } elsif ($code eq "U") {
1607 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1608 } elsif ($code eq "C") {
1609 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1610 } elsif ($code eq "T") {
1611 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1612 } elsif ($code eq "G") {
1613 my ($male, $female) = split /\|/, $data;
1614 $data = $self->gender ? $female : $male;
1615 $xml .= expand_cfpod ($self, $data);
1616 } elsif ($code eq "H") {
1617 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1618 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1619 "")
1620 [$self->{hintmode}];
1621 } else {
1622 $xml .= "error processing '$code($data)' directive";
1623 }
1624 } else {
1625 if ($pod =~ /\G(.+)/) {
1626 warn "parse error while expanding $pod (at $1)";
1627 }
1628 last;
1629 }
1630 }
1631
1632 for ($xml) {
1633 # create single paragraphs (very hackish)
1634 s/(?<=\S)\n(?=\w)/ /g;
1635
1636 # compress some whitespace
1637 s/\s+\n/\n/g; # ws line-ends
1638 s/\n\n+/\n/g; # double lines
1639 s/^\n+//; # beginning lines
1640 s/\n+$//; # ending lines
1641 }
1642
1643 $xml
1644}
1645
1646no re 'eval';
1647
1648sub hintmode {
1649 $_[0]{hintmode} = $_[1] if @_ > 1;
1650 $_[0]{hintmode}
1651}
1652 1749
1653=item $player->ext_reply ($msgid, @msg) 1750=item $player->ext_reply ($msgid, @msg)
1654 1751
1655Sends an ext reply to the player. 1752Sends an ext reply to the player.
1656 1753
… …
1688 1785
1689=cut 1786=cut
1690 1787
1691sub find_by_path($) { 1788sub find_by_path($) {
1692 my ($path) = @_; 1789 my ($path) = @_;
1790
1791 $path =~ s/^~[^\/]*//; # skip ~login
1693 1792
1694 my ($match, $specificity); 1793 my ($match, $specificity);
1695 1794
1696 for my $region (list) { 1795 for my $region (list) {
1697 if ($region->{match} && $path =~ $region->{match}) { 1796 if ($region->{match} && $path =~ $region->{match}) {
… …
1723our $MAX_RESET = 3600; 1822our $MAX_RESET = 3600;
1724our $DEFAULT_RESET = 3000; 1823our $DEFAULT_RESET = 3000;
1725 1824
1726sub generate_random_map { 1825sub generate_random_map {
1727 my ($self, $rmp) = @_; 1826 my ($self, $rmp) = @_;
1827
1828 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1829
1728 # mit "rum" bekleckern, nicht 1830 # mit "rum" bekleckern, nicht
1729 $self->_create_random_map ( 1831 $self->_create_random_map (
1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1832 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1833 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1834 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1733 $rmp->{exit_on_final_map}, 1835 $rmp->{exit_on_final_map},
1734 $rmp->{xsize}, $rmp->{ysize}, 1836 $rmp->{xsize}, $rmp->{ysize},
1735 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1837 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1736 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1838 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1751 1853
1752sub register { 1854sub register {
1753 my (undef, $regex, $prio) = @_; 1855 my (undef, $regex, $prio) = @_;
1754 my $pkg = caller; 1856 my $pkg = caller;
1755 1857
1756 no strict;
1757 push @{"$pkg\::ISA"}, __PACKAGE__; 1858 push @{"$pkg\::ISA"}, __PACKAGE__;
1758 1859
1759 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1860 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1760} 1861}
1761 1862
1762# also paths starting with '/' 1863# also paths starting with '/'
1763$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1864$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1764 1865
1765sub thawer_merge { 1866sub thawer_merge {
1766 my ($self, $merge) = @_; 1867 my ($self, $merge) = @_;
1767 1868
1768 # we have to keep some variables in memory intact 1869 # we have to keep some variables in memory intact
… …
1773} 1874}
1774 1875
1775sub normalise { 1876sub normalise {
1776 my ($path, $base) = @_; 1877 my ($path, $base) = @_;
1777 1878
1778 $path = "$path"; # make sure its a string 1879 $path = "$path"; # make sure it's a string
1779 1880
1780 $path =~ s/\.map$//; 1881 $path =~ s/\.map$//;
1781 1882
1782 # map plan: 1883 # map plan:
1783 # 1884 #
… …
1822 $self->init; # pass $1 etc. 1923 $self->init; # pass $1 etc.
1823 return $self; 1924 return $self;
1824 } 1925 }
1825 } 1926 }
1826 1927
1827 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1928 Carp::cluck "unable to resolve path '$path' (base '$base')";
1828 () 1929 ()
1829} 1930}
1830 1931
1831sub init { 1932sub init {
1832 my ($self) = @_; 1933 my ($self) = @_;
… …
1854 1955
1855# the temporary/swap location 1956# the temporary/swap location
1856sub save_path { 1957sub save_path {
1857 my ($self) = @_; 1958 my ($self) = @_;
1858 1959
1859 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1960 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1860 "$TMPDIR/$path.map" 1961 "$TMPDIR/$path.map"
1861} 1962}
1862 1963
1863# the unique path, undef == no special unique path 1964# the unique path, undef == no special unique path
1864sub uniq_path { 1965sub uniq_path {
1865 my ($self) = @_; 1966 my ($self) = @_;
1866 1967
1867 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1968 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1868 "$UNIQUEDIR/$path" 1969 "$UNIQUEDIR/$path"
1869}
1870
1871# and all this just because we cannot iterate over
1872# all maps in C++...
1873sub change_all_map_light {
1874 my ($change) = @_;
1875
1876 $_->change_map_light ($change)
1877 for grep $_->outdoor, values %cf::MAP;
1878} 1970}
1879 1971
1880sub decay_objects { 1972sub decay_objects {
1881 my ($self) = @_; 1973 my ($self) = @_;
1882 1974
… …
1964 2056
1965sub find; 2057sub find;
1966sub find { 2058sub find {
1967 my ($path, $origin) = @_; 2059 my ($path, $origin) = @_;
1968 2060
2061 cf::cede_to_tick;
2062
1969 $path = normalise $path, $origin && $origin->path; 2063 $path = normalise $path, $origin && $origin->path;
1970 2064
1971 cf::lock_wait "map_data:$path";#d#remove 2065 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1972 cf::lock_wait "map_find:$path"; 2066 my $guard2 = cf::lock_acquire "map_find:$path";
1973 2067
1974 $cf::MAP{$path} || do { 2068 $cf::MAP{$path} || do {
1975 my $guard1 = cf::lock_acquire "map_find:$path";
1976 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1977
1978 my $map = new_from_path cf::map $path 2069 my $map = new_from_path cf::map $path
1979 or return; 2070 or return;
1980 2071
1981 $map->{last_save} = $cf::RUNTIME; 2072 $map->{last_save} = $cf::RUNTIME;
1982 2073
… …
1984 or return; 2075 or return;
1985 2076
1986 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2077 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1987 # doing this can freeze the server in a sync job, obviously 2078 # doing this can freeze the server in a sync job, obviously
1988 #$cf::WAIT_FOR_TICK->wait; 2079 #$cf::WAIT_FOR_TICK->wait;
2080 undef $guard2;
1989 undef $guard1; 2081 undef $guard1;
1990 undef $guard2;
1991 $map->reset; 2082 $map->reset;
1992 return find $path; 2083 return find $path;
1993 } 2084 }
1994 2085
1995 $cf::MAP{$path} = $map 2086 $cf::MAP{$path} = $map
1996 } 2087 }
1997} 2088}
1998 2089
1999sub pre_load { } 2090sub pre_load { }
2000sub post_load { } 2091#sub post_load { } # XS
2001 2092
2002sub load { 2093sub load {
2003 my ($self) = @_; 2094 my ($self) = @_;
2004 2095
2005 local $self->{deny_reset} = 1; # loading can take a long time 2096 local $self->{deny_reset} = 1; # loading can take a long time
… …
2022 my $f = new_from_file cf::object::thawer $self->{load_path}; 2113 my $f = new_from_file cf::object::thawer $self->{load_path};
2023 $f->skip_block; 2114 $f->skip_block;
2024 $self->_load_objects ($f) 2115 $self->_load_objects ($f)
2025 or return; 2116 or return;
2026 2117
2027 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2118 $self->post_load_original
2028 if delete $self->{load_original}; 2119 if delete $self->{load_original};
2029 2120
2030 if (my $uniq = $self->uniq_path) { 2121 if (my $uniq = $self->uniq_path) {
2031 utf8::encode $uniq; 2122 utf8::encode $uniq;
2032 unless (aio_stat $uniq) { 2123 unless (aio_stat $uniq) {
… …
2050 unless ($self->{deny_activate}) { 2141 unless ($self->{deny_activate}) {
2051 $self->decay_objects; 2142 $self->decay_objects;
2052 $self->fix_auto_apply; 2143 $self->fix_auto_apply;
2053 $self->update_buttons; 2144 $self->update_buttons;
2054 cf::cede_to_tick; 2145 cf::cede_to_tick;
2055 $self->set_darkness_map;
2056 cf::cede_to_tick;
2057 $self->activate; 2146 $self->activate;
2058 } 2147 }
2059 2148
2060 $self->{last_save} = $cf::RUNTIME; 2149 $self->{last_save} = $cf::RUNTIME;
2061 $self->last_access ($cf::RUNTIME); 2150 $self->last_access ($cf::RUNTIME);
2062 2151
2063 $self->in_memory (cf::MAP_IN_MEMORY); 2152 $self->in_memory (cf::MAP_ACTIVE);
2064 } 2153 }
2065 2154
2066 $self->post_load; 2155 $self->post_load;
2067} 2156}
2068 2157
2158# customize the map for a given player, i.e.
2159# return the _real_ map. used by e.g. per-player
2160# maps to change the path to ~playername/mappath
2069sub customise_for { 2161sub customise_for {
2070 my ($self, $ob) = @_; 2162 my ($self, $ob) = @_;
2071 2163
2072 return find "~" . $ob->name . "/" . $self->{path} 2164 return find "~" . $ob->name . "/" . $self->{path}
2073 if $self->per_player; 2165 if $self->per_player;
… …
2089 or next; 2181 or next;
2090 $neigh = find $neigh, $map 2182 $neigh = find $neigh, $map
2091 or next; 2183 or next;
2092 $neigh->load; 2184 $neigh->load;
2093 2185
2186 # now find the diagonal neighbours
2094 push @neigh, 2187 push @neigh,
2095 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2188 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2096 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2189 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2097 } 2190 }
2098 2191
… …
2105} 2198}
2106 2199
2107sub find_sync { 2200sub find_sync {
2108 my ($path, $origin) = @_; 2201 my ($path, $origin) = @_;
2109 2202
2110 cf::sync_job { find $path, $origin } 2203 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2204 if $Coro::current == $Coro::main;
2205
2206 find $path, $origin
2111} 2207}
2112 2208
2113sub do_load_sync { 2209sub do_load_sync {
2114 my ($map) = @_; 2210 my ($map) = @_;
2115 2211
2116 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2212 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2117 if $Coro::current == $Coro::main; 2213 if $Coro::current == $Coro::main;
2118 2214
2119 cf::sync_job { $map->load }; 2215 $map->load;
2120} 2216}
2121 2217
2122our %MAP_PREFETCH; 2218our %MAP_PREFETCH;
2123our $MAP_PREFETCHER = undef; 2219our $MAP_PREFETCHER = undef;
2124 2220
… …
2126 my ($path, $origin, $load) = @_; 2222 my ($path, $origin, $load) = @_;
2127 2223
2128 $path = normalise $path, $origin && $origin->{path}; 2224 $path = normalise $path, $origin && $origin->{path};
2129 2225
2130 if (my $map = $cf::MAP{$path}) { 2226 if (my $map = $cf::MAP{$path}) {
2131 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2227 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2132 } 2228 }
2133 2229
2134 $MAP_PREFETCH{$path} |= $load; 2230 $MAP_PREFETCH{$path} |= $load;
2135 2231
2136 $MAP_PREFETCHER ||= cf::async { 2232 $MAP_PREFETCHER ||= cf::async {
… …
2150 $MAP_PREFETCHER->prio (6); 2246 $MAP_PREFETCHER->prio (6);
2151 2247
2152 () 2248 ()
2153} 2249}
2154 2250
2251# common code, used by both ->save and ->swapout
2155sub save { 2252sub _save {
2156 my ($self) = @_; 2253 my ($self) = @_;
2157
2158 my $lock = cf::lock_acquire "map_data:$self->{path}";
2159 2254
2160 $self->{last_save} = $cf::RUNTIME; 2255 $self->{last_save} = $cf::RUNTIME;
2161 2256
2162 return unless $self->dirty; 2257 return unless $self->dirty;
2163 2258
… …
2172 2267
2173 cf::async { 2268 cf::async {
2174 $Coro::current->{desc} = "map player save"; 2269 $Coro::current->{desc} = "map player save";
2175 $_->contr->save for $self->players; 2270 $_->contr->save for $self->players;
2176 }; 2271 };
2272
2273 cf::get_slot 0.02;
2177 2274
2178 if ($uniq) { 2275 if ($uniq) {
2179 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2276 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2180 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2277 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2181 } else { 2278 } else {
2182 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2279 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2183 } 2280 }
2184} 2281}
2185 2282
2283sub save {
2284 my ($self) = @_;
2285
2286 my $lock = cf::lock_acquire "map_data:$self->{path}";
2287
2288 $self->_save;
2289}
2290
2186sub swap_out { 2291sub swap_out {
2187 my ($self) = @_; 2292 my ($self) = @_;
2188 2293
2189 # save first because save cedes
2190 $self->save;
2191
2192 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2294 my $lock = cf::lock_acquire "map_data:$self->{path}";
2193 2295
2296 return if $self->in_memory != cf::MAP_ACTIVE;
2297 return if $self->{deny_save};
2194 return if $self->players; 2298 return if $self->players;
2195 return if $self->in_memory != cf::MAP_IN_MEMORY;
2196 return if $self->{deny_save};
2197 2299
2300 # first deactivate the map and "unlink" it from the core
2301 $self->deactivate;
2302 $_->clear_links_to ($self) for values %cf::MAP;
2198 $self->in_memory (cf::MAP_SWAPPED); 2303 $self->in_memory (cf::MAP_SWAPPED);
2304
2305 # then atomically save
2306 $self->_save;
2307
2308 # then free the map
2309 $self->clear;
2310}
2311
2312sub reset_at {
2313 my ($self) = @_;
2314
2315 # TODO: safety, remove and allow resettable per-player maps
2316 return 1e99 if $self->{deny_reset};
2317
2318 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2319 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2320
2321 $time + $to
2322}
2323
2324sub should_reset {
2325 my ($self) = @_;
2326
2327 $self->reset_at <= $cf::RUNTIME
2328}
2329
2330sub reset {
2331 my ($self) = @_;
2332
2333 my $lock = cf::lock_acquire "map_data:$self->{path}";
2334
2335 return if $self->players;
2336
2337 cf::trace "resetting map ", $self->path, "\n";
2338
2339 $self->in_memory (cf::MAP_SWAPPED);
2340
2341 # need to save uniques path
2342 unless ($self->{deny_save}) {
2343 my $uniq = $self->uniq_path; utf8::encode $uniq;
2344
2345 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2346 if $uniq;
2347 }
2348
2349 delete $cf::MAP{$self->path};
2199 2350
2200 $self->deactivate; 2351 $self->deactivate;
2201 $_->clear_links_to ($self) for values %cf::MAP; 2352 $_->clear_links_to ($self) for values %cf::MAP;
2202 $self->clear; 2353 $self->clear;
2203}
2204
2205sub reset_at {
2206 my ($self) = @_;
2207
2208 # TODO: safety, remove and allow resettable per-player maps
2209 return 1e99 if $self->{deny_reset};
2210
2211 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2212 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2213
2214 $time + $to
2215}
2216
2217sub should_reset {
2218 my ($self) = @_;
2219
2220 $self->reset_at <= $cf::RUNTIME
2221}
2222
2223sub reset {
2224 my ($self) = @_;
2225
2226 my $lock = cf::lock_acquire "map_data:$self->{path}";
2227
2228 return if $self->players;
2229
2230 warn "resetting map ", $self->path;
2231
2232 $self->in_memory (cf::MAP_SWAPPED);
2233
2234 # need to save uniques path
2235 unless ($self->{deny_save}) {
2236 my $uniq = $self->uniq_path; utf8::encode $uniq;
2237
2238 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2239 if $uniq;
2240 }
2241
2242 delete $cf::MAP{$self->path};
2243
2244 $self->deactivate;
2245 $_->clear_links_to ($self) for values %cf::MAP;
2246 $self->clear;
2247 2354
2248 $self->unlink_save; 2355 $self->unlink_save;
2249 $self->destroy; 2356 $self->destroy;
2250} 2357}
2251 2358
… …
2259 2366
2260 delete $cf::MAP{$self->path}; 2367 delete $cf::MAP{$self->path};
2261 2368
2262 $self->unlink_save; 2369 $self->unlink_save;
2263 2370
2264 bless $self, "cf::map"; 2371 bless $self, "cf::map::wrap";
2265 delete $self->{deny_reset}; 2372 delete $self->{deny_reset};
2266 $self->{deny_save} = 1; 2373 $self->{deny_save} = 1;
2267 $self->reset_timeout (1); 2374 $self->reset_timeout (1);
2268 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2375 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2269 2376
… …
2318 2425
2319sub unique_maps() { 2426sub unique_maps() {
2320 [ 2427 [
2321 map { 2428 map {
2322 utf8::decode $_; 2429 utf8::decode $_;
2323 /\.map$/ 2430 s/\.map$//; # TODO future compatibility hack
2431 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2432 ? ()
2324 ? normalise $_ 2433 : normalise $_
2325 : ()
2326 } @{ aio_readdir $UNIQUEDIR or [] } 2434 } @{ aio_readdir $UNIQUEDIR or [] }
2327 ] 2435 ]
2328} 2436}
2329 2437
2330package cf; 2438=item cf::map::static_maps
2439
2440Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2441file in the shared directory excluding F</styles> and F</editor>). May
2442block.
2443
2444=cut
2445
2446sub static_maps() {
2447 my @dirs = "";
2448 my @maps;
2449
2450 while (@dirs) {
2451 my $dir = shift @dirs;
2452
2453 next if $dir eq "/styles" || $dir eq "/editor";
2454
2455 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2456 or return;
2457
2458 for (@$files) {
2459 s/\.map$// or next;
2460 utf8::decode $_;
2461 push @maps, "$dir/$_";
2462 }
2463
2464 push @dirs, map "$dir/$_", @$dirs;
2465 }
2466
2467 \@maps
2468}
2331 2469
2332=back 2470=back
2333 2471
2334=head3 cf::object 2472=head3 cf::object
2335 2473
… …
2339 2477
2340=over 4 2478=over 4
2341 2479
2342=item $ob->inv_recursive 2480=item $ob->inv_recursive
2343 2481
2344Returns the inventory of the object _and_ their inventories, recursively. 2482Returns the inventory of the object I<and> their inventories, recursively,
2483but I<not> the object itself.
2345 2484
2346=cut 2485=cut
2347 2486
2348sub inv_recursive_; 2487sub inv_recursive_;
2349sub inv_recursive_ { 2488sub inv_recursive_ {
… …
2354 inv_recursive_ inv $_[0] 2493 inv_recursive_ inv $_[0]
2355} 2494}
2356 2495
2357=item $ref = $ob->ref 2496=item $ref = $ob->ref
2358 2497
2359creates and returns a persistent reference to an objetc that can be stored as a string. 2498Creates and returns a persistent reference to an object that can be stored as a string.
2360 2499
2361=item $ob = cf::object::deref ($refstring) 2500=item $ob = cf::object::deref ($refstring)
2362 2501
2363returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2502returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2364even if the object actually exists. May block. 2503even if the object actually exists. May block.
… …
2396can be C<undef>. Does the right thing when the player is currently in a 2535can be C<undef>. Does the right thing when the player is currently in a
2397dialogue with the given NPC character. 2536dialogue with the given NPC character.
2398 2537
2399=cut 2538=cut
2400 2539
2540our $SAY_CHANNEL = {
2541 id => "say",
2542 title => "Map",
2543 reply => "say ",
2544 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2545};
2546
2547our $CHAT_CHANNEL = {
2548 id => "chat",
2549 title => "Chat",
2550 reply => "chat ",
2551 tooltip => "Player chat and shouts, global to the server.",
2552};
2553
2401# rough implementation of a future "reply" method that works 2554# rough implementation of a future "reply" method that works
2402# with dialog boxes. 2555# with dialog boxes.
2403#TODO: the first argument must go, split into a $npc->reply_to ( method 2556#TODO: the first argument must go, split into a $npc->reply_to ( method
2404sub cf::object::player::reply($$$;$) { 2557sub cf::object::player::reply($$$;$) {
2405 my ($self, $npc, $msg, $flags) = @_; 2558 my ($self, $npc, $msg, $flags) = @_;
… …
2416 my $dialog = $pl->{npc_dialog}; 2569 my $dialog = $pl->{npc_dialog};
2417 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2570 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2418 2571
2419 } else { 2572 } else {
2420 $msg = $npc->name . " says: $msg" if $npc; 2573 $msg = $npc->name . " says: $msg" if $npc;
2421 $self->message ($msg, $flags); 2574 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2422 } 2575 }
2423 } 2576 }
2424} 2577}
2425 2578
2426=item $object->send_msg ($channel, $msg, $color, [extra...]) 2579=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2451 2604
2452=item $player_object->enter_link 2605=item $player_object->enter_link
2453 2606
2454Freezes the player and moves him/her to a special map (C<{link}>). 2607Freezes the player and moves him/her to a special map (C<{link}>).
2455 2608
2456The player should be reasonably safe there for short amounts of time. You 2609The player should be reasonably safe there for short amounts of time (e.g.
2457I<MUST> call C<leave_link> as soon as possible, though. 2610for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2611though, as the player cannot control the character while it is on the link
2612map.
2458 2613
2459Will never block. 2614Will never block.
2460 2615
2461=item $player_object->leave_link ($map, $x, $y) 2616=item $player_object->leave_link ($map, $x, $y)
2462 2617
… …
2482sub cf::object::player::enter_link { 2637sub cf::object::player::enter_link {
2483 my ($self) = @_; 2638 my ($self) = @_;
2484 2639
2485 $self->deactivate_recursive; 2640 $self->deactivate_recursive;
2486 2641
2642 ++$self->{_link_recursion};
2643
2487 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2644 return if UNIVERSAL::isa $self->map, "ext::map_link";
2488 2645
2489 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2646 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2490 if $self->map && $self->map->{path} ne "{link}"; 2647 if $self->map && $self->map->{path} ne "{link}";
2491 2648
2492 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2649 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2493} 2650}
2494 2651
2495sub cf::object::player::leave_link { 2652sub cf::object::player::leave_link {
2496 my ($self, $map, $x, $y) = @_; 2653 my ($self, $map, $x, $y) = @_;
2497 2654
… …
2514 ($x, $y) = (-1, -1) 2671 ($x, $y) = (-1, -1)
2515 unless (defined $x) && (defined $y); 2672 unless (defined $x) && (defined $y);
2516 2673
2517 # use -1 or undef as default coordinates, not 0, 0 2674 # use -1 or undef as default coordinates, not 0, 0
2518 ($x, $y) = ($map->enter_x, $map->enter_y) 2675 ($x, $y) = ($map->enter_x, $map->enter_y)
2519 if $x <=0 && $y <= 0; 2676 if $x <= 0 && $y <= 0;
2520 2677
2521 $map->load; 2678 $map->load;
2522 $map->load_neighbours; 2679 $map->load_neighbours;
2523 2680
2524 return unless $self->contr->active; 2681 return unless $self->contr->active;
2525 $self->activate_recursive;
2526 2682
2527 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2683 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2528 $self->enter_map ($map, $x, $y); 2684 if ($self->enter_map ($map, $x, $y)) {
2529} 2685 # entering was successful
2686 delete $self->{_link_recursion};
2687 # only activate afterwards, to support waiting in hooks
2688 $self->activate_recursive;
2689 }
2530 2690
2691}
2692
2531=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2693=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2532 2694
2533Moves the player to the given map-path and coordinates by first freezing 2695Moves the player to the given map-path and coordinates by first freezing
2534her, loading and preparing them map, calling the provided $check callback 2696her, loading and preparing them map, calling the provided $check callback
2535that has to return the map if sucecssful, and then unfreezes the player on 2697that has to return the map if sucecssful, and then unfreezes the player on
2536the new (success) or old (failed) map position. In either case, $done will 2698the new (success) or old (failed) map position. In either case, $done will
2537be called at the end of this process. 2699be called at the end of this process.
2538 2700
2701Note that $check will be called with a potentially non-loaded map, so if
2702it needs a loaded map it has to call C<< ->load >>.
2703
2539=cut 2704=cut
2540 2705
2541our $GOTOGEN; 2706our $GOTOGEN;
2542 2707
2543sub cf::object::player::goto { 2708sub cf::object::player::goto {
2544 my ($self, $path, $x, $y, $check, $done) = @_; 2709 my ($self, $path, $x, $y, $check, $done) = @_;
2710
2711 if ($self->{_link_recursion} >= $MAX_LINKS) {
2712 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2713 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2714 ($path, $x, $y) = @$EMERGENCY_POSITION;
2715 }
2545 2716
2546 # do generation counting so two concurrent goto's will be executed in-order 2717 # do generation counting so two concurrent goto's will be executed in-order
2547 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2718 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2548 2719
2549 $self->enter_link; 2720 $self->enter_link;
… …
2573 my $map = eval { 2744 my $map = eval {
2574 my $map = defined $path ? cf::map::find $path : undef; 2745 my $map = defined $path ? cf::map::find $path : undef;
2575 2746
2576 if ($map) { 2747 if ($map) {
2577 $map = $map->customise_for ($self); 2748 $map = $map->customise_for ($self);
2578 $map = $check->($map) if $check && $map; 2749 $map = $check->($map, $x, $y, $self) if $check && $map;
2579 } else { 2750 } else {
2580 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2751 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2581 } 2752 }
2582 2753
2583 $map 2754 $map
… …
2591 if ($gen == $self->{_goto_generation}) { 2762 if ($gen == $self->{_goto_generation}) {
2592 delete $self->{_goto_generation}; 2763 delete $self->{_goto_generation};
2593 $self->leave_link ($map, $x, $y); 2764 $self->leave_link ($map, $x, $y);
2594 } 2765 }
2595 2766
2596 $done->() if $done; 2767 $done->($self) if $done;
2597 })->prio (1); 2768 })->prio (1);
2598} 2769}
2599 2770
2600=item $player_object->enter_exit ($exit_object) 2771=item $player_object->enter_exit ($exit_object)
2601 2772
… …
2621} 2792}
2622 2793
2623sub prepare_random_map { 2794sub prepare_random_map {
2624 my ($exit) = @_; 2795 my ($exit) = @_;
2625 2796
2626 my $guard = cf::lock_acquire "exit_prepare:$exit";
2627
2628 # all this does is basically replace the /! path by 2797 # all this does is basically replace the /! path by
2629 # a new random map path (?random/...) with a seed 2798 # a new random map path (?random/...) with a seed
2630 # that depends on the exit object 2799 # that depends on the exit object
2631 2800
2632 my $rmp = parse_random_map_params $exit->msg; 2801 my $rmp = parse_random_map_params $exit->msg;
… …
2634 if ($exit->map) { 2803 if ($exit->map) {
2635 $rmp->{region} = $exit->region->name; 2804 $rmp->{region} = $exit->region->name;
2636 $rmp->{origin_map} = $exit->map->path; 2805 $rmp->{origin_map} = $exit->map->path;
2637 $rmp->{origin_x} = $exit->x; 2806 $rmp->{origin_x} = $exit->x;
2638 $rmp->{origin_y} = $exit->y; 2807 $rmp->{origin_y} = $exit->y;
2808
2809 $exit->map->touch;
2639 } 2810 }
2640 2811
2641 $rmp->{random_seed} ||= $exit->random_seed; 2812 $rmp->{random_seed} ||= $exit->random_seed;
2642 2813
2643 my $data = cf::to_json $rmp; 2814 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2644 my $md5 = Digest::MD5::md5_hex $data; 2815 my $md5 = Digest::MD5::md5_hex $data;
2645 my $meta = "$RANDOMDIR/$md5.meta"; 2816 my $meta = "$RANDOMDIR/$md5.meta";
2646 2817
2647 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2818 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2648 aio_write $fh, 0, (length $data), $data, 0; 2819 aio_write $fh, 0, (length $data), $data, 0;
2649 undef $fh; 2820 undef $fh;
2650 aio_rename "$meta~", $meta; 2821 aio_rename "$meta~", $meta;
2651 2822
2823 my $slaying = "?random/$md5";
2824
2825 if ($exit->valid) {
2652 $exit->slaying ("?random/$md5"); 2826 $exit->slaying ("?random/$md5");
2653 $exit->msg (undef); 2827 $exit->msg (undef);
2828 }
2654 } 2829 }
2655} 2830}
2656 2831
2657sub cf::object::player::enter_exit { 2832sub cf::object::player::enter_exit {
2658 my ($self, $exit) = @_; 2833 my ($self, $exit) = @_;
2659 2834
2660 return unless $self->type == cf::PLAYER; 2835 return unless $self->type == cf::PLAYER;
2661 2836
2662 if ($exit->slaying eq "/!") {
2663 #TODO: this should de-fi-ni-te-ly not be a sync-job
2664 # the problem is that $exit might not survive long enough
2665 # so it needs to be done right now, right here
2666 cf::sync_job { prepare_random_map $exit };
2667 }
2668
2669 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2670 my $hp = $exit->stats->hp;
2671 my $sp = $exit->stats->sp;
2672
2673 $self->enter_link; 2837 $self->enter_link;
2674 2838
2675 # if exit is damned, update players death & WoR home-position
2676 $self->contr->savebed ($slaying, $hp, $sp)
2677 if $exit->flag (FLAG_DAMNED);
2678
2679 (async { 2839 (async {
2680 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2840 $Coro::current->{desc} = "enter_exit";
2681 2841
2682 $self->deactivate_recursive; # just to be sure
2683 unless (eval { 2842 unless (eval {
2843 $self->deactivate_recursive; # just to be sure
2844
2845 # random map handling
2846 {
2847 my $guard = cf::lock_acquire "exit_prepare:$exit";
2848
2849 prepare_random_map $exit
2850 if $exit->slaying eq "/!";
2851 }
2852
2853 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2854 my $x = $exit->stats->hp;
2855 my $y = $exit->stats->sp;
2856
2684 $self->goto ($slaying, $hp, $sp); 2857 $self->goto ($map, $x, $y);
2685 2858
2859 # if exit is damned, update players death & WoR home-position
2860 $self->contr->savebed ($map, $x, $y)
2861 if $exit->flag (cf::FLAG_DAMNED);
2862
2686 1; 2863 1
2687 }) { 2864 }) {
2688 $self->message ("Something went wrong deep within the crossfire server. " 2865 $self->message ("Something went wrong deep within the deliantra server. "
2689 . "I'll try to bring you back to the map you were before. " 2866 . "I'll try to bring you back to the map you were before. "
2690 . "Please report this to the dungeon master!", 2867 . "Please report this to the dungeon master!",
2691 cf::NDI_UNIQUE | cf::NDI_RED); 2868 cf::NDI_UNIQUE | cf::NDI_RED);
2692 2869
2693 warn "ERROR in enter_exit: $@"; 2870 error "ERROR in enter_exit: $@";
2694 $self->leave_link; 2871 $self->leave_link;
2695 } 2872 }
2696 })->prio (1); 2873 })->prio (1);
2697} 2874}
2698 2875
… …
2710sub cf::client::send_drawinfo { 2887sub cf::client::send_drawinfo {
2711 my ($self, $text, $flags) = @_; 2888 my ($self, $text, $flags) = @_;
2712 2889
2713 utf8::encode $text; 2890 utf8::encode $text;
2714 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2891 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2892}
2893
2894=item $client->send_big_packet ($pkt)
2895
2896Like C<send_packet>, but tries to compress large packets, and fragments
2897them as required.
2898
2899=cut
2900
2901our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2902
2903sub cf::client::send_big_packet {
2904 my ($self, $pkt) = @_;
2905
2906 # try lzf for large packets
2907 $pkt = "lzf " . Compress::LZF::compress $pkt
2908 if 1024 <= length $pkt and $self->{can_lzf};
2909
2910 # split very large packets
2911 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2912 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2913 $pkt = "frag";
2914 }
2915
2916 $self->send_packet ($pkt);
2715} 2917}
2716 2918
2717=item $client->send_msg ($channel, $msg, $color, [extra...]) 2919=item $client->send_msg ($channel, $msg, $color, [extra...])
2718 2920
2719Send a drawinfo or msg packet to the client, formatting the msg for the 2921Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2723 2925
2724=cut 2926=cut
2725 2927
2726# non-persistent channels (usually the info channel) 2928# non-persistent channels (usually the info channel)
2727our %CHANNEL = ( 2929our %CHANNEL = (
2930 "c/motd" => {
2931 id => "infobox",
2932 title => "MOTD",
2933 reply => undef,
2934 tooltip => "The message of the day",
2935 },
2728 "c/identify" => { 2936 "c/identify" => {
2729 id => "infobox", 2937 id => "infobox",
2730 title => "Identify", 2938 title => "Identify",
2731 reply => undef, 2939 reply => undef,
2732 tooltip => "Items recently identified", 2940 tooltip => "Items recently identified",
… …
2734 "c/examine" => { 2942 "c/examine" => {
2735 id => "infobox", 2943 id => "infobox",
2736 title => "Examine", 2944 title => "Examine",
2737 reply => undef, 2945 reply => undef,
2738 tooltip => "Signs and other items you examined", 2946 tooltip => "Signs and other items you examined",
2947 },
2948 "c/shopinfo" => {
2949 id => "infobox",
2950 title => "Shop Info",
2951 reply => undef,
2952 tooltip => "What your bargaining skill tells you about the shop",
2739 }, 2953 },
2740 "c/book" => { 2954 "c/book" => {
2741 id => "infobox", 2955 id => "infobox",
2742 title => "Book", 2956 title => "Book",
2743 reply => undef, 2957 reply => undef,
… …
2759 id => "infobox", 2973 id => "infobox",
2760 title => "Body Parts", 2974 title => "Body Parts",
2761 reply => undef, 2975 reply => undef,
2762 tooltip => "Shows which body parts you posess and are available", 2976 tooltip => "Shows which body parts you posess and are available",
2763 }, 2977 },
2978 "c/statistics" => {
2979 id => "infobox",
2980 title => "Statistics",
2981 reply => undef,
2982 tooltip => "Shows your primary statistics",
2983 },
2984 "c/skills" => {
2985 id => "infobox",
2986 title => "Skills",
2987 reply => undef,
2988 tooltip => "Shows your experience per skill and item power",
2989 },
2990 "c/shopitems" => {
2991 id => "infobox",
2992 title => "Shop Items",
2993 reply => undef,
2994 tooltip => "Shows the items currently for sale in this shop",
2995 },
2996 "c/resistances" => {
2997 id => "infobox",
2998 title => "Resistances",
2999 reply => undef,
3000 tooltip => "Shows your resistances",
3001 },
3002 "c/pets" => {
3003 id => "infobox",
3004 title => "Pets",
3005 reply => undef,
3006 tooltip => "Shows information abotu your pets/a specific pet",
3007 },
3008 "c/perceiveself" => {
3009 id => "infobox",
3010 title => "Perceive Self",
3011 reply => undef,
3012 tooltip => "You gained detailed knowledge about yourself",
3013 },
2764 "c/uptime" => { 3014 "c/uptime" => {
2765 id => "infobox", 3015 id => "infobox",
2766 title => "Uptime", 3016 title => "Uptime",
2767 reply => undef, 3017 reply => undef,
2768 tooltip => "How long the server has been running since last restart", 3018 tooltip => "How long the server has been running since last restart",
… …
2771 id => "infobox", 3021 id => "infobox",
2772 title => "Map Info", 3022 title => "Map Info",
2773 reply => undef, 3023 reply => undef,
2774 tooltip => "Information related to the maps", 3024 tooltip => "Information related to the maps",
2775 }, 3025 },
3026 "c/party" => {
3027 id => "party",
3028 title => "Party",
3029 reply => "gsay ",
3030 tooltip => "Messages and chat related to your party",
3031 },
3032 "c/death" => {
3033 id => "death",
3034 title => "Death",
3035 reply => undef,
3036 tooltip => "Reason for and more info about your most recent death",
3037 },
3038 "c/say" => $SAY_CHANNEL,
3039 "c/chat" => $CHAT_CHANNEL,
2776); 3040);
2777 3041
2778sub cf::client::send_msg { 3042sub cf::client::send_msg {
2779 my ($self, $channel, $msg, $color, @extra) = @_; 3043 my ($self, $channel, $msg, $color, @extra) = @_;
2780 3044
2781 $msg = $self->pl->expand_cfpod ($msg); 3045 $msg = $self->pl->expand_cfpod ($msg)
3046 unless $color & cf::NDI_VERBATIM;
2782 3047
2783 $color &= cf::NDI_CLIENT_MASK; # just in case... 3048 $color &= cf::NDI_CLIENT_MASK; # just in case...
2784 3049
2785 # check predefined channels, for the benefit of C 3050 # check predefined channels, for the benefit of C
2786 if ($CHANNEL{$channel}) { 3051 if ($CHANNEL{$channel}) {
2787 $channel = $CHANNEL{$channel}; 3052 $channel = $CHANNEL{$channel};
2788 3053
2789 $self->ext_msg (channel_info => $channel) 3054 $self->ext_msg (channel_info => $channel);
2790 if $self->can_msg;
2791
2792 $channel = $channel->{id}; 3055 $channel = $channel->{id};
2793 3056
2794 } elsif (ref $channel) { 3057 } elsif (ref $channel) {
2795 # send meta info to client, if not yet sent 3058 # send meta info to client, if not yet sent
2796 unless (exists $self->{channel}{$channel->{id}}) { 3059 unless (exists $self->{channel}{$channel->{id}}) {
2797 $self->{channel}{$channel->{id}} = $channel; 3060 $self->{channel}{$channel->{id}} = $channel;
2798 $self->ext_msg (channel_info => $channel) 3061 $self->ext_msg (channel_info => $channel);
2799 if $self->can_msg;
2800 } 3062 }
2801 3063
2802 $channel = $channel->{id}; 3064 $channel = $channel->{id};
2803 } 3065 }
2804 3066
2805 return unless @extra || length $msg; 3067 return unless @extra || length $msg;
2806 3068
2807 if ($self->can_msg) {
2808 # default colour, mask it out 3069 # default colour, mask it out
2809 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3070 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2810 if $color & cf::NDI_DEF; 3071 if $color & cf::NDI_DEF;
2811 3072
2812 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3073 my $pkt = "msg "
3074 . $self->{json_coder}->encode (
2813 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3075 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2814 } else { 3076 );
2815 if ($color >= 0) {
2816 # replace some tags by gcfclient-compatible ones
2817 for ($msg) {
2818 1 while
2819 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2820 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2821 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2822 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2823 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2824 }
2825 3077
2826 $color &= cf::NDI_COLOR_MASK; 3078 $self->send_big_packet ($pkt);
2827
2828 utf8::encode $msg;
2829
2830 if (0 && $msg =~ /\[/) {
2831 # COMMAND/INFO
2832 $self->send_packet ("drawextinfo $color 10 8 $msg")
2833 } else {
2834 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2835 $self->send_packet ("drawinfo $color $msg")
2836 }
2837 }
2838 }
2839} 3079}
2840 3080
2841=item $client->ext_msg ($type, @msg) 3081=item $client->ext_msg ($type, @msg)
2842 3082
2843Sends an ext event to the client. 3083Sends an ext event to the client.
… …
2846 3086
2847sub cf::client::ext_msg($$@) { 3087sub cf::client::ext_msg($$@) {
2848 my ($self, $type, @msg) = @_; 3088 my ($self, $type, @msg) = @_;
2849 3089
2850 if ($self->extcmd == 2) { 3090 if ($self->extcmd == 2) {
2851 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3091 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2852 } elsif ($self->extcmd == 1) { # TODO: remove 3092 } elsif ($self->extcmd == 1) { # TODO: remove
2853 push @msg, msgtype => "event_$type"; 3093 push @msg, msgtype => "event_$type";
2854 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3094 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2855 } 3095 }
2856} 3096}
2857 3097
2858=item $client->ext_reply ($msgid, @msg) 3098=item $client->ext_reply ($msgid, @msg)
2859 3099
… …
2863 3103
2864sub cf::client::ext_reply($$@) { 3104sub cf::client::ext_reply($$@) {
2865 my ($self, $id, @msg) = @_; 3105 my ($self, $id, @msg) = @_;
2866 3106
2867 if ($self->extcmd == 2) { 3107 if ($self->extcmd == 2) {
2868 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3108 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2869 } elsif ($self->extcmd == 1) { 3109 } elsif ($self->extcmd == 1) {
2870 #TODO: version 1, remove 3110 #TODO: version 1, remove
2871 unshift @msg, msgtype => "reply", msgid => $id; 3111 unshift @msg, msgtype => "reply", msgid => $id;
2872 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3112 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2873 } 3113 }
2874} 3114}
2875 3115
2876=item $success = $client->query ($flags, "text", \&cb) 3116=item $success = $client->query ($flags, "text", \&cb)
2877 3117
… …
2948 3188
2949 $ns->ext_reply ($reply, @reply) 3189 $ns->ext_reply ($reply, @reply)
2950 if $reply; 3190 if $reply;
2951 3191
2952 } else { 3192 } else {
2953 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3193 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2954 } 3194 }
2955 3195
2956 cf::override; 3196 cf::override;
2957 }, 3197 },
2958); 3198);
… …
2978 3218
2979 $coro 3219 $coro
2980} 3220}
2981 3221
2982cf::client->attach ( 3222cf::client->attach (
2983 on_destroy => sub { 3223 on_client_destroy => sub {
2984 my ($ns) = @_; 3224 my ($ns) = @_;
2985 3225
2986 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3226 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2987 }, 3227 },
2988); 3228);
… …
3004our $safe_hole = new Safe::Hole; 3244our $safe_hole = new Safe::Hole;
3005 3245
3006$SIG{FPE} = 'IGNORE'; 3246$SIG{FPE} = 'IGNORE';
3007 3247
3008$safe->permit_only (Opcode::opset qw( 3248$safe->permit_only (Opcode::opset qw(
3009 :base_core :base_mem :base_orig :base_math 3249 :base_core :base_mem :base_orig :base_math :base_loop
3010 grepstart grepwhile mapstart mapwhile 3250 grepstart grepwhile mapstart mapwhile
3011 sort time 3251 sort time
3012)); 3252));
3013 3253
3014# here we export the classes and methods available to script code 3254# here we export the classes and methods available to script code
… …
3017 3257
3018The following functions and methods are available within a safe environment: 3258The following functions and methods are available within a safe environment:
3019 3259
3020 cf::object 3260 cf::object
3021 contr pay_amount pay_player map x y force_find force_add destroy 3261 contr pay_amount pay_player map x y force_find force_add destroy
3022 insert remove name archname title slaying race decrease_ob_nr 3262 insert remove name archname title slaying race decrease split
3263 value
3023 3264
3024 cf::object::player 3265 cf::object::player
3025 player 3266 player
3026 3267
3027 cf::player 3268 cf::player
… …
3032 3273
3033=cut 3274=cut
3034 3275
3035for ( 3276for (
3036 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3277 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3037 insert remove inv name archname title slaying race 3278 insert remove inv nrof name archname title slaying race
3038 decrease_ob_nr destroy)], 3279 decrease split destroy change_exp value msg lore send_msg)],
3039 ["cf::object::player" => qw(player)], 3280 ["cf::object::player" => qw(player)],
3040 ["cf::player" => qw(peaceful)], 3281 ["cf::player" => qw(peaceful send_msg)],
3041 ["cf::map" => qw(trigger)], 3282 ["cf::map" => qw(trigger)],
3042) { 3283) {
3043 no strict 'refs';
3044 my ($pkg, @funs) = @$_; 3284 my ($pkg, @funs) = @$_;
3045 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3285 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3046 for @funs; 3286 for @funs;
3047} 3287}
3048 3288
… …
3063 3303
3064 my $qcode = $code; 3304 my $qcode = $code;
3065 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3305 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3066 $qcode =~ s/\n/\\n/g; 3306 $qcode =~ s/\n/\\n/g;
3067 3307
3308 %vars = (_dummy => 0) unless %vars;
3309
3310 my @res;
3068 local $_; 3311 local $_;
3069 local @safe::cf::_safe_eval_args = values %vars;
3070 3312
3071 my $eval = 3313 my $eval =
3072 "do {\n" 3314 "do {\n"
3073 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3315 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3074 . "#line 0 \"{$qcode}\"\n" 3316 . "#line 0 \"{$qcode}\"\n"
3075 . $code 3317 . $code
3076 . "\n}" 3318 . "\n}"
3077 ; 3319 ;
3078 3320
3321 if ($CFG{safe_eval}) {
3079 sub_generation_inc; 3322 sub_generation_inc;
3323 local @safe::cf::_safe_eval_args = values %vars;
3080 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3324 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3081 sub_generation_inc; 3325 sub_generation_inc;
3326 } else {
3327 local @cf::_safe_eval_args = values %vars;
3328 @res = wantarray ? eval eval : scalar eval $eval;
3329 }
3082 3330
3083 if ($@) { 3331 if ($@) {
3084 warn "$@"; 3332 warn "$@",
3085 warn "while executing safe code '$code'\n"; 3333 "while executing safe code '$code'\n",
3086 warn "with arguments " . (join " ", %vars) . "\n"; 3334 "with arguments " . (join " ", %vars) . "\n";
3087 } 3335 }
3088 3336
3089 wantarray ? @res : $res[0] 3337 wantarray ? @res : $res[0]
3090} 3338}
3091 3339
… …
3105=cut 3353=cut
3106 3354
3107sub register_script_function { 3355sub register_script_function {
3108 my ($fun, $cb) = @_; 3356 my ($fun, $cb) = @_;
3109 3357
3110 no strict 'refs'; 3358 $fun = "safe::$fun" if $CFG{safe_eval};
3111 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3359 *$fun = $safe_hole->wrap ($cb);
3112} 3360}
3113 3361
3114=back 3362=back
3115 3363
3116=cut 3364=cut
… …
3125 # for this (global event?) 3373 # for this (global event?)
3126 %ext::player_env::MUSIC_FACE_CACHE = (); 3374 %ext::player_env::MUSIC_FACE_CACHE = ();
3127 3375
3128 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3376 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3129 3377
3130 warn "loading facedata from $path\n"; 3378 trace "loading facedata from $path\n";
3131 3379
3132 my $facedata;
3133 0 < aio_load $path, $facedata 3380 0 < aio_load $path, my $facedata
3134 or die "$path: $!"; 3381 or die "$path: $!";
3135 3382
3136 $facedata = Coro::Storable::thaw $facedata; 3383 $facedata = Coro::Storable::thaw $facedata;
3137 3384
3138 $facedata->{version} == 2 3385 $facedata->{version} == 2
3139 or cf::cleanup "$path: version mismatch, cannot proceed."; 3386 or cf::cleanup "$path: version mismatch, cannot proceed.";
3140 3387
3141 # patch in the exptable 3388 # patch in the exptable
3389 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3142 $facedata->{resource}{"res/exp_table"} = { 3390 $facedata->{resource}{"res/exp_table"} = {
3143 type => FT_RSRC, 3391 type => FT_RSRC,
3144 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3392 data => $exp_table,
3393 hash => (Digest::MD5::md5 $exp_table),
3145 }; 3394 };
3146 cf::cede_to_tick; 3395 cf::cede_to_tick;
3147 3396
3148 { 3397 {
3149 my $faces = $facedata->{faceinfo}; 3398 my $faces = $facedata->{faceinfo};
3150 3399
3151 while (my ($face, $info) = each %$faces) { 3400 while (my ($face, $info) = each %$faces) {
3152 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3401 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3402
3153 cf::face::set_visibility $idx, $info->{visibility}; 3403 cf::face::set_visibility $idx, $info->{visibility};
3154 cf::face::set_magicmap $idx, $info->{magicmap}; 3404 cf::face::set_magicmap $idx, $info->{magicmap};
3155 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3405 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3156 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3406 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3157 3407
3158 cf::cede_to_tick; 3408 cf::cede_to_tick;
3159 } 3409 }
3160 3410
3161 while (my ($face, $info) = each %$faces) { 3411 while (my ($face, $info) = each %$faces) {
3162 next unless $info->{smooth}; 3412 next unless $info->{smooth};
3413
3163 my $idx = cf::face::find $face 3414 my $idx = cf::face::find $face
3164 or next; 3415 or next;
3416
3165 if (my $smooth = cf::face::find $info->{smooth}) { 3417 if (my $smooth = cf::face::find $info->{smooth}) {
3166 cf::face::set_smooth $idx, $smooth; 3418 cf::face::set_smooth $idx, $smooth;
3167 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3419 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3168 } else { 3420 } else {
3169 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3421 error "smooth face '$info->{smooth}' not found for face '$face'";
3170 } 3422 }
3171 3423
3172 cf::cede_to_tick; 3424 cf::cede_to_tick;
3173 } 3425 }
3174 } 3426 }
… …
3183 3435
3184 cf::anim::invalidate_all; # d'oh 3436 cf::anim::invalidate_all; # d'oh
3185 } 3437 }
3186 3438
3187 { 3439 {
3188 # TODO: for gcfclient pleasure, we should give resources
3189 # that gcfclient doesn't grok a >10000 face index.
3190 my $res = $facedata->{resource}; 3440 my $res = $facedata->{resource};
3191 3441
3192 my $soundconf = delete $res->{"res/sound.conf"};
3193
3194 while (my ($name, $info) = each %$res) { 3442 while (my ($name, $info) = each %$res) {
3443 if (defined $info->{type}) {
3195 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3444 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3196 my $data;
3197 3445
3198 if ($info->{type} & 1) { 3446 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3199 # prepend meta info 3447 cf::face::set_type $idx, $info->{type};
3200
3201 my $meta = $enc->encode ({
3202 name => $name,
3203 %{ $info->{meta} || {} },
3204 });
3205
3206 $data = pack "(w/a*)*", $meta, $info->{data};
3207 } else { 3448 } else {
3208 $data = $info->{data}; 3449 $RESOURCE{$name} = $info; # unused
3209 } 3450 }
3210 3451
3211 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3212 cf::face::set_type $idx, $info->{type};
3213
3214 cf::cede_to_tick; 3452 cf::cede_to_tick;
3215 } 3453 }
3216
3217 if ($soundconf) {
3218 $soundconf = $enc->decode (delete $soundconf->{data});
3219
3220 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3221 my $sound = $soundconf->{compat}[$_]
3222 or next;
3223
3224 my $face = cf::face::find "sound/$sound->[1]";
3225 cf::sound::set $sound->[0] => $face;
3226 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3227 }
3228
3229 while (my ($k, $v) = each %{$soundconf->{event}}) {
3230 my $face = cf::face::find "sound/$v";
3231 cf::sound::set $k => $face;
3232 }
3233 }
3234 } 3454 }
3455
3456 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3235 3457
3236 1 3458 1
3237} 3459}
3238 3460
3239register_exticmd fx_want => sub { 3461register_exticmd fx_want => sub {
… …
3241 3463
3242 while (my ($k, $v) = each %$want) { 3464 while (my ($k, $v) = each %$want) {
3243 $ns->fx_want ($k, $v); 3465 $ns->fx_want ($k, $v);
3244 } 3466 }
3245}; 3467};
3468
3469sub load_resource_file($) {
3470 my $guard = lock_acquire "load_resource_file";
3471
3472 my $status = load_resource_file_ $_[0];
3473 get_slot 0.1, 100;
3474 cf::arch::commit_load;
3475
3476 $status
3477}
3246 3478
3247sub reload_regions { 3479sub reload_regions {
3248 # HACK to clear player env face cache, we need some signal framework 3480 # HACK to clear player env face cache, we need some signal framework
3249 # for this (global event?) 3481 # for this (global event?)
3250 %ext::player_env::MUSIC_FACE_CACHE = (); 3482 %ext::player_env::MUSIC_FACE_CACHE = ();
… …
3264} 3496}
3265 3497
3266sub reload_archetypes { 3498sub reload_archetypes {
3267 load_resource_file "$DATADIR/archetypes" 3499 load_resource_file "$DATADIR/archetypes"
3268 or die "unable to load archetypes\n"; 3500 or die "unable to load archetypes\n";
3269 #d# NEED to laod twice to resolve forward references
3270 # this really needs to be done in an extra post-pass
3271 # (which needs to be synchronous, so solve it differently)
3272 load_resource_file "$DATADIR/archetypes"
3273 or die "unable to load archetypes\n";
3274} 3501}
3275 3502
3276sub reload_treasures { 3503sub reload_treasures {
3277 load_resource_file "$DATADIR/treasures" 3504 load_resource_file "$DATADIR/treasures"
3278 or die "unable to load treasurelists\n"; 3505 or die "unable to load treasurelists\n";
3279} 3506}
3280 3507
3508sub reload_sound {
3509 trace "loading sound config from $DATADIR/sound\n";
3510
3511 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3512 or die "$DATADIR/sound $!";
3513
3514 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3515
3516 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3517 my $sound = $soundconf->{compat}[$_]
3518 or next;
3519
3520 my $face = cf::face::find "sound/$sound->[1]";
3521 cf::sound::set $sound->[0] => $face;
3522 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3523 }
3524
3525 while (my ($k, $v) = each %{$soundconf->{event}}) {
3526 my $face = cf::face::find "sound/$v";
3527 cf::sound::set $k => $face;
3528 }
3529}
3530
3281sub reload_resources { 3531sub reload_resources {
3282 warn "reloading resource files...\n"; 3532 trace "reloading resource files...\n";
3283 3533
3534 reload_exp_table;
3535 reload_materials;
3536 reload_facedata;
3537 reload_sound;
3538 reload_archetypes;
3284 reload_regions; 3539 reload_regions;
3285 reload_facedata;
3286 #reload_archetypes;#d#
3287 reload_archetypes;
3288 reload_treasures; 3540 reload_treasures;
3289 3541
3290 warn "finished reloading resource files\n"; 3542 trace "finished reloading resource files\n";
3291}
3292
3293sub init {
3294 reload_resources;
3295} 3543}
3296 3544
3297sub reload_config { 3545sub reload_config {
3298 open my $fh, "<:utf8", "$CONFDIR/config" 3546 trace "reloading config file...\n";
3299 or return;
3300 3547
3301 local $/; 3548 0 < aio_load "$CONFDIR/config", my $config
3549 or die "$CONFDIR/config: $!";
3550
3551 utf8::decode $config;
3552
3553 cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
3302 *CFG = YAML::Syck::Load <$fh>; 3554 *CFG = YAML::XS::Load $config;
3303 3555
3304 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3556 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3305 3557
3306 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3558 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3307 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3559 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3308 3560
3309 if (exists $CFG{mlockall}) { 3561 if (exists $CFG{mlockall}) {
… …
3313 }; 3565 };
3314 warn $@ if $@; 3566 warn $@ if $@;
3315 } 3567 }
3316} 3568}
3317 3569
3570sub pidfile() {
3571 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3572 or die "$PIDFILE: $!";
3573 flock $fh, &Fcntl::LOCK_EX
3574 or die "$PIDFILE: flock: $!";
3575 $fh
3576}
3577
3578# make sure only one server instance is running at any one time
3579sub atomic {
3580 my $fh = pidfile;
3581
3582 my $pid = <$fh>;
3583 kill 9, $pid if $pid > 0;
3584
3585 seek $fh, 0, 0;
3586 print $fh $$;
3587}
3588
3589sub main_loop {
3590 trace "EV::loop starting\n";
3591 if (1) {
3592 EV::loop;
3593 }
3594 trace "EV::loop returned\n";
3595 goto &main_loop unless $REALLY_UNLOOP;
3596}
3597
3318sub main { 3598sub main {
3599 cf::init_globals; # initialise logging
3600
3601 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3602 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3603 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3604 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3605
3606 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3607
3319 # we must not ever block the main coroutine 3608 # we must not ever block the main coroutine
3320 local $Coro::idle = sub { 3609 local $Coro::idle = sub {
3321 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3610 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3322 (async { 3611 (async {
3323 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3612 $Coro::current->{desc} = "IDLE BUG HANDLER";
3324 EV::loop EV::LOOP_ONESHOT; 3613 EV::loop EV::LOOP_ONESHOT;
3325 })->prio (Coro::PRIO_MAX); 3614 })->prio (Coro::PRIO_MAX);
3326 }; 3615 };
3327 3616
3617 evthread_start IO::AIO::poll_fileno;
3618
3619 cf::sync_job {
3620 cf::incloader::init ();
3621
3622 cf::init_anim;
3623 cf::init_attackmess;
3624 cf::init_dynamic;
3625
3626 cf::load_settings;
3627
3628 reload_resources;
3328 reload_config; 3629 reload_config;
3329 db_init; 3630 db_init;
3631
3632 cf::init_uuid;
3633 cf::init_signals;
3634 cf::init_skills;
3635
3636 cf::init_beforeplay;
3637
3638 atomic;
3639
3330 load_extensions; 3640 load_extensions;
3331 3641
3332 $TICK_WATCHER->start; 3642 utime time, time, $RUNTIMEFILE;
3333 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3643
3334 EV::loop; 3644 # no (long-running) fork's whatsoever before this point(!)
3645 use POSIX ();
3646 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3647
3648 (pop @POST_INIT)->(0) while @POST_INIT;
3649 };
3650
3651 cf::object::thawer::errors_are_fatal 0;
3652 info "parse errors in files are no longer fatal from this point on.\n";
3653
3654 my $free_main; $free_main = EV::idle sub {
3655 undef $free_main;
3656 undef &main; # free gobs of memory :)
3657 };
3658
3659 goto &main_loop;
3335} 3660}
3336 3661
3337############################################################################# 3662#############################################################################
3338# initialisation and cleanup 3663# initialisation and cleanup
3339 3664
3340# install some emergency cleanup handlers 3665# install some emergency cleanup handlers
3341BEGIN { 3666BEGIN {
3342 our %SIGWATCHER = (); 3667 our %SIGWATCHER = ();
3343 for my $signal (qw(INT HUP TERM)) { 3668 for my $signal (qw(INT HUP TERM)) {
3344 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3669 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3345 cf::cleanup "SIG$signal"; 3670 cf::cleanup "SIG$signal";
3346 }; 3671 };
3347 } 3672 }
3348} 3673}
3349 3674
3350sub write_runtime { 3675sub write_runtime_sync {
3351 my $runtime = "$LOCALDIR/runtime"; 3676 my $t0 = AE::time;
3352 3677
3353 # first touch the runtime file to show we are still running: 3678 # first touch the runtime file to show we are still running:
3354 # the fsync below can take a very very long time. 3679 # the fsync below can take a very very long time.
3355 3680
3356 IO::AIO::aio_utime $runtime, undef, undef; 3681 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3357 3682
3358 my $guard = cf::lock_acquire "write_runtime"; 3683 my $guard = cf::lock_acquire "write_runtime";
3359 3684
3360 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3685 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3361 or return; 3686 or return;
3362 3687
3363 my $value = $cf::RUNTIME + 90 + 10; 3688 my $value = $cf::RUNTIME + 90 + 10;
3364 # 10 is the runtime save interval, for a monotonic clock 3689 # 10 is the runtime save interval, for a monotonic clock
3365 # 60 allows for the watchdog to kill the server. 3690 # 60 allows for the watchdog to kill the server.
… …
3375 aio_utime $fh, undef, undef; 3700 aio_utime $fh, undef, undef;
3376 3701
3377 close $fh 3702 close $fh
3378 or return; 3703 or return;
3379 3704
3380 aio_rename "$runtime~", $runtime 3705 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3381 and return; 3706 and return;
3382 3707
3383 warn "runtime file written.\n"; 3708 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3384 3709
3385 1 3710 1
3711}
3712
3713our $uuid_lock;
3714our $uuid_skip;
3715
3716sub write_uuid_sync($) {
3717 $uuid_skip ||= $_[0];
3718
3719 return if $uuid_lock;
3720 local $uuid_lock = 1;
3721
3722 my $uuid = "$LOCALDIR/uuid";
3723
3724 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3725 or return;
3726
3727 my $value = uuid_seq uuid_cur;
3728
3729 unless ($value) {
3730 info "cowardly refusing to write zero uuid value!\n";
3731 return;
3732 }
3733
3734 my $value = uuid_str $value + $uuid_skip;
3735 $uuid_skip = 0;
3736
3737 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3738 and return;
3739
3740 # always fsync - this file is important
3741 aio_fsync $fh
3742 and return;
3743
3744 close $fh
3745 or return;
3746
3747 aio_rename "$uuid~", $uuid
3748 and return;
3749
3750 trace "uuid file written ($value).\n";
3751
3752 1
3753
3754}
3755
3756sub write_uuid($$) {
3757 my ($skip, $sync) = @_;
3758
3759 $sync ? write_uuid_sync $skip
3760 : async { write_uuid_sync $skip };
3386} 3761}
3387 3762
3388sub emergency_save() { 3763sub emergency_save() {
3389 my $freeze_guard = cf::freeze_mainloop; 3764 my $freeze_guard = cf::freeze_mainloop;
3390 3765
3391 warn "enter emergency perl save\n"; 3766 info "emergency_perl_save: enter\n";
3767
3768 # this is a trade-off: we want to be very quick here, so
3769 # save all maps without fsync, and later call a global sync
3770 # (which in turn might be very very slow)
3771 local $USE_FSYNC = 0;
3392 3772
3393 cf::sync_job { 3773 cf::sync_job {
3774 cf::write_runtime_sync; # external watchdog should not bark
3775
3394 # use a peculiar iteration method to avoid tripping on perl 3776 # use a peculiar iteration method to avoid tripping on perl
3395 # refcount bugs in for. also avoids problems with players 3777 # refcount bugs in for. also avoids problems with players
3396 # and maps saved/destroyed asynchronously. 3778 # and maps saved/destroyed asynchronously.
3397 warn "begin emergency player save\n"; 3779 info "emergency_perl_save: begin player save\n";
3398 for my $login (keys %cf::PLAYER) { 3780 for my $login (keys %cf::PLAYER) {
3399 my $pl = $cf::PLAYER{$login} or next; 3781 my $pl = $cf::PLAYER{$login} or next;
3400 $pl->valid or next; 3782 $pl->valid or next;
3401 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3783 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3402 $pl->save; 3784 $pl->save;
3403 } 3785 }
3404 warn "end emergency player save\n"; 3786 info "emergency_perl_save: end player save\n";
3405 3787
3406 warn "begin emergency map save\n"; 3788 cf::write_runtime_sync; # external watchdog should not bark
3789
3790 info "emergency_perl_save: begin map save\n";
3407 for my $path (keys %cf::MAP) { 3791 for my $path (keys %cf::MAP) {
3408 my $map = $cf::MAP{$path} or next; 3792 my $map = $cf::MAP{$path} or next;
3409 $map->valid or next; 3793 $map->valid or next;
3410 $map->save; 3794 $map->save;
3411 } 3795 }
3412 warn "end emergency map save\n"; 3796 info "emergency_perl_save: end map save\n";
3413 3797
3414 warn "begin emergency database checkpoint\n"; 3798 cf::write_runtime_sync; # external watchdog should not bark
3799
3800 info "emergency_perl_save: begin database checkpoint\n";
3415 BDB::db_env_txn_checkpoint $DB_ENV; 3801 BDB::db_env_txn_checkpoint $DB_ENV;
3416 warn "end emergency database checkpoint\n"; 3802 info "emergency_perl_save: end database checkpoint\n";
3803
3804 info "emergency_perl_save: begin write uuid\n";
3805 write_uuid_sync 1;
3806 info "emergency_perl_save: end write uuid\n";
3807
3808 cf::write_runtime_sync; # external watchdog should not bark
3809
3810 trace "emergency_perl_save: syncing database to disk";
3811 BDB::db_env_txn_checkpoint $DB_ENV;
3812
3813 info "emergency_perl_save: starting sync\n";
3814 IO::AIO::aio_sync sub {
3815 info "emergency_perl_save: finished sync\n";
3816 };
3817
3818 cf::write_runtime_sync; # external watchdog should not bark
3819
3820 trace "emergency_perl_save: flushing outstanding aio requests";
3821 while (IO::AIO::nreqs || BDB::nreqs) {
3822 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3823 }
3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3417 }; 3826 };
3418 3827
3419 warn "leave emergency perl save\n"; 3828 info "emergency_perl_save: leave\n";
3420} 3829}
3421 3830
3422sub post_cleanup { 3831sub post_cleanup {
3423 my ($make_core) = @_; 3832 my ($make_core) = @_;
3424 3833
3834 IO::AIO::flush;
3835
3425 warn Carp::longmess "post_cleanup backtrace" 3836 error Carp::longmess "post_cleanup backtrace"
3426 if $make_core; 3837 if $make_core;
3838
3839 my $fh = pidfile;
3840 unlink $PIDFILE if <$fh> == $$;
3841}
3842
3843# a safer delete_package, copied from Symbol
3844sub clear_package($) {
3845 my $pkg = shift;
3846
3847 # expand to full symbol table name if needed
3848 unless ($pkg =~ /^main::.*::$/) {
3849 $pkg = "main$pkg" if $pkg =~ /^::/;
3850 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3851 $pkg .= '::' unless $pkg =~ /::$/;
3852 }
3853
3854 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3855 my $stem_symtab = *{$stem}{HASH};
3856
3857 defined $stem_symtab and exists $stem_symtab->{$leaf}
3858 or return;
3859
3860 # clear all symbols
3861 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3862 for my $name (keys %$leaf_symtab) {
3863 _gv_clear *{"$pkg$name"};
3864# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3865 }
3427} 3866}
3428 3867
3429sub do_reload_perl() { 3868sub do_reload_perl() {
3430 # can/must only be called in main 3869 # can/must only be called in main
3431 if ($Coro::current != $Coro::main) { 3870 unless (in_main) {
3432 warn "can only reload from main coroutine"; 3871 error "can only reload from main coroutine";
3433 return; 3872 return;
3434 } 3873 }
3435 3874
3875 return if $RELOAD++;
3876
3877 my $t1 = AE::time;
3878
3879 while ($RELOAD) {
3880 cf::get_slot 0.1, -1, "reload_perl";
3436 warn "reloading..."; 3881 info "reloading...";
3437 3882
3438 warn "entering sync_job"; 3883 trace "entering sync_job";
3439 3884
3440 cf::sync_job { 3885 cf::sync_job {
3441 cf::write_runtime; # external watchdog should not bark
3442 cf::emergency_save; 3886 #cf::emergency_save;
3443 cf::write_runtime; # external watchdog should not bark
3444 3887
3445 warn "syncing database to disk";
3446 BDB::db_env_txn_checkpoint $DB_ENV;
3447
3448 # if anything goes wrong in here, we should simply crash as we already saved
3449
3450 warn "flushing outstanding aio requests";
3451 for (;;) {
3452 BDB::flush;
3453 IO::AIO::flush;
3454 Coro::cede_notself;
3455 last unless IO::AIO::nreqs || BDB::nreqs;
3456 warn "iterate...";
3457 }
3458
3459 ++$RELOAD;
3460
3461 warn "cancelling all extension coros"; 3888 trace "cancelling all extension coros";
3462 $_->cancel for values %EXT_CORO; 3889 $_->cancel for values %EXT_CORO;
3463 %EXT_CORO = (); 3890 %EXT_CORO = ();
3464 3891
3465 warn "removing commands"; 3892 trace "removing commands";
3466 %COMMAND = (); 3893 %COMMAND = ();
3467 3894
3468 warn "removing ext/exti commands"; 3895 trace "removing ext/exti commands";
3469 %EXTCMD = (); 3896 %EXTCMD = ();
3470 %EXTICMD = (); 3897 %EXTICMD = ();
3471 3898
3472 warn "unloading/nuking all extensions"; 3899 trace "unloading/nuking all extensions";
3473 for my $pkg (@EXTS) { 3900 for my $pkg (@EXTS) {
3474 warn "... unloading $pkg"; 3901 trace "... unloading $pkg";
3475 3902
3476 if (my $cb = $pkg->can ("unload")) { 3903 if (my $cb = $pkg->can ("unload")) {
3477 eval { 3904 eval {
3478 $cb->($pkg); 3905 $cb->($pkg);
3479 1 3906 1
3480 } or warn "$pkg unloaded, but with errors: $@"; 3907 } or error "$pkg unloaded, but with errors: $@";
3908 }
3909
3910 trace "... clearing $pkg";
3911 clear_package $pkg;
3481 } 3912 }
3482 3913
3483 warn "... nuking $pkg";
3484 Symbol::delete_package $pkg;
3485 }
3486
3487 warn "unloading all perl modules loaded from $LIBDIR"; 3914 trace "unloading all perl modules loaded from $LIBDIR";
3488 while (my ($k, $v) = each %INC) { 3915 while (my ($k, $v) = each %INC) {
3489 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3916 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3490 3917
3491 warn "... unloading $k"; 3918 trace "... unloading $k";
3492 delete $INC{$k}; 3919 delete $INC{$k};
3493 3920
3494 $k =~ s/\.pm$//; 3921 $k =~ s/\.pm$//;
3495 $k =~ s/\//::/g; 3922 $k =~ s/\//::/g;
3496 3923
3497 if (my $cb = $k->can ("unload_module")) { 3924 if (my $cb = $k->can ("unload_module")) {
3498 $cb->(); 3925 $cb->();
3926 }
3927
3928 clear_package $k;
3499 } 3929 }
3500 3930
3501 Symbol::delete_package $k;
3502 }
3503
3504 warn "getting rid of safe::, as good as possible"; 3931 trace "getting rid of safe::, as good as possible";
3505 Symbol::delete_package "safe::$_" 3932 clear_package "safe::$_"
3506 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3933 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3507 3934
3508 warn "unloading cf.pm \"a bit\""; 3935 trace "unloading cf.pm \"a bit\"";
3509 delete $INC{"cf.pm"}; 3936 delete $INC{"cf.pm"};
3510 delete $INC{"cf/pod.pm"}; 3937 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3511 3938
3512 # don't, removes xs symbols, too, 3939 # don't, removes xs symbols, too,
3513 # and global variables created in xs 3940 # and global variables created in xs
3514 #Symbol::delete_package __PACKAGE__; 3941 #clear_package __PACKAGE__;
3515 3942
3516 warn "unload completed, starting to reload now"; 3943 info "unload completed, starting to reload now";
3517 3944
3518 warn "reloading cf.pm"; 3945 trace "reloading cf.pm";
3519 require cf; 3946 require cf;
3520 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3947 cf::_connect_to_perl_1;
3521 3948
3522 warn "loading config and database again"; 3949 trace "loading config and database again";
3523 cf::reload_config; 3950 cf::reload_config;
3524 3951
3525 warn "loading extensions"; 3952 trace "loading extensions";
3526 cf::load_extensions; 3953 cf::load_extensions;
3527 3954
3955 if ($REATTACH_ON_RELOAD) {
3528 warn "reattaching attachments to objects/players"; 3956 trace "reattaching attachments to objects/players";
3529 _global_reattach; # objects, sockets 3957 _global_reattach; # objects, sockets
3530 warn "reattaching attachments to maps"; 3958 trace "reattaching attachments to maps";
3531 reattach $_ for values %MAP; 3959 reattach $_ for values %MAP;
3532 warn "reattaching attachments to players"; 3960 trace "reattaching attachments to players";
3533 reattach $_ for values %PLAYER; 3961 reattach $_ for values %PLAYER;
3962 }
3534 3963
3964 trace "running post_init jobs";
3965 (pop @POST_INIT)->(1) while @POST_INIT;
3966
3535 warn "leaving sync_job"; 3967 trace "leaving sync_job";
3536 3968
3537 1 3969 1
3538 } or do { 3970 } or do {
3539 warn $@; 3971 error $@;
3540 warn "error while reloading, exiting."; 3972 cf::cleanup "error while reloading, exiting.";
3541 exit 1; 3973 };
3974
3975 info "reloaded";
3976 --$RELOAD;
3542 }; 3977 }
3543 3978
3544 warn "reloaded"; 3979 $t1 = AE::time - $t1;
3980 info "reload completed in ${t1}s\n";
3545}; 3981};
3546 3982
3547our $RELOAD_WATCHER; # used only during reload 3983our $RELOAD_WATCHER; # used only during reload
3548 3984
3549sub reload_perl() { 3985sub reload_perl() {
3550 # doing reload synchronously and two reloads happen back-to-back, 3986 # doing reload synchronously and two reloads happen back-to-back,
3551 # coro crashes during coro_state_free->destroy here. 3987 # coro crashes during coro_state_free->destroy here.
3552 3988
3989 $RELOAD_WATCHER ||= cf::async {
3990 Coro::AIO::aio_wait cache_extensions;
3991
3553 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3992 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3993 do_reload_perl;
3554 undef $RELOAD_WATCHER; 3994 undef $RELOAD_WATCHER;
3555 do_reload_perl; 3995 };
3556 }; 3996 };
3557} 3997}
3558 3998
3559register_command "reload" => sub { 3999register_command "reload" => sub {
3560 my ($who, $arg) = @_; 4000 my ($who, $arg) = @_;
… …
3566 reload_perl; 4006 reload_perl;
3567 }; 4007 };
3568 } 4008 }
3569}; 4009};
3570 4010
3571unshift @INC, $LIBDIR; 4011#############################################################################
3572 4012
3573my $bug_warning = 0; 4013my $bug_warning = 0;
3574 4014
3575our @WAIT_FOR_TICK; 4015our @WAIT_FOR_TICK;
3576our @WAIT_FOR_TICK_BEGIN; 4016our @WAIT_FOR_TICK_BEGIN;
3577 4017
3578sub wait_for_tick { 4018sub wait_for_tick() {
3579 return unless $TICK_WATCHER->is_active;
3580 return if $Coro::current == $Coro::main; 4019 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3581 4020
3582 my $signal = new Coro::Signal; 4021 my $signal = new Coro::Signal;
3583 push @WAIT_FOR_TICK, $signal; 4022 push @WAIT_FOR_TICK, $signal;
3584 $signal->wait; 4023 $signal->wait;
3585} 4024}
3586 4025
3587sub wait_for_tick_begin { 4026sub wait_for_tick_begin() {
3588 return unless $TICK_WATCHER->is_active;
3589 return if $Coro::current == $Coro::main; 4027 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3590 4028
3591 my $signal = new Coro::Signal; 4029 my $signal = new Coro::Signal;
3592 push @WAIT_FOR_TICK_BEGIN, $signal; 4030 push @WAIT_FOR_TICK_BEGIN, $signal;
3593 $signal->wait; 4031 $signal->wait;
3594} 4032}
3595 4033
3596$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 4034sub tick {
3597 if ($Coro::current != $Coro::main) { 4035 if ($Coro::current != $Coro::main) {
3598 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4036 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3599 unless ++$bug_warning > 10; 4037 unless ++$bug_warning > 10;
3600 return; 4038 return;
3601 } 4039 }
3602 4040
3603 $NOW = $tick_start = EV::now;
3604
3605 cf::server_tick; # one server iteration 4041 cf::server_tick; # one server iteration
3606 4042
3607 $RUNTIME += $TICK; 4043 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3608 $NEXT_TICK += $TICK;
3609 4044
3610 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4045 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3611 $NEXT_RUNTIME_WRITE = $NOW + 10; 4046 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3612 Coro::async_pool { 4047 Coro::async_pool {
3613 $Coro::current->{desc} = "runtime saver"; 4048 $Coro::current->{desc} = "runtime saver";
3614 write_runtime 4049 write_runtime_sync
3615 or warn "ERROR: unable to write runtime file: $!"; 4050 or error "ERROR: unable to write runtime file: $!";
3616 }; 4051 };
3617 } 4052 }
3618 4053
3619 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4054 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3620 $sig->send; 4055 $sig->send;
3621 } 4056 }
3622 while (my $sig = shift @WAIT_FOR_TICK) { 4057 while (my $sig = shift @WAIT_FOR_TICK) {
3623 $sig->send; 4058 $sig->send;
3624 } 4059 }
3625 4060
3626 $LOAD = ($NOW - $tick_start) / $TICK; 4061 $LOAD = ($NOW - $TICK_START) / $TICK;
3627 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4062 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3628 4063
3629 _post_tick; 4064 if (0) {
3630}; 4065 if ($NEXT_TICK) {
3631$TICK_WATCHER->priority (EV::MAXPRI); 4066 my $jitter = $TICK_START - $NEXT_TICK;
4067 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4068 debug "jitter $JITTER\n";#d#
4069 }
4070 }
4071}
3632 4072
3633{ 4073{
4074 # configure BDB
4075
3634 BDB::min_parallel 8; 4076 BDB::min_parallel 16;
3635 BDB::max_poll_time $TICK * 0.1; 4077 BDB::max_poll_reqs $TICK * 0.1;
3636 $BDB_POLL_WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb; 4078 $AnyEvent::BDB::WATCHER->priority (1);
3637
3638 BDB::set_sync_prepare {
3639 my $status;
3640 my $current = $Coro::current;
3641 (
3642 sub {
3643 $status = $!;
3644 $current->ready; undef $current;
3645 },
3646 sub {
3647 Coro::schedule while defined $current;
3648 $! = $status;
3649 },
3650 )
3651 };
3652 4079
3653 unless ($DB_ENV) { 4080 unless ($DB_ENV) {
3654 $DB_ENV = BDB::db_env_create; 4081 $DB_ENV = BDB::db_env_create;
3655 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4082 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3656 | BDB::LOG_AUTOREMOVE, 1); 4083 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4084 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3657 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4085 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3658 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4086 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3659 4087
3660 cf::sync_job { 4088 cf::sync_job {
3661 eval { 4089 eval {
… …
3683 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4111 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3684 }; 4112 };
3685} 4113}
3686 4114
3687{ 4115{
4116 # configure IO::AIO
4117
3688 IO::AIO::min_parallel 8; 4118 IO::AIO::min_parallel 8;
3689
3690 undef $Coro::AIO::WATCHER;
3691 IO::AIO::max_poll_time $TICK * 0.1; 4119 IO::AIO::max_poll_time $TICK * 0.1;
3692 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb; 4120 undef $AnyEvent::AIO::WATCHER;
3693} 4121}
3694 4122
3695my $_log_backtrace; 4123my $_log_backtrace;
3696 4124
3697sub _log_backtrace { 4125sub _log_backtrace {
… …
3700 $msg =~ s/\n//; 4128 $msg =~ s/\n//;
3701 4129
3702 # limit the # of concurrent backtraces 4130 # limit the # of concurrent backtraces
3703 if ($_log_backtrace < 2) { 4131 if ($_log_backtrace < 2) {
3704 ++$_log_backtrace; 4132 ++$_log_backtrace;
4133 my $perl_bt = Carp::longmess $msg;
3705 async { 4134 async {
3706 $Coro::current->{desc} = "abt $msg"; 4135 $Coro::current->{desc} = "abt $msg";
3707 4136
3708 my @bt = fork_call { 4137 my @bt = fork_call {
3709 @addr = map { sprintf "%x", $_ } @addr; 4138 @addr = map { sprintf "%x", $_ } @addr;
… …
3720 } 4149 }
3721 4150
3722 @funcs 4151 @funcs
3723 }; 4152 };
3724 4153
3725 LOG llevInfo, "[ABT] $msg\n"; 4154 LOG llevInfo, "[ABT] $perl_bt\n";
4155 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3726 LOG llevInfo, "[ABT] $_\n" for @bt; 4156 LOG llevInfo, "[ABT] $_\n" for @bt;
3727 --$_log_backtrace; 4157 --$_log_backtrace;
3728 }; 4158 };
3729 } else { 4159 } else {
3730 LOG llevInfo, "[ABT] $msg\n"; 4160 LOG llevInfo, "[ABT] $msg\n";
3731 LOG llevInfo, "[ABT] [suppressed]\n"; 4161 LOG llevInfo, "[ABT] [suppressed]\n";
3732 } 4162 }
3733} 4163}
3734 4164
3735# load additional modules 4165# load additional modules
3736use cf::pod; 4166require "cf/$_.pm" for @EXTRA_MODULES;
4167cf::_connect_to_perl_2;
3737 4168
3738END { cf::emergency_save } 4169END { cf::emergency_save }
3739 4170
37401 41711
3741 4172

Diff Legend

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