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.365 by root, Tue Sep 11 13:27:56 2007 UTC vs.
Revision 1.428 by root, Thu May 1 06:33:19 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;
101our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER; 102our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER; 103our $BDB_TRICKLE_WATCHER;
87our $DB_ENV; 104our $DB_ENV;
88 105
89our %CFG; 106our %CFG;
90 107
91our $UPTIME; $UPTIME ||= time; 108our $UPTIME; $UPTIME ||= time;
92our $RUNTIME; 109our $RUNTIME;
110our $NOW;
93 111
94our (%PLAYER, %PLAYER_LOADING); # all users 112our (%PLAYER, %PLAYER_LOADING); # all users
95our (%MAP, %MAP_LOADING ); # all maps 113our (%MAP, %MAP_LOADING ); # all maps
96our $LINK_MAP; # the special {link} map, which is always available 114our $LINK_MAP; # the special {link} map, which is always available
97 115
98# 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 ∕
99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
100 118
101our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
102our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
103our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
104 123
105binmode STDOUT; 124binmode STDOUT;
106binmode STDERR; 125binmode STDERR;
107 126
108# read virtual server time, if available 127# read virtual server time, if available
161 180
162The raw value load value from the last tick. 181The raw value load value from the last tick.
163 182
164=item %cf::CFG 183=item %cf::CFG
165 184
166Configuration for the server, loaded from C</etc/crossfire/config>, or 185Configuration for the server, loaded from C</etc/deliantra-server/config>, or
167from wherever your confdir points to. 186from wherever your confdir points to.
168 187
169=item cf::wait_for_tick, cf::wait_for_tick_begin 188=item cf::wait_for_tick, cf::wait_for_tick_begin
170 189
171These 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
192 $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;
193 212
194 LOG llevError, $msg; 213 LOG llevError, $msg;
195 }; 214 };
196} 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#?
197 231
198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
199@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
200@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
201@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
214)) { 248)) {
215 no strict 'refs'; 249 no strict 'refs';
216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
217} 251}
218 252
219$Event::DIED = sub { 253$EV::DIED = sub {
220 warn "error in event callback: @_"; 254 warn "error in event callback: @_";
221}; 255};
222 256
223############################################################################# 257#############################################################################
224 258
247 $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;
248 $d 282 $d
249 } || "[unable to dump $_[0]: '$@']"; 283 } || "[unable to dump $_[0]: '$@']";
250} 284}
251 285
252=item $ref = cf::from_json $json 286=item $ref = cf::decode_json $json
253 287
254Converts a JSON string into the corresponding perl data structure. 288Converts a JSON string into the corresponding perl data structure.
255 289
256=item $json = cf::to_json $ref 290=item $json = cf::encode_json $ref
257 291
258Converts a perl data structure into its JSON representation. 292Converts a perl data structure into its JSON representation.
259 293
260=cut 294=cut
261 295
262our $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
263 297
264sub to_json ($) { $json_coder->encode ($_[0]) } 298sub encode_json($) { $json_coder->encode ($_[0]) }
265sub from_json ($) { $json_coder->decode ($_[0]) } 299sub decode_json($) { $json_coder->decode ($_[0]) }
266 300
267=item cf::lock_wait $string 301=item cf::lock_wait $string
268 302
269Wait until the given lock is available. See cf::lock_acquire. 303Wait until the given lock is available. See cf::lock_acquire.
270 304
326 360
327 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
328} 362}
329 363
330sub freeze_mainloop { 364sub freeze_mainloop {
331 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
332 366
333 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
334 $TICK_WATCHER->start; 368}
335 }; 369
336 $TICK_WATCHER->stop; 370=item cf::periodic $interval, $cb
337 $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
338} 383}
339 384
340=item cf::get_slot $time[, $priority[, $name]] 385=item cf::get_slot $time[, $priority[, $name]]
341 386
342Allocate $time seconds of blocking CPU time at priority C<$priority>: 387Allocate $time seconds of blocking CPU time at priority C<$priority>:
353our @SLOT_QUEUE; 398our @SLOT_QUEUE;
354our $SLOT_QUEUE; 399our $SLOT_QUEUE;
355 400
356$SLOT_QUEUE->cancel if $SLOT_QUEUE; 401$SLOT_QUEUE->cancel if $SLOT_QUEUE;
357$SLOT_QUEUE = Coro::async { 402$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager");
404
358 my $signal = new Coro::Signal; 405 my $signal = new Coro::Signal;
359 406
360 while () { 407 while () {
361 next_job: 408 next_job:
362 my $avail = cf::till_tick; 409 my $avail = cf::till_tick;
370 } 417 }
371 } 418 }
372 } 419 }
373 420
374 if (@SLOT_QUEUE) { 421 if (@SLOT_QUEUE) {
375 # 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
376 push @cf::WAIT_FOR_TICK, $signal; 423 push @cf::WAIT_FOR_TICK, $signal;
377 $signal->wait; 424 $signal->wait;
378 } else { 425 } else {
379 Coro::schedule; 426 Coro::schedule;
380 } 427 }
381 } 428 }
382}; 429};
383 430
384sub get_slot($;$$) { 431sub get_slot($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main;
433
385 my ($time, $pri, $name) = @_; 434 my ($time, $pri, $name) = @_;
386 435
387 $time = $TICK * .6 if $time > $TICK * .6; 436 $time = $TICK * .6 if $time > $TICK * .6;
388 my $sig = new Coro::Signal; 437 my $sig = new Coro::Signal;
389 438
403 452
404BEGIN { *async = \&Coro::async_pool } 453BEGIN { *async = \&Coro::async_pool }
405 454
406=item cf::sync_job { BLOCK } 455=item cf::sync_job { BLOCK }
407 456
408The design of Crossfire TRT requires that the main coroutine ($Coro::main) 457The design of Deliantra requires that the main coroutine ($Coro::main)
409is always able to handle events or runnable, as Crossfire TRT is only 458is always able to handle events or runnable, as Deliantra is only
410partly 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
411acceptable. 460acceptable.
412 461
413If 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
414the given BLOCK in another coroutine while waiting for the result. The 463the given BLOCK in another coroutine while waiting for the result. The
419 468
420sub sync_job(&) { 469sub sync_job(&) {
421 my ($job) = @_; 470 my ($job) = @_;
422 471
423 if ($Coro::current == $Coro::main) { 472 if ($Coro::current == $Coro::main) {
424 my $time = Event::time; 473 my $time = EV::time;
425 474
426 # this is the main coro, too bad, we have to block 475 # this is the main coro, too bad, we have to block
427 # till the operation succeeds, freezing the server :/ 476 # till the operation succeeds, freezing the server :/
428 477
429 # TODO: use suspend/resume instead 478 LOG llevError, Carp::longmess "sync job";#d#
430 # (but this is cancel-safe) 479
431 my $freeze_guard = freeze_mainloop; 480 my $freeze_guard = freeze_mainloop;
432 481
433 my $busy = 1; 482 my $busy = 1;
434 my @res; 483 my @res;
435 484
436 (async { 485 (async {
486 $Coro::current->desc ("sync job coro");
437 @res = eval { $job->() }; 487 @res = eval { $job->() };
438 warn $@ if $@; 488 warn $@ if $@;
439 undef $busy; 489 undef $busy;
440 })->prio (Coro::PRIO_MAX); 490 })->prio (Coro::PRIO_MAX);
441 491
442 while ($busy) { 492 while ($busy) {
443 Coro::cede or Event::one_event; 493 if (Coro::nready) {
494 Coro::cede_notself;
495 } else {
496 EV::loop EV::LOOP_ONESHOT;
444 } 497 }
498 }
445 499
446 $time = Event::time - $time; 500 my $time = EV::time - $time;
447 501
448 LOG llevError | logBacktrace, Carp::longmess "long sync job"
449 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
450
451 $tick_start += $time; # do not account sync jobs to server load 502 $TICK_START += $time; # do not account sync jobs to server load
452 503
453 wantarray ? @res : $res[0] 504 wantarray ? @res : $res[0]
454 } else { 505 } else {
455 # we are in another coroutine, how wonderful, everything just works 506 # we are in another coroutine, how wonderful, everything just works
456 507
481=item fork_call { }, $args 532=item fork_call { }, $args
482 533
483Executes the given code block with the given arguments in a seperate 534Executes the given code block with the given arguments in a seperate
484process, returning the results. Everything must be serialisable with 535process, returning the results. Everything must be serialisable with
485Coro::Storable. May, of course, block. Note that the executed sub may 536Coro::Storable. May, of course, block. Note that the executed sub may
486never block itself or use any form of Event handling. 537never block itself or use any form of event handling.
487 538
488=cut 539=cut
489 540
490sub fork_call(&@) { 541sub fork_call(&@) {
491 my ($cb, @args) = @_; 542 my ($cb, @args) = @_;
498 reset_signals; 549 reset_signals;
499 &$cb 550 &$cb
500 }, @args; 551 }, @args;
501 552
502 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
503} 581}
504 582
505=item $value = cf::db_get $family => $key 583=item $value = cf::db_get $family => $key
506 584
507Returns a single value from the environment database. 585Returns a single value from the environment database.
652attach callbacks/event handlers (a collection of which is called an "attachment") 730attach callbacks/event handlers (a collection of which is called an "attachment")
653to it. All such attachable objects support the following methods. 731to it. All such attachable objects support the following methods.
654 732
655In 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>
656C<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
657Crossfire TRT). 735Deliantra).
658 736
659=over 4 737=over 4
660 738
661=item $attachable->attach ($attachment, key => $value...) 739=item $attachable->attach ($attachment, key => $value...)
662 740
944 } 1022 }
945 1023
946 0 1024 0
947} 1025}
948 1026
949=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
950 1028
951=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1029=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
952 1030
953Generate an object-specific event with the given arguments. 1031Generate an object-specific event with the given arguments.
954 1032
960 1038
961=cut 1039=cut
962 1040
963############################################################################# 1041#############################################################################
964# object support 1042# object support
965#
966 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#
967sub _can_merge { 1077sub _can_merge {
968 my ($ob1, $ob2) = @_; 1078 my ($ob1, $ob2) = @_;
969 1079
970 local $Storable::canonical = 1; 1080 ++$SLOW_MERGES;#d#
971 my $fob1 = Storable::freeze $ob1;
972 my $fob2 = Storable::freeze $ob2;
973 1081
974 $fob1 eq $fob2 1082 # we do the slow way here
1083 return _object_equal $ob1, $ob2
975} 1084}
976 1085
977sub reattach { 1086sub reattach {
978 # basically do the same as instantiate, without calling instantiate 1087 # basically do the same as instantiate, without calling instantiate
979 my ($obj) = @_; 1088 my ($obj) = @_;
1001cf::attachable->attach ( 1110cf::attachable->attach (
1002 prio => -1000000, 1111 prio => -1000000,
1003 on_instantiate => sub { 1112 on_instantiate => sub {
1004 my ($obj, $data) = @_; 1113 my ($obj, $data) = @_;
1005 1114
1006 $data = from_json $data; 1115 $data = decode_json $data;
1007 1116
1008 for (@$data) { 1117 for (@$data) {
1009 my ($name, $args) = @$_; 1118 my ($name, $args) = @$_;
1010 1119
1011 $obj->attach ($name, %{$args || {} }); 1120 $obj->attach ($name, %{$args || {} });
1024 }, 1133 },
1025); 1134);
1026 1135
1027sub object_freezer_save { 1136sub object_freezer_save {
1028 my ($filename, $rdata, $objs) = @_; 1137 my ($filename, $rdata, $objs) = @_;
1029
1030 my $guard = cf::lock_acquire "io";
1031 1138
1032 sync_job { 1139 sync_job {
1033 if (length $$rdata) { 1140 if (length $$rdata) {
1034 utf8::decode (my $decname = $filename); 1141 utf8::decode (my $decname = $filename);
1035 warn sprintf "saving %s (%d,%d)\n", 1142 warn sprintf "saving %s (%d,%d)\n",
1036 $decname, length $$rdata, scalar @$objs; 1143 $decname, length $$rdata, scalar @$objs;
1037 1144
1038 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1039 chmod SAVE_MODE, $fh; 1146 aio_chmod $fh, SAVE_MODE;
1040 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1041 aio_fsync $fh if $cf::USE_FSYNC; 1148 aio_fsync $fh if $cf::USE_FSYNC;
1042 close $fh; 1149 aio_close $fh;
1043 1150
1044 if (@$objs) { 1151 if (@$objs) {
1045 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) {
1046 chmod SAVE_MODE, $fh; 1153 aio_chmod $fh, SAVE_MODE;
1047 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1048 aio_write $fh, 0, (length $data), $data, 0; 1155 aio_write $fh, 0, (length $data), $data, 0;
1049 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
1050 close $fh; 1157 aio_close $fh;
1051 aio_rename "$filename.pst~", "$filename.pst"; 1158 aio_rename "$filename.pst~", "$filename.pst";
1052 } 1159 }
1053 } else { 1160 } else {
1054 aio_unlink "$filename.pst"; 1161 aio_unlink "$filename.pst";
1055 } 1162 }
1061 } else { 1168 } else {
1062 aio_unlink $filename; 1169 aio_unlink $filename;
1063 aio_unlink "$filename.pst"; 1170 aio_unlink "$filename.pst";
1064 } 1171 }
1065 }; 1172 };
1066
1067 undef $guard;
1068} 1173}
1069 1174
1070sub object_freezer_as_string { 1175sub object_freezer_as_string {
1071 my ($rdata, $objs) = @_; 1176 my ($rdata, $objs) = @_;
1072 1177
1077 1182
1078sub object_thawer_load { 1183sub object_thawer_load {
1079 my ($filename) = @_; 1184 my ($filename) = @_;
1080 1185
1081 my ($data, $av); 1186 my ($data, $av);
1082
1083 my $guard = cf::lock_acquire "io";
1084 1187
1085 (aio_load $filename, $data) >= 0 1188 (aio_load $filename, $data) >= 0
1086 or return; 1189 or return;
1087 1190
1088 unless (aio_stat "$filename.pst") { 1191 unless (aio_stat "$filename.pst") {
1089 (aio_load "$filename.pst", $av) >= 0 1192 (aio_load "$filename.pst", $av) >= 0
1090 or return; 1193 or return;
1091 1194
1092 undef $guard;
1093 $av = eval { (Storable::thaw $av)->{objs} }; 1195 my $st = eval { Coro::Storable::thaw $av };
1196 $av = $st->{objs};
1094 } 1197 }
1095 1198
1096 utf8::decode (my $decname = $filename); 1199 utf8::decode (my $decname = $filename);
1097 warn sprintf "loading %s (%d,%d)\n", 1200 warn sprintf "loading %s (%d,%d)\n",
1098 $decname, length $data, scalar @{$av || []}; 1201 $decname, length $data, scalar @{$av || []};
1254 my $msg = $@ ? "$v->{path}: $@\n" 1357 my $msg = $@ ? "$v->{path}: $@\n"
1255 : "$v->{base}: extension inactive.\n"; 1358 : "$v->{base}: extension inactive.\n";
1256 1359
1257 if (exists $v->{meta}{mandatory}) { 1360 if (exists $v->{meta}{mandatory}) {
1258 warn $msg; 1361 warn $msg;
1259 warn "mandatory extension failed to load, exiting.\n"; 1362 cf::cleanup "mandatory extension failed to load, exiting.";
1260 exit 1;
1261 } 1363 }
1262 1364
1263 warn $msg; 1365 warn $msg;
1264 } 1366 }
1265 1367
1352 aio_unlink +(playerdir $login) . "/$login.pl"; 1454 aio_unlink +(playerdir $login) . "/$login.pl";
1353 1455
1354 my $f = new_from_file cf::object::thawer path $login 1456 my $f = new_from_file cf::object::thawer path $login
1355 or return; 1457 or return;
1356 1458
1357 $f->next;
1358 my $pl = cf::player::load_pl $f 1459 my $pl = cf::player::load_pl $f
1359 or return; 1460 or return;
1461
1360 local $cf::PLAYER_LOADING{$login} = $pl; 1462 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs; 1463 $f->resolve_delayed_derefs;
1362 $cf::PLAYER{$login} = $pl 1464 $cf::PLAYER{$login} = $pl
1363 } 1465 }
1364 } 1466 }
1374 1476
1375 return if $pl->{deny_save}; 1477 return if $pl->{deny_save};
1376 1478
1377 aio_mkdir playerdir $pl, 0770; 1479 aio_mkdir playerdir $pl, 0770;
1378 $pl->{last_save} = $cf::RUNTIME; 1480 $pl->{last_save} = $cf::RUNTIME;
1481
1482 cf::get_slot 0.01;
1379 1483
1380 $pl->save_pl ($path); 1484 $pl->save_pl ($path);
1381 cf::cede_to_tick; 1485 cf::cede_to_tick;
1382} 1486}
1383 1487
1467 1571
1468 for my $login (@$dirs) { 1572 for my $login (@$dirs) {
1469 my $path = path $login; 1573 my $path = path $login;
1470 1574
1471 # a .pst is a dead give-away for a valid player 1575 # a .pst is a dead give-away for a valid player
1472 unless (-e "$path.pst") { 1576 # if no pst file found, open and chekc for blocked users
1577 if (aio_stat "$path.pst") {
1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1578 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1474 aio_read $fh, 0, 512, my $buf, 0 or next; 1579 aio_read $fh, 0, 512, my $buf, 0 or next;
1475 $buf !~ /^password -------------$/m or next; # official not-valid tag 1580 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 } 1581 }
1477 1582
1514 1619
1515Expand crossfire pod fragments into protocol xml. 1620Expand crossfire pod fragments into protocol xml.
1516 1621
1517=cut 1622=cut
1518 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
1519sub expand_cfpod { 1635sub expand_cfpod {
1520 ((my $self), (local $_)) = @_; 1636 my ($self, $pod) = @_;
1521 1637
1522 # escape & and < 1638 my $xml;
1523 s/&/&amp;/g;
1524 s/(?<![BIUGHT])</&lt;/g;
1525 1639
1526 # this is buggy, it needs to properly take care of nested <'s 1640 while () {
1641 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1642 $group = $1;
1527 1643
1528 1 while 1644 $group =~ s/&/&amp;/g;
1529 # replace B<>, I<>, U<> etc. 1645 $group =~ s/</&lt;/g;
1530 s/B<([^\>]*)>/<b>$1<\/b>/ 1646
1531 || s/I<([^\>]*)>/<i>$1<\/i>/ 1647 $xml .= $group;
1532 || s/U<([^\>]*)>/<u>$1<\/u>/ 1648 } elsif ($pod =~ m%\G
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1649 ([BCGHITU])
1534 # replace G<male|female> tags 1650 <
1535 || s{G<([^>|]*)\|([^>]*)>}{ 1651 (?:
1536 $self->gender ? $2 : $1 1652 ([^<>]*) (?{ $group = $^N })
1537 }ge 1653 | < $interior >
1538 # replace H<hint text> 1654 )
1539 || s{H<([^\>]*)>} 1655 >
1656 %gcsx
1540 { 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") {
1541 ("<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>",
1542 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1676 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1543 "") 1677 "")
1544 [$self->{hintmode}] 1678 [$self->{hintmode}];
1679 } else {
1680 $xml .= "error processing '$code($data)' directive";
1545 }ge; 1681 }
1682 } else {
1683 if ($pod =~ /\G(.+)/) {
1684 warn "parse error while expanding $pod (at $1)";
1685 }
1686 last;
1687 }
1688 }
1546 1689
1690 for ($xml) {
1547 # create single paragraphs (very hackish) 1691 # create single paragraphs (very hackish)
1548 s/(?<=\S)\n(?=\w)/ /g; 1692 s/(?<=\S)\n(?=\w)/ /g;
1549 1693
1550 # compress some whitespace 1694 # compress some whitespace
1551 s/\s+\n/\n/g; # ws line-ends 1695 s/\s+\n/\n/g; # ws line-ends
1552 s/\n\n+/\n/g; # double lines 1696 s/\n\n+/\n/g; # double lines
1553 s/^\n+//; # beginning lines 1697 s/^\n+//; # beginning lines
1554 s/\n+$//; # ending lines 1698 s/\n+$//; # ending lines
1699 }
1555 1700
1556 $_ 1701 $xml
1557} 1702}
1703
1704no re 'eval';
1558 1705
1559sub hintmode { 1706sub hintmode {
1560 $_[0]{hintmode} = $_[1] if @_ > 1; 1707 $_[0]{hintmode} = $_[1] if @_ > 1;
1561 $_[0]{hintmode} 1708 $_[0]{hintmode}
1562} 1709}
1634our $MAX_RESET = 3600; 1781our $MAX_RESET = 3600;
1635our $DEFAULT_RESET = 3000; 1782our $DEFAULT_RESET = 3000;
1636 1783
1637sub generate_random_map { 1784sub generate_random_map {
1638 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
1639 # mit "rum" bekleckern, nicht 1789 # mit "rum" bekleckern, nicht
1640 $self->_create_random_map ( 1790 $self->_create_random_map (
1641 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1791 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1642 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1792 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1643 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1793 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1765 1915
1766# the temporary/swap location 1916# the temporary/swap location
1767sub save_path { 1917sub save_path {
1768 my ($self) = @_; 1918 my ($self) = @_;
1769 1919
1770 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1920 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1771 "$TMPDIR/$path.map" 1921 "$TMPDIR/$path.map"
1772} 1922}
1773 1923
1774# the unique path, undef == no special unique path 1924# the unique path, undef == no special unique path
1775sub uniq_path { 1925sub uniq_path {
1776 my ($self) = @_; 1926 my ($self) = @_;
1777 1927
1778 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1779 "$UNIQUEDIR/$path" 1929 "$UNIQUEDIR/$path"
1780} 1930}
1781 1931
1782# and all this just because we cannot iterate over 1932# and all this just because we cannot iterate over
1783# all maps in C++... 1933# all maps in C++...
1969 } 2119 }
1970 2120
1971 $self->{last_save} = $cf::RUNTIME; 2121 $self->{last_save} = $cf::RUNTIME;
1972 $self->last_access ($cf::RUNTIME); 2122 $self->last_access ($cf::RUNTIME);
1973 2123
1974 $self->in_memory (cf::MAP_IN_MEMORY); 2124 $self->in_memory (cf::MAP_ACTIVE);
1975 } 2125 }
1976 2126
1977 $self->post_load; 2127 $self->post_load;
1978} 2128}
1979 2129
2037 my ($path, $origin, $load) = @_; 2187 my ($path, $origin, $load) = @_;
2038 2188
2039 $path = normalise $path, $origin && $origin->{path}; 2189 $path = normalise $path, $origin && $origin->{path};
2040 2190
2041 if (my $map = $cf::MAP{$path}) { 2191 if (my $map = $cf::MAP{$path}) {
2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2192 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2043 } 2193 }
2044 2194
2045 $MAP_PREFETCH{$path} |= $load; 2195 $MAP_PREFETCH{$path} |= $load;
2046 2196
2047 $MAP_PREFETCHER ||= cf::async { 2197 $MAP_PREFETCHER ||= cf::async {
2198 $Coro::current->{desc} = "map prefetcher";
2199
2048 while (%MAP_PREFETCH) { 2200 while (%MAP_PREFETCH) {
2049 while (my ($k, $v) = each %MAP_PREFETCH) { 2201 while (my ($k, $v) = each %MAP_PREFETCH) {
2050 if (my $map = find $k) { 2202 if (my $map = find $k) {
2051 $map->load if $v; 2203 $map->load if $v;
2052 } 2204 }
2078 return if $self->{deny_save}; 2230 return if $self->{deny_save};
2079 2231
2080 local $self->{last_access} = $self->last_access;#d# 2232 local $self->{last_access} = $self->last_access;#d#
2081 2233
2082 cf::async { 2234 cf::async {
2235 $Coro::current->{desc} = "map player save";
2083 $_->contr->save for $self->players; 2236 $_->contr->save for $self->players;
2084 }; 2237 };
2238
2239 cf::get_slot 0.02;
2085 2240
2086 if ($uniq) { 2241 if ($uniq) {
2087 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2242 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2088 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2243 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2089 } else { 2244 } else {
2098 $self->save; 2253 $self->save;
2099 2254
2100 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2255 my $lock = cf::lock_acquire "map_data:$self->{path}";
2101 2256
2102 return if $self->players; 2257 return if $self->players;
2103 return if $self->in_memory != cf::MAP_IN_MEMORY; 2258 return if $self->in_memory != cf::MAP_ACTIVE;
2104 return if $self->{deny_save}; 2259 return if $self->{deny_save};
2105 2260
2106 $self->in_memory (cf::MAP_SWAPPED); 2261 $self->in_memory (cf::MAP_SWAPPED);
2107 2262
2108 $self->deactivate; 2263 $self->deactivate;
2226 2381
2227sub unique_maps() { 2382sub unique_maps() {
2228 [ 2383 [
2229 map { 2384 map {
2230 utf8::decode $_; 2385 utf8::decode $_;
2231 /\.map$/ 2386 s/\.map$//; # TODO future compatibility hack
2387 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2388 ? ()
2232 ? normalise $_ 2389 : normalise $_
2233 : ()
2234 } @{ aio_readdir $UNIQUEDIR or [] } 2390 } @{ aio_readdir $UNIQUEDIR or [] }
2235 ] 2391 ]
2236} 2392}
2237 2393
2238package cf;
2239
2240=back 2394=back
2241 2395
2242=head3 cf::object 2396=head3 cf::object
2243 2397
2244=cut 2398=cut
2247 2401
2248=over 4 2402=over 4
2249 2403
2250=item $ob->inv_recursive 2404=item $ob->inv_recursive
2251 2405
2252Returns 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.
2253 2408
2254=cut 2409=cut
2255 2410
2256sub inv_recursive_; 2411sub inv_recursive_;
2257sub inv_recursive_ { 2412sub inv_recursive_ {
2262 inv_recursive_ inv $_[0] 2417 inv_recursive_ inv $_[0]
2263} 2418}
2264 2419
2265=item $ref = $ob->ref 2420=item $ref = $ob->ref
2266 2421
2267creates 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.
2268 2423
2269=item $ob = cf::object::deref ($refstring) 2424=item $ob = cf::object::deref ($refstring)
2270 2425
2271returns 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,
2272even if the object actually exists. May block. 2427even if the object actually exists. May block.
2274=cut 2429=cut
2275 2430
2276sub deref { 2431sub deref {
2277 my ($ref) = @_; 2432 my ($ref) = @_;
2278 2433
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2434 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2); 2435 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2436 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return; 2437 or return;
2286 $pl->ob->uuid eq $uuid 2438 $pl->ob->uuid eq $uuid
2287 or return; 2439 or return;
2307can be C<undef>. Does the right thing when the player is currently in a 2459can be C<undef>. Does the right thing when the player is currently in a
2308dialogue with the given NPC character. 2460dialogue with the given NPC character.
2309 2461
2310=cut 2462=cut
2311 2463
2464our $SAY_CHANNEL = {
2465 id => "say",
2466 title => "Map",
2467 reply => "say ",
2468 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2469};
2470
2471our $CHAT_CHANNEL = {
2472 id => "chat",
2473 title => "Chat",
2474 reply => "chat ",
2475 tooltip => "Player chat and shouts, global to the server.",
2476};
2477
2312# rough implementation of a future "reply" method that works 2478# rough implementation of a future "reply" method that works
2313# with dialog boxes. 2479# with dialog boxes.
2314#TODO: the first argument must go, split into a $npc->reply_to ( method 2480#TODO: the first argument must go, split into a $npc->reply_to ( method
2315sub cf::object::player::reply($$$;$) { 2481sub cf::object::player::reply($$$;$) {
2316 my ($self, $npc, $msg, $flags) = @_; 2482 my ($self, $npc, $msg, $flags) = @_;
2327 my $dialog = $pl->{npc_dialog}; 2493 my $dialog = $pl->{npc_dialog};
2328 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2494 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2329 2495
2330 } else { 2496 } else {
2331 $msg = $npc->name . " says: $msg" if $npc; 2497 $msg = $npc->name . " says: $msg" if $npc;
2332 $self->message ($msg, $flags); 2498 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2333 } 2499 }
2334 } 2500 }
2335} 2501}
2336 2502
2337=item $object->send_msg ($channel, $msg, $color, [extra...]) 2503=item $object->send_msg ($channel, $msg, $color, [extra...])
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2624 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459 2625
2460 $self->enter_link; 2626 $self->enter_link;
2461 2627
2462 (async { 2628 (async {
2629 $Coro::current->{desc} = "player::goto $path $x $y";
2630
2463 # *tag paths override both path and x|y 2631 # *tag paths override both path and x|y
2464 if ($path =~ /^\*(.*)$/) { 2632 if ($path =~ /^\*(.*)$/) {
2465 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2633 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466 my $ob = $obs[rand @obs]; 2634 my $ob = $obs[rand @obs];
2635
2636 # see if we actually can go there
2637 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2638 $ob = $obs[rand @obs];
2639 } else {
2640 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2641 }
2642 # else put us there anyways for now #d#
2643
2467 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y); 2644 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2645 } else {
2646 ($path, $x, $y) = (undef, undef, undef);
2468 } 2647 }
2469 } 2648 }
2470 2649
2471 my $map = eval { 2650 my $map = eval {
2472 my $map = cf::map::find $path; 2651 my $map = defined $path ? cf::map::find $path : undef;
2473 2652
2474 if ($map) { 2653 if ($map) {
2475 $map = $map->customise_for ($self); 2654 $map = $map->customise_for ($self);
2476 $map = $check->($map) if $check && $map; 2655 $map = $check->($map) if $check && $map;
2477 } else { 2656 } else {
2478 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2657 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2479 } 2658 }
2480 2659
2481 $map 2660 $map
2482 }; 2661 };
2483 2662
2536 $rmp->{origin_y} = $exit->y; 2715 $rmp->{origin_y} = $exit->y;
2537 } 2716 }
2538 2717
2539 $rmp->{random_seed} ||= $exit->random_seed; 2718 $rmp->{random_seed} ||= $exit->random_seed;
2540 2719
2541 my $data = cf::to_json $rmp; 2720 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2542 my $md5 = Digest::MD5::md5_hex $data; 2721 my $md5 = Digest::MD5::md5_hex $data;
2543 my $meta = "$RANDOMDIR/$md5.meta"; 2722 my $meta = "$RANDOMDIR/$md5.meta";
2544 2723
2545 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2724 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2546 aio_write $fh, 0, (length $data), $data, 0; 2725 aio_write $fh, 0, (length $data), $data, 0;
2573 # if exit is damned, update players death & WoR home-position 2752 # if exit is damned, update players death & WoR home-position
2574 $self->contr->savebed ($slaying, $hp, $sp) 2753 $self->contr->savebed ($slaying, $hp, $sp)
2575 if $exit->flag (FLAG_DAMNED); 2754 if $exit->flag (FLAG_DAMNED);
2576 2755
2577 (async { 2756 (async {
2757 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2758
2578 $self->deactivate_recursive; # just to be sure 2759 $self->deactivate_recursive; # just to be sure
2579 unless (eval { 2760 unless (eval {
2580 $self->goto ($slaying, $hp, $sp); 2761 $self->goto ($slaying, $hp, $sp);
2581 2762
2582 1; 2763 1;
2617the message, with C<log> being the default. If C<$color> is negative, suppress 2798the message, with C<log> being the default. If C<$color> is negative, suppress
2618the message unless the client supports the msg packet. 2799the message unless the client supports the msg packet.
2619 2800
2620=cut 2801=cut
2621 2802
2803# non-persistent channels (usually the info channel)
2622our %CHANNEL = ( 2804our %CHANNEL = (
2623 "c/identify" => { 2805 "c/identify" => {
2624 id => "identify", 2806 id => "infobox",
2625 title => "Identify", 2807 title => "Identify",
2626 reply => undef, 2808 reply => undef,
2627 tooltip => "Items recently identified", 2809 tooltip => "Items recently identified",
2628 }, 2810 },
2629 "c/examine" => { 2811 "c/examine" => {
2630 id => "examine", 2812 id => "infobox",
2631 title => "Examine", 2813 title => "Examine",
2632 reply => undef, 2814 reply => undef,
2633 tooltip => "Signs and other items you examined", 2815 tooltip => "Signs and other items you examined",
2634 }, 2816 },
2817 "c/book" => {
2818 id => "infobox",
2819 title => "Book",
2820 reply => undef,
2821 tooltip => "The contents of a note or book",
2822 },
2823 "c/lookat" => {
2824 id => "infobox",
2825 title => "Look",
2826 reply => undef,
2827 tooltip => "What you saw there",
2828 },
2829 "c/who" => {
2830 id => "infobox",
2831 title => "Players",
2832 reply => undef,
2833 tooltip => "Shows players who are currently online",
2834 },
2835 "c/body" => {
2836 id => "infobox",
2837 title => "Body Parts",
2838 reply => undef,
2839 tooltip => "Shows which body parts you posess and are available",
2840 },
2841 "c/uptime" => {
2842 id => "infobox",
2843 title => "Uptime",
2844 reply => undef,
2845 tooltip => "How long the server has been running since last restart",
2846 },
2847 "c/mapinfo" => {
2848 id => "infobox",
2849 title => "Map Info",
2850 reply => undef,
2851 tooltip => "Information related to the maps",
2852 },
2853 "c/party" => {
2854 id => "party",
2855 title => "Party",
2856 reply => "gsay ",
2857 tooltip => "Messages and chat related to your party",
2858 },
2635); 2859);
2636 2860
2637sub cf::client::send_msg { 2861sub cf::client::send_msg {
2638 my ($self, $channel, $msg, $color, @extra) = @_; 2862 my ($self, $channel, $msg, $color, @extra) = @_;
2639 2863
2640 $msg = $self->pl->expand_cfpod ($msg); 2864 $msg = $self->pl->expand_cfpod ($msg);
2641 2865
2642 $color &= cf::NDI_CLIENT_MASK; # just in case... 2866 $color &= cf::NDI_CLIENT_MASK; # just in case...
2643 2867
2644 # check predefined channels, for the benefit of C 2868 # check predefined channels, for the benefit of C
2645 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2869 if ($CHANNEL{$channel}) {
2870 $channel = $CHANNEL{$channel};
2646 2871
2872 $self->ext_msg (channel_info => $channel)
2873 if $self->can_msg;
2874
2875 $channel = $channel->{id};
2876
2647 if (ref $channel) { 2877 } elsif (ref $channel) {
2648 # send meta info to client, if not yet sent 2878 # send meta info to client, if not yet sent
2649 unless (exists $self->{channel}{$channel->{id}}) { 2879 unless (exists $self->{channel}{$channel->{id}}) {
2650 $self->{channel}{$channel->{id}} = $channel; 2880 $self->{channel}{$channel->{id}} = $channel;
2651 $self->ext_msg (channel_info => $channel) 2881 $self->ext_msg (channel_info => $channel)
2652 if $self->can_msg; 2882 if $self->can_msg;
2869=pod 3099=pod
2870 3100
2871The following functions and methods are available within a safe environment: 3101The following functions and methods are available within a safe environment:
2872 3102
2873 cf::object 3103 cf::object
2874 contr pay_amount pay_player map x y force_find force_add 3104 contr pay_amount pay_player map x y force_find force_add destroy
2875 insert remove name archname title slaying race decrease_ob_nr 3105 insert remove name archname title slaying race decrease split
2876 3106
2877 cf::object::player 3107 cf::object::player
2878 player 3108 player
2879 3109
2880 cf::player 3110 cf::player
2886=cut 3116=cut
2887 3117
2888for ( 3118for (
2889 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3119 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2890 insert remove inv name archname title slaying race 3120 insert remove inv name archname title slaying race
2891 decrease_ob_nr)], 3121 decrease split destroy)],
2892 ["cf::object::player" => qw(player)], 3122 ["cf::object::player" => qw(player)],
2893 ["cf::player" => qw(peaceful)], 3123 ["cf::player" => qw(peaceful)],
2894 ["cf::map" => qw(trigger)], 3124 ["cf::map" => qw(trigger)],
2895) { 3125) {
2896 no strict 'refs'; 3126 no strict 'refs';
3001 { 3231 {
3002 my $faces = $facedata->{faceinfo}; 3232 my $faces = $facedata->{faceinfo};
3003 3233
3004 while (my ($face, $info) = each %$faces) { 3234 while (my ($face, $info) = each %$faces) {
3005 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3235 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3236
3006 cf::face::set_visibility $idx, $info->{visibility}; 3237 cf::face::set_visibility $idx, $info->{visibility};
3007 cf::face::set_magicmap $idx, $info->{magicmap}; 3238 cf::face::set_magicmap $idx, $info->{magicmap};
3008 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3239 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3009 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3240 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3010 3241
3011 cf::cede_to_tick; 3242 cf::cede_to_tick;
3012 } 3243 }
3013 3244
3014 while (my ($face, $info) = each %$faces) { 3245 while (my ($face, $info) = each %$faces) {
3015 next unless $info->{smooth}; 3246 next unless $info->{smooth};
3247
3016 my $idx = cf::face::find $face 3248 my $idx = cf::face::find $face
3017 or next; 3249 or next;
3250
3018 if (my $smooth = cf::face::find $info->{smooth}) { 3251 if (my $smooth = cf::face::find $info->{smooth}) {
3019 cf::face::set_smooth $idx, $smooth; 3252 cf::face::set_smooth $idx, $smooth;
3020 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3253 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3021 } else { 3254 } else {
3022 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3255 warn "smooth face '$info->{smooth}' not found for face '$face'";
3040 { 3273 {
3041 # TODO: for gcfclient pleasure, we should give resources 3274 # TODO: for gcfclient pleasure, we should give resources
3042 # that gcfclient doesn't grok a >10000 face index. 3275 # that gcfclient doesn't grok a >10000 face index.
3043 my $res = $facedata->{resource}; 3276 my $res = $facedata->{resource};
3044 3277
3045 my $soundconf = delete $res->{"res/sound.conf"};
3046
3047 while (my ($name, $info) = each %$res) { 3278 while (my ($name, $info) = each %$res) {
3279 if (defined $info->{type}) {
3048 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3280 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3049 my $data; 3281 my $data;
3050 3282
3051 if ($info->{type} & 1) { 3283 if ($info->{type} & 1) {
3052 # prepend meta info 3284 # prepend meta info
3053 3285
3054 my $meta = $enc->encode ({ 3286 my $meta = $enc->encode ({
3055 name => $name, 3287 name => $name,
3056 %{ $info->{meta} || {} }, 3288 %{ $info->{meta} || {} },
3057 }); 3289 });
3058 3290
3059 $data = pack "(w/a*)*", $meta, $info->{data}; 3291 $data = pack "(w/a*)*", $meta, $info->{data};
3292 } else {
3293 $data = $info->{data};
3294 }
3295
3296 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3297 cf::face::set_type $idx, $info->{type};
3060 } else { 3298 } else {
3061 $data = $info->{data}; 3299 $RESOURCE{$name} = $info;
3062 } 3300 }
3063 3301
3064 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3065 cf::face::set_type $idx, $info->{type};
3066
3067 cf::cede_to_tick; 3302 cf::cede_to_tick;
3068 } 3303 }
3069
3070 if ($soundconf) {
3071 $soundconf = $enc->decode (delete $soundconf->{data});
3072
3073 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3074 my $sound = $soundconf->{compat}[$_]
3075 or next;
3076
3077 my $face = cf::face::find "sound/$sound->[1]";
3078 cf::sound::set $sound->[0] => $face;
3079 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3080 }
3081
3082 while (my ($k, $v) = each %{$soundconf->{event}}) {
3083 my $face = cf::face::find "sound/$v";
3084 cf::sound::set $k => $face;
3085 }
3086 }
3087 } 3304 }
3305
3306 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3088 3307
3089 1 3308 1
3090} 3309}
3310
3311cf::global->attach (on_resource_update => sub {
3312 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3313 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3314
3315 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3316 my $sound = $soundconf->{compat}[$_]
3317 or next;
3318
3319 my $face = cf::face::find "sound/$sound->[1]";
3320 cf::sound::set $sound->[0] => $face;
3321 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3322 }
3323
3324 while (my ($k, $v) = each %{$soundconf->{event}}) {
3325 my $face = cf::face::find "sound/$v";
3326 cf::sound::set $k => $face;
3327 }
3328 }
3329});
3091 3330
3092register_exticmd fx_want => sub { 3331register_exticmd fx_want => sub {
3093 my ($ns, $want) = @_; 3332 my ($ns, $want) = @_;
3094 3333
3095 while (my ($k, $v) = each %$want) { 3334 while (my ($k, $v) = each %$want) {
3096 $ns->fx_want ($k, $v); 3335 $ns->fx_want ($k, $v);
3097 } 3336 }
3098}; 3337};
3338
3339sub load_resource_file($) {
3340 my $guard = lock_acquire "load_resource_file";
3341
3342 my $status = load_resource_file_ $_[0];
3343 get_slot 0.1, 100;
3344 cf::arch::commit_load;
3345
3346 $status
3347}
3099 3348
3100sub reload_regions { 3349sub reload_regions {
3101 # HACK to clear player env face cache, we need some signal framework 3350 # HACK to clear player env face cache, we need some signal framework
3102 # for this (global event?) 3351 # for this (global event?)
3103 %ext::player_env::MUSIC_FACE_CACHE = (); 3352 %ext::player_env::MUSIC_FACE_CACHE = ();
3117} 3366}
3118 3367
3119sub reload_archetypes { 3368sub reload_archetypes {
3120 load_resource_file "$DATADIR/archetypes" 3369 load_resource_file "$DATADIR/archetypes"
3121 or die "unable to load archetypes\n"; 3370 or die "unable to load archetypes\n";
3122 #d# NEED to laod twice to resolve forward references
3123 # this really needs to be done in an extra post-pass
3124 # (which needs to be synchronous, so solve it differently)
3125 load_resource_file "$DATADIR/archetypes"
3126 or die "unable to load archetypes\n";
3127} 3371}
3128 3372
3129sub reload_treasures { 3373sub reload_treasures {
3130 load_resource_file "$DATADIR/treasures" 3374 load_resource_file "$DATADIR/treasures"
3131 or die "unable to load treasurelists\n"; 3375 or die "unable to load treasurelists\n";
3132} 3376}
3133 3377
3134sub reload_resources { 3378sub reload_resources {
3135 warn "reloading resource files...\n"; 3379 warn "reloading resource files...\n";
3136 3380
3381 reload_facedata;
3382 reload_archetypes;
3137 reload_regions; 3383 reload_regions;
3138 reload_facedata;
3139 #reload_archetypes;#d#
3140 reload_archetypes;
3141 reload_treasures; 3384 reload_treasures;
3142 3385
3143 warn "finished reloading resource files\n"; 3386 warn "finished reloading resource files\n";
3144} 3387}
3145 3388
3146sub init { 3389sub init {
3390 my $guard = freeze_mainloop;
3391
3147 reload_resources; 3392 reload_resources;
3148} 3393}
3149 3394
3150sub reload_config { 3395sub reload_config {
3151 open my $fh, "<:utf8", "$CONFDIR/config" 3396 open my $fh, "<:utf8", "$CONFDIR/config"
3152 or return; 3397 or return;
3153 3398
3154 local $/; 3399 local $/;
3155 *CFG = YAML::Syck::Load <$fh>; 3400 *CFG = YAML::Load <$fh>;
3156 3401
3157 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3402 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3158 3403
3159 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3404 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3160 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3405 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3171sub main { 3416sub main {
3172 # we must not ever block the main coroutine 3417 # we must not ever block the main coroutine
3173 local $Coro::idle = sub { 3418 local $Coro::idle = sub {
3174 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3419 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3175 (async { 3420 (async {
3176 Event::one_event; 3421 $Coro::current->{desc} = "IDLE BUG HANDLER";
3422 EV::loop EV::LOOP_ONESHOT;
3177 })->prio (Coro::PRIO_MAX); 3423 })->prio (Coro::PRIO_MAX);
3178 }; 3424 };
3179 3425
3426 {
3427 my $guard = freeze_mainloop;
3180 reload_config; 3428 reload_config;
3181 db_init; 3429 db_init;
3182 load_extensions; 3430 load_extensions;
3183 3431
3184 $TICK_WATCHER->start; 3432 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3433 evthread_start IO::AIO::poll_fileno;
3434 }
3435
3185 Event::loop; 3436 EV::loop;
3186} 3437}
3187 3438
3188############################################################################# 3439#############################################################################
3189# initialisation and cleanup 3440# initialisation and cleanup
3190 3441
3191# install some emergency cleanup handlers 3442# install some emergency cleanup handlers
3192BEGIN { 3443BEGIN {
3444 our %SIGWATCHER = ();
3193 for my $signal (qw(INT HUP TERM)) { 3445 for my $signal (qw(INT HUP TERM)) {
3194 Event->signal ( 3446 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3195 reentrant => 0,
3196 data => WF_AUTOCANCEL,
3197 signal => $signal,
3198 prio => 0,
3199 cb => sub {
3200 cf::cleanup "SIG$signal"; 3447 cf::cleanup "SIG$signal";
3201 },
3202 ); 3448 };
3203 } 3449 }
3204} 3450}
3205 3451
3206sub write_runtime { 3452sub write_runtime_sync {
3207 my $runtime = "$LOCALDIR/runtime"; 3453 my $runtime = "$LOCALDIR/runtime";
3208 3454
3209 # first touch the runtime file to show we are still running: 3455 # first touch the runtime file to show we are still running:
3210 # the fsync below can take a very very long time. 3456 # the fsync below can take a very very long time.
3211 3457
3237 and return; 3483 and return;
3238 3484
3239 warn "runtime file written.\n"; 3485 warn "runtime file written.\n";
3240 3486
3241 1 3487 1
3488}
3489
3490our $uuid_lock;
3491our $uuid_skip;
3492
3493sub write_uuid_sync($) {
3494 $uuid_skip ||= $_[0];
3495
3496 return if $uuid_lock;
3497 local $uuid_lock = 1;
3498
3499 my $uuid = "$LOCALDIR/uuid";
3500
3501 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3502 or return;
3503
3504 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3505 $uuid_skip = 0;
3506
3507 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3508 and return;
3509
3510 # always fsync - this file is important
3511 aio_fsync $fh
3512 and return;
3513
3514 close $fh
3515 or return;
3516
3517 aio_rename "$uuid~", $uuid
3518 and return;
3519
3520 warn "uuid file written ($value).\n";
3521
3522 1
3523
3524}
3525
3526sub write_uuid($$) {
3527 my ($skip, $sync) = @_;
3528
3529 $sync ? write_uuid_sync $skip
3530 : async { write_uuid_sync $skip };
3242} 3531}
3243 3532
3244sub emergency_save() { 3533sub emergency_save() {
3245 my $freeze_guard = cf::freeze_mainloop; 3534 my $freeze_guard = cf::freeze_mainloop;
3246 3535
3252 # and maps saved/destroyed asynchronously. 3541 # and maps saved/destroyed asynchronously.
3253 warn "begin emergency player save\n"; 3542 warn "begin emergency player save\n";
3254 for my $login (keys %cf::PLAYER) { 3543 for my $login (keys %cf::PLAYER) {
3255 my $pl = $cf::PLAYER{$login} or next; 3544 my $pl = $cf::PLAYER{$login} or next;
3256 $pl->valid or next; 3545 $pl->valid or next;
3546 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3257 $pl->save; 3547 $pl->save;
3258 } 3548 }
3259 warn "end emergency player save\n"; 3549 warn "end emergency player save\n";
3260 3550
3261 warn "begin emergency map save\n"; 3551 warn "begin emergency map save\n";
3267 warn "end emergency map save\n"; 3557 warn "end emergency map save\n";
3268 3558
3269 warn "begin emergency database checkpoint\n"; 3559 warn "begin emergency database checkpoint\n";
3270 BDB::db_env_txn_checkpoint $DB_ENV; 3560 BDB::db_env_txn_checkpoint $DB_ENV;
3271 warn "end emergency database checkpoint\n"; 3561 warn "end emergency database checkpoint\n";
3562
3563 warn "begin write uuid\n";
3564 write_uuid_sync 1;
3565 warn "end write uuid\n";
3272 }; 3566 };
3273 3567
3274 warn "leave emergency perl save\n"; 3568 warn "leave emergency perl save\n";
3275} 3569}
3276 3570
3291 warn "reloading..."; 3585 warn "reloading...";
3292 3586
3293 warn "entering sync_job"; 3587 warn "entering sync_job";
3294 3588
3295 cf::sync_job { 3589 cf::sync_job {
3296 cf::write_runtime; # external watchdog should not bark 3590 cf::write_runtime_sync; # external watchdog should not bark
3297 cf::emergency_save; 3591 cf::emergency_save;
3298 cf::write_runtime; # external watchdog should not bark 3592 cf::write_runtime_sync; # external watchdog should not bark
3299 3593
3300 warn "syncing database to disk"; 3594 warn "syncing database to disk";
3301 BDB::db_env_txn_checkpoint $DB_ENV; 3595 BDB::db_env_txn_checkpoint $DB_ENV;
3302 3596
3303 # if anything goes wrong in here, we should simply crash as we already saved 3597 # if anything goes wrong in here, we should simply crash as we already saved
3304
3305 warn "cancelling all WF_AUTOCANCEL watchers";
3306 for (Event::all_watchers) {
3307 $_->cancel if $_->data & WF_AUTOCANCEL;
3308 }
3309 3598
3310 warn "flushing outstanding aio requests"; 3599 warn "flushing outstanding aio requests";
3311 for (;;) { 3600 for (;;) {
3312 BDB::flush; 3601 BDB::flush;
3313 IO::AIO::flush; 3602 IO::AIO::flush;
3314 Coro::cede; 3603 Coro::cede_notself;
3315 last unless IO::AIO::nreqs || BDB::nreqs; 3604 last unless IO::AIO::nreqs || BDB::nreqs;
3316 warn "iterate..."; 3605 warn "iterate...";
3317 } 3606 }
3318 3607
3319 ++$RELOAD; 3608 ++$RELOAD;
3395 warn "leaving sync_job"; 3684 warn "leaving sync_job";
3396 3685
3397 1 3686 1
3398 } or do { 3687 } or do {
3399 warn $@; 3688 warn $@;
3400 warn "error while reloading, exiting."; 3689 cf::cleanup "error while reloading, exiting.";
3401 exit 1;
3402 }; 3690 };
3403 3691
3404 warn "reloaded"; 3692 warn "reloaded";
3405}; 3693};
3406 3694
3408 3696
3409sub reload_perl() { 3697sub reload_perl() {
3410 # doing reload synchronously and two reloads happen back-to-back, 3698 # doing reload synchronously and two reloads happen back-to-back,
3411 # coro crashes during coro_state_free->destroy here. 3699 # coro crashes during coro_state_free->destroy here.
3412 3700
3413 $RELOAD_WATCHER ||= Event->timer ( 3701 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3414 reentrant => 0,
3415 after => 0,
3416 data => WF_AUTOCANCEL,
3417 cb => sub {
3418 do_reload_perl; 3702 do_reload_perl;
3419 undef $RELOAD_WATCHER; 3703 undef $RELOAD_WATCHER;
3420 },
3421 ); 3704 };
3422} 3705}
3423 3706
3424register_command "reload" => sub { 3707register_command "reload" => sub {
3425 my ($who, $arg) = @_; 3708 my ($who, $arg) = @_;
3426 3709
3427 if ($who->flag (FLAG_WIZ)) { 3710 if ($who->flag (FLAG_WIZ)) {
3428 $who->message ("reloading server."); 3711 $who->message ("reloading server.");
3712 async {
3713 $Coro::current->{desc} = "perl_reload";
3429 async { reload_perl }; 3714 reload_perl;
3715 };
3430 } 3716 }
3431}; 3717};
3432 3718
3433unshift @INC, $LIBDIR; 3719unshift @INC, $LIBDIR;
3434 3720
3436 3722
3437our @WAIT_FOR_TICK; 3723our @WAIT_FOR_TICK;
3438our @WAIT_FOR_TICK_BEGIN; 3724our @WAIT_FOR_TICK_BEGIN;
3439 3725
3440sub wait_for_tick { 3726sub wait_for_tick {
3441 return unless $TICK_WATCHER->is_active;
3442 return if $Coro::current == $Coro::main; 3727 return if tick_inhibit || $Coro::current == $Coro::main;
3443 3728
3444 my $signal = new Coro::Signal; 3729 my $signal = new Coro::Signal;
3445 push @WAIT_FOR_TICK, $signal; 3730 push @WAIT_FOR_TICK, $signal;
3446 $signal->wait; 3731 $signal->wait;
3447} 3732}
3448 3733
3449sub wait_for_tick_begin { 3734sub wait_for_tick_begin {
3450 return unless $TICK_WATCHER->is_active;
3451 return if $Coro::current == $Coro::main; 3735 return if tick_inhibit || $Coro::current == $Coro::main;
3452 3736
3453 my $signal = new Coro::Signal; 3737 my $signal = new Coro::Signal;
3454 push @WAIT_FOR_TICK_BEGIN, $signal; 3738 push @WAIT_FOR_TICK_BEGIN, $signal;
3455 $signal->wait; 3739 $signal->wait;
3456} 3740}
3457 3741
3458our $stat_fh; 3742sub tick {
3459sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d#
3460
3461$TICK_WATCHER = Event->timer (
3462 reentrant => 0,
3463 parked => 1,
3464 prio => 0,
3465 at => $NEXT_TICK || $TICK,
3466 data => WF_AUTOCANCEL,
3467 cb => sub {
3468 if ($Coro::current != $Coro::main) { 3743 if ($Coro::current != $Coro::main) {
3469 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3744 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3470 unless ++$bug_warning > 10; 3745 unless ++$bug_warning > 10;
3471 return; 3746 return;
3472 } 3747 }
3473 3748
3474 my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
3475
3476 $NOW = $tick_start = Event::time;
3477
3478 cf::server_tick; # one server iteration 3749 cf::server_tick; # one server iteration
3479 3750
3480 $RUNTIME += $TICK;
3481 $NEXT_TICK += $TICK;
3482
3483 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3751 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3484 $NEXT_RUNTIME_WRITE = $NOW + 10; 3752 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3485 Coro::async_pool { 3753 Coro::async_pool {
3754 $Coro::current->{desc} = "runtime saver";
3486 write_runtime 3755 write_runtime_sync
3487 or warn "ERROR: unable to write runtime file: $!"; 3756 or warn "ERROR: unable to write runtime file: $!";
3488 };
3489 } 3757 };
3758 }
3490 3759
3491# my $AFTER = Event::time;
3492# warn $AFTER - $NOW;#d#
3493
3494 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3760 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3495 $sig->send; 3761 $sig->send;
3496 } 3762 }
3497 while (my $sig = shift @WAIT_FOR_TICK) { 3763 while (my $sig = shift @WAIT_FOR_TICK) {
3498 $sig->send; 3764 $sig->send;
3499 } 3765 }
3500 3766
3501 $NOW = Event::time; 3767 $LOAD = ($NOW - $TICK_START) / $TICK;
3502
3503 # if we are delayed by four ticks or more, skip them all
3504 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3505
3506 $TICK_WATCHER->at ($NEXT_TICK);
3507 $TICK_WATCHER->start;
3508
3509 $LOAD = ($NOW - $tick_start) / $TICK;
3510 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3768 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3511 3769
3512 _post_tick; 3770 if (0) {
3513 3771 if ($NEXT_TICK) {
3514 # gather some statistics#d# 3772 my $jitter = $TICK_START - $NEXT_TICK;
3515 $stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d# 3773 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3516 IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d# 3774 warn "jitter $JITTER\n";#d#
3775 }
3517 }, 3776 }
3518); 3777}
3519 3778
3520{ 3779{
3780 # configure BDB
3781
3521 BDB::min_parallel 8; 3782 BDB::min_parallel 8;
3522 BDB::max_poll_time $TICK * 0.1; 3783 BDB::max_poll_reqs $TICK * 0.1;
3523 $BDB_POLL_WATCHER = Event->io ( 3784 $Coro::BDB::WATCHER->priority (1);
3524 reentrant => 0,
3525 fd => BDB::poll_fileno,
3526 poll => 'r',
3527 prio => 0,
3528 data => WF_AUTOCANCEL,
3529 cb => \&BDB::poll_cb,
3530 );
3531
3532 BDB::set_sync_prepare {
3533 my $status;
3534 my $current = $Coro::current;
3535 (
3536 sub {
3537 $status = $!;
3538 $current->ready; undef $current;
3539 },
3540 sub {
3541 Coro::schedule while defined $current;
3542 $! = $status;
3543 },
3544 )
3545 };
3546 3785
3547 unless ($DB_ENV) { 3786 unless ($DB_ENV) {
3548 $DB_ENV = BDB::db_env_create; 3787 $DB_ENV = BDB::db_env_create;
3788 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3789 | BDB::LOG_AUTOREMOVE, 1);
3790 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3791 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3549 3792
3550 cf::sync_job { 3793 cf::sync_job {
3551 eval { 3794 eval {
3552 BDB::db_env_open 3795 BDB::db_env_open
3553 $DB_ENV, 3796 $DB_ENV,
3555 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3798 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3556 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3799 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3557 0666; 3800 0666;
3558 3801
3559 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3802 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3560
3561 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3562 | BDB::LOG_AUTOREMOVE, 1);
3563 $DB_ENV->set_lk_detect;
3564 }; 3803 };
3565 3804
3566 cf::cleanup "db_env_open(db): $@" if $@; 3805 cf::cleanup "db_env_open(db): $@" if $@;
3567 }; 3806 };
3568 } 3807 }
3569 3808
3570 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3809 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3571 after => 11, 3810 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3572 interval => 60, 3811 };
3573 hard => 1, 3812 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3574 prio => 0,
3575 data => WF_AUTOCANCEL,
3576 cb => sub {
3577 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3813 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3578 },
3579 ); 3814 };
3580 $BDB_TRICKLE_WATCHER = Event->timer ( 3815 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3581 after => 5,
3582 interval => 10,
3583 hard => 1,
3584 prio => 0,
3585 data => WF_AUTOCANCEL,
3586 cb => sub {
3587 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3816 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3588 },
3589 ); 3817 };
3590} 3818}
3591 3819
3592{ 3820{
3821 # configure IO::AIO
3822
3593 IO::AIO::min_parallel 8; 3823 IO::AIO::min_parallel 8;
3594
3595 undef $Coro::AIO::WATCHER;
3596 IO::AIO::max_poll_time $TICK * 0.1; 3824 IO::AIO::max_poll_time $TICK * 0.1;
3597 $AIO_POLL_WATCHER = Event->io ( 3825 $Coro::AIO::WATCHER->priority (1);
3598 reentrant => 0,
3599 data => WF_AUTOCANCEL,
3600 fd => IO::AIO::poll_fileno,
3601 poll => 'r',
3602 prio => 6,
3603 cb => \&IO::AIO::poll_cb,
3604 );
3605} 3826}
3606 3827
3607my $_log_backtrace; 3828my $_log_backtrace;
3608 3829
3609sub _log_backtrace { 3830sub _log_backtrace {
3613 3834
3614 # limit the # of concurrent backtraces 3835 # limit the # of concurrent backtraces
3615 if ($_log_backtrace < 2) { 3836 if ($_log_backtrace < 2) {
3616 ++$_log_backtrace; 3837 ++$_log_backtrace;
3617 async { 3838 async {
3839 $Coro::current->{desc} = "abt $msg";
3840
3618 my @bt = fork_call { 3841 my @bt = fork_call {
3619 @addr = map { sprintf "%x", $_ } @addr; 3842 @addr = map { sprintf "%x", $_ } @addr;
3620 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3843 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3621 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3844 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3622 or die "addr2line: $!"; 3845 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines