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

Diff Legend

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