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.395 by root, Sat Nov 10 22:41:59 2007 UTC vs.
Revision 1.534 by root, Thu Apr 29 08:13:51 2010 UTC

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

Diff Legend

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