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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines