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.294 by root, Tue Jul 3 06:00:48 2007 UTC vs.
Revision 1.441 by root, Sat Aug 30 05:19:03 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines