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.385 by root, Fri Oct 12 19:13:26 2007 UTC vs.
Revision 1.427 by root, Sat Apr 26 12:25:45 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 Event; 30use EV 3.2;
10use Opcode; 31use Opcode;
11use Safe; 32use Safe;
12use Safe::Hole; 33use Safe::Hole;
13use Storable (); 34use Storable ();
14 35
15use Coro 4.1 (); 36use Coro 4.50 ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::Event; 39use Coro::EV;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
22use Coro::AIO; 43use Coro::AIO;
44use Coro::BDB;
23use Coro::Storable; 45use Coro::Storable;
24use Coro::Util (); 46use Coro::Util ();
25 47
26use JSON::XS (); 48use JSON::XS 2.01 ();
27use BDB (); 49use BDB ();
28use Data::Dumper; 50use Data::Dumper;
29use Digest::MD5; 51use Digest::MD5;
30use Fcntl; 52use Fcntl;
31use YAML::Syck (); 53use YAML ();
32use IO::AIO 2.51 (); 54use IO::AIO 2.51 ();
33use Time::HiRes; 55use Time::HiRes;
34use Compress::LZF; 56use Compress::LZF;
35use Digest::MD5 (); 57use Digest::MD5 ();
36 58
37# configure various modules to our taste 59# configure various modules to our taste
38# 60#
39$Storable::canonical = 1; # reduce rsync transfers 61$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
43$Event::Eval = 1; # no idea why this is required, but it is
44
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47 64
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 66
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 68
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 87our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 89our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE;
75 93
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 97our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
83 99
84our $BDB_POLL_WATCHER; 100our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 101our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 102our $BDB_CHECKPOINT_WATCHER;
89 105
90our %CFG; 106our %CFG;
91 107
92our $UPTIME; $UPTIME ||= time; 108our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 109our $RUNTIME;
110our $NOW;
94 111
95our (%PLAYER, %PLAYER_LOADING); # all users 112our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 113our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 114our $LINK_MAP; # the special {link} map, which is always available
98 115
99# used to convert map paths into valid unix filenames by replacing / by ∕ 116# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 118
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
105 123
106binmode STDOUT; 124binmode STDOUT;
107binmode STDERR; 125binmode STDERR;
108 126
109# read virtual server time, if available 127# read virtual server time, if available
162 180
163The raw value load value from the last tick. 181The raw value load value from the last tick.
164 182
165=item %cf::CFG 183=item %cf::CFG
166 184
167Configuration for the server, loaded from C</etc/crossfire/config>, or 185Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 186from wherever your confdir points to.
169 187
170=item cf::wait_for_tick, cf::wait_for_tick_begin 188=item cf::wait_for_tick, cf::wait_for_tick_begin
171 189
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 190These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 212
195 LOG llevError, $msg; 213 LOG llevError, $msg;
196 }; 214 };
197} 215}
216
217$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "=="
219
220 if ($Coro::current == $Coro::main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d#
223 }#d#
224
225 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate
228};
229
230$SIG{__DIE__} = sub { }; #d#?
198 231
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
215)) { 248)) {
216 no strict 'refs'; 249 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 251}
219 252
220$Event::DIED = sub { 253$EV::DIED = sub {
221 warn "error in event callback: @_"; 254 warn "error in event callback: @_";
222}; 255};
223 256
224############################################################################# 257#############################################################################
225 258
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 281 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 282 $d
250 } || "[unable to dump $_[0]: '$@']"; 283 } || "[unable to dump $_[0]: '$@']";
251} 284}
252 285
253=item $ref = cf::from_json $json 286=item $ref = cf::decode_json $json
254 287
255Converts a JSON string into the corresponding perl data structure. 288Converts a JSON string into the corresponding perl data structure.
256 289
257=item $json = cf::to_json $ref 290=item $json = cf::encode_json $ref
258 291
259Converts a perl data structure into its JSON representation. 292Converts a perl data structure into its JSON representation.
260 293
261=cut 294=cut
262 295
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 297
265sub to_json ($) { $json_coder->encode ($_[0]) } 298sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 299sub decode_json($) { $json_coder->decode ($_[0]) }
267 300
268=item cf::lock_wait $string 301=item cf::lock_wait $string
269 302
270Wait until the given lock is available. See cf::lock_acquire. 303Wait until the given lock is available. See cf::lock_acquire.
271 304
327 360
328 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
329} 362}
330 363
331sub freeze_mainloop { 364sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
333 366
334 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
335 $TICK_WATCHER->start; 368}
336 }; 369
337 $TICK_WATCHER->stop; 370=item cf::periodic $interval, $cb
338 $guard 371
372Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer.
374
375=cut
376
377sub periodic($$) {
378 my ($interval, $cb) = @_;
379
380 my $start = rand List::Util::min 180, $interval;
381
382 EV::periodic $start, $interval, 0, $cb
339} 383}
340 384
341=item cf::get_slot $time[, $priority[, $name]] 385=item cf::get_slot $time[, $priority[, $name]]
342 386
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 387Allocate $time seconds of blocking CPU time at priority C<$priority>:
383 } 427 }
384 } 428 }
385}; 429};
386 430
387sub get_slot($;$$) { 431sub get_slot($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main;
433
388 my ($time, $pri, $name) = @_; 434 my ($time, $pri, $name) = @_;
389 435
390 $time = $TICK * .6 if $time > $TICK * .6; 436 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal; 437 my $sig = new Coro::Signal;
392 438
406 452
407BEGIN { *async = \&Coro::async_pool } 453BEGIN { *async = \&Coro::async_pool }
408 454
409=item cf::sync_job { BLOCK } 455=item cf::sync_job { BLOCK }
410 456
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 457The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 458is 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 459partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 460acceptable.
415 461
416If it must be done, put the blocking parts into C<sync_job>. This will run 462If 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 463the given BLOCK in another coroutine while waiting for the result. The
422 468
423sub sync_job(&) { 469sub sync_job(&) {
424 my ($job) = @_; 470 my ($job) = @_;
425 471
426 if ($Coro::current == $Coro::main) { 472 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 473 my $time = EV::time;
428 474
429 # this is the main coro, too bad, we have to block 475 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 476 # till the operation succeeds, freezing the server :/
431 477
432 LOG llevError, Carp::longmess "sync job";#d# 478 LOG llevError, Carp::longmess "sync job";#d#
433 479
434 # TODO: use suspend/resume instead
435 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 480 my $freeze_guard = freeze_mainloop;
437 481
438 my $busy = 1; 482 my $busy = 1;
439 my @res; 483 my @res;
440 484
444 warn $@ if $@; 488 warn $@ if $@;
445 undef $busy; 489 undef $busy;
446 })->prio (Coro::PRIO_MAX); 490 })->prio (Coro::PRIO_MAX);
447 491
448 while ($busy) { 492 while ($busy) {
449 Coro::cede or Event::one_event; 493 if (Coro::nready) {
494 Coro::cede_notself;
495 } else {
496 EV::loop EV::LOOP_ONESHOT;
450 } 497 }
498 }
451 499
452 $time = Event::time - $time; 500 my $time = EV::time - $time;
453 501
454 LOG llevError | logBacktrace, Carp::longmess "long sync job"
455 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
456
457 $tick_start += $time; # do not account sync jobs to server load 502 $TICK_START += $time; # do not account sync jobs to server load
458 503
459 wantarray ? @res : $res[0] 504 wantarray ? @res : $res[0]
460 } else { 505 } else {
461 # we are in another coroutine, how wonderful, everything just works 506 # we are in another coroutine, how wonderful, everything just works
462 507
487=item fork_call { }, $args 532=item fork_call { }, $args
488 533
489Executes the given code block with the given arguments in a seperate 534Executes the given code block with the given arguments in a seperate
490process, returning the results. Everything must be serialisable with 535process, returning the results. Everything must be serialisable with
491Coro::Storable. May, of course, block. Note that the executed sub may 536Coro::Storable. May, of course, block. Note that the executed sub may
492never block itself or use any form of Event handling. 537never block itself or use any form of event handling.
493 538
494=cut 539=cut
495 540
496sub fork_call(&@) { 541sub fork_call(&@) {
497 my ($cb, @args) = @_; 542 my ($cb, @args) = @_;
504 reset_signals; 549 reset_signals;
505 &$cb 550 &$cb
506 }, @args; 551 }, @args;
507 552
508 wantarray ? @res : $res[-1] 553 wantarray ? @res : $res[-1]
554}
555
556=item $coin = coin_from_name $name
557
558=cut
559
560our %coin_alias = (
561 "silver" => "silvercoin",
562 "silvercoin" => "silvercoin",
563 "silvercoins" => "silvercoin",
564 "gold" => "goldcoin",
565 "goldcoin" => "goldcoin",
566 "goldcoins" => "goldcoin",
567 "platinum" => "platinacoin",
568 "platinumcoin" => "platinacoin",
569 "platinumcoins" => "platinacoin",
570 "platina" => "platinacoin",
571 "platinacoin" => "platinacoin",
572 "platinacoins" => "platinacoin",
573 "royalty" => "royalty",
574 "royalties" => "royalty",
575);
576
577sub coin_from_name($) {
578 $coin_alias{$_[0]}
579 ? cf::arch::find $coin_alias{$_[0]}
580 : undef
509} 581}
510 582
511=item $value = cf::db_get $family => $key 583=item $value = cf::db_get $family => $key
512 584
513Returns a single value from the environment database. 585Returns a single value from the environment database.
658attach callbacks/event handlers (a collection of which is called an "attachment") 730attach callbacks/event handlers (a collection of which is called an "attachment")
659to it. All such attachable objects support the following methods. 731to it. All such attachable objects support the following methods.
660 732
661In the following description, CLASS can be any of C<global>, C<object> 733In the following description, CLASS can be any of C<global>, C<object>
662C<player>, C<client> or C<map> (i.e. the attachable objects in 734C<player>, C<client> or C<map> (i.e. the attachable objects in
663Crossfire TRT). 735Deliantra).
664 736
665=over 4 737=over 4
666 738
667=item $attachable->attach ($attachment, key => $value...) 739=item $attachable->attach ($attachment, key => $value...)
668 740
950 } 1022 }
951 1023
952 0 1024 0
953} 1025}
954 1026
955=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
956 1028
957=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1029=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
958 1030
959Generate an object-specific event with the given arguments. 1031Generate an object-specific event with the given arguments.
960 1032
966 1038
967=cut 1039=cut
968 1040
969############################################################################# 1041#############################################################################
970# object support 1042# object support
971#
972 1043
1044sub _object_equal($$);
1045sub _object_equal($$) {
1046 my ($a, $b) = @_;
1047
1048 return 0 unless (ref $a) eq (ref $b);
1049
1050 if ("HASH" eq ref $a) {
1051 my @ka = keys %$a;
1052 my @kb = keys %$b;
1053
1054 return 0 if @ka != @kb;
1055
1056 for (0 .. $#ka) {
1057 return 0 unless $ka[$_] eq $kb[$_];
1058 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1059 }
1060
1061 } elsif ("ARRAY" eq ref $a) {
1062
1063 return 0 if @$a != @$b;
1064
1065 for (0 .. $#$a) {
1066 return 0 unless _object_equal $a->[$_], $b->[$_];
1067 }
1068
1069 } elsif ($a ne $b) {
1070 return 0;
1071 }
1072
1073 1
1074}
1075
1076our $SLOW_MERGES;#d#
973sub _can_merge { 1077sub _can_merge {
974 my ($ob1, $ob2) = @_; 1078 my ($ob1, $ob2) = @_;
975 1079
976 return 1;#d# 1080 ++$SLOW_MERGES;#d#
977 1081
978 #todo#d# kill yourself and do some recursive checking manually without storable 1082 # we do the slow way here
979 sync_job { 1083 return _object_equal $ob1, $ob2
980 my $guard = Coro::Storable::guard;
981 local $Storable::canonical = 1;
982 my $fob1 = Storable::freeze $ob1;
983 my $fob2 = Storable::freeze $ob2;
984 $fob1 eq $fob2
985 }
986} 1084}
987 1085
988sub reattach { 1086sub reattach {
989 # basically do the same as instantiate, without calling instantiate 1087 # basically do the same as instantiate, without calling instantiate
990 my ($obj) = @_; 1088 my ($obj) = @_;
1012cf::attachable->attach ( 1110cf::attachable->attach (
1013 prio => -1000000, 1111 prio => -1000000,
1014 on_instantiate => sub { 1112 on_instantiate => sub {
1015 my ($obj, $data) = @_; 1113 my ($obj, $data) = @_;
1016 1114
1017 $data = from_json $data; 1115 $data = decode_json $data;
1018 1116
1019 for (@$data) { 1117 for (@$data) {
1020 my ($name, $args) = @$_; 1118 my ($name, $args) = @$_;
1021 1119
1022 $obj->attach ($name, %{$args || {} }); 1120 $obj->attach ($name, %{$args || {} });
1043 utf8::decode (my $decname = $filename); 1141 utf8::decode (my $decname = $filename);
1044 warn sprintf "saving %s (%d,%d)\n", 1142 warn sprintf "saving %s (%d,%d)\n",
1045 $decname, length $$rdata, scalar @$objs; 1143 $decname, length $$rdata, scalar @$objs;
1046 1144
1047 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1048 chmod SAVE_MODE, $fh; 1146 aio_chmod $fh, SAVE_MODE;
1049 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1050 aio_fsync $fh if $cf::USE_FSYNC; 1148 aio_fsync $fh if $cf::USE_FSYNC;
1051 close $fh; 1149 aio_close $fh;
1052 1150
1053 if (@$objs) { 1151 if (@$objs) {
1054 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1152 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1055 chmod SAVE_MODE, $fh; 1153 aio_chmod $fh, SAVE_MODE;
1056 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs }; 1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1057 aio_write $fh, 0, (length $data), $data, 0; 1155 aio_write $fh, 0, (length $data), $data, 0;
1058 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
1059 close $fh; 1157 aio_close $fh;
1060 aio_rename "$filename.pst~", "$filename.pst"; 1158 aio_rename "$filename.pst~", "$filename.pst";
1061 } 1159 }
1062 } else { 1160 } else {
1063 aio_unlink "$filename.pst"; 1161 aio_unlink "$filename.pst";
1064 } 1162 }
1092 1190
1093 unless (aio_stat "$filename.pst") { 1191 unless (aio_stat "$filename.pst") {
1094 (aio_load "$filename.pst", $av) >= 0 1192 (aio_load "$filename.pst", $av) >= 0
1095 or return; 1193 or return;
1096 1194
1097 my $st = eval { Coro::Storable::thaw $av } 1195 my $st = eval { Coro::Storable::thaw $av };
1098 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1099 $av = $st->{objs}; 1196 $av = $st->{objs};
1100 } 1197 }
1101 1198
1102 utf8::decode (my $decname = $filename); 1199 utf8::decode (my $decname = $filename);
1103 warn sprintf "loading %s (%d,%d)\n", 1200 warn sprintf "loading %s (%d,%d)\n",
1260 my $msg = $@ ? "$v->{path}: $@\n" 1357 my $msg = $@ ? "$v->{path}: $@\n"
1261 : "$v->{base}: extension inactive.\n"; 1358 : "$v->{base}: extension inactive.\n";
1262 1359
1263 if (exists $v->{meta}{mandatory}) { 1360 if (exists $v->{meta}{mandatory}) {
1264 warn $msg; 1361 warn $msg;
1265 warn "mandatory extension failed to load, exiting.\n"; 1362 cf::cleanup "mandatory extension failed to load, exiting.";
1266 exit 1;
1267 } 1363 }
1268 1364
1269 warn $msg; 1365 warn $msg;
1270 } 1366 }
1271 1367
1360 my $f = new_from_file cf::object::thawer path $login 1456 my $f = new_from_file cf::object::thawer path $login
1361 or return; 1457 or return;
1362 1458
1363 my $pl = cf::player::load_pl $f 1459 my $pl = cf::player::load_pl $f
1364 or return; 1460 or return;
1461
1365 local $cf::PLAYER_LOADING{$login} = $pl; 1462 local $cf::PLAYER_LOADING{$login} = $pl;
1366 $f->resolve_delayed_derefs; 1463 $f->resolve_delayed_derefs;
1367 $cf::PLAYER{$login} = $pl 1464 $cf::PLAYER{$login} = $pl
1368 } 1465 }
1369 } 1466 }
1379 1476
1380 return if $pl->{deny_save}; 1477 return if $pl->{deny_save};
1381 1478
1382 aio_mkdir playerdir $pl, 0770; 1479 aio_mkdir playerdir $pl, 0770;
1383 $pl->{last_save} = $cf::RUNTIME; 1480 $pl->{last_save} = $cf::RUNTIME;
1481
1482 cf::get_slot 0.01;
1384 1483
1385 $pl->save_pl ($path); 1484 $pl->save_pl ($path);
1386 cf::cede_to_tick; 1485 cf::cede_to_tick;
1387} 1486}
1388 1487
1472 1571
1473 for my $login (@$dirs) { 1572 for my $login (@$dirs) {
1474 my $path = path $login; 1573 my $path = path $login;
1475 1574
1476 # a .pst is a dead give-away for a valid player 1575 # a .pst is a dead give-away for a valid player
1477 unless (-e "$path.pst") { 1576 # if no pst file found, open and chekc for blocked users
1577 if (aio_stat "$path.pst") {
1478 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1578 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1479 aio_read $fh, 0, 512, my $buf, 0 or next; 1579 aio_read $fh, 0, 512, my $buf, 0 or next;
1480 $buf !~ /^password -------------$/m or next; # official not-valid tag 1580 $buf !~ /^password -------------$/m or next; # official not-valid tag
1481 } 1581 }
1482 1582
1519 1619
1520Expand crossfire pod fragments into protocol xml. 1620Expand crossfire pod fragments into protocol xml.
1521 1621
1522=cut 1622=cut
1523 1623
1624use re 'eval';
1625
1626my $group;
1627my $interior; $interior = qr{
1628 # match a pod interior sequence sans C<< >>
1629 (?:
1630 \ (.*?)\ (?{ $group = $^N })
1631 | < (??{$interior}) >
1632 )
1633}x;
1634
1524sub expand_cfpod { 1635sub expand_cfpod {
1525 ((my $self), (local $_)) = @_; 1636 my ($self, $pod) = @_;
1526 1637
1527 # escape & and < 1638 my $xml;
1528 s/&/&amp;/g;
1529 s/(?<![BIUGHT])</&lt;/g;
1530 1639
1531 # this is buggy, it needs to properly take care of nested <'s 1640 while () {
1641 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1642 $group = $1;
1532 1643
1533 1 while 1644 $group =~ s/&/&amp;/g;
1534 # replace B<>, I<>, U<> etc. 1645 $group =~ s/</&lt;/g;
1535 s/B<([^\>]*)>/<b>$1<\/b>/ 1646
1536 || s/I<([^\>]*)>/<i>$1<\/i>/ 1647 $xml .= $group;
1537 || s/U<([^\>]*)>/<u>$1<\/u>/ 1648 } elsif ($pod =~ m%\G
1538 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1649 ([BCGHITU])
1539 # replace G<male|female> tags 1650 <
1540 || s{G<([^>|]*)\|([^>]*)>}{ 1651 (?:
1541 $self->gender ? $2 : $1 1652 ([^<>]*) (?{ $group = $^N })
1542 }ge 1653 | < $interior >
1543 # replace H<hint text> 1654 )
1544 || s{H<([^\>]*)>} 1655 >
1656 %gcsx
1545 { 1657 ) {
1658 my ($code, $data) = ($1, $group);
1659
1660 if ($code eq "B") {
1661 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1662 } elsif ($code eq "I") {
1663 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1664 } elsif ($code eq "U") {
1665 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1666 } elsif ($code eq "C") {
1667 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1668 } elsif ($code eq "T") {
1669 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1670 } elsif ($code eq "G") {
1671 my ($male, $female) = split /\|/, $data;
1672 $data = $self->gender ? $female : $male;
1673 $xml .= expand_cfpod ($self, $data);
1674 } elsif ($code eq "H") {
1546 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1675 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1547 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1676 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1548 "") 1677 "")
1549 [$self->{hintmode}] 1678 [$self->{hintmode}];
1679 } else {
1680 $xml .= "error processing '$code($data)' directive";
1550 }ge; 1681 }
1682 } else {
1683 if ($pod =~ /\G(.+)/) {
1684 warn "parse error while expanding $pod (at $1)";
1685 }
1686 last;
1687 }
1688 }
1551 1689
1690 for ($xml) {
1552 # create single paragraphs (very hackish) 1691 # create single paragraphs (very hackish)
1553 s/(?<=\S)\n(?=\w)/ /g; 1692 s/(?<=\S)\n(?=\w)/ /g;
1554 1693
1555 # compress some whitespace 1694 # compress some whitespace
1556 s/\s+\n/\n/g; # ws line-ends 1695 s/\s+\n/\n/g; # ws line-ends
1557 s/\n\n+/\n/g; # double lines 1696 s/\n\n+/\n/g; # double lines
1558 s/^\n+//; # beginning lines 1697 s/^\n+//; # beginning lines
1559 s/\n+$//; # ending lines 1698 s/\n+$//; # ending lines
1699 }
1560 1700
1561 $_ 1701 $xml
1562} 1702}
1703
1704no re 'eval';
1563 1705
1564sub hintmode { 1706sub hintmode {
1565 $_[0]{hintmode} = $_[1] if @_ > 1; 1707 $_[0]{hintmode} = $_[1] if @_ > 1;
1566 $_[0]{hintmode} 1708 $_[0]{hintmode}
1567} 1709}
1639our $MAX_RESET = 3600; 1781our $MAX_RESET = 3600;
1640our $DEFAULT_RESET = 3000; 1782our $DEFAULT_RESET = 3000;
1641 1783
1642sub generate_random_map { 1784sub generate_random_map {
1643 my ($self, $rmp) = @_; 1785 my ($self, $rmp) = @_;
1786
1787 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1788
1644 # mit "rum" bekleckern, nicht 1789 # mit "rum" bekleckern, nicht
1645 $self->_create_random_map ( 1790 $self->_create_random_map (
1646 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1791 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1647 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1792 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1648 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1793 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1770 1915
1771# the temporary/swap location 1916# the temporary/swap location
1772sub save_path { 1917sub save_path {
1773 my ($self) = @_; 1918 my ($self) = @_;
1774 1919
1775 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1920 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1776 "$TMPDIR/$path.map" 1921 "$TMPDIR/$path.map"
1777} 1922}
1778 1923
1779# the unique path, undef == no special unique path 1924# the unique path, undef == no special unique path
1780sub uniq_path { 1925sub uniq_path {
1781 my ($self) = @_; 1926 my ($self) = @_;
1782 1927
1783 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1784 "$UNIQUEDIR/$path" 1929 "$UNIQUEDIR/$path"
1785} 1930}
1786 1931
1787# and all this just because we cannot iterate over 1932# and all this just because we cannot iterate over
1788# all maps in C++... 1933# all maps in C++...
1974 } 2119 }
1975 2120
1976 $self->{last_save} = $cf::RUNTIME; 2121 $self->{last_save} = $cf::RUNTIME;
1977 $self->last_access ($cf::RUNTIME); 2122 $self->last_access ($cf::RUNTIME);
1978 2123
1979 $self->in_memory (cf::MAP_IN_MEMORY); 2124 $self->in_memory (cf::MAP_ACTIVE);
1980 } 2125 }
1981 2126
1982 $self->post_load; 2127 $self->post_load;
1983} 2128}
1984 2129
2042 my ($path, $origin, $load) = @_; 2187 my ($path, $origin, $load) = @_;
2043 2188
2044 $path = normalise $path, $origin && $origin->{path}; 2189 $path = normalise $path, $origin && $origin->{path};
2045 2190
2046 if (my $map = $cf::MAP{$path}) { 2191 if (my $map = $cf::MAP{$path}) {
2047 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2192 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2048 } 2193 }
2049 2194
2050 $MAP_PREFETCH{$path} |= $load; 2195 $MAP_PREFETCH{$path} |= $load;
2051 2196
2052 $MAP_PREFETCHER ||= cf::async { 2197 $MAP_PREFETCHER ||= cf::async {
2089 cf::async { 2234 cf::async {
2090 $Coro::current->{desc} = "map player save"; 2235 $Coro::current->{desc} = "map player save";
2091 $_->contr->save for $self->players; 2236 $_->contr->save for $self->players;
2092 }; 2237 };
2093 2238
2239 cf::get_slot 0.02;
2240
2094 if ($uniq) { 2241 if ($uniq) {
2095 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2242 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2096 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2243 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2097 } else { 2244 } else {
2098 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2106 $self->save; 2253 $self->save;
2107 2254
2108 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2255 my $lock = cf::lock_acquire "map_data:$self->{path}";
2109 2256
2110 return if $self->players; 2257 return if $self->players;
2111 return if $self->in_memory != cf::MAP_IN_MEMORY; 2258 return if $self->in_memory != cf::MAP_ACTIVE;
2112 return if $self->{deny_save}; 2259 return if $self->{deny_save};
2113 2260
2114 $self->in_memory (cf::MAP_SWAPPED); 2261 $self->in_memory (cf::MAP_SWAPPED);
2115 2262
2116 $self->deactivate; 2263 $self->deactivate;
2234 2381
2235sub unique_maps() { 2382sub unique_maps() {
2236 [ 2383 [
2237 map { 2384 map {
2238 utf8::decode $_; 2385 utf8::decode $_;
2239 /\.map$/ 2386 s/\.map$//; # TODO future compatibility hack
2387 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2388 ? ()
2240 ? normalise $_ 2389 : normalise $_
2241 : ()
2242 } @{ aio_readdir $UNIQUEDIR or [] } 2390 } @{ aio_readdir $UNIQUEDIR or [] }
2243 ] 2391 ]
2244} 2392}
2245 2393
2246package cf;
2247
2248=back 2394=back
2249 2395
2250=head3 cf::object 2396=head3 cf::object
2251 2397
2252=cut 2398=cut
2255 2401
2256=over 4 2402=over 4
2257 2403
2258=item $ob->inv_recursive 2404=item $ob->inv_recursive
2259 2405
2260Returns the inventory of the object _and_ their inventories, recursively. 2406Returns the inventory of the object I<and> their inventories, recursively,
2407but I<not> the object itself.
2261 2408
2262=cut 2409=cut
2263 2410
2264sub inv_recursive_; 2411sub inv_recursive_;
2265sub inv_recursive_ { 2412sub inv_recursive_ {
2270 inv_recursive_ inv $_[0] 2417 inv_recursive_ inv $_[0]
2271} 2418}
2272 2419
2273=item $ref = $ob->ref 2420=item $ref = $ob->ref
2274 2421
2275creates and returns a persistent reference to an objetc that can be stored as a string. 2422Creates and returns a persistent reference to an object that can be stored as a string.
2276 2423
2277=item $ob = cf::object::deref ($refstring) 2424=item $ob = cf::object::deref ($refstring)
2278 2425
2279returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2426returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2280even if the object actually exists. May block. 2427even if the object actually exists. May block.
2554 $rmp->{origin_y} = $exit->y; 2701 $rmp->{origin_y} = $exit->y;
2555 } 2702 }
2556 2703
2557 $rmp->{random_seed} ||= $exit->random_seed; 2704 $rmp->{random_seed} ||= $exit->random_seed;
2558 2705
2559 my $data = cf::to_json $rmp; 2706 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2560 my $md5 = Digest::MD5::md5_hex $data; 2707 my $md5 = Digest::MD5::md5_hex $data;
2561 my $meta = "$RANDOMDIR/$md5.meta"; 2708 my $meta = "$RANDOMDIR/$md5.meta";
2562 2709
2563 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2710 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2564 aio_write $fh, 0, (length $data), $data, 0; 2711 aio_write $fh, 0, (length $data), $data, 0;
2637the message, with C<log> being the default. If C<$color> is negative, suppress 2784the message, with C<log> being the default. If C<$color> is negative, suppress
2638the message unless the client supports the msg packet. 2785the message unless the client supports the msg packet.
2639 2786
2640=cut 2787=cut
2641 2788
2789# non-persistent channels (usually the info channel)
2642our %CHANNEL = ( 2790our %CHANNEL = (
2643 "c/identify" => { 2791 "c/identify" => {
2644 id => "infobox", 2792 id => "infobox",
2645 title => "Identify", 2793 title => "Identify",
2646 reply => undef, 2794 reply => undef,
2650 id => "infobox", 2798 id => "infobox",
2651 title => "Examine", 2799 title => "Examine",
2652 reply => undef, 2800 reply => undef,
2653 tooltip => "Signs and other items you examined", 2801 tooltip => "Signs and other items you examined",
2654 }, 2802 },
2803 "c/book" => {
2804 id => "infobox",
2805 title => "Book",
2806 reply => undef,
2807 tooltip => "The contents of a note or book",
2808 },
2655 "c/lookat" => { 2809 "c/lookat" => {
2656 id => "infobox", 2810 id => "infobox",
2657 title => "Look", 2811 title => "Look",
2658 reply => undef, 2812 reply => undef,
2659 tooltip => "What you saw there", 2813 tooltip => "What you saw there",
2814 },
2815 "c/who" => {
2816 id => "infobox",
2817 title => "Players",
2818 reply => undef,
2819 tooltip => "Shows players who are currently online",
2820 },
2821 "c/body" => {
2822 id => "infobox",
2823 title => "Body Parts",
2824 reply => undef,
2825 tooltip => "Shows which body parts you posess and are available",
2826 },
2827 "c/uptime" => {
2828 id => "infobox",
2829 title => "Uptime",
2830 reply => undef,
2831 tooltip => "How long the server has been running since last restart",
2832 },
2833 "c/mapinfo" => {
2834 id => "infobox",
2835 title => "Map Info",
2836 reply => undef,
2837 tooltip => "Information related to the maps",
2838 },
2839 "c/party" => {
2840 id => "party",
2841 title => "Party",
2842 reply => "gsay ",
2843 tooltip => "Messages and chat related to your party",
2660 }, 2844 },
2661); 2845);
2662 2846
2663sub cf::client::send_msg { 2847sub cf::client::send_msg {
2664 my ($self, $channel, $msg, $color, @extra) = @_; 2848 my ($self, $channel, $msg, $color, @extra) = @_;
2902 3086
2903The following functions and methods are available within a safe environment: 3087The following functions and methods are available within a safe environment:
2904 3088
2905 cf::object 3089 cf::object
2906 contr pay_amount pay_player map x y force_find force_add destroy 3090 contr pay_amount pay_player map x y force_find force_add destroy
2907 insert remove name archname title slaying race decrease_ob_nr 3091 insert remove name archname title slaying race decrease split
2908 3092
2909 cf::object::player 3093 cf::object::player
2910 player 3094 player
2911 3095
2912 cf::player 3096 cf::player
2918=cut 3102=cut
2919 3103
2920for ( 3104for (
2921 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3105 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2922 insert remove inv name archname title slaying race 3106 insert remove inv name archname title slaying race
2923 decrease_ob_nr destroy)], 3107 decrease split destroy)],
2924 ["cf::object::player" => qw(player)], 3108 ["cf::object::player" => qw(player)],
2925 ["cf::player" => qw(peaceful)], 3109 ["cf::player" => qw(peaceful)],
2926 ["cf::map" => qw(trigger)], 3110 ["cf::map" => qw(trigger)],
2927) { 3111) {
2928 no strict 'refs'; 3112 no strict 'refs';
3033 { 3217 {
3034 my $faces = $facedata->{faceinfo}; 3218 my $faces = $facedata->{faceinfo};
3035 3219
3036 while (my ($face, $info) = each %$faces) { 3220 while (my ($face, $info) = each %$faces) {
3037 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3221 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3222
3038 cf::face::set_visibility $idx, $info->{visibility}; 3223 cf::face::set_visibility $idx, $info->{visibility};
3039 cf::face::set_magicmap $idx, $info->{magicmap}; 3224 cf::face::set_magicmap $idx, $info->{magicmap};
3040 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3225 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3041 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3226 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3042 3227
3043 cf::cede_to_tick; 3228 cf::cede_to_tick;
3044 } 3229 }
3045 3230
3046 while (my ($face, $info) = each %$faces) { 3231 while (my ($face, $info) = each %$faces) {
3047 next unless $info->{smooth}; 3232 next unless $info->{smooth};
3233
3048 my $idx = cf::face::find $face 3234 my $idx = cf::face::find $face
3049 or next; 3235 or next;
3236
3050 if (my $smooth = cf::face::find $info->{smooth}) { 3237 if (my $smooth = cf::face::find $info->{smooth}) {
3051 cf::face::set_smooth $idx, $smooth; 3238 cf::face::set_smooth $idx, $smooth;
3052 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3239 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3053 } else { 3240 } else {
3054 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3241 warn "smooth face '$info->{smooth}' not found for face '$face'";
3072 { 3259 {
3073 # TODO: for gcfclient pleasure, we should give resources 3260 # TODO: for gcfclient pleasure, we should give resources
3074 # that gcfclient doesn't grok a >10000 face index. 3261 # that gcfclient doesn't grok a >10000 face index.
3075 my $res = $facedata->{resource}; 3262 my $res = $facedata->{resource};
3076 3263
3077 my $soundconf = delete $res->{"res/sound.conf"};
3078
3079 while (my ($name, $info) = each %$res) { 3264 while (my ($name, $info) = each %$res) {
3265 if (defined $info->{type}) {
3080 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3266 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3081 my $data; 3267 my $data;
3082 3268
3083 if ($info->{type} & 1) { 3269 if ($info->{type} & 1) {
3084 # prepend meta info 3270 # prepend meta info
3085 3271
3086 my $meta = $enc->encode ({ 3272 my $meta = $enc->encode ({
3087 name => $name, 3273 name => $name,
3088 %{ $info->{meta} || {} }, 3274 %{ $info->{meta} || {} },
3089 }); 3275 });
3090 3276
3091 $data = pack "(w/a*)*", $meta, $info->{data}; 3277 $data = pack "(w/a*)*", $meta, $info->{data};
3278 } else {
3279 $data = $info->{data};
3280 }
3281
3282 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3283 cf::face::set_type $idx, $info->{type};
3092 } else { 3284 } else {
3093 $data = $info->{data}; 3285 $RESOURCE{$name} = $info;
3094 } 3286 }
3095 3287
3096 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3097 cf::face::set_type $idx, $info->{type};
3098
3099 cf::cede_to_tick; 3288 cf::cede_to_tick;
3100 } 3289 }
3101
3102 if ($soundconf) {
3103 $soundconf = $enc->decode (delete $soundconf->{data});
3104
3105 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3106 my $sound = $soundconf->{compat}[$_]
3107 or next;
3108
3109 my $face = cf::face::find "sound/$sound->[1]";
3110 cf::sound::set $sound->[0] => $face;
3111 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3112 }
3113
3114 while (my ($k, $v) = each %{$soundconf->{event}}) {
3115 my $face = cf::face::find "sound/$v";
3116 cf::sound::set $k => $face;
3117 }
3118 }
3119 } 3290 }
3291
3292 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3120 3293
3121 1 3294 1
3122} 3295}
3296
3297cf::global->attach (on_resource_update => sub {
3298 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3299 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3300
3301 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3302 my $sound = $soundconf->{compat}[$_]
3303 or next;
3304
3305 my $face = cf::face::find "sound/$sound->[1]";
3306 cf::sound::set $sound->[0] => $face;
3307 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3308 }
3309
3310 while (my ($k, $v) = each %{$soundconf->{event}}) {
3311 my $face = cf::face::find "sound/$v";
3312 cf::sound::set $k => $face;
3313 }
3314 }
3315});
3123 3316
3124register_exticmd fx_want => sub { 3317register_exticmd fx_want => sub {
3125 my ($ns, $want) = @_; 3318 my ($ns, $want) = @_;
3126 3319
3127 while (my ($k, $v) = each %$want) { 3320 while (my ($k, $v) = each %$want) {
3128 $ns->fx_want ($k, $v); 3321 $ns->fx_want ($k, $v);
3129 } 3322 }
3130}; 3323};
3324
3325sub load_resource_file($) {
3326 my $guard = lock_acquire "load_resource_file";
3327
3328 my $status = load_resource_file_ $_[0];
3329 get_slot 0.1, 100;
3330 cf::arch::commit_load;
3331
3332 $status
3333}
3131 3334
3132sub reload_regions { 3335sub reload_regions {
3133 # HACK to clear player env face cache, we need some signal framework 3336 # HACK to clear player env face cache, we need some signal framework
3134 # for this (global event?) 3337 # for this (global event?)
3135 %ext::player_env::MUSIC_FACE_CACHE = (); 3338 %ext::player_env::MUSIC_FACE_CACHE = ();
3149} 3352}
3150 3353
3151sub reload_archetypes { 3354sub reload_archetypes {
3152 load_resource_file "$DATADIR/archetypes" 3355 load_resource_file "$DATADIR/archetypes"
3153 or die "unable to load archetypes\n"; 3356 or die "unable to load archetypes\n";
3154 #d# NEED to laod twice to resolve forward references
3155 # this really needs to be done in an extra post-pass
3156 # (which needs to be synchronous, so solve it differently)
3157 load_resource_file "$DATADIR/archetypes"
3158 or die "unable to load archetypes\n";
3159} 3357}
3160 3358
3161sub reload_treasures { 3359sub reload_treasures {
3162 load_resource_file "$DATADIR/treasures" 3360 load_resource_file "$DATADIR/treasures"
3163 or die "unable to load treasurelists\n"; 3361 or die "unable to load treasurelists\n";
3164} 3362}
3165 3363
3166sub reload_resources { 3364sub reload_resources {
3167 warn "reloading resource files...\n"; 3365 warn "reloading resource files...\n";
3168 3366
3367 reload_facedata;
3368 reload_archetypes;
3169 reload_regions; 3369 reload_regions;
3170 reload_facedata;
3171 #reload_archetypes;#d#
3172 reload_archetypes;
3173 reload_treasures; 3370 reload_treasures;
3174 3371
3175 warn "finished reloading resource files\n"; 3372 warn "finished reloading resource files\n";
3176} 3373}
3177 3374
3178sub init { 3375sub init {
3376 my $guard = freeze_mainloop;
3377
3179 reload_resources; 3378 reload_resources;
3180} 3379}
3181 3380
3182sub reload_config { 3381sub reload_config {
3183 open my $fh, "<:utf8", "$CONFDIR/config" 3382 open my $fh, "<:utf8", "$CONFDIR/config"
3184 or return; 3383 or return;
3185 3384
3186 local $/; 3385 local $/;
3187 *CFG = YAML::Syck::Load <$fh>; 3386 *CFG = YAML::Load <$fh>;
3188 3387
3189 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3388 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3190 3389
3191 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3390 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3192 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3391 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3204 # we must not ever block the main coroutine 3403 # we must not ever block the main coroutine
3205 local $Coro::idle = sub { 3404 local $Coro::idle = sub {
3206 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3405 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3207 (async { 3406 (async {
3208 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3407 $Coro::current->{desc} = "IDLE BUG HANDLER";
3209 Event::one_event; 3408 EV::loop EV::LOOP_ONESHOT;
3210 })->prio (Coro::PRIO_MAX); 3409 })->prio (Coro::PRIO_MAX);
3211 }; 3410 };
3212 3411
3412 {
3413 my $guard = freeze_mainloop;
3213 reload_config; 3414 reload_config;
3214 db_init; 3415 db_init;
3215 load_extensions; 3416 load_extensions;
3216 3417
3217 $TICK_WATCHER->start; 3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3419 evthread_start IO::AIO::poll_fileno;
3420 }
3421
3218 Event::loop; 3422 EV::loop;
3219} 3423}
3220 3424
3221############################################################################# 3425#############################################################################
3222# initialisation and cleanup 3426# initialisation and cleanup
3223 3427
3224# install some emergency cleanup handlers 3428# install some emergency cleanup handlers
3225BEGIN { 3429BEGIN {
3430 our %SIGWATCHER = ();
3226 for my $signal (qw(INT HUP TERM)) { 3431 for my $signal (qw(INT HUP TERM)) {
3227 Event->signal ( 3432 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3228 reentrant => 0,
3229 data => WF_AUTOCANCEL,
3230 signal => $signal,
3231 prio => 0,
3232 cb => sub {
3233 cf::cleanup "SIG$signal"; 3433 cf::cleanup "SIG$signal";
3234 },
3235 ); 3434 };
3236 } 3435 }
3237} 3436}
3238 3437
3239sub write_runtime { 3438sub write_runtime_sync {
3240 my $runtime = "$LOCALDIR/runtime"; 3439 my $runtime = "$LOCALDIR/runtime";
3241 3440
3242 # first touch the runtime file to show we are still running: 3441 # first touch the runtime file to show we are still running:
3243 # the fsync below can take a very very long time. 3442 # the fsync below can take a very very long time.
3244 3443
3270 and return; 3469 and return;
3271 3470
3272 warn "runtime file written.\n"; 3471 warn "runtime file written.\n";
3273 3472
3274 1 3473 1
3474}
3475
3476our $uuid_lock;
3477our $uuid_skip;
3478
3479sub write_uuid_sync($) {
3480 $uuid_skip ||= $_[0];
3481
3482 return if $uuid_lock;
3483 local $uuid_lock = 1;
3484
3485 my $uuid = "$LOCALDIR/uuid";
3486
3487 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3488 or return;
3489
3490 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3491 $uuid_skip = 0;
3492
3493 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3494 and return;
3495
3496 # always fsync - this file is important
3497 aio_fsync $fh
3498 and return;
3499
3500 close $fh
3501 or return;
3502
3503 aio_rename "$uuid~", $uuid
3504 and return;
3505
3506 warn "uuid file written ($value).\n";
3507
3508 1
3509
3510}
3511
3512sub write_uuid($$) {
3513 my ($skip, $sync) = @_;
3514
3515 $sync ? write_uuid_sync $skip
3516 : async { write_uuid_sync $skip };
3275} 3517}
3276 3518
3277sub emergency_save() { 3519sub emergency_save() {
3278 my $freeze_guard = cf::freeze_mainloop; 3520 my $freeze_guard = cf::freeze_mainloop;
3279 3521
3301 warn "end emergency map save\n"; 3543 warn "end emergency map save\n";
3302 3544
3303 warn "begin emergency database checkpoint\n"; 3545 warn "begin emergency database checkpoint\n";
3304 BDB::db_env_txn_checkpoint $DB_ENV; 3546 BDB::db_env_txn_checkpoint $DB_ENV;
3305 warn "end emergency database checkpoint\n"; 3547 warn "end emergency database checkpoint\n";
3548
3549 warn "begin write uuid\n";
3550 write_uuid_sync 1;
3551 warn "end write uuid\n";
3306 }; 3552 };
3307 3553
3308 warn "leave emergency perl save\n"; 3554 warn "leave emergency perl save\n";
3309} 3555}
3310 3556
3325 warn "reloading..."; 3571 warn "reloading...";
3326 3572
3327 warn "entering sync_job"; 3573 warn "entering sync_job";
3328 3574
3329 cf::sync_job { 3575 cf::sync_job {
3330 cf::write_runtime; # external watchdog should not bark 3576 cf::write_runtime_sync; # external watchdog should not bark
3331 cf::emergency_save; 3577 cf::emergency_save;
3332 cf::write_runtime; # external watchdog should not bark 3578 cf::write_runtime_sync; # external watchdog should not bark
3333 3579
3334 warn "syncing database to disk"; 3580 warn "syncing database to disk";
3335 BDB::db_env_txn_checkpoint $DB_ENV; 3581 BDB::db_env_txn_checkpoint $DB_ENV;
3336 3582
3337 # if anything goes wrong in here, we should simply crash as we already saved 3583 # if anything goes wrong in here, we should simply crash as we already saved
3338
3339 warn "cancelling all WF_AUTOCANCEL watchers";
3340 for (Event::all_watchers) {
3341 $_->cancel if $_->data & WF_AUTOCANCEL;
3342 }
3343 3584
3344 warn "flushing outstanding aio requests"; 3585 warn "flushing outstanding aio requests";
3345 for (;;) { 3586 for (;;) {
3346 BDB::flush; 3587 BDB::flush;
3347 IO::AIO::flush; 3588 IO::AIO::flush;
3348 Coro::cede; 3589 Coro::cede_notself;
3349 last unless IO::AIO::nreqs || BDB::nreqs; 3590 last unless IO::AIO::nreqs || BDB::nreqs;
3350 warn "iterate..."; 3591 warn "iterate...";
3351 } 3592 }
3352 3593
3353 ++$RELOAD; 3594 ++$RELOAD;
3429 warn "leaving sync_job"; 3670 warn "leaving sync_job";
3430 3671
3431 1 3672 1
3432 } or do { 3673 } or do {
3433 warn $@; 3674 warn $@;
3434 warn "error while reloading, exiting."; 3675 cf::cleanup "error while reloading, exiting.";
3435 exit 1;
3436 }; 3676 };
3437 3677
3438 warn "reloaded"; 3678 warn "reloaded";
3439}; 3679};
3440 3680
3442 3682
3443sub reload_perl() { 3683sub reload_perl() {
3444 # doing reload synchronously and two reloads happen back-to-back, 3684 # doing reload synchronously and two reloads happen back-to-back,
3445 # coro crashes during coro_state_free->destroy here. 3685 # coro crashes during coro_state_free->destroy here.
3446 3686
3447 $RELOAD_WATCHER ||= Event->timer ( 3687 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3448 reentrant => 0,
3449 after => 0,
3450 data => WF_AUTOCANCEL,
3451 cb => sub {
3452 do_reload_perl; 3688 do_reload_perl;
3453 undef $RELOAD_WATCHER; 3689 undef $RELOAD_WATCHER;
3454 },
3455 ); 3690 };
3456} 3691}
3457 3692
3458register_command "reload" => sub { 3693register_command "reload" => sub {
3459 my ($who, $arg) = @_; 3694 my ($who, $arg) = @_;
3460 3695
3473 3708
3474our @WAIT_FOR_TICK; 3709our @WAIT_FOR_TICK;
3475our @WAIT_FOR_TICK_BEGIN; 3710our @WAIT_FOR_TICK_BEGIN;
3476 3711
3477sub wait_for_tick { 3712sub wait_for_tick {
3478 return unless $TICK_WATCHER->is_active;
3479 return if $Coro::current == $Coro::main; 3713 return if tick_inhibit || $Coro::current == $Coro::main;
3480 3714
3481 my $signal = new Coro::Signal; 3715 my $signal = new Coro::Signal;
3482 push @WAIT_FOR_TICK, $signal; 3716 push @WAIT_FOR_TICK, $signal;
3483 $signal->wait; 3717 $signal->wait;
3484} 3718}
3485 3719
3486sub wait_for_tick_begin { 3720sub wait_for_tick_begin {
3487 return unless $TICK_WATCHER->is_active;
3488 return if $Coro::current == $Coro::main; 3721 return if tick_inhibit || $Coro::current == $Coro::main;
3489 3722
3490 my $signal = new Coro::Signal; 3723 my $signal = new Coro::Signal;
3491 push @WAIT_FOR_TICK_BEGIN, $signal; 3724 push @WAIT_FOR_TICK_BEGIN, $signal;
3492 $signal->wait; 3725 $signal->wait;
3493} 3726}
3494 3727
3495$TICK_WATCHER = Event->timer ( 3728sub tick {
3496 reentrant => 0,
3497 parked => 1,
3498 prio => 0,
3499 at => $NEXT_TICK || $TICK,
3500 data => WF_AUTOCANCEL,
3501 cb => sub {
3502 if ($Coro::current != $Coro::main) { 3729 if ($Coro::current != $Coro::main) {
3503 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3730 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3504 unless ++$bug_warning > 10; 3731 unless ++$bug_warning > 10;
3505 return; 3732 return;
3506 } 3733 }
3507 3734
3508 $NOW = $tick_start = Event::time;
3509
3510 cf::server_tick; # one server iteration 3735 cf::server_tick; # one server iteration
3511 3736
3512 $RUNTIME += $TICK;
3513 $NEXT_TICK += $TICK;
3514
3515 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3737 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3516 $NEXT_RUNTIME_WRITE = $NOW + 10; 3738 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3517 Coro::async_pool { 3739 Coro::async_pool {
3518 $Coro::current->{desc} = "runtime saver"; 3740 $Coro::current->{desc} = "runtime saver";
3519 write_runtime 3741 write_runtime_sync
3520 or warn "ERROR: unable to write runtime file: $!"; 3742 or warn "ERROR: unable to write runtime file: $!";
3521 };
3522 } 3743 };
3744 }
3523 3745
3524 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3746 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3525 $sig->send; 3747 $sig->send;
3526 } 3748 }
3527 while (my $sig = shift @WAIT_FOR_TICK) { 3749 while (my $sig = shift @WAIT_FOR_TICK) {
3528 $sig->send; 3750 $sig->send;
3529 } 3751 }
3530 3752
3531 $NOW = Event::time; 3753 $LOAD = ($NOW - $TICK_START) / $TICK;
3532
3533 # if we are delayed by four ticks or more, skip them all
3534 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3535
3536 $TICK_WATCHER->at ($NEXT_TICK);
3537 $TICK_WATCHER->start;
3538
3539 $LOAD = ($NOW - $tick_start) / $TICK;
3540 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3754 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3541 3755
3542 _post_tick; 3756 if (0) {
3757 if ($NEXT_TICK) {
3758 my $jitter = $TICK_START - $NEXT_TICK;
3759 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3760 warn "jitter $JITTER\n";#d#
3761 }
3543 }, 3762 }
3544); 3763}
3545 3764
3546{ 3765{
3766 # configure BDB
3767
3547 BDB::min_parallel 8; 3768 BDB::min_parallel 8;
3548 BDB::max_poll_time $TICK * 0.1; 3769 BDB::max_poll_reqs $TICK * 0.1;
3549 $BDB_POLL_WATCHER = Event->io ( 3770 $Coro::BDB::WATCHER->priority (1);
3550 reentrant => 0,
3551 fd => BDB::poll_fileno,
3552 poll => 'r',
3553 prio => 0,
3554 data => WF_AUTOCANCEL,
3555 cb => \&BDB::poll_cb,
3556 );
3557
3558 BDB::set_sync_prepare {
3559 my $status;
3560 my $current = $Coro::current;
3561 (
3562 sub {
3563 $status = $!;
3564 $current->ready; undef $current;
3565 },
3566 sub {
3567 Coro::schedule while defined $current;
3568 $! = $status;
3569 },
3570 )
3571 };
3572 3771
3573 unless ($DB_ENV) { 3772 unless ($DB_ENV) {
3574 $DB_ENV = BDB::db_env_create; 3773 $DB_ENV = BDB::db_env_create;
3575 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3774 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3576 | BDB::LOG_AUTOREMOVE, 1); 3775 | BDB::LOG_AUTOREMOVE, 1);
3591 3790
3592 cf::cleanup "db_env_open(db): $@" if $@; 3791 cf::cleanup "db_env_open(db): $@" if $@;
3593 }; 3792 };
3594 } 3793 }
3595 3794
3596 $BDB_DEADLOCK_WATCHER = Event->timer ( 3795 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3597 after => 3,
3598 interval => 1,
3599 hard => 1,
3600 prio => 0,
3601 data => WF_AUTOCANCEL,
3602 cb => sub {
3603 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3796 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3604 },
3605 ); 3797 };
3606 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3798 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3607 after => 11,
3608 interval => 60,
3609 hard => 1,
3610 prio => 0,
3611 data => WF_AUTOCANCEL,
3612 cb => sub {
3613 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3799 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3614 },
3615 ); 3800 };
3616 $BDB_TRICKLE_WATCHER = Event->timer ( 3801 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3617 after => 5,
3618 interval => 10,
3619 hard => 1,
3620 prio => 0,
3621 data => WF_AUTOCANCEL,
3622 cb => sub {
3623 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3802 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3624 },
3625 ); 3803 };
3626} 3804}
3627 3805
3628{ 3806{
3807 # configure IO::AIO
3808
3629 IO::AIO::min_parallel 8; 3809 IO::AIO::min_parallel 8;
3630
3631 undef $Coro::AIO::WATCHER;
3632 IO::AIO::max_poll_time $TICK * 0.1; 3810 IO::AIO::max_poll_time $TICK * 0.1;
3633 $AIO_POLL_WATCHER = Event->io ( 3811 $Coro::AIO::WATCHER->priority (1);
3634 reentrant => 0,
3635 data => WF_AUTOCANCEL,
3636 fd => IO::AIO::poll_fileno,
3637 poll => 'r',
3638 prio => 0,
3639 cb => \&IO::AIO::poll_cb,
3640 );
3641} 3812}
3642 3813
3643my $_log_backtrace; 3814my $_log_backtrace;
3644 3815
3645sub _log_backtrace { 3816sub _log_backtrace {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines