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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines