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.298 by root, Sun Jul 8 14:50:07 2007 UTC vs.
Revision 1.444 by root, Mon Sep 8 11:27:25 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "vars", "subs";
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Storable; 31use EV;
10use Event;
11use Opcode; 32use Opcode;
12use Safe; 33use Safe;
13use Safe::Hole; 34use Safe::Hole;
35use Storable ();
14 36
15use Coro 3.61 (); 37use Coro ();
16use Coro::State; 38use Coro::State;
17use Coro::Handle; 39use Coro::Handle;
40use Coro::EV;
18use Coro::Event; 41use Coro::AnyEvent;
19use Coro::Timer; 42use Coro::Timer;
20use Coro::Signal; 43use Coro::Signal;
21use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
22use Coro::AIO; 46use Coro::AIO;
47use Coro::BDB 1.6;
23use Coro::Storable; 48use Coro::Storable;
49use Coro::Util ();
24 50
25use JSON::XS 1.4 (); 51use JSON::XS 2.01 ();
26use BDB (); 52use BDB ();
27use Data::Dumper; 53use Data::Dumper;
28use Digest::MD5; 54use Digest::MD5;
29use Fcntl; 55use Fcntl;
30use YAML::Syck (); 56use YAML ();
31use IO::AIO 2.32 (); 57use IO::AIO ();
32use Time::HiRes; 58use Time::HiRes;
33use Compress::LZF; 59use Compress::LZF;
60use Digest::MD5 ();
61
62AnyEvent::detect;
34 63
35# configure various modules to our taste 64# configure various modules to our taste
36# 65#
37$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
38Coro::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
39Compress::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
40
41$Event::Eval = 1; # no idea why this is required, but it is
42
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
44$YAML::Syck::ImplicitUnicode = 1;
45 69
46$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
47 71
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
49 73
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 92our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 94our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
97our %RESOURCE;
73 98
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER;
76our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 101our $NEXT_TICK;
79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 102our $USE_FSYNC = 1; # use fsync to write maps - default off
81 103
104our $BDB_DEADLOCK_WATCHER;
105our $BDB_CHECKPOINT_WATCHER;
82our $BDB_POLL_WATCHER; 106our $BDB_TRICKLE_WATCHER;
83our $DB_ENV; 107our $DB_ENV;
84 108
85our %CFG; 109our %CFG;
86 110
87our $UPTIME; $UPTIME ||= time; 111our $UPTIME; $UPTIME ||= time;
88our $RUNTIME; 112our $RUNTIME;
113our $NOW;
89 114
90our %PLAYER; # all users 115our (%PLAYER, %PLAYER_LOADING); # all users
91our %MAP; # all maps 116our (%MAP, %MAP_LOADING ); # all maps
92our $LINK_MAP; # the special {link} map, which is always available 117our $LINK_MAP; # the special {link} map, which is always available
93 118
94# 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 ∕
95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 120our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96 121
97our $LOAD; # a number between 0 (idle) and 1 (too many objects) 122our $LOAD; # a number between 0 (idle) and 1 (too many objects)
98our $LOADAVG; # same thing, but with alpha-smoothing 123our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter
99our $tick_start; # for load detecting purposes 125our $TICK_START; # for load detecting purposes
100 126
101binmode STDOUT; 127binmode STDOUT;
102binmode STDERR; 128binmode STDERR;
103 129
104# read virtual server time, if available 130# read virtual server time, if available
157 183
158The raw value load value from the last tick. 184The raw value load value from the last tick.
159 185
160=item %cf::CFG 186=item %cf::CFG
161 187
162Configuration for the server, loaded from C</etc/crossfire/config>, or 188Configuration for the server, loaded from C</etc/deliantra-server/config>, or
163from wherever your confdir points to. 189from wherever your confdir points to.
164 190
165=item cf::wait_for_tick, cf::wait_for_tick_begin 191=item cf::wait_for_tick, cf::wait_for_tick_begin
166 192
167These 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
168returns 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
169per 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.
170 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
171=back 203=back
172 204
173=cut 205=cut
174 206
175BEGIN { 207BEGIN {
179 $msg .= "\n" 211 $msg .= "\n"
180 unless $msg =~ /\n$/; 212 unless $msg =~ /\n$/;
181 213
182 $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;
183 215
184 utf8::encode $msg;
185 LOG llevError, $msg; 216 LOG llevError, $msg;
186 }; 217 };
187} 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#?
188 234
189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
190@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
191@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
192@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
199for my $pkg (qw( 245for my $pkg (qw(
200 cf::global cf::attachable 246 cf::global cf::attachable
201 cf::object cf::object::player 247 cf::object cf::object::player
202 cf::client cf::player 248 cf::client cf::player
203 cf::arch cf::living 249 cf::arch cf::living
250 cf::map cf::mapspace
204 cf::map cf::party cf::region 251 cf::party cf::region
205)) { 252)) {
206 no strict 'refs';
207 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
208} 254}
209 255
210$Event::DIED = sub { 256$EV::DIED = sub {
211 warn "error in event callback: @_"; 257 warn "error in event callback: @_";
212}; 258};
213 259
214############################################################################# 260#############################################################################
215 261
238 $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;
239 $d 285 $d
240 } || "[unable to dump $_[0]: '$@']"; 286 } || "[unable to dump $_[0]: '$@']";
241} 287}
242 288
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.
250 296
251=cut 297=cut
252 298
253our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 299our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
254 300
255sub to_json ($) { $json_coder->encode ($_[0]) } 301sub encode_json($) { $json_coder->encode ($_[0]) }
256sub from_json ($) { $json_coder->decode ($_[0]) } 302sub decode_json($) { $json_coder->decode ($_[0]) }
257 303
258=item cf::lock_wait $string 304=item cf::lock_wait $string
259 305
260Wait until the given lock is available. See cf::lock_acquire. 306Wait until the given lock is available. See cf::lock_acquire.
261 307
264Wait 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
265a 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,
266for example when the coroutine gets canceled), the lock is automatically 312for example when the coroutine gets canceled), the lock is automatically
267returned. 313returned.
268 314
315Locks are *not* recursive, locking from the same coro twice results in a
316deadlocked coro.
317
269Lock 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
270uses map_find and cf::map::load uses map_load). 319uses map_find and cf::map::load uses map_load).
271 320
272=item $locked = cf::lock_active $string 321=item $locked = cf::lock_active $string
273 322
274Return 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.
275 324
276=cut 325=cut
277 326
278our %LOCK; 327our %LOCK;
328our %LOCKER;#d#
279 329
280sub lock_wait($) { 330sub lock_wait($) {
281 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#
282 337
283 # wait for lock, if any 338 # wait for lock, if any
284 while ($LOCK{$key}) { 339 while ($LOCK{$key}) {
285 push @{ $LOCK{$key} }, $Coro::current; 340 push @{ $LOCK{$key} }, $Coro::current;
286 Coro::schedule; 341 Coro::schedule;
292 347
293 # wait, to be sure we are not locked 348 # wait, to be sure we are not locked
294 lock_wait $key; 349 lock_wait $key;
295 350
296 $LOCK{$key} = []; 351 $LOCK{$key} = [];
352 $LOCKER{$key} = $Coro::current;#d#
297 353
298 Coro::guard { 354 Coro::guard {
355 delete $LOCKER{$key};#d#
299 # wake up all waiters, to be on the safe side 356 # wake up all waiters, to be on the safe side
300 $_->ready for @{ delete $LOCK{$key} }; 357 $_->ready for @{ delete $LOCK{$key} };
301 } 358 }
302} 359}
303 360
306 363
307 ! ! $LOCK{$key} 364 ! ! $LOCK{$key}
308} 365}
309 366
310sub freeze_mainloop { 367sub freeze_mainloop {
311 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
312 369
313 my $guard = Coro::guard { 370 Coro::guard \&tick_inhibit_dec;
314 $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 }
315 }; 431 }
316 $TICK_WATCHER->stop; 432};
317 $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;
318} 446}
319 447
320=item cf::async { BLOCK } 448=item cf::async { BLOCK }
321 449
322Currently the same as Coro::async_pool, meaning you cannot use 450Currently the same as Coro::async_pool, meaning you cannot use
327 455
328BEGIN { *async = \&Coro::async_pool } 456BEGIN { *async = \&Coro::async_pool }
329 457
330=item cf::sync_job { BLOCK } 458=item cf::sync_job { BLOCK }
331 459
332The design of Crossfire TRT requires that the main coroutine ($Coro::main) 460The design of Deliantra requires that the main coroutine ($Coro::main)
333is always able to handle events or runnable, as Crossfire TRT is only 461is always able to handle events or runnable, as Deliantra is only
334partly 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
335acceptable. 463acceptable.
336 464
337If 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
338the given BLOCK in another coroutine while waiting for the result. The 466the given BLOCK in another coroutine while waiting for the result. The
343 471
344sub sync_job(&) { 472sub sync_job(&) {
345 my ($job) = @_; 473 my ($job) = @_;
346 474
347 if ($Coro::current == $Coro::main) { 475 if ($Coro::current == $Coro::main) {
348 my $time = Event::time; 476 my $time = EV::time;
349 477
350 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
351 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
352 480
353 # TODO: use suspend/resume instead 481 LOG llevError, Carp::longmess "sync job";#d#
354 # (but this is cancel-safe) 482
355 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
356 484
357 my $busy = 1; 485 my $busy = 1;
358 my @res; 486 my @res;
359 487
360 (async { 488 (async {
489 $Coro::current->desc ("sync job coro");
361 @res = eval { $job->() }; 490 @res = eval { $job->() };
362 warn $@ if $@; 491 warn $@ if $@;
363 undef $busy; 492 undef $busy;
364 })->prio (Coro::PRIO_MAX); 493 })->prio (Coro::PRIO_MAX);
365 494
366 while ($busy) { 495 while ($busy) {
367 Coro::cede or Event::one_event; 496 if (Coro::nready) {
497 Coro::cede_notself;
498 } else {
499 EV::loop EV::LOOP_ONESHOT;
368 } 500 }
501 }
369 502
370 $time = Event::time - $time; 503 my $time = EV::time - $time;
371 504
372 LOG llevError | logBacktrace, Carp::longmess "long sync job"
373 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
374
375 $tick_start += $time; # do not account sync jobs to server load 505 $TICK_START += $time; # do not account sync jobs to server load
376 506
377 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
378 } else { 508 } else {
379 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
380 510
405=item fork_call { }, $args 535=item fork_call { }, $args
406 536
407Executes the given code block with the given arguments in a seperate 537Executes the given code block with the given arguments in a seperate
408process, returning the results. Everything must be serialisable with 538process, returning the results. Everything must be serialisable with
409Coro::Storable. May, of course, block. Note that the executed sub may 539Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 540never block itself or use any form of event handling.
411 541
412=cut 542=cut
413 543
414sub fork_call(&@) { 544sub fork_call(&@) {
415 my ($cb, @args) = @_; 545 my ($cb, @args) = @_;
416 546
417# 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,
418# or die "socketpair: $!"; 548 # otherwise perl prematurely frees the stuff :/
419 pipe my $fh1, my $fh2 549 # TODO: investigate and fix (likely this will be rather laborious)
420 or die "pipe: $!";
421 550
422 if (my $pid = fork) { 551 my @res = Coro::Util::fork_eval {
423 close $fh2;
424
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
426 warn "pst<$res>" unless $res =~ /^pst/;
427 $res = Coro::Storable::thaw $res;
428
429 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
430
431 Carp::confess $$res unless "ARRAY" eq ref $res;
432
433 return wantarray ? @$res : $res->[-1];
434 } else {
435 reset_signals; 552 reset_signals;
436 local $SIG{__WARN__}; 553 &$cb
437 local $SIG{__DIE__}; 554 }, @args;
438 local $Coro::idle;
439 $Coro::current->prio (Coro::PRIO_MAX);
440 eval {
441 close $fh1;
442 555
443 my @res = eval { $cb->(@args) }; 556 wantarray ? @res : $res[-1]
557}
444 558
445 open my $fh, ">", \my $buf 559=item $coin = coin_from_name $name
446 or die "fork_call: cannot open fh-to-buf in child : $!";
447 Storable::store_fd +($@ ? \"$@" : \@res), $fh;
448 close $fh;
449 560
450 warn "writing ", length $buf; 561=cut
451 my $x;
452 (length $buf) == ($x = syswrite $fh2, $buf)
453 or warn "error writing ".(length $buf)." != $x\n";
454 close $fh2;
455 };
456 562
457 warn $@ if $@; 563our %coin_alias = (
458 _exit 0; 564 "silver" => "silvercoin",
459 } 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
460} 584}
461 585
462=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
463 587
464Returns a single value from the environment database. 588Returns a single value from the environment database.
466=item cf::db_put $family => $key => $value 590=item cf::db_put $family => $key => $value
467 591
468Stores 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
469data 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).
470 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
471=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}
472 618
473our $DB; 619our $DB;
474 620
475sub db_init { 621sub db_init {
476 unless ($DB) {
477 $DB = BDB::db_create $DB_ENV;
478
479 cf::sync_job { 622 cf::sync_job {
480 eval { 623 $DB ||= db_table "db";
481 $DB->set_flags (BDB::CHKSUM);
482
483 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
484 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
485 cf::cleanup "db_open(db): $!" if $!;
486 };
487 cf::cleanup "db_open(db): $@" if $@;
488 };
489 } 624 };
490} 625}
491 626
492sub db_get($$) { 627sub db_get($$) {
493 my $key = "$_[0]/$_[1]"; 628 my $key = "$_[0]/$_[1]";
494 629
544 if (1) { 679 if (1) {
545 $md5 = 680 $md5 =
546 join "\x00", 681 join "\x00",
547 $processversion, 682 $processversion,
548 map { 683 map {
549 Coro::cede; 684 cf::cede_to_tick;
550 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 685 ($src->[$_], Digest::MD5::md5_hex $data[$_])
551 } 0.. $#$src; 686 } 0.. $#$src;
552 687
553 688
554 my $dbmd5 = db_get cache => "$id/md5"; 689 my $dbmd5 = db_get cache => "$id/md5";
598attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
599to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
600 735
601In 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>
602C<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
603Crossfire TRT). 738Deliantra).
604 739
605=over 4 740=over 4
606 741
607=item $attachable->attach ($attachment, key => $value...) 742=item $attachable->attach ($attachment, key => $value...)
608 743
860 "; 995 ";
861 die if $@; 996 die if $@;
862} 997}
863 998
864our $override; 999our $override;
865our @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?
866 1001
867sub override { 1002sub override {
868 $override = 1; 1003 $override = 1;
869 @invoke_results = (); 1004 @INVOKE_RESULTS = (@_);
870} 1005}
871 1006
872sub do_invoke { 1007sub do_invoke {
873 my $event = shift; 1008 my $event = shift;
874 my $callbacks = shift; 1009 my $callbacks = shift;
875 1010
876 @invoke_results = (); 1011 @INVOKE_RESULTS = ();
877 1012
878 local $override; 1013 local $override;
879 1014
880 for (@$callbacks) { 1015 for (@$callbacks) {
881 eval { &{$_->[1]} }; 1016 eval { &{$_->[1]} };
890 } 1025 }
891 1026
892 0 1027 0
893} 1028}
894 1029
895=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
896 1031
897=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
898 1033
899Generate an object-specific event with the given arguments. 1034Generate an object-specific event with the given arguments.
900 1035
901This 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
902removed 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
903results (if you must, access C<@cf::invoke_results> directly). 1038results (if you must, access C<@cf::INVOKE_RESULTS> directly).
904 1039
905=back 1040=back
906 1041
907=cut 1042=cut
908 1043
909############################################################################# 1044#############################################################################
910# 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}
911 1088
912sub reattach { 1089sub reattach {
913 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
914 my ($obj) = @_; 1091 my ($obj) = @_;
915 1092
1093 # no longer needed after getting rid of delete_package?
916 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1094 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
917 1095
918 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
919 1097
920 @$registry = (); 1098 @$registry = ();
921 1099
936cf::attachable->attach ( 1114cf::attachable->attach (
937 prio => -1000000, 1115 prio => -1000000,
938 on_instantiate => sub { 1116 on_instantiate => sub {
939 my ($obj, $data) = @_; 1117 my ($obj, $data) = @_;
940 1118
941 $data = from_json $data; 1119 $data = decode_json $data;
942 1120
943 for (@$data) { 1121 for (@$data) {
944 my ($name, $args) = @$_; 1122 my ($name, $args) = @$_;
945 1123
946 $obj->attach ($name, %{$args || {} }); 1124 $obj->attach ($name, %{$args || {} });
962sub object_freezer_save { 1140sub object_freezer_save {
963 my ($filename, $rdata, $objs) = @_; 1141 my ($filename, $rdata, $objs) = @_;
964 1142
965 sync_job { 1143 sync_job {
966 if (length $$rdata) { 1144 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename);
967 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
968 $filename, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
969 1148
970 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
971 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
972 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
973 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
974 close $fh; 1153 aio_close $fh;
975 1154
976 if (@$objs) { 1155 if (@$objs) {
977 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
978 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
979 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
980 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
981 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
982 close $fh; 1161 aio_close $fh;
983 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
984 } 1163 }
985 } else { 1164 } else {
986 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
987 } 1166 }
992 } 1171 }
993 } else { 1172 } else {
994 aio_unlink $filename; 1173 aio_unlink $filename;
995 aio_unlink "$filename.pst"; 1174 aio_unlink "$filename.pst";
996 } 1175 }
997 } 1176 };
998} 1177}
999 1178
1000sub object_freezer_as_string { 1179sub object_freezer_as_string {
1001 my ($rdata, $objs) = @_; 1180 my ($rdata, $objs) = @_;
1002 1181
1014 or return; 1193 or return;
1015 1194
1016 unless (aio_stat "$filename.pst") { 1195 unless (aio_stat "$filename.pst") {
1017 (aio_load "$filename.pst", $av) >= 0 1196 (aio_load "$filename.pst", $av) >= 0
1018 or return; 1197 or return;
1198
1019 $av = eval { (Storable::thaw $av)->{objs} }; 1199 my $st = eval { Coro::Storable::thaw $av };
1200 $av = $st->{objs};
1020 } 1201 }
1021 1202
1203 utf8::decode (my $decname = $filename);
1022 warn sprintf "loading %s (%d)\n", 1204 warn sprintf "loading %s (%d,%d)\n",
1023 $filename, length $data, scalar @{$av || []}; 1205 $decname, length $data, scalar @{$av || []};
1206
1024 return ($data, $av); 1207 ($data, $av)
1025} 1208}
1026 1209
1027=head2 COMMAND CALLBACKS 1210=head2 COMMAND CALLBACKS
1028 1211
1029=over 4 1212=over 4
1102 my ($pl, $buf) = @_; 1285 my ($pl, $buf) = @_;
1103 1286
1104 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1287 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1105 1288
1106 if (ref $msg) { 1289 if (ref $msg) {
1290 my ($type, $reply, @payload) =
1291 "ARRAY" eq ref $msg
1292 ? @$msg
1293 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1294
1295 my @reply;
1296
1107 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1297 if (my $cb = $EXTCMD{$type}) {
1108 if (my %reply = $cb->($pl, $msg)) { 1298 @reply = $cb->($pl, @payload);
1109 $pl->ext_reply ($msg->{msgid}, %reply);
1110 }
1111 } 1299 }
1300
1301 $pl->ext_reply ($reply, @reply)
1302 if $reply;
1303
1112 } else { 1304 } else {
1113 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1305 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1114 } 1306 }
1115 1307
1116 cf::override; 1308 cf::override;
1143 1335
1144 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1145 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1146 1338
1147 $ext{source} = 1339 $ext{source} =
1148 "package $pkg; use strict; use utf8;\n" 1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1149 . "#line 1 \"$path\"\n{\n" 1341 . "#line 1 \"$path\"\n{\n"
1150 . $source 1342 . $source
1151 . "\n};\n1"; 1343 . "\n};\n1";
1152 1344
1153 $todo{$base} = \%ext; 1345 $todo{$base} = \%ext;
1169 my $msg = $@ ? "$v->{path}: $@\n" 1361 my $msg = $@ ? "$v->{path}: $@\n"
1170 : "$v->{base}: extension inactive.\n"; 1362 : "$v->{base}: extension inactive.\n";
1171 1363
1172 if (exists $v->{meta}{mandatory}) { 1364 if (exists $v->{meta}{mandatory}) {
1173 warn $msg; 1365 warn $msg;
1174 warn "mandatory extension failed to load, exiting.\n"; 1366 cf::cleanup "mandatory extension failed to load, exiting.";
1175 exit 1;
1176 } 1367 }
1177 1368
1178 warn $msg; 1369 warn $msg;
1179 } 1370 }
1180 1371
1205use Coro::AIO; 1396use Coro::AIO;
1206 1397
1207=head3 cf::player 1398=head3 cf::player
1208 1399
1209=over 4 1400=over 4
1401
1402=item cf::player::num_playing
1403
1404Returns the official number of playing players, as per the Crossfire metaserver rules.
1405
1406=cut
1407
1408sub num_playing {
1409 scalar grep
1410 $_->ob->map
1411 && !$_->hidden
1412 && !$_->ob->flag (cf::FLAG_WIZ),
1413 cf::player::list
1414}
1210 1415
1211=item cf::player::find $login 1416=item cf::player::find $login
1212 1417
1213Returns the given player object, loading it if necessary (might block). 1418Returns the given player object, loading it if necessary (might block).
1214 1419
1250 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1455 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1251 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1456 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1252 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1457 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1253 aio_unlink +(playerdir $login) . "/$login.pl"; 1458 aio_unlink +(playerdir $login) . "/$login.pl";
1254 1459
1255 my $pl = load_pl path $login 1460 my $f = new_from_file cf::object::thawer path $login
1256 or return; 1461 or return;
1462
1463 my $pl = cf::player::load_pl $f
1464 or return;
1465
1466 local $cf::PLAYER_LOADING{$login} = $pl;
1467 $f->resolve_delayed_derefs;
1257 $cf::PLAYER{$login} = $pl 1468 $cf::PLAYER{$login} = $pl
1258 } 1469 }
1259 } 1470 }
1260} 1471}
1261 1472
1270 return if $pl->{deny_save}; 1481 return if $pl->{deny_save};
1271 1482
1272 aio_mkdir playerdir $pl, 0770; 1483 aio_mkdir playerdir $pl, 0770;
1273 $pl->{last_save} = $cf::RUNTIME; 1484 $pl->{last_save} = $cf::RUNTIME;
1274 1485
1486 cf::get_slot 0.01;
1487
1275 $pl->save_pl ($path); 1488 $pl->save_pl ($path);
1276 Coro::cede; 1489 cf::cede_to_tick;
1277} 1490}
1278 1491
1279sub new($) { 1492sub new($) {
1280 my ($login) = @_; 1493 my ($login) = @_;
1281 1494
1287 $cf::PLAYER{$login} = $self; 1500 $cf::PLAYER{$login} = $self;
1288 1501
1289 $self 1502 $self
1290} 1503}
1291 1504
1505=item $player->send_msg ($channel, $msg, $color, [extra...])
1506
1507=cut
1508
1509sub send_msg {
1510 my $ns = shift->ns
1511 or return;
1512 $ns->send_msg (@_);
1513}
1514
1292=item $pl->quit_character 1515=item $pl->quit_character
1293 1516
1294Nukes the player without looking back. If logged in, the connection will 1517Nukes the player without looking back. If logged in, the connection will
1295be destroyed. May block for a long time. 1518be destroyed. May block for a long time.
1296 1519
1300 my ($pl) = @_; 1523 my ($pl) = @_;
1301 1524
1302 my $name = $pl->ob->name; 1525 my $name = $pl->ob->name;
1303 1526
1304 $pl->{deny_save} = 1; 1527 $pl->{deny_save} = 1;
1305 $pl->password ("*"); # this should lock out the player until we nuked the dir 1528 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1306 1529
1307 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1308 $pl->deactivate; 1531 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1309 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1534 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1310 $pl->ns->destroy if $pl->ns; 1535 $pl->ns->destroy if $pl->ns;
1311 1536
1312 my $path = playerdir $pl; 1537 my $path = playerdir $pl;
1313 my $temp = "$path~$cf::RUNTIME~deleting~"; 1538 my $temp = "$path~$cf::RUNTIME~deleting~";
1349 or return []; 1574 or return [];
1350 1575
1351 my @logins; 1576 my @logins;
1352 1577
1353 for my $login (@$dirs) { 1578 for my $login (@$dirs) {
1579 my $path = path $login;
1580
1581 # a .pst is a dead give-away for a valid player
1582 # if no pst file found, open and chekc for blocked users
1583 if (aio_stat "$path.pst") {
1354 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1584 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1355 aio_read $fh, 0, 512, my $buf, 0 or next; 1585 aio_read $fh, 0, 512, my $buf, 0 or next;
1356 $buf !~ /^password -------------$/m or next; # official not-valid tag 1586 $buf !~ /^password -------------$/m or next; # official not-valid tag
1587 }
1357 1588
1358 utf8::decode $login; 1589 utf8::decode $login;
1359 push @logins, $login; 1590 push @logins, $login;
1360 } 1591 }
1361 1592
1392 1623
1393=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1624=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1394 1625
1395Expand crossfire pod fragments into protocol xml. 1626Expand crossfire pod fragments into protocol xml.
1396 1627
1397=cut
1398
1399sub expand_cfpod {
1400 ((my $self), (local $_)) = @_;
1401
1402 # escape & and <
1403 s/&/&amp;/g;
1404 s/(?<![BIUGH])</&lt;/g;
1405
1406 # this is buggy, it needs to properly take care of nested <'s
1407
1408 1 while
1409 # replace B<>, I<>, U<> etc.
1410 s/B<([^\>]*)>/<b>$1<\/b>/
1411 || s/I<([^\>]*)>/<i>$1<\/i>/
1412 || s/U<([^\>]*)>/<u>$1<\/u>/
1413 # replace G<male|female> tags
1414 || s{G<([^>|]*)\|([^>]*)>}{
1415 $self->gender ? $2 : $1
1416 }ge
1417 # replace H<hint text>
1418 || s{H<([^\>]*)>}
1419 {
1420 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1421 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1422 "")
1423 [$self->{hintmode}]
1424 }ge;
1425
1426 # create single paragraphs (very hackish)
1427 s/(?<=\S)\n(?=\w)/ /g;
1428
1429 # compress some whitespace
1430 s/\s+\n/\n/g; # ws line-ends
1431 s/\n\n+/\n/g; # double lines
1432 s/^\n+//; # beginning lines
1433 s/\n+$//; # ending lines
1434
1435 $_
1436}
1437
1438sub hintmode {
1439 $_[0]{hintmode} = $_[1] if @_ > 1;
1440 $_[0]{hintmode}
1441}
1442
1443=item $player->ext_reply ($msgid, %msg) 1628=item $player->ext_reply ($msgid, @msg)
1444 1629
1445Sends an ext reply to the player. 1630Sends an ext reply to the player.
1446 1631
1447=cut 1632=cut
1448 1633
1449sub ext_reply($$%) { 1634sub ext_reply($$@) {
1450 my ($self, $id, %msg) = @_; 1635 my ($self, $id, @msg) = @_;
1451 1636
1452 $msg{msgid} = $id; 1637 $self->ns->ext_reply ($id, @msg)
1453 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1454} 1638}
1455 1639
1456=item $player->ext_event ($type, %msg) 1640=item $player->ext_msg ($type, @msg)
1457 1641
1458Sends an ext event to the client. 1642Sends an ext event to the client.
1459 1643
1460=cut 1644=cut
1461 1645
1462sub ext_event($$%) { 1646sub ext_msg($$@) {
1463 my ($self, $type, %msg) = @_; 1647 my ($self, $type, @msg) = @_;
1464 1648
1465 $self->ns->ext_event ($type, %msg); 1649 $self->ns->ext_msg ($type, @msg);
1466} 1650}
1467 1651
1468=head3 cf::region 1652=head3 cf::region
1469 1653
1470=over 4 1654=over 4
1483 my ($path) = @_; 1667 my ($path) = @_;
1484 1668
1485 my ($match, $specificity); 1669 my ($match, $specificity);
1486 1670
1487 for my $region (list) { 1671 for my $region (list) {
1488 if ($region->match && $path =~ $region->match) { 1672 if ($region->{match} && $path =~ $region->{match}) {
1489 ($match, $specificity) = ($region, $region->specificity) 1673 ($match, $specificity) = ($region, $region->specificity)
1490 if $region->specificity > $specificity; 1674 if $region->specificity > $specificity;
1491 } 1675 }
1492 } 1676 }
1493 1677
1514our $MAX_RESET = 3600; 1698our $MAX_RESET = 3600;
1515our $DEFAULT_RESET = 3000; 1699our $DEFAULT_RESET = 3000;
1516 1700
1517sub generate_random_map { 1701sub generate_random_map {
1518 my ($self, $rmp) = @_; 1702 my ($self, $rmp) = @_;
1703
1704 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1705
1519 # mit "rum" bekleckern, nicht 1706 # mit "rum" bekleckern, nicht
1520 $self->_create_random_map ( 1707 $self->_create_random_map (
1521 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1708 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1522 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1709 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1523 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1710 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1613 $self->init; # pass $1 etc. 1800 $self->init; # pass $1 etc.
1614 return $self; 1801 return $self;
1615 } 1802 }
1616 } 1803 }
1617 1804
1618 Carp::carp "unable to resolve path '$path' (base '$base')."; 1805 Carp::cluck "unable to resolve path '$path' (base '$base').";
1619 () 1806 ()
1620} 1807}
1621 1808
1622sub init { 1809sub init {
1623 my ($self) = @_; 1810 my ($self) = @_;
1645 1832
1646# the temporary/swap location 1833# the temporary/swap location
1647sub save_path { 1834sub save_path {
1648 my ($self) = @_; 1835 my ($self) = @_;
1649 1836
1650 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1837 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1651 "$TMPDIR/$path.map" 1838 "$TMPDIR/$path.map"
1652} 1839}
1653 1840
1654# the unique path, undef == no special unique path 1841# the unique path, undef == no special unique path
1655sub uniq_path { 1842sub uniq_path {
1656 my ($self) = @_; 1843 my ($self) = @_;
1657 1844
1658 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1845 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1659 "$UNIQUEDIR/$path" 1846 "$UNIQUEDIR/$path"
1660} 1847}
1661 1848
1662# and all this just because we cannot iterate over 1849# and all this just because we cannot iterate over
1663# all maps in C++... 1850# all maps in C++...
1686 1873
1687sub load_header_from($) { 1874sub load_header_from($) {
1688 my ($self, $path) = @_; 1875 my ($self, $path) = @_;
1689 1876
1690 utf8::encode $path; 1877 utf8::encode $path;
1691 #aio_open $path, O_RDONLY, 0 1878 my $f = new_from_file cf::object::thawer $path
1692 # or return;
1693
1694 $self->_load_header ($path)
1695 or return; 1879 or return;
1880
1881 $self->_load_header ($f)
1882 or return;
1883
1884 local $MAP_LOADING{$self->{path}} = $self;
1885 $f->resolve_delayed_derefs;
1696 1886
1697 $self->{load_path} = $path; 1887 $self->{load_path} = $path;
1698 1888
1699 1 1889 1
1700} 1890}
1754sub find { 1944sub find {
1755 my ($path, $origin) = @_; 1945 my ($path, $origin) = @_;
1756 1946
1757 $path = normalise $path, $origin && $origin->path; 1947 $path = normalise $path, $origin && $origin->path;
1758 1948
1949 cf::lock_wait "map_data:$path";#d#remove
1759 cf::lock_wait "map_find:$path"; 1950 cf::lock_wait "map_find:$path";
1760 1951
1761 $cf::MAP{$path} || do { 1952 $cf::MAP{$path} || do {
1953 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1762 my $guard = cf::lock_acquire "map_find:$path"; 1954 my $guard2 = cf::lock_acquire "map_find:$path";
1955
1763 my $map = new_from_path cf::map $path 1956 my $map = new_from_path cf::map $path
1764 or return; 1957 or return;
1765 1958
1766 $map->{last_save} = $cf::RUNTIME; 1959 $map->{last_save} = $cf::RUNTIME;
1767 1960
1769 or return; 1962 or return;
1770 1963
1771 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1964 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1772 # doing this can freeze the server in a sync job, obviously 1965 # doing this can freeze the server in a sync job, obviously
1773 #$cf::WAIT_FOR_TICK->wait; 1966 #$cf::WAIT_FOR_TICK->wait;
1967 undef $guard2;
1968 undef $guard1;
1774 $map->reset; 1969 $map->reset;
1775 undef $guard;
1776 return find $path; 1970 return find $path;
1777 } 1971 }
1778 1972
1779 $cf::MAP{$path} = $map 1973 $cf::MAP{$path} = $map
1780 } 1974 }
1789 local $self->{deny_reset} = 1; # loading can take a long time 1983 local $self->{deny_reset} = 1; # loading can take a long time
1790 1984
1791 my $path = $self->{path}; 1985 my $path = $self->{path};
1792 1986
1793 { 1987 {
1794 my $guard = cf::lock_acquire "map_load:$path"; 1988 my $guard = cf::lock_acquire "map_data:$path";
1795 1989
1990 return unless $self->valid;
1796 return if $self->in_memory != cf::MAP_SWAPPED; 1991 return unless $self->in_memory == cf::MAP_SWAPPED;
1797 1992
1798 $self->in_memory (cf::MAP_LOADING); 1993 $self->in_memory (cf::MAP_LOADING);
1799 1994
1800 $self->alloc; 1995 $self->alloc;
1801 1996
1802 $self->pre_load; 1997 $self->pre_load;
1803 Coro::cede; 1998 cf::cede_to_tick;
1804 1999
2000 my $f = new_from_file cf::object::thawer $self->{load_path};
2001 $f->skip_block;
1805 $self->_load_objects ($self->{load_path}, 1) 2002 $self->_load_objects ($f)
1806 or return; 2003 or return;
1807 2004
1808 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2005 $self->post_load_original
1809 if delete $self->{load_original}; 2006 if delete $self->{load_original};
1810 2007
1811 if (my $uniq = $self->uniq_path) { 2008 if (my $uniq = $self->uniq_path) {
1812 utf8::encode $uniq; 2009 utf8::encode $uniq;
1813 if (aio_open $uniq, O_RDONLY, 0) { 2010 unless (aio_stat $uniq) {
2011 if (my $f = new_from_file cf::object::thawer $uniq) {
1814 $self->clear_unique_items; 2012 $self->clear_unique_items;
1815 $self->_load_objects ($uniq, 0); 2013 $self->_load_objects ($f);
2014 $f->resolve_delayed_derefs;
2015 }
1816 } 2016 }
1817 } 2017 }
1818 2018
1819 Coro::cede; 2019 $f->resolve_delayed_derefs;
2020
2021 cf::cede_to_tick;
1820 # now do the right thing for maps 2022 # now do the right thing for maps
1821 $self->link_multipart_objects; 2023 $self->link_multipart_objects;
1822 $self->difficulty ($self->estimate_difficulty) 2024 $self->difficulty ($self->estimate_difficulty)
1823 unless $self->difficulty; 2025 unless $self->difficulty;
1824 Coro::cede; 2026 cf::cede_to_tick;
1825 2027
1826 unless ($self->{deny_activate}) { 2028 unless ($self->{deny_activate}) {
1827 $self->decay_objects; 2029 $self->decay_objects;
1828 $self->fix_auto_apply; 2030 $self->fix_auto_apply;
1829 $self->update_buttons; 2031 $self->update_buttons;
1830 Coro::cede; 2032 cf::cede_to_tick;
1831 $self->set_darkness_map; 2033 $self->set_darkness_map;
1832 Coro::cede; 2034 cf::cede_to_tick;
1833 $self->activate; 2035 $self->activate;
1834 } 2036 }
1835 2037
2038 $self->{last_save} = $cf::RUNTIME;
2039 $self->last_access ($cf::RUNTIME);
2040
1836 $self->in_memory (cf::MAP_IN_MEMORY); 2041 $self->in_memory (cf::MAP_ACTIVE);
1837 } 2042 }
1838 2043
1839 $self->post_load; 2044 $self->post_load;
1840} 2045}
1841 2046
1850 2055
1851 $self 2056 $self
1852} 2057}
1853 2058
1854# find and load all maps in the 3x3 area around a map 2059# find and load all maps in the 3x3 area around a map
1855sub load_diag { 2060sub load_neighbours {
1856 my ($map) = @_; 2061 my ($map) = @_;
1857 2062
1858 my @diag; # diagonal neighbours 2063 my @neigh; # diagonal neighbours
1859 2064
1860 for (0 .. 3) { 2065 for (0 .. 3) {
1861 my $neigh = $map->tile_path ($_) 2066 my $neigh = $map->tile_path ($_)
1862 or next; 2067 or next;
1863 $neigh = find $neigh, $map 2068 $neigh = find $neigh, $map
1864 or next; 2069 or next;
1865 $neigh->load; 2070 $neigh->load;
1866 2071
2072 push @neigh,
1867 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2073 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1868 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2074 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1869 } 2075 }
1870 2076
1871 for (@diag) { 2077 for (grep defined $_->[0], @neigh) {
2078 my ($path, $origin) = @$_;
1872 my $neigh = find @$_ 2079 my $neigh = find $path, $origin
1873 or next; 2080 or next;
1874 $neigh->load; 2081 $neigh->load;
1875 } 2082 }
1876} 2083}
1877 2084
1882} 2089}
1883 2090
1884sub do_load_sync { 2091sub do_load_sync {
1885 my ($map) = @_; 2092 my ($map) = @_;
1886 2093
2094 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2095 if $Coro::current == $Coro::main;
2096
1887 cf::sync_job { $map->load }; 2097 cf::sync_job { $map->load };
1888} 2098}
1889 2099
1890our %MAP_PREFETCH; 2100our %MAP_PREFETCH;
1891our $MAP_PREFETCHER = undef; 2101our $MAP_PREFETCHER = undef;
1892 2102
1893sub find_async { 2103sub find_async {
1894 my ($path, $origin) = @_; 2104 my ($path, $origin, $load) = @_;
1895 2105
1896 $path = normalise $path, $origin && $origin->{path}; 2106 $path = normalise $path, $origin && $origin->{path};
1897 2107
1898 if (my $map = $cf::MAP{$path}) { 2108 if (my $map = $cf::MAP{$path}) {
1899 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2109 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1900 } 2110 }
1901 2111
1902 undef $MAP_PREFETCH{$path}; 2112 $MAP_PREFETCH{$path} |= $load;
2113
1903 $MAP_PREFETCHER ||= cf::async { 2114 $MAP_PREFETCHER ||= cf::async {
2115 $Coro::current->{desc} = "map prefetcher";
2116
1904 while (%MAP_PREFETCH) { 2117 while (%MAP_PREFETCH) {
1905 for my $path (keys %MAP_PREFETCH) { 2118 while (my ($k, $v) = each %MAP_PREFETCH) {
1906 my $map = find $path 2119 if (my $map = find $k) {
1907 or next;
1908 $map->load; 2120 $map->load if $v;
2121 }
1909 2122
1910 delete $MAP_PREFETCH{$path}; 2123 delete $MAP_PREFETCH{$k};
1911 } 2124 }
1912 } 2125 }
1913 undef $MAP_PREFETCHER; 2126 undef $MAP_PREFETCHER;
1914 }; 2127 };
1915 $MAP_PREFETCHER->prio (6); 2128 $MAP_PREFETCHER->prio (6);
1918} 2131}
1919 2132
1920sub save { 2133sub save {
1921 my ($self) = @_; 2134 my ($self) = @_;
1922 2135
1923 my $lock = cf::lock_acquire "map_data:" . $self->path; 2136 my $lock = cf::lock_acquire "map_data:$self->{path}";
1924 2137
1925 $self->{last_save} = $cf::RUNTIME; 2138 $self->{last_save} = $cf::RUNTIME;
1926 2139
1927 return unless $self->dirty; 2140 return unless $self->dirty;
1928 2141
1934 return if $self->{deny_save}; 2147 return if $self->{deny_save};
1935 2148
1936 local $self->{last_access} = $self->last_access;#d# 2149 local $self->{last_access} = $self->last_access;#d#
1937 2150
1938 cf::async { 2151 cf::async {
2152 $Coro::current->{desc} = "map player save";
1939 $_->contr->save for $self->players; 2153 $_->contr->save for $self->players;
1940 }; 2154 };
2155
2156 cf::get_slot 0.02;
1941 2157
1942 if ($uniq) { 2158 if ($uniq) {
1943 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2159 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1944 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2160 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1945 } else { 2161 } else {
1951 my ($self) = @_; 2167 my ($self) = @_;
1952 2168
1953 # save first because save cedes 2169 # save first because save cedes
1954 $self->save; 2170 $self->save;
1955 2171
1956 my $lock = cf::lock_acquire "map_data:" . $self->path; 2172 my $lock = cf::lock_acquire "map_data:$self->{path}";
1957 2173
1958 return if $self->players; 2174 return if $self->players;
1959 return if $self->in_memory != cf::MAP_IN_MEMORY; 2175 return if $self->in_memory != cf::MAP_ACTIVE;
1960 return if $self->{deny_save}; 2176 return if $self->{deny_save};
1961 2177
2178 $self->in_memory (cf::MAP_SWAPPED);
2179
2180 $self->deactivate;
2181 $_->clear_links_to ($self) for values %cf::MAP;
1962 $self->clear; 2182 $self->clear;
1963 $self->in_memory (cf::MAP_SWAPPED);
1964} 2183}
1965 2184
1966sub reset_at { 2185sub reset_at {
1967 my ($self) = @_; 2186 my ($self) = @_;
1968 2187
2000 if $uniq; 2219 if $uniq;
2001 } 2220 }
2002 2221
2003 delete $cf::MAP{$self->path}; 2222 delete $cf::MAP{$self->path};
2004 2223
2224 $self->deactivate;
2225 $_->clear_links_to ($self) for values %cf::MAP;
2005 $self->clear; 2226 $self->clear;
2006
2007 $_->clear_links_to ($self) for values %cf::MAP;
2008 2227
2009 $self->unlink_save; 2228 $self->unlink_save;
2010 $self->destroy; 2229 $self->destroy;
2011} 2230}
2012 2231
2013my $nuke_counter = "aaaa"; 2232my $nuke_counter = "aaaa";
2014 2233
2015sub nuke { 2234sub nuke {
2016 my ($self) = @_; 2235 my ($self) = @_;
2017 2236
2237 {
2238 my $lock = cf::lock_acquire "map_data:$self->{path}";
2239
2018 delete $cf::MAP{$self->path}; 2240 delete $cf::MAP{$self->path};
2019 2241
2020 $self->unlink_save; 2242 $self->unlink_save;
2021 2243
2022 bless $self, "cf::map"; 2244 bless $self, "cf::map";
2023 delete $self->{deny_reset}; 2245 delete $self->{deny_reset};
2024 $self->{deny_save} = 1; 2246 $self->{deny_save} = 1;
2025 $self->reset_timeout (1); 2247 $self->reset_timeout (1);
2026 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2248 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2027 2249
2028 $cf::MAP{$self->path} = $self; 2250 $cf::MAP{$self->path} = $self;
2251 }
2029 2252
2030 $self->reset; # polite request, might not happen 2253 $self->reset; # polite request, might not happen
2031} 2254}
2032 2255
2033=item $maps = cf::map::tmp_maps 2256=item $maps = cf::map::tmp_maps
2075 2298
2076sub unique_maps() { 2299sub unique_maps() {
2077 [ 2300 [
2078 map { 2301 map {
2079 utf8::decode $_; 2302 utf8::decode $_;
2080 /\.map$/ 2303 s/\.map$//; # TODO future compatibility hack
2304 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2305 ? ()
2081 ? normalise $_ 2306 : normalise $_
2082 : ()
2083 } @{ aio_readdir $UNIQUEDIR or [] } 2307 } @{ aio_readdir $UNIQUEDIR or [] }
2084 ] 2308 ]
2085} 2309}
2086 2310
2087package cf;
2088
2089=back 2311=back
2090 2312
2091=head3 cf::object 2313=head3 cf::object
2092 2314
2093=cut 2315=cut
2096 2318
2097=over 4 2319=over 4
2098 2320
2099=item $ob->inv_recursive 2321=item $ob->inv_recursive
2100 2322
2101Returns the inventory of the object _and_ their inventories, recursively. 2323Returns the inventory of the object I<and> their inventories, recursively,
2324but I<not> the object itself.
2102 2325
2103=cut 2326=cut
2104 2327
2105sub inv_recursive_; 2328sub inv_recursive_;
2106sub inv_recursive_ { 2329sub inv_recursive_ {
2109 2332
2110sub inv_recursive { 2333sub inv_recursive {
2111 inv_recursive_ inv $_[0] 2334 inv_recursive_ inv $_[0]
2112} 2335}
2113 2336
2337=item $ref = $ob->ref
2338
2339Creates and returns a persistent reference to an object that can be stored as a string.
2340
2341=item $ob = cf::object::deref ($refstring)
2342
2343returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2344even if the object actually exists. May block.
2345
2346=cut
2347
2348sub deref {
2349 my ($ref) = @_;
2350
2351 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2352 my ($uuid, $name) = ($1, $2);
2353 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2354 or return;
2355 $pl->ob->uuid eq $uuid
2356 or return;
2357
2358 $pl->ob
2359 } else {
2360 warn "$ref: cannot resolve object reference\n";
2361 undef
2362 }
2363}
2364
2114package cf; 2365package cf;
2115 2366
2116=back 2367=back
2117 2368
2118=head3 cf::object::player 2369=head3 cf::object::player
2124Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2375Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2125can be C<undef>. Does the right thing when the player is currently in a 2376can be C<undef>. Does the right thing when the player is currently in a
2126dialogue with the given NPC character. 2377dialogue with the given NPC character.
2127 2378
2128=cut 2379=cut
2380
2381our $SAY_CHANNEL = {
2382 id => "say",
2383 title => "Map",
2384 reply => "say ",
2385 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2386};
2387
2388our $CHAT_CHANNEL = {
2389 id => "chat",
2390 title => "Chat",
2391 reply => "chat ",
2392 tooltip => "Player chat and shouts, global to the server.",
2393};
2129 2394
2130# rough implementation of a future "reply" method that works 2395# rough implementation of a future "reply" method that works
2131# with dialog boxes. 2396# with dialog boxes.
2132#TODO: the first argument must go, split into a $npc->reply_to ( method 2397#TODO: the first argument must go, split into a $npc->reply_to ( method
2133sub cf::object::player::reply($$$;$) { 2398sub cf::object::player::reply($$$;$) {
2140 2405
2141 } else { 2406 } else {
2142 my $pl = $self->contr; 2407 my $pl = $self->contr;
2143 2408
2144 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2409 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2145 my $diag = $pl->{npc_dialog}; 2410 my $dialog = $pl->{npc_dialog};
2146 $diag->{pl}->ext_reply ( 2411 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2147 $diag->{id},
2148 msgtype => "reply",
2149 msg => $diag->{pl}->expand_cfpod ($msg),
2150 add_topics => []
2151 );
2152 2412
2153 } else { 2413 } else {
2154 $msg = $npc->name . " says: $msg" if $npc; 2414 $msg = $npc->name . " says: $msg" if $npc;
2155 $self->message ($msg, $flags); 2415 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2156 } 2416 }
2157 } 2417 }
2418}
2419
2420=item $object->send_msg ($channel, $msg, $color, [extra...])
2421
2422=cut
2423
2424sub cf::object::send_msg {
2425 my $pl = shift->contr
2426 or return;
2427 $pl->send_msg (@_);
2158} 2428}
2159 2429
2160=item $player_object->may ("access") 2430=item $player_object->may ("access")
2161 2431
2162Returns wether the given player is authorized to access resource "access" 2432Returns wether the given player is authorized to access resource "access"
2241 # use -1 or undef as default coordinates, not 0, 0 2511 # use -1 or undef as default coordinates, not 0, 0
2242 ($x, $y) = ($map->enter_x, $map->enter_y) 2512 ($x, $y) = ($map->enter_x, $map->enter_y)
2243 if $x <=0 && $y <= 0; 2513 if $x <=0 && $y <= 0;
2244 2514
2245 $map->load; 2515 $map->load;
2246 $map->load_diag; 2516 $map->load_neighbours;
2247 2517
2248 return unless $self->contr->active; 2518 return unless $self->contr->active;
2249 $self->activate_recursive; 2519 $self->activate_recursive;
2250 2520
2251 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2521 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2252 $self->enter_map ($map, $x, $y); 2522 $self->enter_map ($map, $x, $y);
2253} 2523}
2254 2524
2255=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2525=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2256 2526
2257Moves the player to the given map-path and coordinates by first freezing 2527Moves the player to the given map-path and coordinates by first freezing
2258her, loading and preparing them map, calling the provided $check callback 2528her, loading and preparing them map, calling the provided $check callback
2259that has to return the map if sucecssful, and then unfreezes the player on 2529that has to return the map if sucecssful, and then unfreezes the player on
2260the new (success) or old (failed) map position. 2530the new (success) or old (failed) map position. In either case, $done will
2531be called at the end of this process.
2532
2533Note that $check will be called with a potentially non-loaded map, so if
2534it needs a loaded map it has to call C<< ->load >>.
2261 2535
2262=cut 2536=cut
2263 2537
2264our $GOTOGEN; 2538our $GOTOGEN;
2265 2539
2266sub cf::object::player::goto { 2540sub cf::object::player::goto {
2267 my ($self, $path, $x, $y, $check) = @_; 2541 my ($self, $path, $x, $y, $check, $done) = @_;
2268 2542
2269 # do generation counting so two concurrent goto's will be executed in-order 2543 # do generation counting so two concurrent goto's will be executed in-order
2270 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2544 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2271 2545
2272 $self->enter_link; 2546 $self->enter_link;
2273 2547
2274 (async { 2548 (async {
2549 $Coro::current->{desc} = "player::goto $path $x $y";
2550
2551 # *tag paths override both path and x|y
2552 if ($path =~ /^\*(.*)$/) {
2553 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2554 my $ob = $obs[rand @obs];
2555
2556 # see if we actually can go there
2557 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2558 $ob = $obs[rand @obs];
2559 } else {
2560 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2561 }
2562 # else put us there anyways for now #d#
2563
2564 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2565 } else {
2566 ($path, $x, $y) = (undef, undef, undef);
2567 }
2568 }
2569
2275 my $map = eval { 2570 my $map = eval {
2276 my $map = cf::map::find $path; 2571 my $map = defined $path ? cf::map::find $path : undef;
2277 2572
2278 if ($map) { 2573 if ($map) {
2279 $map = $map->customise_for ($self); 2574 $map = $map->customise_for ($self);
2280 $map = $check->($map) if $check && $map; 2575 $map = $check->($map) if $check && $map;
2281 } else { 2576 } else {
2282 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2577 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2283 } 2578 }
2284 2579
2285 $map 2580 $map
2286 }; 2581 };
2287 2582
2292 2587
2293 if ($gen == $self->{_goto_generation}) { 2588 if ($gen == $self->{_goto_generation}) {
2294 delete $self->{_goto_generation}; 2589 delete $self->{_goto_generation};
2295 $self->leave_link ($map, $x, $y); 2590 $self->leave_link ($map, $x, $y);
2296 } 2591 }
2592
2593 $done->() if $done;
2297 })->prio (1); 2594 })->prio (1);
2298} 2595}
2299 2596
2300=item $player_object->enter_exit ($exit_object) 2597=item $player_object->enter_exit ($exit_object)
2301 2598
2321} 2618}
2322 2619
2323sub prepare_random_map { 2620sub prepare_random_map {
2324 my ($exit) = @_; 2621 my ($exit) = @_;
2325 2622
2326 my $guard = cf::lock_acquire "exit_prepare:$exit";
2327
2328 # all this does is basically replace the /! path by 2623 # all this does is basically replace the /! path by
2329 # a new random map path (?random/...) with a seed 2624 # a new random map path (?random/...) with a seed
2330 # that depends on the exit object 2625 # that depends on the exit object
2331 2626
2332 my $rmp = parse_random_map_params $exit->msg; 2627 my $rmp = parse_random_map_params $exit->msg;
2334 if ($exit->map) { 2629 if ($exit->map) {
2335 $rmp->{region} = $exit->region->name; 2630 $rmp->{region} = $exit->region->name;
2336 $rmp->{origin_map} = $exit->map->path; 2631 $rmp->{origin_map} = $exit->map->path;
2337 $rmp->{origin_x} = $exit->x; 2632 $rmp->{origin_x} = $exit->x;
2338 $rmp->{origin_y} = $exit->y; 2633 $rmp->{origin_y} = $exit->y;
2634
2635 $exit->map->touch;
2339 } 2636 }
2340 2637
2341 $rmp->{random_seed} ||= $exit->random_seed; 2638 $rmp->{random_seed} ||= $exit->random_seed;
2342 2639
2343 my $data = cf::to_json $rmp; 2640 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2344 my $md5 = Digest::MD5::md5_hex $data; 2641 my $md5 = Digest::MD5::md5_hex $data;
2345 my $meta = "$RANDOMDIR/$md5.meta"; 2642 my $meta = "$RANDOMDIR/$md5.meta";
2346 2643
2347 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2644 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2348 aio_write $fh, 0, (length $data), $data, 0; 2645 aio_write $fh, 0, (length $data), $data, 0;
2349 undef $fh; 2646 undef $fh;
2350 aio_rename "$meta~", $meta; 2647 aio_rename "$meta~", $meta;
2351 2648
2649 my $slaying = "?random/$md5";
2650
2651 if ($exit->valid) {
2352 $exit->slaying ("?random/$md5"); 2652 $exit->slaying ("?random/$md5");
2353 $exit->msg (undef); 2653 $exit->msg (undef);
2654 }
2354 } 2655 }
2355} 2656}
2356 2657
2357sub cf::object::player::enter_exit { 2658sub cf::object::player::enter_exit {
2358 my ($self, $exit) = @_; 2659 my ($self, $exit) = @_;
2359 2660
2360 return unless $self->type == cf::PLAYER; 2661 return unless $self->type == cf::PLAYER;
2361 2662
2362 if ($exit->slaying eq "/!") {
2363 #TODO: this should de-fi-ni-te-ly not be a sync-job
2364 # the problem is that $exit might not survive long enough
2365 # so it needs to be done right now, right here
2366 cf::sync_job { prepare_random_map $exit };
2367 }
2368
2369 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2370 my $hp = $exit->stats->hp;
2371 my $sp = $exit->stats->sp;
2372
2373 $self->enter_link; 2663 $self->enter_link;
2374 2664
2375 # if exit is damned, update players death & WoR home-position
2376 $self->contr->savebed ($slaying, $hp, $sp)
2377 if $exit->flag (FLAG_DAMNED);
2378
2379 (async { 2665 (async {
2380 $self->deactivate_recursive; # just to be sure 2666 $Coro::current->{desc} = "enter_exit";
2667
2381 unless (eval { 2668 unless (eval {
2669 $self->deactivate_recursive; # just to be sure
2670
2671 # random map handling
2672 {
2673 my $guard = cf::lock_acquire "exit_prepare:$exit";
2674
2675 prepare_random_map $exit
2676 if $exit->slaying eq "/!";
2677 }
2678
2679 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2680 my $x = $exit->stats->hp;
2681 my $y = $exit->stats->sp;
2682
2382 $self->goto ($slaying, $hp, $sp); 2683 $self->goto ($map, $x, $y);
2383 2684
2685 # if exit is damned, update players death & WoR home-position
2686 $self->contr->savebed ($map, $x, $y)
2687 if $exit->flag (cf::FLAG_DAMNED);
2688
2384 1; 2689 1
2385 }) { 2690 }) {
2386 $self->message ("Something went wrong deep within the crossfire server. " 2691 $self->message ("Something went wrong deep within the crossfire server. "
2387 . "I'll try to bring you back to the map you were before. " 2692 . "I'll try to bring you back to the map you were before. "
2388 . "Please report this to the dungeon master!", 2693 . "Please report this to the dungeon master!",
2389 cf::NDI_UNIQUE | cf::NDI_RED); 2694 cf::NDI_UNIQUE | cf::NDI_RED);
2410 2715
2411 utf8::encode $text; 2716 utf8::encode $text;
2412 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2717 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2413} 2718}
2414 2719
2415=item $client->send_msg ($color, $type, $msg, [extra...]) 2720=item $client->send_msg ($channel, $msg, $color, [extra...])
2416 2721
2417Send a drawinfo or msg packet to the client, formatting the msg for the 2722Send a drawinfo or msg packet to the client, formatting the msg for the
2418client if neccessary. C<$type> should be a string identifying the type of 2723client if neccessary. C<$type> should be a string identifying the type of
2419the message, with C<log> being the default. If C<$color> is negative, suppress 2724the message, with C<log> being the default. If C<$color> is negative, suppress
2420the message unless the client supports the msg packet. 2725the message unless the client supports the msg packet.
2421 2726
2422=cut 2727=cut
2423 2728
2729# non-persistent channels (usually the info channel)
2730our %CHANNEL = (
2731 "c/identify" => {
2732 id => "infobox",
2733 title => "Identify",
2734 reply => undef,
2735 tooltip => "Items recently identified",
2736 },
2737 "c/examine" => {
2738 id => "infobox",
2739 title => "Examine",
2740 reply => undef,
2741 tooltip => "Signs and other items you examined",
2742 },
2743 "c/book" => {
2744 id => "infobox",
2745 title => "Book",
2746 reply => undef,
2747 tooltip => "The contents of a note or book",
2748 },
2749 "c/lookat" => {
2750 id => "infobox",
2751 title => "Look",
2752 reply => undef,
2753 tooltip => "What you saw there",
2754 },
2755 "c/who" => {
2756 id => "infobox",
2757 title => "Players",
2758 reply => undef,
2759 tooltip => "Shows players who are currently online",
2760 },
2761 "c/body" => {
2762 id => "infobox",
2763 title => "Body Parts",
2764 reply => undef,
2765 tooltip => "Shows which body parts you posess and are available",
2766 },
2767 "c/uptime" => {
2768 id => "infobox",
2769 title => "Uptime",
2770 reply => undef,
2771 tooltip => "How long the server has been running since last restart",
2772 },
2773 "c/mapinfo" => {
2774 id => "infobox",
2775 title => "Map Info",
2776 reply => undef,
2777 tooltip => "Information related to the maps",
2778 },
2779 "c/party" => {
2780 id => "party",
2781 title => "Party",
2782 reply => "gsay ",
2783 tooltip => "Messages and chat related to your party",
2784 },
2785);
2786
2424sub cf::client::send_msg { 2787sub cf::client::send_msg {
2425 my ($self, $color, $type, $msg, @extra) = @_; 2788 my ($self, $channel, $msg, $color, @extra) = @_;
2426 2789
2427 $msg = $self->pl->expand_cfpod ($msg); 2790 $msg = $self->pl->expand_cfpod ($msg);
2428 2791
2792 $color &= cf::NDI_CLIENT_MASK; # just in case...
2793
2794 # check predefined channels, for the benefit of C
2795 if ($CHANNEL{$channel}) {
2796 $channel = $CHANNEL{$channel};
2797
2798 $self->ext_msg (channel_info => $channel)
2799 if $self->can_msg;
2800
2801 $channel = $channel->{id};
2802
2803 } elsif (ref $channel) {
2804 # send meta info to client, if not yet sent
2805 unless (exists $self->{channel}{$channel->{id}}) {
2806 $self->{channel}{$channel->{id}} = $channel;
2807 $self->ext_msg (channel_info => $channel)
2808 if $self->can_msg;
2809 }
2810
2811 $channel = $channel->{id};
2812 }
2813
2429 return unless @extra || length $msg; 2814 return unless @extra || length $msg;
2430 2815
2431 if ($self->can_msg) { 2816 if ($self->can_msg) {
2432 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2817 # default colour, mask it out
2818 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2819 if $color & cf::NDI_DEF;
2820
2821 my $pkt = "msg "
2822 . $self->{json_coder}->encode (
2823 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2824 );
2825
2826 # try lzf for large packets
2827 $pkt = "lzf " . Compress::LZF::compress $pkt
2828 if 1024 <= length $pkt and $self->{can_lzf};
2829
2830 # split very large packets
2831 if (8192 < length $pkt and $self->{can_lzf}) {
2832 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2833 $pkt = "frag";
2834 }
2835
2836 $self->send_packet ($pkt);
2433 } else { 2837 } else {
2434 # replace some tags by gcfclient-compatible ones
2435 for ($msg) {
2436 1 while
2437 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2438 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2439 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2440 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2441 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2442 }
2443
2444 if ($color >= 0) { 2838 if ($color >= 0) {
2839 # replace some tags by gcfclient-compatible ones
2840 for ($msg) {
2841 1 while
2842 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2843 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2844 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2845 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2846 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2847 }
2848
2849 $color &= cf::NDI_COLOR_MASK;
2850
2851 utf8::encode $msg;
2852
2445 if (0 && $msg =~ /\[/) { 2853 if (0 && $msg =~ /\[/) {
2854 # COMMAND/INFO
2446 $self->send_packet ("drawextinfo $color 4 0 $msg") 2855 $self->send_packet ("drawextinfo $color 10 8 $msg")
2447 } else { 2856 } else {
2448 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2857 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2449 $self->send_packet ("drawinfo $color $msg") 2858 $self->send_packet ("drawinfo $color $msg")
2450 } 2859 }
2451 } 2860 }
2452 } 2861 }
2453} 2862}
2454 2863
2455=item $client->ext_event ($type, %msg) 2864=item $client->ext_msg ($type, @msg)
2456 2865
2457Sends an ext event to the client. 2866Sends an ext event to the client.
2458 2867
2459=cut 2868=cut
2460 2869
2461sub cf::client::ext_event($$%) { 2870sub cf::client::ext_msg($$@) {
2462 my ($self, $type, %msg) = @_; 2871 my ($self, $type, @msg) = @_;
2463 2872
2873 if ($self->extcmd == 2) {
2874 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2875 } elsif ($self->extcmd == 1) { # TODO: remove
2464 $msg{msgtype} = "event_$type"; 2876 push @msg, msgtype => "event_$type";
2465 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2877 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2878 }
2879}
2880
2881=item $client->ext_reply ($msgid, @msg)
2882
2883Sends an ext reply to the client.
2884
2885=cut
2886
2887sub cf::client::ext_reply($$@) {
2888 my ($self, $id, @msg) = @_;
2889
2890 if ($self->extcmd == 2) {
2891 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2892 } elsif ($self->extcmd == 1) {
2893 #TODO: version 1, remove
2894 unshift @msg, msgtype => "reply", msgid => $id;
2895 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2896 }
2466} 2897}
2467 2898
2468=item $success = $client->query ($flags, "text", \&cb) 2899=item $success = $client->query ($flags, "text", \&cb)
2469 2900
2470Queues a query to the client, calling the given callback with 2901Queues a query to the client, calling the given callback with
2525 my ($ns, $buf) = @_; 2956 my ($ns, $buf) = @_;
2526 2957
2527 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2958 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2528 2959
2529 if (ref $msg) { 2960 if (ref $msg) {
2961 my ($type, $reply, @payload) =
2962 "ARRAY" eq ref $msg
2963 ? @$msg
2964 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2965
2966 my @reply;
2967
2530 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2968 if (my $cb = $EXTICMD{$type}) {
2531 if (my %reply = $cb->($ns, $msg)) { 2969 @reply = $cb->($ns, @payload);
2532 $reply{msgid} = $msg->{msgid};
2533 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2534 }
2535 } 2970 }
2971
2972 $ns->ext_reply ($reply, @reply)
2973 if $reply;
2974
2536 } else { 2975 } else {
2537 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2976 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2538 } 2977 }
2539 2978
2540 cf::override; 2979 cf::override;
2587our $safe = new Safe "safe"; 3026our $safe = new Safe "safe";
2588our $safe_hole = new Safe::Hole; 3027our $safe_hole = new Safe::Hole;
2589 3028
2590$SIG{FPE} = 'IGNORE'; 3029$SIG{FPE} = 'IGNORE';
2591 3030
2592$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3031$safe->permit_only (Opcode::opset qw(
3032 :base_core :base_mem :base_orig :base_math
3033 grepstart grepwhile mapstart mapwhile
3034 sort time
3035));
2593 3036
2594# here we export the classes and methods available to script code 3037# here we export the classes and methods available to script code
2595 3038
2596=pod 3039=pod
2597 3040
2598The following functions and methods are available within a safe environment: 3041The following functions and methods are available within a safe environment:
2599 3042
2600 cf::object 3043 cf::object
2601 contr pay_amount pay_player map x y force_find force_add 3044 contr pay_amount pay_player map x y force_find force_add destroy
2602 insert remove 3045 insert remove name archname title slaying race decrease split
2603 3046
2604 cf::object::player 3047 cf::object::player
2605 player 3048 player
2606 3049
2607 cf::player 3050 cf::player
2612 3055
2613=cut 3056=cut
2614 3057
2615for ( 3058for (
2616 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3059 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2617 insert remove)], 3060 insert remove inv nrof name archname title slaying race
3061 decrease split destroy change_exp)],
2618 ["cf::object::player" => qw(player)], 3062 ["cf::object::player" => qw(player)],
2619 ["cf::player" => qw(peaceful)], 3063 ["cf::player" => qw(peaceful)],
2620 ["cf::map" => qw(trigger)], 3064 ["cf::map" => qw(trigger)],
2621) { 3065) {
2622 no strict 'refs'; 3066 no strict 'refs';
2698# the server's init and main functions 3142# the server's init and main functions
2699 3143
2700sub load_facedata($) { 3144sub load_facedata($) {
2701 my ($path) = @_; 3145 my ($path) = @_;
2702 3146
3147 # HACK to clear player env face cache, we need some signal framework
3148 # for this (global event?)
3149 %ext::player_env::MUSIC_FACE_CACHE = ();
3150
3151 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3152
2703 warn "loading facedata from $path\n"; 3153 warn "loading facedata from $path\n";
2704 3154
2705 my $facedata; 3155 my $facedata;
2706 0 < aio_load $path, $facedata 3156 0 < aio_load $path, $facedata
2707 or die "$path: $!"; 3157 or die "$path: $!";
2709 $facedata = Coro::Storable::thaw $facedata; 3159 $facedata = Coro::Storable::thaw $facedata;
2710 3160
2711 $facedata->{version} == 2 3161 $facedata->{version} == 2
2712 or cf::cleanup "$path: version mismatch, cannot proceed."; 3162 or cf::cleanup "$path: version mismatch, cannot proceed.";
2713 3163
3164 # patch in the exptable
3165 $facedata->{resource}{"res/exp_table"} = {
3166 type => FT_RSRC,
3167 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3168 };
3169 cf::cede_to_tick;
3170
2714 { 3171 {
2715 my $faces = $facedata->{faceinfo}; 3172 my $faces = $facedata->{faceinfo};
2716 3173
2717 while (my ($face, $info) = each %$faces) { 3174 while (my ($face, $info) = each %$faces) {
2718 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3175 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3176
2719 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3177 cf::face::set_visibility $idx, $info->{visibility};
3178 cf::face::set_magicmap $idx, $info->{magicmap};
2720 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3179 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2721 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3180 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2722 Coro::cede; 3181
3182 cf::cede_to_tick;
2723 } 3183 }
2724 3184
2725 while (my ($face, $info) = each %$faces) { 3185 while (my ($face, $info) = each %$faces) {
2726 next unless $info->{smooth}; 3186 next unless $info->{smooth};
3187
2727 my $idx = cf::face::find $face 3188 my $idx = cf::face::find $face
2728 or next; 3189 or next;
3190
2729 if (my $smooth = cf::face::find $info->{smooth}) { 3191 if (my $smooth = cf::face::find $info->{smooth}) {
3192 cf::face::set_smooth $idx, $smooth;
2730 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3193 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2731 } else { 3194 } else {
2732 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3195 warn "smooth face '$info->{smooth}' not found for face '$face'";
2733 } 3196 }
2734 Coro::cede; 3197
3198 cf::cede_to_tick;
2735 } 3199 }
2736 } 3200 }
2737 3201
2738 { 3202 {
2739 my $anims = $facedata->{animinfo}; 3203 my $anims = $facedata->{animinfo};
2740 3204
2741 while (my ($anim, $info) = each %$anims) { 3205 while (my ($anim, $info) = each %$anims) {
2742 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3206 cf::anim::set $anim, $info->{frames}, $info->{facings};
2743 Coro::cede; 3207 cf::cede_to_tick;
2744 } 3208 }
2745 3209
2746 cf::anim::invalidate_all; # d'oh 3210 cf::anim::invalidate_all; # d'oh
2747 } 3211 }
2748 3212
3213 {
3214 # TODO: for gcfclient pleasure, we should give resources
3215 # that gcfclient doesn't grok a >10000 face index.
3216 my $res = $facedata->{resource};
3217
3218 while (my ($name, $info) = each %$res) {
3219 if (defined $info->{type}) {
3220 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3221 my $data;
3222
3223 if ($info->{type} & 1) {
3224 # prepend meta info
3225
3226 my $meta = $enc->encode ({
3227 name => $name,
3228 %{ $info->{meta} || {} },
3229 });
3230
3231 $data = pack "(w/a*)*", $meta, $info->{data};
3232 } else {
3233 $data = $info->{data};
3234 }
3235
3236 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3237 cf::face::set_type $idx, $info->{type};
3238 } else {
3239 $RESOURCE{$name} = $info;
3240 }
3241
3242 cf::cede_to_tick;
3243 }
3244 }
3245
3246 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3247
2749 1 3248 1
2750} 3249}
2751 3250
3251cf::global->attach (on_resource_update => sub {
3252 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3253 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3254
3255 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3256 my $sound = $soundconf->{compat}[$_]
3257 or next;
3258
3259 my $face = cf::face::find "sound/$sound->[1]";
3260 cf::sound::set $sound->[0] => $face;
3261 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3262 }
3263
3264 while (my ($k, $v) = each %{$soundconf->{event}}) {
3265 my $face = cf::face::find "sound/$v";
3266 cf::sound::set $k => $face;
3267 }
3268 }
3269});
3270
3271register_exticmd fx_want => sub {
3272 my ($ns, $want) = @_;
3273
3274 while (my ($k, $v) = each %$want) {
3275 $ns->fx_want ($k, $v);
3276 }
3277};
3278
3279sub load_resource_file($) {
3280 my $guard = lock_acquire "load_resource_file";
3281
3282 my $status = load_resource_file_ $_[0];
3283 get_slot 0.1, 100;
3284 cf::arch::commit_load;
3285
3286 $status
3287}
3288
2752sub reload_regions { 3289sub reload_regions {
3290 # HACK to clear player env face cache, we need some signal framework
3291 # for this (global event?)
3292 %ext::player_env::MUSIC_FACE_CACHE = ();
3293
2753 load_resource_file "$MAPDIR/regions" 3294 load_resource_file "$MAPDIR/regions"
2754 or die "unable to load regions file\n"; 3295 or die "unable to load regions file\n";
3296
3297 for (cf::region::list) {
3298 $_->{match} = qr/$_->{match}/
3299 if exists $_->{match};
3300 }
2755} 3301}
2756 3302
2757sub reload_facedata { 3303sub reload_facedata {
2758 load_facedata "$DATADIR/facedata" 3304 load_facedata "$DATADIR/facedata"
2759 or die "unable to load facedata\n"; 3305 or die "unable to load facedata\n";
2760} 3306}
2761 3307
2762sub reload_archetypes { 3308sub reload_archetypes {
2763 load_resource_file "$DATADIR/archetypes" 3309 load_resource_file "$DATADIR/archetypes"
2764 or die "unable to load archetypes\n"; 3310 or die "unable to load archetypes\n";
2765 #d# NEED to laod twice to resolve forward references
2766 # this really needs to be done in an extra post-pass
2767 # (which needs to be synchronous, so solve it differently)
2768 load_resource_file "$DATADIR/archetypes"
2769 or die "unable to load archetypes\n";
2770} 3311}
2771 3312
2772sub reload_treasures { 3313sub reload_treasures {
2773 load_resource_file "$DATADIR/treasures" 3314 load_resource_file "$DATADIR/treasures"
2774 or die "unable to load treasurelists\n"; 3315 or die "unable to load treasurelists\n";
2775} 3316}
2776 3317
2777sub reload_resources { 3318sub reload_resources {
2778 warn "reloading resource files...\n"; 3319 warn "reloading resource files...\n";
2779 3320
3321 reload_facedata;
3322 reload_archetypes;
2780 reload_regions; 3323 reload_regions;
2781 reload_facedata;
2782 #reload_archetypes;#d#
2783 reload_archetypes;
2784 reload_treasures; 3324 reload_treasures;
2785 3325
2786 warn "finished reloading resource files\n"; 3326 warn "finished reloading resource files\n";
2787} 3327}
2788 3328
2789sub init { 3329sub init {
3330 my $guard = freeze_mainloop;
3331
3332 evthread_start IO::AIO::poll_fileno;
3333
2790 reload_resources; 3334 reload_resources;
2791} 3335}
2792 3336
2793sub cfg_load { 3337sub reload_config {
2794 open my $fh, "<:utf8", "$CONFDIR/config" 3338 open my $fh, "<:utf8", "$CONFDIR/config"
2795 or return; 3339 or return;
2796 3340
2797 local $/; 3341 local $/;
2798 *CFG = YAML::Syck::Load <$fh>; 3342 *CFG = YAML::Load <$fh>;
2799 3343
2800 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3344 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2801 3345
2802 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3346 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2803 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3347 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2814sub main { 3358sub main {
2815 # we must not ever block the main coroutine 3359 # we must not ever block the main coroutine
2816 local $Coro::idle = sub { 3360 local $Coro::idle = sub {
2817 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3361 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2818 (async { 3362 (async {
2819 Event::one_event; 3363 $Coro::current->{desc} = "IDLE BUG HANDLER";
3364 EV::loop EV::LOOP_ONESHOT;
2820 })->prio (Coro::PRIO_MAX); 3365 })->prio (Coro::PRIO_MAX);
2821 }; 3366 };
2822 3367
2823 cfg_load; 3368 {
3369 my $guard = freeze_mainloop;
3370 reload_config;
2824 db_init; 3371 db_init;
2825 load_extensions; 3372 load_extensions;
2826 3373
2827 $TICK_WATCHER->start; 3374 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3375 }
3376
2828 Event::loop; 3377 EV::loop;
2829} 3378}
2830 3379
2831############################################################################# 3380#############################################################################
2832# initialisation and cleanup 3381# initialisation and cleanup
2833 3382
2834# install some emergency cleanup handlers 3383# install some emergency cleanup handlers
2835BEGIN { 3384BEGIN {
3385 our %SIGWATCHER = ();
2836 for my $signal (qw(INT HUP TERM)) { 3386 for my $signal (qw(INT HUP TERM)) {
2837 Event->signal ( 3387 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2838 reentrant => 0,
2839 data => WF_AUTOCANCEL,
2840 signal => $signal,
2841 prio => 0,
2842 cb => sub {
2843 cf::cleanup "SIG$signal"; 3388 cf::cleanup "SIG$signal";
2844 },
2845 ); 3389 };
2846 } 3390 }
2847} 3391}
2848 3392
2849sub write_runtime { 3393sub write_runtime_sync {
2850 my $runtime = "$LOCALDIR/runtime"; 3394 my $runtime = "$LOCALDIR/runtime";
2851 3395
2852 # first touch the runtime file to show we are still running: 3396 # first touch the runtime file to show we are still running:
2853 # the fsync below can take a very very long time. 3397 # the fsync below can take a very very long time.
2854 3398
2880 and return; 3424 and return;
2881 3425
2882 warn "runtime file written.\n"; 3426 warn "runtime file written.\n";
2883 3427
2884 1 3428 1
3429}
3430
3431our $uuid_lock;
3432our $uuid_skip;
3433
3434sub write_uuid_sync($) {
3435 $uuid_skip ||= $_[0];
3436
3437 return if $uuid_lock;
3438 local $uuid_lock = 1;
3439
3440 my $uuid = "$LOCALDIR/uuid";
3441
3442 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3443 or return;
3444
3445 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3446 $uuid_skip = 0;
3447
3448 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3449 and return;
3450
3451 # always fsync - this file is important
3452 aio_fsync $fh
3453 and return;
3454
3455 close $fh
3456 or return;
3457
3458 aio_rename "$uuid~", $uuid
3459 and return;
3460
3461 warn "uuid file written ($value).\n";
3462
3463 1
3464
3465}
3466
3467sub write_uuid($$) {
3468 my ($skip, $sync) = @_;
3469
3470 $sync ? write_uuid_sync $skip
3471 : async { write_uuid_sync $skip };
2885} 3472}
2886 3473
2887sub emergency_save() { 3474sub emergency_save() {
2888 my $freeze_guard = cf::freeze_mainloop; 3475 my $freeze_guard = cf::freeze_mainloop;
2889 3476
2895 # and maps saved/destroyed asynchronously. 3482 # and maps saved/destroyed asynchronously.
2896 warn "begin emergency player save\n"; 3483 warn "begin emergency player save\n";
2897 for my $login (keys %cf::PLAYER) { 3484 for my $login (keys %cf::PLAYER) {
2898 my $pl = $cf::PLAYER{$login} or next; 3485 my $pl = $cf::PLAYER{$login} or next;
2899 $pl->valid or next; 3486 $pl->valid or next;
3487 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2900 $pl->save; 3488 $pl->save;
2901 } 3489 }
2902 warn "end emergency player save\n"; 3490 warn "end emergency player save\n";
2903 3491
2904 warn "begin emergency map save\n"; 3492 warn "begin emergency map save\n";
2910 warn "end emergency map save\n"; 3498 warn "end emergency map save\n";
2911 3499
2912 warn "begin emergency database checkpoint\n"; 3500 warn "begin emergency database checkpoint\n";
2913 BDB::db_env_txn_checkpoint $DB_ENV; 3501 BDB::db_env_txn_checkpoint $DB_ENV;
2914 warn "end emergency database checkpoint\n"; 3502 warn "end emergency database checkpoint\n";
3503
3504 warn "begin write uuid\n";
3505 write_uuid_sync 1;
3506 warn "end write uuid\n";
2915 }; 3507 };
2916 3508
2917 warn "leave emergency perl save\n"; 3509 warn "leave emergency perl save\n";
2918} 3510}
2919 3511
2921 my ($make_core) = @_; 3513 my ($make_core) = @_;
2922 3514
2923 warn Carp::longmess "post_cleanup backtrace" 3515 warn Carp::longmess "post_cleanup backtrace"
2924 if $make_core; 3516 if $make_core;
2925} 3517}
3518
3519# a safer delete_package, copied from Symbol
3520sub clear_package($) {
3521 my $pkg = shift;
3522
3523 # expand to full symbol table name if needed
3524 unless ($pkg =~ /^main::.*::$/) {
3525 $pkg = "main$pkg" if $pkg =~ /^::/;
3526 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3527 $pkg .= '::' unless $pkg =~ /::$/;
3528 }
3529
3530 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3531 my $stem_symtab = *{$stem}{HASH};
3532
3533 defined $stem_symtab and exists $stem_symtab->{$leaf}
3534 or return;
3535
3536 # clear all symbols
3537 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3538 for my $name (keys %$leaf_symtab) {
3539 _gv_clear *{"$pkg$name"};
3540# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3541 }
3542 warn "cleared package #$pkg\n";#d#
3543}
3544
3545our $RELOAD; # how many times to reload
2926 3546
2927sub do_reload_perl() { 3547sub do_reload_perl() {
2928 # can/must only be called in main 3548 # can/must only be called in main
2929 if ($Coro::current != $Coro::main) { 3549 if ($Coro::current != $Coro::main) {
2930 warn "can only reload from main coroutine"; 3550 warn "can only reload from main coroutine";
2931 return; 3551 return;
2932 } 3552 }
2933 3553
3554 return if $RELOAD++;
3555
3556 while ($RELOAD) {
2934 warn "reloading..."; 3557 warn "reloading...";
2935 3558
2936 warn "entering sync_job"; 3559 warn "entering sync_job";
2937 3560
2938 cf::sync_job { 3561 cf::sync_job {
2939 cf::write_runtime; # external watchdog should not bark 3562 cf::write_runtime_sync; # external watchdog should not bark
2940 cf::emergency_save; 3563 cf::emergency_save;
2941 cf::write_runtime; # external watchdog should not bark 3564 cf::write_runtime_sync; # external watchdog should not bark
2942 3565
2943 warn "syncing database to disk"; 3566 warn "syncing database to disk";
2944 BDB::db_env_txn_checkpoint $DB_ENV; 3567 BDB::db_env_txn_checkpoint $DB_ENV;
2945 3568
2946 # if anything goes wrong in here, we should simply crash as we already saved 3569 # if anything goes wrong in here, we should simply crash as we already saved
2947 3570
2948 warn "cancelling all WF_AUTOCANCEL watchers";
2949 for (Event::all_watchers) {
2950 $_->cancel if $_->data & WF_AUTOCANCEL;
2951 }
2952
2953 warn "flushing outstanding aio requests"; 3571 warn "flushing outstanding aio requests";
2954 for (;;) {
2955 BDB::flush;
2956 IO::AIO::flush;
2957 Coro::cede;
2958 last unless IO::AIO::nreqs || BDB::nreqs; 3572 while (IO::AIO::nreqs || BDB::nreqs) {
2959 warn "iterate..."; 3573 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
2960 }
2961
2962 ++$RELOAD;
2963
2964 warn "cancelling all extension coros";
2965 $_->cancel for values %EXT_CORO;
2966 %EXT_CORO = ();
2967
2968 warn "removing commands";
2969 %COMMAND = ();
2970
2971 warn "removing ext/exti commands";
2972 %EXTCMD = ();
2973 %EXTICMD = ();
2974
2975 warn "unloading/nuking all extensions";
2976 for my $pkg (@EXTS) {
2977 warn "... unloading $pkg";
2978
2979 if (my $cb = $pkg->can ("unload")) {
2980 eval {
2981 $cb->($pkg);
2982 1
2983 } or warn "$pkg unloaded, but with errors: $@";
2984 } 3574 }
2985 3575
2986 warn "... nuking $pkg"; 3576 warn "cancelling all extension coros";
2987 Symbol::delete_package $pkg; 3577 $_->cancel for values %EXT_CORO;
2988 } 3578 %EXT_CORO = ();
2989 3579
2990 warn "unloading all perl modules loaded from $LIBDIR"; 3580 warn "removing commands";
2991 while (my ($k, $v) = each %INC) { 3581 %COMMAND = ();
2992 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2993 3582
3583 warn "removing ext/exti commands";
3584 %EXTCMD = ();
3585 %EXTICMD = ();
3586
3587 warn "unloading/nuking all extensions";
3588 for my $pkg (@EXTS) {
2994 warn "... unloading $k"; 3589 warn "... unloading $pkg";
2995 delete $INC{$k};
2996 3590
2997 $k =~ s/\.pm$//;
2998 $k =~ s/\//::/g;
2999
3000 if (my $cb = $k->can ("unload_module")) { 3591 if (my $cb = $pkg->can ("unload")) {
3592 eval {
3001 $cb->(); 3593 $cb->($pkg);
3594 1
3595 } or warn "$pkg unloaded, but with errors: $@";
3596 }
3597
3598 warn "... clearing $pkg";
3599 clear_package $pkg;
3002 } 3600 }
3003 3601
3004 Symbol::delete_package $k; 3602 warn "unloading all perl modules loaded from $LIBDIR";
3603 while (my ($k, $v) = each %INC) {
3604 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3605
3606 warn "... unloading $k";
3607 delete $INC{$k};
3608
3609 $k =~ s/\.pm$//;
3610 $k =~ s/\//::/g;
3611
3612 if (my $cb = $k->can ("unload_module")) {
3613 $cb->();
3614 }
3615
3616 clear_package $k;
3005 } 3617 }
3006 3618
3007 warn "getting rid of safe::, as good as possible"; 3619 warn "getting rid of safe::, as good as possible";
3008 Symbol::delete_package "safe::$_" 3620 clear_package "safe::$_"
3009 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3621 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3010 3622
3011 warn "unloading cf.pm \"a bit\""; 3623 warn "unloading cf.pm \"a bit\"";
3012 delete $INC{"cf.pm"}; 3624 delete $INC{"cf.pm"};
3013 delete $INC{"cf/pod.pm"}; 3625 delete $INC{"cf/pod.pm"};
3014 3626
3015 # don't, removes xs symbols, too, 3627 # don't, removes xs symbols, too,
3016 # and global variables created in xs 3628 # and global variables created in xs
3017 #Symbol::delete_package __PACKAGE__; 3629 #clear_package __PACKAGE__;
3018 3630
3019 warn "unload completed, starting to reload now"; 3631 warn "unload completed, starting to reload now";
3020 3632
3021 warn "reloading cf.pm"; 3633 warn "reloading cf.pm";
3022 require cf; 3634 require cf;
3023 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3635 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3024 3636
3025 warn "loading config and database again"; 3637 warn "loading config and database again";
3026 cf::cfg_load; 3638 cf::reload_config;
3027 3639
3028 warn "loading extensions"; 3640 warn "loading extensions";
3029 cf::load_extensions; 3641 cf::load_extensions;
3030 3642
3031 warn "reattaching attachments to objects/players"; 3643 warn "reattaching attachments to objects/players";
3032 _global_reattach; # objects, sockets 3644 _global_reattach; # objects, sockets
3033 warn "reattaching attachments to maps"; 3645 warn "reattaching attachments to maps";
3034 reattach $_ for values %MAP; 3646 reattach $_ for values %MAP;
3035 warn "reattaching attachments to players"; 3647 warn "reattaching attachments to players";
3036 reattach $_ for values %PLAYER; 3648 reattach $_ for values %PLAYER;
3037 3649
3038 warn "leaving sync_job"; 3650 warn "leaving sync_job";
3039 3651
3040 1 3652 1
3041 } or do { 3653 } or do {
3042 warn $@; 3654 warn $@;
3043 warn "error while reloading, exiting."; 3655 cf::cleanup "error while reloading, exiting.";
3044 exit 1;
3045 }; 3656 };
3046 3657
3047 warn "reloaded"; 3658 warn "reloaded";
3659 --$RELOAD;
3660 }
3048}; 3661};
3049 3662
3050our $RELOAD_WATCHER; # used only during reload 3663our $RELOAD_WATCHER; # used only during reload
3051 3664
3052sub reload_perl() { 3665sub reload_perl() {
3053 # doing reload synchronously and two reloads happen back-to-back, 3666 # doing reload synchronously and two reloads happen back-to-back,
3054 # coro crashes during coro_state_free->destroy here. 3667 # coro crashes during coro_state_free->destroy here.
3055 3668
3056 $RELOAD_WATCHER ||= Event->timer ( 3669 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3057 reentrant => 0,
3058 after => 0,
3059 data => WF_AUTOCANCEL,
3060 cb => sub {
3061 do_reload_perl; 3670 do_reload_perl;
3062 undef $RELOAD_WATCHER; 3671 undef $RELOAD_WATCHER;
3063 },
3064 ); 3672 };
3065} 3673}
3066 3674
3067register_command "reload" => sub { 3675register_command "reload" => sub {
3068 my ($who, $arg) = @_; 3676 my ($who, $arg) = @_;
3069 3677
3070 if ($who->flag (FLAG_WIZ)) { 3678 if ($who->flag (FLAG_WIZ)) {
3071 $who->message ("reloading server."); 3679 $who->message ("reloading server.");
3680 async {
3681 $Coro::current->{desc} = "perl_reload";
3072 async { reload_perl }; 3682 reload_perl;
3683 };
3073 } 3684 }
3074}; 3685};
3075 3686
3076unshift @INC, $LIBDIR; 3687unshift @INC, $LIBDIR;
3077 3688
3079 3690
3080our @WAIT_FOR_TICK; 3691our @WAIT_FOR_TICK;
3081our @WAIT_FOR_TICK_BEGIN; 3692our @WAIT_FOR_TICK_BEGIN;
3082 3693
3083sub wait_for_tick { 3694sub wait_for_tick {
3084 return unless $TICK_WATCHER->is_active;
3085 return if $Coro::current == $Coro::main; 3695 return if tick_inhibit || $Coro::current == $Coro::main;
3086 3696
3087 my $signal = new Coro::Signal; 3697 my $signal = new Coro::Signal;
3088 push @WAIT_FOR_TICK, $signal; 3698 push @WAIT_FOR_TICK, $signal;
3089 $signal->wait; 3699 $signal->wait;
3090} 3700}
3091 3701
3092sub wait_for_tick_begin { 3702sub wait_for_tick_begin {
3093 return unless $TICK_WATCHER->is_active;
3094 return if $Coro::current == $Coro::main; 3703 return if tick_inhibit || $Coro::current == $Coro::main;
3095 3704
3096 my $signal = new Coro::Signal; 3705 my $signal = new Coro::Signal;
3097 push @WAIT_FOR_TICK_BEGIN, $signal; 3706 push @WAIT_FOR_TICK_BEGIN, $signal;
3098 $signal->wait; 3707 $signal->wait;
3099} 3708}
3100 3709
3101 my $min = 1e6;#d# 3710sub tick {
3102 my $avg = 10;
3103$TICK_WATCHER = Event->timer (
3104 reentrant => 0,
3105 parked => 1,
3106 prio => 0,
3107 at => $NEXT_TICK || $TICK,
3108 data => WF_AUTOCANCEL,
3109 cb => sub {
3110 if ($Coro::current != $Coro::main) { 3711 if ($Coro::current != $Coro::main) {
3111 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3712 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3112 unless ++$bug_warning > 10; 3713 unless ++$bug_warning > 10;
3113 return; 3714 return;
3114 } 3715 }
3115 3716
3116 $NOW = $tick_start = Event::time;
3117
3118 cf::server_tick; # one server iteration 3717 cf::server_tick; # one server iteration
3119 3718
3120 0 && sync_job {#d# 3719 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3121 for(1..10) { 3720 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3122 my $t = Event::time; 3721 Coro::async_pool {
3123 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3722 $Coro::current->{desc} = "runtime saver";
3124 or die; 3723 write_runtime_sync
3125 3724 or warn "ERROR: unable to write runtime file: $!";
3126 $map->width (50);
3127 $map->height (50);
3128 $map->alloc;
3129 $map->_load_objects ("/tmp/x.map", 1);
3130 my $t = Event::time - $t;
3131
3132 #next unless $t < 0.0013;#d#
3133 if ($t < $min) {
3134 $min = $t;
3135 }
3136 $avg = $avg * 0.99 + $t * 0.01;
3137 }
3138 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3139 exit 0;
3140 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3141 }; 3725 };
3726 }
3142 3727
3143 $RUNTIME += $TICK;
3144 $NEXT_TICK += $TICK;
3145
3146 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3147 $NEXT_RUNTIME_WRITE = $NOW + 10;
3148 Coro::async_pool {
3149 write_runtime
3150 or warn "ERROR: unable to write runtime file: $!";
3151 };
3152 }
3153
3154# my $AFTER = Event::time;
3155# warn $AFTER - $NOW;#d#
3156
3157 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3728 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3158 $sig->send; 3729 $sig->send;
3159 } 3730 }
3160 while (my $sig = shift @WAIT_FOR_TICK) { 3731 while (my $sig = shift @WAIT_FOR_TICK) {
3161 $sig->send; 3732 $sig->send;
3162 } 3733 }
3163 3734
3164 $NOW = Event::time; 3735 $LOAD = ($NOW - $TICK_START) / $TICK;
3165
3166 # if we are delayed by four ticks or more, skip them all
3167 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3168
3169 $TICK_WATCHER->at ($NEXT_TICK);
3170 $TICK_WATCHER->start;
3171
3172 $LOAD = ($NOW - $tick_start) / $TICK;
3173 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3736 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3174 3737
3175 _post_tick; 3738 if (0) {
3176 3739 if ($NEXT_TICK) {
3177 3740 my $jitter = $TICK_START - $NEXT_TICK;
3741 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3742 warn "jitter $JITTER\n";#d#
3743 }
3178 }, 3744 }
3179); 3745}
3180 3746
3181{ 3747{
3182 BDB::max_poll_time $TICK * 0.1; 3748 # configure BDB
3183 $BDB_POLL_WATCHER = Event->io ( 3749
3184 reentrant => 0,
3185 fd => BDB::poll_fileno,
3186 poll => 'r',
3187 prio => 0,
3188 data => WF_AUTOCANCEL,
3189 cb => \&BDB::poll_cb,
3190 );
3191 BDB::min_parallel 8; 3750 BDB::min_parallel 8;
3192 3751 BDB::max_poll_reqs $TICK * 0.1;
3193 BDB::set_sync_prepare { 3752 $AnyEvent::BDB::WATCHER->priority (1);
3194 my $status;
3195 my $current = $Coro::current;
3196 (
3197 sub {
3198 $status = $!;
3199 $current->ready; undef $current;
3200 },
3201 sub {
3202 Coro::schedule while defined $current;
3203 $! = $status;
3204 },
3205 )
3206 };
3207 3753
3208 unless ($DB_ENV) { 3754 unless ($DB_ENV) {
3209 $DB_ENV = BDB::db_env_create; 3755 $DB_ENV = BDB::db_env_create;
3756 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3757 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3758 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3759 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3760 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3210 3761
3211 cf::sync_job { 3762 cf::sync_job {
3212 eval { 3763 eval {
3213 BDB::db_env_open 3764 BDB::db_env_open
3214 $DB_ENV, 3765 $DB_ENV,
3216 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3767 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3217 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3768 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3218 0666; 3769 0666;
3219 3770
3220 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3771 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3221
3222 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3223 $DB_ENV->set_lk_detect;
3224 }; 3772 };
3225 3773
3226 cf::cleanup "db_env_open(db): $@" if $@; 3774 cf::cleanup "db_env_open(db): $@" if $@;
3227 }; 3775 };
3228 } 3776 }
3777
3778 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3779 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3780 };
3781 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3782 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3783 };
3784 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3785 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3786 };
3229} 3787}
3230 3788
3231{ 3789{
3790 # configure IO::AIO
3791
3232 IO::AIO::min_parallel 8; 3792 IO::AIO::min_parallel 8;
3233
3234 undef $Coro::AIO::WATCHER;
3235 IO::AIO::max_poll_time $TICK * 0.1; 3793 IO::AIO::max_poll_time $TICK * 0.1;
3236 $AIO_POLL_WATCHER = Event->io ( 3794 undef $AnyEvent::AIO::WATCHER;
3237 reentrant => 0,
3238 data => WF_AUTOCANCEL,
3239 fd => IO::AIO::poll_fileno,
3240 poll => 'r',
3241 prio => 6,
3242 cb => \&IO::AIO::poll_cb,
3243 );
3244} 3795}
3245 3796
3246my $_log_backtrace; 3797my $_log_backtrace;
3247 3798
3248sub _log_backtrace { 3799sub _log_backtrace {
3252 3803
3253 # limit the # of concurrent backtraces 3804 # limit the # of concurrent backtraces
3254 if ($_log_backtrace < 2) { 3805 if ($_log_backtrace < 2) {
3255 ++$_log_backtrace; 3806 ++$_log_backtrace;
3256 async { 3807 async {
3808 $Coro::current->{desc} = "abt $msg";
3809
3257 my @bt = fork_call { 3810 my @bt = fork_call {
3258 @addr = map { sprintf "%x", $_ } @addr; 3811 @addr = map { sprintf "%x", $_ } @addr;
3259 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3812 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3260 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3813 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3261 or die "addr2line: $!"; 3814 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines