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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines