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.376 by root, Mon Oct 1 00:44:44 2007 UTC vs.
Revision 1.437 by root, Tue Jul 8 08:33:27 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;
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 ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::Event; 39use Coro::AnyEvent;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
43use Coro::AnyEvent;
22use Coro::AIO; 44use Coro::AIO;
45use Coro::BDB 1.6;
23use Coro::Storable; 46use Coro::Storable;
24use Coro::Util (); 47use Coro::Util ();
25 48
26use JSON::XS (); 49use JSON::XS 2.01 ();
27use BDB (); 50use BDB ();
28use Data::Dumper; 51use Data::Dumper;
29use Digest::MD5; 52use Digest::MD5;
30use Fcntl; 53use Fcntl;
31use YAML::Syck (); 54use YAML ();
32use IO::AIO 2.32 (); 55use IO::AIO ();
33use Time::HiRes; 56use Time::HiRes;
34use Compress::LZF; 57use Compress::LZF;
35use Digest::MD5 (); 58use Digest::MD5 ();
59
60AnyEvent::detect;
36 61
37# configure various modules to our taste 62# configure various modules to our taste
38# 63#
39$Storable::canonical = 1; # reduce rsync transfers 64$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 65Coro::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 66Compress::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 67
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 68$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 69
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 70sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 71
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 90our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 91our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 92our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 93our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 94our $BDBDIR = "$LOCALDIR/db";
95our %RESOURCE;
75 96
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 97our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 99our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 100our $USE_FSYNC = 1; # use fsync to write maps - default off
83 101
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 102our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 103our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 104our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 105our $DB_ENV;
89 106
90our %CFG; 107our %CFG;
91 108
92our $UPTIME; $UPTIME ||= time; 109our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 110our $RUNTIME;
111our $NOW;
94 112
95our (%PLAYER, %PLAYER_LOADING); # all users 113our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 114our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 115our $LINK_MAP; # the special {link} map, which is always available
98 116
99# used to convert map paths into valid unix filenames by replacing / by ∕ 117# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 118our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 119
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 120our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 121our $LOADAVG; # same thing, but with alpha-smoothing
122our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 123our $TICK_START; # for load detecting purposes
105 124
106binmode STDOUT; 125binmode STDOUT;
107binmode STDERR; 126binmode STDERR;
108 127
109# read virtual server time, if available 128# read virtual server time, if available
162 181
163The raw value load value from the last tick. 182The raw value load value from the last tick.
164 183
165=item %cf::CFG 184=item %cf::CFG
166 185
167Configuration for the server, loaded from C</etc/crossfire/config>, or 186Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 187from wherever your confdir points to.
169 188
170=item cf::wait_for_tick, cf::wait_for_tick_begin 189=item cf::wait_for_tick, cf::wait_for_tick_begin
171 190
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 191These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 212 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 213
195 LOG llevError, $msg; 214 LOG llevError, $msg;
196 }; 215 };
197} 216}
217
218$Coro::State::DIEHOOK = sub {
219 return unless $^S eq 0; # "eq", not "=="
220
221 if ($Coro::current == $Coro::main) {#d#
222 warn "DIEHOOK called in main context, Coro bug?\n";#d#
223 return;#d#
224 }#d#
225
226 # kill coroutine otherwise
227 warn Carp::longmess $_[0];
228 Coro::terminate
229};
230
231$SIG{__DIE__} = sub { }; #d#?
198 232
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 233@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 234@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 235@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 236@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
215)) { 249)) {
216 no strict 'refs'; 250 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 251 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 252}
219 253
220$Event::DIED = sub { 254$EV::DIED = sub {
221 warn "error in event callback: @_"; 255 warn "error in event callback: @_";
222}; 256};
223 257
224############################################################################# 258#############################################################################
225 259
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 282 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 283 $d
250 } || "[unable to dump $_[0]: '$@']"; 284 } || "[unable to dump $_[0]: '$@']";
251} 285}
252 286
253=item $ref = cf::from_json $json 287=item $ref = cf::decode_json $json
254 288
255Converts a JSON string into the corresponding perl data structure. 289Converts a JSON string into the corresponding perl data structure.
256 290
257=item $json = cf::to_json $ref 291=item $json = cf::encode_json $ref
258 292
259Converts a perl data structure into its JSON representation. 293Converts a perl data structure into its JSON representation.
260 294
261=cut 295=cut
262 296
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 297our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 298
265sub to_json ($) { $json_coder->encode ($_[0]) } 299sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 300sub decode_json($) { $json_coder->decode ($_[0]) }
267 301
268=item cf::lock_wait $string 302=item cf::lock_wait $string
269 303
270Wait until the given lock is available. See cf::lock_acquire. 304Wait until the given lock is available. See cf::lock_acquire.
271 305
327 361
328 ! ! $LOCK{$key} 362 ! ! $LOCK{$key}
329} 363}
330 364
331sub freeze_mainloop { 365sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 366 tick_inhibit_inc;
333 367
334 my $guard = Coro::guard { 368 Coro::guard \&tick_inhibit_dec;
335 $TICK_WATCHER->start; 369}
336 }; 370
337 $TICK_WATCHER->stop; 371=item cf::periodic $interval, $cb
338 $guard 372
373Like EV::periodic, but randomly selects a starting point so that the actions
374get spread over timer.
375
376=cut
377
378sub periodic($$) {
379 my ($interval, $cb) = @_;
380
381 my $start = rand List::Util::min 180, $interval;
382
383 EV::periodic $start, $interval, 0, $cb
339} 384}
340 385
341=item cf::get_slot $time[, $priority[, $name]] 386=item cf::get_slot $time[, $priority[, $name]]
342 387
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 388Allocate $time seconds of blocking CPU time at priority C<$priority>:
373 } 418 }
374 } 419 }
375 } 420 }
376 421
377 if (@SLOT_QUEUE) { 422 if (@SLOT_QUEUE) {
378 # we do not use wait_For_tick() as it returns immediately when tick is inactive 423 # we do not use wait_for_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal; 424 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait; 425 $signal->wait;
381 } else { 426 } else {
382 Coro::schedule; 427 Coro::schedule;
383 } 428 }
384 } 429 }
385}; 430};
386 431
387sub get_slot($;$$) { 432sub get_slot($;$$) {
433 return if tick_inhibit || $Coro::current == $Coro::main;
434
388 my ($time, $pri, $name) = @_; 435 my ($time, $pri, $name) = @_;
389 436
390 $time = $TICK * .6 if $time > $TICK * .6; 437 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal; 438 my $sig = new Coro::Signal;
392 439
406 453
407BEGIN { *async = \&Coro::async_pool } 454BEGIN { *async = \&Coro::async_pool }
408 455
409=item cf::sync_job { BLOCK } 456=item cf::sync_job { BLOCK }
410 457
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 458The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 459is always able to handle events or runnable, as Deliantra is only
413partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 460partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 461acceptable.
415 462
416If it must be done, put the blocking parts into C<sync_job>. This will run 463If it must be done, put the blocking parts into C<sync_job>. This will run
417the given BLOCK in another coroutine while waiting for the result. The 464the given BLOCK in another coroutine while waiting for the result. The
422 469
423sub sync_job(&) { 470sub sync_job(&) {
424 my ($job) = @_; 471 my ($job) = @_;
425 472
426 if ($Coro::current == $Coro::main) { 473 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 474 my $time = EV::time;
428 475
429 # this is the main coro, too bad, we have to block 476 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 477 # till the operation succeeds, freezing the server :/
431 478
432 # TODO: use suspend/resume instead 479 LOG llevError, Carp::longmess "sync job";#d#
433 # (but this is cancel-safe) 480
434 my $freeze_guard = freeze_mainloop; 481 my $freeze_guard = freeze_mainloop;
435 482
436 my $busy = 1; 483 my $busy = 1;
437 my @res; 484 my @res;
438 485
442 warn $@ if $@; 489 warn $@ if $@;
443 undef $busy; 490 undef $busy;
444 })->prio (Coro::PRIO_MAX); 491 })->prio (Coro::PRIO_MAX);
445 492
446 while ($busy) { 493 while ($busy) {
447 Coro::cede or Event::one_event; 494 if (Coro::nready) {
495 Coro::cede_notself;
496 } else {
497 EV::loop EV::LOOP_ONESHOT;
448 } 498 }
499 }
449 500
450 $time = Event::time - $time; 501 my $time = EV::time - $time;
451 502
452 LOG llevError | logBacktrace, Carp::longmess "long sync job"
453 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
454
455 $tick_start += $time; # do not account sync jobs to server load 503 $TICK_START += $time; # do not account sync jobs to server load
456 504
457 wantarray ? @res : $res[0] 505 wantarray ? @res : $res[0]
458 } else { 506 } else {
459 # we are in another coroutine, how wonderful, everything just works 507 # we are in another coroutine, how wonderful, everything just works
460 508
485=item fork_call { }, $args 533=item fork_call { }, $args
486 534
487Executes the given code block with the given arguments in a seperate 535Executes the given code block with the given arguments in a seperate
488process, returning the results. Everything must be serialisable with 536process, returning the results. Everything must be serialisable with
489Coro::Storable. May, of course, block. Note that the executed sub may 537Coro::Storable. May, of course, block. Note that the executed sub may
490never block itself or use any form of Event handling. 538never block itself or use any form of event handling.
491 539
492=cut 540=cut
493 541
494sub fork_call(&@) { 542sub fork_call(&@) {
495 my ($cb, @args) = @_; 543 my ($cb, @args) = @_;
502 reset_signals; 550 reset_signals;
503 &$cb 551 &$cb
504 }, @args; 552 }, @args;
505 553
506 wantarray ? @res : $res[-1] 554 wantarray ? @res : $res[-1]
555}
556
557=item $coin = coin_from_name $name
558
559=cut
560
561our %coin_alias = (
562 "silver" => "silvercoin",
563 "silvercoin" => "silvercoin",
564 "silvercoins" => "silvercoin",
565 "gold" => "goldcoin",
566 "goldcoin" => "goldcoin",
567 "goldcoins" => "goldcoin",
568 "platinum" => "platinacoin",
569 "platinumcoin" => "platinacoin",
570 "platinumcoins" => "platinacoin",
571 "platina" => "platinacoin",
572 "platinacoin" => "platinacoin",
573 "platinacoins" => "platinacoin",
574 "royalty" => "royalty",
575 "royalties" => "royalty",
576);
577
578sub coin_from_name($) {
579 $coin_alias{$_[0]}
580 ? cf::arch::find $coin_alias{$_[0]}
581 : undef
507} 582}
508 583
509=item $value = cf::db_get $family => $key 584=item $value = cf::db_get $family => $key
510 585
511Returns a single value from the environment database. 586Returns a single value from the environment database.
656attach callbacks/event handlers (a collection of which is called an "attachment") 731attach callbacks/event handlers (a collection of which is called an "attachment")
657to it. All such attachable objects support the following methods. 732to it. All such attachable objects support the following methods.
658 733
659In the following description, CLASS can be any of C<global>, C<object> 734In the following description, CLASS can be any of C<global>, C<object>
660C<player>, C<client> or C<map> (i.e. the attachable objects in 735C<player>, C<client> or C<map> (i.e. the attachable objects in
661Crossfire TRT). 736Deliantra).
662 737
663=over 4 738=over 4
664 739
665=item $attachable->attach ($attachment, key => $value...) 740=item $attachable->attach ($attachment, key => $value...)
666 741
948 } 1023 }
949 1024
950 0 1025 0
951} 1026}
952 1027
953=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1028=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
954 1029
955=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
956 1031
957Generate an object-specific event with the given arguments. 1032Generate an object-specific event with the given arguments.
958 1033
964 1039
965=cut 1040=cut
966 1041
967############################################################################# 1042#############################################################################
968# object support 1043# object support
969#
970 1044
1045sub _object_equal($$);
1046sub _object_equal($$) {
1047 my ($a, $b) = @_;
1048
1049 return 0 unless (ref $a) eq (ref $b);
1050
1051 if ("HASH" eq ref $a) {
1052 my @ka = keys %$a;
1053 my @kb = keys %$b;
1054
1055 return 0 if @ka != @kb;
1056
1057 for (0 .. $#ka) {
1058 return 0 unless $ka[$_] eq $kb[$_];
1059 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1060 }
1061
1062 } elsif ("ARRAY" eq ref $a) {
1063
1064 return 0 if @$a != @$b;
1065
1066 for (0 .. $#$a) {
1067 return 0 unless _object_equal $a->[$_], $b->[$_];
1068 }
1069
1070 } elsif ($a ne $b) {
1071 return 0;
1072 }
1073
1074 1
1075}
1076
1077our $SLOW_MERGES;#d#
971sub _can_merge { 1078sub _can_merge {
972 my ($ob1, $ob2) = @_; 1079 my ($ob1, $ob2) = @_;
973 1080
974 local $Storable::canonical = 1; 1081 ++$SLOW_MERGES;#d#
975 my $fob1 = Storable::freeze $ob1;
976 my $fob2 = Storable::freeze $ob2;
977 1082
978 $fob1 eq $fob2 1083 # we do the slow way here
1084 return _object_equal $ob1, $ob2
979} 1085}
980 1086
981sub reattach { 1087sub reattach {
982 # basically do the same as instantiate, without calling instantiate 1088 # basically do the same as instantiate, without calling instantiate
983 my ($obj) = @_; 1089 my ($obj) = @_;
1005cf::attachable->attach ( 1111cf::attachable->attach (
1006 prio => -1000000, 1112 prio => -1000000,
1007 on_instantiate => sub { 1113 on_instantiate => sub {
1008 my ($obj, $data) = @_; 1114 my ($obj, $data) = @_;
1009 1115
1010 $data = from_json $data; 1116 $data = decode_json $data;
1011 1117
1012 for (@$data) { 1118 for (@$data) {
1013 my ($name, $args) = @$_; 1119 my ($name, $args) = @$_;
1014 1120
1015 $obj->attach ($name, %{$args || {} }); 1121 $obj->attach ($name, %{$args || {} });
1036 utf8::decode (my $decname = $filename); 1142 utf8::decode (my $decname = $filename);
1037 warn sprintf "saving %s (%d,%d)\n", 1143 warn sprintf "saving %s (%d,%d)\n",
1038 $decname, length $$rdata, scalar @$objs; 1144 $decname, length $$rdata, scalar @$objs;
1039 1145
1040 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1146 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1041 chmod SAVE_MODE, $fh; 1147 aio_chmod $fh, SAVE_MODE;
1042 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1148 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1043 aio_fsync $fh if $cf::USE_FSYNC; 1149 aio_fsync $fh if $cf::USE_FSYNC;
1044 close $fh; 1150 aio_close $fh;
1045 1151
1046 if (@$objs) { 1152 if (@$objs) {
1047 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1153 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1048 chmod SAVE_MODE, $fh; 1154 aio_chmod $fh, SAVE_MODE;
1049 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1155 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1050 aio_write $fh, 0, (length $data), $data, 0; 1156 aio_write $fh, 0, (length $data), $data, 0;
1051 aio_fsync $fh if $cf::USE_FSYNC; 1157 aio_fsync $fh if $cf::USE_FSYNC;
1052 close $fh; 1158 aio_close $fh;
1053 aio_rename "$filename.pst~", "$filename.pst"; 1159 aio_rename "$filename.pst~", "$filename.pst";
1054 } 1160 }
1055 } else { 1161 } else {
1056 aio_unlink "$filename.pst"; 1162 aio_unlink "$filename.pst";
1057 } 1163 }
1085 1191
1086 unless (aio_stat "$filename.pst") { 1192 unless (aio_stat "$filename.pst") {
1087 (aio_load "$filename.pst", $av) >= 0 1193 (aio_load "$filename.pst", $av) >= 0
1088 or return; 1194 or return;
1089 1195
1090 $av = eval { (Storable::thaw $av)->{objs} }; 1196 my $st = eval { Coro::Storable::thaw $av };
1197 $av = $st->{objs};
1091 } 1198 }
1092 1199
1093 utf8::decode (my $decname = $filename); 1200 utf8::decode (my $decname = $filename);
1094 warn sprintf "loading %s (%d,%d)\n", 1201 warn sprintf "loading %s (%d,%d)\n",
1095 $decname, length $data, scalar @{$av || []}; 1202 $decname, length $data, scalar @{$av || []};
1251 my $msg = $@ ? "$v->{path}: $@\n" 1358 my $msg = $@ ? "$v->{path}: $@\n"
1252 : "$v->{base}: extension inactive.\n"; 1359 : "$v->{base}: extension inactive.\n";
1253 1360
1254 if (exists $v->{meta}{mandatory}) { 1361 if (exists $v->{meta}{mandatory}) {
1255 warn $msg; 1362 warn $msg;
1256 warn "mandatory extension failed to load, exiting.\n"; 1363 cf::cleanup "mandatory extension failed to load, exiting.";
1257 exit 1;
1258 } 1364 }
1259 1365
1260 warn $msg; 1366 warn $msg;
1261 } 1367 }
1262 1368
1351 my $f = new_from_file cf::object::thawer path $login 1457 my $f = new_from_file cf::object::thawer path $login
1352 or return; 1458 or return;
1353 1459
1354 my $pl = cf::player::load_pl $f 1460 my $pl = cf::player::load_pl $f
1355 or return; 1461 or return;
1462
1356 local $cf::PLAYER_LOADING{$login} = $pl; 1463 local $cf::PLAYER_LOADING{$login} = $pl;
1357 $f->resolve_delayed_derefs; 1464 $f->resolve_delayed_derefs;
1358 $cf::PLAYER{$login} = $pl 1465 $cf::PLAYER{$login} = $pl
1359 } 1466 }
1360 } 1467 }
1370 1477
1371 return if $pl->{deny_save}; 1478 return if $pl->{deny_save};
1372 1479
1373 aio_mkdir playerdir $pl, 0770; 1480 aio_mkdir playerdir $pl, 0770;
1374 $pl->{last_save} = $cf::RUNTIME; 1481 $pl->{last_save} = $cf::RUNTIME;
1482
1483 cf::get_slot 0.01;
1375 1484
1376 $pl->save_pl ($path); 1485 $pl->save_pl ($path);
1377 cf::cede_to_tick; 1486 cf::cede_to_tick;
1378} 1487}
1379 1488
1415 $pl->{deny_save} = 1; 1524 $pl->{deny_save} = 1;
1416 $pl->password ("*"); # this should lock out the player until we nuked the dir 1525 $pl->password ("*"); # this should lock out the player until we nuked the dir
1417 1526
1418 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1419 $pl->deactivate; 1528 $pl->deactivate;
1529 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1530 $pl->ob->check_score;
1420 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1531 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1421 $pl->ns->destroy if $pl->ns; 1532 $pl->ns->destroy if $pl->ns;
1422 1533
1423 my $path = playerdir $pl; 1534 my $path = playerdir $pl;
1424 my $temp = "$path~$cf::RUNTIME~deleting~"; 1535 my $temp = "$path~$cf::RUNTIME~deleting~";
1463 1574
1464 for my $login (@$dirs) { 1575 for my $login (@$dirs) {
1465 my $path = path $login; 1576 my $path = path $login;
1466 1577
1467 # a .pst is a dead give-away for a valid player 1578 # a .pst is a dead give-away for a valid player
1468 unless (-e "$path.pst") { 1579 # if no pst file found, open and chekc for blocked users
1580 if (aio_stat "$path.pst") {
1469 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1581 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1470 aio_read $fh, 0, 512, my $buf, 0 or next; 1582 aio_read $fh, 0, 512, my $buf, 0 or next;
1471 $buf !~ /^password -------------$/m or next; # official not-valid tag 1583 $buf !~ /^password -------------$/m or next; # official not-valid tag
1472 } 1584 }
1473 1585
1510 1622
1511Expand crossfire pod fragments into protocol xml. 1623Expand crossfire pod fragments into protocol xml.
1512 1624
1513=cut 1625=cut
1514 1626
1627use re 'eval';
1628
1629my $group;
1630my $interior; $interior = qr{
1631 # match a pod interior sequence sans C<< >>
1632 (?:
1633 \ (.*?)\ (?{ $group = $^N })
1634 | < (??{$interior}) >
1635 )
1636}x;
1637
1515sub expand_cfpod { 1638sub expand_cfpod {
1516 ((my $self), (local $_)) = @_; 1639 my ($self, $pod) = @_;
1517 1640
1518 # escape & and < 1641 my $xml;
1519 s/&/&amp;/g;
1520 s/(?<![BIUGHT])</&lt;/g;
1521 1642
1522 # this is buggy, it needs to properly take care of nested <'s 1643 while () {
1644 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1645 $group = $1;
1523 1646
1524 1 while 1647 $group =~ s/&/&amp;/g;
1525 # replace B<>, I<>, U<> etc. 1648 $group =~ s/</&lt;/g;
1526 s/B<([^\>]*)>/<b>$1<\/b>/ 1649
1527 || s/I<([^\>]*)>/<i>$1<\/i>/ 1650 $xml .= $group;
1528 || s/U<([^\>]*)>/<u>$1<\/u>/ 1651 } elsif ($pod =~ m%\G
1529 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1652 ([BCGHITU])
1530 # replace G<male|female> tags 1653 <
1531 || s{G<([^>|]*)\|([^>]*)>}{ 1654 (?:
1532 $self->gender ? $2 : $1 1655 ([^<>]*) (?{ $group = $^N })
1533 }ge 1656 | < $interior >
1534 # replace H<hint text> 1657 )
1535 || s{H<([^\>]*)>} 1658 >
1659 %gcsx
1536 { 1660 ) {
1661 my ($code, $data) = ($1, $group);
1662
1663 if ($code eq "B") {
1664 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1665 } elsif ($code eq "I") {
1666 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1667 } elsif ($code eq "U") {
1668 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1669 } elsif ($code eq "C") {
1670 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1671 } elsif ($code eq "T") {
1672 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1673 } elsif ($code eq "G") {
1674 my ($male, $female) = split /\|/, $data;
1675 $data = $self->gender ? $female : $male;
1676 $xml .= expand_cfpod ($self, $data);
1677 } elsif ($code eq "H") {
1537 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1678 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1538 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1679 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1539 "") 1680 "")
1540 [$self->{hintmode}] 1681 [$self->{hintmode}];
1682 } else {
1683 $xml .= "error processing '$code($data)' directive";
1541 }ge; 1684 }
1685 } else {
1686 if ($pod =~ /\G(.+)/) {
1687 warn "parse error while expanding $pod (at $1)";
1688 }
1689 last;
1690 }
1691 }
1542 1692
1693 for ($xml) {
1543 # create single paragraphs (very hackish) 1694 # create single paragraphs (very hackish)
1544 s/(?<=\S)\n(?=\w)/ /g; 1695 s/(?<=\S)\n(?=\w)/ /g;
1545 1696
1546 # compress some whitespace 1697 # compress some whitespace
1547 s/\s+\n/\n/g; # ws line-ends 1698 s/\s+\n/\n/g; # ws line-ends
1548 s/\n\n+/\n/g; # double lines 1699 s/\n\n+/\n/g; # double lines
1549 s/^\n+//; # beginning lines 1700 s/^\n+//; # beginning lines
1550 s/\n+$//; # ending lines 1701 s/\n+$//; # ending lines
1702 }
1551 1703
1552 $_ 1704 $xml
1553} 1705}
1706
1707no re 'eval';
1554 1708
1555sub hintmode { 1709sub hintmode {
1556 $_[0]{hintmode} = $_[1] if @_ > 1; 1710 $_[0]{hintmode} = $_[1] if @_ > 1;
1557 $_[0]{hintmode} 1711 $_[0]{hintmode}
1558} 1712}
1630our $MAX_RESET = 3600; 1784our $MAX_RESET = 3600;
1631our $DEFAULT_RESET = 3000; 1785our $DEFAULT_RESET = 3000;
1632 1786
1633sub generate_random_map { 1787sub generate_random_map {
1634 my ($self, $rmp) = @_; 1788 my ($self, $rmp) = @_;
1789
1790 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1791
1635 # mit "rum" bekleckern, nicht 1792 # mit "rum" bekleckern, nicht
1636 $self->_create_random_map ( 1793 $self->_create_random_map (
1637 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1794 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1638 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1795 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1639 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1796 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1761 1918
1762# the temporary/swap location 1919# the temporary/swap location
1763sub save_path { 1920sub save_path {
1764 my ($self) = @_; 1921 my ($self) = @_;
1765 1922
1766 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1923 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1767 "$TMPDIR/$path.map" 1924 "$TMPDIR/$path.map"
1768} 1925}
1769 1926
1770# the unique path, undef == no special unique path 1927# the unique path, undef == no special unique path
1771sub uniq_path { 1928sub uniq_path {
1772 my ($self) = @_; 1929 my ($self) = @_;
1773 1930
1774 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1931 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1775 "$UNIQUEDIR/$path" 1932 "$UNIQUEDIR/$path"
1776} 1933}
1777 1934
1778# and all this just because we cannot iterate over 1935# and all this just because we cannot iterate over
1779# all maps in C++... 1936# all maps in C++...
1877 2034
1878 cf::lock_wait "map_data:$path";#d#remove 2035 cf::lock_wait "map_data:$path";#d#remove
1879 cf::lock_wait "map_find:$path"; 2036 cf::lock_wait "map_find:$path";
1880 2037
1881 $cf::MAP{$path} || do { 2038 $cf::MAP{$path} || do {
1882 my $guard1 = cf::lock_acquire "map_find:$path";
1883 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 2039 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2040 my $guard2 = cf::lock_acquire "map_find:$path";
1884 2041
1885 my $map = new_from_path cf::map $path 2042 my $map = new_from_path cf::map $path
1886 or return; 2043 or return;
1887 2044
1888 $map->{last_save} = $cf::RUNTIME; 2045 $map->{last_save} = $cf::RUNTIME;
1891 or return; 2048 or return;
1892 2049
1893 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2050 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1894 # doing this can freeze the server in a sync job, obviously 2051 # doing this can freeze the server in a sync job, obviously
1895 #$cf::WAIT_FOR_TICK->wait; 2052 #$cf::WAIT_FOR_TICK->wait;
2053 undef $guard2;
1896 undef $guard1; 2054 undef $guard1;
1897 undef $guard2;
1898 $map->reset; 2055 $map->reset;
1899 return find $path; 2056 return find $path;
1900 } 2057 }
1901 2058
1902 $cf::MAP{$path} = $map 2059 $cf::MAP{$path} = $map
1965 } 2122 }
1966 2123
1967 $self->{last_save} = $cf::RUNTIME; 2124 $self->{last_save} = $cf::RUNTIME;
1968 $self->last_access ($cf::RUNTIME); 2125 $self->last_access ($cf::RUNTIME);
1969 2126
1970 $self->in_memory (cf::MAP_IN_MEMORY); 2127 $self->in_memory (cf::MAP_ACTIVE);
1971 } 2128 }
1972 2129
1973 $self->post_load; 2130 $self->post_load;
1974} 2131}
1975 2132
2033 my ($path, $origin, $load) = @_; 2190 my ($path, $origin, $load) = @_;
2034 2191
2035 $path = normalise $path, $origin && $origin->{path}; 2192 $path = normalise $path, $origin && $origin->{path};
2036 2193
2037 if (my $map = $cf::MAP{$path}) { 2194 if (my $map = $cf::MAP{$path}) {
2038 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2195 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2039 } 2196 }
2040 2197
2041 $MAP_PREFETCH{$path} |= $load; 2198 $MAP_PREFETCH{$path} |= $load;
2042 2199
2043 $MAP_PREFETCHER ||= cf::async { 2200 $MAP_PREFETCHER ||= cf::async {
2080 cf::async { 2237 cf::async {
2081 $Coro::current->{desc} = "map player save"; 2238 $Coro::current->{desc} = "map player save";
2082 $_->contr->save for $self->players; 2239 $_->contr->save for $self->players;
2083 }; 2240 };
2084 2241
2242 cf::get_slot 0.02;
2243
2085 if ($uniq) { 2244 if ($uniq) {
2086 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2087 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2246 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2088 } else { 2247 } else {
2089 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2248 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2097 $self->save; 2256 $self->save;
2098 2257
2099 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2258 my $lock = cf::lock_acquire "map_data:$self->{path}";
2100 2259
2101 return if $self->players; 2260 return if $self->players;
2102 return if $self->in_memory != cf::MAP_IN_MEMORY; 2261 return if $self->in_memory != cf::MAP_ACTIVE;
2103 return if $self->{deny_save}; 2262 return if $self->{deny_save};
2104 2263
2105 $self->in_memory (cf::MAP_SWAPPED); 2264 $self->in_memory (cf::MAP_SWAPPED);
2106 2265
2107 $self->deactivate; 2266 $self->deactivate;
2225 2384
2226sub unique_maps() { 2385sub unique_maps() {
2227 [ 2386 [
2228 map { 2387 map {
2229 utf8::decode $_; 2388 utf8::decode $_;
2230 /\.map$/ 2389 s/\.map$//; # TODO future compatibility hack
2390 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2391 ? ()
2231 ? normalise $_ 2392 : normalise $_
2232 : ()
2233 } @{ aio_readdir $UNIQUEDIR or [] } 2393 } @{ aio_readdir $UNIQUEDIR or [] }
2234 ] 2394 ]
2235} 2395}
2236 2396
2237package cf;
2238
2239=back 2397=back
2240 2398
2241=head3 cf::object 2399=head3 cf::object
2242 2400
2243=cut 2401=cut
2246 2404
2247=over 4 2405=over 4
2248 2406
2249=item $ob->inv_recursive 2407=item $ob->inv_recursive
2250 2408
2251Returns the inventory of the object _and_ their inventories, recursively. 2409Returns the inventory of the object I<and> their inventories, recursively,
2410but I<not> the object itself.
2252 2411
2253=cut 2412=cut
2254 2413
2255sub inv_recursive_; 2414sub inv_recursive_;
2256sub inv_recursive_ { 2415sub inv_recursive_ {
2261 inv_recursive_ inv $_[0] 2420 inv_recursive_ inv $_[0]
2262} 2421}
2263 2422
2264=item $ref = $ob->ref 2423=item $ref = $ob->ref
2265 2424
2266creates and returns a persistent reference to an objetc that can be stored as a string. 2425Creates and returns a persistent reference to an object that can be stored as a string.
2267 2426
2268=item $ob = cf::object::deref ($refstring) 2427=item $ob = cf::object::deref ($refstring)
2269 2428
2270returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2429returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2271even if the object actually exists. May block. 2430even if the object actually exists. May block.
2273=cut 2432=cut
2274 2433
2275sub deref { 2434sub deref {
2276 my ($ref) = @_; 2435 my ($ref) = @_;
2277 2436
2278 # temporary compatibility#TODO#remove
2279 $ref =~ s{^<}{player/<};
2280
2281 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2437 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2282 my ($uuid, $name) = ($1, $2); 2438 my ($uuid, $name) = ($1, $2);
2283 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2439 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2284 or return; 2440 or return;
2285 $pl->ob->uuid eq $uuid 2441 $pl->ob->uuid eq $uuid
2286 or return; 2442 or return;
2306can be C<undef>. Does the right thing when the player is currently in a 2462can be C<undef>. Does the right thing when the player is currently in a
2307dialogue with the given NPC character. 2463dialogue with the given NPC character.
2308 2464
2309=cut 2465=cut
2310 2466
2467our $SAY_CHANNEL = {
2468 id => "say",
2469 title => "Map",
2470 reply => "say ",
2471 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2472};
2473
2474our $CHAT_CHANNEL = {
2475 id => "chat",
2476 title => "Chat",
2477 reply => "chat ",
2478 tooltip => "Player chat and shouts, global to the server.",
2479};
2480
2311# rough implementation of a future "reply" method that works 2481# rough implementation of a future "reply" method that works
2312# with dialog boxes. 2482# with dialog boxes.
2313#TODO: the first argument must go, split into a $npc->reply_to ( method 2483#TODO: the first argument must go, split into a $npc->reply_to ( method
2314sub cf::object::player::reply($$$;$) { 2484sub cf::object::player::reply($$$;$) {
2315 my ($self, $npc, $msg, $flags) = @_; 2485 my ($self, $npc, $msg, $flags) = @_;
2326 my $dialog = $pl->{npc_dialog}; 2496 my $dialog = $pl->{npc_dialog};
2327 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2497 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2328 2498
2329 } else { 2499 } else {
2330 $msg = $npc->name . " says: $msg" if $npc; 2500 $msg = $npc->name . " says: $msg" if $npc;
2331 $self->message ($msg, $flags); 2501 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2332 } 2502 }
2333 } 2503 }
2334} 2504}
2335 2505
2336=item $object->send_msg ($channel, $msg, $color, [extra...]) 2506=item $object->send_msg ($channel, $msg, $color, [extra...])
2443Moves the player to the given map-path and coordinates by first freezing 2613Moves the player to the given map-path and coordinates by first freezing
2444her, loading and preparing them map, calling the provided $check callback 2614her, loading and preparing them map, calling the provided $check callback
2445that has to return the map if sucecssful, and then unfreezes the player on 2615that has to return the map if sucecssful, and then unfreezes the player on
2446the new (success) or old (failed) map position. In either case, $done will 2616the new (success) or old (failed) map position. In either case, $done will
2447be called at the end of this process. 2617be called at the end of this process.
2618
2619Note that $check will be called with a potentially non-loaded map, so if
2620it needs a loaded map it has to call C<< ->load >>.
2448 2621
2449=cut 2622=cut
2450 2623
2451our $GOTOGEN; 2624our $GOTOGEN;
2452 2625
2531} 2704}
2532 2705
2533sub prepare_random_map { 2706sub prepare_random_map {
2534 my ($exit) = @_; 2707 my ($exit) = @_;
2535 2708
2536 my $guard = cf::lock_acquire "exit_prepare:$exit";
2537
2538 # all this does is basically replace the /! path by 2709 # all this does is basically replace the /! path by
2539 # a new random map path (?random/...) with a seed 2710 # a new random map path (?random/...) with a seed
2540 # that depends on the exit object 2711 # that depends on the exit object
2541 2712
2542 my $rmp = parse_random_map_params $exit->msg; 2713 my $rmp = parse_random_map_params $exit->msg;
2544 if ($exit->map) { 2715 if ($exit->map) {
2545 $rmp->{region} = $exit->region->name; 2716 $rmp->{region} = $exit->region->name;
2546 $rmp->{origin_map} = $exit->map->path; 2717 $rmp->{origin_map} = $exit->map->path;
2547 $rmp->{origin_x} = $exit->x; 2718 $rmp->{origin_x} = $exit->x;
2548 $rmp->{origin_y} = $exit->y; 2719 $rmp->{origin_y} = $exit->y;
2720
2721 $exit->map->touch;
2549 } 2722 }
2550 2723
2551 $rmp->{random_seed} ||= $exit->random_seed; 2724 $rmp->{random_seed} ||= $exit->random_seed;
2552 2725
2553 my $data = cf::to_json $rmp; 2726 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2554 my $md5 = Digest::MD5::md5_hex $data; 2727 my $md5 = Digest::MD5::md5_hex $data;
2555 my $meta = "$RANDOMDIR/$md5.meta"; 2728 my $meta = "$RANDOMDIR/$md5.meta";
2556 2729
2557 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2730 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2558 aio_write $fh, 0, (length $data), $data, 0; 2731 aio_write $fh, 0, (length $data), $data, 0;
2559 undef $fh; 2732 undef $fh;
2560 aio_rename "$meta~", $meta; 2733 aio_rename "$meta~", $meta;
2561 2734
2735 my $slaying = "?random/$md5";
2736
2737 if ($exit->valid) {
2562 $exit->slaying ("?random/$md5"); 2738 $exit->slaying ("?random/$md5");
2563 $exit->msg (undef); 2739 $exit->msg (undef);
2740 }
2564 } 2741 }
2565} 2742}
2566 2743
2567sub cf::object::player::enter_exit { 2744sub cf::object::player::enter_exit {
2568 my ($self, $exit) = @_; 2745 my ($self, $exit) = @_;
2569 2746
2570 return unless $self->type == cf::PLAYER; 2747 return unless $self->type == cf::PLAYER;
2571 2748
2572 if ($exit->slaying eq "/!") {
2573 #TODO: this should de-fi-ni-te-ly not be a sync-job
2574 # the problem is that $exit might not survive long enough
2575 # so it needs to be done right now, right here
2576 cf::sync_job { prepare_random_map $exit };
2577 }
2578
2579 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2580 my $hp = $exit->stats->hp;
2581 my $sp = $exit->stats->sp;
2582
2583 $self->enter_link; 2749 $self->enter_link;
2584 2750
2585 # if exit is damned, update players death & WoR home-position
2586 $self->contr->savebed ($slaying, $hp, $sp)
2587 if $exit->flag (FLAG_DAMNED);
2588
2589 (async { 2751 (async {
2590 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2752 $Coro::current->{desc} = "enter_exit";
2591 2753
2592 $self->deactivate_recursive; # just to be sure
2593 unless (eval { 2754 unless (eval {
2755 $self->deactivate_recursive; # just to be sure
2756
2757 # random map handling
2758 {
2759 my $guard = cf::lock_acquire "exit_prepare:$exit";
2760
2761 prepare_random_map $exit
2762 if $exit->slaying eq "/!";
2763 }
2764
2765 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2766 my $x = $exit->stats->hp;
2767 my $y = $exit->stats->sp;
2768
2594 $self->goto ($slaying, $hp, $sp); 2769 $self->goto ($map, $x, $y);
2595 2770
2771 # if exit is damned, update players death & WoR home-position
2772 $self->contr->savebed ($map, $x, $y)
2773 if $exit->flag (cf::FLAG_DAMNED);
2774
2596 1; 2775 1
2597 }) { 2776 }) {
2598 $self->message ("Something went wrong deep within the crossfire server. " 2777 $self->message ("Something went wrong deep within the crossfire server. "
2599 . "I'll try to bring you back to the map you were before. " 2778 . "I'll try to bring you back to the map you were before. "
2600 . "Please report this to the dungeon master!", 2779 . "Please report this to the dungeon master!",
2601 cf::NDI_UNIQUE | cf::NDI_RED); 2780 cf::NDI_UNIQUE | cf::NDI_RED);
2631the message, with C<log> being the default. If C<$color> is negative, suppress 2810the message, with C<log> being the default. If C<$color> is negative, suppress
2632the message unless the client supports the msg packet. 2811the message unless the client supports the msg packet.
2633 2812
2634=cut 2813=cut
2635 2814
2815# non-persistent channels (usually the info channel)
2636our %CHANNEL = ( 2816our %CHANNEL = (
2637 "c/identify" => { 2817 "c/identify" => {
2638 id => "infobox", 2818 id => "infobox",
2639 title => "Identify", 2819 title => "Identify",
2640 reply => undef, 2820 reply => undef,
2644 id => "infobox", 2824 id => "infobox",
2645 title => "Examine", 2825 title => "Examine",
2646 reply => undef, 2826 reply => undef,
2647 tooltip => "Signs and other items you examined", 2827 tooltip => "Signs and other items you examined",
2648 }, 2828 },
2829 "c/book" => {
2830 id => "infobox",
2831 title => "Book",
2832 reply => undef,
2833 tooltip => "The contents of a note or book",
2834 },
2649 "c/lookat" => { 2835 "c/lookat" => {
2650 id => "infobox", 2836 id => "infobox",
2651 title => "Look", 2837 title => "Look",
2652 reply => undef, 2838 reply => undef,
2653 tooltip => "What you saw there", 2839 tooltip => "What you saw there",
2840 },
2841 "c/who" => {
2842 id => "infobox",
2843 title => "Players",
2844 reply => undef,
2845 tooltip => "Shows players who are currently online",
2846 },
2847 "c/body" => {
2848 id => "infobox",
2849 title => "Body Parts",
2850 reply => undef,
2851 tooltip => "Shows which body parts you posess and are available",
2852 },
2853 "c/uptime" => {
2854 id => "infobox",
2855 title => "Uptime",
2856 reply => undef,
2857 tooltip => "How long the server has been running since last restart",
2858 },
2859 "c/mapinfo" => {
2860 id => "infobox",
2861 title => "Map Info",
2862 reply => undef,
2863 tooltip => "Information related to the maps",
2864 },
2865 "c/party" => {
2866 id => "party",
2867 title => "Party",
2868 reply => "gsay ",
2869 tooltip => "Messages and chat related to your party",
2654 }, 2870 },
2655); 2871);
2656 2872
2657sub cf::client::send_msg { 2873sub cf::client::send_msg {
2658 my ($self, $channel, $msg, $color, @extra) = @_; 2874 my ($self, $channel, $msg, $color, @extra) = @_;
2895=pod 3111=pod
2896 3112
2897The following functions and methods are available within a safe environment: 3113The following functions and methods are available within a safe environment:
2898 3114
2899 cf::object 3115 cf::object
2900 contr pay_amount pay_player map x y force_find force_add 3116 contr pay_amount pay_player map x y force_find force_add destroy
2901 insert remove name archname title slaying race decrease_ob_nr 3117 insert remove name archname title slaying race decrease split
2902 3118
2903 cf::object::player 3119 cf::object::player
2904 player 3120 player
2905 3121
2906 cf::player 3122 cf::player
2911 3127
2912=cut 3128=cut
2913 3129
2914for ( 3130for (
2915 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3131 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2916 insert remove inv name archname title slaying race 3132 insert remove inv nrof name archname title slaying race
2917 decrease_ob_nr)], 3133 decrease split destroy)],
2918 ["cf::object::player" => qw(player)], 3134 ["cf::object::player" => qw(player)],
2919 ["cf::player" => qw(peaceful)], 3135 ["cf::player" => qw(peaceful)],
2920 ["cf::map" => qw(trigger)], 3136 ["cf::map" => qw(trigger)],
2921) { 3137) {
2922 no strict 'refs'; 3138 no strict 'refs';
3027 { 3243 {
3028 my $faces = $facedata->{faceinfo}; 3244 my $faces = $facedata->{faceinfo};
3029 3245
3030 while (my ($face, $info) = each %$faces) { 3246 while (my ($face, $info) = each %$faces) {
3031 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3247 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3248
3032 cf::face::set_visibility $idx, $info->{visibility}; 3249 cf::face::set_visibility $idx, $info->{visibility};
3033 cf::face::set_magicmap $idx, $info->{magicmap}; 3250 cf::face::set_magicmap $idx, $info->{magicmap};
3034 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3251 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3035 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3252 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3036 3253
3037 cf::cede_to_tick; 3254 cf::cede_to_tick;
3038 } 3255 }
3039 3256
3040 while (my ($face, $info) = each %$faces) { 3257 while (my ($face, $info) = each %$faces) {
3041 next unless $info->{smooth}; 3258 next unless $info->{smooth};
3259
3042 my $idx = cf::face::find $face 3260 my $idx = cf::face::find $face
3043 or next; 3261 or next;
3262
3044 if (my $smooth = cf::face::find $info->{smooth}) { 3263 if (my $smooth = cf::face::find $info->{smooth}) {
3045 cf::face::set_smooth $idx, $smooth; 3264 cf::face::set_smooth $idx, $smooth;
3046 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3265 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3047 } else { 3266 } else {
3048 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3267 warn "smooth face '$info->{smooth}' not found for face '$face'";
3066 { 3285 {
3067 # TODO: for gcfclient pleasure, we should give resources 3286 # TODO: for gcfclient pleasure, we should give resources
3068 # that gcfclient doesn't grok a >10000 face index. 3287 # that gcfclient doesn't grok a >10000 face index.
3069 my $res = $facedata->{resource}; 3288 my $res = $facedata->{resource};
3070 3289
3071 my $soundconf = delete $res->{"res/sound.conf"};
3072
3073 while (my ($name, $info) = each %$res) { 3290 while (my ($name, $info) = each %$res) {
3291 if (defined $info->{type}) {
3074 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3292 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3075 my $data; 3293 my $data;
3076 3294
3077 if ($info->{type} & 1) { 3295 if ($info->{type} & 1) {
3078 # prepend meta info 3296 # prepend meta info
3079 3297
3080 my $meta = $enc->encode ({ 3298 my $meta = $enc->encode ({
3081 name => $name, 3299 name => $name,
3082 %{ $info->{meta} || {} }, 3300 %{ $info->{meta} || {} },
3083 }); 3301 });
3084 3302
3085 $data = pack "(w/a*)*", $meta, $info->{data}; 3303 $data = pack "(w/a*)*", $meta, $info->{data};
3304 } else {
3305 $data = $info->{data};
3306 }
3307
3308 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3309 cf::face::set_type $idx, $info->{type};
3086 } else { 3310 } else {
3087 $data = $info->{data}; 3311 $RESOURCE{$name} = $info;
3088 } 3312 }
3089 3313
3090 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3091 cf::face::set_type $idx, $info->{type};
3092
3093 cf::cede_to_tick; 3314 cf::cede_to_tick;
3094 } 3315 }
3095
3096 if ($soundconf) {
3097 $soundconf = $enc->decode (delete $soundconf->{data});
3098
3099 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3100 my $sound = $soundconf->{compat}[$_]
3101 or next;
3102
3103 my $face = cf::face::find "sound/$sound->[1]";
3104 cf::sound::set $sound->[0] => $face;
3105 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3106 }
3107
3108 while (my ($k, $v) = each %{$soundconf->{event}}) {
3109 my $face = cf::face::find "sound/$v";
3110 cf::sound::set $k => $face;
3111 }
3112 }
3113 } 3316 }
3317
3318 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3114 3319
3115 1 3320 1
3116} 3321}
3322
3323cf::global->attach (on_resource_update => sub {
3324 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3325 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3326
3327 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3328 my $sound = $soundconf->{compat}[$_]
3329 or next;
3330
3331 my $face = cf::face::find "sound/$sound->[1]";
3332 cf::sound::set $sound->[0] => $face;
3333 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3334 }
3335
3336 while (my ($k, $v) = each %{$soundconf->{event}}) {
3337 my $face = cf::face::find "sound/$v";
3338 cf::sound::set $k => $face;
3339 }
3340 }
3341});
3117 3342
3118register_exticmd fx_want => sub { 3343register_exticmd fx_want => sub {
3119 my ($ns, $want) = @_; 3344 my ($ns, $want) = @_;
3120 3345
3121 while (my ($k, $v) = each %$want) { 3346 while (my ($k, $v) = each %$want) {
3122 $ns->fx_want ($k, $v); 3347 $ns->fx_want ($k, $v);
3123 } 3348 }
3124}; 3349};
3350
3351sub load_resource_file($) {
3352 my $guard = lock_acquire "load_resource_file";
3353
3354 my $status = load_resource_file_ $_[0];
3355 get_slot 0.1, 100;
3356 cf::arch::commit_load;
3357
3358 $status
3359}
3125 3360
3126sub reload_regions { 3361sub reload_regions {
3127 # HACK to clear player env face cache, we need some signal framework 3362 # HACK to clear player env face cache, we need some signal framework
3128 # for this (global event?) 3363 # for this (global event?)
3129 %ext::player_env::MUSIC_FACE_CACHE = (); 3364 %ext::player_env::MUSIC_FACE_CACHE = ();
3143} 3378}
3144 3379
3145sub reload_archetypes { 3380sub reload_archetypes {
3146 load_resource_file "$DATADIR/archetypes" 3381 load_resource_file "$DATADIR/archetypes"
3147 or die "unable to load archetypes\n"; 3382 or die "unable to load archetypes\n";
3148 #d# NEED to laod twice to resolve forward references
3149 # this really needs to be done in an extra post-pass
3150 # (which needs to be synchronous, so solve it differently)
3151 load_resource_file "$DATADIR/archetypes"
3152 or die "unable to load archetypes\n";
3153} 3383}
3154 3384
3155sub reload_treasures { 3385sub reload_treasures {
3156 load_resource_file "$DATADIR/treasures" 3386 load_resource_file "$DATADIR/treasures"
3157 or die "unable to load treasurelists\n"; 3387 or die "unable to load treasurelists\n";
3158} 3388}
3159 3389
3160sub reload_resources { 3390sub reload_resources {
3161 warn "reloading resource files...\n"; 3391 warn "reloading resource files...\n";
3162 3392
3393 reload_facedata;
3394 reload_archetypes;
3163 reload_regions; 3395 reload_regions;
3164 reload_facedata;
3165 #reload_archetypes;#d#
3166 reload_archetypes;
3167 reload_treasures; 3396 reload_treasures;
3168 3397
3169 warn "finished reloading resource files\n"; 3398 warn "finished reloading resource files\n";
3170} 3399}
3171 3400
3172sub init { 3401sub init {
3402 my $guard = freeze_mainloop;
3403
3404 evthread_start IO::AIO::poll_fileno;
3405
3173 reload_resources; 3406 reload_resources;
3174} 3407}
3175 3408
3176sub reload_config { 3409sub reload_config {
3177 open my $fh, "<:utf8", "$CONFDIR/config" 3410 open my $fh, "<:utf8", "$CONFDIR/config"
3178 or return; 3411 or return;
3179 3412
3180 local $/; 3413 local $/;
3181 *CFG = YAML::Syck::Load <$fh>; 3414 *CFG = YAML::Load <$fh>;
3182 3415
3183 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3416 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3184 3417
3185 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3418 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3186 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3419 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3198 # we must not ever block the main coroutine 3431 # we must not ever block the main coroutine
3199 local $Coro::idle = sub { 3432 local $Coro::idle = sub {
3200 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3433 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3201 (async { 3434 (async {
3202 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3435 $Coro::current->{desc} = "IDLE BUG HANDLER";
3203 Event::one_event; 3436 EV::loop EV::LOOP_ONESHOT;
3204 })->prio (Coro::PRIO_MAX); 3437 })->prio (Coro::PRIO_MAX);
3205 }; 3438 };
3206 3439
3440 {
3441 my $guard = freeze_mainloop;
3207 reload_config; 3442 reload_config;
3208 db_init; 3443 db_init;
3209 load_extensions; 3444 load_extensions;
3210 3445
3211 $TICK_WATCHER->start; 3446 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3447 }
3448
3212 Event::loop; 3449 EV::loop;
3213} 3450}
3214 3451
3215############################################################################# 3452#############################################################################
3216# initialisation and cleanup 3453# initialisation and cleanup
3217 3454
3218# install some emergency cleanup handlers 3455# install some emergency cleanup handlers
3219BEGIN { 3456BEGIN {
3457 our %SIGWATCHER = ();
3220 for my $signal (qw(INT HUP TERM)) { 3458 for my $signal (qw(INT HUP TERM)) {
3221 Event->signal ( 3459 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3222 reentrant => 0,
3223 data => WF_AUTOCANCEL,
3224 signal => $signal,
3225 prio => 0,
3226 cb => sub {
3227 cf::cleanup "SIG$signal"; 3460 cf::cleanup "SIG$signal";
3228 },
3229 ); 3461 };
3230 } 3462 }
3231} 3463}
3232 3464
3233sub write_runtime { 3465sub write_runtime_sync {
3234 my $runtime = "$LOCALDIR/runtime"; 3466 my $runtime = "$LOCALDIR/runtime";
3235 3467
3236 # first touch the runtime file to show we are still running: 3468 # first touch the runtime file to show we are still running:
3237 # the fsync below can take a very very long time. 3469 # the fsync below can take a very very long time.
3238 3470
3264 and return; 3496 and return;
3265 3497
3266 warn "runtime file written.\n"; 3498 warn "runtime file written.\n";
3267 3499
3268 1 3500 1
3501}
3502
3503our $uuid_lock;
3504our $uuid_skip;
3505
3506sub write_uuid_sync($) {
3507 $uuid_skip ||= $_[0];
3508
3509 return if $uuid_lock;
3510 local $uuid_lock = 1;
3511
3512 my $uuid = "$LOCALDIR/uuid";
3513
3514 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3515 or return;
3516
3517 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3518 $uuid_skip = 0;
3519
3520 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3521 and return;
3522
3523 # always fsync - this file is important
3524 aio_fsync $fh
3525 and return;
3526
3527 close $fh
3528 or return;
3529
3530 aio_rename "$uuid~", $uuid
3531 and return;
3532
3533 warn "uuid file written ($value).\n";
3534
3535 1
3536
3537}
3538
3539sub write_uuid($$) {
3540 my ($skip, $sync) = @_;
3541
3542 $sync ? write_uuid_sync $skip
3543 : async { write_uuid_sync $skip };
3269} 3544}
3270 3545
3271sub emergency_save() { 3546sub emergency_save() {
3272 my $freeze_guard = cf::freeze_mainloop; 3547 my $freeze_guard = cf::freeze_mainloop;
3273 3548
3279 # and maps saved/destroyed asynchronously. 3554 # and maps saved/destroyed asynchronously.
3280 warn "begin emergency player save\n"; 3555 warn "begin emergency player save\n";
3281 for my $login (keys %cf::PLAYER) { 3556 for my $login (keys %cf::PLAYER) {
3282 my $pl = $cf::PLAYER{$login} or next; 3557 my $pl = $cf::PLAYER{$login} or next;
3283 $pl->valid or next; 3558 $pl->valid or next;
3559 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3284 $pl->save; 3560 $pl->save;
3285 } 3561 }
3286 warn "end emergency player save\n"; 3562 warn "end emergency player save\n";
3287 3563
3288 warn "begin emergency map save\n"; 3564 warn "begin emergency map save\n";
3294 warn "end emergency map save\n"; 3570 warn "end emergency map save\n";
3295 3571
3296 warn "begin emergency database checkpoint\n"; 3572 warn "begin emergency database checkpoint\n";
3297 BDB::db_env_txn_checkpoint $DB_ENV; 3573 BDB::db_env_txn_checkpoint $DB_ENV;
3298 warn "end emergency database checkpoint\n"; 3574 warn "end emergency database checkpoint\n";
3575
3576 warn "begin write uuid\n";
3577 write_uuid_sync 1;
3578 warn "end write uuid\n";
3299 }; 3579 };
3300 3580
3301 warn "leave emergency perl save\n"; 3581 warn "leave emergency perl save\n";
3302} 3582}
3303 3583
3318 warn "reloading..."; 3598 warn "reloading...";
3319 3599
3320 warn "entering sync_job"; 3600 warn "entering sync_job";
3321 3601
3322 cf::sync_job { 3602 cf::sync_job {
3323 cf::write_runtime; # external watchdog should not bark 3603 cf::write_runtime_sync; # external watchdog should not bark
3324 cf::emergency_save; 3604 cf::emergency_save;
3325 cf::write_runtime; # external watchdog should not bark 3605 cf::write_runtime_sync; # external watchdog should not bark
3326 3606
3327 warn "syncing database to disk"; 3607 warn "syncing database to disk";
3328 BDB::db_env_txn_checkpoint $DB_ENV; 3608 BDB::db_env_txn_checkpoint $DB_ENV;
3329 3609
3330 # if anything goes wrong in here, we should simply crash as we already saved 3610 # if anything goes wrong in here, we should simply crash as we already saved
3331
3332 warn "cancelling all WF_AUTOCANCEL watchers";
3333 for (Event::all_watchers) {
3334 $_->cancel if $_->data & WF_AUTOCANCEL;
3335 }
3336 3611
3337 warn "flushing outstanding aio requests"; 3612 warn "flushing outstanding aio requests";
3338 for (;;) { 3613 for (;;) {
3339 BDB::flush; 3614 BDB::flush;
3340 IO::AIO::flush; 3615 IO::AIO::flush;
3341 Coro::cede; 3616 Coro::cede_notself;
3342 last unless IO::AIO::nreqs || BDB::nreqs; 3617 last unless IO::AIO::nreqs || BDB::nreqs;
3343 warn "iterate..."; 3618 warn "iterate...";
3344 } 3619 }
3345 3620
3346 ++$RELOAD; 3621 ++$RELOAD;
3422 warn "leaving sync_job"; 3697 warn "leaving sync_job";
3423 3698
3424 1 3699 1
3425 } or do { 3700 } or do {
3426 warn $@; 3701 warn $@;
3427 warn "error while reloading, exiting."; 3702 cf::cleanup "error while reloading, exiting.";
3428 exit 1;
3429 }; 3703 };
3430 3704
3431 warn "reloaded"; 3705 warn "reloaded";
3432}; 3706};
3433 3707
3435 3709
3436sub reload_perl() { 3710sub reload_perl() {
3437 # doing reload synchronously and two reloads happen back-to-back, 3711 # doing reload synchronously and two reloads happen back-to-back,
3438 # coro crashes during coro_state_free->destroy here. 3712 # coro crashes during coro_state_free->destroy here.
3439 3713
3440 $RELOAD_WATCHER ||= Event->timer ( 3714 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3441 reentrant => 0,
3442 after => 0,
3443 data => WF_AUTOCANCEL,
3444 cb => sub {
3445 do_reload_perl; 3715 do_reload_perl;
3446 undef $RELOAD_WATCHER; 3716 undef $RELOAD_WATCHER;
3447 },
3448 ); 3717 };
3449} 3718}
3450 3719
3451register_command "reload" => sub { 3720register_command "reload" => sub {
3452 my ($who, $arg) = @_; 3721 my ($who, $arg) = @_;
3453 3722
3466 3735
3467our @WAIT_FOR_TICK; 3736our @WAIT_FOR_TICK;
3468our @WAIT_FOR_TICK_BEGIN; 3737our @WAIT_FOR_TICK_BEGIN;
3469 3738
3470sub wait_for_tick { 3739sub wait_for_tick {
3471 return unless $TICK_WATCHER->is_active;
3472 return if $Coro::current == $Coro::main; 3740 return if tick_inhibit || $Coro::current == $Coro::main;
3473 3741
3474 my $signal = new Coro::Signal; 3742 my $signal = new Coro::Signal;
3475 push @WAIT_FOR_TICK, $signal; 3743 push @WAIT_FOR_TICK, $signal;
3476 $signal->wait; 3744 $signal->wait;
3477} 3745}
3478 3746
3479sub wait_for_tick_begin { 3747sub wait_for_tick_begin {
3480 return unless $TICK_WATCHER->is_active;
3481 return if $Coro::current == $Coro::main; 3748 return if tick_inhibit || $Coro::current == $Coro::main;
3482 3749
3483 my $signal = new Coro::Signal; 3750 my $signal = new Coro::Signal;
3484 push @WAIT_FOR_TICK_BEGIN, $signal; 3751 push @WAIT_FOR_TICK_BEGIN, $signal;
3485 $signal->wait; 3752 $signal->wait;
3486} 3753}
3487 3754
3488$TICK_WATCHER = Event->timer ( 3755sub tick {
3489 reentrant => 0,
3490 parked => 1,
3491 prio => 0,
3492 at => $NEXT_TICK || $TICK,
3493 data => WF_AUTOCANCEL,
3494 cb => sub {
3495 if ($Coro::current != $Coro::main) { 3756 if ($Coro::current != $Coro::main) {
3496 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3757 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3497 unless ++$bug_warning > 10; 3758 unless ++$bug_warning > 10;
3498 return; 3759 return;
3499 } 3760 }
3500 3761
3501 $NOW = $tick_start = Event::time;
3502
3503 cf::server_tick; # one server iteration 3762 cf::server_tick; # one server iteration
3504 3763
3505 $RUNTIME += $TICK;
3506 $NEXT_TICK += $TICK;
3507
3508 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3764 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3509 $NEXT_RUNTIME_WRITE = $NOW + 10; 3765 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3510 Coro::async_pool { 3766 Coro::async_pool {
3511 $Coro::current->{desc} = "runtime saver"; 3767 $Coro::current->{desc} = "runtime saver";
3512 write_runtime 3768 write_runtime_sync
3513 or warn "ERROR: unable to write runtime file: $!"; 3769 or warn "ERROR: unable to write runtime file: $!";
3514 };
3515 } 3770 };
3771 }
3516 3772
3517 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3773 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3518 $sig->send; 3774 $sig->send;
3519 } 3775 }
3520 while (my $sig = shift @WAIT_FOR_TICK) { 3776 while (my $sig = shift @WAIT_FOR_TICK) {
3521 $sig->send; 3777 $sig->send;
3522 } 3778 }
3523 3779
3524 $NOW = Event::time; 3780 $LOAD = ($NOW - $TICK_START) / $TICK;
3525
3526 # if we are delayed by four ticks or more, skip them all
3527 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3528
3529 $TICK_WATCHER->at ($NEXT_TICK);
3530 $TICK_WATCHER->start;
3531
3532 $LOAD = ($NOW - $tick_start) / $TICK;
3533 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3781 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3534 3782
3535 _post_tick; 3783 if (0) {
3784 if ($NEXT_TICK) {
3785 my $jitter = $TICK_START - $NEXT_TICK;
3786 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3787 warn "jitter $JITTER\n";#d#
3788 }
3536 }, 3789 }
3537); 3790}
3538 3791
3539{ 3792{
3793 # configure BDB
3794
3540 BDB::min_parallel 8; 3795 BDB::min_parallel 8;
3541 BDB::max_poll_time $TICK * 0.1; 3796 BDB::max_poll_reqs $TICK * 0.1;
3542 $BDB_POLL_WATCHER = Event->io ( 3797 $AnyEvent::BDB::WATCHER->priority (1);
3543 reentrant => 0,
3544 fd => BDB::poll_fileno,
3545 poll => 'r',
3546 prio => 0,
3547 data => WF_AUTOCANCEL,
3548 cb => \&BDB::poll_cb,
3549 );
3550
3551 BDB::set_sync_prepare {
3552 my $status;
3553 my $current = $Coro::current;
3554 (
3555 sub {
3556 $status = $!;
3557 $current->ready; undef $current;
3558 },
3559 sub {
3560 Coro::schedule while defined $current;
3561 $! = $status;
3562 },
3563 )
3564 };
3565 3798
3566 unless ($DB_ENV) { 3799 unless ($DB_ENV) {
3567 $DB_ENV = BDB::db_env_create; 3800 $DB_ENV = BDB::db_env_create;
3568 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3801 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3569 | BDB::LOG_AUTOREMOVE, 1); 3802 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3803 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3570 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3804 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3571 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3805 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3572 3806
3573 cf::sync_job { 3807 cf::sync_job {
3574 eval { 3808 eval {
3584 3818
3585 cf::cleanup "db_env_open(db): $@" if $@; 3819 cf::cleanup "db_env_open(db): $@" if $@;
3586 }; 3820 };
3587 } 3821 }
3588 3822
3589 $BDB_DEADLOCK_WATCHER = Event->timer ( 3823 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3590 after => 3,
3591 interval => 1,
3592 hard => 1,
3593 prio => 0,
3594 data => WF_AUTOCANCEL,
3595 cb => sub {
3596 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3824 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3597 },
3598 ); 3825 };
3599 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3826 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3600 after => 11,
3601 interval => 60,
3602 hard => 1,
3603 prio => 0,
3604 data => WF_AUTOCANCEL,
3605 cb => sub {
3606 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3827 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3607 },
3608 ); 3828 };
3609 $BDB_TRICKLE_WATCHER = Event->timer ( 3829 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3610 after => 5,
3611 interval => 10,
3612 hard => 1,
3613 prio => 0,
3614 data => WF_AUTOCANCEL,
3615 cb => sub {
3616 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3830 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3617 },
3618 ); 3831 };
3619} 3832}
3620 3833
3621{ 3834{
3835 # configure IO::AIO
3836
3622 IO::AIO::min_parallel 8; 3837 IO::AIO::min_parallel 8;
3623
3624 undef $Coro::AIO::WATCHER;
3625 IO::AIO::max_poll_time $TICK * 0.1; 3838 IO::AIO::max_poll_time $TICK * 0.1;
3626 $AIO_POLL_WATCHER = Event->io ( 3839 undef $AnyEvent::AIO::WATCHER;
3627 reentrant => 0,
3628 data => WF_AUTOCANCEL,
3629 fd => IO::AIO::poll_fileno,
3630 poll => 'r',
3631 prio => 0,
3632 cb => \&IO::AIO::poll_cb,
3633 );
3634} 3840}
3635 3841
3636my $_log_backtrace; 3842my $_log_backtrace;
3637 3843
3638sub _log_backtrace { 3844sub _log_backtrace {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines