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.373 by root, Sat Sep 15 15:58:06 2007 UTC vs.
Revision 1.422 by root, Tue Apr 15 20:46:55 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV 3.2;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
14 35
15use Coro 3.64 (); 36use Coro 4.50 ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::Event; 39use Coro::EV;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
22use Coro::AIO; 43use Coro::AIO;
44use Coro::BDB;
23use Coro::Storable; 45use Coro::Storable;
24use Coro::Util (); 46use Coro::Util ();
25 47
26use JSON::XS (); 48use JSON::XS 2.01 ();
27use BDB (); 49use BDB ();
28use Data::Dumper; 50use Data::Dumper;
29use Digest::MD5; 51use Digest::MD5;
30use Fcntl; 52use Fcntl;
31use YAML::Syck (); 53use YAML ();
32use IO::AIO 2.32 (); 54use IO::AIO 2.51 ();
33use Time::HiRes; 55use Time::HiRes;
34use Compress::LZF; 56use Compress::LZF;
35use Digest::MD5 (); 57use Digest::MD5 ();
36 58
37# configure various modules to our taste 59# configure various modules to our taste
38# 60#
39$Storable::canonical = 1; # reduce rsync transfers 61$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
43$Event::Eval = 1; # no idea why this is required, but it is
44
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47 64
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 66
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 68
… …
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 87our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 89our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE;
75 93
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 97our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
83 99
84our $BDB_POLL_WATCHER; 100our $BDB_POLL_WATCHER;
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>:
… …
354our @SLOT_QUEUE; 398our @SLOT_QUEUE;
355our $SLOT_QUEUE; 399our $SLOT_QUEUE;
356 400
357$SLOT_QUEUE->cancel if $SLOT_QUEUE; 401$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async { 402$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager");
404
359 my $signal = new Coro::Signal; 405 my $signal = new Coro::Signal;
360 406
361 while () { 407 while () {
362 next_job: 408 next_job:
363 my $avail = cf::till_tick; 409 my $avail = cf::till_tick;
… …
371 } 417 }
372 } 418 }
373 } 419 }
374 420
375 if (@SLOT_QUEUE) { 421 if (@SLOT_QUEUE) {
376 # we do not use wait_For_tick() as it returns immediately when tick is inactive 422 # we do not use wait_for_tick() as it returns immediately when tick is inactive
377 push @cf::WAIT_FOR_TICK, $signal; 423 push @cf::WAIT_FOR_TICK, $signal;
378 $signal->wait; 424 $signal->wait;
379 } else { 425 } else {
380 Coro::schedule; 426 Coro::schedule;
381 } 427 }
382 } 428 }
383}; 429};
384 430
385sub get_slot($;$$) { 431sub get_slot($;$$) {
432 return if tick_inhibit;
433
386 my ($time, $pri, $name) = @_; 434 my ($time, $pri, $name) = @_;
387 435
388 $time = $TICK * .6 if $time > $TICK * .6; 436 $time = $TICK * .6 if $time > $TICK * .6;
389 my $sig = new Coro::Signal; 437 my $sig = new Coro::Signal;
390 438
… …
404 452
405BEGIN { *async = \&Coro::async_pool } 453BEGIN { *async = \&Coro::async_pool }
406 454
407=item cf::sync_job { BLOCK } 455=item cf::sync_job { BLOCK }
408 456
409The design of Crossfire TRT requires that the main coroutine ($Coro::main) 457The design of Deliantra requires that the main coroutine ($Coro::main)
410is always able to handle events or runnable, as Crossfire TRT is only 458is always able to handle events or runnable, as Deliantra is only
411partly 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
412acceptable. 460acceptable.
413 461
414If 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
415the given BLOCK in another coroutine while waiting for the result. The 463the given BLOCK in another coroutine while waiting for the result. The
… …
420 468
421sub sync_job(&) { 469sub sync_job(&) {
422 my ($job) = @_; 470 my ($job) = @_;
423 471
424 if ($Coro::current == $Coro::main) { 472 if ($Coro::current == $Coro::main) {
425 my $time = Event::time; 473 my $time = EV::time;
426 474
427 # this is the main coro, too bad, we have to block 475 # this is the main coro, too bad, we have to block
428 # till the operation succeeds, freezing the server :/ 476 # till the operation succeeds, freezing the server :/
429 477
430 # TODO: use suspend/resume instead 478 LOG llevError, Carp::longmess "sync job";#d#
431 # (but this is cancel-safe) 479
432 my $freeze_guard = freeze_mainloop; 480 my $freeze_guard = freeze_mainloop;
433 481
434 my $busy = 1; 482 my $busy = 1;
435 my @res; 483 my @res;
436 484
437 (async { 485 (async {
486 $Coro::current->desc ("sync job coro");
438 @res = eval { $job->() }; 487 @res = eval { $job->() };
439 warn $@ if $@; 488 warn $@ if $@;
440 undef $busy; 489 undef $busy;
441 })->prio (Coro::PRIO_MAX); 490 })->prio (Coro::PRIO_MAX);
442 491
443 while ($busy) { 492 while ($busy) {
444 Coro::cede or Event::one_event; 493 if (Coro::nready) {
494 Coro::cede_notself;
495 } else {
496 EV::loop EV::LOOP_ONESHOT;
445 } 497 }
498 }
446 499
447 $time = Event::time - $time; 500 my $time = EV::time - $time;
448 501
449 LOG llevError | logBacktrace, Carp::longmess "long sync job"
450 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
451
452 $tick_start += $time; # do not account sync jobs to server load 502 $TICK_START += $time; # do not account sync jobs to server load
453 503
454 wantarray ? @res : $res[0] 504 wantarray ? @res : $res[0]
455 } else { 505 } else {
456 # we are in another coroutine, how wonderful, everything just works 506 # we are in another coroutine, how wonderful, everything just works
457 507
… …
482=item fork_call { }, $args 532=item fork_call { }, $args
483 533
484Executes the given code block with the given arguments in a seperate 534Executes the given code block with the given arguments in a seperate
485process, returning the results. Everything must be serialisable with 535process, returning the results. Everything must be serialisable with
486Coro::Storable. May, of course, block. Note that the executed sub may 536Coro::Storable. May, of course, block. Note that the executed sub may
487never block itself or use any form of Event handling. 537never block itself or use any form of event handling.
488 538
489=cut 539=cut
490 540
491sub fork_call(&@) { 541sub fork_call(&@) {
492 my ($cb, @args) = @_; 542 my ($cb, @args) = @_;
… …
499 reset_signals; 549 reset_signals;
500 &$cb 550 &$cb
501 }, @args; 551 }, @args;
502 552
503 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
504} 581}
505 582
506=item $value = cf::db_get $family => $key 583=item $value = cf::db_get $family => $key
507 584
508Returns a single value from the environment database. 585Returns a single value from the environment database.
… …
653attach callbacks/event handlers (a collection of which is called an "attachment") 730attach callbacks/event handlers (a collection of which is called an "attachment")
654to it. All such attachable objects support the following methods. 731to it. All such attachable objects support the following methods.
655 732
656In 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>
657C<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
658Crossfire TRT). 735Deliantra).
659 736
660=over 4 737=over 4
661 738
662=item $attachable->attach ($attachment, key => $value...) 739=item $attachable->attach ($attachment, key => $value...)
663 740
… …
945 } 1022 }
946 1023
947 0 1024 0
948} 1025}
949 1026
950=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
951 1028
952=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1029=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
953 1030
954Generate an object-specific event with the given arguments. 1031Generate an object-specific event with the given arguments.
955 1032
… …
961 1038
962=cut 1039=cut
963 1040
964############################################################################# 1041#############################################################################
965# object support 1042# object support
966#
967 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#
968sub _can_merge { 1077sub _can_merge {
969 my ($ob1, $ob2) = @_; 1078 my ($ob1, $ob2) = @_;
970 1079
971 local $Storable::canonical = 1; 1080 ++$SLOW_MERGES;#d#
972 my $fob1 = Storable::freeze $ob1;
973 my $fob2 = Storable::freeze $ob2;
974 1081
975 $fob1 eq $fob2 1082 # we do the slow way here
1083 return _object_equal $ob1, $ob2
976} 1084}
977 1085
978sub reattach { 1086sub reattach {
979 # basically do the same as instantiate, without calling instantiate 1087 # basically do the same as instantiate, without calling instantiate
980 my ($obj) = @_; 1088 my ($obj) = @_;
… …
1002cf::attachable->attach ( 1110cf::attachable->attach (
1003 prio => -1000000, 1111 prio => -1000000,
1004 on_instantiate => sub { 1112 on_instantiate => sub {
1005 my ($obj, $data) = @_; 1113 my ($obj, $data) = @_;
1006 1114
1007 $data = from_json $data; 1115 $data = decode_json $data;
1008 1116
1009 for (@$data) { 1117 for (@$data) {
1010 my ($name, $args) = @$_; 1118 my ($name, $args) = @$_;
1011 1119
1012 $obj->attach ($name, %{$args || {} }); 1120 $obj->attach ($name, %{$args || {} });
… …
1041 close $fh; 1149 close $fh;
1042 1150
1043 if (@$objs) { 1151 if (@$objs) {
1044 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) {
1045 chmod SAVE_MODE, $fh; 1153 chmod SAVE_MODE, $fh;
1046 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1047 aio_write $fh, 0, (length $data), $data, 0; 1155 aio_write $fh, 0, (length $data), $data, 0;
1048 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
1049 close $fh; 1157 close $fh;
1050 aio_rename "$filename.pst~", "$filename.pst"; 1158 aio_rename "$filename.pst~", "$filename.pst";
1051 } 1159 }
… …
1082 1190
1083 unless (aio_stat "$filename.pst") { 1191 unless (aio_stat "$filename.pst") {
1084 (aio_load "$filename.pst", $av) >= 0 1192 (aio_load "$filename.pst", $av) >= 0
1085 or return; 1193 or return;
1086 1194
1087 $av = eval { (Storable::thaw $av)->{objs} }; 1195 my $st = eval { Coro::Storable::thaw $av };
1196 $av = $st->{objs};
1088 } 1197 }
1089 1198
1090 utf8::decode (my $decname = $filename); 1199 utf8::decode (my $decname = $filename);
1091 warn sprintf "loading %s (%d,%d)\n", 1200 warn sprintf "loading %s (%d,%d)\n",
1092 $decname, length $data, scalar @{$av || []}; 1201 $decname, length $data, scalar @{$av || []};
… …
1248 my $msg = $@ ? "$v->{path}: $@\n" 1357 my $msg = $@ ? "$v->{path}: $@\n"
1249 : "$v->{base}: extension inactive.\n"; 1358 : "$v->{base}: extension inactive.\n";
1250 1359
1251 if (exists $v->{meta}{mandatory}) { 1360 if (exists $v->{meta}{mandatory}) {
1252 warn $msg; 1361 warn $msg;
1253 warn "mandatory extension failed to load, exiting.\n"; 1362 cf::cleanup "mandatory extension failed to load, exiting.";
1254 exit 1;
1255 } 1363 }
1256 1364
1257 warn $msg; 1365 warn $msg;
1258 } 1366 }
1259 1367
… …
1368 return if $pl->{deny_save}; 1476 return if $pl->{deny_save};
1369 1477
1370 aio_mkdir playerdir $pl, 0770; 1478 aio_mkdir playerdir $pl, 0770;
1371 $pl->{last_save} = $cf::RUNTIME; 1479 $pl->{last_save} = $cf::RUNTIME;
1372 1480
1481 cf::get_slot 0.01;
1482
1373 $pl->save_pl ($path); 1483 $pl->save_pl ($path);
1374 cf::cede_to_tick; 1484 cf::cede_to_tick;
1375} 1485}
1376 1486
1377sub new($) { 1487sub new($) {
… …
1507 1617
1508Expand crossfire pod fragments into protocol xml. 1618Expand crossfire pod fragments into protocol xml.
1509 1619
1510=cut 1620=cut
1511 1621
1622use re 'eval';
1623
1624my $group;
1625my $interior; $interior = qr{
1626 # match a pod interior sequence sans C<< >>
1627 (?:
1628 \ (.*?)\ (?{ $group = $^N })
1629 | < (??{$interior}) >
1630 )
1631}x;
1632
1512sub expand_cfpod { 1633sub expand_cfpod {
1513 ((my $self), (local $_)) = @_; 1634 my ($self, $pod) = @_;
1514 1635
1515 # escape & and < 1636 my $xml;
1516 s/&/&amp;/g;
1517 s/(?<![BIUGHT])</&lt;/g;
1518 1637
1519 # this is buggy, it needs to properly take care of nested <'s 1638 while () {
1639 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1640 $group = $1;
1520 1641
1521 1 while 1642 $group =~ s/&/&amp;/g;
1522 # replace B<>, I<>, U<> etc. 1643 $group =~ s/</&lt;/g;
1523 s/B<([^\>]*)>/<b>$1<\/b>/ 1644
1524 || s/I<([^\>]*)>/<i>$1<\/i>/ 1645 $xml .= $group;
1525 || s/U<([^\>]*)>/<u>$1<\/u>/ 1646 } elsif ($pod =~ m%\G
1526 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1647 ([BCGHITU])
1527 # replace G<male|female> tags 1648 <
1528 || s{G<([^>|]*)\|([^>]*)>}{ 1649 (?:
1529 $self->gender ? $2 : $1 1650 ([^<>]*) (?{ $group = $^N })
1530 }ge 1651 | < $interior >
1531 # replace H<hint text> 1652 )
1532 || s{H<([^\>]*)>} 1653 >
1654 %gcsx
1533 { 1655 ) {
1656 my ($code, $data) = ($1, $group);
1657
1658 if ($code eq "B") {
1659 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1660 } elsif ($code eq "I") {
1661 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1662 } elsif ($code eq "U") {
1663 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1664 } elsif ($code eq "C") {
1665 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1666 } elsif ($code eq "T") {
1667 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1668 } elsif ($code eq "G") {
1669 my ($male, $female) = split /\|/, $data;
1670 $data = $self->gender ? $female : $male;
1671 $xml .= expand_cfpod ($self, $data);
1672 } elsif ($code eq "H") {
1534 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1673 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1535 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1674 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1536 "") 1675 "")
1537 [$self->{hintmode}] 1676 [$self->{hintmode}];
1677 } else {
1678 $xml .= "error processing '$code($data)' directive";
1538 }ge; 1679 }
1680 } else {
1681 if ($pod =~ /\G(.+)/) {
1682 warn "parse error while expanding $pod (at $1)";
1683 }
1684 last;
1685 }
1686 }
1539 1687
1688 for ($xml) {
1540 # create single paragraphs (very hackish) 1689 # create single paragraphs (very hackish)
1541 s/(?<=\S)\n(?=\w)/ /g; 1690 s/(?<=\S)\n(?=\w)/ /g;
1542 1691
1543 # compress some whitespace 1692 # compress some whitespace
1544 s/\s+\n/\n/g; # ws line-ends 1693 s/\s+\n/\n/g; # ws line-ends
1545 s/\n\n+/\n/g; # double lines 1694 s/\n\n+/\n/g; # double lines
1546 s/^\n+//; # beginning lines 1695 s/^\n+//; # beginning lines
1547 s/\n+$//; # ending lines 1696 s/\n+$//; # ending lines
1697 }
1548 1698
1549 $_ 1699 $xml
1550} 1700}
1701
1702no re 'eval';
1551 1703
1552sub hintmode { 1704sub hintmode {
1553 $_[0]{hintmode} = $_[1] if @_ > 1; 1705 $_[0]{hintmode} = $_[1] if @_ > 1;
1554 $_[0]{hintmode} 1706 $_[0]{hintmode}
1555} 1707}
… …
1627our $MAX_RESET = 3600; 1779our $MAX_RESET = 3600;
1628our $DEFAULT_RESET = 3000; 1780our $DEFAULT_RESET = 3000;
1629 1781
1630sub generate_random_map { 1782sub generate_random_map {
1631 my ($self, $rmp) = @_; 1783 my ($self, $rmp) = @_;
1784
1785 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1786
1632 # mit "rum" bekleckern, nicht 1787 # mit "rum" bekleckern, nicht
1633 $self->_create_random_map ( 1788 $self->_create_random_map (
1634 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1635 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1636 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1758 1913
1759# the temporary/swap location 1914# the temporary/swap location
1760sub save_path { 1915sub save_path {
1761 my ($self) = @_; 1916 my ($self) = @_;
1762 1917
1763 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1918 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1764 "$TMPDIR/$path.map" 1919 "$TMPDIR/$path.map"
1765} 1920}
1766 1921
1767# the unique path, undef == no special unique path 1922# the unique path, undef == no special unique path
1768sub uniq_path { 1923sub uniq_path {
1769 my ($self) = @_; 1924 my ($self) = @_;
1770 1925
1771 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1772 "$UNIQUEDIR/$path" 1927 "$UNIQUEDIR/$path"
1773} 1928}
1774 1929
1775# and all this just because we cannot iterate over 1930# and all this just because we cannot iterate over
1776# all maps in C++... 1931# all maps in C++...
… …
1962 } 2117 }
1963 2118
1964 $self->{last_save} = $cf::RUNTIME; 2119 $self->{last_save} = $cf::RUNTIME;
1965 $self->last_access ($cf::RUNTIME); 2120 $self->last_access ($cf::RUNTIME);
1966 2121
1967 $self->in_memory (cf::MAP_IN_MEMORY); 2122 $self->in_memory (cf::MAP_ACTIVE);
1968 } 2123 }
1969 2124
1970 $self->post_load; 2125 $self->post_load;
1971} 2126}
1972 2127
… …
2030 my ($path, $origin, $load) = @_; 2185 my ($path, $origin, $load) = @_;
2031 2186
2032 $path = normalise $path, $origin && $origin->{path}; 2187 $path = normalise $path, $origin && $origin->{path};
2033 2188
2034 if (my $map = $cf::MAP{$path}) { 2189 if (my $map = $cf::MAP{$path}) {
2035 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2190 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2036 } 2191 }
2037 2192
2038 $MAP_PREFETCH{$path} |= $load; 2193 $MAP_PREFETCH{$path} |= $load;
2039 2194
2040 $MAP_PREFETCHER ||= cf::async { 2195 $MAP_PREFETCHER ||= cf::async {
2196 $Coro::current->{desc} = "map prefetcher";
2197
2041 while (%MAP_PREFETCH) { 2198 while (%MAP_PREFETCH) {
2042 while (my ($k, $v) = each %MAP_PREFETCH) { 2199 while (my ($k, $v) = each %MAP_PREFETCH) {
2043 if (my $map = find $k) { 2200 if (my $map = find $k) {
2044 $map->load if $v; 2201 $map->load if $v;
2045 } 2202 }
… …
2071 return if $self->{deny_save}; 2228 return if $self->{deny_save};
2072 2229
2073 local $self->{last_access} = $self->last_access;#d# 2230 local $self->{last_access} = $self->last_access;#d#
2074 2231
2075 cf::async { 2232 cf::async {
2233 $Coro::current->{desc} = "map player save";
2076 $_->contr->save for $self->players; 2234 $_->contr->save for $self->players;
2077 }; 2235 };
2236
2237 cf::get_slot 0.02;
2078 2238
2079 if ($uniq) { 2239 if ($uniq) {
2080 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2240 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2081 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2241 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2082 } else { 2242 } else {
… …
2091 $self->save; 2251 $self->save;
2092 2252
2093 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2253 my $lock = cf::lock_acquire "map_data:$self->{path}";
2094 2254
2095 return if $self->players; 2255 return if $self->players;
2096 return if $self->in_memory != cf::MAP_IN_MEMORY; 2256 return if $self->in_memory != cf::MAP_ACTIVE;
2097 return if $self->{deny_save}; 2257 return if $self->{deny_save};
2098 2258
2099 $self->in_memory (cf::MAP_SWAPPED); 2259 $self->in_memory (cf::MAP_SWAPPED);
2100 2260
2101 $self->deactivate; 2261 $self->deactivate;
… …
2219 2379
2220sub unique_maps() { 2380sub unique_maps() {
2221 [ 2381 [
2222 map { 2382 map {
2223 utf8::decode $_; 2383 utf8::decode $_;
2224 /\.map$/ 2384 s/\.map$//; # TODO future compatibility hack
2385 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2386 ? ()
2225 ? normalise $_ 2387 : normalise $_
2226 : ()
2227 } @{ aio_readdir $UNIQUEDIR or [] } 2388 } @{ aio_readdir $UNIQUEDIR or [] }
2228 ] 2389 ]
2229} 2390}
2230 2391
2231package cf;
2232
2233=back 2392=back
2234 2393
2235=head3 cf::object 2394=head3 cf::object
2236 2395
2237=cut 2396=cut
… …
2240 2399
2241=over 4 2400=over 4
2242 2401
2243=item $ob->inv_recursive 2402=item $ob->inv_recursive
2244 2403
2245Returns the inventory of the object _and_ their inventories, recursively. 2404Returns the inventory of the object I<and> their inventories, recursively,
2405but I<not> the object itself.
2246 2406
2247=cut 2407=cut
2248 2408
2249sub inv_recursive_; 2409sub inv_recursive_;
2250sub inv_recursive_ { 2410sub inv_recursive_ {
… …
2255 inv_recursive_ inv $_[0] 2415 inv_recursive_ inv $_[0]
2256} 2416}
2257 2417
2258=item $ref = $ob->ref 2418=item $ref = $ob->ref
2259 2419
2260creates and returns a persistent reference to an objetc that can be stored as a string. 2420Creates and returns a persistent reference to an object that can be stored as a string.
2261 2421
2262=item $ob = cf::object::deref ($refstring) 2422=item $ob = cf::object::deref ($refstring)
2263 2423
2264returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2424returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2265even if the object actually exists. May block. 2425even if the object actually exists. May block.
… …
2267=cut 2427=cut
2268 2428
2269sub deref { 2429sub deref {
2270 my ($ref) = @_; 2430 my ($ref) = @_;
2271 2431
2272 # temporary compatibility#TODO#remove
2273 $ref =~ s{^<}{player/<};
2274
2275 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2432 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2276 my ($uuid, $name) = ($1, $2); 2433 my ($uuid, $name) = ($1, $2);
2277 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2434 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2278 or return; 2435 or return;
2279 $pl->ob->uuid eq $uuid 2436 $pl->ob->uuid eq $uuid
2280 or return; 2437 or return;
… …
2451 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2608 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2452 2609
2453 $self->enter_link; 2610 $self->enter_link;
2454 2611
2455 (async { 2612 (async {
2613 $Coro::current->{desc} = "player::goto $path $x $y";
2614
2456 # *tag paths override both path and x|y 2615 # *tag paths override both path and x|y
2457 if ($path =~ /^\*(.*)$/) { 2616 if ($path =~ /^\*(.*)$/) {
2458 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2617 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2459 my $ob = $obs[rand @obs]; 2618 my $ob = $obs[rand @obs];
2460 2619
… …
2540 $rmp->{origin_y} = $exit->y; 2699 $rmp->{origin_y} = $exit->y;
2541 } 2700 }
2542 2701
2543 $rmp->{random_seed} ||= $exit->random_seed; 2702 $rmp->{random_seed} ||= $exit->random_seed;
2544 2703
2545 my $data = cf::to_json $rmp; 2704 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2546 my $md5 = Digest::MD5::md5_hex $data; 2705 my $md5 = Digest::MD5::md5_hex $data;
2547 my $meta = "$RANDOMDIR/$md5.meta"; 2706 my $meta = "$RANDOMDIR/$md5.meta";
2548 2707
2549 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2550 aio_write $fh, 0, (length $data), $data, 0; 2709 aio_write $fh, 0, (length $data), $data, 0;
… …
2577 # if exit is damned, update players death & WoR home-position 2736 # if exit is damned, update players death & WoR home-position
2578 $self->contr->savebed ($slaying, $hp, $sp) 2737 $self->contr->savebed ($slaying, $hp, $sp)
2579 if $exit->flag (FLAG_DAMNED); 2738 if $exit->flag (FLAG_DAMNED);
2580 2739
2581 (async { 2740 (async {
2741 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2742
2582 $self->deactivate_recursive; # just to be sure 2743 $self->deactivate_recursive; # just to be sure
2583 unless (eval { 2744 unless (eval {
2584 $self->goto ($slaying, $hp, $sp); 2745 $self->goto ($slaying, $hp, $sp);
2585 2746
2586 1; 2747 1;
… …
2621the message, with C<log> being the default. If C<$color> is negative, suppress 2782the message, with C<log> being the default. If C<$color> is negative, suppress
2622the message unless the client supports the msg packet. 2783the message unless the client supports the msg packet.
2623 2784
2624=cut 2785=cut
2625 2786
2787# non-persistent channels (usually the info channel)
2626our %CHANNEL = ( 2788our %CHANNEL = (
2627 "c/identify" => { 2789 "c/identify" => {
2628 id => "identify", 2790 id => "infobox",
2629 title => "Identify", 2791 title => "Identify",
2630 reply => undef, 2792 reply => undef,
2631 tooltip => "Items recently identified", 2793 tooltip => "Items recently identified",
2632 }, 2794 },
2633 "c/examine" => { 2795 "c/examine" => {
2634 id => "examine", 2796 id => "infobox",
2635 title => "Examine", 2797 title => "Examine",
2636 reply => undef, 2798 reply => undef,
2637 tooltip => "Signs and other items you examined", 2799 tooltip => "Signs and other items you examined",
2638 }, 2800 },
2801 "c/book" => {
2802 id => "infobox",
2803 title => "Book",
2804 reply => undef,
2805 tooltip => "The contents of a note or book",
2806 },
2807 "c/lookat" => {
2808 id => "infobox",
2809 title => "Look",
2810 reply => undef,
2811 tooltip => "What you saw there",
2812 },
2813 "c/who" => {
2814 id => "infobox",
2815 title => "Players",
2816 reply => undef,
2817 tooltip => "Shows players who are currently online",
2818 },
2819 "c/body" => {
2820 id => "infobox",
2821 title => "Body Parts",
2822 reply => undef,
2823 tooltip => "Shows which body parts you posess and are available",
2824 },
2825 "c/uptime" => {
2826 id => "infobox",
2827 title => "Uptime",
2828 reply => undef,
2829 tooltip => "How long the server has been running since last restart",
2830 },
2831 "c/mapinfo" => {
2832 id => "infobox",
2833 title => "Map Info",
2834 reply => undef,
2835 tooltip => "Information related to the maps",
2836 },
2639); 2837);
2640 2838
2641sub cf::client::send_msg { 2839sub cf::client::send_msg {
2642 my ($self, $channel, $msg, $color, @extra) = @_; 2840 my ($self, $channel, $msg, $color, @extra) = @_;
2643 2841
2644 $msg = $self->pl->expand_cfpod ($msg); 2842 $msg = $self->pl->expand_cfpod ($msg);
2645 2843
2646 $color &= cf::NDI_CLIENT_MASK; # just in case... 2844 $color &= cf::NDI_CLIENT_MASK; # just in case...
2647 2845
2648 # check predefined channels, for the benefit of C 2846 # check predefined channels, for the benefit of C
2649 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2847 if ($CHANNEL{$channel}) {
2848 $channel = $CHANNEL{$channel};
2650 2849
2850 $self->ext_msg (channel_info => $channel)
2851 if $self->can_msg;
2852
2853 $channel = $channel->{id};
2854
2651 if (ref $channel) { 2855 } elsif (ref $channel) {
2652 # send meta info to client, if not yet sent 2856 # send meta info to client, if not yet sent
2653 unless (exists $self->{channel}{$channel->{id}}) { 2857 unless (exists $self->{channel}{$channel->{id}}) {
2654 $self->{channel}{$channel->{id}} = $channel; 2858 $self->{channel}{$channel->{id}} = $channel;
2655 $self->ext_msg (channel_info => $channel) 2859 $self->ext_msg (channel_info => $channel)
2656 if $self->can_msg; 2860 if $self->can_msg;
… …
2873=pod 3077=pod
2874 3078
2875The following functions and methods are available within a safe environment: 3079The following functions and methods are available within a safe environment:
2876 3080
2877 cf::object 3081 cf::object
2878 contr pay_amount pay_player map x y force_find force_add 3082 contr pay_amount pay_player map x y force_find force_add destroy
2879 insert remove name archname title slaying race decrease_ob_nr 3083 insert remove name archname title slaying race decrease_ob_nr
2880 3084
2881 cf::object::player 3085 cf::object::player
2882 player 3086 player
2883 3087
… …
2890=cut 3094=cut
2891 3095
2892for ( 3096for (
2893 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3097 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2894 insert remove inv name archname title slaying race 3098 insert remove inv name archname title slaying race
2895 decrease_ob_nr)], 3099 decrease_ob_nr destroy)],
2896 ["cf::object::player" => qw(player)], 3100 ["cf::object::player" => qw(player)],
2897 ["cf::player" => qw(peaceful)], 3101 ["cf::player" => qw(peaceful)],
2898 ["cf::map" => qw(trigger)], 3102 ["cf::map" => qw(trigger)],
2899) { 3103) {
2900 no strict 'refs'; 3104 no strict 'refs';
… …
3005 { 3209 {
3006 my $faces = $facedata->{faceinfo}; 3210 my $faces = $facedata->{faceinfo};
3007 3211
3008 while (my ($face, $info) = each %$faces) { 3212 while (my ($face, $info) = each %$faces) {
3009 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3213 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3214
3010 cf::face::set_visibility $idx, $info->{visibility}; 3215 cf::face::set_visibility $idx, $info->{visibility};
3011 cf::face::set_magicmap $idx, $info->{magicmap}; 3216 cf::face::set_magicmap $idx, $info->{magicmap};
3012 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3217 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3013 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3218 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3014 3219
3015 cf::cede_to_tick; 3220 cf::cede_to_tick;
3016 } 3221 }
3017 3222
3018 while (my ($face, $info) = each %$faces) { 3223 while (my ($face, $info) = each %$faces) {
3019 next unless $info->{smooth}; 3224 next unless $info->{smooth};
3225
3020 my $idx = cf::face::find $face 3226 my $idx = cf::face::find $face
3021 or next; 3227 or next;
3228
3022 if (my $smooth = cf::face::find $info->{smooth}) { 3229 if (my $smooth = cf::face::find $info->{smooth}) {
3023 cf::face::set_smooth $idx, $smooth; 3230 cf::face::set_smooth $idx, $smooth;
3024 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3231 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3025 } else { 3232 } else {
3026 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3233 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3044 { 3251 {
3045 # TODO: for gcfclient pleasure, we should give resources 3252 # TODO: for gcfclient pleasure, we should give resources
3046 # that gcfclient doesn't grok a >10000 face index. 3253 # that gcfclient doesn't grok a >10000 face index.
3047 my $res = $facedata->{resource}; 3254 my $res = $facedata->{resource};
3048 3255
3049 my $soundconf = delete $res->{"res/sound.conf"};
3050
3051 while (my ($name, $info) = each %$res) { 3256 while (my ($name, $info) = each %$res) {
3257 if (defined $info->{type}) {
3052 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3258 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3053 my $data; 3259 my $data;
3054 3260
3055 if ($info->{type} & 1) { 3261 if ($info->{type} & 1) {
3056 # prepend meta info 3262 # prepend meta info
3057 3263
3058 my $meta = $enc->encode ({ 3264 my $meta = $enc->encode ({
3059 name => $name, 3265 name => $name,
3060 %{ $info->{meta} || {} }, 3266 %{ $info->{meta} || {} },
3061 }); 3267 });
3062 3268
3063 $data = pack "(w/a*)*", $meta, $info->{data}; 3269 $data = pack "(w/a*)*", $meta, $info->{data};
3270 } else {
3271 $data = $info->{data};
3272 }
3273
3274 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3275 cf::face::set_type $idx, $info->{type};
3064 } else { 3276 } else {
3065 $data = $info->{data}; 3277 $RESOURCE{$name} = $info;
3066 } 3278 }
3067 3279
3068 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3069 cf::face::set_type $idx, $info->{type};
3070
3071 cf::cede_to_tick; 3280 cf::cede_to_tick;
3072 } 3281 }
3073
3074 if ($soundconf) {
3075 $soundconf = $enc->decode (delete $soundconf->{data});
3076
3077 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3078 my $sound = $soundconf->{compat}[$_]
3079 or next;
3080
3081 my $face = cf::face::find "sound/$sound->[1]";
3082 cf::sound::set $sound->[0] => $face;
3083 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3084 }
3085
3086 while (my ($k, $v) = each %{$soundconf->{event}}) {
3087 my $face = cf::face::find "sound/$v";
3088 cf::sound::set $k => $face;
3089 }
3090 }
3091 } 3282 }
3283
3284 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3092 3285
3093 1 3286 1
3094} 3287}
3288
3289cf::global->attach (on_resource_update => sub {
3290 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3291 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3292
3293 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3294 my $sound = $soundconf->{compat}[$_]
3295 or next;
3296
3297 my $face = cf::face::find "sound/$sound->[1]";
3298 cf::sound::set $sound->[0] => $face;
3299 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3300 }
3301
3302 while (my ($k, $v) = each %{$soundconf->{event}}) {
3303 my $face = cf::face::find "sound/$v";
3304 cf::sound::set $k => $face;
3305 }
3306 }
3307});
3095 3308
3096register_exticmd fx_want => sub { 3309register_exticmd fx_want => sub {
3097 my ($ns, $want) = @_; 3310 my ($ns, $want) = @_;
3098 3311
3099 while (my ($k, $v) = each %$want) { 3312 while (my ($k, $v) = each %$want) {
… …
3154sub reload_config { 3367sub reload_config {
3155 open my $fh, "<:utf8", "$CONFDIR/config" 3368 open my $fh, "<:utf8", "$CONFDIR/config"
3156 or return; 3369 or return;
3157 3370
3158 local $/; 3371 local $/;
3159 *CFG = YAML::Syck::Load <$fh>; 3372 *CFG = YAML::Load <$fh>;
3160 3373
3161 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3374 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3162 3375
3163 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3376 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3164 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3377 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3175sub main { 3388sub main {
3176 # we must not ever block the main coroutine 3389 # we must not ever block the main coroutine
3177 local $Coro::idle = sub { 3390 local $Coro::idle = sub {
3178 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3391 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3179 (async { 3392 (async {
3180 Event::one_event; 3393 $Coro::current->{desc} = "IDLE BUG HANDLER";
3394 EV::loop EV::LOOP_ONESHOT;
3181 })->prio (Coro::PRIO_MAX); 3395 })->prio (Coro::PRIO_MAX);
3182 }; 3396 };
3183 3397
3184 reload_config; 3398 reload_config;
3185 db_init; 3399 db_init;
3186 load_extensions; 3400 load_extensions;
3187 3401
3188 $TICK_WATCHER->start; 3402 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3403 evthread_start IO::AIO::poll_fileno;
3189 Event::loop; 3404 EV::loop;
3190} 3405}
3191 3406
3192############################################################################# 3407#############################################################################
3193# initialisation and cleanup 3408# initialisation and cleanup
3194 3409
3195# install some emergency cleanup handlers 3410# install some emergency cleanup handlers
3196BEGIN { 3411BEGIN {
3412 our %SIGWATCHER = ();
3197 for my $signal (qw(INT HUP TERM)) { 3413 for my $signal (qw(INT HUP TERM)) {
3198 Event->signal ( 3414 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3199 reentrant => 0,
3200 data => WF_AUTOCANCEL,
3201 signal => $signal,
3202 prio => 0,
3203 cb => sub {
3204 cf::cleanup "SIG$signal"; 3415 cf::cleanup "SIG$signal";
3205 },
3206 ); 3416 };
3207 } 3417 }
3208} 3418}
3209 3419
3210sub write_runtime { 3420sub write_runtime_sync {
3211 my $runtime = "$LOCALDIR/runtime"; 3421 my $runtime = "$LOCALDIR/runtime";
3212 3422
3213 # first touch the runtime file to show we are still running: 3423 # first touch the runtime file to show we are still running:
3214 # the fsync below can take a very very long time. 3424 # the fsync below can take a very very long time.
3215 3425
… …
3241 and return; 3451 and return;
3242 3452
3243 warn "runtime file written.\n"; 3453 warn "runtime file written.\n";
3244 3454
3245 1 3455 1
3456}
3457
3458our $uuid_lock;
3459our $uuid_skip;
3460
3461sub write_uuid_sync($) {
3462 $uuid_skip ||= $_[0];
3463
3464 return if $uuid_lock;
3465 local $uuid_lock = 1;
3466
3467 my $uuid = "$LOCALDIR/uuid";
3468
3469 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3470 or return;
3471
3472 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3473 $uuid_skip = 0;
3474
3475 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3476 and return;
3477
3478 # always fsync - this file is important
3479 aio_fsync $fh
3480 and return;
3481
3482 close $fh
3483 or return;
3484
3485 aio_rename "$uuid~", $uuid
3486 and return;
3487
3488 warn "uuid file written ($value).\n";
3489
3490 1
3491
3492}
3493
3494sub write_uuid($$) {
3495 my ($skip, $sync) = @_;
3496
3497 $sync ? write_uuid_sync $skip
3498 : async { write_uuid_sync $skip };
3246} 3499}
3247 3500
3248sub emergency_save() { 3501sub emergency_save() {
3249 my $freeze_guard = cf::freeze_mainloop; 3502 my $freeze_guard = cf::freeze_mainloop;
3250 3503
… …
3256 # and maps saved/destroyed asynchronously. 3509 # and maps saved/destroyed asynchronously.
3257 warn "begin emergency player save\n"; 3510 warn "begin emergency player save\n";
3258 for my $login (keys %cf::PLAYER) { 3511 for my $login (keys %cf::PLAYER) {
3259 my $pl = $cf::PLAYER{$login} or next; 3512 my $pl = $cf::PLAYER{$login} or next;
3260 $pl->valid or next; 3513 $pl->valid or next;
3514 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3261 $pl->save; 3515 $pl->save;
3262 } 3516 }
3263 warn "end emergency player save\n"; 3517 warn "end emergency player save\n";
3264 3518
3265 warn "begin emergency map save\n"; 3519 warn "begin emergency map save\n";
… …
3271 warn "end emergency map save\n"; 3525 warn "end emergency map save\n";
3272 3526
3273 warn "begin emergency database checkpoint\n"; 3527 warn "begin emergency database checkpoint\n";
3274 BDB::db_env_txn_checkpoint $DB_ENV; 3528 BDB::db_env_txn_checkpoint $DB_ENV;
3275 warn "end emergency database checkpoint\n"; 3529 warn "end emergency database checkpoint\n";
3530
3531 warn "begin write uuid\n";
3532 write_uuid_sync 1;
3533 warn "end write uuid\n";
3276 }; 3534 };
3277 3535
3278 warn "leave emergency perl save\n"; 3536 warn "leave emergency perl save\n";
3279} 3537}
3280 3538
… …
3295 warn "reloading..."; 3553 warn "reloading...";
3296 3554
3297 warn "entering sync_job"; 3555 warn "entering sync_job";
3298 3556
3299 cf::sync_job { 3557 cf::sync_job {
3300 cf::write_runtime; # external watchdog should not bark 3558 cf::write_runtime_sync; # external watchdog should not bark
3301 cf::emergency_save; 3559 cf::emergency_save;
3302 cf::write_runtime; # external watchdog should not bark 3560 cf::write_runtime_sync; # external watchdog should not bark
3303 3561
3304 warn "syncing database to disk"; 3562 warn "syncing database to disk";
3305 BDB::db_env_txn_checkpoint $DB_ENV; 3563 BDB::db_env_txn_checkpoint $DB_ENV;
3306 3564
3307 # if anything goes wrong in here, we should simply crash as we already saved 3565 # if anything goes wrong in here, we should simply crash as we already saved
3308
3309 warn "cancelling all WF_AUTOCANCEL watchers";
3310 for (Event::all_watchers) {
3311 $_->cancel if $_->data & WF_AUTOCANCEL;
3312 }
3313 3566
3314 warn "flushing outstanding aio requests"; 3567 warn "flushing outstanding aio requests";
3315 for (;;) { 3568 for (;;) {
3316 BDB::flush; 3569 BDB::flush;
3317 IO::AIO::flush; 3570 IO::AIO::flush;
3318 Coro::cede; 3571 Coro::cede_notself;
3319 last unless IO::AIO::nreqs || BDB::nreqs; 3572 last unless IO::AIO::nreqs || BDB::nreqs;
3320 warn "iterate..."; 3573 warn "iterate...";
3321 } 3574 }
3322 3575
3323 ++$RELOAD; 3576 ++$RELOAD;
… …
3399 warn "leaving sync_job"; 3652 warn "leaving sync_job";
3400 3653
3401 1 3654 1
3402 } or do { 3655 } or do {
3403 warn $@; 3656 warn $@;
3404 warn "error while reloading, exiting."; 3657 cf::cleanup "error while reloading, exiting.";
3405 exit 1;
3406 }; 3658 };
3407 3659
3408 warn "reloaded"; 3660 warn "reloaded";
3409}; 3661};
3410 3662
… …
3412 3664
3413sub reload_perl() { 3665sub reload_perl() {
3414 # doing reload synchronously and two reloads happen back-to-back, 3666 # doing reload synchronously and two reloads happen back-to-back,
3415 # coro crashes during coro_state_free->destroy here. 3667 # coro crashes during coro_state_free->destroy here.
3416 3668
3417 $RELOAD_WATCHER ||= Event->timer ( 3669 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3418 reentrant => 0,
3419 after => 0,
3420 data => WF_AUTOCANCEL,
3421 cb => sub {
3422 do_reload_perl; 3670 do_reload_perl;
3423 undef $RELOAD_WATCHER; 3671 undef $RELOAD_WATCHER;
3424 },
3425 ); 3672 };
3426} 3673}
3427 3674
3428register_command "reload" => sub { 3675register_command "reload" => sub {
3429 my ($who, $arg) = @_; 3676 my ($who, $arg) = @_;
3430 3677
3431 if ($who->flag (FLAG_WIZ)) { 3678 if ($who->flag (FLAG_WIZ)) {
3432 $who->message ("reloading server."); 3679 $who->message ("reloading server.");
3680 async {
3681 $Coro::current->{desc} = "perl_reload";
3433 async { reload_perl }; 3682 reload_perl;
3683 };
3434 } 3684 }
3435}; 3685};
3436 3686
3437unshift @INC, $LIBDIR; 3687unshift @INC, $LIBDIR;
3438 3688
… …
3440 3690
3441our @WAIT_FOR_TICK; 3691our @WAIT_FOR_TICK;
3442our @WAIT_FOR_TICK_BEGIN; 3692our @WAIT_FOR_TICK_BEGIN;
3443 3693
3444sub wait_for_tick { 3694sub wait_for_tick {
3445 return unless $TICK_WATCHER->is_active; 3695 return if tick_inhibit;
3446 return if $Coro::current == $Coro::main; 3696 return if $Coro::current == $Coro::main;
3447 3697
3448 my $signal = new Coro::Signal; 3698 my $signal = new Coro::Signal;
3449 push @WAIT_FOR_TICK, $signal; 3699 push @WAIT_FOR_TICK, $signal;
3450 $signal->wait; 3700 $signal->wait;
3451} 3701}
3452 3702
3453sub wait_for_tick_begin { 3703sub wait_for_tick_begin {
3454 return unless $TICK_WATCHER->is_active; 3704 return if tick_inhibit;
3455 return if $Coro::current == $Coro::main; 3705 return if $Coro::current == $Coro::main;
3456 3706
3457 my $signal = new Coro::Signal; 3707 my $signal = new Coro::Signal;
3458 push @WAIT_FOR_TICK_BEGIN, $signal; 3708 push @WAIT_FOR_TICK_BEGIN, $signal;
3459 $signal->wait; 3709 $signal->wait;
3460} 3710}
3461 3711
3462$TICK_WATCHER = Event->timer ( 3712sub tick {
3463 reentrant => 0,
3464 parked => 1,
3465 prio => 0,
3466 at => $NEXT_TICK || $TICK,
3467 data => WF_AUTOCANCEL,
3468 cb => sub {
3469 if ($Coro::current != $Coro::main) { 3713 if ($Coro::current != $Coro::main) {
3470 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3714 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3471 unless ++$bug_warning > 10; 3715 unless ++$bug_warning > 10;
3472 return; 3716 return;
3473 } 3717 }
3474 3718
3475 $NOW = $tick_start = Event::time;
3476
3477 cf::server_tick; # one server iteration 3719 cf::server_tick; # one server iteration
3478 3720
3479 $RUNTIME += $TICK;
3480 $NEXT_TICK += $TICK;
3481
3482 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3721 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3483 $NEXT_RUNTIME_WRITE = $NOW + 10; 3722 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3484 Coro::async_pool { 3723 Coro::async_pool {
3724 $Coro::current->{desc} = "runtime saver";
3485 write_runtime 3725 write_runtime_sync
3486 or warn "ERROR: unable to write runtime file: $!"; 3726 or warn "ERROR: unable to write runtime file: $!";
3487 };
3488 } 3727 };
3728 }
3489 3729
3490 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3730 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3491 $sig->send; 3731 $sig->send;
3492 } 3732 }
3493 while (my $sig = shift @WAIT_FOR_TICK) { 3733 while (my $sig = shift @WAIT_FOR_TICK) {
3494 $sig->send; 3734 $sig->send;
3495 } 3735 }
3496 3736
3497 $NOW = Event::time; 3737 $LOAD = ($NOW - $TICK_START) / $TICK;
3498
3499 # if we are delayed by four ticks or more, skip them all
3500 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3501
3502 $TICK_WATCHER->at ($NEXT_TICK);
3503 $TICK_WATCHER->start;
3504
3505 $LOAD = ($NOW - $tick_start) / $TICK;
3506 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3738 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3507 3739
3508 _post_tick; 3740 if (0) {
3741 if ($NEXT_TICK) {
3742 my $jitter = $TICK_START - $NEXT_TICK;
3743 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3744 warn "jitter $JITTER\n";#d#
3745 }
3509 }, 3746 }
3510); 3747}
3511 3748
3512{ 3749{
3750 # configure BDB
3751
3513 BDB::min_parallel 8; 3752 BDB::min_parallel 8;
3514 BDB::max_poll_time $TICK * 0.1; 3753 BDB::max_poll_reqs $TICK * 0.1;
3515 $BDB_POLL_WATCHER = Event->io ( 3754 $Coro::BDB::WATCHER->priority (1);
3516 reentrant => 0,
3517 fd => BDB::poll_fileno,
3518 poll => 'r',
3519 prio => 0,
3520 data => WF_AUTOCANCEL,
3521 cb => \&BDB::poll_cb,
3522 );
3523
3524 BDB::set_sync_prepare {
3525 my $status;
3526 my $current = $Coro::current;
3527 (
3528 sub {
3529 $status = $!;
3530 $current->ready; undef $current;
3531 },
3532 sub {
3533 Coro::schedule while defined $current;
3534 $! = $status;
3535 },
3536 )
3537 };
3538 3755
3539 unless ($DB_ENV) { 3756 unless ($DB_ENV) {
3540 $DB_ENV = BDB::db_env_create; 3757 $DB_ENV = BDB::db_env_create;
3541 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3758 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3542 | BDB::LOG_AUTOREMOVE, 1); 3759 | BDB::LOG_AUTOREMOVE, 1);
… …
3557 3774
3558 cf::cleanup "db_env_open(db): $@" if $@; 3775 cf::cleanup "db_env_open(db): $@" if $@;
3559 }; 3776 };
3560 } 3777 }
3561 3778
3562 $BDB_DEADLOCK_WATCHER = Event->timer ( 3779 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3563 after => 3,
3564 interval => 1,
3565 hard => 1,
3566 prio => 0,
3567 data => WF_AUTOCANCEL,
3568 cb => sub {
3569 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3780 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3570 },
3571 ); 3781 };
3572 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3782 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3573 after => 11,
3574 interval => 60,
3575 hard => 1,
3576 prio => 0,
3577 data => WF_AUTOCANCEL,
3578 cb => sub {
3579 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3783 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3580 },
3581 ); 3784 };
3582 $BDB_TRICKLE_WATCHER = Event->timer ( 3785 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3583 after => 5,
3584 interval => 10,
3585 hard => 1,
3586 prio => 0,
3587 data => WF_AUTOCANCEL,
3588 cb => sub {
3589 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3786 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3590 },
3591 ); 3787 };
3592} 3788}
3593 3789
3594{ 3790{
3791 # configure IO::AIO
3792
3595 IO::AIO::min_parallel 8; 3793 IO::AIO::min_parallel 8;
3596
3597 undef $Coro::AIO::WATCHER;
3598 IO::AIO::max_poll_time $TICK * 0.1; 3794 IO::AIO::max_poll_time $TICK * 0.1;
3599 $AIO_POLL_WATCHER = Event->io ( 3795 $Coro::AIO::WATCHER->priority (1);
3600 reentrant => 0,
3601 data => WF_AUTOCANCEL,
3602 fd => IO::AIO::poll_fileno,
3603 poll => 'r',
3604 prio => 6,
3605 cb => \&IO::AIO::poll_cb,
3606 );
3607} 3796}
3608 3797
3609my $_log_backtrace; 3798my $_log_backtrace;
3610 3799
3611sub _log_backtrace { 3800sub _log_backtrace {
… …
3615 3804
3616 # limit the # of concurrent backtraces 3805 # limit the # of concurrent backtraces
3617 if ($_log_backtrace < 2) { 3806 if ($_log_backtrace < 2) {
3618 ++$_log_backtrace; 3807 ++$_log_backtrace;
3619 async { 3808 async {
3809 $Coro::current->{desc} = "abt $msg";
3810
3620 my @bt = fork_call { 3811 my @bt = fork_call {
3621 @addr = map { sprintf "%x", $_ } @addr; 3812 @addr = map { sprintf "%x", $_ } @addr;
3622 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3813 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3623 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3814 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3624 or die "addr2line: $!"; 3815 or die "addr2line: $!";

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines