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.285 by root, Sun Jun 24 04:21:42 2007 UTC vs.
Revision 1.434 by root, Thu May 29 03:27: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
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
14 35
15use Coro 3.61 (); 36use Coro ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::Event; 39use Coro::AnyEvent;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
43use Coro::AnyEvent;
22use Coro::AIO; 44use Coro::AIO;
45use Coro::BDB;
23use Coro::Storable; 46use Coro::Storable;
47use Coro::Util ();
24 48
49use JSON::XS 2.01 ();
25use BDB (); 50use BDB ();
26use Data::Dumper; 51use Data::Dumper;
27use Digest::MD5; 52use Digest::MD5;
28use Fcntl; 53use Fcntl;
29use YAML::Syck (); 54use YAML ();
30use IO::AIO 2.32 (); 55use IO::AIO ();
31use Time::HiRes; 56use Time::HiRes;
32use Compress::LZF; 57use Compress::LZF;
58use Digest::MD5 ();
59
60AnyEvent::detect;
61
62IO::AIO::max_poll_reqs 1;#d#
33 63
34# configure various modules to our taste 64# configure various modules to our taste
35# 65#
36$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 68Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39 69
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 70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46 71
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
48 73
49our %COMMAND = (); 74our %COMMAND = ();
50our %COMMAND_TIME = (); 75our %COMMAND_TIME = ();
51 76
52our @EXTS = (); # list of extension package names 77our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 78our %EXTCMD = ();
79our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 80our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 81our %EXT_MAP = (); # pluggable maps
56 82
57our $RELOAD; # number of reloads so far 83our $RELOAD; # number of reloads so far
58our @EVENT; 84our @EVENT;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 92our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 94our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
97our %RESOURCE;
71 98
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 99our $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 100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
76our $NEXT_TICK; 101our $NEXT_TICK;
77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 102our $USE_FSYNC = 1; # use fsync to write maps - default off
79 103
104our $BDB_DEADLOCK_WATCHER;
105our $BDB_CHECKPOINT_WATCHER;
80our $BDB_POLL_WATCHER; 106our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 107our $DB_ENV;
82 108
83our %CFG; 109our %CFG;
84 110
85our $UPTIME; $UPTIME ||= time; 111our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 112our $RUNTIME;
113our $NOW;
87 114
88our %PLAYER; # all users 115our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 116our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 117our $LINK_MAP; # the special {link} map, which is always available
91 118
92# used to convert map paths into valid unix filenames by replacing / by ∕ 119# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 120our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 121
95our $LOAD; # a number between 0 (idle) and 1 (too many objects) 122our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing 123our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter
97our $tick_start; # for load detecting purposes 125our $TICK_START; # for load detecting purposes
98 126
99binmode STDOUT; 127binmode STDOUT;
100binmode STDERR; 128binmode STDERR;
101 129
102# read virtual server time, if available 130# read virtual server time, if available
155 183
156The raw value load value from the last tick. 184The raw value load value from the last tick.
157 185
158=item %cf::CFG 186=item %cf::CFG
159 187
160Configuration for the server, loaded from C</etc/crossfire/config>, or 188Configuration for the server, loaded from C</etc/deliantra-server/config>, or
161from wherever your confdir points to. 189from wherever your confdir points to.
162 190
163=item cf::wait_for_tick, cf::wait_for_tick_begin 191=item cf::wait_for_tick, cf::wait_for_tick_begin
164 192
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 193These 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 194returns 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. 195per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 196
197=item @cf::INVOKE_RESULTS
198
199This array contains the results of the last C<invoke ()> call. When
200C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
201that call.
202
169=back 203=back
170 204
171=cut 205=cut
172 206
173BEGIN { 207BEGIN {
177 $msg .= "\n" 211 $msg .= "\n"
178 unless $msg =~ /\n$/; 212 unless $msg =~ /\n$/;
179 213
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 214 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181 215
182 utf8::encode $msg;
183 LOG llevError, $msg; 216 LOG llevError, $msg;
184 }; 217 };
185} 218}
219
220$Coro::State::DIEHOOK = sub {
221 return unless $^S eq 0; # "eq", not "=="
222
223 if ($Coro::current == $Coro::main) {#d#
224 warn "DIEHOOK called in main context, Coro bug?\n";#d#
225 return;#d#
226 }#d#
227
228 # kill coroutine otherwise
229 warn Carp::longmess $_[0];
230 Coro::terminate
231};
232
233$SIG{__DIE__} = sub { }; #d#?
186 234
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
203)) { 251)) {
204 no strict 'refs'; 252 no strict 'refs';
205 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
206} 254}
207 255
208$Event::DIED = sub { 256$EV::DIED = sub {
209 warn "error in event callback: @_"; 257 warn "error in event callback: @_";
210}; 258};
211 259
212############################################################################# 260#############################################################################
213 261
236 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 284 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
237 $d 285 $d
238 } || "[unable to dump $_[0]: '$@']"; 286 } || "[unable to dump $_[0]: '$@']";
239} 287}
240 288
241use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
242
243=item $ref = cf::from_json $json 289=item $ref = cf::decode_json $json
244 290
245Converts a JSON string into the corresponding perl data structure. 291Converts a JSON string into the corresponding perl data structure.
246 292
247=item $json = cf::to_json $ref 293=item $json = cf::encode_json $ref
248 294
249Converts a perl data structure into its JSON representation. 295Converts a perl data structure into its JSON representation.
296
297=cut
298
299our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
300
301sub encode_json($) { $json_coder->encode ($_[0]) }
302sub decode_json($) { $json_coder->decode ($_[0]) }
250 303
251=item cf::lock_wait $string 304=item cf::lock_wait $string
252 305
253Wait until the given lock is available. See cf::lock_acquire. 306Wait until the given lock is available. See cf::lock_acquire.
254 307
257Wait until the given lock is available and then acquires it and returns 310Wait until the given lock is available and then acquires it and returns
258a Coro::guard object. If the guard object gets destroyed (goes out of scope, 311a Coro::guard object. If the guard object gets destroyed (goes out of scope,
259for example when the coroutine gets canceled), the lock is automatically 312for example when the coroutine gets canceled), the lock is automatically
260returned. 313returned.
261 314
315Locks are *not* recursive, locking from the same coro twice results in a
316deadlocked coro.
317
262Lock names should begin with a unique identifier (for example, cf::map::find 318Lock names should begin with a unique identifier (for example, cf::map::find
263uses map_find and cf::map::load uses map_load). 319uses map_find and cf::map::load uses map_load).
264 320
265=item $locked = cf::lock_active $string 321=item $locked = cf::lock_active $string
266 322
267Return true if the lock is currently active, i.e. somebody has locked it. 323Return true if the lock is currently active, i.e. somebody has locked it.
268 324
269=cut 325=cut
270 326
271our %LOCK; 327our %LOCK;
328our %LOCKER;#d#
272 329
273sub lock_wait($) { 330sub lock_wait($) {
274 my ($key) = @_; 331 my ($key) = @_;
332
333 if ($LOCKER{$key} == $Coro::current) {#d#
334 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
335 return;#d#
336 }#d#
275 337
276 # wait for lock, if any 338 # wait for lock, if any
277 while ($LOCK{$key}) { 339 while ($LOCK{$key}) {
278 push @{ $LOCK{$key} }, $Coro::current; 340 push @{ $LOCK{$key} }, $Coro::current;
279 Coro::schedule; 341 Coro::schedule;
285 347
286 # wait, to be sure we are not locked 348 # wait, to be sure we are not locked
287 lock_wait $key; 349 lock_wait $key;
288 350
289 $LOCK{$key} = []; 351 $LOCK{$key} = [];
352 $LOCKER{$key} = $Coro::current;#d#
290 353
291 Coro::guard { 354 Coro::guard {
355 delete $LOCKER{$key};#d#
292 # wake up all waiters, to be on the safe side 356 # wake up all waiters, to be on the safe side
293 $_->ready for @{ delete $LOCK{$key} }; 357 $_->ready for @{ delete $LOCK{$key} };
294 } 358 }
295} 359}
296 360
299 363
300 ! ! $LOCK{$key} 364 ! ! $LOCK{$key}
301} 365}
302 366
303sub freeze_mainloop { 367sub freeze_mainloop {
304 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
305 369
306 my $guard = Coro::guard { 370 Coro::guard \&tick_inhibit_dec;
307 $TICK_WATCHER->start; 371}
372
373=item cf::periodic $interval, $cb
374
375Like EV::periodic, but randomly selects a starting point so that the actions
376get spread over timer.
377
378=cut
379
380sub periodic($$) {
381 my ($interval, $cb) = @_;
382
383 my $start = rand List::Util::min 180, $interval;
384
385 EV::periodic $start, $interval, 0, $cb
386}
387
388=item cf::get_slot $time[, $priority[, $name]]
389
390Allocate $time seconds of blocking CPU time at priority C<$priority>:
391This call blocks and returns only when you have at least C<$time> seconds
392of cpu time till the next tick. The slot is only valid till the next cede.
393
394The optional C<$name> can be used to identify the job to run. It might be
395used for statistical purposes and should identify the same time-class.
396
397Useful for short background jobs.
398
399=cut
400
401our @SLOT_QUEUE;
402our $SLOT_QUEUE;
403
404$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager");
407
408 my $signal = new Coro::Signal;
409
410 while () {
411 next_job:
412 my $avail = cf::till_tick;
413 if ($avail > 0.01) {
414 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) {
416 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send;
418 Coro::cede;
419 goto next_job;
420 }
421 }
422 }
423
424 if (@SLOT_QUEUE) {
425 # we do not use wait_for_tick() as it returns immediately when tick is inactive
426 push @cf::WAIT_FOR_TICK, $signal;
427 $signal->wait;
428 } else {
429 Coro::schedule;
430 }
308 }; 431 }
309 $TICK_WATCHER->stop; 432};
310 $guard 433
434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
437 my ($time, $pri, $name) = @_;
438
439 $time = $TICK * .6 if $time > $TICK * .6;
440 my $sig = new Coro::Signal;
441
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready;
445 $sig->wait;
311} 446}
312 447
313=item cf::async { BLOCK } 448=item cf::async { BLOCK }
314 449
315Currently the same as Coro::async_pool, meaning you cannot use 450Currently the same as Coro::async_pool, meaning you cannot use
320 455
321BEGIN { *async = \&Coro::async_pool } 456BEGIN { *async = \&Coro::async_pool }
322 457
323=item cf::sync_job { BLOCK } 458=item cf::sync_job { BLOCK }
324 459
325The design of Crossfire TRT requires that the main coroutine ($Coro::main) 460The design of Deliantra requires that the main coroutine ($Coro::main)
326is always able to handle events or runnable, as Crossfire TRT is only 461is always able to handle events or runnable, as Deliantra is only
327partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 462partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
328acceptable. 463acceptable.
329 464
330If it must be done, put the blocking parts into C<sync_job>. This will run 465If it must be done, put the blocking parts into C<sync_job>. This will run
331the given BLOCK in another coroutine while waiting for the result. The 466the given BLOCK in another coroutine while waiting for the result. The
336 471
337sub sync_job(&) { 472sub sync_job(&) {
338 my ($job) = @_; 473 my ($job) = @_;
339 474
340 if ($Coro::current == $Coro::main) { 475 if ($Coro::current == $Coro::main) {
341 my $time = Event::time; 476 my $time = EV::time;
342 477
343 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
344 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
345 480
346 # TODO: use suspend/resume instead 481 LOG llevError, Carp::longmess "sync job";#d#
347 # (but this is cancel-safe) 482
348 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
349 484
350 my $busy = 1; 485 my $busy = 1;
351 my @res; 486 my @res;
352 487
353 (async { 488 (async {
489 $Coro::current->desc ("sync job coro");
354 @res = eval { $job->() }; 490 @res = eval { $job->() };
355 warn $@ if $@; 491 warn $@ if $@;
356 undef $busy; 492 undef $busy;
357 })->prio (Coro::PRIO_MAX); 493 })->prio (Coro::PRIO_MAX);
358 494
359 while ($busy) { 495 while ($busy) {
360 Coro::cede or Event::one_event; 496 if (Coro::nready) {
497 Coro::cede_notself;
498 } else {
499 EV::loop EV::LOOP_ONESHOT;
361 } 500 }
501 }
362 502
363 $time = Event::time - $time; 503 my $time = EV::time - $time;
364 504
365 LOG llevError | logBacktrace, Carp::longmess "long sync job"
366 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
367
368 $tick_start += $time; # do not account sync jobs to server load 505 $TICK_START += $time; # do not account sync jobs to server load
369 506
370 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
371 } else { 508 } else {
372 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
373 510
398=item fork_call { }, $args 535=item fork_call { }, $args
399 536
400Executes the given code block with the given arguments in a seperate 537Executes the given code block with the given arguments in a seperate
401process, returning the results. Everything must be serialisable with 538process, returning the results. Everything must be serialisable with
402Coro::Storable. May, of course, block. Note that the executed sub may 539Coro::Storable. May, of course, block. Note that the executed sub may
403never block itself or use any form of Event handling. 540never block itself or use any form of event handling.
404 541
405=cut 542=cut
406 543
407sub fork_call(&@) { 544sub fork_call(&@) {
408 my ($cb, @args) = @_; 545 my ($cb, @args) = @_;
409 546
410# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 547 # we seemingly have to make a local copy of the whole thing,
411# or die "socketpair: $!"; 548 # otherwise perl prematurely frees the stuff :/
412 pipe my $fh1, my $fh2 549 # TODO: investigate and fix (likely this will be rather laborious)
413 or die "pipe: $!";
414 550
415 if (my $pid = fork) { 551 my @res = Coro::Util::fork_eval {
416 close $fh2;
417
418 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
419 $res = Coro::Storable::thaw $res;
420
421 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
422
423 die $$res unless "ARRAY" eq ref $res;
424
425 return wantarray ? @$res : $res->[-1];
426 } else {
427 reset_signals; 552 reset_signals;
428 local $SIG{__WARN__}; 553 &$cb
429 local $SIG{__DIE__}; 554 }, @args;
430 eval {
431 close $fh1;
432 555
433 my @res = eval { $cb->(@args) }; 556 wantarray ? @res : $res[-1]
434 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 557}
435 };
436 558
437 warn $@ if $@; 559=item $coin = coin_from_name $name
438 _exit 0; 560
439 } 561=cut
562
563our %coin_alias = (
564 "silver" => "silvercoin",
565 "silvercoin" => "silvercoin",
566 "silvercoins" => "silvercoin",
567 "gold" => "goldcoin",
568 "goldcoin" => "goldcoin",
569 "goldcoins" => "goldcoin",
570 "platinum" => "platinacoin",
571 "platinumcoin" => "platinacoin",
572 "platinumcoins" => "platinacoin",
573 "platina" => "platinacoin",
574 "platinacoin" => "platinacoin",
575 "platinacoins" => "platinacoin",
576 "royalty" => "royalty",
577 "royalties" => "royalty",
578);
579
580sub coin_from_name($) {
581 $coin_alias{$_[0]}
582 ? cf::arch::find $coin_alias{$_[0]}
583 : undef
440} 584}
441 585
442=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
443 587
444Returns a single value from the environment database. 588Returns a single value from the environment database.
446=item cf::db_put $family => $key => $value 590=item cf::db_put $family => $key => $value
447 591
448Stores the given C<$value> in the family. It can currently store binary 592Stores the given C<$value> in the family. It can currently store binary
449data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 593data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
450 594
595=item $db = cf::db_table "name"
596
597Create and/or open a new database table. The string must not be "db" and must be unique
598within each server.
599
451=cut 600=cut
601
602sub db_table($) {
603 my ($name) = @_;
604 my $db = BDB::db_create $DB_ENV;
605
606 eval {
607 $db->set_flags (BDB::CHKSUM);
608
609 utf8::encode $name;
610 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
611 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
612 cf::cleanup "db_open(db): $!" if $!;
613 };
614 cf::cleanup "db_open(db): $@" if $@;
615
616 $db
617}
452 618
453our $DB; 619our $DB;
454 620
455sub db_init { 621sub db_init {
456 unless ($DB) {
457 $DB = BDB::db_create $DB_ENV;
458
459 cf::sync_job { 622 cf::sync_job {
460 eval { 623 $DB ||= db_table "db";
461 $DB->set_flags (BDB::CHKSUM);
462
463 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
464 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
465 cf::cleanup "db_open(db): $!" if $!;
466 };
467 cf::cleanup "db_open(db): $@" if $@;
468 };
469 } 624 };
470} 625}
471 626
472sub db_get($$) { 627sub db_get($$) {
473 my $key = "$_[0]/$_[1]"; 628 my $key = "$_[0]/$_[1]";
474 629
524 if (1) { 679 if (1) {
525 $md5 = 680 $md5 =
526 join "\x00", 681 join "\x00",
527 $processversion, 682 $processversion,
528 map { 683 map {
529 Coro::cede; 684 cf::cede_to_tick;
530 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 685 ($src->[$_], Digest::MD5::md5_hex $data[$_])
531 } 0.. $#$src; 686 } 0.. $#$src;
532 687
533 688
534 my $dbmd5 = db_get cache => "$id/md5"; 689 my $dbmd5 = db_get cache => "$id/md5";
578attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
579to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
580 735
581In the following description, CLASS can be any of C<global>, C<object> 736In the following description, CLASS can be any of C<global>, C<object>
582C<player>, C<client> or C<map> (i.e. the attachable objects in 737C<player>, C<client> or C<map> (i.e. the attachable objects in
583Crossfire TRT). 738Deliantra).
584 739
585=over 4 740=over 4
586 741
587=item $attachable->attach ($attachment, key => $value...) 742=item $attachable->attach ($attachment, key => $value...)
588 743
840 "; 995 ";
841 die if $@; 996 die if $@;
842} 997}
843 998
844our $override; 999our $override;
845our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 1000our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
846 1001
847sub override { 1002sub override {
848 $override = 1; 1003 $override = 1;
849 @invoke_results = (); 1004 @INVOKE_RESULTS = (@_);
850} 1005}
851 1006
852sub do_invoke { 1007sub do_invoke {
853 my $event = shift; 1008 my $event = shift;
854 my $callbacks = shift; 1009 my $callbacks = shift;
855 1010
856 @invoke_results = (); 1011 @INVOKE_RESULTS = ();
857 1012
858 local $override; 1013 local $override;
859 1014
860 for (@$callbacks) { 1015 for (@$callbacks) {
861 eval { &{$_->[1]} }; 1016 eval { &{$_->[1]} };
870 } 1025 }
871 1026
872 0 1027 0
873} 1028}
874 1029
875=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
876 1031
877=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
878 1033
879Generate an object-specific event with the given arguments. 1034Generate an object-specific event with the given arguments.
880 1035
881This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1036This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
882removed in future versions), and there is no public API to access override 1037removed in future versions), and there is no public API to access override
883results (if you must, access C<@cf::invoke_results> directly). 1038results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884 1039
885=back 1040=back
886 1041
887=cut 1042=cut
888 1043
889############################################################################# 1044#############################################################################
890# object support 1045# object support
1046
1047sub _object_equal($$);
1048sub _object_equal($$) {
1049 my ($a, $b) = @_;
1050
1051 return 0 unless (ref $a) eq (ref $b);
1052
1053 if ("HASH" eq ref $a) {
1054 my @ka = keys %$a;
1055 my @kb = keys %$b;
1056
1057 return 0 if @ka != @kb;
1058
1059 for (0 .. $#ka) {
1060 return 0 unless $ka[$_] eq $kb[$_];
1061 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1062 }
1063
1064 } elsif ("ARRAY" eq ref $a) {
1065
1066 return 0 if @$a != @$b;
1067
1068 for (0 .. $#$a) {
1069 return 0 unless _object_equal $a->[$_], $b->[$_];
1070 }
1071
1072 } elsif ($a ne $b) {
1073 return 0;
1074 }
1075
1076 1
1077}
1078
1079our $SLOW_MERGES;#d#
1080sub _can_merge {
1081 my ($ob1, $ob2) = @_;
1082
1083 ++$SLOW_MERGES;#d#
1084
1085 # we do the slow way here
1086 return _object_equal $ob1, $ob2
1087}
891 1088
892sub reattach { 1089sub reattach {
893 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
894 my ($obj) = @_; 1091 my ($obj) = @_;
895 1092
916cf::attachable->attach ( 1113cf::attachable->attach (
917 prio => -1000000, 1114 prio => -1000000,
918 on_instantiate => sub { 1115 on_instantiate => sub {
919 my ($obj, $data) = @_; 1116 my ($obj, $data) = @_;
920 1117
921 $data = from_json $data; 1118 $data = decode_json $data;
922 1119
923 for (@$data) { 1120 for (@$data) {
924 my ($name, $args) = @$_; 1121 my ($name, $args) = @$_;
925 1122
926 $obj->attach ($name, %{$args || {} }); 1123 $obj->attach ($name, %{$args || {} });
942sub object_freezer_save { 1139sub object_freezer_save {
943 my ($filename, $rdata, $objs) = @_; 1140 my ($filename, $rdata, $objs) = @_;
944 1141
945 sync_job { 1142 sync_job {
946 if (length $$rdata) { 1143 if (length $$rdata) {
1144 utf8::decode (my $decname = $filename);
947 warn sprintf "saving %s (%d,%d)\n", 1145 warn sprintf "saving %s (%d,%d)\n",
948 $filename, length $$rdata, scalar @$objs; 1146 $decname, length $$rdata, scalar @$objs;
949 1147
950 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1148 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
951 chmod SAVE_MODE, $fh; 1149 aio_chmod $fh, SAVE_MODE;
952 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1150 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
953 aio_fsync $fh if $cf::USE_FSYNC; 1151 aio_fsync $fh if $cf::USE_FSYNC;
954 close $fh; 1152 aio_close $fh;
955 1153
956 if (@$objs) { 1154 if (@$objs) {
957 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1155 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
958 chmod SAVE_MODE, $fh; 1156 aio_chmod $fh, SAVE_MODE;
959 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1157 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
960 aio_write $fh, 0, (length $data), $data, 0; 1158 aio_write $fh, 0, (length $data), $data, 0;
961 aio_fsync $fh if $cf::USE_FSYNC; 1159 aio_fsync $fh if $cf::USE_FSYNC;
962 close $fh; 1160 aio_close $fh;
963 aio_rename "$filename.pst~", "$filename.pst"; 1161 aio_rename "$filename.pst~", "$filename.pst";
964 } 1162 }
965 } else { 1163 } else {
966 aio_unlink "$filename.pst"; 1164 aio_unlink "$filename.pst";
967 } 1165 }
972 } 1170 }
973 } else { 1171 } else {
974 aio_unlink $filename; 1172 aio_unlink $filename;
975 aio_unlink "$filename.pst"; 1173 aio_unlink "$filename.pst";
976 } 1174 }
977 } 1175 };
978} 1176}
979 1177
980sub object_freezer_as_string { 1178sub object_freezer_as_string {
981 my ($rdata, $objs) = @_; 1179 my ($rdata, $objs) = @_;
982 1180
994 or return; 1192 or return;
995 1193
996 unless (aio_stat "$filename.pst") { 1194 unless (aio_stat "$filename.pst") {
997 (aio_load "$filename.pst", $av) >= 0 1195 (aio_load "$filename.pst", $av) >= 0
998 or return; 1196 or return;
1197
999 $av = eval { (Storable::thaw $av)->{objs} }; 1198 my $st = eval { Coro::Storable::thaw $av };
1199 $av = $st->{objs};
1000 } 1200 }
1001 1201
1202 utf8::decode (my $decname = $filename);
1002 warn sprintf "loading %s (%d)\n", 1203 warn sprintf "loading %s (%d,%d)\n",
1003 $filename, length $data, scalar @{$av || []}; 1204 $decname, length $data, scalar @{$av || []};
1205
1004 return ($data, $av); 1206 ($data, $av)
1005} 1207}
1006 1208
1007=head2 COMMAND CALLBACKS 1209=head2 COMMAND CALLBACKS
1008 1210
1009=over 4 1211=over 4
1029 push @{ $COMMAND{$name} }, [$caller, $cb]; 1231 push @{ $COMMAND{$name} }, [$caller, $cb];
1030} 1232}
1031 1233
1032=item cf::register_extcmd $name => \&callback($pl,$packet); 1234=item cf::register_extcmd $name => \&callback($pl,$packet);
1033 1235
1034Register a callback fro execution when the client sends an extcmd packet. 1236Register a callback for execution when the client sends an (synchronous)
1237extcmd packet. Ext commands will be processed in the order they are
1238received by the server, like other user commands. The first argument is
1239the logged-in player. Ext commands can only be processed after a player
1240has logged in successfully.
1035 1241
1036If the callback returns something, it is sent back as if reply was being 1242If the callback returns something, it is sent back as if reply was being
1037called. 1243called.
1038 1244
1245=item cf::register_exticmd $name => \&callback($ns,$packet);
1246
1247Register a callback for execution when the client sends an (asynchronous)
1248exticmd packet. Exti commands are processed by the server as soon as they
1249are received, i.e. out of order w.r.t. other commands. The first argument
1250is a client socket. Exti commands can be received anytime, even before
1251log-in.
1252
1253If the callback returns something, it is sent back as if reply was being
1254called.
1255
1039=cut 1256=cut
1040 1257
1041sub register_extcmd { 1258sub register_extcmd {
1042 my ($name, $cb) = @_; 1259 my ($name, $cb) = @_;
1043 1260
1044 $EXTCMD{$name} = $cb; 1261 $EXTCMD{$name} = $cb;
1262}
1263
1264sub register_exticmd {
1265 my ($name, $cb) = @_;
1266
1267 $EXTICMD{$name} = $cb;
1045} 1268}
1046 1269
1047cf::player->attach ( 1270cf::player->attach (
1048 on_command => sub { 1271 on_command => sub {
1049 my ($pl, $name, $params) = @_; 1272 my ($pl, $name, $params) = @_;
1058 cf::override; 1281 cf::override;
1059 }, 1282 },
1060 on_extcmd => sub { 1283 on_extcmd => sub {
1061 my ($pl, $buf) = @_; 1284 my ($pl, $buf) = @_;
1062 1285
1063 my $msg = eval { from_json $buf }; 1286 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064 1287
1065 if (ref $msg) { 1288 if (ref $msg) {
1289 my ($type, $reply, @payload) =
1290 "ARRAY" eq ref $msg
1291 ? @$msg
1292 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1293
1294 my @reply;
1295
1066 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1296 if (my $cb = $EXTCMD{$type}) {
1067 if (my %reply = $cb->($pl, $msg)) { 1297 @reply = $cb->($pl, @payload);
1068 $pl->ext_reply ($msg->{msgid}, %reply);
1069 }
1070 } 1298 }
1299
1300 $pl->ext_reply ($reply, @reply)
1301 if $reply;
1302
1071 } else { 1303 } else {
1072 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1304 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073 } 1305 }
1074 1306
1075 cf::override; 1307 cf::override;
1128 my $msg = $@ ? "$v->{path}: $@\n" 1360 my $msg = $@ ? "$v->{path}: $@\n"
1129 : "$v->{base}: extension inactive.\n"; 1361 : "$v->{base}: extension inactive.\n";
1130 1362
1131 if (exists $v->{meta}{mandatory}) { 1363 if (exists $v->{meta}{mandatory}) {
1132 warn $msg; 1364 warn $msg;
1133 warn "mandatory extension failed to load, exiting.\n"; 1365 cf::cleanup "mandatory extension failed to load, exiting.";
1134 exit 1;
1135 } 1366 }
1136 1367
1137 warn $msg; 1368 warn $msg;
1138 } 1369 }
1139 1370
1164use Coro::AIO; 1395use Coro::AIO;
1165 1396
1166=head3 cf::player 1397=head3 cf::player
1167 1398
1168=over 4 1399=over 4
1400
1401=item cf::player::num_playing
1402
1403Returns the official number of playing players, as per the Crossfire metaserver rules.
1404
1405=cut
1406
1407sub num_playing {
1408 scalar grep
1409 $_->ob->map
1410 && !$_->hidden
1411 && !$_->ob->flag (cf::FLAG_WIZ),
1412 cf::player::list
1413}
1169 1414
1170=item cf::player::find $login 1415=item cf::player::find $login
1171 1416
1172Returns the given player object, loading it if necessary (might block). 1417Returns the given player object, loading it if necessary (might block).
1173 1418
1209 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1454 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1210 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1455 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1211 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1456 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1212 aio_unlink +(playerdir $login) . "/$login.pl"; 1457 aio_unlink +(playerdir $login) . "/$login.pl";
1213 1458
1214 my $pl = load_pl path $login 1459 my $f = new_from_file cf::object::thawer path $login
1215 or return; 1460 or return;
1461
1462 my $pl = cf::player::load_pl $f
1463 or return;
1464
1465 local $cf::PLAYER_LOADING{$login} = $pl;
1466 $f->resolve_delayed_derefs;
1216 $cf::PLAYER{$login} = $pl 1467 $cf::PLAYER{$login} = $pl
1217 } 1468 }
1218 } 1469 }
1219} 1470}
1220 1471
1229 return if $pl->{deny_save}; 1480 return if $pl->{deny_save};
1230 1481
1231 aio_mkdir playerdir $pl, 0770; 1482 aio_mkdir playerdir $pl, 0770;
1232 $pl->{last_save} = $cf::RUNTIME; 1483 $pl->{last_save} = $cf::RUNTIME;
1233 1484
1485 cf::get_slot 0.01;
1486
1234 $pl->save_pl ($path); 1487 $pl->save_pl ($path);
1235 Coro::cede; 1488 cf::cede_to_tick;
1236} 1489}
1237 1490
1238sub new($) { 1491sub new($) {
1239 my ($login) = @_; 1492 my ($login) = @_;
1240 1493
1246 $cf::PLAYER{$login} = $self; 1499 $cf::PLAYER{$login} = $self;
1247 1500
1248 $self 1501 $self
1249} 1502}
1250 1503
1504=item $player->send_msg ($channel, $msg, $color, [extra...])
1505
1506=cut
1507
1508sub send_msg {
1509 my $ns = shift->ns
1510 or return;
1511 $ns->send_msg (@_);
1512}
1513
1251=item $pl->quit_character 1514=item $pl->quit_character
1252 1515
1253Nukes the player without looking back. If logged in, the connection will 1516Nukes the player without looking back. If logged in, the connection will
1254be destroyed. May block for a long time. 1517be destroyed. May block for a long time.
1255 1518
1263 $pl->{deny_save} = 1; 1526 $pl->{deny_save} = 1;
1264 $pl->password ("*"); # this should lock out the player until we nuked the dir 1527 $pl->password ("*"); # this should lock out the player until we nuked the dir
1265 1528
1266 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1529 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1267 $pl->deactivate; 1530 $pl->deactivate;
1531 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1532 $pl->ob->check_score;
1268 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1533 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1269 $pl->ns->destroy if $pl->ns; 1534 $pl->ns->destroy if $pl->ns;
1270 1535
1271 my $path = playerdir $pl; 1536 my $path = playerdir $pl;
1272 my $temp = "$path~$cf::RUNTIME~deleting~"; 1537 my $temp = "$path~$cf::RUNTIME~deleting~";
1308 or return []; 1573 or return [];
1309 1574
1310 my @logins; 1575 my @logins;
1311 1576
1312 for my $login (@$dirs) { 1577 for my $login (@$dirs) {
1578 my $path = path $login;
1579
1580 # a .pst is a dead give-away for a valid player
1581 # if no pst file found, open and chekc for blocked users
1582 if (aio_stat "$path.pst") {
1313 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1583 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1314 aio_read $fh, 0, 512, my $buf, 0 or next; 1584 aio_read $fh, 0, 512, my $buf, 0 or next;
1315 $buf !~ /^password -------------$/m or next; # official not-valid tag 1585 $buf !~ /^password -------------$/m or next; # official not-valid tag
1586 }
1316 1587
1317 utf8::decode $login; 1588 utf8::decode $login;
1318 push @logins, $login; 1589 push @logins, $login;
1319 } 1590 }
1320 1591
1353 1624
1354Expand crossfire pod fragments into protocol xml. 1625Expand crossfire pod fragments into protocol xml.
1355 1626
1356=cut 1627=cut
1357 1628
1629use re 'eval';
1630
1631my $group;
1632my $interior; $interior = qr{
1633 # match a pod interior sequence sans C<< >>
1634 (?:
1635 \ (.*?)\ (?{ $group = $^N })
1636 | < (??{$interior}) >
1637 )
1638}x;
1639
1358sub expand_cfpod { 1640sub expand_cfpod {
1359 ((my $self), (local $_)) = @_; 1641 my ($self, $pod) = @_;
1360 1642
1361 # escape & and < 1643 my $xml;
1362 s/&/&amp;/g;
1363 s/(?<![BIUGH])</&lt;/g;
1364 1644
1365 # this is buggy, it needs to properly take care of nested <'s 1645 while () {
1646 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1647 $group = $1;
1366 1648
1367 1 while 1649 $group =~ s/&/&amp;/g;
1368 # replace B<>, I<>, U<> etc. 1650 $group =~ s/</&lt;/g;
1369 s/B<([^\>]*)>/<b>$1<\/b>/ 1651
1370 || s/I<([^\>]*)>/<i>$1<\/i>/ 1652 $xml .= $group;
1371 || s/U<([^\>]*)>/<u>$1<\/u>/ 1653 } elsif ($pod =~ m%\G
1372 # replace G<male|female> tags 1654 ([BCGHITU])
1373 || s{G<([^>|]*)\|([^>]*)>}{ 1655 <
1374 $self->gender ? $2 : $1 1656 (?:
1657 ([^<>]*) (?{ $group = $^N })
1658 | < $interior >
1659 )
1660 >
1661 %gcsx
1662 ) {
1663 my ($code, $data) = ($1, $group);
1664
1665 if ($code eq "B") {
1666 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1667 } elsif ($code eq "I") {
1668 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1669 } elsif ($code eq "U") {
1670 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1671 } elsif ($code eq "C") {
1672 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1673 } elsif ($code eq "T") {
1674 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1675 } elsif ($code eq "G") {
1676 my ($male, $female) = split /\|/, $data;
1677 $data = $self->gender ? $female : $male;
1678 $xml .= expand_cfpod ($self, $data);
1679 } elsif ($code eq "H") {
1680 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1681 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1682 "")
1683 [$self->{hintmode}];
1684 } else {
1685 $xml .= "error processing '$code($data)' directive";
1686 }
1687 } else {
1688 if ($pod =~ /\G(.+)/) {
1689 warn "parse error while expanding $pod (at $1)";
1690 }
1691 last;
1375 }ge 1692 }
1376 # replace H<hint text> 1693 }
1377 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;
1378 1694
1695 for ($xml) {
1379 # create single paragraphs (very hackish) 1696 # create single paragraphs (very hackish)
1380 s/(?<=\S)\n(?=\w)/ /g; 1697 s/(?<=\S)\n(?=\w)/ /g;
1381 1698
1382 $_ 1699 # compress some whitespace
1383} 1700 s/\s+\n/\n/g; # ws line-ends
1701 s/\n\n+/\n/g; # double lines
1702 s/^\n+//; # beginning lines
1703 s/\n+$//; # ending lines
1704 }
1384 1705
1706 $xml
1707}
1708
1709no re 'eval';
1710
1711sub hintmode {
1712 $_[0]{hintmode} = $_[1] if @_ > 1;
1713 $_[0]{hintmode}
1714}
1715
1385=item $player->ext_reply ($msgid, %msg) 1716=item $player->ext_reply ($msgid, @msg)
1386 1717
1387Sends an ext reply to the player. 1718Sends an ext reply to the player.
1388 1719
1389=cut 1720=cut
1390 1721
1391sub ext_reply($$%) { 1722sub ext_reply($$@) {
1392 my ($self, $id, %msg) = @_; 1723 my ($self, $id, @msg) = @_;
1393 1724
1394 $msg{msgid} = $id; 1725 $self->ns->ext_reply ($id, @msg)
1395
1396 $self->send ("ext " . cf::to_json \%msg);
1397} 1726}
1398 1727
1399=item $player->ext_event ($type, %msg) 1728=item $player->ext_msg ($type, @msg)
1400 1729
1401Sends an ext event to the client. 1730Sends an ext event to the client.
1402 1731
1403=cut 1732=cut
1404 1733
1405sub ext_event($$%) { 1734sub ext_msg($$@) {
1406 my ($self, $type, %msg) = @_; 1735 my ($self, $type, @msg) = @_;
1407 1736
1408 $self->ns->ext_event ($type, %msg); 1737 $self->ns->ext_msg ($type, @msg);
1409} 1738}
1410 1739
1411=head3 cf::region 1740=head3 cf::region
1412 1741
1413=over 4 1742=over 4
1426 my ($path) = @_; 1755 my ($path) = @_;
1427 1756
1428 my ($match, $specificity); 1757 my ($match, $specificity);
1429 1758
1430 for my $region (list) { 1759 for my $region (list) {
1431 if ($region->match && $path =~ $region->match) { 1760 if ($region->{match} && $path =~ $region->{match}) {
1432 ($match, $specificity) = ($region, $region->specificity) 1761 ($match, $specificity) = ($region, $region->specificity)
1433 if $region->specificity > $specificity; 1762 if $region->specificity > $specificity;
1434 } 1763 }
1435 } 1764 }
1436 1765
1457our $MAX_RESET = 3600; 1786our $MAX_RESET = 3600;
1458our $DEFAULT_RESET = 3000; 1787our $DEFAULT_RESET = 3000;
1459 1788
1460sub generate_random_map { 1789sub generate_random_map {
1461 my ($self, $rmp) = @_; 1790 my ($self, $rmp) = @_;
1791
1792 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1793
1462 # mit "rum" bekleckern, nicht 1794 # mit "rum" bekleckern, nicht
1463 $self->_create_random_map ( 1795 $self->_create_random_map (
1464 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1796 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1465 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1797 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1466 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1798 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1556 $self->init; # pass $1 etc. 1888 $self->init; # pass $1 etc.
1557 return $self; 1889 return $self;
1558 } 1890 }
1559 } 1891 }
1560 1892
1561 Carp::carp "unable to resolve path '$path' (base '$base')."; 1893 Carp::cluck "unable to resolve path '$path' (base '$base').";
1562 () 1894 ()
1563} 1895}
1564 1896
1565sub init { 1897sub init {
1566 my ($self) = @_; 1898 my ($self) = @_;
1588 1920
1589# the temporary/swap location 1921# the temporary/swap location
1590sub save_path { 1922sub save_path {
1591 my ($self) = @_; 1923 my ($self) = @_;
1592 1924
1593 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1925 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1594 "$TMPDIR/$path.map" 1926 "$TMPDIR/$path.map"
1595} 1927}
1596 1928
1597# the unique path, undef == no special unique path 1929# the unique path, undef == no special unique path
1598sub uniq_path { 1930sub uniq_path {
1599 my ($self) = @_; 1931 my ($self) = @_;
1600 1932
1601 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1933 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1602 "$UNIQUEDIR/$path" 1934 "$UNIQUEDIR/$path"
1603} 1935}
1604 1936
1605# and all this just because we cannot iterate over 1937# and all this just because we cannot iterate over
1606# all maps in C++... 1938# all maps in C++...
1629 1961
1630sub load_header_from($) { 1962sub load_header_from($) {
1631 my ($self, $path) = @_; 1963 my ($self, $path) = @_;
1632 1964
1633 utf8::encode $path; 1965 utf8::encode $path;
1634 #aio_open $path, O_RDONLY, 0 1966 my $f = new_from_file cf::object::thawer $path
1635 # or return;
1636
1637 $self->_load_header ($path)
1638 or return; 1967 or return;
1968
1969 $self->_load_header ($f)
1970 or return;
1971
1972 local $MAP_LOADING{$self->{path}} = $self;
1973 $f->resolve_delayed_derefs;
1639 1974
1640 $self->{load_path} = $path; 1975 $self->{load_path} = $path;
1641 1976
1642 1 1977 1
1643} 1978}
1697sub find { 2032sub find {
1698 my ($path, $origin) = @_; 2033 my ($path, $origin) = @_;
1699 2034
1700 $path = normalise $path, $origin && $origin->path; 2035 $path = normalise $path, $origin && $origin->path;
1701 2036
2037 cf::lock_wait "map_data:$path";#d#remove
1702 cf::lock_wait "map_find:$path"; 2038 cf::lock_wait "map_find:$path";
1703 2039
1704 $cf::MAP{$path} || do { 2040 $cf::MAP{$path} || do {
2041 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1705 my $guard = cf::lock_acquire "map_find:$path"; 2042 my $guard2 = cf::lock_acquire "map_find:$path";
2043
1706 my $map = new_from_path cf::map $path 2044 my $map = new_from_path cf::map $path
1707 or return; 2045 or return;
1708 2046
1709 $map->{last_save} = $cf::RUNTIME; 2047 $map->{last_save} = $cf::RUNTIME;
1710 2048
1712 or return; 2050 or return;
1713 2051
1714 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2052 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1715 # doing this can freeze the server in a sync job, obviously 2053 # doing this can freeze the server in a sync job, obviously
1716 #$cf::WAIT_FOR_TICK->wait; 2054 #$cf::WAIT_FOR_TICK->wait;
2055 undef $guard2;
2056 undef $guard1;
1717 $map->reset; 2057 $map->reset;
1718 undef $guard;
1719 return find $path; 2058 return find $path;
1720 } 2059 }
1721 2060
1722 $cf::MAP{$path} = $map 2061 $cf::MAP{$path} = $map
1723 } 2062 }
1732 local $self->{deny_reset} = 1; # loading can take a long time 2071 local $self->{deny_reset} = 1; # loading can take a long time
1733 2072
1734 my $path = $self->{path}; 2073 my $path = $self->{path};
1735 2074
1736 { 2075 {
1737 my $guard = cf::lock_acquire "map_load:$path"; 2076 my $guard = cf::lock_acquire "map_data:$path";
1738 2077
2078 return unless $self->valid;
1739 return if $self->in_memory != cf::MAP_SWAPPED; 2079 return unless $self->in_memory == cf::MAP_SWAPPED;
1740 2080
1741 $self->in_memory (cf::MAP_LOADING); 2081 $self->in_memory (cf::MAP_LOADING);
1742 2082
1743 $self->alloc; 2083 $self->alloc;
1744 2084
1745 $self->pre_load; 2085 $self->pre_load;
1746 Coro::cede; 2086 cf::cede_to_tick;
1747 2087
2088 my $f = new_from_file cf::object::thawer $self->{load_path};
2089 $f->skip_block;
1748 $self->_load_objects ($self->{load_path}, 1) 2090 $self->_load_objects ($f)
1749 or return; 2091 or return;
1750 2092
1751 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2093 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1752 if delete $self->{load_original}; 2094 if delete $self->{load_original};
1753 2095
1754 if (my $uniq = $self->uniq_path) { 2096 if (my $uniq = $self->uniq_path) {
1755 utf8::encode $uniq; 2097 utf8::encode $uniq;
1756 if (aio_open $uniq, O_RDONLY, 0) { 2098 unless (aio_stat $uniq) {
2099 if (my $f = new_from_file cf::object::thawer $uniq) {
1757 $self->clear_unique_items; 2100 $self->clear_unique_items;
1758 $self->_load_objects ($uniq, 0); 2101 $self->_load_objects ($f);
2102 $f->resolve_delayed_derefs;
2103 }
1759 } 2104 }
1760 } 2105 }
1761 2106
1762 Coro::cede; 2107 $f->resolve_delayed_derefs;
2108
2109 cf::cede_to_tick;
1763 # now do the right thing for maps 2110 # now do the right thing for maps
1764 $self->link_multipart_objects; 2111 $self->link_multipart_objects;
1765 $self->difficulty ($self->estimate_difficulty) 2112 $self->difficulty ($self->estimate_difficulty)
1766 unless $self->difficulty; 2113 unless $self->difficulty;
1767 Coro::cede; 2114 cf::cede_to_tick;
1768 2115
1769 unless ($self->{deny_activate}) { 2116 unless ($self->{deny_activate}) {
1770 $self->decay_objects; 2117 $self->decay_objects;
1771 $self->fix_auto_apply; 2118 $self->fix_auto_apply;
1772 $self->update_buttons; 2119 $self->update_buttons;
1773 Coro::cede; 2120 cf::cede_to_tick;
1774 $self->set_darkness_map; 2121 $self->set_darkness_map;
1775 Coro::cede; 2122 cf::cede_to_tick;
1776 $self->activate; 2123 $self->activate;
1777 } 2124 }
1778 2125
2126 $self->{last_save} = $cf::RUNTIME;
2127 $self->last_access ($cf::RUNTIME);
2128
1779 $self->in_memory (cf::MAP_IN_MEMORY); 2129 $self->in_memory (cf::MAP_ACTIVE);
1780 } 2130 }
1781 2131
1782 $self->post_load; 2132 $self->post_load;
1783} 2133}
1784 2134
1793 2143
1794 $self 2144 $self
1795} 2145}
1796 2146
1797# find and load all maps in the 3x3 area around a map 2147# find and load all maps in the 3x3 area around a map
1798sub load_diag { 2148sub load_neighbours {
1799 my ($map) = @_; 2149 my ($map) = @_;
1800 2150
1801 my @diag; # diagonal neighbours 2151 my @neigh; # diagonal neighbours
1802 2152
1803 for (0 .. 3) { 2153 for (0 .. 3) {
1804 my $neigh = $map->tile_path ($_) 2154 my $neigh = $map->tile_path ($_)
1805 or next; 2155 or next;
1806 $neigh = find $neigh, $map 2156 $neigh = find $neigh, $map
1807 or next; 2157 or next;
1808 $neigh->load; 2158 $neigh->load;
1809 2159
2160 push @neigh,
1810 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2161 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1811 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2162 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1812 } 2163 }
1813 2164
1814 for (@diag) { 2165 for (grep defined $_->[0], @neigh) {
2166 my ($path, $origin) = @$_;
1815 my $neigh = find @$_ 2167 my $neigh = find $path, $origin
1816 or next; 2168 or next;
1817 $neigh->load; 2169 $neigh->load;
1818 } 2170 }
1819} 2171}
1820 2172
1825} 2177}
1826 2178
1827sub do_load_sync { 2179sub do_load_sync {
1828 my ($map) = @_; 2180 my ($map) = @_;
1829 2181
2182 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2183 if $Coro::current == $Coro::main;
2184
1830 cf::sync_job { $map->load }; 2185 cf::sync_job { $map->load };
1831} 2186}
1832 2187
1833our %MAP_PREFETCH; 2188our %MAP_PREFETCH;
1834our $MAP_PREFETCHER = undef; 2189our $MAP_PREFETCHER = undef;
1835 2190
1836sub find_async { 2191sub find_async {
1837 my ($path, $origin) = @_; 2192 my ($path, $origin, $load) = @_;
1838 2193
1839 $path = normalise $path, $origin && $origin->{path}; 2194 $path = normalise $path, $origin && $origin->{path};
1840 2195
1841 if (my $map = $cf::MAP{$path}) { 2196 if (my $map = $cf::MAP{$path}) {
1842 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2197 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1843 } 2198 }
1844 2199
1845 undef $MAP_PREFETCH{$path}; 2200 $MAP_PREFETCH{$path} |= $load;
2201
1846 $MAP_PREFETCHER ||= cf::async { 2202 $MAP_PREFETCHER ||= cf::async {
2203 $Coro::current->{desc} = "map prefetcher";
2204
1847 while (%MAP_PREFETCH) { 2205 while (%MAP_PREFETCH) {
1848 for my $path (keys %MAP_PREFETCH) { 2206 while (my ($k, $v) = each %MAP_PREFETCH) {
1849 my $map = find $path 2207 if (my $map = find $k) {
1850 or next;
1851 $map->load; 2208 $map->load if $v;
2209 }
1852 2210
1853 delete $MAP_PREFETCH{$path}; 2211 delete $MAP_PREFETCH{$k};
1854 } 2212 }
1855 } 2213 }
1856 undef $MAP_PREFETCHER; 2214 undef $MAP_PREFETCHER;
1857 }; 2215 };
1858 $MAP_PREFETCHER->prio (6); 2216 $MAP_PREFETCHER->prio (6);
1861} 2219}
1862 2220
1863sub save { 2221sub save {
1864 my ($self) = @_; 2222 my ($self) = @_;
1865 2223
1866 my $lock = cf::lock_acquire "map_data:" . $self->path; 2224 my $lock = cf::lock_acquire "map_data:$self->{path}";
1867 2225
1868 $self->{last_save} = $cf::RUNTIME; 2226 $self->{last_save} = $cf::RUNTIME;
1869 2227
1870 return unless $self->dirty; 2228 return unless $self->dirty;
1871 2229
1877 return if $self->{deny_save}; 2235 return if $self->{deny_save};
1878 2236
1879 local $self->{last_access} = $self->last_access;#d# 2237 local $self->{last_access} = $self->last_access;#d#
1880 2238
1881 cf::async { 2239 cf::async {
2240 $Coro::current->{desc} = "map player save";
1882 $_->contr->save for $self->players; 2241 $_->contr->save for $self->players;
1883 }; 2242 };
2243
2244 cf::get_slot 0.02;
1884 2245
1885 if ($uniq) { 2246 if ($uniq) {
1886 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2247 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1887 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2248 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1888 } else { 2249 } else {
1894 my ($self) = @_; 2255 my ($self) = @_;
1895 2256
1896 # save first because save cedes 2257 # save first because save cedes
1897 $self->save; 2258 $self->save;
1898 2259
1899 my $lock = cf::lock_acquire "map_data:" . $self->path; 2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
1900 2261
1901 return if $self->players; 2262 return if $self->players;
1902 return if $self->in_memory != cf::MAP_IN_MEMORY; 2263 return if $self->in_memory != cf::MAP_ACTIVE;
1903 return if $self->{deny_save}; 2264 return if $self->{deny_save};
1904 2265
2266 $self->in_memory (cf::MAP_SWAPPED);
2267
2268 $self->deactivate;
2269 $_->clear_links_to ($self) for values %cf::MAP;
1905 $self->clear; 2270 $self->clear;
1906 $self->in_memory (cf::MAP_SWAPPED);
1907} 2271}
1908 2272
1909sub reset_at { 2273sub reset_at {
1910 my ($self) = @_; 2274 my ($self) = @_;
1911 2275
1943 if $uniq; 2307 if $uniq;
1944 } 2308 }
1945 2309
1946 delete $cf::MAP{$self->path}; 2310 delete $cf::MAP{$self->path};
1947 2311
2312 $self->deactivate;
2313 $_->clear_links_to ($self) for values %cf::MAP;
1948 $self->clear; 2314 $self->clear;
1949
1950 $_->clear_links_to ($self) for values %cf::MAP;
1951 2315
1952 $self->unlink_save; 2316 $self->unlink_save;
1953 $self->destroy; 2317 $self->destroy;
1954} 2318}
1955 2319
1956my $nuke_counter = "aaaa"; 2320my $nuke_counter = "aaaa";
1957 2321
1958sub nuke { 2322sub nuke {
1959 my ($self) = @_; 2323 my ($self) = @_;
1960 2324
2325 {
2326 my $lock = cf::lock_acquire "map_data:$self->{path}";
2327
1961 delete $cf::MAP{$self->path}; 2328 delete $cf::MAP{$self->path};
1962 2329
1963 $self->unlink_save; 2330 $self->unlink_save;
1964 2331
1965 bless $self, "cf::map"; 2332 bless $self, "cf::map";
1966 delete $self->{deny_reset}; 2333 delete $self->{deny_reset};
1967 $self->{deny_save} = 1; 2334 $self->{deny_save} = 1;
1968 $self->reset_timeout (1); 2335 $self->reset_timeout (1);
1969 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2336 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1970 2337
1971 $cf::MAP{$self->path} = $self; 2338 $cf::MAP{$self->path} = $self;
2339 }
1972 2340
1973 $self->reset; # polite request, might not happen 2341 $self->reset; # polite request, might not happen
1974} 2342}
1975 2343
1976=item $maps = cf::map::tmp_maps 2344=item $maps = cf::map::tmp_maps
2018 2386
2019sub unique_maps() { 2387sub unique_maps() {
2020 [ 2388 [
2021 map { 2389 map {
2022 utf8::decode $_; 2390 utf8::decode $_;
2023 /\.map$/ 2391 s/\.map$//; # TODO future compatibility hack
2392 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2393 ? ()
2024 ? normalise $_ 2394 : normalise $_
2025 : ()
2026 } @{ aio_readdir $UNIQUEDIR or [] } 2395 } @{ aio_readdir $UNIQUEDIR or [] }
2027 ] 2396 ]
2028} 2397}
2029 2398
2030package cf;
2031
2032=back 2399=back
2033 2400
2034=head3 cf::object 2401=head3 cf::object
2035 2402
2036=cut 2403=cut
2039 2406
2040=over 4 2407=over 4
2041 2408
2042=item $ob->inv_recursive 2409=item $ob->inv_recursive
2043 2410
2044Returns the inventory of the object _and_ their inventories, recursively. 2411Returns the inventory of the object I<and> their inventories, recursively,
2412but I<not> the object itself.
2045 2413
2046=cut 2414=cut
2047 2415
2048sub inv_recursive_; 2416sub inv_recursive_;
2049sub inv_recursive_ { 2417sub inv_recursive_ {
2052 2420
2053sub inv_recursive { 2421sub inv_recursive {
2054 inv_recursive_ inv $_[0] 2422 inv_recursive_ inv $_[0]
2055} 2423}
2056 2424
2425=item $ref = $ob->ref
2426
2427Creates and returns a persistent reference to an object that can be stored as a string.
2428
2429=item $ob = cf::object::deref ($refstring)
2430
2431returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2432even if the object actually exists. May block.
2433
2434=cut
2435
2436sub deref {
2437 my ($ref) = @_;
2438
2439 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2440 my ($uuid, $name) = ($1, $2);
2441 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2442 or return;
2443 $pl->ob->uuid eq $uuid
2444 or return;
2445
2446 $pl->ob
2447 } else {
2448 warn "$ref: cannot resolve object reference\n";
2449 undef
2450 }
2451}
2452
2057package cf; 2453package cf;
2058 2454
2059=back 2455=back
2060 2456
2061=head3 cf::object::player 2457=head3 cf::object::player
2067Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2463Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2068can be C<undef>. Does the right thing when the player is currently in a 2464can be C<undef>. Does the right thing when the player is currently in a
2069dialogue with the given NPC character. 2465dialogue with the given NPC character.
2070 2466
2071=cut 2467=cut
2468
2469our $SAY_CHANNEL = {
2470 id => "say",
2471 title => "Map",
2472 reply => "say ",
2473 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2474};
2475
2476our $CHAT_CHANNEL = {
2477 id => "chat",
2478 title => "Chat",
2479 reply => "chat ",
2480 tooltip => "Player chat and shouts, global to the server.",
2481};
2072 2482
2073# rough implementation of a future "reply" method that works 2483# rough implementation of a future "reply" method that works
2074# with dialog boxes. 2484# with dialog boxes.
2075#TODO: the first argument must go, split into a $npc->reply_to ( method 2485#TODO: the first argument must go, split into a $npc->reply_to ( method
2076sub cf::object::player::reply($$$;$) { 2486sub cf::object::player::reply($$$;$) {
2083 2493
2084 } else { 2494 } else {
2085 my $pl = $self->contr; 2495 my $pl = $self->contr;
2086 2496
2087 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2497 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2088 my $diag = $pl->{npc_dialog}; 2498 my $dialog = $pl->{npc_dialog};
2089 $diag->{pl}->ext_reply ( 2499 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2090 $diag->{id},
2091 msgtype => "reply",
2092 msg => $diag->{pl}->expand_cfpod ($msg),
2093 add_topics => []
2094 );
2095 2500
2096 } else { 2501 } else {
2097 $msg = $npc->name . " says: $msg" if $npc; 2502 $msg = $npc->name . " says: $msg" if $npc;
2098 $self->message ($msg, $flags); 2503 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2099 } 2504 }
2100 } 2505 }
2506}
2507
2508=item $object->send_msg ($channel, $msg, $color, [extra...])
2509
2510=cut
2511
2512sub cf::object::send_msg {
2513 my $pl = shift->contr
2514 or return;
2515 $pl->send_msg (@_);
2101} 2516}
2102 2517
2103=item $player_object->may ("access") 2518=item $player_object->may ("access")
2104 2519
2105Returns wether the given player is authorized to access resource "access" 2520Returns wether the given player is authorized to access resource "access"
2184 # use -1 or undef as default coordinates, not 0, 0 2599 # use -1 or undef as default coordinates, not 0, 0
2185 ($x, $y) = ($map->enter_x, $map->enter_y) 2600 ($x, $y) = ($map->enter_x, $map->enter_y)
2186 if $x <=0 && $y <= 0; 2601 if $x <=0 && $y <= 0;
2187 2602
2188 $map->load; 2603 $map->load;
2189 $map->load_diag; 2604 $map->load_neighbours;
2190 2605
2191 return unless $self->contr->active; 2606 return unless $self->contr->active;
2192 $self->activate_recursive; 2607 $self->activate_recursive;
2193 2608
2194 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2609 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2195 $self->enter_map ($map, $x, $y); 2610 $self->enter_map ($map, $x, $y);
2196} 2611}
2197 2612
2198=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2613=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2199 2614
2200Moves the player to the given map-path and coordinates by first freezing 2615Moves the player to the given map-path and coordinates by first freezing
2201her, loading and preparing them map, calling the provided $check callback 2616her, loading and preparing them map, calling the provided $check callback
2202that has to return the map if sucecssful, and then unfreezes the player on 2617that has to return the map if sucecssful, and then unfreezes the player on
2203the new (success) or old (failed) map position. 2618the new (success) or old (failed) map position. In either case, $done will
2619be called at the end of this process.
2204 2620
2205=cut 2621=cut
2206 2622
2207our $GOTOGEN; 2623our $GOTOGEN;
2208 2624
2209sub cf::object::player::goto { 2625sub cf::object::player::goto {
2210 my ($self, $path, $x, $y, $check) = @_; 2626 my ($self, $path, $x, $y, $check, $done) = @_;
2211 2627
2212 # do generation counting so two concurrent goto's will be executed in-order 2628 # do generation counting so two concurrent goto's will be executed in-order
2213 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2629 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2214 2630
2215 $self->enter_link; 2631 $self->enter_link;
2216 2632
2217 (async { 2633 (async {
2634 $Coro::current->{desc} = "player::goto $path $x $y";
2635
2636 # *tag paths override both path and x|y
2637 if ($path =~ /^\*(.*)$/) {
2638 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2639 my $ob = $obs[rand @obs];
2640
2641 # see if we actually can go there
2642 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2643 $ob = $obs[rand @obs];
2644 } else {
2645 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2646 }
2647 # else put us there anyways for now #d#
2648
2649 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2650 } else {
2651 ($path, $x, $y) = (undef, undef, undef);
2652 }
2653 }
2654
2218 my $map = eval { 2655 my $map = eval {
2219 my $map = cf::map::find $path; 2656 my $map = defined $path ? cf::map::find $path : undef;
2220 2657
2221 if ($map) { 2658 if ($map) {
2222 $map = $map->customise_for ($self); 2659 $map = $map->customise_for ($self);
2223 $map = $check->($map) if $check && $map; 2660 $map = $check->($map) if $check && $map;
2224 } else { 2661 } else {
2225 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2662 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2226 } 2663 }
2227 2664
2228 $map 2665 $map
2229 }; 2666 };
2230 2667
2235 2672
2236 if ($gen == $self->{_goto_generation}) { 2673 if ($gen == $self->{_goto_generation}) {
2237 delete $self->{_goto_generation}; 2674 delete $self->{_goto_generation};
2238 $self->leave_link ($map, $x, $y); 2675 $self->leave_link ($map, $x, $y);
2239 } 2676 }
2677
2678 $done->() if $done;
2240 })->prio (1); 2679 })->prio (1);
2241} 2680}
2242 2681
2243=item $player_object->enter_exit ($exit_object) 2682=item $player_object->enter_exit ($exit_object)
2244 2683
2264} 2703}
2265 2704
2266sub prepare_random_map { 2705sub prepare_random_map {
2267 my ($exit) = @_; 2706 my ($exit) = @_;
2268 2707
2269 my $guard = cf::lock_acquire "exit_prepare:$exit";
2270
2271 # all this does is basically replace the /! path by 2708 # all this does is basically replace the /! path by
2272 # a new random map path (?random/...) with a seed 2709 # a new random map path (?random/...) with a seed
2273 # that depends on the exit object 2710 # that depends on the exit object
2274 2711
2275 my $rmp = parse_random_map_params $exit->msg; 2712 my $rmp = parse_random_map_params $exit->msg;
2277 if ($exit->map) { 2714 if ($exit->map) {
2278 $rmp->{region} = $exit->region->name; 2715 $rmp->{region} = $exit->region->name;
2279 $rmp->{origin_map} = $exit->map->path; 2716 $rmp->{origin_map} = $exit->map->path;
2280 $rmp->{origin_x} = $exit->x; 2717 $rmp->{origin_x} = $exit->x;
2281 $rmp->{origin_y} = $exit->y; 2718 $rmp->{origin_y} = $exit->y;
2719
2720 $exit->map->touch;
2282 } 2721 }
2283 2722
2284 $rmp->{random_seed} ||= $exit->random_seed; 2723 $rmp->{random_seed} ||= $exit->random_seed;
2285 2724
2286 my $data = cf::to_json $rmp; 2725 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2287 my $md5 = Digest::MD5::md5_hex $data; 2726 my $md5 = Digest::MD5::md5_hex $data;
2288 my $meta = "$RANDOMDIR/$md5.meta"; 2727 my $meta = "$RANDOMDIR/$md5.meta";
2289 2728
2290 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2729 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2291 aio_write $fh, 0, (length $data), $data, 0; 2730 aio_write $fh, 0, (length $data), $data, 0;
2292 undef $fh; 2731 undef $fh;
2293 aio_rename "$meta~", $meta; 2732 aio_rename "$meta~", $meta;
2294 2733
2734 my $slaying = "?random/$md5";
2735
2736 if ($exit->valid) {
2295 $exit->slaying ("?random/$md5"); 2737 $exit->slaying ("?random/$md5");
2296 $exit->msg (undef); 2738 $exit->msg (undef);
2739 }
2297 } 2740 }
2298} 2741}
2299 2742
2300sub cf::object::player::enter_exit { 2743sub cf::object::player::enter_exit {
2301 my ($self, $exit) = @_; 2744 my ($self, $exit) = @_;
2302 2745
2303 return unless $self->type == cf::PLAYER; 2746 return unless $self->type == cf::PLAYER;
2304 2747
2305 if ($exit->slaying eq "/!") {
2306 #TODO: this should de-fi-ni-te-ly not be a sync-job
2307 # the problem is that $exit might not survive long enough
2308 # so it needs to be done right now, right here
2309 cf::sync_job { prepare_random_map $exit };
2310 }
2311
2312 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2313 my $hp = $exit->stats->hp;
2314 my $sp = $exit->stats->sp;
2315
2316 $self->enter_link; 2748 $self->enter_link;
2317 2749
2318 (async { 2750 (async {
2319 $self->deactivate_recursive; # just to be sure 2751 $Coro::current->{desc} = "enter_exit";
2752
2320 unless (eval { 2753 unless (eval {
2754 $self->deactivate_recursive; # just to be sure
2755
2756 # random map handling
2757 {
2758 my $guard = cf::lock_acquire "exit_prepare:$exit";
2759
2760 prepare_random_map $exit
2761 if $exit->slaying eq "/!";
2762 }
2763
2764 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2765 my $x = $exit->stats->hp;
2766 my $y = $exit->stats->sp;
2767
2321 $self->goto ($slaying, $hp, $sp); 2768 $self->goto ($map, $x, $y);
2322 2769
2770 # if exit is damned, update players death & WoR home-position
2771 $self->contr->savebed ($map, $x, $y)
2772 if $exit->flag (cf::FLAG_DAMNED);
2773
2323 1; 2774 1
2324 }) { 2775 }) {
2325 $self->message ("Something went wrong deep within the crossfire server. " 2776 $self->message ("Something went wrong deep within the crossfire server. "
2326 . "I'll try to bring you back to the map you were before. " 2777 . "I'll try to bring you back to the map you were before. "
2327 . "Please report this to the dungeon master!", 2778 . "Please report this to the dungeon master!",
2328 cf::NDI_UNIQUE | cf::NDI_RED); 2779 cf::NDI_UNIQUE | cf::NDI_RED);
2349 2800
2350 utf8::encode $text; 2801 utf8::encode $text;
2351 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2802 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2352} 2803}
2353 2804
2354=item $client->send_msg ($color, $type, $msg, [extra...]) 2805=item $client->send_msg ($channel, $msg, $color, [extra...])
2355 2806
2356Send a drawinfo or msg packet to the client, formatting the msg for the 2807Send a drawinfo or msg packet to the client, formatting the msg for the
2357client if neccessary. C<$type> should be a string identifying the type of 2808client if neccessary. C<$type> should be a string identifying the type of
2358the message, with C<log> being the default. If C<$color> is negative, suppress 2809the message, with C<log> being the default. If C<$color> is negative, suppress
2359the message unless the client supports the msg packet. 2810the message unless the client supports the msg packet.
2360 2811
2361=cut 2812=cut
2362 2813
2814# non-persistent channels (usually the info channel)
2815our %CHANNEL = (
2816 "c/identify" => {
2817 id => "infobox",
2818 title => "Identify",
2819 reply => undef,
2820 tooltip => "Items recently identified",
2821 },
2822 "c/examine" => {
2823 id => "infobox",
2824 title => "Examine",
2825 reply => undef,
2826 tooltip => "Signs and other items you examined",
2827 },
2828 "c/book" => {
2829 id => "infobox",
2830 title => "Book",
2831 reply => undef,
2832 tooltip => "The contents of a note or book",
2833 },
2834 "c/lookat" => {
2835 id => "infobox",
2836 title => "Look",
2837 reply => undef,
2838 tooltip => "What you saw there",
2839 },
2840 "c/who" => {
2841 id => "infobox",
2842 title => "Players",
2843 reply => undef,
2844 tooltip => "Shows players who are currently online",
2845 },
2846 "c/body" => {
2847 id => "infobox",
2848 title => "Body Parts",
2849 reply => undef,
2850 tooltip => "Shows which body parts you posess and are available",
2851 },
2852 "c/uptime" => {
2853 id => "infobox",
2854 title => "Uptime",
2855 reply => undef,
2856 tooltip => "How long the server has been running since last restart",
2857 },
2858 "c/mapinfo" => {
2859 id => "infobox",
2860 title => "Map Info",
2861 reply => undef,
2862 tooltip => "Information related to the maps",
2863 },
2864 "c/party" => {
2865 id => "party",
2866 title => "Party",
2867 reply => "gsay ",
2868 tooltip => "Messages and chat related to your party",
2869 },
2870);
2871
2363sub cf::client::send_msg { 2872sub cf::client::send_msg {
2364 my ($self, $color, $type, $msg, @extra) = @_; 2873 my ($self, $channel, $msg, $color, @extra) = @_;
2365 2874
2366 $msg = $self->pl->expand_cfpod ($msg); 2875 $msg = $self->pl->expand_cfpod ($msg);
2367 2876
2877 $color &= cf::NDI_CLIENT_MASK; # just in case...
2878
2879 # check predefined channels, for the benefit of C
2880 if ($CHANNEL{$channel}) {
2881 $channel = $CHANNEL{$channel};
2882
2883 $self->ext_msg (channel_info => $channel)
2884 if $self->can_msg;
2885
2886 $channel = $channel->{id};
2887
2888 } elsif (ref $channel) {
2889 # send meta info to client, if not yet sent
2890 unless (exists $self->{channel}{$channel->{id}}) {
2891 $self->{channel}{$channel->{id}} = $channel;
2892 $self->ext_msg (channel_info => $channel)
2893 if $self->can_msg;
2894 }
2895
2896 $channel = $channel->{id};
2897 }
2898
2899 return unless @extra || length $msg;
2900
2368 if ($self->can_msg) { 2901 if ($self->can_msg) {
2369 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); 2902 # default colour, mask it out
2903 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2904 if $color & cf::NDI_DEF;
2905
2906 $self->send_packet ("msg " . $self->{json_coder}->encode (
2907 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2370 } else { 2908 } else {
2371 # replace some tags by gcfclient-compatible ones
2372 for ($msg) {
2373 1 while
2374 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2375 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2376 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2377 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2378 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2379 }
2380
2381 if ($color >= 0) { 2909 if ($color >= 0) {
2910 # replace some tags by gcfclient-compatible ones
2911 for ($msg) {
2912 1 while
2913 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2914 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2915 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2916 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2917 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2918 }
2919
2920 $color &= cf::NDI_COLOR_MASK;
2921
2922 utf8::encode $msg;
2923
2382 if (0 && $msg =~ /\[/) { 2924 if (0 && $msg =~ /\[/) {
2925 # COMMAND/INFO
2383 $self->send_packet ("drawextinfo $color 4 0 $msg") 2926 $self->send_packet ("drawextinfo $color 10 8 $msg")
2384 } else { 2927 } else {
2385 s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2928 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2386 $self->send_packet ("drawinfo $color $msg") 2929 $self->send_packet ("drawinfo $color $msg")
2387 } 2930 }
2388 } 2931 }
2389 } 2932 }
2390} 2933}
2391 2934
2392=item $client->ext_event ($type, %msg) 2935=item $client->ext_msg ($type, @msg)
2393 2936
2394Sends an exti event to the client. 2937Sends an ext event to the client.
2395 2938
2396=cut 2939=cut
2397 2940
2398sub cf::client::ext_event($$%) { 2941sub cf::client::ext_msg($$@) {
2399 my ($self, $type, %msg) = @_; 2942 my ($self, $type, @msg) = @_;
2400 2943
2944 if ($self->extcmd == 2) {
2945 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2946 } elsif ($self->extcmd == 1) { # TODO: remove
2401 $msg{msgtype} = "event_$type"; 2947 push @msg, msgtype => "event_$type";
2402 $self->send_packet ("ext " . cf::to_json \%msg); 2948 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2949 }
2950}
2951
2952=item $client->ext_reply ($msgid, @msg)
2953
2954Sends an ext reply to the client.
2955
2956=cut
2957
2958sub cf::client::ext_reply($$@) {
2959 my ($self, $id, @msg) = @_;
2960
2961 if ($self->extcmd == 2) {
2962 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2963 } elsif ($self->extcmd == 1) {
2964 #TODO: version 1, remove
2965 unshift @msg, msgtype => "reply", msgid => $id;
2966 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2967 }
2403} 2968}
2404 2969
2405=item $success = $client->query ($flags, "text", \&cb) 2970=item $success = $client->query ($flags, "text", \&cb)
2406 2971
2407Queues a query to the client, calling the given callback with 2972Queues a query to the client, calling the given callback with
2408the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2973the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2409C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2974C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2410 2975
2411Queries can fail, so check the return code. Or don't, as queries will become 2976Queries can fail, so check the return code. Or don't, as queries will
2412reliable at some point in the future. 2977become reliable at some point in the future.
2413 2978
2414=cut 2979=cut
2415 2980
2416sub cf::client::query { 2981sub cf::client::query {
2417 my ($self, $flags, $text, $cb) = @_; 2982 my ($self, $flags, $text, $cb) = @_;
2425 utf8::encode $text; 2990 utf8::encode $text;
2426 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2991 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2427 2992
2428 $self->send_packet ($self->{query_queue}[0][0]) 2993 $self->send_packet ($self->{query_queue}[0][0])
2429 if @{ $self->{query_queue} } == 1; 2994 if @{ $self->{query_queue} } == 1;
2995
2996 1
2430} 2997}
2431 2998
2432cf::client->attach ( 2999cf::client->attach (
3000 on_connect => sub {
3001 my ($ns) = @_;
3002
3003 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
3004 },
2433 on_reply => sub { 3005 on_reply => sub {
2434 my ($ns, $msg) = @_; 3006 my ($ns, $msg) = @_;
2435 3007
2436 # this weird shuffling is so that direct followup queries 3008 # this weird shuffling is so that direct followup queries
2437 # get handled first 3009 # get handled first
2449 } else { 3021 } else {
2450 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 3022 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2451 } 3023 }
2452 } 3024 }
2453 }, 3025 },
3026 on_exticmd => sub {
3027 my ($ns, $buf) = @_;
3028
3029 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3030
3031 if (ref $msg) {
3032 my ($type, $reply, @payload) =
3033 "ARRAY" eq ref $msg
3034 ? @$msg
3035 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3036
3037 my @reply;
3038
3039 if (my $cb = $EXTICMD{$type}) {
3040 @reply = $cb->($ns, @payload);
3041 }
3042
3043 $ns->ext_reply ($reply, @reply)
3044 if $reply;
3045
3046 } else {
3047 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3048 }
3049
3050 cf::override;
3051 },
2454); 3052);
2455 3053
2456=item $client->async (\&cb) 3054=item $client->async (\&cb)
2457 3055
2458Create a new coroutine, running the specified callback. The coroutine will 3056Create a new coroutine, running the specified callback. The coroutine will
2499our $safe = new Safe "safe"; 3097our $safe = new Safe "safe";
2500our $safe_hole = new Safe::Hole; 3098our $safe_hole = new Safe::Hole;
2501 3099
2502$SIG{FPE} = 'IGNORE'; 3100$SIG{FPE} = 'IGNORE';
2503 3101
2504$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3102$safe->permit_only (Opcode::opset qw(
3103 :base_core :base_mem :base_orig :base_math
3104 grepstart grepwhile mapstart mapwhile
3105 sort time
3106));
2505 3107
2506# here we export the classes and methods available to script code 3108# here we export the classes and methods available to script code
2507 3109
2508=pod 3110=pod
2509 3111
2510The following functions and methods are available within a safe environment: 3112The following functions and methods are available within a safe environment:
2511 3113
2512 cf::object contr pay_amount pay_player map 3114 cf::object
3115 contr pay_amount pay_player map x y force_find force_add destroy
3116 insert remove name archname title slaying race decrease split
3117
2513 cf::object::player player 3118 cf::object::player
2514 cf::player peaceful 3119 player
2515 cf::map trigger 3120
3121 cf::player
3122 peaceful
3123
3124 cf::map
3125 trigger
2516 3126
2517=cut 3127=cut
2518 3128
2519for ( 3129for (
2520 ["cf::object" => qw(contr pay_amount pay_player map)], 3130 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3131 insert remove inv nrof name archname title slaying race
3132 decrease split destroy)],
2521 ["cf::object::player" => qw(player)], 3133 ["cf::object::player" => qw(player)],
2522 ["cf::player" => qw(peaceful)], 3134 ["cf::player" => qw(peaceful)],
2523 ["cf::map" => qw(trigger)], 3135 ["cf::map" => qw(trigger)],
2524) { 3136) {
2525 no strict 'refs'; 3137 no strict 'refs';
2601# the server's init and main functions 3213# the server's init and main functions
2602 3214
2603sub load_facedata($) { 3215sub load_facedata($) {
2604 my ($path) = @_; 3216 my ($path) = @_;
2605 3217
3218 # HACK to clear player env face cache, we need some signal framework
3219 # for this (global event?)
3220 %ext::player_env::MUSIC_FACE_CACHE = ();
3221
3222 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3223
2606 warn "loading facedata from $path\n"; 3224 warn "loading facedata from $path\n";
2607 3225
2608 my $facedata; 3226 my $facedata;
2609 0 < aio_load $path, $facedata 3227 0 < aio_load $path, $facedata
2610 or die "$path: $!"; 3228 or die "$path: $!";
2612 $facedata = Coro::Storable::thaw $facedata; 3230 $facedata = Coro::Storable::thaw $facedata;
2613 3231
2614 $facedata->{version} == 2 3232 $facedata->{version} == 2
2615 or cf::cleanup "$path: version mismatch, cannot proceed."; 3233 or cf::cleanup "$path: version mismatch, cannot proceed.";
2616 3234
3235 # patch in the exptable
3236 $facedata->{resource}{"res/exp_table"} = {
3237 type => FT_RSRC,
3238 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3239 };
3240 cf::cede_to_tick;
3241
2617 { 3242 {
2618 my $faces = $facedata->{faceinfo}; 3243 my $faces = $facedata->{faceinfo};
2619 3244
2620 while (my ($face, $info) = each %$faces) { 3245 while (my ($face, $info) = each %$faces) {
2621 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3246 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3247
2622 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3248 cf::face::set_visibility $idx, $info->{visibility};
3249 cf::face::set_magicmap $idx, $info->{magicmap};
2623 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3250 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2624 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3251 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2625 Coro::cede; 3252
3253 cf::cede_to_tick;
2626 } 3254 }
2627 3255
2628 while (my ($face, $info) = each %$faces) { 3256 while (my ($face, $info) = each %$faces) {
2629 next unless $info->{smooth}; 3257 next unless $info->{smooth};
3258
2630 my $idx = cf::face::find $face 3259 my $idx = cf::face::find $face
2631 or next; 3260 or next;
3261
2632 if (my $smooth = cf::face::find $info->{smooth}) { 3262 if (my $smooth = cf::face::find $info->{smooth}) {
3263 cf::face::set_smooth $idx, $smooth;
2633 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3264 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2634 } else { 3265 } else {
2635 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3266 warn "smooth face '$info->{smooth}' not found for face '$face'";
2636 } 3267 }
2637 Coro::cede; 3268
3269 cf::cede_to_tick;
2638 } 3270 }
2639 } 3271 }
2640 3272
2641 { 3273 {
2642 my $anims = $facedata->{animinfo}; 3274 my $anims = $facedata->{animinfo};
2643 3275
2644 while (my ($anim, $info) = each %$anims) { 3276 while (my ($anim, $info) = each %$anims) {
2645 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3277 cf::anim::set $anim, $info->{frames}, $info->{facings};
2646 Coro::cede; 3278 cf::cede_to_tick;
2647 } 3279 }
2648 3280
2649 cf::anim::invalidate_all; # d'oh 3281 cf::anim::invalidate_all; # d'oh
2650 } 3282 }
2651 3283
3284 {
3285 # TODO: for gcfclient pleasure, we should give resources
3286 # that gcfclient doesn't grok a >10000 face index.
3287 my $res = $facedata->{resource};
3288
3289 while (my ($name, $info) = each %$res) {
3290 if (defined $info->{type}) {
3291 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3292 my $data;
3293
3294 if ($info->{type} & 1) {
3295 # prepend meta info
3296
3297 my $meta = $enc->encode ({
3298 name => $name,
3299 %{ $info->{meta} || {} },
3300 });
3301
3302 $data = pack "(w/a*)*", $meta, $info->{data};
3303 } else {
3304 $data = $info->{data};
3305 }
3306
3307 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3308 cf::face::set_type $idx, $info->{type};
3309 } else {
3310 $RESOURCE{$name} = $info;
3311 }
3312
3313 cf::cede_to_tick;
3314 }
3315 }
3316
3317 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3318
2652 1 3319 1
2653} 3320}
2654 3321
3322cf::global->attach (on_resource_update => sub {
3323 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3324 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3325
3326 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3327 my $sound = $soundconf->{compat}[$_]
3328 or next;
3329
3330 my $face = cf::face::find "sound/$sound->[1]";
3331 cf::sound::set $sound->[0] => $face;
3332 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3333 }
3334
3335 while (my ($k, $v) = each %{$soundconf->{event}}) {
3336 my $face = cf::face::find "sound/$v";
3337 cf::sound::set $k => $face;
3338 }
3339 }
3340});
3341
3342register_exticmd fx_want => sub {
3343 my ($ns, $want) = @_;
3344
3345 while (my ($k, $v) = each %$want) {
3346 $ns->fx_want ($k, $v);
3347 }
3348};
3349
3350sub load_resource_file($) {
3351 my $guard = lock_acquire "load_resource_file";
3352
3353 my $status = load_resource_file_ $_[0];
3354 get_slot 0.1, 100;
3355 cf::arch::commit_load;
3356
3357 $status
3358}
3359
2655sub reload_regions { 3360sub reload_regions {
3361 # HACK to clear player env face cache, we need some signal framework
3362 # for this (global event?)
3363 %ext::player_env::MUSIC_FACE_CACHE = ();
3364
2656 load_resource_file "$MAPDIR/regions" 3365 load_resource_file "$MAPDIR/regions"
2657 or die "unable to load regions file\n"; 3366 or die "unable to load regions file\n";
3367
3368 for (cf::region::list) {
3369 $_->{match} = qr/$_->{match}/
3370 if exists $_->{match};
3371 }
2658} 3372}
2659 3373
2660sub reload_facedata { 3374sub reload_facedata {
2661 load_facedata "$DATADIR/facedata" 3375 load_facedata "$DATADIR/facedata"
2662 or die "unable to load facedata\n"; 3376 or die "unable to load facedata\n";
2673} 3387}
2674 3388
2675sub reload_resources { 3389sub reload_resources {
2676 warn "reloading resource files...\n"; 3390 warn "reloading resource files...\n";
2677 3391
3392 reload_facedata;
3393 reload_archetypes;
2678 reload_regions; 3394 reload_regions;
2679 reload_facedata;
2680 #reload_archetypes;#d#
2681 reload_archetypes;
2682 reload_treasures; 3395 reload_treasures;
2683 3396
2684 warn "finished reloading resource files\n"; 3397 warn "finished reloading resource files\n";
2685} 3398}
2686 3399
2687sub init { 3400sub init {
3401 my $guard = freeze_mainloop;
3402
2688 reload_resources; 3403 reload_resources;
2689} 3404}
2690 3405
2691sub cfg_load { 3406sub reload_config {
2692 open my $fh, "<:utf8", "$CONFDIR/config" 3407 open my $fh, "<:utf8", "$CONFDIR/config"
2693 or return; 3408 or return;
2694 3409
2695 local $/; 3410 local $/;
2696 *CFG = YAML::Syck::Load <$fh>; 3411 *CFG = YAML::Load <$fh>;
2697 3412
2698 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3413 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2699 3414
2700 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3415 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2701 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3416 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2712sub main { 3427sub main {
2713 # we must not ever block the main coroutine 3428 # we must not ever block the main coroutine
2714 local $Coro::idle = sub { 3429 local $Coro::idle = sub {
2715 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3430 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2716 (async { 3431 (async {
2717 Event::one_event; 3432 $Coro::current->{desc} = "IDLE BUG HANDLER";
3433 EV::loop EV::LOOP_ONESHOT;
2718 })->prio (Coro::PRIO_MAX); 3434 })->prio (Coro::PRIO_MAX);
2719 }; 3435 };
2720 3436
2721 cfg_load; 3437 {
3438 my $guard = freeze_mainloop;
3439 reload_config;
2722 db_init; 3440 db_init;
2723 load_extensions; 3441 load_extensions;
2724 3442
2725 $TICK_WATCHER->start; 3443 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3444 }
3445
2726 Event::loop; 3446 EV::loop;
2727} 3447}
2728 3448
2729############################################################################# 3449#############################################################################
2730# initialisation and cleanup 3450# initialisation and cleanup
2731 3451
2732# install some emergency cleanup handlers 3452# install some emergency cleanup handlers
2733BEGIN { 3453BEGIN {
3454 our %SIGWATCHER = ();
2734 for my $signal (qw(INT HUP TERM)) { 3455 for my $signal (qw(INT HUP TERM)) {
2735 Event->signal ( 3456 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2736 reentrant => 0,
2737 data => WF_AUTOCANCEL,
2738 signal => $signal,
2739 prio => 0,
2740 cb => sub {
2741 cf::cleanup "SIG$signal"; 3457 cf::cleanup "SIG$signal";
2742 },
2743 ); 3458 };
2744 } 3459 }
2745} 3460}
2746 3461
2747sub write_runtime { 3462sub write_runtime_sync {
2748 my $runtime = "$LOCALDIR/runtime"; 3463 my $runtime = "$LOCALDIR/runtime";
2749 3464
2750 # first touch the runtime file to show we are still running: 3465 # first touch the runtime file to show we are still running:
2751 # the fsync below can take a very very long time. 3466 # the fsync below can take a very very long time.
2752 3467
2778 and return; 3493 and return;
2779 3494
2780 warn "runtime file written.\n"; 3495 warn "runtime file written.\n";
2781 3496
2782 1 3497 1
3498}
3499
3500our $uuid_lock;
3501our $uuid_skip;
3502
3503sub write_uuid_sync($) {
3504 $uuid_skip ||= $_[0];
3505
3506 return if $uuid_lock;
3507 local $uuid_lock = 1;
3508
3509 my $uuid = "$LOCALDIR/uuid";
3510
3511 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3512 or return;
3513
3514 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3515 $uuid_skip = 0;
3516
3517 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3518 and return;
3519
3520 # always fsync - this file is important
3521 aio_fsync $fh
3522 and return;
3523
3524 close $fh
3525 or return;
3526
3527 aio_rename "$uuid~", $uuid
3528 and return;
3529
3530 warn "uuid file written ($value).\n";
3531
3532 1
3533
3534}
3535
3536sub write_uuid($$) {
3537 my ($skip, $sync) = @_;
3538
3539 $sync ? write_uuid_sync $skip
3540 : async { write_uuid_sync $skip };
2783} 3541}
2784 3542
2785sub emergency_save() { 3543sub emergency_save() {
2786 my $freeze_guard = cf::freeze_mainloop; 3544 my $freeze_guard = cf::freeze_mainloop;
2787 3545
2793 # and maps saved/destroyed asynchronously. 3551 # and maps saved/destroyed asynchronously.
2794 warn "begin emergency player save\n"; 3552 warn "begin emergency player save\n";
2795 for my $login (keys %cf::PLAYER) { 3553 for my $login (keys %cf::PLAYER) {
2796 my $pl = $cf::PLAYER{$login} or next; 3554 my $pl = $cf::PLAYER{$login} or next;
2797 $pl->valid or next; 3555 $pl->valid or next;
3556 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2798 $pl->save; 3557 $pl->save;
2799 } 3558 }
2800 warn "end emergency player save\n"; 3559 warn "end emergency player save\n";
2801 3560
2802 warn "begin emergency map save\n"; 3561 warn "begin emergency map save\n";
2808 warn "end emergency map save\n"; 3567 warn "end emergency map save\n";
2809 3568
2810 warn "begin emergency database checkpoint\n"; 3569 warn "begin emergency database checkpoint\n";
2811 BDB::db_env_txn_checkpoint $DB_ENV; 3570 BDB::db_env_txn_checkpoint $DB_ENV;
2812 warn "end emergency database checkpoint\n"; 3571 warn "end emergency database checkpoint\n";
3572
3573 warn "begin write uuid\n";
3574 write_uuid_sync 1;
3575 warn "end write uuid\n";
2813 }; 3576 };
2814 3577
2815 warn "leave emergency perl save\n"; 3578 warn "leave emergency perl save\n";
2816} 3579}
2817 3580
2832 warn "reloading..."; 3595 warn "reloading...";
2833 3596
2834 warn "entering sync_job"; 3597 warn "entering sync_job";
2835 3598
2836 cf::sync_job { 3599 cf::sync_job {
2837 cf::write_runtime; # external watchdog should not bark 3600 cf::write_runtime_sync; # external watchdog should not bark
2838 cf::emergency_save; 3601 cf::emergency_save;
2839 cf::write_runtime; # external watchdog should not bark 3602 cf::write_runtime_sync; # external watchdog should not bark
2840 3603
2841 warn "syncing database to disk"; 3604 warn "syncing database to disk";
2842 BDB::db_env_txn_checkpoint $DB_ENV; 3605 BDB::db_env_txn_checkpoint $DB_ENV;
2843 3606
2844 # if anything goes wrong in here, we should simply crash as we already saved 3607 # if anything goes wrong in here, we should simply crash as we already saved
2845
2846 warn "cancelling all WF_AUTOCANCEL watchers";
2847 for (Event::all_watchers) {
2848 $_->cancel if $_->data & WF_AUTOCANCEL;
2849 }
2850 3608
2851 warn "flushing outstanding aio requests"; 3609 warn "flushing outstanding aio requests";
2852 for (;;) { 3610 for (;;) {
2853 BDB::flush; 3611 BDB::flush;
2854 IO::AIO::flush; 3612 IO::AIO::flush;
2855 Coro::cede; 3613 Coro::cede_notself;
2856 last unless IO::AIO::nreqs || BDB::nreqs; 3614 last unless IO::AIO::nreqs || BDB::nreqs;
2857 warn "iterate..."; 3615 warn "iterate...";
2858 } 3616 }
2859 3617
2860 ++$RELOAD; 3618 ++$RELOAD;
2864 %EXT_CORO = (); 3622 %EXT_CORO = ();
2865 3623
2866 warn "removing commands"; 3624 warn "removing commands";
2867 %COMMAND = (); 3625 %COMMAND = ();
2868 3626
2869 warn "removing ext commands"; 3627 warn "removing ext/exti commands";
2870 %EXTCMD = (); 3628 %EXTCMD = ();
3629 %EXTICMD = ();
2871 3630
2872 warn "unloading/nuking all extensions"; 3631 warn "unloading/nuking all extensions";
2873 for my $pkg (@EXTS) { 3632 for my $pkg (@EXTS) {
2874 warn "... unloading $pkg"; 3633 warn "... unloading $pkg";
2875 3634
2918 warn "reloading cf.pm"; 3677 warn "reloading cf.pm";
2919 require cf; 3678 require cf;
2920 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3679 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2921 3680
2922 warn "loading config and database again"; 3681 warn "loading config and database again";
2923 cf::cfg_load; 3682 cf::reload_config;
2924 3683
2925 warn "loading extensions"; 3684 warn "loading extensions";
2926 cf::load_extensions; 3685 cf::load_extensions;
2927 3686
2928 warn "reattaching attachments to objects/players"; 3687 warn "reattaching attachments to objects/players";
2935 warn "leaving sync_job"; 3694 warn "leaving sync_job";
2936 3695
2937 1 3696 1
2938 } or do { 3697 } or do {
2939 warn $@; 3698 warn $@;
2940 warn "error while reloading, exiting."; 3699 cf::cleanup "error while reloading, exiting.";
2941 exit 1;
2942 }; 3700 };
2943 3701
2944 warn "reloaded"; 3702 warn "reloaded";
2945}; 3703};
2946 3704
2948 3706
2949sub reload_perl() { 3707sub reload_perl() {
2950 # doing reload synchronously and two reloads happen back-to-back, 3708 # doing reload synchronously and two reloads happen back-to-back,
2951 # coro crashes during coro_state_free->destroy here. 3709 # coro crashes during coro_state_free->destroy here.
2952 3710
2953 $RELOAD_WATCHER ||= Event->timer ( 3711 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
2954 reentrant => 0,
2955 after => 0,
2956 data => WF_AUTOCANCEL,
2957 cb => sub {
2958 do_reload_perl; 3712 do_reload_perl;
2959 undef $RELOAD_WATCHER; 3713 undef $RELOAD_WATCHER;
2960 },
2961 ); 3714 };
2962} 3715}
2963 3716
2964register_command "reload" => sub { 3717register_command "reload" => sub {
2965 my ($who, $arg) = @_; 3718 my ($who, $arg) = @_;
2966 3719
2967 if ($who->flag (FLAG_WIZ)) { 3720 if ($who->flag (FLAG_WIZ)) {
2968 $who->message ("reloading server."); 3721 $who->message ("reloading server.");
3722 async {
3723 $Coro::current->{desc} = "perl_reload";
2969 async { reload_perl }; 3724 reload_perl;
3725 };
2970 } 3726 }
2971}; 3727};
2972 3728
2973unshift @INC, $LIBDIR; 3729unshift @INC, $LIBDIR;
2974 3730
2976 3732
2977our @WAIT_FOR_TICK; 3733our @WAIT_FOR_TICK;
2978our @WAIT_FOR_TICK_BEGIN; 3734our @WAIT_FOR_TICK_BEGIN;
2979 3735
2980sub wait_for_tick { 3736sub wait_for_tick {
2981 return unless $TICK_WATCHER->is_active;
2982 return if $Coro::current == $Coro::main; 3737 return if tick_inhibit || $Coro::current == $Coro::main;
2983 3738
2984 my $signal = new Coro::Signal; 3739 my $signal = new Coro::Signal;
2985 push @WAIT_FOR_TICK, $signal; 3740 push @WAIT_FOR_TICK, $signal;
2986 $signal->wait; 3741 $signal->wait;
2987} 3742}
2988 3743
2989sub wait_for_tick_begin { 3744sub wait_for_tick_begin {
2990 return unless $TICK_WATCHER->is_active;
2991 return if $Coro::current == $Coro::main; 3745 return if tick_inhibit || $Coro::current == $Coro::main;
2992 3746
2993 my $signal = new Coro::Signal; 3747 my $signal = new Coro::Signal;
2994 push @WAIT_FOR_TICK_BEGIN, $signal; 3748 push @WAIT_FOR_TICK_BEGIN, $signal;
2995 $signal->wait; 3749 $signal->wait;
2996} 3750}
2997 3751
2998 my $min = 1e6;#d# 3752sub tick {
2999 my $avg = 10;
3000$TICK_WATCHER = Event->timer (
3001 reentrant => 0,
3002 parked => 1,
3003 prio => 0,
3004 at => $NEXT_TICK || $TICK,
3005 data => WF_AUTOCANCEL,
3006 cb => sub {
3007 if ($Coro::current != $Coro::main) { 3753 if ($Coro::current != $Coro::main) {
3008 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3754 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3009 unless ++$bug_warning > 10; 3755 unless ++$bug_warning > 10;
3010 return; 3756 return;
3011 } 3757 }
3012 3758
3013 $NOW = $tick_start = Event::time;
3014
3015 cf::server_tick; # one server iteration 3759 cf::server_tick; # one server iteration
3016 3760
3017 0 && sync_job {#d# 3761 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3018 for(1..10) { 3762 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3019 my $t = Event::time; 3763 Coro::async_pool {
3020 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3764 $Coro::current->{desc} = "runtime saver";
3021 or die; 3765 write_runtime_sync
3022 3766 or warn "ERROR: unable to write runtime file: $!";
3023 $map->width (50);
3024 $map->height (50);
3025 $map->alloc;
3026 $map->_load_objects ("/tmp/x.map", 1);
3027 my $t = Event::time - $t;
3028
3029 #next unless $t < 0.0013;#d#
3030 if ($t < $min) {
3031 $min = $t;
3032 }
3033 $avg = $avg * 0.99 + $t * 0.01;
3034 }
3035 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3036 exit 0;
3037 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3038 }; 3767 };
3768 }
3039 3769
3040 $RUNTIME += $TICK;
3041 $NEXT_TICK += $TICK;
3042
3043 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3044 $NEXT_RUNTIME_WRITE = $NOW + 10;
3045 Coro::async_pool {
3046 write_runtime
3047 or warn "ERROR: unable to write runtime file: $!";
3048 };
3049 }
3050
3051# my $AFTER = Event::time;
3052# warn $AFTER - $NOW;#d#
3053
3054 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3770 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3055 $sig->send; 3771 $sig->send;
3056 } 3772 }
3057 while (my $sig = shift @WAIT_FOR_TICK) { 3773 while (my $sig = shift @WAIT_FOR_TICK) {
3058 $sig->send; 3774 $sig->send;
3059 } 3775 }
3060 3776
3061 $NOW = Event::time; 3777 $LOAD = ($NOW - $TICK_START) / $TICK;
3062
3063 # if we are delayed by four ticks or more, skip them all
3064 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3065
3066 $TICK_WATCHER->at ($NEXT_TICK);
3067 $TICK_WATCHER->start;
3068
3069 $LOAD = ($NOW - $tick_start) / $TICK;
3070 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3778 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3071 3779
3072 _post_tick; 3780 if (0) {
3073 3781 if ($NEXT_TICK) {
3074 3782 my $jitter = $TICK_START - $NEXT_TICK;
3783 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3784 warn "jitter $JITTER\n";#d#
3785 }
3075 }, 3786 }
3076); 3787}
3077 3788
3078{ 3789{
3079 BDB::max_poll_time $TICK * 0.1; 3790 # configure BDB
3080 $BDB_POLL_WATCHER = Event->io ( 3791
3081 reentrant => 0,
3082 fd => BDB::poll_fileno,
3083 poll => 'r',
3084 prio => 0,
3085 data => WF_AUTOCANCEL,
3086 cb => \&BDB::poll_cb,
3087 );
3088 BDB::min_parallel 8; 3792 BDB::min_parallel 8;
3089 3793 BDB::max_poll_reqs $TICK * 0.1;
3090 BDB::set_sync_prepare { 3794 $AnyEvent::BDB::WATCHER->priority (1);
3091 my $status;
3092 my $current = $Coro::current;
3093 (
3094 sub {
3095 $status = $!;
3096 $current->ready; undef $current;
3097 },
3098 sub {
3099 Coro::schedule while defined $current;
3100 $! = $status;
3101 },
3102 )
3103 };
3104 3795
3105 unless ($DB_ENV) { 3796 unless ($DB_ENV) {
3106 $DB_ENV = BDB::db_env_create; 3797 $DB_ENV = BDB::db_env_create;
3798 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3799 | BDB::LOG_AUTOREMOVE, 1);
3800 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3801 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3107 3802
3108 cf::sync_job { 3803 cf::sync_job {
3109 eval { 3804 eval {
3110 BDB::db_env_open 3805 BDB::db_env_open
3111 $DB_ENV, 3806 $DB_ENV,
3113 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3808 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3114 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3809 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3115 0666; 3810 0666;
3116 3811
3117 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3812 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3118
3119 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3120 $DB_ENV->set_lk_detect;
3121 }; 3813 };
3122 3814
3123 cf::cleanup "db_env_open(db): $@" if $@; 3815 cf::cleanup "db_env_open(db): $@" if $@;
3124 }; 3816 };
3125 } 3817 }
3818
3819 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3820 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3821 };
3822 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3823 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3824 };
3825 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3826 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3827 };
3126} 3828}
3127 3829
3128{ 3830{
3831 # configure IO::AIO
3832
3129 IO::AIO::min_parallel 8; 3833 IO::AIO::min_parallel 8;
3130
3131 undef $Coro::AIO::WATCHER;
3132 IO::AIO::max_poll_time $TICK * 0.1; 3834 IO::AIO::max_poll_time $TICK * 0.1;
3133 $AIO_POLL_WATCHER = Event->io ( 3835 #undef $AnyEvent::AIO::WATCHER;
3134 reentrant => 0,
3135 data => WF_AUTOCANCEL,
3136 fd => IO::AIO::poll_fileno,
3137 poll => 'r',
3138 prio => 6,
3139 cb => \&IO::AIO::poll_cb,
3140 );
3141} 3836}
3142 3837
3143my $_log_backtrace; 3838my $_log_backtrace;
3144 3839
3145sub _log_backtrace { 3840sub _log_backtrace {
3149 3844
3150 # limit the # of concurrent backtraces 3845 # limit the # of concurrent backtraces
3151 if ($_log_backtrace < 2) { 3846 if ($_log_backtrace < 2) {
3152 ++$_log_backtrace; 3847 ++$_log_backtrace;
3153 async { 3848 async {
3849 $Coro::current->{desc} = "abt $msg";
3850
3154 my @bt = fork_call { 3851 my @bt = fork_call {
3155 @addr = map { sprintf "%x", $_ } @addr; 3852 @addr = map { sprintf "%x", $_ } @addr;
3156 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3853 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3157 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3854 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3158 or die "addr2line: $!"; 3855 or die "addr2line: $!";
3181# load additional modules 3878# load additional modules
3182use cf::pod; 3879use cf::pod;
3183 3880
3184END { cf::emergency_save } 3881END { cf::emergency_save }
3185 3882
3883evthread_start IO::AIO::poll_fileno;
3884
31861 38851
3187 3886

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines