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.271 by root, Fri Jun 1 06:04:08 2007 UTC vs.
Revision 1.455 by root, Sat Sep 27 08:17:40 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your 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 GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "vars", "subs";
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Storable; 31use EV;
10use Event;
11use Opcode; 32use Opcode;
12use Safe; 33use Safe;
13use Safe::Hole; 34use Safe::Hole;
35use Storable ();
14 36
15use Coro 3.61 (); 37use Coro ();
16use Coro::State; 38use Coro::State;
17use Coro::Handle; 39use Coro::Handle;
40use Coro::EV;
18use Coro::Event; 41use Coro::AnyEvent;
19use Coro::Timer; 42use Coro::Timer;
20use Coro::Signal; 43use Coro::Signal;
21use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
22use Coro::AIO; 46use Coro::AIO;
47use Coro::BDB 1.6;
23use Coro::Storable; 48use Coro::Storable;
49use Coro::Util ();
24 50
51use JSON::XS 2.01 ();
25use BDB (); 52use BDB ();
26use Data::Dumper; 53use Data::Dumper;
27use Digest::MD5; 54use Digest::MD5;
28use Fcntl; 55use Fcntl;
29use YAML::Syck (); 56use YAML ();
30use IO::AIO 2.32 (); 57use IO::AIO ();
31use Time::HiRes; 58use Time::HiRes;
32use Compress::LZF; 59use Compress::LZF;
60use Digest::MD5 ();
61
62AnyEvent::detect;
33 63
34# configure various modules to our taste 64# configure various modules to our taste
35# 65#
36$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
68
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70
71# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 73Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39
40$Event::Eval = 1; # no idea why this is required, but it is
41
42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
43$YAML::Syck::ImplicitUnicode = 1;
44
45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46 74
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
48 76
49our %COMMAND = (); 77our %COMMAND = ();
50our %COMMAND_TIME = (); 78our %COMMAND_TIME = ();
51 79
52our @EXTS = (); # list of extension package names 80our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 81our %EXTCMD = ();
82our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 83our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 84our %EXT_MAP = (); # pluggable maps
56 85
57our $RELOAD; # number of reloads so far 86our $RELOAD; # number of reloads so far, non-zero while in reload
58our @EVENT; 87our @EVENT;
59 88
60our $CONFDIR = confdir; 89our $CONFDIR = confdir;
61our $DATADIR = datadir; 90our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext"; 91our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod"; 92our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir; 93our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir; 94our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 95our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 96our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 97our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 98our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 99our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime";
102
103our %RESOURCE;
71 104
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
73our $TICK_WATCHER;
74our $AIO_POLL_WATCHER;
75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
76our $NEXT_TICK; 107our $NEXT_TICK;
77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 108our $USE_FSYNC = 1; # use fsync to write maps - default off
79 109
110our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER;
80our $BDB_POLL_WATCHER; 112our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 113our $DB_ENV;
82 114
83our %CFG; 115our %CFG;
84 116
85our $UPTIME; $UPTIME ||= time; 117our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 118our $RUNTIME;
119our $NOW;
87 120
88our %PLAYER; # all users 121our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 122our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 123our $LINK_MAP; # the special {link} map, which is always available
91 124
92# used to convert map paths into valid unix filenames by replacing / by ∕ 125# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 126our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 127
95our $LOAD; # a number between 0 (idle) and 1 (too many objects) 128our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing 129our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter
97our $tick_start; # for load detecting purposes 131our $TICK_START; # for load detecting purposes
132
133our @POST_INIT;
98 134
99binmode STDOUT; 135binmode STDOUT;
100binmode STDERR; 136binmode STDERR;
101 137
102# read virtual server time, if available 138# read virtual server time, if available
103unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 139unless ($RUNTIME || !-e $RUNTIMEFILE) {
104 open my $fh, "<", "$LOCALDIR/runtime" 140 open my $fh, "<", $RUNTIMEFILE
105 or die "unable to read runtime file: $!"; 141 or die "unable to read $RUNTIMEFILE file: $!";
106 $RUNTIME = <$fh> + 0.; 142 $RUNTIME = <$fh> + 0.;
107} 143}
108 144
109mkdir $_ 145mkdir $_
110 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 146 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
… …
155 191
156The raw value load value from the last tick. 192The raw value load value from the last tick.
157 193
158=item %cf::CFG 194=item %cf::CFG
159 195
160Configuration for the server, loaded from C</etc/crossfire/config>, or 196Configuration for the server, loaded from C</etc/deliantra-server/config>, or
161from wherever your confdir points to. 197from wherever your confdir points to.
162 198
163=item cf::wait_for_tick, cf::wait_for_tick_begin 199=item cf::wait_for_tick, cf::wait_for_tick_begin
164 200
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 201These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
166returns directly I<after> the tick processing (and consequently, can only wake one process 202returns directly I<after> the tick processing (and consequently, can only wake one process
167per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 203per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 204
205=item @cf::INVOKE_RESULTS
206
207This array contains the results of the last C<invoke ()> call. When
208C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
209that call.
210
169=back 211=back
170 212
171=cut 213=cut
172 214
173BEGIN { 215BEGIN {
… …
177 $msg .= "\n" 219 $msg .= "\n"
178 unless $msg =~ /\n$/; 220 unless $msg =~ /\n$/;
179 221
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 222 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181 223
182 utf8::encode $msg;
183 LOG llevError, $msg; 224 LOG llevError, $msg;
184 }; 225 };
185} 226}
227
228$Coro::State::DIEHOOK = sub {
229 return unless $^S eq 0; # "eq", not "=="
230
231 if ($Coro::current == $Coro::main) {#d#
232 warn "DIEHOOK called in main context, Coro bug?\n";#d#
233 return;#d#
234 }#d#
235
236 # kill coroutine otherwise
237 warn Carp::longmess $_[0];
238 Coro::terminate
239};
240
241$SIG{__DIE__} = sub { }; #d#?
186 242
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 243@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 244@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 245@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 246@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
191@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 247@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
248@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
192@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 249@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
193 250
194# we bless all objects into (empty) derived classes to force a method lookup 251# we bless all objects into (empty) derived classes to force a method lookup
195# within the Safe compartment. 252# within the Safe compartment.
196for my $pkg (qw( 253for my $pkg (qw(
197 cf::global cf::attachable 254 cf::global cf::attachable
198 cf::object cf::object::player 255 cf::object cf::object::player
199 cf::client cf::player 256 cf::client cf::player
200 cf::arch cf::living 257 cf::arch cf::living
258 cf::map cf::mapspace
201 cf::map cf::party cf::region 259 cf::party cf::region
202)) { 260)) {
203 no strict 'refs';
204 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 261 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
205} 262}
206 263
207$Event::DIED = sub { 264$EV::DIED = sub {
208 warn "error in event callback: @_"; 265 warn "error in event callback: @_";
209}; 266};
267
268#############################################################################
210 269
211=head2 UTILITY FUNCTIONS 270=head2 UTILITY FUNCTIONS
212 271
213=over 4 272=over 4
214 273
… …
233 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 292 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
234 $d 293 $d
235 } || "[unable to dump $_[0]: '$@']"; 294 } || "[unable to dump $_[0]: '$@']";
236} 295}
237 296
238use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
239
240=item $ref = cf::from_json $json 297=item $ref = cf::decode_json $json
241 298
242Converts a JSON string into the corresponding perl data structure. 299Converts a JSON string into the corresponding perl data structure.
243 300
244=item $json = cf::to_json $ref 301=item $json = cf::encode_json $ref
245 302
246Converts a perl data structure into its JSON representation. 303Converts a perl data structure into its JSON representation.
304
305=cut
306
307our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
308
309sub encode_json($) { $json_coder->encode ($_[0]) }
310sub decode_json($) { $json_coder->decode ($_[0]) }
311
312=item cf::post_init { BLOCK }
313
314Execute the given codeblock, I<after> all extensions have been (re-)loaded,
315but I<before> the server starts ticking again.
316
317The cdoeblock will have a single boolean argument to indicate whether this
318is a reload or not.
319
320=cut
321
322sub post_init(&) {
323 push @POST_INIT, shift;
324}
247 325
248=item cf::lock_wait $string 326=item cf::lock_wait $string
249 327
250Wait until the given lock is available. See cf::lock_acquire. 328Wait until the given lock is available. See cf::lock_acquire.
251 329
… …
254Wait until the given lock is available and then acquires it and returns 332Wait until the given lock is available and then acquires it and returns
255a Coro::guard object. If the guard object gets destroyed (goes out of scope, 333a Coro::guard object. If the guard object gets destroyed (goes out of scope,
256for example when the coroutine gets canceled), the lock is automatically 334for example when the coroutine gets canceled), the lock is automatically
257returned. 335returned.
258 336
337Locks are *not* recursive, locking from the same coro twice results in a
338deadlocked coro.
339
259Lock names should begin with a unique identifier (for example, cf::map::find 340Lock names should begin with a unique identifier (for example, cf::map::find
260uses map_find and cf::map::load uses map_load). 341uses map_find and cf::map::load uses map_load).
261 342
262=item $locked = cf::lock_active $string 343=item $locked = cf::lock_active $string
263 344
264Return true if the lock is currently active, i.e. somebody has locked it. 345Return true if the lock is currently active, i.e. somebody has locked it.
265 346
266=cut 347=cut
267 348
268our %LOCK; 349our %LOCK;
350our %LOCKER;#d#
269 351
270sub lock_wait($) { 352sub lock_wait($) {
271 my ($key) = @_; 353 my ($key) = @_;
272 354
355 if ($LOCKER{$key} == $Coro::current) {#d#
356 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
357 return;#d#
358 }#d#
359
273 # wait for lock, if any 360 # wait for lock, if any
274 while ($LOCK{$key}) { 361 while ($LOCK{$key}) {
362 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
275 push @{ $LOCK{$key} }, $Coro::current; 363 push @{ $LOCK{$key} }, $Coro::current;
276 Coro::schedule; 364 Coro::schedule;
277 } 365 }
278} 366}
279 367
… …
282 370
283 # wait, to be sure we are not locked 371 # wait, to be sure we are not locked
284 lock_wait $key; 372 lock_wait $key;
285 373
286 $LOCK{$key} = []; 374 $LOCK{$key} = [];
375 $LOCKER{$key} = $Coro::current;#d#
287 376
288 Coro::guard { 377 Coro::guard {
378 delete $LOCKER{$key};#d#
289 # wake up all waiters, to be on the safe side 379 # wake up all waiters, to be on the safe side
290 $_->ready for @{ delete $LOCK{$key} }; 380 $_->ready for @{ delete $LOCK{$key} };
291 } 381 }
292} 382}
293 383
… …
296 386
297 ! ! $LOCK{$key} 387 ! ! $LOCK{$key}
298} 388}
299 389
300sub freeze_mainloop { 390sub freeze_mainloop {
301 return unless $TICK_WATCHER->is_active; 391 tick_inhibit_inc;
302 392
303 my $guard = Coro::guard { 393 Coro::guard \&tick_inhibit_dec;
304 $TICK_WATCHER->start; 394}
395
396=item cf::periodic $interval, $cb
397
398Like EV::periodic, but randomly selects a starting point so that the actions
399get spread over timer.
400
401=cut
402
403sub periodic($$) {
404 my ($interval, $cb) = @_;
405
406 my $start = rand List::Util::min 180, $interval;
407
408 EV::periodic $start, $interval, 0, $cb
409}
410
411=item cf::get_slot $time[, $priority[, $name]]
412
413Allocate $time seconds of blocking CPU time at priority C<$priority>:
414This call blocks and returns only when you have at least C<$time> seconds
415of cpu time till the next tick. The slot is only valid till the next cede.
416
417The optional C<$name> can be used to identify the job to run. It might be
418used for statistical purposes and should identify the same time-class.
419
420Useful for short background jobs.
421
422=cut
423
424our @SLOT_QUEUE;
425our $SLOT_QUEUE;
426
427$SLOT_QUEUE->cancel if $SLOT_QUEUE;
428$SLOT_QUEUE = Coro::async {
429 $Coro::current->desc ("timeslot manager");
430
431 my $signal = new Coro::Signal;
432
433 while () {
434 next_job:
435 my $avail = cf::till_tick;
436 if ($avail > 0.01) {
437 for (0 .. $#SLOT_QUEUE) {
438 if ($SLOT_QUEUE[$_][0] < $avail) {
439 my $job = splice @SLOT_QUEUE, $_, 1, ();
440 $job->[2]->send;
441 Coro::cede;
442 goto next_job;
443 }
444 }
445 }
446
447 if (@SLOT_QUEUE) {
448 # we do not use wait_for_tick() as it returns immediately when tick is inactive
449 push @cf::WAIT_FOR_TICK, $signal;
450 $signal->wait;
451 } else {
452 Coro::schedule;
453 }
305 }; 454 }
306 $TICK_WATCHER->stop; 455};
307 $guard 456
457sub get_slot($;$$) {
458 return if tick_inhibit || $Coro::current == $Coro::main;
459
460 my ($time, $pri, $name) = @_;
461
462 $time = $TICK * .6 if $time > $TICK * .6;
463 my $sig = new Coro::Signal;
464
465 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
466 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
467 $SLOT_QUEUE->ready;
468 $sig->wait;
308} 469}
309 470
310=item cf::async { BLOCK } 471=item cf::async { BLOCK }
311 472
312Currently the same as Coro::async_pool, meaning you cannot use 473Currently the same as Coro::async_pool, meaning you cannot use
… …
317 478
318BEGIN { *async = \&Coro::async_pool } 479BEGIN { *async = \&Coro::async_pool }
319 480
320=item cf::sync_job { BLOCK } 481=item cf::sync_job { BLOCK }
321 482
322The design of crossfire+ requires that the main coro ($Coro::main) is 483The design of Deliantra requires that the main coroutine ($Coro::main)
323always able to handle events or runnable, as crossfire+ is only partly 484is always able to handle events or runnable, as Deliantra is only
324reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 485partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
486acceptable.
325 487
326If it must be done, put the blocking parts into C<sync_job>. This will run 488If it must be done, put the blocking parts into C<sync_job>. This will run
327the given BLOCK in another coroutine while waiting for the result. The 489the given BLOCK in another coroutine while waiting for the result. The
328server will be frozen during this time, so the block should either finish 490server will be frozen during this time, so the block should either finish
329fast or be very important. 491fast or be very important.
… …
332 494
333sub sync_job(&) { 495sub sync_job(&) {
334 my ($job) = @_; 496 my ($job) = @_;
335 497
336 if ($Coro::current == $Coro::main) { 498 if ($Coro::current == $Coro::main) {
337 my $time = Event::time; 499 my $time = EV::time;
338 500
339 # this is the main coro, too bad, we have to block 501 # this is the main coro, too bad, we have to block
340 # till the operation succeeds, freezing the server :/ 502 # till the operation succeeds, freezing the server :/
341 503
342 # TODO: use suspend/resume instead 504 LOG llevError, Carp::longmess "sync job";#d#
343 # (but this is cancel-safe) 505
344 my $freeze_guard = freeze_mainloop; 506 my $freeze_guard = freeze_mainloop;
345 507
346 my $busy = 1; 508 my $busy = 1;
347 my @res; 509 my @res;
348 510
349 (async { 511 (async {
512 $Coro::current->desc ("sync job coro");
350 @res = eval { $job->() }; 513 @res = eval { $job->() };
351 warn $@ if $@; 514 warn $@ if $@;
352 undef $busy; 515 undef $busy;
353 })->prio (Coro::PRIO_MAX); 516 })->prio (Coro::PRIO_MAX);
354 517
355 while ($busy) { 518 while ($busy) {
356 Coro::cede or Event::one_event; 519 if (Coro::nready) {
520 Coro::cede_notself;
521 } else {
522 EV::loop EV::LOOP_ONESHOT;
357 } 523 }
524 }
358 525
359 $time = Event::time - $time; 526 my $time = EV::time - $time;
360 527
361 LOG llevError | logBacktrace, Carp::longmess "long sync job"
362 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
363
364 $tick_start += $time; # do not account sync jobs to server load 528 $TICK_START += $time; # do not account sync jobs to server load
365 529
366 wantarray ? @res : $res[0] 530 wantarray ? @res : $res[0]
367 } else { 531 } else {
368 # we are in another coroutine, how wonderful, everything just works 532 # we are in another coroutine, how wonderful, everything just works
369 533
… …
389 $EXT_CORO{$coro+0} = $coro; 553 $EXT_CORO{$coro+0} = $coro;
390 554
391 $coro 555 $coro
392} 556}
393 557
394sub write_runtime { 558=item fork_call { }, $args
395 my $runtime = "$LOCALDIR/runtime";
396 559
397 # first touch the runtime file to show we are still running: 560Executes the given code block with the given arguments in a seperate
398 # the fsync below can take a very very long time. 561process, returning the results. Everything must be serialisable with
562Coro::Storable. May, of course, block. Note that the executed sub may
563never block itself or use any form of event handling.
399 564
400 IO::AIO::aio_utime $runtime, undef, undef; 565=cut
401 566
402 my $guard = cf::lock_acquire "write_runtime"; 567sub fork_call(&@) {
568 my ($cb, @args) = @_;
403 569
404 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 570 # we seemingly have to make a local copy of the whole thing,
405 or return; 571 # otherwise perl prematurely frees the stuff :/
572 # TODO: investigate and fix (likely this will be rather laborious)
406 573
407 my $value = $cf::RUNTIME + 90 + 10; 574 my @res = Coro::Util::fork_eval {
408 # 10 is the runtime save interval, for a monotonic clock 575 reset_signals;
409 # 60 allows for the watchdog to kill the server. 576 &$cb
577 }, @args;
410 578
411 (aio_write $fh, 0, (length $value), $value, 0) <= 0 579 wantarray ? @res : $res[-1]
412 and return; 580}
413 581
414 # always fsync - this file is important 582=item $coin = coin_from_name $name
415 aio_fsync $fh
416 and return;
417 583
418 # touch it again to show we are up-to-date 584=cut
419 aio_utime $fh, undef, undef;
420 585
421 close $fh 586our %coin_alias = (
422 or return; 587 "silver" => "silvercoin",
588 "silvercoin" => "silvercoin",
589 "silvercoins" => "silvercoin",
590 "gold" => "goldcoin",
591 "goldcoin" => "goldcoin",
592 "goldcoins" => "goldcoin",
593 "platinum" => "platinacoin",
594 "platinumcoin" => "platinacoin",
595 "platinumcoins" => "platinacoin",
596 "platina" => "platinacoin",
597 "platinacoin" => "platinacoin",
598 "platinacoins" => "platinacoin",
599 "royalty" => "royalty",
600 "royalties" => "royalty",
601);
423 602
424 aio_rename "$runtime~", $runtime 603sub coin_from_name($) {
425 and return; 604 $coin_alias{$_[0]}
605 ? cf::arch::find $coin_alias{$_[0]}
606 : undef
607}
426 608
427 warn "runtime file written.\n";#d# 609=item $value = cf::db_get $family => $key
428 610
611Returns a single value from the environment database.
612
613=item cf::db_put $family => $key => $value
614
615Stores the given C<$value> in the family. It can currently store binary
616data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
617
618=item $db = cf::db_table "name"
619
620Create and/or open a new database table. The string must not be "db" and must be unique
621within each server.
622
623=cut
624
625sub db_table($) {
626 my ($name) = @_;
627 my $db = BDB::db_create $DB_ENV;
628
629 eval {
630 $db->set_flags (BDB::CHKSUM);
631
632 utf8::encode $name;
633 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
634 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
635 cf::cleanup "db_open(db): $!" if $!;
636 };
637 cf::cleanup "db_open(db): $@" if $@;
638
639 $db
640}
641
642our $DB;
643
644sub db_init {
645 cf::sync_job {
646 $DB ||= db_table "db";
647 };
648}
649
650sub db_get($$) {
651 my $key = "$_[0]/$_[1]";
652
653 cf::sync_job {
654 BDB::db_get $DB, undef, $key, my $data;
655
656 $! ? ()
657 : $data
429 1 658 }
659}
660
661sub db_put($$$) {
662 BDB::dbreq_pri 4;
663 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
664}
665
666=item cf::cache $id => [$paths...], $processversion => $process
667
668Generic caching function that returns the value of the resource $id,
669caching and regenerating as required.
670
671This function can block.
672
673=cut
674
675sub cache {
676 my ($id, $src, $processversion, $process) = @_;
677
678 my $meta =
679 join "\x00",
680 $processversion,
681 map {
682 aio_stat $_
683 and Carp::croak "$_: $!";
684
685 ($_, (stat _)[7,9])
686 } @$src;
687
688 my $dbmeta = db_get cache => "$id/meta";
689 if ($dbmeta ne $meta) {
690 # changed, we may need to process
691
692 my @data;
693 my $md5;
694
695 for (0 .. $#$src) {
696 0 <= aio_load $src->[$_], $data[$_]
697 or Carp::croak "$src->[$_]: $!";
698 }
699
700 # if processing is expensive, check
701 # checksum first
702 if (1) {
703 $md5 =
704 join "\x00",
705 $processversion,
706 map {
707 cf::cede_to_tick;
708 ($src->[$_], Digest::MD5::md5_hex $data[$_])
709 } 0.. $#$src;
710
711
712 my $dbmd5 = db_get cache => "$id/md5";
713 if ($dbmd5 eq $md5) {
714 db_put cache => "$id/meta", $meta;
715
716 return db_get cache => "$id/data";
717 }
718 }
719
720 my $t1 = Time::HiRes::time;
721 my $data = $process->(\@data);
722 my $t2 = Time::HiRes::time;
723
724 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
725
726 db_put cache => "$id/data", $data;
727 db_put cache => "$id/md5" , $md5;
728 db_put cache => "$id/meta", $meta;
729
730 return $data;
731 }
732
733 db_get cache => "$id/data"
430} 734}
431 735
432=item cf::datalog type => key => value, ... 736=item cf::datalog type => key => value, ...
433 737
434Log a datalog packet of the given type with the given key-value pairs. 738Log a datalog packet of the given type with the given key-value pairs.
… …
446 750
447############################################################################# 751#############################################################################
448 752
449=head2 ATTACHABLE OBJECTS 753=head2 ATTACHABLE OBJECTS
450 754
451Many objects in crossfire are so-called attachable objects. That means you can 755Many objects in deliantra are so-called attachable objects. That means you can
452attach callbacks/event handlers (a collection of which is called an "attachment") 756attach callbacks/event handlers (a collection of which is called an "attachment")
453to it. All such attachable objects support the following methods. 757to it. All such attachable objects support the following methods.
454 758
455In the following description, CLASS can be any of C<global>, C<object> 759In the following description, CLASS can be any of C<global>, C<object>
456C<player>, C<client> or C<map> (i.e. the attachable objects in 760C<player>, C<client> or C<map> (i.e. the attachable objects in
457crossfire+). 761Deliantra).
458 762
459=over 4 763=over 4
460 764
461=item $attachable->attach ($attachment, key => $value...) 765=item $attachable->attach ($attachment, key => $value...)
462 766
… …
506=item cf::CLASS::attachment $name, ... 810=item cf::CLASS::attachment $name, ...
507 811
508Register an attachment by C<$name> through which attachable objects of the 812Register an attachment by C<$name> through which attachable objects of the
509given CLASS can refer to this attachment. 813given CLASS can refer to this attachment.
510 814
511Some classes such as crossfire maps and objects can specify attachments 815Some classes such as deliantra maps and objects can specify attachments
512that are attached at load/instantiate time, thus the need for a name. 816that are attached at load/instantiate time, thus the need for a name.
513 817
514These calls expect any number of the following handler/hook descriptions: 818These calls expect any number of the following handler/hook descriptions:
515 819
516=over 4 820=over 4
… …
664 _attach $registry, $klass, @attach; 968 _attach $registry, $klass, @attach;
665 } 969 }
666 970
667 $obj->{$name} = \%arg; 971 $obj->{$name} = \%arg;
668 } else { 972 } else {
669 warn "object uses attachment '$name' that is not available, postponing.\n"; 973 warn "object uses attachment '$name' which is not available, postponing.\n";
670 } 974 }
671 975
672 $obj->{_attachment}{$name} = undef; 976 $obj->{_attachment}{$name} = undef;
673} 977}
674 978
… …
714 "; 1018 ";
715 die if $@; 1019 die if $@;
716} 1020}
717 1021
718our $override; 1022our $override;
719our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 1023our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
720 1024
721sub override { 1025sub override {
722 $override = 1; 1026 $override = 1;
723 @invoke_results = (); 1027 @INVOKE_RESULTS = (@_);
724} 1028}
725 1029
726sub do_invoke { 1030sub do_invoke {
727 my $event = shift; 1031 my $event = shift;
728 my $callbacks = shift; 1032 my $callbacks = shift;
729 1033
730 @invoke_results = (); 1034 @INVOKE_RESULTS = ();
731 1035
732 local $override; 1036 local $override;
733 1037
734 for (@$callbacks) { 1038 for (@$callbacks) {
735 eval { &{$_->[1]} }; 1039 eval { &{$_->[1]} };
… …
744 } 1048 }
745 1049
746 0 1050 0
747} 1051}
748 1052
749=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1053=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
750 1054
751=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1055=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
752 1056
753Generate an object-specific event with the given arguments. 1057Generate an object-specific event with the given arguments.
754 1058
755This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1059This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
756removed in future versions), and there is no public API to access override 1060removed in future versions), and there is no public API to access override
757results (if you must, access C<@cf::invoke_results> directly). 1061results (if you must, access C<@cf::INVOKE_RESULTS> directly).
758 1062
759=back 1063=back
760 1064
761=cut 1065=cut
762 1066
763############################################################################# 1067#############################################################################
764# object support 1068# object support
1069
1070sub _object_equal($$);
1071sub _object_equal($$) {
1072 my ($a, $b) = @_;
1073
1074 return 0 unless (ref $a) eq (ref $b);
1075
1076 if ("HASH" eq ref $a) {
1077 my @ka = keys %$a;
1078 my @kb = keys %$b;
1079
1080 return 0 if @ka != @kb;
1081
1082 for (0 .. $#ka) {
1083 return 0 unless $ka[$_] eq $kb[$_];
1084 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1085 }
1086
1087 } elsif ("ARRAY" eq ref $a) {
1088
1089 return 0 if @$a != @$b;
1090
1091 for (0 .. $#$a) {
1092 return 0 unless _object_equal $a->[$_], $b->[$_];
1093 }
1094
1095 } elsif ($a ne $b) {
1096 return 0;
1097 }
1098
1099 1
1100}
1101
1102our $SLOW_MERGES;#d#
1103sub _can_merge {
1104 my ($ob1, $ob2) = @_;
1105
1106 ++$SLOW_MERGES;#d#
1107
1108 # we do the slow way here
1109 return _object_equal $ob1, $ob2
1110}
765 1111
766sub reattach { 1112sub reattach {
767 # basically do the same as instantiate, without calling instantiate 1113 # basically do the same as instantiate, without calling instantiate
768 my ($obj) = @_; 1114 my ($obj) = @_;
769 1115
1116 # no longer needed after getting rid of delete_package?
770 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1117 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
771 1118
772 my $registry = $obj->registry; 1119 my $registry = $obj->registry;
773 1120
774 @$registry = (); 1121 @$registry = ();
775 1122
… …
790cf::attachable->attach ( 1137cf::attachable->attach (
791 prio => -1000000, 1138 prio => -1000000,
792 on_instantiate => sub { 1139 on_instantiate => sub {
793 my ($obj, $data) = @_; 1140 my ($obj, $data) = @_;
794 1141
795 $data = from_json $data; 1142 $data = decode_json $data;
796 1143
797 for (@$data) { 1144 for (@$data) {
798 my ($name, $args) = @$_; 1145 my ($name, $args) = @$_;
799 1146
800 $obj->attach ($name, %{$args || {} }); 1147 $obj->attach ($name, %{$args || {} });
… …
816sub object_freezer_save { 1163sub object_freezer_save {
817 my ($filename, $rdata, $objs) = @_; 1164 my ($filename, $rdata, $objs) = @_;
818 1165
819 sync_job { 1166 sync_job {
820 if (length $$rdata) { 1167 if (length $$rdata) {
1168 utf8::decode (my $decname = $filename);
821 warn sprintf "saving %s (%d,%d)\n", 1169 warn sprintf "saving %s (%d,%d)\n",
822 $filename, length $$rdata, scalar @$objs; 1170 $decname, length $$rdata, scalar @$objs;
823 1171
824 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
825 chmod SAVE_MODE, $fh; 1173 aio_chmod $fh, SAVE_MODE;
826 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
827 aio_fsync $fh if $cf::USE_FSYNC; 1175 aio_fsync $fh if $cf::USE_FSYNC;
828 close $fh; 1176 aio_close $fh;
829 1177
830 if (@$objs) { 1178 if (@$objs) {
831 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1179 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
832 chmod SAVE_MODE, $fh; 1180 aio_chmod $fh, SAVE_MODE;
833 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
834 aio_write $fh, 0, (length $data), $data, 0; 1182 aio_write $fh, 0, (length $data), $data, 0;
835 aio_fsync $fh if $cf::USE_FSYNC; 1183 aio_fsync $fh if $cf::USE_FSYNC;
836 close $fh; 1184 aio_close $fh;
837 aio_rename "$filename.pst~", "$filename.pst"; 1185 aio_rename "$filename.pst~", "$filename.pst";
838 } 1186 }
839 } else { 1187 } else {
840 aio_unlink "$filename.pst"; 1188 aio_unlink "$filename.pst";
841 } 1189 }
… …
846 } 1194 }
847 } else { 1195 } else {
848 aio_unlink $filename; 1196 aio_unlink $filename;
849 aio_unlink "$filename.pst"; 1197 aio_unlink "$filename.pst";
850 } 1198 }
851 } 1199 };
852} 1200}
853 1201
854sub object_freezer_as_string { 1202sub object_freezer_as_string {
855 my ($rdata, $objs) = @_; 1203 my ($rdata, $objs) = @_;
856 1204
… …
868 or return; 1216 or return;
869 1217
870 unless (aio_stat "$filename.pst") { 1218 unless (aio_stat "$filename.pst") {
871 (aio_load "$filename.pst", $av) >= 0 1219 (aio_load "$filename.pst", $av) >= 0
872 or return; 1220 or return;
1221
873 $av = eval { (Storable::thaw $av)->{objs} }; 1222 my $st = eval { Coro::Storable::thaw $av };
1223 $av = $st->{objs};
874 } 1224 }
875 1225
1226 utf8::decode (my $decname = $filename);
876 warn sprintf "loading %s (%d)\n", 1227 warn sprintf "loading %s (%d,%d)\n",
877 $filename, length $data, scalar @{$av || []};#d# 1228 $decname, length $data, scalar @{$av || []};
1229
878 return ($data, $av); 1230 ($data, $av)
879} 1231}
1232
1233=head2 COMMAND CALLBACKS
1234
1235=over 4
1236
1237=cut
880 1238
881############################################################################# 1239#############################################################################
882# command handling &c 1240# command handling &c
883 1241
884=item cf::register_command $name => \&callback($ob,$args); 1242=item cf::register_command $name => \&callback($ob,$args);
… …
897 push @{ $COMMAND{$name} }, [$caller, $cb]; 1255 push @{ $COMMAND{$name} }, [$caller, $cb];
898} 1256}
899 1257
900=item cf::register_extcmd $name => \&callback($pl,$packet); 1258=item cf::register_extcmd $name => \&callback($pl,$packet);
901 1259
902Register a callbackf ro execution when the client sends an extcmd packet. 1260Register a callback for execution when the client sends an (synchronous)
1261extcmd packet. Ext commands will be processed in the order they are
1262received by the server, like other user commands. The first argument is
1263the logged-in player. Ext commands can only be processed after a player
1264has logged in successfully.
903 1265
904If the callback returns something, it is sent back as if reply was being 1266If the callback returns something, it is sent back as if reply was being
905called. 1267called.
906 1268
1269=item cf::register_exticmd $name => \&callback($ns,$packet);
1270
1271Register a callback for execution when the client sends an (asynchronous)
1272exticmd packet. Exti commands are processed by the server as soon as they
1273are received, i.e. out of order w.r.t. other commands. The first argument
1274is a client socket. Exti commands can be received anytime, even before
1275log-in.
1276
1277If the callback returns something, it is sent back as if reply was being
1278called.
1279
907=cut 1280=cut
908 1281
909sub register_extcmd { 1282sub register_extcmd {
910 my ($name, $cb) = @_; 1283 my ($name, $cb) = @_;
911 1284
912 $EXTCMD{$name} = $cb; 1285 $EXTCMD{$name} = $cb;
1286}
1287
1288sub register_exticmd {
1289 my ($name, $cb) = @_;
1290
1291 $EXTICMD{$name} = $cb;
913} 1292}
914 1293
915cf::player->attach ( 1294cf::player->attach (
916 on_command => sub { 1295 on_command => sub {
917 my ($pl, $name, $params) = @_; 1296 my ($pl, $name, $params) = @_;
… …
926 cf::override; 1305 cf::override;
927 }, 1306 },
928 on_extcmd => sub { 1307 on_extcmd => sub {
929 my ($pl, $buf) = @_; 1308 my ($pl, $buf) = @_;
930 1309
931 my $msg = eval { from_json $buf }; 1310 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
932 1311
933 if (ref $msg) { 1312 if (ref $msg) {
1313 my ($type, $reply, @payload) =
1314 "ARRAY" eq ref $msg
1315 ? @$msg
1316 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1317
1318 my @reply;
1319
934 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1320 if (my $cb = $EXTCMD{$type}) {
935 if (my %reply = $cb->($pl, $msg)) { 1321 @reply = $cb->($pl, @payload);
936 $pl->ext_reply ($msg->{msgid}, %reply);
937 }
938 } 1322 }
1323
1324 $pl->ext_reply ($reply, @reply)
1325 if $reply;
1326
939 } else { 1327 } else {
940 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1328 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
941 } 1329 }
942 1330
943 cf::override; 1331 cf::override;
944 }, 1332 },
945); 1333);
946 1334
947sub load_extension {
948 my ($path) = @_;
949
950 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
951 my $base = $1;
952 my $pkg = $1;
953 $pkg =~ s/[^[:word:]]/_/g;
954 $pkg = "ext::$pkg";
955
956 warn "... loading '$path' into '$pkg'\n";
957
958 open my $fh, "<:utf8", $path
959 or die "$path: $!";
960
961 my $source =
962 "package $pkg; use strict; use utf8;\n"
963 . "#line 1 \"$path\"\n{\n"
964 . (do { local $/; <$fh> })
965 . "\n};\n1";
966
967 unless (eval $source) {
968 my $msg = $@ ? "$path: $@\n"
969 : "extension disabled.\n";
970 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
971 warn $@;
972 warn "mandatory extension failed to load, exiting.\n";
973 exit 1;
974 }
975 die $@;
976 }
977
978 push @EXTS, $pkg;
979}
980
981sub load_extensions { 1335sub load_extensions {
1336 cf::sync_job {
1337 my %todo;
1338
982 for my $ext (<$LIBDIR/*.ext>) { 1339 for my $path (<$LIBDIR/*.ext>) {
983 next unless -r $ext; 1340 next unless -r $path;
984 eval { 1341
985 load_extension $ext; 1342 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1343 my $base = $1;
1344 my $pkg = $1;
1345 $pkg =~ s/[^[:word:]]/_/g;
1346 $pkg = "ext::$pkg";
1347
1348 open my $fh, "<:utf8", $path
1349 or die "$path: $!";
1350
1351 my $source = do { local $/; <$fh> };
1352
1353 my %ext = (
1354 path => $path,
1355 base => $base,
1356 pkg => $pkg,
1357 );
1358
1359 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1360 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1361
1362 $ext{source} =
1363 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1364 . "#line 1 \"$path\"\n{\n"
1365 . $source
1366 . "\n};\n1";
1367
1368 $todo{$base} = \%ext;
1369 }
1370
1371 my %done;
1372 while (%todo) {
1373 my $progress;
1374
1375 while (my ($k, $v) = each %todo) {
1376 for (split /,\s*/, $v->{meta}{depends}) {
1377 goto skip
1378 unless exists $done{$_};
1379 }
1380
1381 warn "... loading '$k' into '$v->{pkg}'\n";
1382
1383 unless (eval $v->{source}) {
1384 my $msg = $@ ? "$v->{path}: $@\n"
1385 : "$v->{base}: extension inactive.\n";
1386
1387 if (exists $v->{meta}{mandatory}) {
1388 warn $msg;
1389 cf::cleanup "mandatory extension failed to load, exiting.";
1390 }
1391
1392 warn $msg;
1393 }
1394
1395 $done{$k} = delete $todo{$k};
1396 push @EXTS, $v->{pkg};
1397 $progress = 1;
986 1 1398 }
987 } or warn "$ext not loaded: $@"; 1399
1400 skip:
1401 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1402 unless $progress;
1403 }
988 } 1404 };
989} 1405}
990 1406
991############################################################################# 1407#############################################################################
992 1408
1409=back
1410
993=head2 CORE EXTENSIONS 1411=head2 CORE EXTENSIONS
994 1412
995Functions and methods that extend core crossfire objects. 1413Functions and methods that extend core deliantra objects.
996 1414
997=cut 1415=cut
998 1416
999package cf::player; 1417package cf::player;
1000 1418
1001use Coro::AIO; 1419use Coro::AIO;
1002 1420
1003=head3 cf::player 1421=head3 cf::player
1004 1422
1005=over 4 1423=over 4
1424
1425=item cf::player::num_playing
1426
1427Returns the official number of playing players, as per the Crossfire metaserver rules.
1428
1429=cut
1430
1431sub num_playing {
1432 scalar grep
1433 $_->ob->map
1434 && !$_->hidden
1435 && !$_->ob->flag (cf::FLAG_WIZ),
1436 cf::player::list
1437}
1006 1438
1007=item cf::player::find $login 1439=item cf::player::find $login
1008 1440
1009Returns the given player object, loading it if necessary (might block). 1441Returns the given player object, loading it if necessary (might block).
1010 1442
… …
1029 1461
1030sub exists($) { 1462sub exists($) {
1031 my ($login) = @_; 1463 my ($login) = @_;
1032 1464
1033 $cf::PLAYER{$login} 1465 $cf::PLAYER{$login}
1034 or cf::sync_job { !aio_stat path $login } 1466 or !aio_stat path $login
1035} 1467}
1036 1468
1037sub find($) { 1469sub find($) {
1038 return $cf::PLAYER{$_[0]} || do { 1470 return $cf::PLAYER{$_[0]} || do {
1039 my $login = $_[0]; 1471 my $login = $_[0];
… …
1046 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1478 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1047 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1479 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1048 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1480 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1049 aio_unlink +(playerdir $login) . "/$login.pl"; 1481 aio_unlink +(playerdir $login) . "/$login.pl";
1050 1482
1051 my $pl = load_pl path $login 1483 my $f = new_from_file cf::object::thawer path $login
1052 or return; 1484 or return;
1485
1486 my $pl = cf::player::load_pl $f
1487 or return;
1488
1489 local $cf::PLAYER_LOADING{$login} = $pl;
1490 $f->resolve_delayed_derefs;
1053 $cf::PLAYER{$login} = $pl 1491 $cf::PLAYER{$login} = $pl
1054 } 1492 }
1055 } 1493 }
1056} 1494}
1057 1495
… …
1066 return if $pl->{deny_save}; 1504 return if $pl->{deny_save};
1067 1505
1068 aio_mkdir playerdir $pl, 0770; 1506 aio_mkdir playerdir $pl, 0770;
1069 $pl->{last_save} = $cf::RUNTIME; 1507 $pl->{last_save} = $cf::RUNTIME;
1070 1508
1509 cf::get_slot 0.01;
1510
1071 $pl->save_pl ($path); 1511 $pl->save_pl ($path);
1072 Coro::cede; 1512 cf::cede_to_tick;
1073} 1513}
1074 1514
1075sub new($) { 1515sub new($) {
1076 my ($login) = @_; 1516 my ($login) = @_;
1077 1517
… …
1083 $cf::PLAYER{$login} = $self; 1523 $cf::PLAYER{$login} = $self;
1084 1524
1085 $self 1525 $self
1086} 1526}
1087 1527
1528=item $player->send_msg ($channel, $msg, $color, [extra...])
1529
1530=cut
1531
1532sub send_msg {
1533 my $ns = shift->ns
1534 or return;
1535 $ns->send_msg (@_);
1536}
1537
1088=item $pl->quit_character 1538=item $pl->quit_character
1089 1539
1090Nukes the player without looking back. If logged in, the connection will 1540Nukes the player without looking back. If logged in, the connection will
1091be destroyed. May block for a long time. 1541be destroyed. May block for a long time.
1092 1542
… …
1096 my ($pl) = @_; 1546 my ($pl) = @_;
1097 1547
1098 my $name = $pl->ob->name; 1548 my $name = $pl->ob->name;
1099 1549
1100 $pl->{deny_save} = 1; 1550 $pl->{deny_save} = 1;
1101 $pl->password ("*"); # this should lock out the player until we nuked the dir 1551 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1102 1552
1103 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1553 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1104 $pl->deactivate; 1554 $pl->deactivate;
1555 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1556 $pl->ob->check_score;
1105 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1557 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1106 $pl->ns->destroy if $pl->ns; 1558 $pl->ns->destroy if $pl->ns;
1107 1559
1108 my $path = playerdir $pl; 1560 my $path = playerdir $pl;
1109 my $temp = "$path~$cf::RUNTIME~deleting~"; 1561 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1145 or return []; 1597 or return [];
1146 1598
1147 my @logins; 1599 my @logins;
1148 1600
1149 for my $login (@$dirs) { 1601 for my $login (@$dirs) {
1602 my $path = path $login;
1603
1604 # a .pst is a dead give-away for a valid player
1605 # if no pst file found, open and chekc for blocked users
1606 if (aio_stat "$path.pst") {
1150 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1607 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1151 aio_read $fh, 0, 512, my $buf, 0 or next; 1608 aio_read $fh, 0, 512, my $buf, 0 or next;
1152 $buf !~ /^password -------------$/m or next; # official not-valid tag 1609 $buf !~ /^password -------------$/m or next; # official not-valid tag
1610 }
1153 1611
1154 utf8::decode $login; 1612 utf8::decode $login;
1155 push @logins, $login; 1613 push @logins, $login;
1156 } 1614 }
1157 1615
… …
1184 } 1642 }
1185 1643
1186 \@paths 1644 \@paths
1187} 1645}
1188 1646
1647=item $protocol_xml = $player->expand_cfpod ($cfpod)
1648
1649Expand deliantra pod fragments into protocol xml.
1650
1189=item $player->ext_reply ($msgid, %msg) 1651=item $player->ext_reply ($msgid, @msg)
1190 1652
1191Sends an ext reply to the player. 1653Sends an ext reply to the player.
1192 1654
1193=cut 1655=cut
1194 1656
1195sub ext_reply($$%) { 1657sub ext_reply($$@) {
1196 my ($self, $id, %msg) = @_; 1658 my ($self, $id, @msg) = @_;
1197 1659
1198 $msg{msgid} = $id; 1660 $self->ns->ext_reply ($id, @msg)
1199
1200 $self->send ("ext " . cf::to_json \%msg);
1201} 1661}
1202 1662
1203=item $player->ext_event ($type, %msg) 1663=item $player->ext_msg ($type, @msg)
1204 1664
1205Sends an ext event to the client. 1665Sends an ext event to the client.
1206 1666
1207=cut 1667=cut
1208 1668
1209sub ext_event($$%) { 1669sub ext_msg($$@) {
1210 my ($self, $type, %msg) = @_; 1670 my ($self, $type, @msg) = @_;
1211 1671
1212 $self->ns->ext_event ($type, %msg); 1672 $self->ns->ext_msg ($type, @msg);
1213} 1673}
1214 1674
1215=head3 cf::region 1675=head3 cf::region
1216 1676
1217=over 4 1677=over 4
… …
1220 1680
1221package cf::region; 1681package cf::region;
1222 1682
1223=item cf::region::find_by_path $path 1683=item cf::region::find_by_path $path
1224 1684
1225Tries to decuce the probable region for a map knowing only its path. 1685Tries to decuce the likely region for a map knowing only its path.
1226 1686
1227=cut 1687=cut
1228 1688
1229sub find_by_path($) { 1689sub find_by_path($) {
1230 my ($path) = @_; 1690 my ($path) = @_;
1231 1691
1232 my ($match, $specificity); 1692 my ($match, $specificity);
1233 1693
1234 for my $region (list) { 1694 for my $region (list) {
1235 if ($region->match && $path =~ $region->match) { 1695 if ($region->{match} && $path =~ $region->{match}) {
1236 ($match, $specificity) = ($region, $region->specificity) 1696 ($match, $specificity) = ($region, $region->specificity)
1237 if $region->specificity > $specificity; 1697 if $region->specificity > $specificity;
1238 } 1698 }
1239 } 1699 }
1240 1700
… …
1261our $MAX_RESET = 3600; 1721our $MAX_RESET = 3600;
1262our $DEFAULT_RESET = 3000; 1722our $DEFAULT_RESET = 3000;
1263 1723
1264sub generate_random_map { 1724sub generate_random_map {
1265 my ($self, $rmp) = @_; 1725 my ($self, $rmp) = @_;
1726
1727 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1728
1266 # mit "rum" bekleckern, nicht 1729 # mit "rum" bekleckern, nicht
1267 $self->_create_random_map ( 1730 $self->_create_random_map (
1268 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1269 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1270 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1304 my ($self, $merge) = @_; 1767 my ($self, $merge) = @_;
1305 1768
1306 # we have to keep some variables in memory intact 1769 # we have to keep some variables in memory intact
1307 local $self->{path}; 1770 local $self->{path};
1308 local $self->{load_path}; 1771 local $self->{load_path};
1309 local $self->{deny_save};
1310 local $self->{deny_reset};
1311 1772
1312 $self->SUPER::thawer_merge ($merge); 1773 $self->SUPER::thawer_merge ($merge);
1313} 1774}
1314 1775
1315sub normalise { 1776sub normalise {
… …
1362 $self->init; # pass $1 etc. 1823 $self->init; # pass $1 etc.
1363 return $self; 1824 return $self;
1364 } 1825 }
1365 } 1826 }
1366 1827
1367 Carp::carp "unable to resolve path '$path' (base '$base')."; 1828 Carp::cluck "unable to resolve path '$path' (base '$base').";
1368 () 1829 ()
1369} 1830}
1370 1831
1371sub init { 1832sub init {
1372 my ($self) = @_; 1833 my ($self) = @_;
… …
1394 1855
1395# the temporary/swap location 1856# the temporary/swap location
1396sub save_path { 1857sub save_path {
1397 my ($self) = @_; 1858 my ($self) = @_;
1398 1859
1399 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1860 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1400 "$TMPDIR/$path.map" 1861 "$TMPDIR/$path.map"
1401} 1862}
1402 1863
1403# the unique path, undef == no special unique path 1864# the unique path, undef == no special unique path
1404sub uniq_path { 1865sub uniq_path {
1405 my ($self) = @_; 1866 my ($self) = @_;
1406 1867
1407 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1408 "$UNIQUEDIR/$path" 1869 "$UNIQUEDIR/$path"
1409} 1870}
1410 1871
1411# and all this just because we cannot iterate over 1872# and all this just because we cannot iterate over
1412# all maps in C++... 1873# all maps in C++...
… …
1415 1876
1416 $_->change_map_light ($change) 1877 $_->change_map_light ($change)
1417 for grep $_->outdoor, values %cf::MAP; 1878 for grep $_->outdoor, values %cf::MAP;
1418} 1879}
1419 1880
1881sub decay_objects {
1882 my ($self) = @_;
1883
1884 return if $self->{deny_reset};
1885
1886 $self->do_decay_objects;
1887}
1888
1420sub unlink_save { 1889sub unlink_save {
1421 my ($self) = @_; 1890 my ($self) = @_;
1422 1891
1423 utf8::encode (my $save = $self->save_path); 1892 utf8::encode (my $save = $self->save_path);
1424 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1893 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
… …
1427 1896
1428sub load_header_from($) { 1897sub load_header_from($) {
1429 my ($self, $path) = @_; 1898 my ($self, $path) = @_;
1430 1899
1431 utf8::encode $path; 1900 utf8::encode $path;
1432 #aio_open $path, O_RDONLY, 0 1901 my $f = new_from_file cf::object::thawer $path
1433 # or return;
1434
1435 $self->_load_header ($path)
1436 or return; 1902 or return;
1903
1904 $self->_load_header ($f)
1905 or return;
1906
1907 local $MAP_LOADING{$self->{path}} = $self;
1908 $f->resolve_delayed_derefs;
1437 1909
1438 $self->{load_path} = $path; 1910 $self->{load_path} = $path;
1439 1911
1440 1 1912 1
1441} 1913}
… …
1480 $self->load_header_orig 1952 $self->load_header_orig
1481 or return; 1953 or return;
1482 $self->prepare_orig; 1954 $self->prepare_orig;
1483 } 1955 }
1484 1956
1957 $self->{deny_reset} = 1
1958 if $self->no_reset;
1959
1485 $self->default_region (cf::region::find_by_path $self->{path}) 1960 $self->default_region (cf::region::find_by_path $self->{path})
1486 unless $self->default_region; 1961 unless $self->default_region;
1487 1962
1488 1 1963 1
1489} 1964}
… …
1492sub find { 1967sub find {
1493 my ($path, $origin) = @_; 1968 my ($path, $origin) = @_;
1494 1969
1495 $path = normalise $path, $origin && $origin->path; 1970 $path = normalise $path, $origin && $origin->path;
1496 1971
1972 cf::lock_wait "map_data:$path";#d#remove
1497 cf::lock_wait "map_find:$path"; 1973 cf::lock_wait "map_find:$path";
1498 1974
1499 $cf::MAP{$path} || do { 1975 $cf::MAP{$path} || do {
1976 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1500 my $guard = cf::lock_acquire "map_find:$path"; 1977 my $guard2 = cf::lock_acquire "map_find:$path";
1978
1501 my $map = new_from_path cf::map $path 1979 my $map = new_from_path cf::map $path
1502 or return; 1980 or return;
1503 1981
1504 $map->{last_save} = $cf::RUNTIME; 1982 $map->{last_save} = $cf::RUNTIME;
1505 1983
1506 $map->load_header 1984 $map->load_header
1507 or return; 1985 or return;
1508 1986
1509 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1987 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1510 # doing this can freeze the server in a sync job, obviously 1988 # doing this can freeze the server in a sync job, obviously
1511 #$cf::WAIT_FOR_TICK->wait; 1989 #$cf::WAIT_FOR_TICK->wait;
1990 undef $guard2;
1991 undef $guard1;
1512 $map->reset; 1992 $map->reset;
1513 undef $guard;
1514 return find $path; 1993 return find $path;
1515 } 1994 }
1516 1995
1517 $cf::MAP{$path} = $map 1996 $cf::MAP{$path} = $map
1518 } 1997 }
… …
1527 local $self->{deny_reset} = 1; # loading can take a long time 2006 local $self->{deny_reset} = 1; # loading can take a long time
1528 2007
1529 my $path = $self->{path}; 2008 my $path = $self->{path};
1530 2009
1531 { 2010 {
1532 my $guard = cf::lock_acquire "map_load:$path"; 2011 my $guard = cf::lock_acquire "map_data:$path";
1533 2012
2013 return unless $self->valid;
1534 return if $self->in_memory != cf::MAP_SWAPPED; 2014 return unless $self->in_memory == cf::MAP_SWAPPED;
1535 2015
1536 $self->in_memory (cf::MAP_LOADING); 2016 $self->in_memory (cf::MAP_LOADING);
1537 2017
1538 $self->alloc; 2018 $self->alloc;
1539 2019
1540 $self->pre_load; 2020 $self->pre_load;
1541 Coro::cede; 2021 cf::cede_to_tick;
1542 2022
2023 my $f = new_from_file cf::object::thawer $self->{load_path};
2024 $f->skip_block;
1543 $self->_load_objects ($self->{load_path}, 1) 2025 $self->_load_objects ($f)
1544 or return; 2026 or return;
1545 2027
1546 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2028 $self->post_load_original
1547 if delete $self->{load_original}; 2029 if delete $self->{load_original};
1548 2030
1549 if (my $uniq = $self->uniq_path) { 2031 if (my $uniq = $self->uniq_path) {
1550 utf8::encode $uniq; 2032 utf8::encode $uniq;
1551 if (aio_open $uniq, O_RDONLY, 0) { 2033 unless (aio_stat $uniq) {
2034 if (my $f = new_from_file cf::object::thawer $uniq) {
1552 $self->clear_unique_items; 2035 $self->clear_unique_items;
1553 $self->_load_objects ($uniq, 0); 2036 $self->_load_objects ($f);
2037 $f->resolve_delayed_derefs;
2038 }
1554 } 2039 }
1555 } 2040 }
1556 2041
1557 Coro::cede; 2042 $f->resolve_delayed_derefs;
2043
2044 cf::cede_to_tick;
1558 # now do the right thing for maps 2045 # now do the right thing for maps
1559 $self->link_multipart_objects; 2046 $self->link_multipart_objects;
1560 $self->difficulty ($self->estimate_difficulty) 2047 $self->difficulty ($self->estimate_difficulty)
1561 unless $self->difficulty; 2048 unless $self->difficulty;
1562 Coro::cede; 2049 cf::cede_to_tick;
1563 2050
1564 unless ($self->{deny_activate}) { 2051 unless ($self->{deny_activate}) {
1565 $self->decay_objects; 2052 $self->decay_objects;
1566 $self->fix_auto_apply; 2053 $self->fix_auto_apply;
1567 $self->update_buttons; 2054 $self->update_buttons;
1568 Coro::cede; 2055 cf::cede_to_tick;
1569 $self->set_darkness_map; 2056 $self->set_darkness_map;
1570 Coro::cede; 2057 cf::cede_to_tick;
1571 $self->activate; 2058 $self->activate;
1572 } 2059 }
1573 2060
2061 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME);
2063
1574 $self->in_memory (cf::MAP_IN_MEMORY); 2064 $self->in_memory (cf::MAP_ACTIVE);
1575 } 2065 }
1576 2066
1577 $self->post_load; 2067 $self->post_load;
1578} 2068}
1579 2069
… …
1581 my ($self, $ob) = @_; 2071 my ($self, $ob) = @_;
1582 2072
1583 return find "~" . $ob->name . "/" . $self->{path} 2073 return find "~" . $ob->name . "/" . $self->{path}
1584 if $self->per_player; 2074 if $self->per_player;
1585 2075
2076# return find "?party/" . $ob->name . "/" . $self->{path}
2077# if $self->per_party;
2078
1586 $self 2079 $self
1587} 2080}
1588 2081
1589# find and load all maps in the 3x3 area around a map 2082# find and load all maps in the 3x3 area around a map
1590sub load_diag { 2083sub load_neighbours {
1591 my ($map) = @_; 2084 my ($map) = @_;
1592 2085
1593 my @diag; # diagonal neighbours 2086 my @neigh; # diagonal neighbours
1594 2087
1595 for (0 .. 3) { 2088 for (0 .. 3) {
1596 my $neigh = $map->tile_path ($_) 2089 my $neigh = $map->tile_path ($_)
1597 or next; 2090 or next;
1598 $neigh = find $neigh, $map 2091 $neigh = find $neigh, $map
1599 or next; 2092 or next;
1600 $neigh->load; 2093 $neigh->load;
1601 2094
2095 push @neigh,
1602 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2096 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1603 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2097 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1604 } 2098 }
1605 2099
1606 for (@diag) { 2100 for (grep defined $_->[0], @neigh) {
2101 my ($path, $origin) = @$_;
1607 my $neigh = find @$_ 2102 my $neigh = find $path, $origin
1608 or next; 2103 or next;
1609 $neigh->load; 2104 $neigh->load;
1610 } 2105 }
1611} 2106}
1612 2107
… …
1617} 2112}
1618 2113
1619sub do_load_sync { 2114sub do_load_sync {
1620 my ($map) = @_; 2115 my ($map) = @_;
1621 2116
2117 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2118 if $Coro::current == $Coro::main;
2119
1622 cf::sync_job { $map->load }; 2120 cf::sync_job { $map->load };
1623} 2121}
1624 2122
1625our %MAP_PREFETCH; 2123our %MAP_PREFETCH;
1626our $MAP_PREFETCHER = undef; 2124our $MAP_PREFETCHER = undef;
1627 2125
1628sub find_async { 2126sub find_async {
1629 my ($path, $origin) = @_; 2127 my ($path, $origin, $load) = @_;
1630 2128
1631 $path = normalise $path, $origin && $origin->{path}; 2129 $path = normalise $path, $origin && $origin->{path};
1632 2130
1633 if (my $map = $cf::MAP{$path}) { 2131 if (my $map = $cf::MAP{$path}) {
1634 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2132 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1635 } 2133 }
1636 2134
1637 undef $MAP_PREFETCH{$path}; 2135 $MAP_PREFETCH{$path} |= $load;
2136
1638 $MAP_PREFETCHER ||= cf::async { 2137 $MAP_PREFETCHER ||= cf::async {
2138 $Coro::current->{desc} = "map prefetcher";
2139
1639 while (%MAP_PREFETCH) { 2140 while (%MAP_PREFETCH) {
1640 for my $path (keys %MAP_PREFETCH) { 2141 while (my ($k, $v) = each %MAP_PREFETCH) {
1641 my $map = find $path 2142 if (my $map = find $k) {
1642 or next;
1643 $map->load; 2143 $map->load if $v;
2144 }
1644 2145
1645 delete $MAP_PREFETCH{$path}; 2146 delete $MAP_PREFETCH{$k};
1646 } 2147 }
1647 } 2148 }
1648 undef $MAP_PREFETCHER; 2149 undef $MAP_PREFETCHER;
1649 }; 2150 };
1650 $MAP_PREFETCHER->prio (6); 2151 $MAP_PREFETCHER->prio (6);
… …
1653} 2154}
1654 2155
1655sub save { 2156sub save {
1656 my ($self) = @_; 2157 my ($self) = @_;
1657 2158
1658 my $lock = cf::lock_acquire "map_data:" . $self->path; 2159 my $lock = cf::lock_acquire "map_data:$self->{path}";
1659 2160
1660 $self->{last_save} = $cf::RUNTIME; 2161 $self->{last_save} = $cf::RUNTIME;
1661 2162
1662 return unless $self->dirty; 2163 return unless $self->dirty;
1663 2164
… …
1669 return if $self->{deny_save}; 2170 return if $self->{deny_save};
1670 2171
1671 local $self->{last_access} = $self->last_access;#d# 2172 local $self->{last_access} = $self->last_access;#d#
1672 2173
1673 cf::async { 2174 cf::async {
2175 $Coro::current->{desc} = "map player save";
1674 $_->contr->save for $self->players; 2176 $_->contr->save for $self->players;
1675 }; 2177 };
2178
2179 cf::get_slot 0.02;
1676 2180
1677 if ($uniq) { 2181 if ($uniq) {
1678 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2182 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1679 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2183 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1680 } else { 2184 } else {
… …
1686 my ($self) = @_; 2190 my ($self) = @_;
1687 2191
1688 # save first because save cedes 2192 # save first because save cedes
1689 $self->save; 2193 $self->save;
1690 2194
1691 my $lock = cf::lock_acquire "map_data:" . $self->path; 2195 my $lock = cf::lock_acquire "map_data:$self->{path}";
1692 2196
1693 return if $self->players; 2197 return if $self->players;
1694 return if $self->in_memory != cf::MAP_IN_MEMORY; 2198 return if $self->in_memory != cf::MAP_ACTIVE;
1695 return if $self->{deny_save}; 2199 return if $self->{deny_save};
1696 2200
2201 $self->in_memory (cf::MAP_SWAPPED);
2202
2203 $self->deactivate;
2204 $_->clear_links_to ($self) for values %cf::MAP;
1697 $self->clear; 2205 $self->clear;
1698 $self->in_memory (cf::MAP_SWAPPED);
1699} 2206}
1700 2207
1701sub reset_at { 2208sub reset_at {
1702 my ($self) = @_; 2209 my ($self) = @_;
1703 2210
1704 # TODO: safety, remove and allow resettable per-player maps 2211 # TODO: safety, remove and allow resettable per-player maps
1705 return 1e99 if $self->isa ("ext::map_per_player");#d#
1706 return 1e99 if $self->{deny_reset}; 2212 return 1e99 if $self->{deny_reset};
1707 2213
1708 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2214 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1709 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2215 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1710 2216
… …
1721 my ($self) = @_; 2227 my ($self) = @_;
1722 2228
1723 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2229 my $lock = cf::lock_acquire "map_data:$self->{path}";
1724 2230
1725 return if $self->players; 2231 return if $self->players;
1726 return if $self->isa ("ext::map_per_player");#d#
1727 2232
1728 warn "resetting map ", $self->path;#d# 2233 warn "resetting map ", $self->path;
1729 2234
1730 $self->in_memory (cf::MAP_SWAPPED); 2235 $self->in_memory (cf::MAP_SWAPPED);
1731 2236
1732 # need to save uniques path 2237 # need to save uniques path
1733 unless ($self->{deny_save}) { 2238 unless ($self->{deny_save}) {
… …
1737 if $uniq; 2242 if $uniq;
1738 } 2243 }
1739 2244
1740 delete $cf::MAP{$self->path}; 2245 delete $cf::MAP{$self->path};
1741 2246
2247 $self->deactivate;
2248 $_->clear_links_to ($self) for values %cf::MAP;
1742 $self->clear; 2249 $self->clear;
1743
1744 $_->clear_links_to ($self) for values %cf::MAP;
1745 2250
1746 $self->unlink_save; 2251 $self->unlink_save;
1747 $self->destroy; 2252 $self->destroy;
1748} 2253}
1749 2254
1750my $nuke_counter = "aaaa"; 2255my $nuke_counter = "aaaa";
1751 2256
1752sub nuke { 2257sub nuke {
1753 my ($self) = @_; 2258 my ($self) = @_;
1754 2259
2260 {
2261 my $lock = cf::lock_acquire "map_data:$self->{path}";
2262
1755 delete $cf::MAP{$self->path}; 2263 delete $cf::MAP{$self->path};
1756 2264
1757 $self->unlink_save; 2265 $self->unlink_save;
1758 2266
1759 bless $self, "cf::map"; 2267 bless $self, "cf::map";
1760 delete $self->{deny_reset}; 2268 delete $self->{deny_reset};
1761 $self->{deny_save} = 1; 2269 $self->{deny_save} = 1;
1762 $self->reset_timeout (1); 2270 $self->reset_timeout (1);
1763 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2271 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1764 2272
1765 $cf::MAP{$self->path} = $self; 2273 $cf::MAP{$self->path} = $self;
2274 }
1766 2275
1767 $self->reset; # polite request, might not happen 2276 $self->reset; # polite request, might not happen
2277}
2278
2279=item $maps = cf::map::tmp_maps
2280
2281Returns an arrayref with all map paths of currently instantiated and saved
2282maps. May block.
2283
2284=cut
2285
2286sub tmp_maps() {
2287 [
2288 map {
2289 utf8::decode $_;
2290 /\.map$/
2291 ? normalise $_
2292 : ()
2293 } @{ aio_readdir $TMPDIR or [] }
2294 ]
2295}
2296
2297=item $maps = cf::map::random_maps
2298
2299Returns an arrayref with all map paths of currently instantiated and saved
2300random maps. May block.
2301
2302=cut
2303
2304sub random_maps() {
2305 [
2306 map {
2307 utf8::decode $_;
2308 /\.map$/
2309 ? normalise "?random/$_"
2310 : ()
2311 } @{ aio_readdir $RANDOMDIR or [] }
2312 ]
1768} 2313}
1769 2314
1770=item cf::map::unique_maps 2315=item cf::map::unique_maps
1771 2316
1772Returns an arrayref of paths of all shared maps that have 2317Returns an arrayref of paths of all shared maps that have
1773instantiated unique items. May block. 2318instantiated unique items. May block.
1774 2319
1775=cut 2320=cut
1776 2321
1777sub unique_maps() { 2322sub unique_maps() {
1778 my $files = aio_readdir $UNIQUEDIR 2323 [
1779 or return; 2324 map {
1780
1781 my @paths;
1782
1783 for (@$files) {
1784 utf8::decode $_; 2325 utf8::decode $_;
1785 next if /\.pst$/; 2326 s/\.map$//; # TODO future compatibility hack
1786 next unless /^$PATH_SEP/o; 2327 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
1787 2328 ? ()
1788 push @paths, cf::map::normalise $_; 2329 : normalise $_
2330 } @{ aio_readdir $UNIQUEDIR or [] }
1789 } 2331 ]
1790
1791 \@paths
1792} 2332}
1793
1794package cf;
1795 2333
1796=back 2334=back
1797 2335
1798=head3 cf::object 2336=head3 cf::object
1799 2337
… …
1803 2341
1804=over 4 2342=over 4
1805 2343
1806=item $ob->inv_recursive 2344=item $ob->inv_recursive
1807 2345
1808Returns the inventory of the object _and_ their inventories, recursively. 2346Returns the inventory of the object I<and> their inventories, recursively,
2347but I<not> the object itself.
1809 2348
1810=cut 2349=cut
1811 2350
1812sub inv_recursive_; 2351sub inv_recursive_;
1813sub inv_recursive_ { 2352sub inv_recursive_ {
… …
1816 2355
1817sub inv_recursive { 2356sub inv_recursive {
1818 inv_recursive_ inv $_[0] 2357 inv_recursive_ inv $_[0]
1819} 2358}
1820 2359
2360=item $ref = $ob->ref
2361
2362Creates and returns a persistent reference to an object that can be stored as a string.
2363
2364=item $ob = cf::object::deref ($refstring)
2365
2366returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2367even if the object actually exists. May block.
2368
2369=cut
2370
2371sub deref {
2372 my ($ref) = @_;
2373
2374 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2375 my ($uuid, $name) = ($1, $2);
2376 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2377 or return;
2378 $pl->ob->uuid eq $uuid
2379 or return;
2380
2381 $pl->ob
2382 } else {
2383 warn "$ref: cannot resolve object reference\n";
2384 undef
2385 }
2386}
2387
1821package cf; 2388package cf;
1822 2389
1823=back 2390=back
1824 2391
1825=head3 cf::object::player 2392=head3 cf::object::player
… …
1831Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2398Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
1832can be C<undef>. Does the right thing when the player is currently in a 2399can be C<undef>. Does the right thing when the player is currently in a
1833dialogue with the given NPC character. 2400dialogue with the given NPC character.
1834 2401
1835=cut 2402=cut
2403
2404our $SAY_CHANNEL = {
2405 id => "say",
2406 title => "Map",
2407 reply => "say ",
2408 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2409};
2410
2411our $CHAT_CHANNEL = {
2412 id => "chat",
2413 title => "Chat",
2414 reply => "chat ",
2415 tooltip => "Player chat and shouts, global to the server.",
2416};
1836 2417
1837# rough implementation of a future "reply" method that works 2418# rough implementation of a future "reply" method that works
1838# with dialog boxes. 2419# with dialog boxes.
1839#TODO: the first argument must go, split into a $npc->reply_to ( method 2420#TODO: the first argument must go, split into a $npc->reply_to ( method
1840sub cf::object::player::reply($$$;$) { 2421sub cf::object::player::reply($$$;$) {
… …
1842 2423
1843 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2424 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1844 2425
1845 if ($self->{record_replies}) { 2426 if ($self->{record_replies}) {
1846 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2427 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2428
1847 } else { 2429 } else {
2430 my $pl = $self->contr;
2431
2432 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2433 my $dialog = $pl->{npc_dialog};
2434 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2435
2436 } else {
1848 $msg = $npc->name . " says: $msg" if $npc; 2437 $msg = $npc->name . " says: $msg" if $npc;
1849 $self->message ($msg, $flags); 2438 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2439 }
1850 } 2440 }
2441}
2442
2443=item $object->send_msg ($channel, $msg, $color, [extra...])
2444
2445=cut
2446
2447sub cf::object::send_msg {
2448 my $pl = shift->contr
2449 or return;
2450 $pl->send_msg (@_);
1851} 2451}
1852 2452
1853=item $player_object->may ("access") 2453=item $player_object->may ("access")
1854 2454
1855Returns wether the given player is authorized to access resource "access" 2455Returns wether the given player is authorized to access resource "access"
… …
1868 2468
1869=item $player_object->enter_link 2469=item $player_object->enter_link
1870 2470
1871Freezes the player and moves him/her to a special map (C<{link}>). 2471Freezes the player and moves him/her to a special map (C<{link}>).
1872 2472
1873The player should be reasonably safe there for short amounts of time. You 2473The player should be reasonably safe there for short amounts of time (e.g.
1874I<MUST> call C<leave_link> as soon as possible, though. 2474for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2475though, as the palyer cannot control the character while it is on the link
2476map.
1875 2477
1876Will never block. 2478Will never block.
1877 2479
1878=item $player_object->leave_link ($map, $x, $y) 2480=item $player_object->leave_link ($map, $x, $y)
1879 2481
… …
1934 # use -1 or undef as default coordinates, not 0, 0 2536 # use -1 or undef as default coordinates, not 0, 0
1935 ($x, $y) = ($map->enter_x, $map->enter_y) 2537 ($x, $y) = ($map->enter_x, $map->enter_y)
1936 if $x <=0 && $y <= 0; 2538 if $x <=0 && $y <= 0;
1937 2539
1938 $map->load; 2540 $map->load;
1939 $map->load_diag; 2541 $map->load_neighbours;
1940 2542
1941 return unless $self->contr->active; 2543 return unless $self->contr->active;
2544 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
1942 $self->activate_recursive; 2545 $self->activate_recursive;
1943 2546
1944 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2547 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1945 $self->enter_map ($map, $x, $y); 2548 $self->enter_map ($map, $x, $y);
1946} 2549}
1947 2550
1948=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2551=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1949 2552
1950Moves the player to the given map-path and coordinates by first freezing 2553Moves the player to the given map-path and coordinates by first freezing
1951her, loading and preparing them map, calling the provided $check callback 2554her, loading and preparing them map, calling the provided $check callback
1952that has to return the map if sucecssful, and then unfreezes the player on 2555that has to return the map if sucecssful, and then unfreezes the player on
1953the new (success) or old (failed) map position. 2556the new (success) or old (failed) map position. In either case, $done will
2557be called at the end of this process.
2558
2559Note that $check will be called with a potentially non-loaded map, so if
2560it needs a loaded map it has to call C<< ->load >>.
1954 2561
1955=cut 2562=cut
1956 2563
1957our $GOTOGEN; 2564our $GOTOGEN;
1958 2565
1959sub cf::object::player::goto { 2566sub cf::object::player::goto {
1960 my ($self, $path, $x, $y, $check) = @_; 2567 my ($self, $path, $x, $y, $check, $done) = @_;
1961 2568
1962 # do generation counting so two concurrent goto's will be executed in-order 2569 # do generation counting so two concurrent goto's will be executed in-order
1963 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2570 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1964 2571
1965 $self->enter_link; 2572 $self->enter_link;
1966 2573
1967 (async { 2574 (async {
2575 $Coro::current->{desc} = "player::goto $path $x $y";
2576
2577 # *tag paths override both path and x|y
2578 if ($path =~ /^\*(.*)$/) {
2579 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2580 my $ob = $obs[rand @obs];
2581
2582 # see if we actually can go there
2583 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2584 $ob = $obs[rand @obs];
2585 } else {
2586 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2587 }
2588 # else put us there anyways for now #d#
2589
2590 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2591 } else {
2592 ($path, $x, $y) = (undef, undef, undef);
2593 }
2594 }
2595
1968 my $map = eval { 2596 my $map = eval {
1969 my $map = cf::map::find $path; 2597 my $map = defined $path ? cf::map::find $path : undef;
1970 2598
1971 if ($map) { 2599 if ($map) {
1972 $map = $map->customise_for ($self); 2600 $map = $map->customise_for ($self);
1973 $map = $check->($map) if $check && $map; 2601 $map = $check->($map) if $check && $map;
1974 } else { 2602 } else {
1975 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2603 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
1976 } 2604 }
1977 2605
1978 $map 2606 $map
1979 }; 2607 };
1980 2608
… …
1985 2613
1986 if ($gen == $self->{_goto_generation}) { 2614 if ($gen == $self->{_goto_generation}) {
1987 delete $self->{_goto_generation}; 2615 delete $self->{_goto_generation};
1988 $self->leave_link ($map, $x, $y); 2616 $self->leave_link ($map, $x, $y);
1989 } 2617 }
2618
2619 $done->() if $done;
1990 })->prio (1); 2620 })->prio (1);
1991} 2621}
1992 2622
1993=item $player_object->enter_exit ($exit_object) 2623=item $player_object->enter_exit ($exit_object)
1994 2624
… …
2014} 2644}
2015 2645
2016sub prepare_random_map { 2646sub prepare_random_map {
2017 my ($exit) = @_; 2647 my ($exit) = @_;
2018 2648
2019 my $guard = cf::lock_acquire "exit_prepare:$exit";
2020
2021 # all this does is basically replace the /! path by 2649 # all this does is basically replace the /! path by
2022 # a new random map path (?random/...) with a seed 2650 # a new random map path (?random/...) with a seed
2023 # that depends on the exit object 2651 # that depends on the exit object
2024 2652
2025 my $rmp = parse_random_map_params $exit->msg; 2653 my $rmp = parse_random_map_params $exit->msg;
… …
2027 if ($exit->map) { 2655 if ($exit->map) {
2028 $rmp->{region} = $exit->region->name; 2656 $rmp->{region} = $exit->region->name;
2029 $rmp->{origin_map} = $exit->map->path; 2657 $rmp->{origin_map} = $exit->map->path;
2030 $rmp->{origin_x} = $exit->x; 2658 $rmp->{origin_x} = $exit->x;
2031 $rmp->{origin_y} = $exit->y; 2659 $rmp->{origin_y} = $exit->y;
2660
2661 $exit->map->touch;
2032 } 2662 }
2033 2663
2034 $rmp->{random_seed} ||= $exit->random_seed; 2664 $rmp->{random_seed} ||= $exit->random_seed;
2035 2665
2036 my $data = cf::to_json $rmp; 2666 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2037 my $md5 = Digest::MD5::md5_hex $data; 2667 my $md5 = Digest::MD5::md5_hex $data;
2038 my $meta = "$RANDOMDIR/$md5.meta"; 2668 my $meta = "$RANDOMDIR/$md5.meta";
2039 2669
2040 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2670 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2041 aio_write $fh, 0, (length $data), $data, 0; 2671 aio_write $fh, 0, (length $data), $data, 0;
2042 undef $fh; 2672 undef $fh;
2043 aio_rename "$meta~", $meta; 2673 aio_rename "$meta~", $meta;
2044 2674
2675 my $slaying = "?random/$md5";
2676
2677 if ($exit->valid) {
2045 $exit->slaying ("?random/$md5"); 2678 $exit->slaying ("?random/$md5");
2046 $exit->msg (undef); 2679 $exit->msg (undef);
2680 }
2047 } 2681 }
2048} 2682}
2049 2683
2050sub cf::object::player::enter_exit { 2684sub cf::object::player::enter_exit {
2051 my ($self, $exit) = @_; 2685 my ($self, $exit) = @_;
2052 2686
2053 return unless $self->type == cf::PLAYER; 2687 return unless $self->type == cf::PLAYER;
2054 2688
2055 if ($exit->slaying eq "/!") {
2056 #TODO: this should de-fi-ni-te-ly not be a sync-job
2057 # the problem is that $exit might not survive long enough
2058 # so it needs to be done right now, right here
2059 cf::sync_job { prepare_random_map $exit };
2060 }
2061
2062 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2063 my $hp = $exit->stats->hp;
2064 my $sp = $exit->stats->sp;
2065
2066 $self->enter_link; 2689 $self->enter_link;
2067 2690
2068 (async { 2691 (async {
2069 $self->deactivate_recursive; # just to be sure 2692 $Coro::current->{desc} = "enter_exit";
2693
2070 unless (eval { 2694 unless (eval {
2695 $self->deactivate_recursive; # just to be sure
2696
2697 # random map handling
2698 {
2699 my $guard = cf::lock_acquire "exit_prepare:$exit";
2700
2701 prepare_random_map $exit
2702 if $exit->slaying eq "/!";
2703 }
2704
2705 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2706 my $x = $exit->stats->hp;
2707 my $y = $exit->stats->sp;
2708
2071 $self->goto ($slaying, $hp, $sp); 2709 $self->goto ($map, $x, $y);
2072 2710
2711 # if exit is damned, update players death & WoR home-position
2712 $self->contr->savebed ($map, $x, $y)
2713 if $exit->flag (cf::FLAG_DAMNED);
2714
2073 1; 2715 1
2074 }) { 2716 }) {
2075 $self->message ("Something went wrong deep within the crossfire server. " 2717 $self->message ("Something went wrong deep within the deliantra server. "
2076 . "I'll try to bring you back to the map you were before. " 2718 . "I'll try to bring you back to the map you were before. "
2077 . "Please report this to the dungeon master!", 2719 . "Please report this to the dungeon master!",
2078 cf::NDI_UNIQUE | cf::NDI_RED); 2720 cf::NDI_UNIQUE | cf::NDI_RED);
2079 2721
2080 warn "ERROR in enter_exit: $@"; 2722 warn "ERROR in enter_exit: $@";
… …
2099 2741
2100 utf8::encode $text; 2742 utf8::encode $text;
2101 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2743 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2102} 2744}
2103 2745
2746=item $client->send_msg ($channel, $msg, $color, [extra...])
2747
2748Send a drawinfo or msg packet to the client, formatting the msg for the
2749client if neccessary. C<$type> should be a string identifying the type of
2750the message, with C<log> being the default. If C<$color> is negative, suppress
2751the message unless the client supports the msg packet.
2752
2753=cut
2754
2755# non-persistent channels (usually the info channel)
2756our %CHANNEL = (
2757 "c/identify" => {
2758 id => "infobox",
2759 title => "Identify",
2760 reply => undef,
2761 tooltip => "Items recently identified",
2762 },
2763 "c/examine" => {
2764 id => "infobox",
2765 title => "Examine",
2766 reply => undef,
2767 tooltip => "Signs and other items you examined",
2768 },
2769 "c/book" => {
2770 id => "infobox",
2771 title => "Book",
2772 reply => undef,
2773 tooltip => "The contents of a note or book",
2774 },
2775 "c/lookat" => {
2776 id => "infobox",
2777 title => "Look",
2778 reply => undef,
2779 tooltip => "What you saw there",
2780 },
2781 "c/who" => {
2782 id => "infobox",
2783 title => "Players",
2784 reply => undef,
2785 tooltip => "Shows players who are currently online",
2786 },
2787 "c/body" => {
2788 id => "infobox",
2789 title => "Body Parts",
2790 reply => undef,
2791 tooltip => "Shows which body parts you posess and are available",
2792 },
2793 "c/skills" => {
2794 id => "infobox",
2795 title => "Skills",
2796 reply => undef,
2797 tooltip => "Shows your experience per skill and item power",
2798 },
2799 "c/uptime" => {
2800 id => "infobox",
2801 title => "Uptime",
2802 reply => undef,
2803 tooltip => "How long the server has been running since last restart",
2804 },
2805 "c/mapinfo" => {
2806 id => "infobox",
2807 title => "Map Info",
2808 reply => undef,
2809 tooltip => "Information related to the maps",
2810 },
2811 "c/party" => {
2812 id => "party",
2813 title => "Party",
2814 reply => "gsay ",
2815 tooltip => "Messages and chat related to your party",
2816 },
2817);
2818
2819sub cf::client::send_msg {
2820 my ($self, $channel, $msg, $color, @extra) = @_;
2821
2822 $msg = $self->pl->expand_cfpod ($msg)
2823 unless $color & cf::NDI_VERBATIM;
2824
2825 $color &= cf::NDI_CLIENT_MASK; # just in case...
2826
2827 # check predefined channels, for the benefit of C
2828 if ($CHANNEL{$channel}) {
2829 $channel = $CHANNEL{$channel};
2830
2831 $self->ext_msg (channel_info => $channel)
2832 if $self->can_msg;
2833
2834 $channel = $channel->{id};
2835
2836 } elsif (ref $channel) {
2837 # send meta info to client, if not yet sent
2838 unless (exists $self->{channel}{$channel->{id}}) {
2839 $self->{channel}{$channel->{id}} = $channel;
2840 $self->ext_msg (channel_info => $channel)
2841 if $self->can_msg;
2842 }
2843
2844 $channel = $channel->{id};
2845 }
2846
2847 return unless @extra || length $msg;
2848
2849 if ($self->can_msg) {
2850 # default colour, mask it out
2851 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2852 if $color & cf::NDI_DEF;
2853
2854 my $pkt = "msg "
2855 . $self->{json_coder}->encode (
2856 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2857 );
2858
2859 # try lzf for large packets
2860 $pkt = "lzf " . Compress::LZF::compress $pkt
2861 if 1024 <= length $pkt and $self->{can_lzf};
2862
2863 # split very large packets
2864 if (8192 < length $pkt and $self->{can_lzf}) {
2865 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2866 $pkt = "frag";
2867 }
2868
2869 $self->send_packet ($pkt);
2870 } else {
2871 if ($color >= 0) {
2872 # replace some tags by gcfclient-compatible ones
2873 for ($msg) {
2874 1 while
2875 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2876 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2877 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2878 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2879 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2880 }
2881
2882 $color &= cf::NDI_COLOR_MASK;
2883
2884 utf8::encode $msg;
2885
2886 if (0 && $msg =~ /\[/) {
2887 # COMMAND/INFO
2888 $self->send_packet ("drawextinfo $color 10 8 $msg")
2889 } else {
2890 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2891 $self->send_packet ("drawinfo $color $msg")
2892 }
2893 }
2894 }
2895}
2896
2104=item $client->ext_event ($type, %msg) 2897=item $client->ext_msg ($type, @msg)
2105 2898
2106Sends an exti event to the client. 2899Sends an ext event to the client.
2107 2900
2108=cut 2901=cut
2109 2902
2110sub cf::client::ext_event($$%) { 2903sub cf::client::ext_msg($$@) {
2111 my ($self, $type, %msg) = @_; 2904 my ($self, $type, @msg) = @_;
2112 2905
2906 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2908 } elsif ($self->extcmd == 1) { # TODO: remove
2113 $msg{msgtype} = "event_$type"; 2909 push @msg, msgtype => "event_$type";
2114 $self->send_packet ("ext " . cf::to_json \%msg); 2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 }
2912}
2913
2914=item $client->ext_reply ($msgid, @msg)
2915
2916Sends an ext reply to the client.
2917
2918=cut
2919
2920sub cf::client::ext_reply($$@) {
2921 my ($self, $id, @msg) = @_;
2922
2923 if ($self->extcmd == 2) {
2924 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2925 } elsif ($self->extcmd == 1) {
2926 #TODO: version 1, remove
2927 unshift @msg, msgtype => "reply", msgid => $id;
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2929 }
2115} 2930}
2116 2931
2117=item $success = $client->query ($flags, "text", \&cb) 2932=item $success = $client->query ($flags, "text", \&cb)
2118 2933
2119Queues a query to the client, calling the given callback with 2934Queues a query to the client, calling the given callback with
2120the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2935the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2121C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2936C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2122 2937
2123Queries can fail, so check the return code. Or don't, as queries will become 2938Queries can fail, so check the return code. Or don't, as queries will
2124reliable at some point in the future. 2939become reliable at some point in the future.
2125 2940
2126=cut 2941=cut
2127 2942
2128sub cf::client::query { 2943sub cf::client::query {
2129 my ($self, $flags, $text, $cb) = @_; 2944 my ($self, $flags, $text, $cb) = @_;
… …
2137 utf8::encode $text; 2952 utf8::encode $text;
2138 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2953 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2139 2954
2140 $self->send_packet ($self->{query_queue}[0][0]) 2955 $self->send_packet ($self->{query_queue}[0][0])
2141 if @{ $self->{query_queue} } == 1; 2956 if @{ $self->{query_queue} } == 1;
2957
2958 1
2142} 2959}
2143 2960
2144cf::client->attach ( 2961cf::client->attach (
2962 on_connect => sub {
2963 my ($ns) = @_;
2964
2965 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2966 },
2145 on_reply => sub { 2967 on_reply => sub {
2146 my ($ns, $msg) = @_; 2968 my ($ns, $msg) = @_;
2147 2969
2148 # this weird shuffling is so that direct followup queries 2970 # this weird shuffling is so that direct followup queries
2149 # get handled first 2971 # get handled first
… …
2161 } else { 2983 } else {
2162 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2984 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2163 } 2985 }
2164 } 2986 }
2165 }, 2987 },
2988 on_exticmd => sub {
2989 my ($ns, $buf) = @_;
2990
2991 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2992
2993 if (ref $msg) {
2994 my ($type, $reply, @payload) =
2995 "ARRAY" eq ref $msg
2996 ? @$msg
2997 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2998
2999 my @reply;
3000
3001 if (my $cb = $EXTICMD{$type}) {
3002 @reply = $cb->($ns, @payload);
3003 }
3004
3005 $ns->ext_reply ($reply, @reply)
3006 if $reply;
3007
3008 } else {
3009 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3010 }
3011
3012 cf::override;
3013 },
2166); 3014);
2167 3015
2168=item $client->async (\&cb) 3016=item $client->async (\&cb)
2169 3017
2170Create a new coroutine, running the specified callback. The coroutine will 3018Create a new coroutine, running the specified callback. The coroutine will
… …
2211our $safe = new Safe "safe"; 3059our $safe = new Safe "safe";
2212our $safe_hole = new Safe::Hole; 3060our $safe_hole = new Safe::Hole;
2213 3061
2214$SIG{FPE} = 'IGNORE'; 3062$SIG{FPE} = 'IGNORE';
2215 3063
2216$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3064$safe->permit_only (Opcode::opset qw(
3065 :base_core :base_mem :base_orig :base_math
3066 grepstart grepwhile mapstart mapwhile
3067 sort time
3068));
2217 3069
2218# here we export the classes and methods available to script code 3070# here we export the classes and methods available to script code
2219 3071
2220=pod 3072=pod
2221 3073
2222The following functions and methods are available within a safe environment: 3074The following functions and methods are available within a safe environment:
2223 3075
2224 cf::object contr pay_amount pay_player map 3076 cf::object
3077 contr pay_amount pay_player map x y force_find force_add destroy
3078 insert remove name archname title slaying race decrease split
3079
2225 cf::object::player player 3080 cf::object::player
2226 cf::player peaceful 3081 player
2227 cf::map trigger 3082
3083 cf::player
3084 peaceful
3085
3086 cf::map
3087 trigger
2228 3088
2229=cut 3089=cut
2230 3090
2231for ( 3091for (
2232 ["cf::object" => qw(contr pay_amount pay_player map)], 3092 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3093 insert remove inv nrof name archname title slaying race
3094 decrease split destroy change_exp)],
2233 ["cf::object::player" => qw(player)], 3095 ["cf::object::player" => qw(player)],
2234 ["cf::player" => qw(peaceful)], 3096 ["cf::player" => qw(peaceful)],
2235 ["cf::map" => qw(trigger)], 3097 ["cf::map" => qw(trigger)],
2236) { 3098) {
2237 no strict 'refs'; 3099 no strict 'refs';
… …
2308=back 3170=back
2309 3171
2310=cut 3172=cut
2311 3173
2312############################################################################# 3174#############################################################################
2313
2314=head2 EXTENSION DATABASE SUPPORT
2315
2316Crossfire maintains a very simple database for extension use. It can
2317currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2318convert to/from binary).
2319
2320The parameter C<$family> should best start with the name of the extension
2321using it, it should be unique.
2322
2323=over 4
2324
2325=item $value = cf::db_get $family => $key
2326
2327Returns a single value from the database.
2328
2329=item cf::db_put $family => $key => $value
2330
2331Stores the given C<$value> in the family.
2332
2333=cut
2334
2335our $DB;
2336
2337sub db_init {
2338 unless ($DB) {
2339 $DB = BDB::db_create $DB_ENV;
2340
2341 cf::sync_job {
2342 eval {
2343 $DB->set_flags (BDB::CHKSUM);
2344
2345 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2346 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2347 cf::cleanup "db_open(db): $!" if $!;
2348 };
2349 cf::cleanup "db_open(db): $@" if $@;
2350 };
2351 }
2352}
2353
2354sub db_get($$) {
2355 my $key = "$_[0]/$_[1]";
2356
2357 cf::sync_job {
2358 BDB::db_get $DB, undef, $key, my $data;
2359
2360 $! ? ()
2361 : $data
2362 }
2363}
2364
2365sub db_put($$$) {
2366 BDB::dbreq_pri 4;
2367 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2368}
2369
2370=item cf::cache $id => [$paths...], $processversion => $process
2371
2372Generic caching function that returns the value of the resource $id,
2373caching and regenerating as required.
2374
2375This function can block.
2376
2377=cut
2378
2379sub cache {
2380 my ($id, $src, $processversion, $process) = @_;
2381
2382 my $meta =
2383 join "\x00",
2384 $processversion,
2385 map {
2386 aio_stat $_
2387 and Carp::croak "$_: $!";
2388
2389 ($_, (stat _)[7,9])
2390 } @$src;
2391
2392 my $dbmeta = db_get cache => "$id/meta";
2393 if ($dbmeta ne $meta) {
2394 # changed, we may need to process
2395
2396 my @data;
2397 my $md5;
2398
2399 for (0 .. $#$src) {
2400 0 <= aio_load $src->[$_], $data[$_]
2401 or Carp::croak "$src->[$_]: $!";
2402 }
2403
2404 # if processing is expensive, check
2405 # checksum first
2406 if (1) {
2407 $md5 =
2408 join "\x00",
2409 $processversion,
2410 map {
2411 Coro::cede;
2412 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2413 } 0.. $#$src;
2414
2415
2416 my $dbmd5 = db_get cache => "$id/md5";
2417 if ($dbmd5 eq $md5) {
2418 db_put cache => "$id/meta", $meta;
2419
2420 return db_get cache => "$id/data";
2421 }
2422 }
2423
2424 my $t1 = Time::HiRes::time;
2425 my $data = $process->(\@data);
2426 my $t2 = Time::HiRes::time;
2427
2428 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2429
2430 db_put cache => "$id/data", $data;
2431 db_put cache => "$id/md5" , $md5;
2432 db_put cache => "$id/meta", $meta;
2433
2434 return $data;
2435 }
2436
2437 db_get cache => "$id/data"
2438}
2439
2440=item fork_call { }, $args
2441
2442Executes the given code block with the given arguments in a seperate
2443process, returning the results. Everything must be serialisable with
2444Coro::Storable. May, of course, block. Note that the executed sub may
2445never block itself or use any form of Event handling.
2446
2447=cut
2448
2449sub fork_call(&@) {
2450 my ($cb, @args) = @_;
2451
2452# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2453# or die "socketpair: $!";
2454 pipe my $fh1, my $fh2
2455 or die "pipe: $!";
2456
2457 if (my $pid = fork) {
2458 close $fh2;
2459
2460 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2461 $res = Coro::Storable::thaw $res;
2462
2463 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2464
2465 die $$res unless "ARRAY" eq ref $res;
2466
2467 return wantarray ? @$res : $res->[-1];
2468 } else {
2469 reset_signals;
2470 local $SIG{__WARN__};
2471 local $SIG{__DIE__};
2472 eval {
2473 close $fh1;
2474
2475 my @res = eval { $cb->(@args) };
2476 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2477 };
2478
2479 warn $@ if $@;
2480 _exit 0;
2481 }
2482}
2483
2484#############################################################################
2485# the server's init and main functions 3175# the server's init and main functions
2486 3176
2487sub load_facedata($) { 3177sub load_facedata($) {
2488 my ($path) = @_; 3178 my ($path) = @_;
3179
3180 # HACK to clear player env face cache, we need some signal framework
3181 # for this (global event?)
3182 %ext::player_env::MUSIC_FACE_CACHE = ();
3183
3184 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2489 3185
2490 warn "loading facedata from $path\n"; 3186 warn "loading facedata from $path\n";
2491 3187
2492 my $facedata; 3188 my $facedata;
2493 0 < aio_load $path, $facedata 3189 0 < aio_load $path, $facedata
… …
2496 $facedata = Coro::Storable::thaw $facedata; 3192 $facedata = Coro::Storable::thaw $facedata;
2497 3193
2498 $facedata->{version} == 2 3194 $facedata->{version} == 2
2499 or cf::cleanup "$path: version mismatch, cannot proceed."; 3195 or cf::cleanup "$path: version mismatch, cannot proceed.";
2500 3196
3197 # patch in the exptable
3198 $facedata->{resource}{"res/exp_table"} = {
3199 type => FT_RSRC,
3200 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3201 };
3202 cf::cede_to_tick;
3203
2501 { 3204 {
2502 my $faces = $facedata->{faceinfo}; 3205 my $faces = $facedata->{faceinfo};
2503 3206
2504 while (my ($face, $info) = each %$faces) { 3207 while (my ($face, $info) = each %$faces) {
2505 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3208 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3209
2506 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3210 cf::face::set_visibility $idx, $info->{visibility};
3211 cf::face::set_magicmap $idx, $info->{magicmap};
2507 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3212 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2508 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3213 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2509 Coro::cede; 3214
3215 cf::cede_to_tick;
2510 } 3216 }
2511 3217
2512 while (my ($face, $info) = each %$faces) { 3218 while (my ($face, $info) = each %$faces) {
2513 next unless $info->{smooth}; 3219 next unless $info->{smooth};
3220
2514 my $idx = cf::face::find $face 3221 my $idx = cf::face::find $face
2515 or next; 3222 or next;
3223
2516 if (my $smooth = cf::face::find $info->{smooth}) { 3224 if (my $smooth = cf::face::find $info->{smooth}) {
3225 cf::face::set_smooth $idx, $smooth;
2517 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3226 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2518 } else { 3227 } else {
2519 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3228 warn "smooth face '$info->{smooth}' not found for face '$face'";
2520 } 3229 }
2521 Coro::cede; 3230
3231 cf::cede_to_tick;
2522 } 3232 }
2523 } 3233 }
2524 3234
2525 { 3235 {
2526 my $anims = $facedata->{animinfo}; 3236 my $anims = $facedata->{animinfo};
2527 3237
2528 while (my ($anim, $info) = each %$anims) { 3238 while (my ($anim, $info) = each %$anims) {
2529 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3239 cf::anim::set $anim, $info->{frames}, $info->{facings};
2530 Coro::cede; 3240 cf::cede_to_tick;
2531 } 3241 }
2532 3242
2533 cf::anim::invalidate_all; # d'oh 3243 cf::anim::invalidate_all; # d'oh
2534 } 3244 }
2535 3245
3246 {
3247 # TODO: for gcfclient pleasure, we should give resources
3248 # that gcfclient doesn't grok a >10000 face index.
3249 my $res = $facedata->{resource};
3250
3251 while (my ($name, $info) = each %$res) {
3252 if (defined $info->{type}) {
3253 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3254 my $data;
3255
3256 if ($info->{type} & 1) {
3257 # prepend meta info
3258
3259 my $meta = $enc->encode ({
3260 name => $name,
3261 %{ $info->{meta} || {} },
3262 });
3263
3264 $data = pack "(w/a*)*", $meta, $info->{data};
3265 } else {
3266 $data = $info->{data};
3267 }
3268
3269 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3270 cf::face::set_type $idx, $info->{type};
3271 } else {
3272 $RESOURCE{$name} = $info;
3273 }
3274
3275 cf::cede_to_tick;
3276 }
3277 }
3278
3279 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3280
2536 1 3281 1
2537} 3282}
2538 3283
3284cf::global->attach (on_resource_update => sub {
3285 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3286 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3287
3288 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3289 my $sound = $soundconf->{compat}[$_]
3290 or next;
3291
3292 my $face = cf::face::find "sound/$sound->[1]";
3293 cf::sound::set $sound->[0] => $face;
3294 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3295 }
3296
3297 while (my ($k, $v) = each %{$soundconf->{event}}) {
3298 my $face = cf::face::find "sound/$v";
3299 cf::sound::set $k => $face;
3300 }
3301 }
3302});
3303
3304register_exticmd fx_want => sub {
3305 my ($ns, $want) = @_;
3306
3307 while (my ($k, $v) = each %$want) {
3308 $ns->fx_want ($k, $v);
3309 }
3310};
3311
3312sub load_resource_file($) {
3313 my $guard = lock_acquire "load_resource_file";
3314
3315 my $status = load_resource_file_ $_[0];
3316 get_slot 0.1, 100;
3317 cf::arch::commit_load;
3318
3319 $status
3320}
3321
2539sub reload_regions { 3322sub reload_regions {
3323 # HACK to clear player env face cache, we need some signal framework
3324 # for this (global event?)
3325 %ext::player_env::MUSIC_FACE_CACHE = ();
3326
2540 load_resource_file "$MAPDIR/regions" 3327 load_resource_file "$MAPDIR/regions"
2541 or die "unable to load regions file\n"; 3328 or die "unable to load regions file\n";
3329
3330 for (cf::region::list) {
3331 $_->{match} = qr/$_->{match}/
3332 if exists $_->{match};
3333 }
2542} 3334}
2543 3335
2544sub reload_facedata { 3336sub reload_facedata {
2545 load_facedata "$DATADIR/facedata" 3337 load_facedata "$DATADIR/facedata"
2546 or die "unable to load facedata\n"; 3338 or die "unable to load facedata\n";
… …
2557} 3349}
2558 3350
2559sub reload_resources { 3351sub reload_resources {
2560 warn "reloading resource files...\n"; 3352 warn "reloading resource files...\n";
2561 3353
2562 reload_regions;
2563 reload_facedata; 3354 reload_facedata;
2564 reload_archetypes; 3355 reload_archetypes;
3356 reload_regions;
2565 reload_treasures; 3357 reload_treasures;
2566 3358
2567 warn "finished reloading resource files\n"; 3359 warn "finished reloading resource files\n";
2568} 3360}
2569 3361
2570sub init { 3362sub reload_config {
2571 reload_resources;
2572}
2573
2574sub cfg_load {
2575 open my $fh, "<:utf8", "$CONFDIR/config" 3363 open my $fh, "<:utf8", "$CONFDIR/config"
2576 or return; 3364 or return;
2577 3365
2578 local $/; 3366 local $/;
2579 *CFG = YAML::Syck::Load <$fh>; 3367 *CFG = YAML::Load <$fh>;
2580 3368
2581 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3369 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2582 3370
2583 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3371 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2584 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3372 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
2590 }; 3378 };
2591 warn $@ if $@; 3379 warn $@ if $@;
2592 } 3380 }
2593} 3381}
2594 3382
3383sub pidfile() {
3384 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3385 or die "$PIDFILE: $!";
3386 flock $fh, &Fcntl::LOCK_EX
3387 or die "$PIDFILE: flock: $!";
3388 $fh
3389}
3390
3391# make sure only one server instance is running at any one time
3392sub atomic {
3393 my $fh = pidfile;
3394
3395 my $pid = <$fh>;
3396 kill 9, $pid if $pid > 0;
3397
3398 seek $fh, 0, 0;
3399 print $fh $$;
3400}
3401
2595sub main { 3402sub main {
3403 cf::init_globals; # initialise logging
3404
3405 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3406 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3407 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3408 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3409
3410 cf::init_experience;
3411 cf::init_anim;
3412 cf::init_attackmess;
3413 cf::init_dynamic;
3414 cf::init_block;
3415
3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3417
2596 # we must not ever block the main coroutine 3418 # we must not ever block the main coroutine
2597 local $Coro::idle = sub { 3419 local $Coro::idle = sub {
2598 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3420 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2599 (async { 3421 (async {
2600 Event::one_event; 3422 $Coro::current->{desc} = "IDLE BUG HANDLER";
3423 EV::loop EV::LOOP_ONESHOT;
2601 })->prio (Coro::PRIO_MAX); 3424 })->prio (Coro::PRIO_MAX);
2602 }; 3425 };
2603 3426
2604 cfg_load; 3427 evthread_start IO::AIO::poll_fileno;
3428
3429 cf::sync_job {
3430 reload_resources;
3431 reload_config;
2605 db_init; 3432 db_init;
3433
3434 cf::load_settings;
3435 cf::load_materials;
3436 cf::init_uuid;
3437 cf::init_signals;
3438 cf::init_commands;
3439 cf::init_skills;
3440
3441 cf::init_beforeplay;
3442
3443 atomic;
3444
2606 load_extensions; 3445 load_extensions;
2607 3446
2608 $TICK_WATCHER->start; 3447 utime time, time, $RUNTIMEFILE;
3448
3449 # no (long-running) fork's whatsoever before this point(!)
3450 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3451
3452 (pop @POST_INIT)->(0) while @POST_INIT;
3453 };
3454
2609 Event::loop; 3455 EV::loop;
2610} 3456}
2611 3457
2612############################################################################# 3458#############################################################################
2613# initialisation and cleanup 3459# initialisation and cleanup
2614 3460
2615# install some emergency cleanup handlers 3461# install some emergency cleanup handlers
2616BEGIN { 3462BEGIN {
3463 our %SIGWATCHER = ();
2617 for my $signal (qw(INT HUP TERM)) { 3464 for my $signal (qw(INT HUP TERM)) {
2618 Event->signal ( 3465 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2619 reentrant => 0,
2620 data => WF_AUTOCANCEL,
2621 signal => $signal,
2622 prio => 0,
2623 cb => sub {
2624 cf::cleanup "SIG$signal"; 3466 cf::cleanup "SIG$signal";
2625 },
2626 ); 3467 };
3468 }
3469}
3470
3471sub write_runtime_sync {
3472 # first touch the runtime file to show we are still running:
3473 # the fsync below can take a very very long time.
3474
3475 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3476
3477 my $guard = cf::lock_acquire "write_runtime";
3478
3479 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3480 or return;
3481
3482 my $value = $cf::RUNTIME + 90 + 10;
3483 # 10 is the runtime save interval, for a monotonic clock
3484 # 60 allows for the watchdog to kill the server.
3485
3486 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3487 and return;
3488
3489 # always fsync - this file is important
3490 aio_fsync $fh
3491 and return;
3492
3493 # touch it again to show we are up-to-date
3494 aio_utime $fh, undef, undef;
3495
3496 close $fh
3497 or return;
3498
3499 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3500 and return;
3501
3502 warn "runtime file written.\n";
3503
2627 } 3504 1
3505}
3506
3507our $uuid_lock;
3508our $uuid_skip;
3509
3510sub write_uuid_sync($) {
3511 $uuid_skip ||= $_[0];
3512
3513 return if $uuid_lock;
3514 local $uuid_lock = 1;
3515
3516 my $uuid = "$LOCALDIR/uuid";
3517
3518 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3519 or return;
3520
3521 my $value = uuid_seq uuid_cur;
3522
3523 unless ($value) {
3524 warn "cowardly refusing to write zero uuid value!\n";
3525 return;
3526 }
3527
3528 my $value = uuid_str $value + $uuid_skip;
3529 $uuid_skip = 0;
3530
3531 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3532 and return;
3533
3534 # always fsync - this file is important
3535 aio_fsync $fh
3536 and return;
3537
3538 close $fh
3539 or return;
3540
3541 aio_rename "$uuid~", $uuid
3542 and return;
3543
3544 warn "uuid file written ($value).\n";
3545
3546 1
3547
3548}
3549
3550sub write_uuid($$) {
3551 my ($skip, $sync) = @_;
3552
3553 $sync ? write_uuid_sync $skip
3554 : async { write_uuid_sync $skip };
2628} 3555}
2629 3556
2630sub emergency_save() { 3557sub emergency_save() {
2631 my $freeze_guard = cf::freeze_mainloop; 3558 my $freeze_guard = cf::freeze_mainloop;
2632 3559
… …
2638 # and maps saved/destroyed asynchronously. 3565 # and maps saved/destroyed asynchronously.
2639 warn "begin emergency player save\n"; 3566 warn "begin emergency player save\n";
2640 for my $login (keys %cf::PLAYER) { 3567 for my $login (keys %cf::PLAYER) {
2641 my $pl = $cf::PLAYER{$login} or next; 3568 my $pl = $cf::PLAYER{$login} or next;
2642 $pl->valid or next; 3569 $pl->valid or next;
3570 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2643 $pl->save; 3571 $pl->save;
2644 } 3572 }
2645 warn "end emergency player save\n"; 3573 warn "end emergency player save\n";
2646 3574
2647 warn "begin emergency map save\n"; 3575 warn "begin emergency map save\n";
… …
2653 warn "end emergency map save\n"; 3581 warn "end emergency map save\n";
2654 3582
2655 warn "begin emergency database checkpoint\n"; 3583 warn "begin emergency database checkpoint\n";
2656 BDB::db_env_txn_checkpoint $DB_ENV; 3584 BDB::db_env_txn_checkpoint $DB_ENV;
2657 warn "end emergency database checkpoint\n"; 3585 warn "end emergency database checkpoint\n";
3586
3587 warn "begin write uuid\n";
3588 write_uuid_sync 1;
3589 warn "end write uuid\n";
2658 }; 3590 };
2659 3591
2660 warn "leave emergency perl save\n"; 3592 warn "leave emergency perl save\n";
2661} 3593}
2662 3594
2663sub post_cleanup { 3595sub post_cleanup {
2664 my ($make_core) = @_; 3596 my ($make_core) = @_;
2665 3597
2666 warn Carp::longmess "post_cleanup backtrace" 3598 warn Carp::longmess "post_cleanup backtrace"
2667 if $make_core; 3599 if $make_core;
3600
3601 my $fh = pidfile;
3602 unlink $PIDFILE if <$fh> == $$;
3603}
3604
3605# a safer delete_package, copied from Symbol
3606sub clear_package($) {
3607 my $pkg = shift;
3608
3609 # expand to full symbol table name if needed
3610 unless ($pkg =~ /^main::.*::$/) {
3611 $pkg = "main$pkg" if $pkg =~ /^::/;
3612 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3613 $pkg .= '::' unless $pkg =~ /::$/;
3614 }
3615
3616 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3617 my $stem_symtab = *{$stem}{HASH};
3618
3619 defined $stem_symtab and exists $stem_symtab->{$leaf}
3620 or return;
3621
3622 # clear all symbols
3623 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3624 for my $name (keys %$leaf_symtab) {
3625 _gv_clear *{"$pkg$name"};
3626# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3627 }
3628 warn "cleared package $pkg\n";#d#
2668} 3629}
2669 3630
2670sub do_reload_perl() { 3631sub do_reload_perl() {
2671 # can/must only be called in main 3632 # can/must only be called in main
2672 if ($Coro::current != $Coro::main) { 3633 if ($Coro::current != $Coro::main) {
2673 warn "can only reload from main coroutine"; 3634 warn "can only reload from main coroutine";
2674 return; 3635 return;
2675 } 3636 }
2676 3637
3638 return if $RELOAD++;
3639
3640 while ($RELOAD) {
2677 warn "reloading..."; 3641 warn "reloading...";
2678 3642
2679 warn "entering sync_job"; 3643 warn "entering sync_job";
2680 3644
2681 cf::sync_job { 3645 cf::sync_job {
2682 cf::write_runtime; # external watchdog should not bark 3646 cf::write_runtime_sync; # external watchdog should not bark
2683 cf::emergency_save; 3647 cf::emergency_save;
2684 cf::write_runtime; # external watchdog should not bark 3648 cf::write_runtime_sync; # external watchdog should not bark
2685 3649
2686 warn "syncing database to disk"; 3650 warn "syncing database to disk";
2687 BDB::db_env_txn_checkpoint $DB_ENV; 3651 BDB::db_env_txn_checkpoint $DB_ENV;
2688 3652
2689 # if anything goes wrong in here, we should simply crash as we already saved 3653 # if anything goes wrong in here, we should simply crash as we already saved
2690 3654
2691 warn "cancelling all WF_AUTOCANCEL watchers";
2692 for (Event::all_watchers) {
2693 $_->cancel if $_->data & WF_AUTOCANCEL;
2694 }
2695
2696 warn "flushing outstanding aio requests"; 3655 warn "flushing outstanding aio requests";
2697 for (;;) {
2698 BDB::flush;
2699 IO::AIO::flush;
2700 Coro::cede;
2701 last unless IO::AIO::nreqs || BDB::nreqs; 3656 while (IO::AIO::nreqs || BDB::nreqs) {
2702 warn "iterate..."; 3657 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
2703 }
2704
2705 ++$RELOAD;
2706
2707 warn "cancelling all extension coros";
2708 $_->cancel for values %EXT_CORO;
2709 %EXT_CORO = ();
2710
2711 warn "removing commands";
2712 %COMMAND = ();
2713
2714 warn "removing ext commands";
2715 %EXTCMD = ();
2716
2717 warn "unloading/nuking all extensions";
2718 for my $pkg (@EXTS) {
2719 warn "... unloading $pkg";
2720
2721 if (my $cb = $pkg->can ("unload")) {
2722 eval {
2723 $cb->($pkg);
2724 1
2725 } or warn "$pkg unloaded, but with errors: $@";
2726 } 3658 }
2727 3659
2728 warn "... nuking $pkg"; 3660 warn "cancelling all extension coros";
2729 Symbol::delete_package $pkg; 3661 $_->cancel for values %EXT_CORO;
2730 } 3662 %EXT_CORO = ();
2731 3663
2732 warn "unloading all perl modules loaded from $LIBDIR"; 3664 warn "removing commands";
2733 while (my ($k, $v) = each %INC) { 3665 %COMMAND = ();
2734 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2735 3666
3667 warn "removing ext/exti commands";
3668 %EXTCMD = ();
3669 %EXTICMD = ();
3670
3671 warn "unloading/nuking all extensions";
3672 for my $pkg (@EXTS) {
2736 warn "... unloading $k"; 3673 warn "... unloading $pkg";
2737 delete $INC{$k};
2738 3674
2739 $k =~ s/\.pm$//;
2740 $k =~ s/\//::/g;
2741
2742 if (my $cb = $k->can ("unload_module")) { 3675 if (my $cb = $pkg->can ("unload")) {
3676 eval {
2743 $cb->(); 3677 $cb->($pkg);
3678 1
3679 } or warn "$pkg unloaded, but with errors: $@";
3680 }
3681
3682 warn "... clearing $pkg";
3683 clear_package $pkg;
2744 } 3684 }
2745 3685
2746 Symbol::delete_package $k; 3686 warn "unloading all perl modules loaded from $LIBDIR";
3687 while (my ($k, $v) = each %INC) {
3688 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3689
3690 warn "... unloading $k";
3691 delete $INC{$k};
3692
3693 $k =~ s/\.pm$//;
3694 $k =~ s/\//::/g;
3695
3696 if (my $cb = $k->can ("unload_module")) {
3697 $cb->();
3698 }
3699
3700 clear_package $k;
2747 } 3701 }
2748 3702
2749 warn "getting rid of safe::, as good as possible"; 3703 warn "getting rid of safe::, as good as possible";
2750 Symbol::delete_package "safe::$_" 3704 clear_package "safe::$_"
2751 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3705 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2752 3706
2753 warn "unloading cf.pm \"a bit\""; 3707 warn "unloading cf.pm \"a bit\"";
2754 delete $INC{"cf.pm"}; 3708 delete $INC{"cf.pm"};
2755 delete $INC{"cf/pod.pm"}; 3709 delete $INC{"cf/pod.pm"};
2756 3710
2757 # don't, removes xs symbols, too, 3711 # don't, removes xs symbols, too,
2758 # and global variables created in xs 3712 # and global variables created in xs
2759 #Symbol::delete_package __PACKAGE__; 3713 #clear_package __PACKAGE__;
2760 3714
2761 warn "unload completed, starting to reload now"; 3715 warn "unload completed, starting to reload now";
2762 3716
2763 warn "reloading cf.pm"; 3717 warn "reloading cf.pm";
2764 require cf; 3718 require cf;
2765 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3719 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2766 3720
2767 warn "loading config and database again"; 3721 warn "loading config and database again";
2768 cf::cfg_load; 3722 cf::reload_config;
2769 3723
2770 warn "loading extensions"; 3724 warn "loading extensions";
2771 cf::load_extensions; 3725 cf::load_extensions;
2772 3726
2773 warn "reattaching attachments to objects/players"; 3727 warn "reattaching attachments to objects/players";
2774 _global_reattach; # objects, sockets 3728 _global_reattach; # objects, sockets
2775 warn "reattaching attachments to maps"; 3729 warn "reattaching attachments to maps";
2776 reattach $_ for values %MAP; 3730 reattach $_ for values %MAP;
2777 warn "reattaching attachments to players"; 3731 warn "reattaching attachments to players";
2778 reattach $_ for values %PLAYER; 3732 reattach $_ for values %PLAYER;
2779 3733
3734 warn "running post_load";
3735 (pop @POST_INIT)->(1) while @POST_INIT;
3736
2780 warn "leaving sync_job"; 3737 warn "leaving sync_job";
2781 3738
2782 1 3739 1
2783 } or do { 3740 } or do {
2784 warn $@; 3741 warn $@;
2785 warn "error while reloading, exiting."; 3742 cf::cleanup "error while reloading, exiting.";
2786 exit 1;
2787 }; 3743 };
2788 3744
2789 warn "reloaded"; 3745 warn "reloaded";
3746 --$RELOAD;
3747 }
2790}; 3748};
2791 3749
2792our $RELOAD_WATCHER; # used only during reload 3750our $RELOAD_WATCHER; # used only during reload
2793 3751
2794sub reload_perl() { 3752sub reload_perl() {
2795 # doing reload synchronously and two reloads happen back-to-back, 3753 # doing reload synchronously and two reloads happen back-to-back,
2796 # coro crashes during coro_state_free->destroy here. 3754 # coro crashes during coro_state_free->destroy here.
2797 3755
2798 $RELOAD_WATCHER ||= Event->timer ( 3756 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub {
2799 reentrant => 0,
2800 after => 0,
2801 data => WF_AUTOCANCEL,
2802 cb => sub {
2803 do_reload_perl; 3757 do_reload_perl;
2804 undef $RELOAD_WATCHER; 3758 undef $RELOAD_WATCHER;
2805 },
2806 ); 3759 };
2807} 3760}
2808 3761
2809register_command "reload" => sub { 3762register_command "reload" => sub {
2810 my ($who, $arg) = @_; 3763 my ($who, $arg) = @_;
2811 3764
2812 if ($who->flag (FLAG_WIZ)) { 3765 if ($who->flag (FLAG_WIZ)) {
2813 $who->message ("reloading server."); 3766 $who->message ("reloading server.");
3767 async {
3768 $Coro::current->{desc} = "perl_reload";
2814 async { reload_perl }; 3769 reload_perl;
3770 };
2815 } 3771 }
2816}; 3772};
2817 3773
2818unshift @INC, $LIBDIR; 3774unshift @INC, $LIBDIR;
2819 3775
… …
2821 3777
2822our @WAIT_FOR_TICK; 3778our @WAIT_FOR_TICK;
2823our @WAIT_FOR_TICK_BEGIN; 3779our @WAIT_FOR_TICK_BEGIN;
2824 3780
2825sub wait_for_tick { 3781sub wait_for_tick {
2826 return unless $TICK_WATCHER->is_active;
2827 return if $Coro::current == $Coro::main; 3782 return if tick_inhibit || $Coro::current == $Coro::main;
2828 3783
2829 my $signal = new Coro::Signal; 3784 my $signal = new Coro::Signal;
2830 push @WAIT_FOR_TICK, $signal; 3785 push @WAIT_FOR_TICK, $signal;
2831 $signal->wait; 3786 $signal->wait;
2832} 3787}
2833 3788
2834sub wait_for_tick_begin { 3789sub wait_for_tick_begin {
2835 return unless $TICK_WATCHER->is_active;
2836 return if $Coro::current == $Coro::main; 3790 return if tick_inhibit || $Coro::current == $Coro::main;
2837 3791
2838 my $signal = new Coro::Signal; 3792 my $signal = new Coro::Signal;
2839 push @WAIT_FOR_TICK_BEGIN, $signal; 3793 push @WAIT_FOR_TICK_BEGIN, $signal;
2840 $signal->wait; 3794 $signal->wait;
2841} 3795}
2842 3796
2843 my $min = 1e6;#d# 3797sub tick {
2844 my $avg = 10;
2845$TICK_WATCHER = Event->timer (
2846 reentrant => 0,
2847 parked => 1,
2848 prio => 0,
2849 at => $NEXT_TICK || $TICK,
2850 data => WF_AUTOCANCEL,
2851 cb => sub {
2852 if ($Coro::current != $Coro::main) { 3798 if ($Coro::current != $Coro::main) {
2853 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3799 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2854 unless ++$bug_warning > 10; 3800 unless ++$bug_warning > 10;
2855 return; 3801 return;
2856 } 3802 }
2857 3803
2858 $NOW = $tick_start = Event::time;
2859
2860 cf::server_tick; # one server iteration 3804 cf::server_tick; # one server iteration
2861 3805
2862 0 && sync_job {#d# 3806 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2863 for(1..10) { 3807 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
2864 my $t = Event::time; 3808 Coro::async_pool {
2865 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3809 $Coro::current->{desc} = "runtime saver";
2866 or die; 3810 write_runtime_sync
2867 3811 or warn "ERROR: unable to write runtime file: $!";
2868 $map->width (50);
2869 $map->height (50);
2870 $map->alloc;
2871 $map->_load_objects ("/tmp/x.map", 1);
2872 my $t = Event::time - $t;
2873
2874 #next unless $t < 0.0013;#d#
2875 if ($t < $min) {
2876 $min = $t;
2877 }
2878 $avg = $avg * 0.99 + $t * 0.01;
2879 }
2880 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2881 exit 0;
2882 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2883 }; 3812 };
3813 }
2884 3814
2885 $RUNTIME += $TICK;
2886 $NEXT_TICK += $TICK;
2887
2888 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2889 $NEXT_RUNTIME_WRITE = $NOW + 10;
2890 Coro::async_pool {
2891 write_runtime
2892 or warn "ERROR: unable to write runtime file: $!";
2893 };
2894 }
2895
2896# my $AFTER = Event::time;
2897# warn $AFTER - $NOW;#d#
2898
2899 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3815 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2900 $sig->send; 3816 $sig->send;
2901 } 3817 }
2902 while (my $sig = shift @WAIT_FOR_TICK) { 3818 while (my $sig = shift @WAIT_FOR_TICK) {
2903 $sig->send; 3819 $sig->send;
2904 } 3820 }
2905 3821
2906 $NOW = Event::time; 3822 $LOAD = ($NOW - $TICK_START) / $TICK;
2907
2908 # if we are delayed by four ticks or more, skip them all
2909 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2910
2911 $TICK_WATCHER->at ($NEXT_TICK);
2912 $TICK_WATCHER->start;
2913
2914 $LOAD = ($NOW - $tick_start) / $TICK;
2915 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3823 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2916 3824
2917 _post_tick; 3825 if (0) {
2918 3826 if ($NEXT_TICK) {
2919 3827 my $jitter = $TICK_START - $NEXT_TICK;
3828 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3829 warn "jitter $JITTER\n";#d#
3830 }
2920 }, 3831 }
2921); 3832}
2922 3833
2923{ 3834{
2924 BDB::max_poll_time $TICK * 0.1; 3835 # configure BDB
2925 $BDB_POLL_WATCHER = Event->io ( 3836
2926 reentrant => 0,
2927 fd => BDB::poll_fileno,
2928 poll => 'r',
2929 prio => 0,
2930 data => WF_AUTOCANCEL,
2931 cb => \&BDB::poll_cb,
2932 );
2933 BDB::min_parallel 8; 3837 BDB::min_parallel 8;
2934 3838 BDB::max_poll_reqs $TICK * 0.1;
2935 BDB::set_sync_prepare { 3839 $AnyEvent::BDB::WATCHER->priority (1);
2936 my $status;
2937 my $current = $Coro::current;
2938 (
2939 sub {
2940 $status = $!;
2941 $current->ready; undef $current;
2942 },
2943 sub {
2944 Coro::schedule while defined $current;
2945 $! = $status;
2946 },
2947 )
2948 };
2949 3840
2950 unless ($DB_ENV) { 3841 unless ($DB_ENV) {
2951 $DB_ENV = BDB::db_env_create; 3842 $DB_ENV = BDB::db_env_create;
3843 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3844 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3845 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3846 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3847 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
2952 3848
2953 cf::sync_job { 3849 cf::sync_job {
2954 eval { 3850 eval {
2955 BDB::db_env_open 3851 BDB::db_env_open
2956 $DB_ENV, 3852 $DB_ENV,
… …
2958 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3854 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2959 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3855 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2960 0666; 3856 0666;
2961 3857
2962 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3858 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2963
2964 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2965 $DB_ENV->set_lk_detect;
2966 }; 3859 };
2967 3860
2968 cf::cleanup "db_env_open(db): $@" if $@; 3861 cf::cleanup "db_env_open(db): $@" if $@;
2969 }; 3862 };
2970 } 3863 }
3864
3865 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3866 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3867 };
3868 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3869 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3870 };
3871 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3872 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3873 };
2971} 3874}
2972 3875
2973{ 3876{
3877 # configure IO::AIO
3878
2974 IO::AIO::min_parallel 8; 3879 IO::AIO::min_parallel 8;
2975
2976 undef $Coro::AIO::WATCHER;
2977 IO::AIO::max_poll_time $TICK * 0.1; 3880 IO::AIO::max_poll_time $TICK * 0.1;
2978 $AIO_POLL_WATCHER = Event->io ( 3881 undef $AnyEvent::AIO::WATCHER;
2979 reentrant => 0,
2980 data => WF_AUTOCANCEL,
2981 fd => IO::AIO::poll_fileno,
2982 poll => 'r',
2983 prio => 6,
2984 cb => \&IO::AIO::poll_cb,
2985 );
2986} 3882}
2987 3883
2988my $_log_backtrace; 3884my $_log_backtrace;
2989 3885
2990sub _log_backtrace { 3886sub _log_backtrace {
… …
2993 $msg =~ s/\n//; 3889 $msg =~ s/\n//;
2994 3890
2995 # limit the # of concurrent backtraces 3891 # limit the # of concurrent backtraces
2996 if ($_log_backtrace < 2) { 3892 if ($_log_backtrace < 2) {
2997 ++$_log_backtrace; 3893 ++$_log_backtrace;
3894 my $perl_bt = Carp::longmess $msg;
2998 async { 3895 async {
3896 $Coro::current->{desc} = "abt $msg";
3897
2999 my @bt = fork_call { 3898 my @bt = fork_call {
3000 @addr = map { sprintf "%x", $_ } @addr; 3899 @addr = map { sprintf "%x", $_ } @addr;
3001 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3900 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3002 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3901 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3003 or die "addr2line: $!"; 3902 or die "addr2line: $!";
… …
3011 } 3910 }
3012 3911
3013 @funcs 3912 @funcs
3014 }; 3913 };
3015 3914
3016 LOG llevInfo, "[ABT] $msg\n"; 3915 LOG llevInfo, "[ABT] $perl_bt\n";
3916 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3017 LOG llevInfo, "[ABT] $_\n" for @bt; 3917 LOG llevInfo, "[ABT] $_\n" for @bt;
3018 --$_log_backtrace; 3918 --$_log_backtrace;
3019 }; 3919 };
3020 } else { 3920 } else {
3021 LOG llevInfo, "[ABT] $msg\n"; 3921 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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