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.350 by root, Sat Sep 1 08:03:45 2007 UTC vs.
Revision 1.415 by root, Thu Apr 10 15:35:16 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV 3.2;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
14 35
15use Coro 3.64 (); 36use Coro 4.50 ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::Event; 39use Coro::EV;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
22use Coro::AIO; 43use Coro::AIO;
44use Coro::BDB;
23use Coro::Storable; 45use Coro::Storable;
24use Coro::Util (); 46use Coro::Util ();
25 47
26use JSON::XS (); 48use JSON::XS 2.01 ();
27use BDB (); 49use BDB ();
28use Data::Dumper; 50use Data::Dumper;
29use Digest::MD5; 51use Digest::MD5;
30use Fcntl; 52use Fcntl;
31use YAML::Syck (); 53use YAML ();
32use IO::AIO 2.32 (); 54use IO::AIO 2.51 ();
33use Time::HiRes; 55use Time::HiRes;
34use Compress::LZF; 56use Compress::LZF;
35use Digest::MD5 (); 57use Digest::MD5 ();
36 58
37# configure various modules to our taste 59# configure various modules to our taste
38# 60#
39$Storable::canonical = 1; # reduce rsync transfers 61$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
43$Event::Eval = 1; # no idea why this is required, but it is
44
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47 64
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 66
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 68
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 87our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 89our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE;
75 93
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 97our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
83 99
84our $BDB_POLL_WATCHER; 100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 104our $DB_ENV;
86 105
87our %CFG; 106our %CFG;
88 107
89our $UPTIME; $UPTIME ||= time; 108our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 109our $RUNTIME;
110our $NOW;
91 111
92our %PLAYER; # all users 112our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # all maps 113our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 114our $LINK_MAP; # the special {link} map, which is always available
95 115
96# used to convert map paths into valid unix filenames by replacing / by ∕ 116# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 118
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
102 123
103binmode STDOUT; 124binmode STDOUT;
104binmode STDERR; 125binmode STDERR;
105 126
106# read virtual server time, if available 127# read virtual server time, if available
159 180
160The raw value load value from the last tick. 181The raw value load value from the last tick.
161 182
162=item %cf::CFG 183=item %cf::CFG
163 184
164Configuration for the server, loaded from C</etc/crossfire/config>, or 185Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 186from wherever your confdir points to.
166 187
167=item cf::wait_for_tick, cf::wait_for_tick_begin 188=item cf::wait_for_tick, cf::wait_for_tick_begin
168 189
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 190These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
187 $msg .= "\n" 208 $msg .= "\n"
188 unless $msg =~ /\n$/; 209 unless $msg =~ /\n$/;
189 210
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 212
192 utf8::encode $msg;
193 LOG llevError, $msg; 213 LOG llevError, $msg;
194 }; 214 };
195} 215}
216
217$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "=="
219
220 if ($Coro::current == $Coro::main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d#
223 }#d#
224
225 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate
228};
229
230$SIG{__DIE__} = sub { }; #d#?
196 231
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
213)) { 248)) {
214 no strict 'refs'; 249 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 251}
217 252
218$Event::DIED = sub { 253$EV::DIED = sub {
219 warn "error in event callback: @_"; 254 warn "error in event callback: @_";
220}; 255};
221 256
222############################################################################# 257#############################################################################
223 258
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 281 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 282 $d
248 } || "[unable to dump $_[0]: '$@']"; 283 } || "[unable to dump $_[0]: '$@']";
249} 284}
250 285
251=item $ref = cf::from_json $json 286=item $ref = cf::decode_json $json
252 287
253Converts a JSON string into the corresponding perl data structure. 288Converts a JSON string into the corresponding perl data structure.
254 289
255=item $json = cf::to_json $ref 290=item $json = cf::encode_json $ref
256 291
257Converts a perl data structure into its JSON representation. 292Converts a perl data structure into its JSON representation.
258 293
259=cut 294=cut
260 295
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 297
263sub to_json ($) { $json_coder->encode ($_[0]) } 298sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 299sub decode_json($) { $json_coder->decode ($_[0]) }
265 300
266=item cf::lock_wait $string 301=item cf::lock_wait $string
267 302
268Wait until the given lock is available. See cf::lock_acquire. 303Wait until the given lock is available. See cf::lock_acquire.
269 304
285Return true if the lock is currently active, i.e. somebody has locked it. 320Return true if the lock is currently active, i.e. somebody has locked it.
286 321
287=cut 322=cut
288 323
289our %LOCK; 324our %LOCK;
325our %LOCKER;#d#
290 326
291sub lock_wait($) { 327sub lock_wait($) {
292 my ($key) = @_; 328 my ($key) = @_;
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
293 334
294 # wait for lock, if any 335 # wait for lock, if any
295 while ($LOCK{$key}) { 336 while ($LOCK{$key}) {
296 push @{ $LOCK{$key} }, $Coro::current; 337 push @{ $LOCK{$key} }, $Coro::current;
297 Coro::schedule; 338 Coro::schedule;
303 344
304 # wait, to be sure we are not locked 345 # wait, to be sure we are not locked
305 lock_wait $key; 346 lock_wait $key;
306 347
307 $LOCK{$key} = []; 348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
308 350
309 Coro::guard { 351 Coro::guard {
352 delete $LOCKER{$key};#d#
310 # wake up all waiters, to be on the safe side 353 # wake up all waiters, to be on the safe side
311 $_->ready for @{ delete $LOCK{$key} }; 354 $_->ready for @{ delete $LOCK{$key} };
312 } 355 }
313} 356}
314 357
317 360
318 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
319} 362}
320 363
321sub freeze_mainloop { 364sub freeze_mainloop {
322 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
323 366
324 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
325 $TICK_WATCHER->start; 368}
326 }; 369
327 $TICK_WATCHER->stop; 370=item cf::periodic $interval, $cb
328 $guard 371
372Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer.
374
375=cut
376
377sub periodic($$) {
378 my ($interval, $cb) = @_;
379
380 my $start = rand List::Util::min 180, $interval;
381
382 EV::periodic $start, $interval, 0, $cb
329} 383}
330 384
331=item cf::get_slot $time[, $priority[, $name]] 385=item cf::get_slot $time[, $priority[, $name]]
332 386
333Allocate $time seconds of blocking CPU time at priority C<$priority>: 387Allocate $time seconds of blocking CPU time at priority C<$priority>:
344our @SLOT_QUEUE; 398our @SLOT_QUEUE;
345our $SLOT_QUEUE; 399our $SLOT_QUEUE;
346 400
347$SLOT_QUEUE->cancel if $SLOT_QUEUE; 401$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async { 402$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager");
404
349 my $signal = new Coro::Signal; 405 my $signal = new Coro::Signal;
350 406
351 while () { 407 while () {
352 next_job: 408 next_job:
353 my $avail = cf::till_tick; 409 my $avail = cf::till_tick;
361 } 417 }
362 } 418 }
363 } 419 }
364 420
365 if (@SLOT_QUEUE) { 421 if (@SLOT_QUEUE) {
366 # we do not use wait_For_tick() as it returns immediately when tick is inactive 422 # we do not use wait_for_tick() as it returns immediately when tick is inactive
367 push @cf::WAIT_FOR_TICK, $signal; 423 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait; 424 $signal->wait;
369 } else { 425 } else {
370 Coro::schedule; 426 Coro::schedule;
371 } 427 }
394 450
395BEGIN { *async = \&Coro::async_pool } 451BEGIN { *async = \&Coro::async_pool }
396 452
397=item cf::sync_job { BLOCK } 453=item cf::sync_job { BLOCK }
398 454
399The design of Crossfire TRT requires that the main coroutine ($Coro::main) 455The design of Deliantra requires that the main coroutine ($Coro::main)
400is always able to handle events or runnable, as Crossfire TRT is only 456is always able to handle events or runnable, as Deliantra is only
401partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 457partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
402acceptable. 458acceptable.
403 459
404If it must be done, put the blocking parts into C<sync_job>. This will run 460If it must be done, put the blocking parts into C<sync_job>. This will run
405the given BLOCK in another coroutine while waiting for the result. The 461the given BLOCK in another coroutine while waiting for the result. The
410 466
411sub sync_job(&) { 467sub sync_job(&) {
412 my ($job) = @_; 468 my ($job) = @_;
413 469
414 if ($Coro::current == $Coro::main) { 470 if ($Coro::current == $Coro::main) {
415 my $time = Event::time; 471 my $time = EV::time;
416 472
417 # this is the main coro, too bad, we have to block 473 # this is the main coro, too bad, we have to block
418 # till the operation succeeds, freezing the server :/ 474 # till the operation succeeds, freezing the server :/
419 475
420 # TODO: use suspend/resume instead 476 LOG llevError, Carp::longmess "sync job";#d#
421 # (but this is cancel-safe) 477
422 my $freeze_guard = freeze_mainloop; 478 my $freeze_guard = freeze_mainloop;
423 479
424 my $busy = 1; 480 my $busy = 1;
425 my @res; 481 my @res;
426 482
427 (async { 483 (async {
484 $Coro::current->desc ("sync job coro");
428 @res = eval { $job->() }; 485 @res = eval { $job->() };
429 warn $@ if $@; 486 warn $@ if $@;
430 undef $busy; 487 undef $busy;
431 })->prio (Coro::PRIO_MAX); 488 })->prio (Coro::PRIO_MAX);
432 489
433 while ($busy) { 490 while ($busy) {
434 Coro::cede or Event::one_event; 491 if (Coro::nready) {
492 Coro::cede_notself;
493 } else {
494 EV::loop EV::LOOP_ONESHOT;
435 } 495 }
496 }
436 497
437 $time = Event::time - $time; 498 my $time = EV::time - $time;
438 499
439 LOG llevError | logBacktrace, Carp::longmess "long sync job"
440 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
441
442 $tick_start += $time; # do not account sync jobs to server load 500 $TICK_START += $time; # do not account sync jobs to server load
443 501
444 wantarray ? @res : $res[0] 502 wantarray ? @res : $res[0]
445 } else { 503 } else {
446 # we are in another coroutine, how wonderful, everything just works 504 # we are in another coroutine, how wonderful, everything just works
447 505
472=item fork_call { }, $args 530=item fork_call { }, $args
473 531
474Executes the given code block with the given arguments in a seperate 532Executes the given code block with the given arguments in a seperate
475process, returning the results. Everything must be serialisable with 533process, returning the results. Everything must be serialisable with
476Coro::Storable. May, of course, block. Note that the executed sub may 534Coro::Storable. May, of course, block. Note that the executed sub may
477never block itself or use any form of Event handling. 535never block itself or use any form of event handling.
478 536
479=cut 537=cut
480 538
481sub fork_call(&@) { 539sub fork_call(&@) {
482 my ($cb, @args) = @_; 540 my ($cb, @args) = @_;
483 541
484 # we seemingly have to make a local copy of the whole thing, 542 # we seemingly have to make a local copy of the whole thing,
485 # otherwise perl prematurely frees the stuff :/ 543 # otherwise perl prematurely frees the stuff :/
486 # TODO: investigate and fix (liekly this will be rather laborious) 544 # TODO: investigate and fix (likely this will be rather laborious)
487 545
488 my @res = Coro::Util::fork_eval { 546 my @res = Coro::Util::fork_eval {
489 reset_signals; 547 reset_signals;
490 &$cb 548 &$cb
491 }, @args; 549 }, @args;
492 550
493 wantarray ? @res : $res[-1] 551 wantarray ? @res : $res[-1]
494} 552}
495 553
554=item $coin = coin_from_name $name
555
556=cut
557
558our %coin_alias = (
559 "silver" => "silvercoin",
560 "silvercoin" => "silvercoin",
561 "silvercoins" => "silvercoin",
562 "gold" => "goldcoin",
563 "goldcoin" => "goldcoin",
564 "goldcoins" => "goldcoin",
565 "platinum" => "platinacoin",
566 "platinumcoin" => "platinacoin",
567 "platinumcoins" => "platinacoin",
568 "platina" => "platinacoin",
569 "platinacoin" => "platinacoin",
570 "platinacoins" => "platinacoin",
571 "royalty" => "royalty",
572 "royalties" => "royalty",
573);
574
575sub coin_from_name($) {
576 $coin_alias{$_[0]}
577 ? cf::arch::find $coin_alias{$_[0]}
578 : undef
579}
580
496=item $value = cf::db_get $family => $key 581=item $value = cf::db_get $family => $key
497 582
498Returns a single value from the environment database. 583Returns a single value from the environment database.
499 584
500=item cf::db_put $family => $key => $value 585=item cf::db_put $family => $key => $value
501 586
502Stores the given C<$value> in the family. It can currently store binary 587Stores the given C<$value> in the family. It can currently store binary
503data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 588data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
504 589
590=item $db = cf::db_table "name"
591
592Create and/or open a new database table. The string must not be "db" and must be unique
593within each server.
594
505=cut 595=cut
596
597sub db_table($) {
598 my ($name) = @_;
599 my $db = BDB::db_create $DB_ENV;
600
601 eval {
602 $db->set_flags (BDB::CHKSUM);
603
604 utf8::encode $name;
605 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
606 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
607 cf::cleanup "db_open(db): $!" if $!;
608 };
609 cf::cleanup "db_open(db): $@" if $@;
610
611 $db
612}
506 613
507our $DB; 614our $DB;
508 615
509sub db_init { 616sub db_init {
510 unless ($DB) {
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job { 617 cf::sync_job {
514 eval { 618 $DB ||= db_table "db";
515 $DB->set_flags (BDB::CHKSUM);
516
517 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
518 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
519 cf::cleanup "db_open(db): $!" if $!;
520 };
521 cf::cleanup "db_open(db): $@" if $@;
522 };
523 } 619 };
524} 620}
525 621
526sub db_get($$) { 622sub db_get($$) {
527 my $key = "$_[0]/$_[1]"; 623 my $key = "$_[0]/$_[1]";
528 624
632attach callbacks/event handlers (a collection of which is called an "attachment") 728attach callbacks/event handlers (a collection of which is called an "attachment")
633to it. All such attachable objects support the following methods. 729to it. All such attachable objects support the following methods.
634 730
635In the following description, CLASS can be any of C<global>, C<object> 731In the following description, CLASS can be any of C<global>, C<object>
636C<player>, C<client> or C<map> (i.e. the attachable objects in 732C<player>, C<client> or C<map> (i.e. the attachable objects in
637Crossfire TRT). 733Deliantra).
638 734
639=over 4 735=over 4
640 736
641=item $attachable->attach ($attachment, key => $value...) 737=item $attachable->attach ($attachment, key => $value...)
642 738
924 } 1020 }
925 1021
926 0 1022 0
927} 1023}
928 1024
929=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1025=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
930 1026
931=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
932 1028
933Generate an object-specific event with the given arguments. 1029Generate an object-specific event with the given arguments.
934 1030
940 1036
941=cut 1037=cut
942 1038
943############################################################################# 1039#############################################################################
944# object support 1040# object support
945#
946 1041
1042sub _object_equal($$);
1043sub _object_equal($$) {
1044 my ($a, $b) = @_;
1045
1046 return 0 unless (ref $a) eq (ref $b);
1047
1048 if ("HASH" eq ref $a) {
1049 my @ka = keys %$a;
1050 my @kb = keys %$b;
1051
1052 return 0 if @ka != @kb;
1053
1054 for (0 .. $#ka) {
1055 return 0 unless $ka[$_] eq $kb[$_];
1056 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1057 }
1058
1059 } elsif ("ARRAY" eq ref $a) {
1060
1061 return 0 if @$a != @$b;
1062
1063 for (0 .. $#$a) {
1064 return 0 unless _object_equal $a->[$_], $b->[$_];
1065 }
1066
1067 } elsif ($a ne $b) {
1068 return 0;
1069 }
1070
1071 1
1072}
1073
1074our $SLOW_MERGES;#d#
947sub _can_merge { 1075sub _can_merge {
948 my ($ob1, $ob2) = @_; 1076 my ($ob1, $ob2) = @_;
949 1077
950 local $Storable::canonical = 1; 1078 ++$SLOW_MERGES;#d#
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953 1079
954 $fob1 eq $fob2 1080 # we do the slow way here
1081 return _object_equal $ob1, $ob2
955} 1082}
956 1083
957sub reattach { 1084sub reattach {
958 # basically do the same as instantiate, without calling instantiate 1085 # basically do the same as instantiate, without calling instantiate
959 my ($obj) = @_; 1086 my ($obj) = @_;
981cf::attachable->attach ( 1108cf::attachable->attach (
982 prio => -1000000, 1109 prio => -1000000,
983 on_instantiate => sub { 1110 on_instantiate => sub {
984 my ($obj, $data) = @_; 1111 my ($obj, $data) = @_;
985 1112
986 $data = from_json $data; 1113 $data = decode_json $data;
987 1114
988 for (@$data) { 1115 for (@$data) {
989 my ($name, $args) = @$_; 1116 my ($name, $args) = @$_;
990 1117
991 $obj->attach ($name, %{$args || {} }); 1118 $obj->attach ($name, %{$args || {} });
1007sub object_freezer_save { 1134sub object_freezer_save {
1008 my ($filename, $rdata, $objs) = @_; 1135 my ($filename, $rdata, $objs) = @_;
1009 1136
1010 sync_job { 1137 sync_job {
1011 if (length $$rdata) { 1138 if (length $$rdata) {
1139 utf8::decode (my $decname = $filename);
1012 warn sprintf "saving %s (%d,%d)\n", 1140 warn sprintf "saving %s (%d,%d)\n",
1013 $filename, length $$rdata, scalar @$objs; 1141 $decname, length $$rdata, scalar @$objs;
1014 1142
1015 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1016 chmod SAVE_MODE, $fh; 1144 chmod SAVE_MODE, $fh;
1017 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1018 aio_fsync $fh if $cf::USE_FSYNC; 1146 aio_fsync $fh if $cf::USE_FSYNC;
1019 close $fh; 1147 close $fh;
1020 1148
1021 if (@$objs) { 1149 if (@$objs) {
1022 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1150 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1023 chmod SAVE_MODE, $fh; 1151 chmod SAVE_MODE, $fh;
1024 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1025 aio_write $fh, 0, (length $data), $data, 0; 1153 aio_write $fh, 0, (length $data), $data, 0;
1026 aio_fsync $fh if $cf::USE_FSYNC; 1154 aio_fsync $fh if $cf::USE_FSYNC;
1027 close $fh; 1155 close $fh;
1028 aio_rename "$filename.pst~", "$filename.pst"; 1156 aio_rename "$filename.pst~", "$filename.pst";
1029 } 1157 }
1037 } 1165 }
1038 } else { 1166 } else {
1039 aio_unlink $filename; 1167 aio_unlink $filename;
1040 aio_unlink "$filename.pst"; 1168 aio_unlink "$filename.pst";
1041 } 1169 }
1042 } 1170 };
1043} 1171}
1044 1172
1045sub object_freezer_as_string { 1173sub object_freezer_as_string {
1046 my ($rdata, $objs) = @_; 1174 my ($rdata, $objs) = @_;
1047 1175
1059 or return; 1187 or return;
1060 1188
1061 unless (aio_stat "$filename.pst") { 1189 unless (aio_stat "$filename.pst") {
1062 (aio_load "$filename.pst", $av) >= 0 1190 (aio_load "$filename.pst", $av) >= 0
1063 or return; 1191 or return;
1192
1064 $av = eval { (Storable::thaw $av)->{objs} }; 1193 my $st = eval { Coro::Storable::thaw $av };
1194 $av = $st->{objs};
1065 } 1195 }
1066 1196
1197 utf8::decode (my $decname = $filename);
1067 warn sprintf "loading %s (%d)\n", 1198 warn sprintf "loading %s (%d,%d)\n",
1068 $filename, length $data, scalar @{$av || []}; 1199 $decname, length $data, scalar @{$av || []};
1200
1069 return ($data, $av); 1201 ($data, $av)
1070} 1202}
1071 1203
1072=head2 COMMAND CALLBACKS 1204=head2 COMMAND CALLBACKS
1073 1205
1074=over 4 1206=over 4
1223 my $msg = $@ ? "$v->{path}: $@\n" 1355 my $msg = $@ ? "$v->{path}: $@\n"
1224 : "$v->{base}: extension inactive.\n"; 1356 : "$v->{base}: extension inactive.\n";
1225 1357
1226 if (exists $v->{meta}{mandatory}) { 1358 if (exists $v->{meta}{mandatory}) {
1227 warn $msg; 1359 warn $msg;
1228 warn "mandatory extension failed to load, exiting.\n"; 1360 cf::cleanup "mandatory extension failed to load, exiting.";
1229 exit 1;
1230 } 1361 }
1231 1362
1232 warn $msg; 1363 warn $msg;
1233 } 1364 }
1234 1365
1259use Coro::AIO; 1390use Coro::AIO;
1260 1391
1261=head3 cf::player 1392=head3 cf::player
1262 1393
1263=over 4 1394=over 4
1395
1396=item cf::player::num_playing
1397
1398Returns the official number of playing players, as per the Crossfire metaserver rules.
1399
1400=cut
1401
1402sub num_playing {
1403 scalar grep
1404 $_->ob->map
1405 && !$_->hidden
1406 && !$_->ob->flag (cf::FLAG_WIZ),
1407 cf::player::list
1408}
1264 1409
1265=item cf::player::find $login 1410=item cf::player::find $login
1266 1411
1267Returns the given player object, loading it if necessary (might block). 1412Returns the given player object, loading it if necessary (might block).
1268 1413
1304 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1449 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1305 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1450 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1306 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1451 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1307 aio_unlink +(playerdir $login) . "/$login.pl"; 1452 aio_unlink +(playerdir $login) . "/$login.pl";
1308 1453
1309 my $pl = load_pl path $login 1454 my $f = new_from_file cf::object::thawer path $login
1310 or return; 1455 or return;
1456
1457 my $pl = cf::player::load_pl $f
1458 or return;
1459 local $cf::PLAYER_LOADING{$login} = $pl;
1460 $f->resolve_delayed_derefs;
1311 $cf::PLAYER{$login} = $pl 1461 $cf::PLAYER{$login} = $pl
1312 } 1462 }
1313 } 1463 }
1314} 1464}
1315 1465
1413 or return []; 1563 or return [];
1414 1564
1415 my @logins; 1565 my @logins;
1416 1566
1417 for my $login (@$dirs) { 1567 for my $login (@$dirs) {
1568 my $path = path $login;
1569
1570 # a .pst is a dead give-away for a valid player
1571 unless (-e "$path.pst") {
1418 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1419 aio_read $fh, 0, 512, my $buf, 0 or next; 1573 aio_read $fh, 0, 512, my $buf, 0 or next;
1420 $buf !~ /^password -------------$/m or next; # official not-valid tag 1574 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 }
1421 1576
1422 utf8::decode $login; 1577 utf8::decode $login;
1423 push @logins, $login; 1578 push @logins, $login;
1424 } 1579 }
1425 1580
1458 1613
1459Expand crossfire pod fragments into protocol xml. 1614Expand crossfire pod fragments into protocol xml.
1460 1615
1461=cut 1616=cut
1462 1617
1618use re 'eval';
1619
1620my $group;
1621my $interior; $interior = qr{
1622 # match a pod interior sequence sans C<< >>
1623 (?:
1624 \ (.*?)\ (?{ $group = $^N })
1625 | < (??{$interior}) >
1626 )
1627}x;
1628
1463sub expand_cfpod { 1629sub expand_cfpod {
1464 ((my $self), (local $_)) = @_; 1630 my ($self, $pod) = @_;
1465 1631
1466 # escape & and < 1632 my $xml;
1467 s/&/&amp;/g;
1468 s/(?<![BIUGH])</&lt;/g;
1469 1633
1470 # this is buggy, it needs to properly take care of nested <'s 1634 while () {
1635 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1636 $group = $1;
1471 1637
1472 1 while 1638 $group =~ s/&/&amp;/g;
1473 # replace B<>, I<>, U<> etc. 1639 $group =~ s/</&lt;/g;
1474 s/B<([^\>]*)>/<b>$1<\/b>/ 1640
1475 || s/I<([^\>]*)>/<i>$1<\/i>/ 1641 $xml .= $group;
1476 || s/U<([^\>]*)>/<u>$1<\/u>/ 1642 } elsif ($pod =~ m%\G
1477 # replace G<male|female> tags 1643 ([BCGHITU])
1478 || s{G<([^>|]*)\|([^>]*)>}{ 1644 <
1479 $self->gender ? $2 : $1 1645 (?:
1480 }ge 1646 ([^<>]*) (?{ $group = $^N })
1481 # replace H<hint text> 1647 | < $interior >
1482 || s{H<([^\>]*)>} 1648 )
1649 >
1650 %gcsx
1483 { 1651 ) {
1652 my ($code, $data) = ($1, $group);
1653
1654 if ($code eq "B") {
1655 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1656 } elsif ($code eq "I") {
1657 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1658 } elsif ($code eq "U") {
1659 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1660 } elsif ($code eq "C") {
1661 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1662 } elsif ($code eq "T") {
1663 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1664 } elsif ($code eq "G") {
1665 my ($male, $female) = split /\|/, $data;
1666 $data = $self->gender ? $female : $male;
1667 $xml .= expand_cfpod ($self, $data);
1668 } elsif ($code eq "H") {
1484 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1669 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1485 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1670 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1486 "") 1671 "")
1487 [$self->{hintmode}] 1672 [$self->{hintmode}];
1673 } else {
1674 $xml .= "error processing '$code($data)' directive";
1488 }ge; 1675 }
1676 } else {
1677 if ($pod =~ /\G(.+)/) {
1678 warn "parse error while expanding $pod (at $1)";
1679 }
1680 last;
1681 }
1682 }
1489 1683
1684 for ($xml) {
1490 # create single paragraphs (very hackish) 1685 # create single paragraphs (very hackish)
1491 s/(?<=\S)\n(?=\w)/ /g; 1686 s/(?<=\S)\n(?=\w)/ /g;
1492 1687
1493 # compress some whitespace 1688 # compress some whitespace
1494 s/\s+\n/\n/g; # ws line-ends 1689 s/\s+\n/\n/g; # ws line-ends
1495 s/\n\n+/\n/g; # double lines 1690 s/\n\n+/\n/g; # double lines
1496 s/^\n+//; # beginning lines 1691 s/^\n+//; # beginning lines
1497 s/\n+$//; # ending lines 1692 s/\n+$//; # ending lines
1693 }
1498 1694
1499 $_ 1695 $xml
1500} 1696}
1697
1698no re 'eval';
1501 1699
1502sub hintmode { 1700sub hintmode {
1503 $_[0]{hintmode} = $_[1] if @_ > 1; 1701 $_[0]{hintmode} = $_[1] if @_ > 1;
1504 $_[0]{hintmode} 1702 $_[0]{hintmode}
1505} 1703}
1749 1947
1750sub load_header_from($) { 1948sub load_header_from($) {
1751 my ($self, $path) = @_; 1949 my ($self, $path) = @_;
1752 1950
1753 utf8::encode $path; 1951 utf8::encode $path;
1754 #aio_open $path, O_RDONLY, 0 1952 my $f = new_from_file cf::object::thawer $path
1755 # or return;
1756
1757 $self->_load_header ($path)
1758 or return; 1953 or return;
1954
1955 $self->_load_header ($f)
1956 or return;
1957
1958 local $MAP_LOADING{$self->{path}} = $self;
1959 $f->resolve_delayed_derefs;
1759 1960
1760 $self->{load_path} = $path; 1961 $self->{load_path} = $path;
1761 1962
1762 1 1963 1
1763} 1964}
1817sub find { 2018sub find {
1818 my ($path, $origin) = @_; 2019 my ($path, $origin) = @_;
1819 2020
1820 $path = normalise $path, $origin && $origin->path; 2021 $path = normalise $path, $origin && $origin->path;
1821 2022
2023 cf::lock_wait "map_data:$path";#d#remove
1822 cf::lock_wait "map_find:$path"; 2024 cf::lock_wait "map_find:$path";
1823 2025
1824 $cf::MAP{$path} || do { 2026 $cf::MAP{$path} || do {
1825 my $guard = cf::lock_acquire "map_find:$path"; 2027 my $guard1 = cf::lock_acquire "map_find:$path";
2028 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2029
1826 my $map = new_from_path cf::map $path 2030 my $map = new_from_path cf::map $path
1827 or return; 2031 or return;
1828 2032
1829 $map->{last_save} = $cf::RUNTIME; 2033 $map->{last_save} = $cf::RUNTIME;
1830 2034
1832 or return; 2036 or return;
1833 2037
1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2038 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835 # doing this can freeze the server in a sync job, obviously 2039 # doing this can freeze the server in a sync job, obviously
1836 #$cf::WAIT_FOR_TICK->wait; 2040 #$cf::WAIT_FOR_TICK->wait;
2041 undef $guard1;
2042 undef $guard2;
1837 $map->reset; 2043 $map->reset;
1838 undef $guard;
1839 return find $path; 2044 return find $path;
1840 } 2045 }
1841 2046
1842 $cf::MAP{$path} = $map 2047 $cf::MAP{$path} = $map
1843 } 2048 }
1852 local $self->{deny_reset} = 1; # loading can take a long time 2057 local $self->{deny_reset} = 1; # loading can take a long time
1853 2058
1854 my $path = $self->{path}; 2059 my $path = $self->{path};
1855 2060
1856 { 2061 {
1857 my $guard1 = cf::lock_acquire "map_data:$path"; 2062 my $guard = cf::lock_acquire "map_data:$path";
1858 my $guard2 = cf::lock_acquire "map_load:$path";
1859 2063
2064 return unless $self->valid;
1860 return if $self->in_memory != cf::MAP_SWAPPED; 2065 return unless $self->in_memory == cf::MAP_SWAPPED;
1861 2066
1862 $self->in_memory (cf::MAP_LOADING); 2067 $self->in_memory (cf::MAP_LOADING);
1863 2068
1864 $self->alloc; 2069 $self->alloc;
1865 2070
1866 $self->pre_load; 2071 $self->pre_load;
1867 cf::cede_to_tick; 2072 cf::cede_to_tick;
1868 2073
2074 my $f = new_from_file cf::object::thawer $self->{load_path};
2075 $f->skip_block;
1869 $self->_load_objects ($self->{load_path}, 1) 2076 $self->_load_objects ($f)
1870 or return; 2077 or return;
1871 2078
1872 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2079 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1873 if delete $self->{load_original}; 2080 if delete $self->{load_original};
1874 2081
1875 if (my $uniq = $self->uniq_path) { 2082 if (my $uniq = $self->uniq_path) {
1876 utf8::encode $uniq; 2083 utf8::encode $uniq;
1877 if (aio_open $uniq, O_RDONLY, 0) { 2084 unless (aio_stat $uniq) {
2085 if (my $f = new_from_file cf::object::thawer $uniq) {
1878 $self->clear_unique_items; 2086 $self->clear_unique_items;
1879 $self->_load_objects ($uniq, 0); 2087 $self->_load_objects ($f);
2088 $f->resolve_delayed_derefs;
2089 }
1880 } 2090 }
1881 } 2091 }
2092
2093 $f->resolve_delayed_derefs;
1882 2094
1883 cf::cede_to_tick; 2095 cf::cede_to_tick;
1884 # now do the right thing for maps 2096 # now do the right thing for maps
1885 $self->link_multipart_objects; 2097 $self->link_multipart_objects;
1886 $self->difficulty ($self->estimate_difficulty) 2098 $self->difficulty ($self->estimate_difficulty)
1972 } 2184 }
1973 2185
1974 $MAP_PREFETCH{$path} |= $load; 2186 $MAP_PREFETCH{$path} |= $load;
1975 2187
1976 $MAP_PREFETCHER ||= cf::async { 2188 $MAP_PREFETCHER ||= cf::async {
2189 $Coro::current->{desc} = "map prefetcher";
2190
1977 while (%MAP_PREFETCH) { 2191 while (%MAP_PREFETCH) {
1978 while (my ($k, $v) = each %MAP_PREFETCH) { 2192 while (my ($k, $v) = each %MAP_PREFETCH) {
1979 if (my $map = find $k) { 2193 if (my $map = find $k) {
1980 $map->load if $v; 2194 $map->load if $v;
1981 } 2195 }
2007 return if $self->{deny_save}; 2221 return if $self->{deny_save};
2008 2222
2009 local $self->{last_access} = $self->last_access;#d# 2223 local $self->{last_access} = $self->last_access;#d#
2010 2224
2011 cf::async { 2225 cf::async {
2226 $Coro::current->{desc} = "map player save";
2012 $_->contr->save for $self->players; 2227 $_->contr->save for $self->players;
2013 }; 2228 };
2014 2229
2015 if ($uniq) { 2230 if ($uniq) {
2016 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2231 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2030 2245
2031 return if $self->players; 2246 return if $self->players;
2032 return if $self->in_memory != cf::MAP_IN_MEMORY; 2247 return if $self->in_memory != cf::MAP_IN_MEMORY;
2033 return if $self->{deny_save}; 2248 return if $self->{deny_save};
2034 2249
2250 $self->in_memory (cf::MAP_SWAPPED);
2251
2252 $self->deactivate;
2253 $_->clear_links_to ($self) for values %cf::MAP;
2035 $self->clear; 2254 $self->clear;
2036 $self->in_memory (cf::MAP_SWAPPED);
2037} 2255}
2038 2256
2039sub reset_at { 2257sub reset_at {
2040 my ($self) = @_; 2258 my ($self) = @_;
2041 2259
2073 if $uniq; 2291 if $uniq;
2074 } 2292 }
2075 2293
2076 delete $cf::MAP{$self->path}; 2294 delete $cf::MAP{$self->path};
2077 2295
2296 $self->deactivate;
2297 $_->clear_links_to ($self) for values %cf::MAP;
2078 $self->clear; 2298 $self->clear;
2079
2080 $_->clear_links_to ($self) for values %cf::MAP;
2081 2299
2082 $self->unlink_save; 2300 $self->unlink_save;
2083 $self->destroy; 2301 $self->destroy;
2084} 2302}
2085 2303
2090 2308
2091 { 2309 {
2092 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2093 2311
2094 delete $cf::MAP{$self->path}; 2312 delete $cf::MAP{$self->path};
2313
2314 $self->unlink_save;
2095 2315
2096 bless $self, "cf::map"; 2316 bless $self, "cf::map";
2097 delete $self->{deny_reset}; 2317 delete $self->{deny_reset};
2098 $self->{deny_save} = 1; 2318 $self->{deny_save} = 1;
2099 $self->reset_timeout (1); 2319 $self->reset_timeout (1);
2100 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2320 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2101
2102 $self->unlink_save;
2103 2321
2104 $cf::MAP{$self->path} = $self; 2322 $cf::MAP{$self->path} = $self;
2105 } 2323 }
2106 2324
2107 $self->reset; # polite request, might not happen 2325 $self->reset; # polite request, might not happen
2159 : () 2377 : ()
2160 } @{ aio_readdir $UNIQUEDIR or [] } 2378 } @{ aio_readdir $UNIQUEDIR or [] }
2161 ] 2379 ]
2162} 2380}
2163 2381
2164package cf;
2165
2166=back 2382=back
2167 2383
2168=head3 cf::object 2384=head3 cf::object
2169 2385
2170=cut 2386=cut
2184 map { $_, inv_recursive_ $_->inv } @_ 2400 map { $_, inv_recursive_ $_->inv } @_
2185} 2401}
2186 2402
2187sub inv_recursive { 2403sub inv_recursive {
2188 inv_recursive_ inv $_[0] 2404 inv_recursive_ inv $_[0]
2405}
2406
2407=item $ref = $ob->ref
2408
2409creates and returns a persistent reference to an objetc that can be stored as a string.
2410
2411=item $ob = cf::object::deref ($refstring)
2412
2413returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2414even if the object actually exists. May block.
2415
2416=cut
2417
2418sub deref {
2419 my ($ref) = @_;
2420
2421 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2422 my ($uuid, $name) = ($1, $2);
2423 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2424 or return;
2425 $pl->ob->uuid eq $uuid
2426 or return;
2427
2428 $pl->ob
2429 } else {
2430 warn "$ref: cannot resolve object reference\n";
2431 undef
2432 }
2189} 2433}
2190 2434
2191package cf; 2435package cf;
2192 2436
2193=back 2437=back
2353 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2597 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2354 2598
2355 $self->enter_link; 2599 $self->enter_link;
2356 2600
2357 (async { 2601 (async {
2602 $Coro::current->{desc} = "player::goto $path $x $y";
2603
2604 # *tag paths override both path and x|y
2605 if ($path =~ /^\*(.*)$/) {
2606 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2607 my $ob = $obs[rand @obs];
2608
2609 # see if we actually can go there
2610 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2611 $ob = $obs[rand @obs];
2612 } else {
2613 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2614 }
2615 # else put us there anyways for now #d#
2616
2617 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2618 } else {
2619 ($path, $x, $y) = (undef, undef, undef);
2620 }
2621 }
2622
2358 my $map = eval { 2623 my $map = eval {
2359 my $map = cf::map::find $path; 2624 my $map = defined $path ? cf::map::find $path : undef;
2360 2625
2361 if ($map) { 2626 if ($map) {
2362 $map = $map->customise_for ($self); 2627 $map = $map->customise_for ($self);
2363 $map = $check->($map) if $check && $map; 2628 $map = $check->($map) if $check && $map;
2364 } else { 2629 } else {
2365 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2630 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2366 } 2631 }
2367 2632
2368 $map 2633 $map
2369 }; 2634 };
2370 2635
2423 $rmp->{origin_y} = $exit->y; 2688 $rmp->{origin_y} = $exit->y;
2424 } 2689 }
2425 2690
2426 $rmp->{random_seed} ||= $exit->random_seed; 2691 $rmp->{random_seed} ||= $exit->random_seed;
2427 2692
2428 my $data = cf::to_json $rmp; 2693 my $data = cf::encode_json $rmp;
2429 my $md5 = Digest::MD5::md5_hex $data; 2694 my $md5 = Digest::MD5::md5_hex $data;
2430 my $meta = "$RANDOMDIR/$md5.meta"; 2695 my $meta = "$RANDOMDIR/$md5.meta";
2431 2696
2432 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2697 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2433 aio_write $fh, 0, (length $data), $data, 0; 2698 aio_write $fh, 0, (length $data), $data, 0;
2460 # if exit is damned, update players death & WoR home-position 2725 # if exit is damned, update players death & WoR home-position
2461 $self->contr->savebed ($slaying, $hp, $sp) 2726 $self->contr->savebed ($slaying, $hp, $sp)
2462 if $exit->flag (FLAG_DAMNED); 2727 if $exit->flag (FLAG_DAMNED);
2463 2728
2464 (async { 2729 (async {
2730 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2731
2465 $self->deactivate_recursive; # just to be sure 2732 $self->deactivate_recursive; # just to be sure
2466 unless (eval { 2733 unless (eval {
2467 $self->goto ($slaying, $hp, $sp); 2734 $self->goto ($slaying, $hp, $sp);
2468 2735
2469 1; 2736 1;
2504the message, with C<log> being the default. If C<$color> is negative, suppress 2771the message, with C<log> being the default. If C<$color> is negative, suppress
2505the message unless the client supports the msg packet. 2772the message unless the client supports the msg packet.
2506 2773
2507=cut 2774=cut
2508 2775
2776# non-persistent channels (usually the info channel)
2509our %CHANNEL = ( 2777our %CHANNEL = (
2510 "c/identify" => { 2778 "c/identify" => {
2511 id => "identify", 2779 id => "infobox",
2512 title => "Identify", 2780 title => "Identify",
2513 reply => undef, 2781 reply => undef,
2514 tooltip => "Items recently identified", 2782 tooltip => "Items recently identified",
2515 }, 2783 },
2784 "c/examine" => {
2785 id => "infobox",
2786 title => "Examine",
2787 reply => undef,
2788 tooltip => "Signs and other items you examined",
2789 },
2790 "c/book" => {
2791 id => "infobox",
2792 title => "Book",
2793 reply => undef,
2794 tooltip => "The contents of a note or book",
2795 },
2796 "c/lookat" => {
2797 id => "infobox",
2798 title => "Look",
2799 reply => undef,
2800 tooltip => "What you saw there",
2801 },
2802 "c/who" => {
2803 id => "infobox",
2804 title => "Players",
2805 reply => undef,
2806 tooltip => "Shows players who are currently online",
2807 },
2808 "c/body" => {
2809 id => "infobox",
2810 title => "Body Parts",
2811 reply => undef,
2812 tooltip => "Shows which body parts you posess and are available",
2813 },
2814 "c/uptime" => {
2815 id => "infobox",
2816 title => "Uptime",
2817 reply => undef,
2818 tooltip => "How long the server has been running since last restart",
2819 },
2820 "c/mapinfo" => {
2821 id => "infobox",
2822 title => "Map Info",
2823 reply => undef,
2824 tooltip => "Information related to the maps",
2825 },
2516); 2826);
2517 2827
2518sub cf::client::send_msg { 2828sub cf::client::send_msg {
2519 my ($self, $channel, $msg, $color, @extra) = @_; 2829 my ($self, $channel, $msg, $color, @extra) = @_;
2520 2830
2521 $msg = $self->pl->expand_cfpod ($msg); 2831 $msg = $self->pl->expand_cfpod ($msg);
2522 2832
2523 $color &= cf::NDI_CLIENT_MASK; # just in case... 2833 $color &= cf::NDI_CLIENT_MASK; # just in case...
2524 2834
2525 # check predefined channels, for the benefit of C 2835 # check predefined channels, for the benefit of C
2526 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2836 if ($CHANNEL{$channel}) {
2837 $channel = $CHANNEL{$channel};
2527 2838
2839 $self->ext_msg (channel_info => $channel)
2840 if $self->can_msg;
2841
2842 $channel = $channel->{id};
2843
2528 if (ref $channel) { 2844 } elsif (ref $channel) {
2529 # send meta info to client, if not yet sent 2845 # send meta info to client, if not yet sent
2530 unless (exists $self->{channel}{$channel->{id}}) { 2846 unless (exists $self->{channel}{$channel->{id}}) {
2531 $self->{channel}{$channel->{id}} = $channel; 2847 $self->{channel}{$channel->{id}} = $channel;
2532 $self->ext_msg (channel_info => $channel); 2848 $self->ext_msg (channel_info => $channel)
2849 if $self->can_msg;
2533 } 2850 }
2534 2851
2535 $channel = $channel->{id}; 2852 $channel = $channel->{id};
2536 } 2853 }
2537 2854
2749=pod 3066=pod
2750 3067
2751The following functions and methods are available within a safe environment: 3068The following functions and methods are available within a safe environment:
2752 3069
2753 cf::object 3070 cf::object
2754 contr pay_amount pay_player map x y force_find force_add 3071 contr pay_amount pay_player map x y force_find force_add destroy
2755 insert remove name archname title slaying race decrease_ob_nr 3072 insert remove name archname title slaying race decrease_ob_nr
2756 3073
2757 cf::object::player 3074 cf::object::player
2758 player 3075 player
2759 3076
2766=cut 3083=cut
2767 3084
2768for ( 3085for (
2769 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3086 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2770 insert remove inv name archname title slaying race 3087 insert remove inv name archname title slaying race
2771 decrease_ob_nr)], 3088 decrease_ob_nr destroy)],
2772 ["cf::object::player" => qw(player)], 3089 ["cf::object::player" => qw(player)],
2773 ["cf::player" => qw(peaceful)], 3090 ["cf::player" => qw(peaceful)],
2774 ["cf::map" => qw(trigger)], 3091 ["cf::map" => qw(trigger)],
2775) { 3092) {
2776 no strict 'refs'; 3093 no strict 'refs';
2881 { 3198 {
2882 my $faces = $facedata->{faceinfo}; 3199 my $faces = $facedata->{faceinfo};
2883 3200
2884 while (my ($face, $info) = each %$faces) { 3201 while (my ($face, $info) = each %$faces) {
2885 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3202 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3203
2886 cf::face::set_visibility $idx, $info->{visibility}; 3204 cf::face::set_visibility $idx, $info->{visibility};
2887 cf::face::set_magicmap $idx, $info->{magicmap}; 3205 cf::face::set_magicmap $idx, $info->{magicmap};
2888 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3206 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2889 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3207 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2890 3208
2891 cf::cede_to_tick; 3209 cf::cede_to_tick;
2892 } 3210 }
2893 3211
2894 while (my ($face, $info) = each %$faces) { 3212 while (my ($face, $info) = each %$faces) {
2895 next unless $info->{smooth}; 3213 next unless $info->{smooth};
3214
2896 my $idx = cf::face::find $face 3215 my $idx = cf::face::find $face
2897 or next; 3216 or next;
3217
2898 if (my $smooth = cf::face::find $info->{smooth}) { 3218 if (my $smooth = cf::face::find $info->{smooth}) {
2899 cf::face::set_smooth $idx, $smooth; 3219 cf::face::set_smooth $idx, $smooth;
2900 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3220 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2901 } else { 3221 } else {
2902 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3222 warn "smooth face '$info->{smooth}' not found for face '$face'";
2920 { 3240 {
2921 # TODO: for gcfclient pleasure, we should give resources 3241 # TODO: for gcfclient pleasure, we should give resources
2922 # that gcfclient doesn't grok a >10000 face index. 3242 # that gcfclient doesn't grok a >10000 face index.
2923 my $res = $facedata->{resource}; 3243 my $res = $facedata->{resource};
2924 3244
2925 my $soundconf = delete $res->{"res/sound.conf"};
2926
2927 while (my ($name, $info) = each %$res) { 3245 while (my ($name, $info) = each %$res) {
3246 if (defined $info->{type}) {
2928 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3247 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2929 my $data; 3248 my $data;
2930 3249
2931 if ($info->{type} & 1) { 3250 if ($info->{type} & 1) {
2932 # prepend meta info 3251 # prepend meta info
2933 3252
2934 my $meta = $enc->encode ({ 3253 my $meta = $enc->encode ({
2935 name => $name, 3254 name => $name,
2936 %{ $info->{meta} || {} }, 3255 %{ $info->{meta} || {} },
2937 }); 3256 });
2938 3257
2939 $data = pack "(w/a*)*", $meta, $info->{data}; 3258 $data = pack "(w/a*)*", $meta, $info->{data};
3259 } else {
3260 $data = $info->{data};
3261 }
3262
3263 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3264 cf::face::set_type $idx, $info->{type};
2940 } else { 3265 } else {
2941 $data = $info->{data}; 3266 $RESOURCE{$name} = $info;
2942 } 3267 }
2943 3268
2944 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2945 cf::face::set_type $idx, $info->{type};
2946
2947 cf::cede_to_tick; 3269 cf::cede_to_tick;
2948 } 3270 }
2949
2950 if ($soundconf) {
2951 $soundconf = $enc->decode (delete $soundconf->{data});
2952
2953 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2954 my $sound = $soundconf->{compat}[$_]
2955 or next;
2956
2957 my $face = cf::face::find "sound/$sound->[1]";
2958 cf::sound::set $sound->[0] => $face;
2959 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2960 }
2961
2962 while (my ($k, $v) = each %{$soundconf->{event}}) {
2963 my $face = cf::face::find "sound/$v";
2964 cf::sound::set $k => $face;
2965 }
2966 }
2967 } 3271 }
3272
3273 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2968 3274
2969 1 3275 1
2970} 3276}
3277
3278cf::global->attach (on_resource_update => sub {
3279 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3280 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3281
3282 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3283 my $sound = $soundconf->{compat}[$_]
3284 or next;
3285
3286 my $face = cf::face::find "sound/$sound->[1]";
3287 cf::sound::set $sound->[0] => $face;
3288 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3289 }
3290
3291 while (my ($k, $v) = each %{$soundconf->{event}}) {
3292 my $face = cf::face::find "sound/$v";
3293 cf::sound::set $k => $face;
3294 }
3295 }
3296});
2971 3297
2972register_exticmd fx_want => sub { 3298register_exticmd fx_want => sub {
2973 my ($ns, $want) = @_; 3299 my ($ns, $want) = @_;
2974 3300
2975 while (my ($k, $v) = each %$want) { 3301 while (my ($k, $v) = each %$want) {
3030sub reload_config { 3356sub reload_config {
3031 open my $fh, "<:utf8", "$CONFDIR/config" 3357 open my $fh, "<:utf8", "$CONFDIR/config"
3032 or return; 3358 or return;
3033 3359
3034 local $/; 3360 local $/;
3035 *CFG = YAML::Syck::Load <$fh>; 3361 *CFG = YAML::Load <$fh>;
3036 3362
3037 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3363 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3038 3364
3039 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3365 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3040 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3366 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3051sub main { 3377sub main {
3052 # we must not ever block the main coroutine 3378 # we must not ever block the main coroutine
3053 local $Coro::idle = sub { 3379 local $Coro::idle = sub {
3054 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3380 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3055 (async { 3381 (async {
3056 Event::one_event; 3382 $Coro::current->{desc} = "IDLE BUG HANDLER";
3383 EV::loop EV::LOOP_ONESHOT;
3057 })->prio (Coro::PRIO_MAX); 3384 })->prio (Coro::PRIO_MAX);
3058 }; 3385 };
3059 3386
3060 reload_config; 3387 reload_config;
3061 db_init; 3388 db_init;
3062 load_extensions; 3389 load_extensions;
3063 3390
3064 $TICK_WATCHER->start; 3391 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3392 evthread_start IO::AIO::poll_fileno;
3065 Event::loop; 3393 EV::loop;
3066} 3394}
3067 3395
3068############################################################################# 3396#############################################################################
3069# initialisation and cleanup 3397# initialisation and cleanup
3070 3398
3071# install some emergency cleanup handlers 3399# install some emergency cleanup handlers
3072BEGIN { 3400BEGIN {
3401 our %SIGWATCHER = ();
3073 for my $signal (qw(INT HUP TERM)) { 3402 for my $signal (qw(INT HUP TERM)) {
3074 Event->signal ( 3403 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3075 reentrant => 0,
3076 data => WF_AUTOCANCEL,
3077 signal => $signal,
3078 prio => 0,
3079 cb => sub {
3080 cf::cleanup "SIG$signal"; 3404 cf::cleanup "SIG$signal";
3081 },
3082 ); 3405 };
3083 } 3406 }
3084} 3407}
3085 3408
3086sub write_runtime { 3409sub write_runtime {
3087 my $runtime = "$LOCALDIR/runtime"; 3410 my $runtime = "$LOCALDIR/runtime";
3132 # and maps saved/destroyed asynchronously. 3455 # and maps saved/destroyed asynchronously.
3133 warn "begin emergency player save\n"; 3456 warn "begin emergency player save\n";
3134 for my $login (keys %cf::PLAYER) { 3457 for my $login (keys %cf::PLAYER) {
3135 my $pl = $cf::PLAYER{$login} or next; 3458 my $pl = $cf::PLAYER{$login} or next;
3136 $pl->valid or next; 3459 $pl->valid or next;
3460 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3137 $pl->save; 3461 $pl->save;
3138 } 3462 }
3139 warn "end emergency player save\n"; 3463 warn "end emergency player save\n";
3140 3464
3141 warn "begin emergency map save\n"; 3465 warn "begin emergency map save\n";
3180 warn "syncing database to disk"; 3504 warn "syncing database to disk";
3181 BDB::db_env_txn_checkpoint $DB_ENV; 3505 BDB::db_env_txn_checkpoint $DB_ENV;
3182 3506
3183 # if anything goes wrong in here, we should simply crash as we already saved 3507 # if anything goes wrong in here, we should simply crash as we already saved
3184 3508
3185 warn "cancelling all WF_AUTOCANCEL watchers";
3186 for (Event::all_watchers) {
3187 $_->cancel if $_->data & WF_AUTOCANCEL;
3188 }
3189
3190 warn "flushing outstanding aio requests"; 3509 warn "flushing outstanding aio requests";
3191 for (;;) { 3510 for (;;) {
3192 BDB::flush; 3511 BDB::flush;
3193 IO::AIO::flush; 3512 IO::AIO::flush;
3194 Coro::cede; 3513 Coro::cede_notself;
3195 last unless IO::AIO::nreqs || BDB::nreqs; 3514 last unless IO::AIO::nreqs || BDB::nreqs;
3196 warn "iterate..."; 3515 warn "iterate...";
3197 } 3516 }
3198 3517
3199 ++$RELOAD; 3518 ++$RELOAD;
3275 warn "leaving sync_job"; 3594 warn "leaving sync_job";
3276 3595
3277 1 3596 1
3278 } or do { 3597 } or do {
3279 warn $@; 3598 warn $@;
3280 warn "error while reloading, exiting."; 3599 cf::cleanup "error while reloading, exiting.";
3281 exit 1;
3282 }; 3600 };
3283 3601
3284 warn "reloaded"; 3602 warn "reloaded";
3285}; 3603};
3286 3604
3288 3606
3289sub reload_perl() { 3607sub reload_perl() {
3290 # doing reload synchronously and two reloads happen back-to-back, 3608 # doing reload synchronously and two reloads happen back-to-back,
3291 # coro crashes during coro_state_free->destroy here. 3609 # coro crashes during coro_state_free->destroy here.
3292 3610
3293 $RELOAD_WATCHER ||= Event->timer ( 3611 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3294 reentrant => 0,
3295 after => 0,
3296 data => WF_AUTOCANCEL,
3297 cb => sub {
3298 do_reload_perl; 3612 do_reload_perl;
3299 undef $RELOAD_WATCHER; 3613 undef $RELOAD_WATCHER;
3300 },
3301 ); 3614 };
3302} 3615}
3303 3616
3304register_command "reload" => sub { 3617register_command "reload" => sub {
3305 my ($who, $arg) = @_; 3618 my ($who, $arg) = @_;
3306 3619
3307 if ($who->flag (FLAG_WIZ)) { 3620 if ($who->flag (FLAG_WIZ)) {
3308 $who->message ("reloading server."); 3621 $who->message ("reloading server.");
3622 async {
3623 $Coro::current->{desc} = "perl_reload";
3309 async { reload_perl }; 3624 reload_perl;
3625 };
3310 } 3626 }
3311}; 3627};
3312 3628
3313unshift @INC, $LIBDIR; 3629unshift @INC, $LIBDIR;
3314 3630
3316 3632
3317our @WAIT_FOR_TICK; 3633our @WAIT_FOR_TICK;
3318our @WAIT_FOR_TICK_BEGIN; 3634our @WAIT_FOR_TICK_BEGIN;
3319 3635
3320sub wait_for_tick { 3636sub wait_for_tick {
3321 return unless $TICK_WATCHER->is_active; 3637 return if tick_inhibit;
3322 return if $Coro::current == $Coro::main; 3638 return if $Coro::current == $Coro::main;
3323 3639
3324 my $signal = new Coro::Signal; 3640 my $signal = new Coro::Signal;
3325 push @WAIT_FOR_TICK, $signal; 3641 push @WAIT_FOR_TICK, $signal;
3326 $signal->wait; 3642 $signal->wait;
3327} 3643}
3328 3644
3329sub wait_for_tick_begin { 3645sub wait_for_tick_begin {
3330 return unless $TICK_WATCHER->is_active; 3646 return if tick_inhibit;
3331 return if $Coro::current == $Coro::main; 3647 return if $Coro::current == $Coro::main;
3332 3648
3333 my $signal = new Coro::Signal; 3649 my $signal = new Coro::Signal;
3334 push @WAIT_FOR_TICK_BEGIN, $signal; 3650 push @WAIT_FOR_TICK_BEGIN, $signal;
3335 $signal->wait; 3651 $signal->wait;
3336} 3652}
3337 3653
3338 my $min = 1e6;#d# 3654sub tick {
3339 my $avg = 10;
3340$TICK_WATCHER = Event->timer (
3341 reentrant => 0,
3342 parked => 1,
3343 prio => 0,
3344 at => $NEXT_TICK || $TICK,
3345 data => WF_AUTOCANCEL,
3346 cb => sub {
3347 if ($Coro::current != $Coro::main) { 3655 if ($Coro::current != $Coro::main) {
3348 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3656 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3349 unless ++$bug_warning > 10; 3657 unless ++$bug_warning > 10;
3350 return; 3658 return;
3351 } 3659 }
3352 3660
3353 $NOW = $tick_start = Event::time;
3354
3355 cf::server_tick; # one server iteration 3661 cf::server_tick; # one server iteration
3356 3662
3357 0 && sync_job {#d# 3663 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3358 for(1..10) { 3664 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3359 my $t = Event::time; 3665 Coro::async_pool {
3360 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3666 $Coro::current->{desc} = "runtime saver";
3361 or die; 3667 write_runtime
3362 3668 or warn "ERROR: unable to write runtime file: $!";
3363 $map->width (50);
3364 $map->height (50);
3365 $map->alloc;
3366 $map->_load_objects ("/tmp/x.map", 1);
3367 my $t = Event::time - $t;
3368
3369 #next unless $t < 0.0013;#d#
3370 if ($t < $min) {
3371 $min = $t;
3372 }
3373 $avg = $avg * 0.99 + $t * 0.01;
3374 }
3375 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3376 exit 0;
3377 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3378 }; 3669 };
3670 }
3379 3671
3380 $RUNTIME += $TICK;
3381 $NEXT_TICK += $TICK;
3382
3383 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3384 $NEXT_RUNTIME_WRITE = $NOW + 10;
3385 Coro::async_pool {
3386 write_runtime
3387 or warn "ERROR: unable to write runtime file: $!";
3388 };
3389 }
3390
3391# my $AFTER = Event::time;
3392# warn $AFTER - $NOW;#d#
3393
3394 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3672 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3395 $sig->send; 3673 $sig->send;
3396 } 3674 }
3397 while (my $sig = shift @WAIT_FOR_TICK) { 3675 while (my $sig = shift @WAIT_FOR_TICK) {
3398 $sig->send; 3676 $sig->send;
3399 } 3677 }
3400 3678
3401 $NOW = Event::time; 3679 $LOAD = ($NOW - $TICK_START) / $TICK;
3402
3403 # if we are delayed by four ticks or more, skip them all
3404 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3405
3406 $TICK_WATCHER->at ($NEXT_TICK);
3407 $TICK_WATCHER->start;
3408
3409 $LOAD = ($NOW - $tick_start) / $TICK;
3410 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3680 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3411 3681
3412 _post_tick; 3682 if (0) {
3413 3683 if ($NEXT_TICK) {
3414 3684 my $jitter = $TICK_START - $NEXT_TICK;
3685 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3686 warn "jitter $JITTER\n";#d#
3687 }
3415 }, 3688 }
3416); 3689}
3417 3690
3418{ 3691{
3419 BDB::max_poll_time $TICK * 0.1; 3692 # configure BDB
3420 $BDB_POLL_WATCHER = Event->io ( 3693
3421 reentrant => 0,
3422 fd => BDB::poll_fileno,
3423 poll => 'r',
3424 prio => 0,
3425 data => WF_AUTOCANCEL,
3426 cb => \&BDB::poll_cb,
3427 );
3428 BDB::min_parallel 8; 3694 BDB::min_parallel 8;
3429 3695 BDB::max_poll_reqs $TICK * 0.1;
3430 BDB::set_sync_prepare { 3696 $Coro::BDB::WATCHER->priority (1);
3431 my $status;
3432 my $current = $Coro::current;
3433 (
3434 sub {
3435 $status = $!;
3436 $current->ready; undef $current;
3437 },
3438 sub {
3439 Coro::schedule while defined $current;
3440 $! = $status;
3441 },
3442 )
3443 };
3444 3697
3445 unless ($DB_ENV) { 3698 unless ($DB_ENV) {
3446 $DB_ENV = BDB::db_env_create; 3699 $DB_ENV = BDB::db_env_create;
3700 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3701 | BDB::LOG_AUTOREMOVE, 1);
3702 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3703 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3447 3704
3448 cf::sync_job { 3705 cf::sync_job {
3449 eval { 3706 eval {
3450 BDB::db_env_open 3707 BDB::db_env_open
3451 $DB_ENV, 3708 $DB_ENV,
3453 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3710 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3454 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3711 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3455 0666; 3712 0666;
3456 3713
3457 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3714 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3458
3459 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3460 $DB_ENV->set_lk_detect;
3461 }; 3715 };
3462 3716
3463 cf::cleanup "db_env_open(db): $@" if $@; 3717 cf::cleanup "db_env_open(db): $@" if $@;
3464 }; 3718 };
3465 } 3719 }
3720
3721 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3722 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3723 };
3724 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3725 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3726 };
3727 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3728 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3729 };
3466} 3730}
3467 3731
3468{ 3732{
3733 # configure IO::AIO
3734
3469 IO::AIO::min_parallel 8; 3735 IO::AIO::min_parallel 8;
3470
3471 undef $Coro::AIO::WATCHER;
3472 IO::AIO::max_poll_time $TICK * 0.1; 3736 IO::AIO::max_poll_time $TICK * 0.1;
3473 $AIO_POLL_WATCHER = Event->io ( 3737 $Coro::AIO::WATCHER->priority (1);
3474 reentrant => 0,
3475 data => WF_AUTOCANCEL,
3476 fd => IO::AIO::poll_fileno,
3477 poll => 'r',
3478 prio => 6,
3479 cb => \&IO::AIO::poll_cb,
3480 );
3481} 3738}
3482 3739
3483my $_log_backtrace; 3740my $_log_backtrace;
3484 3741
3485sub _log_backtrace { 3742sub _log_backtrace {
3489 3746
3490 # limit the # of concurrent backtraces 3747 # limit the # of concurrent backtraces
3491 if ($_log_backtrace < 2) { 3748 if ($_log_backtrace < 2) {
3492 ++$_log_backtrace; 3749 ++$_log_backtrace;
3493 async { 3750 async {
3751 $Coro::current->{desc} = "abt $msg";
3752
3494 my @bt = fork_call { 3753 my @bt = fork_call {
3495 @addr = map { sprintf "%x", $_ } @addr; 3754 @addr = map { sprintf "%x", $_ } @addr;
3496 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3755 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3497 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3756 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3498 or die "addr2line: $!"; 3757 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines