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.369 by root, Thu Sep 13 08:35:25 2007 UTC vs.
Revision 1.432 by root, Mon May 5 22:38:47 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
1419 $pl->{deny_save} = 1; 1523 $pl->{deny_save} = 1;
1420 $pl->password ("*"); # this should lock out the player until we nuked the dir 1524 $pl->password ("*"); # this should lock out the player until we nuked the dir
1421 1525
1422 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1526 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1423 $pl->deactivate; 1527 $pl->deactivate;
1528 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1529 $pl->ob->check_score;
1424 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1530 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1425 $pl->ns->destroy if $pl->ns; 1531 $pl->ns->destroy if $pl->ns;
1426 1532
1427 my $path = playerdir $pl; 1533 my $path = playerdir $pl;
1428 my $temp = "$path~$cf::RUNTIME~deleting~"; 1534 my $temp = "$path~$cf::RUNTIME~deleting~";
1467 1573
1468 for my $login (@$dirs) { 1574 for my $login (@$dirs) {
1469 my $path = path $login; 1575 my $path = path $login;
1470 1576
1471 # a .pst is a dead give-away for a valid player 1577 # a .pst is a dead give-away for a valid player
1472 unless (-e "$path.pst") { 1578 # if no pst file found, open and chekc for blocked users
1579 if (aio_stat "$path.pst") {
1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1580 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1474 aio_read $fh, 0, 512, my $buf, 0 or next; 1581 aio_read $fh, 0, 512, my $buf, 0 or next;
1475 $buf !~ /^password -------------$/m or next; # official not-valid tag 1582 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 } 1583 }
1477 1584
1514 1621
1515Expand crossfire pod fragments into protocol xml. 1622Expand crossfire pod fragments into protocol xml.
1516 1623
1517=cut 1624=cut
1518 1625
1626use re 'eval';
1627
1628my $group;
1629my $interior; $interior = qr{
1630 # match a pod interior sequence sans C<< >>
1631 (?:
1632 \ (.*?)\ (?{ $group = $^N })
1633 | < (??{$interior}) >
1634 )
1635}x;
1636
1519sub expand_cfpod { 1637sub expand_cfpod {
1520 ((my $self), (local $_)) = @_; 1638 my ($self, $pod) = @_;
1521 1639
1522 # escape & and < 1640 my $xml;
1523 s/&/&amp;/g;
1524 s/(?<![BIUGHT])</&lt;/g;
1525 1641
1526 # this is buggy, it needs to properly take care of nested <'s 1642 while () {
1643 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1644 $group = $1;
1527 1645
1528 1 while 1646 $group =~ s/&/&amp;/g;
1529 # replace B<>, I<>, U<> etc. 1647 $group =~ s/</&lt;/g;
1530 s/B<([^\>]*)>/<b>$1<\/b>/ 1648
1531 || s/I<([^\>]*)>/<i>$1<\/i>/ 1649 $xml .= $group;
1532 || s/U<([^\>]*)>/<u>$1<\/u>/ 1650 } elsif ($pod =~ m%\G
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1651 ([BCGHITU])
1534 # replace G<male|female> tags 1652 <
1535 || s{G<([^>|]*)\|([^>]*)>}{ 1653 (?:
1536 $self->gender ? $2 : $1 1654 ([^<>]*) (?{ $group = $^N })
1537 }ge 1655 | < $interior >
1538 # replace H<hint text> 1656 )
1539 || s{H<([^\>]*)>} 1657 >
1658 %gcsx
1540 { 1659 ) {
1660 my ($code, $data) = ($1, $group);
1661
1662 if ($code eq "B") {
1663 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1664 } elsif ($code eq "I") {
1665 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1666 } elsif ($code eq "U") {
1667 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1668 } elsif ($code eq "C") {
1669 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1670 } elsif ($code eq "T") {
1671 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1672 } elsif ($code eq "G") {
1673 my ($male, $female) = split /\|/, $data;
1674 $data = $self->gender ? $female : $male;
1675 $xml .= expand_cfpod ($self, $data);
1676 } elsif ($code eq "H") {
1541 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1677 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1542 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1678 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1543 "") 1679 "")
1544 [$self->{hintmode}] 1680 [$self->{hintmode}];
1681 } else {
1682 $xml .= "error processing '$code($data)' directive";
1545 }ge; 1683 }
1684 } else {
1685 if ($pod =~ /\G(.+)/) {
1686 warn "parse error while expanding $pod (at $1)";
1687 }
1688 last;
1689 }
1690 }
1546 1691
1692 for ($xml) {
1547 # create single paragraphs (very hackish) 1693 # create single paragraphs (very hackish)
1548 s/(?<=\S)\n(?=\w)/ /g; 1694 s/(?<=\S)\n(?=\w)/ /g;
1549 1695
1550 # compress some whitespace 1696 # compress some whitespace
1551 s/\s+\n/\n/g; # ws line-ends 1697 s/\s+\n/\n/g; # ws line-ends
1552 s/\n\n+/\n/g; # double lines 1698 s/\n\n+/\n/g; # double lines
1553 s/^\n+//; # beginning lines 1699 s/^\n+//; # beginning lines
1554 s/\n+$//; # ending lines 1700 s/\n+$//; # ending lines
1701 }
1555 1702
1556 $_ 1703 $xml
1557} 1704}
1705
1706no re 'eval';
1558 1707
1559sub hintmode { 1708sub hintmode {
1560 $_[0]{hintmode} = $_[1] if @_ > 1; 1709 $_[0]{hintmode} = $_[1] if @_ > 1;
1561 $_[0]{hintmode} 1710 $_[0]{hintmode}
1562} 1711}
1634our $MAX_RESET = 3600; 1783our $MAX_RESET = 3600;
1635our $DEFAULT_RESET = 3000; 1784our $DEFAULT_RESET = 3000;
1636 1785
1637sub generate_random_map { 1786sub generate_random_map {
1638 my ($self, $rmp) = @_; 1787 my ($self, $rmp) = @_;
1788
1789 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1790
1639 # mit "rum" bekleckern, nicht 1791 # mit "rum" bekleckern, nicht
1640 $self->_create_random_map ( 1792 $self->_create_random_map (
1641 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1793 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1642 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1794 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1643 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1795 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1765 1917
1766# the temporary/swap location 1918# the temporary/swap location
1767sub save_path { 1919sub save_path {
1768 my ($self) = @_; 1920 my ($self) = @_;
1769 1921
1770 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1922 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1771 "$TMPDIR/$path.map" 1923 "$TMPDIR/$path.map"
1772} 1924}
1773 1925
1774# the unique path, undef == no special unique path 1926# the unique path, undef == no special unique path
1775sub uniq_path { 1927sub uniq_path {
1776 my ($self) = @_; 1928 my ($self) = @_;
1777 1929
1778 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1930 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1779 "$UNIQUEDIR/$path" 1931 "$UNIQUEDIR/$path"
1780} 1932}
1781 1933
1782# and all this just because we cannot iterate over 1934# and all this just because we cannot iterate over
1783# all maps in C++... 1935# all maps in C++...
1881 2033
1882 cf::lock_wait "map_data:$path";#d#remove 2034 cf::lock_wait "map_data:$path";#d#remove
1883 cf::lock_wait "map_find:$path"; 2035 cf::lock_wait "map_find:$path";
1884 2036
1885 $cf::MAP{$path} || do { 2037 $cf::MAP{$path} || do {
1886 my $guard1 = cf::lock_acquire "map_find:$path";
1887 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 2038 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2039 my $guard2 = cf::lock_acquire "map_find:$path";
1888 2040
1889 my $map = new_from_path cf::map $path 2041 my $map = new_from_path cf::map $path
1890 or return; 2042 or return;
1891 2043
1892 $map->{last_save} = $cf::RUNTIME; 2044 $map->{last_save} = $cf::RUNTIME;
1895 or return; 2047 or return;
1896 2048
1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2049 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1898 # doing this can freeze the server in a sync job, obviously 2050 # doing this can freeze the server in a sync job, obviously
1899 #$cf::WAIT_FOR_TICK->wait; 2051 #$cf::WAIT_FOR_TICK->wait;
2052 undef $guard2;
1900 undef $guard1; 2053 undef $guard1;
1901 undef $guard2;
1902 $map->reset; 2054 $map->reset;
1903 return find $path; 2055 return find $path;
1904 } 2056 }
1905 2057
1906 $cf::MAP{$path} = $map 2058 $cf::MAP{$path} = $map
1969 } 2121 }
1970 2122
1971 $self->{last_save} = $cf::RUNTIME; 2123 $self->{last_save} = $cf::RUNTIME;
1972 $self->last_access ($cf::RUNTIME); 2124 $self->last_access ($cf::RUNTIME);
1973 2125
1974 $self->in_memory (cf::MAP_IN_MEMORY); 2126 $self->in_memory (cf::MAP_ACTIVE);
1975 } 2127 }
1976 2128
1977 $self->post_load; 2129 $self->post_load;
1978} 2130}
1979 2131
2037 my ($path, $origin, $load) = @_; 2189 my ($path, $origin, $load) = @_;
2038 2190
2039 $path = normalise $path, $origin && $origin->{path}; 2191 $path = normalise $path, $origin && $origin->{path};
2040 2192
2041 if (my $map = $cf::MAP{$path}) { 2193 if (my $map = $cf::MAP{$path}) {
2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2194 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2043 } 2195 }
2044 2196
2045 $MAP_PREFETCH{$path} |= $load; 2197 $MAP_PREFETCH{$path} |= $load;
2046 2198
2047 $MAP_PREFETCHER ||= cf::async { 2199 $MAP_PREFETCHER ||= cf::async {
2200 $Coro::current->{desc} = "map prefetcher";
2201
2048 while (%MAP_PREFETCH) { 2202 while (%MAP_PREFETCH) {
2049 while (my ($k, $v) = each %MAP_PREFETCH) { 2203 while (my ($k, $v) = each %MAP_PREFETCH) {
2050 if (my $map = find $k) { 2204 if (my $map = find $k) {
2051 $map->load if $v; 2205 $map->load if $v;
2052 } 2206 }
2078 return if $self->{deny_save}; 2232 return if $self->{deny_save};
2079 2233
2080 local $self->{last_access} = $self->last_access;#d# 2234 local $self->{last_access} = $self->last_access;#d#
2081 2235
2082 cf::async { 2236 cf::async {
2237 $Coro::current->{desc} = "map player save";
2083 $_->contr->save for $self->players; 2238 $_->contr->save for $self->players;
2084 }; 2239 };
2240
2241 cf::get_slot 0.02;
2085 2242
2086 if ($uniq) { 2243 if ($uniq) {
2087 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2244 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2088 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2245 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2089 } else { 2246 } else {
2098 $self->save; 2255 $self->save;
2099 2256
2100 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2257 my $lock = cf::lock_acquire "map_data:$self->{path}";
2101 2258
2102 return if $self->players; 2259 return if $self->players;
2103 return if $self->in_memory != cf::MAP_IN_MEMORY; 2260 return if $self->in_memory != cf::MAP_ACTIVE;
2104 return if $self->{deny_save}; 2261 return if $self->{deny_save};
2105 2262
2106 $self->in_memory (cf::MAP_SWAPPED); 2263 $self->in_memory (cf::MAP_SWAPPED);
2107 2264
2108 $self->deactivate; 2265 $self->deactivate;
2226 2383
2227sub unique_maps() { 2384sub unique_maps() {
2228 [ 2385 [
2229 map { 2386 map {
2230 utf8::decode $_; 2387 utf8::decode $_;
2231 /\.map$/ 2388 s/\.map$//; # TODO future compatibility hack
2389 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2390 ? ()
2232 ? normalise $_ 2391 : normalise $_
2233 : ()
2234 } @{ aio_readdir $UNIQUEDIR or [] } 2392 } @{ aio_readdir $UNIQUEDIR or [] }
2235 ] 2393 ]
2236} 2394}
2237 2395
2238package cf;
2239
2240=back 2396=back
2241 2397
2242=head3 cf::object 2398=head3 cf::object
2243 2399
2244=cut 2400=cut
2247 2403
2248=over 4 2404=over 4
2249 2405
2250=item $ob->inv_recursive 2406=item $ob->inv_recursive
2251 2407
2252Returns the inventory of the object _and_ their inventories, recursively. 2408Returns the inventory of the object I<and> their inventories, recursively,
2409but I<not> the object itself.
2253 2410
2254=cut 2411=cut
2255 2412
2256sub inv_recursive_; 2413sub inv_recursive_;
2257sub inv_recursive_ { 2414sub inv_recursive_ {
2262 inv_recursive_ inv $_[0] 2419 inv_recursive_ inv $_[0]
2263} 2420}
2264 2421
2265=item $ref = $ob->ref 2422=item $ref = $ob->ref
2266 2423
2267creates and returns a persistent reference to an objetc that can be stored as a string. 2424Creates and returns a persistent reference to an object that can be stored as a string.
2268 2425
2269=item $ob = cf::object::deref ($refstring) 2426=item $ob = cf::object::deref ($refstring)
2270 2427
2271returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2428returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2272even if the object actually exists. May block. 2429even if the object actually exists. May block.
2274=cut 2431=cut
2275 2432
2276sub deref { 2433sub deref {
2277 my ($ref) = @_; 2434 my ($ref) = @_;
2278 2435
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2436 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2); 2437 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2438 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return; 2439 or return;
2286 $pl->ob->uuid eq $uuid 2440 $pl->ob->uuid eq $uuid
2287 or return; 2441 or return;
2307can be C<undef>. Does the right thing when the player is currently in a 2461can be C<undef>. Does the right thing when the player is currently in a
2308dialogue with the given NPC character. 2462dialogue with the given NPC character.
2309 2463
2310=cut 2464=cut
2311 2465
2466our $SAY_CHANNEL = {
2467 id => "say",
2468 title => "Map",
2469 reply => "say ",
2470 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2471};
2472
2473our $CHAT_CHANNEL = {
2474 id => "chat",
2475 title => "Chat",
2476 reply => "chat ",
2477 tooltip => "Player chat and shouts, global to the server.",
2478};
2479
2312# rough implementation of a future "reply" method that works 2480# rough implementation of a future "reply" method that works
2313# with dialog boxes. 2481# with dialog boxes.
2314#TODO: the first argument must go, split into a $npc->reply_to ( method 2482#TODO: the first argument must go, split into a $npc->reply_to ( method
2315sub cf::object::player::reply($$$;$) { 2483sub cf::object::player::reply($$$;$) {
2316 my ($self, $npc, $msg, $flags) = @_; 2484 my ($self, $npc, $msg, $flags) = @_;
2327 my $dialog = $pl->{npc_dialog}; 2495 my $dialog = $pl->{npc_dialog};
2328 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2496 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2329 2497
2330 } else { 2498 } else {
2331 $msg = $npc->name . " says: $msg" if $npc; 2499 $msg = $npc->name . " says: $msg" if $npc;
2332 $self->message ($msg, $flags); 2500 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2333 } 2501 }
2334 } 2502 }
2335} 2503}
2336 2504
2337=item $object->send_msg ($channel, $msg, $color, [extra...]) 2505=item $object->send_msg ($channel, $msg, $color, [extra...])
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2626 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459 2627
2460 $self->enter_link; 2628 $self->enter_link;
2461 2629
2462 (async { 2630 (async {
2631 $Coro::current->{desc} = "player::goto $path $x $y";
2632
2463 # *tag paths override both path and x|y 2633 # *tag paths override both path and x|y
2464 if ($path =~ /^\*(.*)$/) { 2634 if ($path =~ /^\*(.*)$/) {
2465 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2635 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466 my $ob = $obs[rand @obs]; 2636 my $ob = $obs[rand @obs];
2467 2637
2530} 2700}
2531 2701
2532sub prepare_random_map { 2702sub prepare_random_map {
2533 my ($exit) = @_; 2703 my ($exit) = @_;
2534 2704
2535 my $guard = cf::lock_acquire "exit_prepare:$exit";
2536
2537 # all this does is basically replace the /! path by 2705 # all this does is basically replace the /! path by
2538 # a new random map path (?random/...) with a seed 2706 # a new random map path (?random/...) with a seed
2539 # that depends on the exit object 2707 # that depends on the exit object
2540 2708
2541 my $rmp = parse_random_map_params $exit->msg; 2709 my $rmp = parse_random_map_params $exit->msg;
2543 if ($exit->map) { 2711 if ($exit->map) {
2544 $rmp->{region} = $exit->region->name; 2712 $rmp->{region} = $exit->region->name;
2545 $rmp->{origin_map} = $exit->map->path; 2713 $rmp->{origin_map} = $exit->map->path;
2546 $rmp->{origin_x} = $exit->x; 2714 $rmp->{origin_x} = $exit->x;
2547 $rmp->{origin_y} = $exit->y; 2715 $rmp->{origin_y} = $exit->y;
2716
2717 $exit->map->touch;
2548 } 2718 }
2549 2719
2550 $rmp->{random_seed} ||= $exit->random_seed; 2720 $rmp->{random_seed} ||= $exit->random_seed;
2551 2721
2552 my $data = cf::to_json $rmp; 2722 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2553 my $md5 = Digest::MD5::md5_hex $data; 2723 my $md5 = Digest::MD5::md5_hex $data;
2554 my $meta = "$RANDOMDIR/$md5.meta"; 2724 my $meta = "$RANDOMDIR/$md5.meta";
2555 2725
2556 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2726 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2557 aio_write $fh, 0, (length $data), $data, 0; 2727 aio_write $fh, 0, (length $data), $data, 0;
2558 undef $fh; 2728 undef $fh;
2559 aio_rename "$meta~", $meta; 2729 aio_rename "$meta~", $meta;
2560 2730
2731 my $slaying = "?random/$md5";
2732
2733 if ($exit->valid) {
2561 $exit->slaying ("?random/$md5"); 2734 $exit->slaying ("?random/$md5");
2562 $exit->msg (undef); 2735 $exit->msg (undef);
2736 }
2563 } 2737 }
2564} 2738}
2565 2739
2566sub cf::object::player::enter_exit { 2740sub cf::object::player::enter_exit {
2567 my ($self, $exit) = @_; 2741 my ($self, $exit) = @_;
2568 2742
2569 return unless $self->type == cf::PLAYER; 2743 return unless $self->type == cf::PLAYER;
2570 2744
2571 if ($exit->slaying eq "/!") {
2572 #TODO: this should de-fi-ni-te-ly not be a sync-job
2573 # the problem is that $exit might not survive long enough
2574 # so it needs to be done right now, right here
2575 cf::sync_job { prepare_random_map $exit };
2576 }
2577
2578 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2579 my $hp = $exit->stats->hp;
2580 my $sp = $exit->stats->sp;
2581
2582 $self->enter_link; 2745 $self->enter_link;
2583 2746
2584 # if exit is damned, update players death & WoR home-position
2585 $self->contr->savebed ($slaying, $hp, $sp)
2586 if $exit->flag (FLAG_DAMNED);
2587
2588 (async { 2747 (async {
2589 $self->deactivate_recursive; # just to be sure 2748 $Coro::current->{desc} = "enter_exit";
2749
2590 unless (eval { 2750 unless (eval {
2751 $self->deactivate_recursive; # just to be sure
2752
2753 # random map handling
2754 {
2755 my $guard = cf::lock_acquire "exit_prepare:$exit";
2756
2757 prepare_random_map $exit
2758 if $exit->slaying eq "/!";
2759 }
2760
2761 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2762 my $x = $exit->stats->hp;
2763 my $y = $exit->stats->sp;
2764
2591 $self->goto ($slaying, $hp, $sp); 2765 $self->goto ($map, $x, $y);
2592 2766
2767 # if exit is damned, update players death & WoR home-position
2768 $self->contr->savebed ($map, $x, $y)
2769 if $exit->flag (cf::FLAG_DAMNED);
2770
2593 1; 2771 1
2594 }) { 2772 }) {
2595 $self->message ("Something went wrong deep within the crossfire server. " 2773 $self->message ("Something went wrong deep within the crossfire server. "
2596 . "I'll try to bring you back to the map you were before. " 2774 . "I'll try to bring you back to the map you were before. "
2597 . "Please report this to the dungeon master!", 2775 . "Please report this to the dungeon master!",
2598 cf::NDI_UNIQUE | cf::NDI_RED); 2776 cf::NDI_UNIQUE | cf::NDI_RED);
2628the message, with C<log> being the default. If C<$color> is negative, suppress 2806the message, with C<log> being the default. If C<$color> is negative, suppress
2629the message unless the client supports the msg packet. 2807the message unless the client supports the msg packet.
2630 2808
2631=cut 2809=cut
2632 2810
2811# non-persistent channels (usually the info channel)
2633our %CHANNEL = ( 2812our %CHANNEL = (
2634 "c/identify" => { 2813 "c/identify" => {
2635 id => "identify", 2814 id => "infobox",
2636 title => "Identify", 2815 title => "Identify",
2637 reply => undef, 2816 reply => undef,
2638 tooltip => "Items recently identified", 2817 tooltip => "Items recently identified",
2639 }, 2818 },
2640 "c/examine" => { 2819 "c/examine" => {
2641 id => "examine", 2820 id => "infobox",
2642 title => "Examine", 2821 title => "Examine",
2643 reply => undef, 2822 reply => undef,
2644 tooltip => "Signs and other items you examined", 2823 tooltip => "Signs and other items you examined",
2645 }, 2824 },
2825 "c/book" => {
2826 id => "infobox",
2827 title => "Book",
2828 reply => undef,
2829 tooltip => "The contents of a note or book",
2830 },
2831 "c/lookat" => {
2832 id => "infobox",
2833 title => "Look",
2834 reply => undef,
2835 tooltip => "What you saw there",
2836 },
2837 "c/who" => {
2838 id => "infobox",
2839 title => "Players",
2840 reply => undef,
2841 tooltip => "Shows players who are currently online",
2842 },
2843 "c/body" => {
2844 id => "infobox",
2845 title => "Body Parts",
2846 reply => undef,
2847 tooltip => "Shows which body parts you posess and are available",
2848 },
2849 "c/uptime" => {
2850 id => "infobox",
2851 title => "Uptime",
2852 reply => undef,
2853 tooltip => "How long the server has been running since last restart",
2854 },
2855 "c/mapinfo" => {
2856 id => "infobox",
2857 title => "Map Info",
2858 reply => undef,
2859 tooltip => "Information related to the maps",
2860 },
2861 "c/party" => {
2862 id => "party",
2863 title => "Party",
2864 reply => "gsay ",
2865 tooltip => "Messages and chat related to your party",
2866 },
2646); 2867);
2647 2868
2648sub cf::client::send_msg { 2869sub cf::client::send_msg {
2649 my ($self, $channel, $msg, $color, @extra) = @_; 2870 my ($self, $channel, $msg, $color, @extra) = @_;
2650 2871
2651 $msg = $self->pl->expand_cfpod ($msg); 2872 $msg = $self->pl->expand_cfpod ($msg);
2652 2873
2653 $color &= cf::NDI_CLIENT_MASK; # just in case... 2874 $color &= cf::NDI_CLIENT_MASK; # just in case...
2654 2875
2655 # check predefined channels, for the benefit of C 2876 # check predefined channels, for the benefit of C
2656 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2877 if ($CHANNEL{$channel}) {
2878 $channel = $CHANNEL{$channel};
2657 2879
2880 $self->ext_msg (channel_info => $channel)
2881 if $self->can_msg;
2882
2883 $channel = $channel->{id};
2884
2658 if (ref $channel) { 2885 } elsif (ref $channel) {
2659 # send meta info to client, if not yet sent 2886 # send meta info to client, if not yet sent
2660 unless (exists $self->{channel}{$channel->{id}}) { 2887 unless (exists $self->{channel}{$channel->{id}}) {
2661 $self->{channel}{$channel->{id}} = $channel; 2888 $self->{channel}{$channel->{id}} = $channel;
2662 $self->ext_msg (channel_info => $channel) 2889 $self->ext_msg (channel_info => $channel)
2663 if $self->can_msg; 2890 if $self->can_msg;
2880=pod 3107=pod
2881 3108
2882The following functions and methods are available within a safe environment: 3109The following functions and methods are available within a safe environment:
2883 3110
2884 cf::object 3111 cf::object
2885 contr pay_amount pay_player map x y force_find force_add 3112 contr pay_amount pay_player map x y force_find force_add destroy
2886 insert remove name archname title slaying race decrease_ob_nr 3113 insert remove name archname title slaying race decrease split
2887 3114
2888 cf::object::player 3115 cf::object::player
2889 player 3116 player
2890 3117
2891 cf::player 3118 cf::player
2896 3123
2897=cut 3124=cut
2898 3125
2899for ( 3126for (
2900 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3127 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2901 insert remove inv name archname title slaying race 3128 insert remove inv nrof name archname title slaying race
2902 decrease_ob_nr)], 3129 decrease split destroy)],
2903 ["cf::object::player" => qw(player)], 3130 ["cf::object::player" => qw(player)],
2904 ["cf::player" => qw(peaceful)], 3131 ["cf::player" => qw(peaceful)],
2905 ["cf::map" => qw(trigger)], 3132 ["cf::map" => qw(trigger)],
2906) { 3133) {
2907 no strict 'refs'; 3134 no strict 'refs';
3012 { 3239 {
3013 my $faces = $facedata->{faceinfo}; 3240 my $faces = $facedata->{faceinfo};
3014 3241
3015 while (my ($face, $info) = each %$faces) { 3242 while (my ($face, $info) = each %$faces) {
3016 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3243 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3244
3017 cf::face::set_visibility $idx, $info->{visibility}; 3245 cf::face::set_visibility $idx, $info->{visibility};
3018 cf::face::set_magicmap $idx, $info->{magicmap}; 3246 cf::face::set_magicmap $idx, $info->{magicmap};
3019 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3247 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3020 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3248 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3021 3249
3022 cf::cede_to_tick; 3250 cf::cede_to_tick;
3023 } 3251 }
3024 3252
3025 while (my ($face, $info) = each %$faces) { 3253 while (my ($face, $info) = each %$faces) {
3026 next unless $info->{smooth}; 3254 next unless $info->{smooth};
3255
3027 my $idx = cf::face::find $face 3256 my $idx = cf::face::find $face
3028 or next; 3257 or next;
3258
3029 if (my $smooth = cf::face::find $info->{smooth}) { 3259 if (my $smooth = cf::face::find $info->{smooth}) {
3030 cf::face::set_smooth $idx, $smooth; 3260 cf::face::set_smooth $idx, $smooth;
3031 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3261 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3032 } else { 3262 } else {
3033 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3263 warn "smooth face '$info->{smooth}' not found for face '$face'";
3051 { 3281 {
3052 # TODO: for gcfclient pleasure, we should give resources 3282 # TODO: for gcfclient pleasure, we should give resources
3053 # that gcfclient doesn't grok a >10000 face index. 3283 # that gcfclient doesn't grok a >10000 face index.
3054 my $res = $facedata->{resource}; 3284 my $res = $facedata->{resource};
3055 3285
3056 my $soundconf = delete $res->{"res/sound.conf"};
3057
3058 while (my ($name, $info) = each %$res) { 3286 while (my ($name, $info) = each %$res) {
3287 if (defined $info->{type}) {
3059 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3288 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3060 my $data; 3289 my $data;
3061 3290
3062 if ($info->{type} & 1) { 3291 if ($info->{type} & 1) {
3063 # prepend meta info 3292 # prepend meta info
3064 3293
3065 my $meta = $enc->encode ({ 3294 my $meta = $enc->encode ({
3066 name => $name, 3295 name => $name,
3067 %{ $info->{meta} || {} }, 3296 %{ $info->{meta} || {} },
3068 }); 3297 });
3069 3298
3070 $data = pack "(w/a*)*", $meta, $info->{data}; 3299 $data = pack "(w/a*)*", $meta, $info->{data};
3300 } else {
3301 $data = $info->{data};
3302 }
3303
3304 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3305 cf::face::set_type $idx, $info->{type};
3071 } else { 3306 } else {
3072 $data = $info->{data}; 3307 $RESOURCE{$name} = $info;
3073 } 3308 }
3074 3309
3075 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3076 cf::face::set_type $idx, $info->{type};
3077
3078 cf::cede_to_tick; 3310 cf::cede_to_tick;
3079 } 3311 }
3080
3081 if ($soundconf) {
3082 $soundconf = $enc->decode (delete $soundconf->{data});
3083
3084 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3085 my $sound = $soundconf->{compat}[$_]
3086 or next;
3087
3088 my $face = cf::face::find "sound/$sound->[1]";
3089 cf::sound::set $sound->[0] => $face;
3090 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3091 }
3092
3093 while (my ($k, $v) = each %{$soundconf->{event}}) {
3094 my $face = cf::face::find "sound/$v";
3095 cf::sound::set $k => $face;
3096 }
3097 }
3098 } 3312 }
3313
3314 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3099 3315
3100 1 3316 1
3101} 3317}
3318
3319cf::global->attach (on_resource_update => sub {
3320 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3321 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3322
3323 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3324 my $sound = $soundconf->{compat}[$_]
3325 or next;
3326
3327 my $face = cf::face::find "sound/$sound->[1]";
3328 cf::sound::set $sound->[0] => $face;
3329 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3330 }
3331
3332 while (my ($k, $v) = each %{$soundconf->{event}}) {
3333 my $face = cf::face::find "sound/$v";
3334 cf::sound::set $k => $face;
3335 }
3336 }
3337});
3102 3338
3103register_exticmd fx_want => sub { 3339register_exticmd fx_want => sub {
3104 my ($ns, $want) = @_; 3340 my ($ns, $want) = @_;
3105 3341
3106 while (my ($k, $v) = each %$want) { 3342 while (my ($k, $v) = each %$want) {
3107 $ns->fx_want ($k, $v); 3343 $ns->fx_want ($k, $v);
3108 } 3344 }
3109}; 3345};
3346
3347sub load_resource_file($) {
3348 my $guard = lock_acquire "load_resource_file";
3349
3350 my $status = load_resource_file_ $_[0];
3351 get_slot 0.1, 100;
3352 cf::arch::commit_load;
3353
3354 $status
3355}
3110 3356
3111sub reload_regions { 3357sub reload_regions {
3112 # HACK to clear player env face cache, we need some signal framework 3358 # HACK to clear player env face cache, we need some signal framework
3113 # for this (global event?) 3359 # for this (global event?)
3114 %ext::player_env::MUSIC_FACE_CACHE = (); 3360 %ext::player_env::MUSIC_FACE_CACHE = ();
3128} 3374}
3129 3375
3130sub reload_archetypes { 3376sub reload_archetypes {
3131 load_resource_file "$DATADIR/archetypes" 3377 load_resource_file "$DATADIR/archetypes"
3132 or die "unable to load archetypes\n"; 3378 or die "unable to load archetypes\n";
3133 #d# NEED to laod twice to resolve forward references
3134 # this really needs to be done in an extra post-pass
3135 # (which needs to be synchronous, so solve it differently)
3136 load_resource_file "$DATADIR/archetypes"
3137 or die "unable to load archetypes\n";
3138} 3379}
3139 3380
3140sub reload_treasures { 3381sub reload_treasures {
3141 load_resource_file "$DATADIR/treasures" 3382 load_resource_file "$DATADIR/treasures"
3142 or die "unable to load treasurelists\n"; 3383 or die "unable to load treasurelists\n";
3143} 3384}
3144 3385
3145sub reload_resources { 3386sub reload_resources {
3146 warn "reloading resource files...\n"; 3387 warn "reloading resource files...\n";
3147 3388
3389 reload_facedata;
3390 reload_archetypes;
3148 reload_regions; 3391 reload_regions;
3149 reload_facedata;
3150 #reload_archetypes;#d#
3151 reload_archetypes;
3152 reload_treasures; 3392 reload_treasures;
3153 3393
3154 warn "finished reloading resource files\n"; 3394 warn "finished reloading resource files\n";
3155} 3395}
3156 3396
3157sub init { 3397sub init {
3398 my $guard = freeze_mainloop;
3399
3158 reload_resources; 3400 reload_resources;
3159} 3401}
3160 3402
3161sub reload_config { 3403sub reload_config {
3162 open my $fh, "<:utf8", "$CONFDIR/config" 3404 open my $fh, "<:utf8", "$CONFDIR/config"
3163 or return; 3405 or return;
3164 3406
3165 local $/; 3407 local $/;
3166 *CFG = YAML::Syck::Load <$fh>; 3408 *CFG = YAML::Load <$fh>;
3167 3409
3168 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3410 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3169 3411
3170 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3412 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3171 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3413 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3182sub main { 3424sub main {
3183 # we must not ever block the main coroutine 3425 # we must not ever block the main coroutine
3184 local $Coro::idle = sub { 3426 local $Coro::idle = sub {
3185 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3427 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3186 (async { 3428 (async {
3187 Event::one_event; 3429 $Coro::current->{desc} = "IDLE BUG HANDLER";
3430 EV::loop EV::LOOP_ONESHOT;
3188 })->prio (Coro::PRIO_MAX); 3431 })->prio (Coro::PRIO_MAX);
3189 }; 3432 };
3190 3433
3434 {
3435 my $guard = freeze_mainloop;
3191 reload_config; 3436 reload_config;
3192 db_init; 3437 db_init;
3193 load_extensions; 3438 load_extensions;
3194 3439
3195 $TICK_WATCHER->start; 3440 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3441 evthread_start IO::AIO::poll_fileno;
3442 }
3443
3196 Event::loop; 3444 EV::loop;
3197} 3445}
3198 3446
3199############################################################################# 3447#############################################################################
3200# initialisation and cleanup 3448# initialisation and cleanup
3201 3449
3202# install some emergency cleanup handlers 3450# install some emergency cleanup handlers
3203BEGIN { 3451BEGIN {
3452 our %SIGWATCHER = ();
3204 for my $signal (qw(INT HUP TERM)) { 3453 for my $signal (qw(INT HUP TERM)) {
3205 Event->signal ( 3454 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3206 reentrant => 0,
3207 data => WF_AUTOCANCEL,
3208 signal => $signal,
3209 prio => 0,
3210 cb => sub {
3211 cf::cleanup "SIG$signal"; 3455 cf::cleanup "SIG$signal";
3212 },
3213 ); 3456 };
3214 } 3457 }
3215} 3458}
3216 3459
3217sub write_runtime { 3460sub write_runtime_sync {
3218 my $runtime = "$LOCALDIR/runtime"; 3461 my $runtime = "$LOCALDIR/runtime";
3219 3462
3220 # first touch the runtime file to show we are still running: 3463 # first touch the runtime file to show we are still running:
3221 # the fsync below can take a very very long time. 3464 # the fsync below can take a very very long time.
3222 3465
3248 and return; 3491 and return;
3249 3492
3250 warn "runtime file written.\n"; 3493 warn "runtime file written.\n";
3251 3494
3252 1 3495 1
3496}
3497
3498our $uuid_lock;
3499our $uuid_skip;
3500
3501sub write_uuid_sync($) {
3502 $uuid_skip ||= $_[0];
3503
3504 return if $uuid_lock;
3505 local $uuid_lock = 1;
3506
3507 my $uuid = "$LOCALDIR/uuid";
3508
3509 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3510 or return;
3511
3512 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3513 $uuid_skip = 0;
3514
3515 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3516 and return;
3517
3518 # always fsync - this file is important
3519 aio_fsync $fh
3520 and return;
3521
3522 close $fh
3523 or return;
3524
3525 aio_rename "$uuid~", $uuid
3526 and return;
3527
3528 warn "uuid file written ($value).\n";
3529
3530 1
3531
3532}
3533
3534sub write_uuid($$) {
3535 my ($skip, $sync) = @_;
3536
3537 $sync ? write_uuid_sync $skip
3538 : async { write_uuid_sync $skip };
3253} 3539}
3254 3540
3255sub emergency_save() { 3541sub emergency_save() {
3256 my $freeze_guard = cf::freeze_mainloop; 3542 my $freeze_guard = cf::freeze_mainloop;
3257 3543
3263 # and maps saved/destroyed asynchronously. 3549 # and maps saved/destroyed asynchronously.
3264 warn "begin emergency player save\n"; 3550 warn "begin emergency player save\n";
3265 for my $login (keys %cf::PLAYER) { 3551 for my $login (keys %cf::PLAYER) {
3266 my $pl = $cf::PLAYER{$login} or next; 3552 my $pl = $cf::PLAYER{$login} or next;
3267 $pl->valid or next; 3553 $pl->valid or next;
3554 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3268 $pl->save; 3555 $pl->save;
3269 } 3556 }
3270 warn "end emergency player save\n"; 3557 warn "end emergency player save\n";
3271 3558
3272 warn "begin emergency map save\n"; 3559 warn "begin emergency map save\n";
3278 warn "end emergency map save\n"; 3565 warn "end emergency map save\n";
3279 3566
3280 warn "begin emergency database checkpoint\n"; 3567 warn "begin emergency database checkpoint\n";
3281 BDB::db_env_txn_checkpoint $DB_ENV; 3568 BDB::db_env_txn_checkpoint $DB_ENV;
3282 warn "end emergency database checkpoint\n"; 3569 warn "end emergency database checkpoint\n";
3570
3571 warn "begin write uuid\n";
3572 write_uuid_sync 1;
3573 warn "end write uuid\n";
3283 }; 3574 };
3284 3575
3285 warn "leave emergency perl save\n"; 3576 warn "leave emergency perl save\n";
3286} 3577}
3287 3578
3302 warn "reloading..."; 3593 warn "reloading...";
3303 3594
3304 warn "entering sync_job"; 3595 warn "entering sync_job";
3305 3596
3306 cf::sync_job { 3597 cf::sync_job {
3307 cf::write_runtime; # external watchdog should not bark 3598 cf::write_runtime_sync; # external watchdog should not bark
3308 cf::emergency_save; 3599 cf::emergency_save;
3309 cf::write_runtime; # external watchdog should not bark 3600 cf::write_runtime_sync; # external watchdog should not bark
3310 3601
3311 warn "syncing database to disk"; 3602 warn "syncing database to disk";
3312 BDB::db_env_txn_checkpoint $DB_ENV; 3603 BDB::db_env_txn_checkpoint $DB_ENV;
3313 3604
3314 # if anything goes wrong in here, we should simply crash as we already saved 3605 # if anything goes wrong in here, we should simply crash as we already saved
3315
3316 warn "cancelling all WF_AUTOCANCEL watchers";
3317 for (Event::all_watchers) {
3318 $_->cancel if $_->data & WF_AUTOCANCEL;
3319 }
3320 3606
3321 warn "flushing outstanding aio requests"; 3607 warn "flushing outstanding aio requests";
3322 for (;;) { 3608 for (;;) {
3323 BDB::flush; 3609 BDB::flush;
3324 IO::AIO::flush; 3610 IO::AIO::flush;
3325 Coro::cede; 3611 Coro::cede_notself;
3326 last unless IO::AIO::nreqs || BDB::nreqs; 3612 last unless IO::AIO::nreqs || BDB::nreqs;
3327 warn "iterate..."; 3613 warn "iterate...";
3328 } 3614 }
3329 3615
3330 ++$RELOAD; 3616 ++$RELOAD;
3406 warn "leaving sync_job"; 3692 warn "leaving sync_job";
3407 3693
3408 1 3694 1
3409 } or do { 3695 } or do {
3410 warn $@; 3696 warn $@;
3411 warn "error while reloading, exiting."; 3697 cf::cleanup "error while reloading, exiting.";
3412 exit 1;
3413 }; 3698 };
3414 3699
3415 warn "reloaded"; 3700 warn "reloaded";
3416}; 3701};
3417 3702
3419 3704
3420sub reload_perl() { 3705sub reload_perl() {
3421 # doing reload synchronously and two reloads happen back-to-back, 3706 # doing reload synchronously and two reloads happen back-to-back,
3422 # coro crashes during coro_state_free->destroy here. 3707 # coro crashes during coro_state_free->destroy here.
3423 3708
3424 $RELOAD_WATCHER ||= Event->timer ( 3709 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3425 reentrant => 0,
3426 after => 0,
3427 data => WF_AUTOCANCEL,
3428 cb => sub {
3429 do_reload_perl; 3710 do_reload_perl;
3430 undef $RELOAD_WATCHER; 3711 undef $RELOAD_WATCHER;
3431 },
3432 ); 3712 };
3433} 3713}
3434 3714
3435register_command "reload" => sub { 3715register_command "reload" => sub {
3436 my ($who, $arg) = @_; 3716 my ($who, $arg) = @_;
3437 3717
3438 if ($who->flag (FLAG_WIZ)) { 3718 if ($who->flag (FLAG_WIZ)) {
3439 $who->message ("reloading server."); 3719 $who->message ("reloading server.");
3720 async {
3721 $Coro::current->{desc} = "perl_reload";
3440 async { reload_perl }; 3722 reload_perl;
3723 };
3441 } 3724 }
3442}; 3725};
3443 3726
3444unshift @INC, $LIBDIR; 3727unshift @INC, $LIBDIR;
3445 3728
3447 3730
3448our @WAIT_FOR_TICK; 3731our @WAIT_FOR_TICK;
3449our @WAIT_FOR_TICK_BEGIN; 3732our @WAIT_FOR_TICK_BEGIN;
3450 3733
3451sub wait_for_tick { 3734sub wait_for_tick {
3452 return unless $TICK_WATCHER->is_active;
3453 return if $Coro::current == $Coro::main; 3735 return if tick_inhibit || $Coro::current == $Coro::main;
3454 3736
3455 my $signal = new Coro::Signal; 3737 my $signal = new Coro::Signal;
3456 push @WAIT_FOR_TICK, $signal; 3738 push @WAIT_FOR_TICK, $signal;
3457 $signal->wait; 3739 $signal->wait;
3458} 3740}
3459 3741
3460sub wait_for_tick_begin { 3742sub wait_for_tick_begin {
3461 return unless $TICK_WATCHER->is_active;
3462 return if $Coro::current == $Coro::main; 3743 return if tick_inhibit || $Coro::current == $Coro::main;
3463 3744
3464 my $signal = new Coro::Signal; 3745 my $signal = new Coro::Signal;
3465 push @WAIT_FOR_TICK_BEGIN, $signal; 3746 push @WAIT_FOR_TICK_BEGIN, $signal;
3466 $signal->wait; 3747 $signal->wait;
3467} 3748}
3468 3749
3469our $stat_fh; 3750sub tick {
3470sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d#
3471
3472$TICK_WATCHER = Event->timer (
3473 reentrant => 0,
3474 parked => 1,
3475 prio => 0,
3476 at => $NEXT_TICK || $TICK,
3477 data => WF_AUTOCANCEL,
3478 cb => sub {
3479 if ($Coro::current != $Coro::main) { 3751 if ($Coro::current != $Coro::main) {
3480 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3752 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3481 unless ++$bug_warning > 10; 3753 unless ++$bug_warning > 10;
3482 return; 3754 return;
3483 } 3755 }
3484 3756
3485 my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
3486
3487 $NOW = $tick_start = Event::time;
3488
3489 cf::server_tick; # one server iteration 3757 cf::server_tick; # one server iteration
3490 3758
3491 $RUNTIME += $TICK;
3492 $NEXT_TICK += $TICK;
3493
3494 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3759 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3495 $NEXT_RUNTIME_WRITE = $NOW + 10; 3760 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3496 Coro::async_pool { 3761 Coro::async_pool {
3762 $Coro::current->{desc} = "runtime saver";
3497 write_runtime 3763 write_runtime_sync
3498 or warn "ERROR: unable to write runtime file: $!"; 3764 or warn "ERROR: unable to write runtime file: $!";
3499 };
3500 } 3765 };
3766 }
3501 3767
3502# my $AFTER = Event::time;
3503# warn $AFTER - $NOW;#d#
3504
3505 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3768 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3506 $sig->send; 3769 $sig->send;
3507 } 3770 }
3508 while (my $sig = shift @WAIT_FOR_TICK) { 3771 while (my $sig = shift @WAIT_FOR_TICK) {
3509 $sig->send; 3772 $sig->send;
3510 } 3773 }
3511 3774
3512 $NOW = Event::time; 3775 $LOAD = ($NOW - $TICK_START) / $TICK;
3513
3514 # if we are delayed by four ticks or more, skip them all
3515 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3516
3517 $TICK_WATCHER->at ($NEXT_TICK);
3518 $TICK_WATCHER->start;
3519
3520 $LOAD = ($NOW - $tick_start) / $TICK;
3521 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3776 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3522 3777
3523 _post_tick; 3778 if (0) {
3524 3779 if ($NEXT_TICK) {
3525 # gather some statistics#d# 3780 my $jitter = $TICK_START - $NEXT_TICK;
3526 $stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d# 3781 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3527 IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d# 3782 warn "jitter $JITTER\n";#d#
3783 }
3528 }, 3784 }
3529); 3785}
3530 3786
3531{ 3787{
3788 # configure BDB
3789
3532 BDB::min_parallel 8; 3790 BDB::min_parallel 8;
3533 BDB::max_poll_time $TICK * 0.1; 3791 BDB::max_poll_reqs $TICK * 0.1;
3534 $BDB_POLL_WATCHER = Event->io ( 3792 $Coro::BDB::WATCHER->priority (1);
3535 reentrant => 0,
3536 fd => BDB::poll_fileno,
3537 poll => 'r',
3538 prio => 0,
3539 data => WF_AUTOCANCEL,
3540 cb => \&BDB::poll_cb,
3541 );
3542
3543 BDB::set_sync_prepare {
3544 my $status;
3545 my $current = $Coro::current;
3546 (
3547 sub {
3548 $status = $!;
3549 $current->ready; undef $current;
3550 },
3551 sub {
3552 Coro::schedule while defined $current;
3553 $! = $status;
3554 },
3555 )
3556 };
3557 3793
3558 unless ($DB_ENV) { 3794 unless ($DB_ENV) {
3559 $DB_ENV = BDB::db_env_create; 3795 $DB_ENV = BDB::db_env_create;
3796 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3797 | BDB::LOG_AUTOREMOVE, 1);
3798 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3799 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3560 3800
3561 cf::sync_job { 3801 cf::sync_job {
3562 eval { 3802 eval {
3563 BDB::db_env_open 3803 BDB::db_env_open
3564 $DB_ENV, 3804 $DB_ENV,
3566 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3806 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3567 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3807 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3568 0666; 3808 0666;
3569 3809
3570 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3810 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3571
3572 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3573 | BDB::LOG_AUTOREMOVE, 1);
3574 $DB_ENV->set_lk_detect;
3575 }; 3811 };
3576 3812
3577 cf::cleanup "db_env_open(db): $@" if $@; 3813 cf::cleanup "db_env_open(db): $@" if $@;
3578 }; 3814 };
3579 } 3815 }
3580 3816
3581 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3817 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3582 after => 11, 3818 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3583 interval => 60, 3819 };
3584 hard => 1, 3820 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3585 prio => 0,
3586 data => WF_AUTOCANCEL,
3587 cb => sub {
3588 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3821 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3589 },
3590 ); 3822 };
3591 $BDB_TRICKLE_WATCHER = Event->timer ( 3823 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3592 after => 5,
3593 interval => 10,
3594 hard => 1,
3595 prio => 0,
3596 data => WF_AUTOCANCEL,
3597 cb => sub {
3598 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3824 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3599 },
3600 ); 3825 };
3601} 3826}
3602 3827
3603{ 3828{
3829 # configure IO::AIO
3830
3604 IO::AIO::min_parallel 8; 3831 IO::AIO::min_parallel 8;
3605
3606 undef $Coro::AIO::WATCHER;
3607 IO::AIO::max_poll_time $TICK * 0.1; 3832 IO::AIO::max_poll_time $TICK * 0.1;
3608 $AIO_POLL_WATCHER = Event->io ( 3833 $Coro::AIO::WATCHER->priority (1);
3609 reentrant => 0,
3610 data => WF_AUTOCANCEL,
3611 fd => IO::AIO::poll_fileno,
3612 poll => 'r',
3613 prio => 6,
3614 cb => \&IO::AIO::poll_cb,
3615 );
3616} 3834}
3617 3835
3618my $_log_backtrace; 3836my $_log_backtrace;
3619 3837
3620sub _log_backtrace { 3838sub _log_backtrace {
3624 3842
3625 # limit the # of concurrent backtraces 3843 # limit the # of concurrent backtraces
3626 if ($_log_backtrace < 2) { 3844 if ($_log_backtrace < 2) {
3627 ++$_log_backtrace; 3845 ++$_log_backtrace;
3628 async { 3846 async {
3847 $Coro::current->{desc} = "abt $msg";
3848
3629 my @bt = fork_call { 3849 my @bt = fork_call {
3630 @addr = map { sprintf "%x", $_ } @addr; 3850 @addr = map { sprintf "%x", $_ } @addr;
3631 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3851 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3632 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3852 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3633 or die "addr2line: $!"; 3853 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines