ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cf.schmorp.de/server/lib/cf.pm
(Generate patch)

Comparing cf.schmorp.de/server/lib/cf.pm (file contents):
Revision 1.356 by root, Tue Sep 4 05:43:21 2007 UTC vs.
Revision 1.418 by root, Fri Apr 11 21:09:53 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, %PLAYER_LOADING); # all users 112our (%PLAYER, %PLAYER_LOADING); # all users
93our (%MAP, %MAP_LOADING ); # 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) = @_;
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 || {} });
1005); 1132);
1006 1133
1007sub object_freezer_save { 1134sub object_freezer_save {
1008 my ($filename, $rdata, $objs) = @_; 1135 my ($filename, $rdata, $objs) = @_;
1009 1136
1010 my $guard = cf::lock_acquire "io";
1011
1012 sync_job { 1137 sync_job {
1013 if (length $$rdata) { 1138 if (length $$rdata) {
1139 utf8::decode (my $decname = $filename);
1014 warn sprintf "saving %s (%d,%d)\n", 1140 warn sprintf "saving %s (%d,%d)\n",
1015 $filename, length $$rdata, scalar @$objs; 1141 $decname, length $$rdata, scalar @$objs;
1016 1142
1017 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1018 chmod SAVE_MODE, $fh; 1144 chmod SAVE_MODE, $fh;
1019 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1020 aio_fsync $fh if $cf::USE_FSYNC; 1146 aio_fsync $fh if $cf::USE_FSYNC;
1021 close $fh; 1147 close $fh;
1022 1148
1023 if (@$objs) { 1149 if (@$objs) {
1024 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) {
1025 chmod SAVE_MODE, $fh; 1151 chmod SAVE_MODE, $fh;
1026 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1027 aio_write $fh, 0, (length $data), $data, 0; 1153 aio_write $fh, 0, (length $data), $data, 0;
1028 aio_fsync $fh if $cf::USE_FSYNC; 1154 aio_fsync $fh if $cf::USE_FSYNC;
1029 close $fh; 1155 close $fh;
1030 aio_rename "$filename.pst~", "$filename.pst"; 1156 aio_rename "$filename.pst~", "$filename.pst";
1031 } 1157 }
1040 } else { 1166 } else {
1041 aio_unlink $filename; 1167 aio_unlink $filename;
1042 aio_unlink "$filename.pst"; 1168 aio_unlink "$filename.pst";
1043 } 1169 }
1044 }; 1170 };
1045
1046 undef $guard;
1047} 1171}
1048 1172
1049sub object_freezer_as_string { 1173sub object_freezer_as_string {
1050 my ($rdata, $objs) = @_; 1174 my ($rdata, $objs) = @_;
1051 1175
1056 1180
1057sub object_thawer_load { 1181sub object_thawer_load {
1058 my ($filename) = @_; 1182 my ($filename) = @_;
1059 1183
1060 my ($data, $av); 1184 my ($data, $av);
1061
1062 my $guard = cf::lock_acquire "io";
1063 1185
1064 (aio_load $filename, $data) >= 0 1186 (aio_load $filename, $data) >= 0
1065 or return; 1187 or return;
1066 1188
1067 unless (aio_stat "$filename.pst") { 1189 unless (aio_stat "$filename.pst") {
1068 (aio_load "$filename.pst", $av) >= 0 1190 (aio_load "$filename.pst", $av) >= 0
1069 or return; 1191 or return;
1070 1192
1071 undef $guard;
1072 $av = eval { (Storable::thaw $av)->{objs} }; 1193 my $st = eval { Coro::Storable::thaw $av };
1194 $av = $st->{objs};
1073 } 1195 }
1074 1196
1197 utf8::decode (my $decname = $filename);
1075 warn sprintf "loading %s (%d)\n", 1198 warn sprintf "loading %s (%d,%d)\n",
1076 $filename, length $data, scalar @{$av || []}; 1199 $decname, length $data, scalar @{$av || []};
1077 1200
1078 ($data, $av) 1201 ($data, $av)
1079} 1202}
1080 1203
1081=head2 COMMAND CALLBACKS 1204=head2 COMMAND CALLBACKS
1232 my $msg = $@ ? "$v->{path}: $@\n" 1355 my $msg = $@ ? "$v->{path}: $@\n"
1233 : "$v->{base}: extension inactive.\n"; 1356 : "$v->{base}: extension inactive.\n";
1234 1357
1235 if (exists $v->{meta}{mandatory}) { 1358 if (exists $v->{meta}{mandatory}) {
1236 warn $msg; 1359 warn $msg;
1237 warn "mandatory extension failed to load, exiting.\n"; 1360 cf::cleanup "mandatory extension failed to load, exiting.";
1238 exit 1;
1239 } 1361 }
1240 1362
1241 warn $msg; 1363 warn $msg;
1242 } 1364 }
1243 1365
1268use Coro::AIO; 1390use Coro::AIO;
1269 1391
1270=head3 cf::player 1392=head3 cf::player
1271 1393
1272=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}
1273 1409
1274=item cf::player::find $login 1410=item cf::player::find $login
1275 1411
1276Returns the given player object, loading it if necessary (might block). 1412Returns the given player object, loading it if necessary (might block).
1277 1413
1316 aio_unlink +(playerdir $login) . "/$login.pl"; 1452 aio_unlink +(playerdir $login) . "/$login.pl";
1317 1453
1318 my $f = new_from_file cf::object::thawer path $login 1454 my $f = new_from_file cf::object::thawer path $login
1319 or return; 1455 or return;
1320 1456
1321 $f->next;
1322 my $pl = cf::player::load_pl $f 1457 my $pl = cf::player::load_pl $f
1323 or return; 1458 or return;
1324 local $cf::PLAYER_LOADING{$login} = $pl; 1459 local $cf::PLAYER_LOADING{$login} = $pl;
1325 $f->resolve_delayed_derefs; 1460 $f->resolve_delayed_derefs;
1326 $cf::PLAYER{$login} = $pl 1461 $cf::PLAYER{$login} = $pl
1478 1613
1479Expand crossfire pod fragments into protocol xml. 1614Expand crossfire pod fragments into protocol xml.
1480 1615
1481=cut 1616=cut
1482 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
1483sub expand_cfpod { 1629sub expand_cfpod {
1484 ((my $self), (local $_)) = @_; 1630 my ($self, $pod) = @_;
1485 1631
1486 # escape & and < 1632 my $xml;
1487 s/&/&amp;/g;
1488 s/(?<![BIUGHT])</&lt;/g;
1489 1633
1490 # this is buggy, it needs to properly take care of nested <'s 1634 while () {
1635 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1636 $group = $1;
1491 1637
1492 1 while 1638 $group =~ s/&/&amp;/g;
1493 # replace B<>, I<>, U<> etc. 1639 $group =~ s/</&lt;/g;
1494 s/B<([^\>]*)>/<b>$1<\/b>/ 1640
1495 || s/I<([^\>]*)>/<i>$1<\/i>/ 1641 $xml .= $group;
1496 || s/U<([^\>]*)>/<u>$1<\/u>/ 1642 } elsif ($pod =~ m%\G
1497 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1643 ([BCGHITU])
1498 # replace G<male|female> tags 1644 <
1499 || s{G<([^>|]*)\|([^>]*)>}{ 1645 (?:
1500 $self->gender ? $2 : $1 1646 ([^<>]*) (?{ $group = $^N })
1501 }ge 1647 | < $interior >
1502 # replace H<hint text> 1648 )
1503 || s{H<([^\>]*)>} 1649 >
1650 %gcsx
1504 { 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") {
1505 ("<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>",
1506 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1670 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1507 "") 1671 "")
1508 [$self->{hintmode}] 1672 [$self->{hintmode}];
1673 } else {
1674 $xml .= "error processing '$code($data)' directive";
1509 }ge; 1675 }
1676 } else {
1677 if ($pod =~ /\G(.+)/) {
1678 warn "parse error while expanding $pod (at $1)";
1679 }
1680 last;
1681 }
1682 }
1510 1683
1684 for ($xml) {
1511 # create single paragraphs (very hackish) 1685 # create single paragraphs (very hackish)
1512 s/(?<=\S)\n(?=\w)/ /g; 1686 s/(?<=\S)\n(?=\w)/ /g;
1513 1687
1514 # compress some whitespace 1688 # compress some whitespace
1515 s/\s+\n/\n/g; # ws line-ends 1689 s/\s+\n/\n/g; # ws line-ends
1516 s/\n\n+/\n/g; # double lines 1690 s/\n\n+/\n/g; # double lines
1517 s/^\n+//; # beginning lines 1691 s/^\n+//; # beginning lines
1518 s/\n+$//; # ending lines 1692 s/\n+$//; # ending lines
1693 }
1519 1694
1520 $_ 1695 $xml
1521} 1696}
1697
1698no re 'eval';
1522 1699
1523sub hintmode { 1700sub hintmode {
1524 $_[0]{hintmode} = $_[1] if @_ > 1; 1701 $_[0]{hintmode} = $_[1] if @_ > 1;
1525 $_[0]{hintmode} 1702 $_[0]{hintmode}
1526} 1703}
1598our $MAX_RESET = 3600; 1775our $MAX_RESET = 3600;
1599our $DEFAULT_RESET = 3000; 1776our $DEFAULT_RESET = 3000;
1600 1777
1601sub generate_random_map { 1778sub generate_random_map {
1602 my ($self, $rmp) = @_; 1779 my ($self, $rmp) = @_;
1780
1781 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1782
1603 # mit "rum" bekleckern, nicht 1783 # mit "rum" bekleckern, nicht
1604 $self->_create_random_map ( 1784 $self->_create_random_map (
1605 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1785 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1606 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1786 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1607 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1787 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1841sub find { 2021sub find {
1842 my ($path, $origin) = @_; 2022 my ($path, $origin) = @_;
1843 2023
1844 $path = normalise $path, $origin && $origin->path; 2024 $path = normalise $path, $origin && $origin->path;
1845 2025
2026 cf::lock_wait "map_data:$path";#d#remove
1846 cf::lock_wait "map_find:$path"; 2027 cf::lock_wait "map_find:$path";
1847 2028
1848 $cf::MAP{$path} || do { 2029 $cf::MAP{$path} || do {
1849 my $guard = cf::lock_acquire "map_find:$path"; 2030 my $guard1 = cf::lock_acquire "map_find:$path";
2031 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2032
1850 my $map = new_from_path cf::map $path 2033 my $map = new_from_path cf::map $path
1851 or return; 2034 or return;
1852 2035
1853 $map->{last_save} = $cf::RUNTIME; 2036 $map->{last_save} = $cf::RUNTIME;
1854 2037
1856 or return; 2039 or return;
1857 2040
1858 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2041 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1859 # doing this can freeze the server in a sync job, obviously 2042 # doing this can freeze the server in a sync job, obviously
1860 #$cf::WAIT_FOR_TICK->wait; 2043 #$cf::WAIT_FOR_TICK->wait;
2044 undef $guard1;
2045 undef $guard2;
1861 $map->reset; 2046 $map->reset;
1862 undef $guard;
1863 return find $path; 2047 return find $path;
1864 } 2048 }
1865 2049
1866 $cf::MAP{$path} = $map 2050 $cf::MAP{$path} = $map
1867 } 2051 }
1876 local $self->{deny_reset} = 1; # loading can take a long time 2060 local $self->{deny_reset} = 1; # loading can take a long time
1877 2061
1878 my $path = $self->{path}; 2062 my $path = $self->{path};
1879 2063
1880 { 2064 {
1881 my $guard1 = cf::lock_acquire "map_data:$path"; 2065 my $guard = cf::lock_acquire "map_data:$path";
1882 my $guard2 = cf::lock_acquire "map_load:$path";
1883 2066
2067 return unless $self->valid;
1884 return if $self->in_memory != cf::MAP_SWAPPED; 2068 return unless $self->in_memory == cf::MAP_SWAPPED;
1885 2069
1886 $self->in_memory (cf::MAP_LOADING); 2070 $self->in_memory (cf::MAP_LOADING);
1887 2071
1888 $self->alloc; 2072 $self->alloc;
1889 2073
2003 } 2187 }
2004 2188
2005 $MAP_PREFETCH{$path} |= $load; 2189 $MAP_PREFETCH{$path} |= $load;
2006 2190
2007 $MAP_PREFETCHER ||= cf::async { 2191 $MAP_PREFETCHER ||= cf::async {
2192 $Coro::current->{desc} = "map prefetcher";
2193
2008 while (%MAP_PREFETCH) { 2194 while (%MAP_PREFETCH) {
2009 while (my ($k, $v) = each %MAP_PREFETCH) { 2195 while (my ($k, $v) = each %MAP_PREFETCH) {
2010 if (my $map = find $k) { 2196 if (my $map = find $k) {
2011 $map->load if $v; 2197 $map->load if $v;
2012 } 2198 }
2038 return if $self->{deny_save}; 2224 return if $self->{deny_save};
2039 2225
2040 local $self->{last_access} = $self->last_access;#d# 2226 local $self->{last_access} = $self->last_access;#d#
2041 2227
2042 cf::async { 2228 cf::async {
2229 $Coro::current->{desc} = "map player save";
2043 $_->contr->save for $self->players; 2230 $_->contr->save for $self->players;
2044 }; 2231 };
2045 2232
2046 if ($uniq) { 2233 if ($uniq) {
2047 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2234 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2061 2248
2062 return if $self->players; 2249 return if $self->players;
2063 return if $self->in_memory != cf::MAP_IN_MEMORY; 2250 return if $self->in_memory != cf::MAP_IN_MEMORY;
2064 return if $self->{deny_save}; 2251 return if $self->{deny_save};
2065 2252
2253 $self->in_memory (cf::MAP_SWAPPED);
2254
2255 $self->deactivate;
2256 $_->clear_links_to ($self) for values %cf::MAP;
2066 $self->clear; 2257 $self->clear;
2067 $self->in_memory (cf::MAP_SWAPPED);
2068} 2258}
2069 2259
2070sub reset_at { 2260sub reset_at {
2071 my ($self) = @_; 2261 my ($self) = @_;
2072 2262
2104 if $uniq; 2294 if $uniq;
2105 } 2295 }
2106 2296
2107 delete $cf::MAP{$self->path}; 2297 delete $cf::MAP{$self->path};
2108 2298
2299 $self->deactivate;
2300 $_->clear_links_to ($self) for values %cf::MAP;
2109 $self->clear; 2301 $self->clear;
2110
2111 $_->clear_links_to ($self) for values %cf::MAP;
2112 2302
2113 $self->unlink_save; 2303 $self->unlink_save;
2114 $self->destroy; 2304 $self->destroy;
2115} 2305}
2116 2306
2190 : () 2380 : ()
2191 } @{ aio_readdir $UNIQUEDIR or [] } 2381 } @{ aio_readdir $UNIQUEDIR or [] }
2192 ] 2382 ]
2193} 2383}
2194 2384
2195package cf;
2196
2197=back 2385=back
2198 2386
2199=head3 cf::object 2387=head3 cf::object
2200 2388
2201=cut 2389=cut
2231=cut 2419=cut
2232 2420
2233sub deref { 2421sub deref {
2234 my ($ref) = @_; 2422 my ($ref) = @_;
2235 2423
2236 # temporary compatibility#TODO#remove
2237 $ref =~ s{^<}{player/<};
2238
2239 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2424 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2240 my ($uuid, $name) = ($1, $2); 2425 my ($uuid, $name) = ($1, $2);
2241 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2426 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2242 or return; 2427 or return;
2243 $pl->ob->uuid eq $uuid 2428 $pl->ob->uuid eq $uuid
2244 or return; 2429 or return;
2415 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2600 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2416 2601
2417 $self->enter_link; 2602 $self->enter_link;
2418 2603
2419 (async { 2604 (async {
2605 $Coro::current->{desc} = "player::goto $path $x $y";
2606
2607 # *tag paths override both path and x|y
2608 if ($path =~ /^\*(.*)$/) {
2609 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2610 my $ob = $obs[rand @obs];
2611
2612 # see if we actually can go there
2613 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2614 $ob = $obs[rand @obs];
2615 } else {
2616 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2617 }
2618 # else put us there anyways for now #d#
2619
2620 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2621 } else {
2622 ($path, $x, $y) = (undef, undef, undef);
2623 }
2624 }
2625
2420 my $map = eval { 2626 my $map = eval {
2421 my $map = cf::map::find $path; 2627 my $map = defined $path ? cf::map::find $path : undef;
2422 2628
2423 if ($map) { 2629 if ($map) {
2424 $map = $map->customise_for ($self); 2630 $map = $map->customise_for ($self);
2425 $map = $check->($map) if $check && $map; 2631 $map = $check->($map) if $check && $map;
2426 } else { 2632 } else {
2427 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2633 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2428 } 2634 }
2429 2635
2430 $map 2636 $map
2431 }; 2637 };
2432 2638
2485 $rmp->{origin_y} = $exit->y; 2691 $rmp->{origin_y} = $exit->y;
2486 } 2692 }
2487 2693
2488 $rmp->{random_seed} ||= $exit->random_seed; 2694 $rmp->{random_seed} ||= $exit->random_seed;
2489 2695
2490 my $data = cf::to_json $rmp; 2696 my $data = cf::encode_json $rmp;
2491 my $md5 = Digest::MD5::md5_hex $data; 2697 my $md5 = Digest::MD5::md5_hex $data;
2492 my $meta = "$RANDOMDIR/$md5.meta"; 2698 my $meta = "$RANDOMDIR/$md5.meta";
2493 2699
2494 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2700 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2495 aio_write $fh, 0, (length $data), $data, 0; 2701 aio_write $fh, 0, (length $data), $data, 0;
2522 # if exit is damned, update players death & WoR home-position 2728 # if exit is damned, update players death & WoR home-position
2523 $self->contr->savebed ($slaying, $hp, $sp) 2729 $self->contr->savebed ($slaying, $hp, $sp)
2524 if $exit->flag (FLAG_DAMNED); 2730 if $exit->flag (FLAG_DAMNED);
2525 2731
2526 (async { 2732 (async {
2733 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2734
2527 $self->deactivate_recursive; # just to be sure 2735 $self->deactivate_recursive; # just to be sure
2528 unless (eval { 2736 unless (eval {
2529 $self->goto ($slaying, $hp, $sp); 2737 $self->goto ($slaying, $hp, $sp);
2530 2738
2531 1; 2739 1;
2566the message, with C<log> being the default. If C<$color> is negative, suppress 2774the message, with C<log> being the default. If C<$color> is negative, suppress
2567the message unless the client supports the msg packet. 2775the message unless the client supports the msg packet.
2568 2776
2569=cut 2777=cut
2570 2778
2779# non-persistent channels (usually the info channel)
2571our %CHANNEL = ( 2780our %CHANNEL = (
2572 "c/identify" => { 2781 "c/identify" => {
2573 id => "identify", 2782 id => "infobox",
2574 title => "Identify", 2783 title => "Identify",
2575 reply => undef, 2784 reply => undef,
2576 tooltip => "Items recently identified", 2785 tooltip => "Items recently identified",
2577 }, 2786 },
2578 "c/examine" => { 2787 "c/examine" => {
2579 id => "examine", 2788 id => "infobox",
2580 title => "Examine", 2789 title => "Examine",
2581 reply => undef, 2790 reply => undef,
2582 tooltip => "Signs and other items you examined", 2791 tooltip => "Signs and other items you examined",
2583 }, 2792 },
2793 "c/book" => {
2794 id => "infobox",
2795 title => "Book",
2796 reply => undef,
2797 tooltip => "The contents of a note or book",
2798 },
2799 "c/lookat" => {
2800 id => "infobox",
2801 title => "Look",
2802 reply => undef,
2803 tooltip => "What you saw there",
2804 },
2805 "c/who" => {
2806 id => "infobox",
2807 title => "Players",
2808 reply => undef,
2809 tooltip => "Shows players who are currently online",
2810 },
2811 "c/body" => {
2812 id => "infobox",
2813 title => "Body Parts",
2814 reply => undef,
2815 tooltip => "Shows which body parts you posess and are available",
2816 },
2817 "c/uptime" => {
2818 id => "infobox",
2819 title => "Uptime",
2820 reply => undef,
2821 tooltip => "How long the server has been running since last restart",
2822 },
2823 "c/mapinfo" => {
2824 id => "infobox",
2825 title => "Map Info",
2826 reply => undef,
2827 tooltip => "Information related to the maps",
2828 },
2584); 2829);
2585 2830
2586sub cf::client::send_msg { 2831sub cf::client::send_msg {
2587 my ($self, $channel, $msg, $color, @extra) = @_; 2832 my ($self, $channel, $msg, $color, @extra) = @_;
2588 2833
2589 $msg = $self->pl->expand_cfpod ($msg); 2834 $msg = $self->pl->expand_cfpod ($msg);
2590 2835
2591 $color &= cf::NDI_CLIENT_MASK; # just in case... 2836 $color &= cf::NDI_CLIENT_MASK; # just in case...
2592 2837
2593 # check predefined channels, for the benefit of C 2838 # check predefined channels, for the benefit of C
2594 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2839 if ($CHANNEL{$channel}) {
2840 $channel = $CHANNEL{$channel};
2595 2841
2842 $self->ext_msg (channel_info => $channel)
2843 if $self->can_msg;
2844
2845 $channel = $channel->{id};
2846
2596 if (ref $channel) { 2847 } elsif (ref $channel) {
2597 # send meta info to client, if not yet sent 2848 # send meta info to client, if not yet sent
2598 unless (exists $self->{channel}{$channel->{id}}) { 2849 unless (exists $self->{channel}{$channel->{id}}) {
2599 $self->{channel}{$channel->{id}} = $channel; 2850 $self->{channel}{$channel->{id}} = $channel;
2600 $self->ext_msg (channel_info => $channel) 2851 $self->ext_msg (channel_info => $channel)
2601 if $self->can_msg; 2852 if $self->can_msg;
2818=pod 3069=pod
2819 3070
2820The following functions and methods are available within a safe environment: 3071The following functions and methods are available within a safe environment:
2821 3072
2822 cf::object 3073 cf::object
2823 contr pay_amount pay_player map x y force_find force_add 3074 contr pay_amount pay_player map x y force_find force_add destroy
2824 insert remove name archname title slaying race decrease_ob_nr 3075 insert remove name archname title slaying race decrease_ob_nr
2825 3076
2826 cf::object::player 3077 cf::object::player
2827 player 3078 player
2828 3079
2835=cut 3086=cut
2836 3087
2837for ( 3088for (
2838 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3089 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2839 insert remove inv name archname title slaying race 3090 insert remove inv name archname title slaying race
2840 decrease_ob_nr)], 3091 decrease_ob_nr destroy)],
2841 ["cf::object::player" => qw(player)], 3092 ["cf::object::player" => qw(player)],
2842 ["cf::player" => qw(peaceful)], 3093 ["cf::player" => qw(peaceful)],
2843 ["cf::map" => qw(trigger)], 3094 ["cf::map" => qw(trigger)],
2844) { 3095) {
2845 no strict 'refs'; 3096 no strict 'refs';
2950 { 3201 {
2951 my $faces = $facedata->{faceinfo}; 3202 my $faces = $facedata->{faceinfo};
2952 3203
2953 while (my ($face, $info) = each %$faces) { 3204 while (my ($face, $info) = each %$faces) {
2954 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3205 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3206
2955 cf::face::set_visibility $idx, $info->{visibility}; 3207 cf::face::set_visibility $idx, $info->{visibility};
2956 cf::face::set_magicmap $idx, $info->{magicmap}; 3208 cf::face::set_magicmap $idx, $info->{magicmap};
2957 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3209 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2958 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3210 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2959 3211
2960 cf::cede_to_tick; 3212 cf::cede_to_tick;
2961 } 3213 }
2962 3214
2963 while (my ($face, $info) = each %$faces) { 3215 while (my ($face, $info) = each %$faces) {
2964 next unless $info->{smooth}; 3216 next unless $info->{smooth};
3217
2965 my $idx = cf::face::find $face 3218 my $idx = cf::face::find $face
2966 or next; 3219 or next;
3220
2967 if (my $smooth = cf::face::find $info->{smooth}) { 3221 if (my $smooth = cf::face::find $info->{smooth}) {
2968 cf::face::set_smooth $idx, $smooth; 3222 cf::face::set_smooth $idx, $smooth;
2969 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3223 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2970 } else { 3224 } else {
2971 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3225 warn "smooth face '$info->{smooth}' not found for face '$face'";
2989 { 3243 {
2990 # TODO: for gcfclient pleasure, we should give resources 3244 # TODO: for gcfclient pleasure, we should give resources
2991 # that gcfclient doesn't grok a >10000 face index. 3245 # that gcfclient doesn't grok a >10000 face index.
2992 my $res = $facedata->{resource}; 3246 my $res = $facedata->{resource};
2993 3247
2994 my $soundconf = delete $res->{"res/sound.conf"};
2995
2996 while (my ($name, $info) = each %$res) { 3248 while (my ($name, $info) = each %$res) {
3249 if (defined $info->{type}) {
2997 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3250 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2998 my $data; 3251 my $data;
2999 3252
3000 if ($info->{type} & 1) { 3253 if ($info->{type} & 1) {
3001 # prepend meta info 3254 # prepend meta info
3002 3255
3003 my $meta = $enc->encode ({ 3256 my $meta = $enc->encode ({
3004 name => $name, 3257 name => $name,
3005 %{ $info->{meta} || {} }, 3258 %{ $info->{meta} || {} },
3006 }); 3259 });
3007 3260
3008 $data = pack "(w/a*)*", $meta, $info->{data}; 3261 $data = pack "(w/a*)*", $meta, $info->{data};
3262 } else {
3263 $data = $info->{data};
3264 }
3265
3266 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3267 cf::face::set_type $idx, $info->{type};
3009 } else { 3268 } else {
3010 $data = $info->{data}; 3269 $RESOURCE{$name} = $info;
3011 } 3270 }
3012 3271
3013 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3014 cf::face::set_type $idx, $info->{type};
3015
3016 cf::cede_to_tick; 3272 cf::cede_to_tick;
3017 } 3273 }
3018
3019 if ($soundconf) {
3020 $soundconf = $enc->decode (delete $soundconf->{data});
3021
3022 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3023 my $sound = $soundconf->{compat}[$_]
3024 or next;
3025
3026 my $face = cf::face::find "sound/$sound->[1]";
3027 cf::sound::set $sound->[0] => $face;
3028 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3029 }
3030
3031 while (my ($k, $v) = each %{$soundconf->{event}}) {
3032 my $face = cf::face::find "sound/$v";
3033 cf::sound::set $k => $face;
3034 }
3035 }
3036 } 3274 }
3275
3276 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3037 3277
3038 1 3278 1
3039} 3279}
3280
3281cf::global->attach (on_resource_update => sub {
3282 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3283 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3284
3285 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3286 my $sound = $soundconf->{compat}[$_]
3287 or next;
3288
3289 my $face = cf::face::find "sound/$sound->[1]";
3290 cf::sound::set $sound->[0] => $face;
3291 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3292 }
3293
3294 while (my ($k, $v) = each %{$soundconf->{event}}) {
3295 my $face = cf::face::find "sound/$v";
3296 cf::sound::set $k => $face;
3297 }
3298 }
3299});
3040 3300
3041register_exticmd fx_want => sub { 3301register_exticmd fx_want => sub {
3042 my ($ns, $want) = @_; 3302 my ($ns, $want) = @_;
3043 3303
3044 while (my ($k, $v) = each %$want) { 3304 while (my ($k, $v) = each %$want) {
3099sub reload_config { 3359sub reload_config {
3100 open my $fh, "<:utf8", "$CONFDIR/config" 3360 open my $fh, "<:utf8", "$CONFDIR/config"
3101 or return; 3361 or return;
3102 3362
3103 local $/; 3363 local $/;
3104 *CFG = YAML::Syck::Load <$fh>; 3364 *CFG = YAML::Load <$fh>;
3105 3365
3106 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3366 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3107 3367
3108 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3368 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3109 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3369 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3120sub main { 3380sub main {
3121 # we must not ever block the main coroutine 3381 # we must not ever block the main coroutine
3122 local $Coro::idle = sub { 3382 local $Coro::idle = sub {
3123 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3383 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3124 (async { 3384 (async {
3125 Event::one_event; 3385 $Coro::current->{desc} = "IDLE BUG HANDLER";
3386 EV::loop EV::LOOP_ONESHOT;
3126 })->prio (Coro::PRIO_MAX); 3387 })->prio (Coro::PRIO_MAX);
3127 }; 3388 };
3128 3389
3129 reload_config; 3390 reload_config;
3130 db_init; 3391 db_init;
3131 load_extensions; 3392 load_extensions;
3132 3393
3133 $TICK_WATCHER->start; 3394 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3395 evthread_start IO::AIO::poll_fileno;
3134 Event::loop; 3396 EV::loop;
3135} 3397}
3136 3398
3137############################################################################# 3399#############################################################################
3138# initialisation and cleanup 3400# initialisation and cleanup
3139 3401
3140# install some emergency cleanup handlers 3402# install some emergency cleanup handlers
3141BEGIN { 3403BEGIN {
3404 our %SIGWATCHER = ();
3142 for my $signal (qw(INT HUP TERM)) { 3405 for my $signal (qw(INT HUP TERM)) {
3143 Event->signal ( 3406 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3144 reentrant => 0,
3145 data => WF_AUTOCANCEL,
3146 signal => $signal,
3147 prio => 0,
3148 cb => sub {
3149 cf::cleanup "SIG$signal"; 3407 cf::cleanup "SIG$signal";
3150 },
3151 ); 3408 };
3152 } 3409 }
3153} 3410}
3154 3411
3155sub write_runtime { 3412sub write_runtime_sync {
3156 my $runtime = "$LOCALDIR/runtime"; 3413 my $runtime = "$LOCALDIR/runtime";
3157 3414
3158 # first touch the runtime file to show we are still running: 3415 # first touch the runtime file to show we are still running:
3159 # the fsync below can take a very very long time. 3416 # the fsync below can take a very very long time.
3160 3417
3186 and return; 3443 and return;
3187 3444
3188 warn "runtime file written.\n"; 3445 warn "runtime file written.\n";
3189 3446
3190 1 3447 1
3448}
3449
3450our $uuid_lock;
3451our $uuid_skip;
3452
3453sub write_uuid_sync($) {
3454 $uuid_skip ||= $_[0];
3455
3456 return if $uuid_lock;
3457 local $uuid_lock = 1;
3458
3459 my $uuid = "$LOCALDIR/uuid";
3460
3461 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3462 or return;
3463
3464 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3465 $uuid_skip = 0;
3466
3467 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3468 and return;
3469
3470 # always fsync - this file is important
3471 aio_fsync $fh
3472 and return;
3473
3474 close $fh
3475 or return;
3476
3477 aio_rename "$uuid~", $uuid
3478 and return;
3479
3480 warn "uuid file written ($value).\n";
3481
3482 1
3483
3484}
3485
3486sub write_uuid($$) {
3487 my ($skip, $sync) = @_;
3488
3489 $sync ? write_uuid_sync $skip
3490 : async { write_uuid_sync $skip };
3191} 3491}
3192 3492
3193sub emergency_save() { 3493sub emergency_save() {
3194 my $freeze_guard = cf::freeze_mainloop; 3494 my $freeze_guard = cf::freeze_mainloop;
3195 3495
3201 # and maps saved/destroyed asynchronously. 3501 # and maps saved/destroyed asynchronously.
3202 warn "begin emergency player save\n"; 3502 warn "begin emergency player save\n";
3203 for my $login (keys %cf::PLAYER) { 3503 for my $login (keys %cf::PLAYER) {
3204 my $pl = $cf::PLAYER{$login} or next; 3504 my $pl = $cf::PLAYER{$login} or next;
3205 $pl->valid or next; 3505 $pl->valid or next;
3506 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3206 $pl->save; 3507 $pl->save;
3207 } 3508 }
3208 warn "end emergency player save\n"; 3509 warn "end emergency player save\n";
3209 3510
3210 warn "begin emergency map save\n"; 3511 warn "begin emergency map save\n";
3216 warn "end emergency map save\n"; 3517 warn "end emergency map save\n";
3217 3518
3218 warn "begin emergency database checkpoint\n"; 3519 warn "begin emergency database checkpoint\n";
3219 BDB::db_env_txn_checkpoint $DB_ENV; 3520 BDB::db_env_txn_checkpoint $DB_ENV;
3220 warn "end emergency database checkpoint\n"; 3521 warn "end emergency database checkpoint\n";
3522
3523 warn "begin write uuid\n";
3524 write_uuid_sync 1;
3525 warn "end write uuid\n";
3221 }; 3526 };
3222 3527
3223 warn "leave emergency perl save\n"; 3528 warn "leave emergency perl save\n";
3224} 3529}
3225 3530
3240 warn "reloading..."; 3545 warn "reloading...";
3241 3546
3242 warn "entering sync_job"; 3547 warn "entering sync_job";
3243 3548
3244 cf::sync_job { 3549 cf::sync_job {
3245 cf::write_runtime; # external watchdog should not bark 3550 cf::write_runtime_sync; # external watchdog should not bark
3246 cf::emergency_save; 3551 cf::emergency_save;
3247 cf::write_runtime; # external watchdog should not bark 3552 cf::write_runtime_sync; # external watchdog should not bark
3248 3553
3249 warn "syncing database to disk"; 3554 warn "syncing database to disk";
3250 BDB::db_env_txn_checkpoint $DB_ENV; 3555 BDB::db_env_txn_checkpoint $DB_ENV;
3251 3556
3252 # if anything goes wrong in here, we should simply crash as we already saved 3557 # if anything goes wrong in here, we should simply crash as we already saved
3253
3254 warn "cancelling all WF_AUTOCANCEL watchers";
3255 for (Event::all_watchers) {
3256 $_->cancel if $_->data & WF_AUTOCANCEL;
3257 }
3258 3558
3259 warn "flushing outstanding aio requests"; 3559 warn "flushing outstanding aio requests";
3260 for (;;) { 3560 for (;;) {
3261 BDB::flush; 3561 BDB::flush;
3262 IO::AIO::flush; 3562 IO::AIO::flush;
3263 Coro::cede; 3563 Coro::cede_notself;
3264 last unless IO::AIO::nreqs || BDB::nreqs; 3564 last unless IO::AIO::nreqs || BDB::nreqs;
3265 warn "iterate..."; 3565 warn "iterate...";
3266 } 3566 }
3267 3567
3268 ++$RELOAD; 3568 ++$RELOAD;
3344 warn "leaving sync_job"; 3644 warn "leaving sync_job";
3345 3645
3346 1 3646 1
3347 } or do { 3647 } or do {
3348 warn $@; 3648 warn $@;
3349 warn "error while reloading, exiting."; 3649 cf::cleanup "error while reloading, exiting.";
3350 exit 1;
3351 }; 3650 };
3352 3651
3353 warn "reloaded"; 3652 warn "reloaded";
3354}; 3653};
3355 3654
3357 3656
3358sub reload_perl() { 3657sub reload_perl() {
3359 # doing reload synchronously and two reloads happen back-to-back, 3658 # doing reload synchronously and two reloads happen back-to-back,
3360 # coro crashes during coro_state_free->destroy here. 3659 # coro crashes during coro_state_free->destroy here.
3361 3660
3362 $RELOAD_WATCHER ||= Event->timer ( 3661 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3363 reentrant => 0,
3364 after => 0,
3365 data => WF_AUTOCANCEL,
3366 cb => sub {
3367 do_reload_perl; 3662 do_reload_perl;
3368 undef $RELOAD_WATCHER; 3663 undef $RELOAD_WATCHER;
3369 },
3370 ); 3664 };
3371} 3665}
3372 3666
3373register_command "reload" => sub { 3667register_command "reload" => sub {
3374 my ($who, $arg) = @_; 3668 my ($who, $arg) = @_;
3375 3669
3376 if ($who->flag (FLAG_WIZ)) { 3670 if ($who->flag (FLAG_WIZ)) {
3377 $who->message ("reloading server."); 3671 $who->message ("reloading server.");
3672 async {
3673 $Coro::current->{desc} = "perl_reload";
3378 async { reload_perl }; 3674 reload_perl;
3675 };
3379 } 3676 }
3380}; 3677};
3381 3678
3382unshift @INC, $LIBDIR; 3679unshift @INC, $LIBDIR;
3383 3680
3385 3682
3386our @WAIT_FOR_TICK; 3683our @WAIT_FOR_TICK;
3387our @WAIT_FOR_TICK_BEGIN; 3684our @WAIT_FOR_TICK_BEGIN;
3388 3685
3389sub wait_for_tick { 3686sub wait_for_tick {
3390 return unless $TICK_WATCHER->is_active; 3687 return if tick_inhibit;
3391 return if $Coro::current == $Coro::main; 3688 return if $Coro::current == $Coro::main;
3392 3689
3393 my $signal = new Coro::Signal; 3690 my $signal = new Coro::Signal;
3394 push @WAIT_FOR_TICK, $signal; 3691 push @WAIT_FOR_TICK, $signal;
3395 $signal->wait; 3692 $signal->wait;
3396} 3693}
3397 3694
3398sub wait_for_tick_begin { 3695sub wait_for_tick_begin {
3399 return unless $TICK_WATCHER->is_active; 3696 return if tick_inhibit;
3400 return if $Coro::current == $Coro::main; 3697 return if $Coro::current == $Coro::main;
3401 3698
3402 my $signal = new Coro::Signal; 3699 my $signal = new Coro::Signal;
3403 push @WAIT_FOR_TICK_BEGIN, $signal; 3700 push @WAIT_FOR_TICK_BEGIN, $signal;
3404 $signal->wait; 3701 $signal->wait;
3405} 3702}
3406 3703
3407 my $min = 1e6;#d# 3704sub tick {
3408 my $avg = 10;
3409$TICK_WATCHER = Event->timer (
3410 reentrant => 0,
3411 parked => 1,
3412 prio => 0,
3413 at => $NEXT_TICK || $TICK,
3414 data => WF_AUTOCANCEL,
3415 cb => sub {
3416 if ($Coro::current != $Coro::main) { 3705 if ($Coro::current != $Coro::main) {
3417 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3706 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3418 unless ++$bug_warning > 10; 3707 unless ++$bug_warning > 10;
3419 return; 3708 return;
3420 } 3709 }
3421 3710
3422 $NOW = $tick_start = Event::time;
3423
3424 cf::server_tick; # one server iteration 3711 cf::server_tick; # one server iteration
3425 3712
3426 0 && sync_job {#d# 3713 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3427 for(1..10) { 3714 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3428 my $t = Event::time; 3715 Coro::async_pool {
3429 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3716 $Coro::current->{desc} = "runtime saver";
3430 or die; 3717 write_runtime_sync
3431 3718 or warn "ERROR: unable to write runtime file: $!";
3432 $map->width (50);
3433 $map->height (50);
3434 $map->alloc;
3435 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3436 my $t = Event::time - $t;
3437
3438 #next unless $t < 0.0013;#d#
3439 if ($t < $min) {
3440 $min = $t;
3441 }
3442 $avg = $avg * 0.99 + $t * 0.01;
3443 }
3444 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3445 exit 0;
3446 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3447 }; 3719 };
3720 }
3448 3721
3449 $RUNTIME += $TICK;
3450 $NEXT_TICK += $TICK;
3451
3452 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3453 $NEXT_RUNTIME_WRITE = $NOW + 10;
3454 Coro::async_pool {
3455 write_runtime
3456 or warn "ERROR: unable to write runtime file: $!";
3457 };
3458 }
3459
3460# my $AFTER = Event::time;
3461# warn $AFTER - $NOW;#d#
3462
3463 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3722 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3464 $sig->send; 3723 $sig->send;
3465 } 3724 }
3466 while (my $sig = shift @WAIT_FOR_TICK) { 3725 while (my $sig = shift @WAIT_FOR_TICK) {
3467 $sig->send; 3726 $sig->send;
3468 } 3727 }
3469 3728
3470 $NOW = Event::time; 3729 $LOAD = ($NOW - $TICK_START) / $TICK;
3471
3472 # if we are delayed by four ticks or more, skip them all
3473 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3474
3475 $TICK_WATCHER->at ($NEXT_TICK);
3476 $TICK_WATCHER->start;
3477
3478 $LOAD = ($NOW - $tick_start) / $TICK;
3479 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3730 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3480 3731
3481 _post_tick; 3732 if (0) {
3482 3733 if ($NEXT_TICK) {
3483 3734 my $jitter = $TICK_START - $NEXT_TICK;
3735 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3736 warn "jitter $JITTER\n";#d#
3737 }
3484 }, 3738 }
3485); 3739}
3486 3740
3487{ 3741{
3488 BDB::max_poll_time $TICK * 0.1; 3742 # configure BDB
3489 $BDB_POLL_WATCHER = Event->io ( 3743
3490 reentrant => 0,
3491 fd => BDB::poll_fileno,
3492 poll => 'r',
3493 prio => 0,
3494 data => WF_AUTOCANCEL,
3495 cb => \&BDB::poll_cb,
3496 );
3497 BDB::min_parallel 8; 3744 BDB::min_parallel 8;
3498 3745 BDB::max_poll_reqs $TICK * 0.1;
3499 BDB::set_sync_prepare { 3746 $Coro::BDB::WATCHER->priority (1);
3500 my $status;
3501 my $current = $Coro::current;
3502 (
3503 sub {
3504 $status = $!;
3505 $current->ready; undef $current;
3506 },
3507 sub {
3508 Coro::schedule while defined $current;
3509 $! = $status;
3510 },
3511 )
3512 };
3513 3747
3514 unless ($DB_ENV) { 3748 unless ($DB_ENV) {
3515 $DB_ENV = BDB::db_env_create; 3749 $DB_ENV = BDB::db_env_create;
3750 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3751 | BDB::LOG_AUTOREMOVE, 1);
3752 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3753 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3516 3754
3517 cf::sync_job { 3755 cf::sync_job {
3518 eval { 3756 eval {
3519 BDB::db_env_open 3757 BDB::db_env_open
3520 $DB_ENV, 3758 $DB_ENV,
3522 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3760 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3523 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3761 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3524 0666; 3762 0666;
3525 3763
3526 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3764 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3527
3528 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3529 $DB_ENV->set_lk_detect;
3530 }; 3765 };
3531 3766
3532 cf::cleanup "db_env_open(db): $@" if $@; 3767 cf::cleanup "db_env_open(db): $@" if $@;
3533 }; 3768 };
3534 } 3769 }
3770
3771 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3772 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3773 };
3774 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3775 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3776 };
3777 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3778 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3779 };
3535} 3780}
3536 3781
3537{ 3782{
3783 # configure IO::AIO
3784
3538 IO::AIO::min_parallel 8; 3785 IO::AIO::min_parallel 8;
3539
3540 undef $Coro::AIO::WATCHER;
3541 IO::AIO::max_poll_time $TICK * 0.1; 3786 IO::AIO::max_poll_time $TICK * 0.1;
3542 $AIO_POLL_WATCHER = Event->io ( 3787 $Coro::AIO::WATCHER->priority (1);
3543 reentrant => 0,
3544 data => WF_AUTOCANCEL,
3545 fd => IO::AIO::poll_fileno,
3546 poll => 'r',
3547 prio => 6,
3548 cb => \&IO::AIO::poll_cb,
3549 );
3550} 3788}
3551 3789
3552my $_log_backtrace; 3790my $_log_backtrace;
3553 3791
3554sub _log_backtrace { 3792sub _log_backtrace {
3558 3796
3559 # limit the # of concurrent backtraces 3797 # limit the # of concurrent backtraces
3560 if ($_log_backtrace < 2) { 3798 if ($_log_backtrace < 2) {
3561 ++$_log_backtrace; 3799 ++$_log_backtrace;
3562 async { 3800 async {
3801 $Coro::current->{desc} = "abt $msg";
3802
3563 my @bt = fork_call { 3803 my @bt = fork_call {
3564 @addr = map { sprintf "%x", $_ } @addr; 3804 @addr = map { sprintf "%x", $_ } @addr;
3565 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3805 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3566 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3806 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3567 or die "addr2line: $!"; 3807 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines