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.364 by root, Tue Sep 11 08:41:11 2007 UTC vs.
Revision 1.433 by root, Sat May 10 22:38:52 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
14 35
15use Coro 3.64 (); 36use Coro ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::Event; 39use Coro::EV;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
43use Coro::AnyEvent;
22use Coro::AIO; 44use Coro::AIO;
45use Coro::BDB;
23use Coro::Storable; 46use Coro::Storable;
24use Coro::Util (); 47use Coro::Util ();
25 48
26use JSON::XS (); 49use JSON::XS 2.01 ();
27use BDB (); 50use BDB ();
28use Data::Dumper; 51use Data::Dumper;
29use Digest::MD5; 52use Digest::MD5;
30use Fcntl; 53use Fcntl;
31use YAML::Syck (); 54use YAML ();
32use IO::AIO 2.32 (); 55use IO::AIO ();
33use Time::HiRes; 56use Time::HiRes;
34use Compress::LZF; 57use Compress::LZF;
35use Digest::MD5 (); 58use Digest::MD5 ();
59
60AnyEvent::detect;
36 61
37# configure various modules to our taste 62# configure various modules to our taste
38# 63#
39$Storable::canonical = 1; # reduce rsync transfers 64$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 65Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 66Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
43$Event::Eval = 1; # no idea why this is required, but it is
44
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47 67
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 68$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 69
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 70sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 71
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 90our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 91our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 92our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 93our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 94our $BDBDIR = "$LOCALDIR/db";
95our %RESOURCE;
75 96
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 97our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 99our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 100our $USE_FSYNC = 1; # use fsync to write maps - default off
83 101
84our $BDB_POLL_WATCHER; 102our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER; 103our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER; 104our $BDB_TRICKLE_WATCHER;
87our $DB_ENV; 105our $DB_ENV;
88 106
89our %CFG; 107our %CFG;
90 108
91our $UPTIME; $UPTIME ||= time; 109our $UPTIME; $UPTIME ||= time;
92our $RUNTIME; 110our $RUNTIME;
111our $NOW;
93 112
94our (%PLAYER, %PLAYER_LOADING); # all users 113our (%PLAYER, %PLAYER_LOADING); # all users
95our (%MAP, %MAP_LOADING ); # all maps 114our (%MAP, %MAP_LOADING ); # all maps
96our $LINK_MAP; # the special {link} map, which is always available 115our $LINK_MAP; # the special {link} map, which is always available
97 116
98# used to convert map paths into valid unix filenames by replacing / by ∕ 117# used to convert map paths into valid unix filenames by replacing / by ∕
99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 118our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
100 119
101our $LOAD; # a number between 0 (idle) and 1 (too many objects) 120our $LOAD; # a number between 0 (idle) and 1 (too many objects)
102our $LOADAVG; # same thing, but with alpha-smoothing 121our $LOADAVG; # same thing, but with alpha-smoothing
122our $JITTER; # average jitter
103our $tick_start; # for load detecting purposes 123our $TICK_START; # for load detecting purposes
104 124
105binmode STDOUT; 125binmode STDOUT;
106binmode STDERR; 126binmode STDERR;
107 127
108# read virtual server time, if available 128# read virtual server time, if available
161 181
162The raw value load value from the last tick. 182The raw value load value from the last tick.
163 183
164=item %cf::CFG 184=item %cf::CFG
165 185
166Configuration for the server, loaded from C</etc/crossfire/config>, or 186Configuration for the server, loaded from C</etc/deliantra-server/config>, or
167from wherever your confdir points to. 187from wherever your confdir points to.
168 188
169=item cf::wait_for_tick, cf::wait_for_tick_begin 189=item cf::wait_for_tick, cf::wait_for_tick_begin
170 190
171These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 191These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
192 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 212 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
193 213
194 LOG llevError, $msg; 214 LOG llevError, $msg;
195 }; 215 };
196} 216}
217
218$Coro::State::DIEHOOK = sub {
219 return unless $^S eq 0; # "eq", not "=="
220
221 if ($Coro::current == $Coro::main) {#d#
222 warn "DIEHOOK called in main context, Coro bug?\n";#d#
223 return;#d#
224 }#d#
225
226 # kill coroutine otherwise
227 warn Carp::longmess $_[0];
228 Coro::terminate
229};
230
231$SIG{__DIE__} = sub { }; #d#?
197 232
198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 233@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
199@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 234@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
200@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 235@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
201@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 236@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
214)) { 249)) {
215 no strict 'refs'; 250 no strict 'refs';
216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 251 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
217} 252}
218 253
219$Event::DIED = sub { 254$EV::DIED = sub {
220 warn "error in event callback: @_"; 255 warn "error in event callback: @_";
221}; 256};
222 257
223############################################################################# 258#############################################################################
224 259
247 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 282 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
248 $d 283 $d
249 } || "[unable to dump $_[0]: '$@']"; 284 } || "[unable to dump $_[0]: '$@']";
250} 285}
251 286
252=item $ref = cf::from_json $json 287=item $ref = cf::decode_json $json
253 288
254Converts a JSON string into the corresponding perl data structure. 289Converts a JSON string into the corresponding perl data structure.
255 290
256=item $json = cf::to_json $ref 291=item $json = cf::encode_json $ref
257 292
258Converts a perl data structure into its JSON representation. 293Converts a perl data structure into its JSON representation.
259 294
260=cut 295=cut
261 296
262our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 297our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
263 298
264sub to_json ($) { $json_coder->encode ($_[0]) } 299sub encode_json($) { $json_coder->encode ($_[0]) }
265sub from_json ($) { $json_coder->decode ($_[0]) } 300sub decode_json($) { $json_coder->decode ($_[0]) }
266 301
267=item cf::lock_wait $string 302=item cf::lock_wait $string
268 303
269Wait until the given lock is available. See cf::lock_acquire. 304Wait until the given lock is available. See cf::lock_acquire.
270 305
326 361
327 ! ! $LOCK{$key} 362 ! ! $LOCK{$key}
328} 363}
329 364
330sub freeze_mainloop { 365sub freeze_mainloop {
331 return unless $TICK_WATCHER->is_active; 366 tick_inhibit_inc;
332 367
333 my $guard = Coro::guard { 368 Coro::guard \&tick_inhibit_dec;
334 $TICK_WATCHER->start; 369}
335 }; 370
336 $TICK_WATCHER->stop; 371=item cf::periodic $interval, $cb
337 $guard 372
373Like EV::periodic, but randomly selects a starting point so that the actions
374get spread over timer.
375
376=cut
377
378sub periodic($$) {
379 my ($interval, $cb) = @_;
380
381 my $start = rand List::Util::min 180, $interval;
382
383 EV::periodic $start, $interval, 0, $cb
338} 384}
339 385
340=item cf::get_slot $time[, $priority[, $name]] 386=item cf::get_slot $time[, $priority[, $name]]
341 387
342Allocate $time seconds of blocking CPU time at priority C<$priority>: 388Allocate $time seconds of blocking CPU time at priority C<$priority>:
353our @SLOT_QUEUE; 399our @SLOT_QUEUE;
354our $SLOT_QUEUE; 400our $SLOT_QUEUE;
355 401
356$SLOT_QUEUE->cancel if $SLOT_QUEUE; 402$SLOT_QUEUE->cancel if $SLOT_QUEUE;
357$SLOT_QUEUE = Coro::async { 403$SLOT_QUEUE = Coro::async {
404 $Coro::current->desc ("timeslot manager");
405
358 my $signal = new Coro::Signal; 406 my $signal = new Coro::Signal;
359 407
360 while () { 408 while () {
361 next_job: 409 next_job:
362 my $avail = cf::till_tick; 410 my $avail = cf::till_tick;
370 } 418 }
371 } 419 }
372 } 420 }
373 421
374 if (@SLOT_QUEUE) { 422 if (@SLOT_QUEUE) {
375 # we do not use wait_For_tick() as it returns immediately when tick is inactive 423 # we do not use wait_for_tick() as it returns immediately when tick is inactive
376 push @cf::WAIT_FOR_TICK, $signal; 424 push @cf::WAIT_FOR_TICK, $signal;
377 $signal->wait; 425 $signal->wait;
378 } else { 426 } else {
379 Coro::schedule; 427 Coro::schedule;
380 } 428 }
381 } 429 }
382}; 430};
383 431
384sub get_slot($;$$) { 432sub get_slot($;$$) {
433 return if tick_inhibit || $Coro::current == $Coro::main;
434
385 my ($time, $pri, $name) = @_; 435 my ($time, $pri, $name) = @_;
386 436
387 $time = $TICK * .6 if $time > $TICK * .6; 437 $time = $TICK * .6 if $time > $TICK * .6;
388 my $sig = new Coro::Signal; 438 my $sig = new Coro::Signal;
389 439
403 453
404BEGIN { *async = \&Coro::async_pool } 454BEGIN { *async = \&Coro::async_pool }
405 455
406=item cf::sync_job { BLOCK } 456=item cf::sync_job { BLOCK }
407 457
408The design of Crossfire TRT requires that the main coroutine ($Coro::main) 458The design of Deliantra requires that the main coroutine ($Coro::main)
409is always able to handle events or runnable, as Crossfire TRT is only 459is 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 460partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
411acceptable. 461acceptable.
412 462
413If it must be done, put the blocking parts into C<sync_job>. This will run 463If 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 464the given BLOCK in another coroutine while waiting for the result. The
419 469
420sub sync_job(&) { 470sub sync_job(&) {
421 my ($job) = @_; 471 my ($job) = @_;
422 472
423 if ($Coro::current == $Coro::main) { 473 if ($Coro::current == $Coro::main) {
424 my $time = Event::time; 474 my $time = EV::time;
425 475
426 # this is the main coro, too bad, we have to block 476 # this is the main coro, too bad, we have to block
427 # till the operation succeeds, freezing the server :/ 477 # till the operation succeeds, freezing the server :/
428 478
429 # TODO: use suspend/resume instead 479 LOG llevError, Carp::longmess "sync job";#d#
430 # (but this is cancel-safe) 480
431 my $freeze_guard = freeze_mainloop; 481 my $freeze_guard = freeze_mainloop;
432 482
433 my $busy = 1; 483 my $busy = 1;
434 my @res; 484 my @res;
435 485
436 (async { 486 (async {
487 $Coro::current->desc ("sync job coro");
437 @res = eval { $job->() }; 488 @res = eval { $job->() };
438 warn $@ if $@; 489 warn $@ if $@;
439 undef $busy; 490 undef $busy;
440 })->prio (Coro::PRIO_MAX); 491 })->prio (Coro::PRIO_MAX);
441 492
442 while ($busy) { 493 while ($busy) {
443 Coro::cede or Event::one_event; 494 if (Coro::nready) {
495 Coro::cede_notself;
496 } else {
497 EV::loop EV::LOOP_ONESHOT;
444 } 498 }
499 }
445 500
446 $time = Event::time - $time; 501 my $time = EV::time - $time;
447 502
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 503 $TICK_START += $time; # do not account sync jobs to server load
452 504
453 wantarray ? @res : $res[0] 505 wantarray ? @res : $res[0]
454 } else { 506 } else {
455 # we are in another coroutine, how wonderful, everything just works 507 # we are in another coroutine, how wonderful, everything just works
456 508
481=item fork_call { }, $args 533=item fork_call { }, $args
482 534
483Executes the given code block with the given arguments in a seperate 535Executes the given code block with the given arguments in a seperate
484process, returning the results. Everything must be serialisable with 536process, returning the results. Everything must be serialisable with
485Coro::Storable. May, of course, block. Note that the executed sub may 537Coro::Storable. May, of course, block. Note that the executed sub may
486never block itself or use any form of Event handling. 538never block itself or use any form of event handling.
487 539
488=cut 540=cut
489 541
490sub fork_call(&@) { 542sub fork_call(&@) {
491 my ($cb, @args) = @_; 543 my ($cb, @args) = @_;
498 reset_signals; 550 reset_signals;
499 &$cb 551 &$cb
500 }, @args; 552 }, @args;
501 553
502 wantarray ? @res : $res[-1] 554 wantarray ? @res : $res[-1]
555}
556
557=item $coin = coin_from_name $name
558
559=cut
560
561our %coin_alias = (
562 "silver" => "silvercoin",
563 "silvercoin" => "silvercoin",
564 "silvercoins" => "silvercoin",
565 "gold" => "goldcoin",
566 "goldcoin" => "goldcoin",
567 "goldcoins" => "goldcoin",
568 "platinum" => "platinacoin",
569 "platinumcoin" => "platinacoin",
570 "platinumcoins" => "platinacoin",
571 "platina" => "platinacoin",
572 "platinacoin" => "platinacoin",
573 "platinacoins" => "platinacoin",
574 "royalty" => "royalty",
575 "royalties" => "royalty",
576);
577
578sub coin_from_name($) {
579 $coin_alias{$_[0]}
580 ? cf::arch::find $coin_alias{$_[0]}
581 : undef
503} 582}
504 583
505=item $value = cf::db_get $family => $key 584=item $value = cf::db_get $family => $key
506 585
507Returns a single value from the environment database. 586Returns a single value from the environment database.
652attach callbacks/event handlers (a collection of which is called an "attachment") 731attach callbacks/event handlers (a collection of which is called an "attachment")
653to it. All such attachable objects support the following methods. 732to it. All such attachable objects support the following methods.
654 733
655In the following description, CLASS can be any of C<global>, C<object> 734In 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 735C<player>, C<client> or C<map> (i.e. the attachable objects in
657Crossfire TRT). 736Deliantra).
658 737
659=over 4 738=over 4
660 739
661=item $attachable->attach ($attachment, key => $value...) 740=item $attachable->attach ($attachment, key => $value...)
662 741
944 } 1023 }
945 1024
946 0 1025 0
947} 1026}
948 1027
949=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1028=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
950 1029
951=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
952 1031
953Generate an object-specific event with the given arguments. 1032Generate an object-specific event with the given arguments.
954 1033
960 1039
961=cut 1040=cut
962 1041
963############################################################################# 1042#############################################################################
964# object support 1043# object support
965#
966 1044
1045sub _object_equal($$);
1046sub _object_equal($$) {
1047 my ($a, $b) = @_;
1048
1049 return 0 unless (ref $a) eq (ref $b);
1050
1051 if ("HASH" eq ref $a) {
1052 my @ka = keys %$a;
1053 my @kb = keys %$b;
1054
1055 return 0 if @ka != @kb;
1056
1057 for (0 .. $#ka) {
1058 return 0 unless $ka[$_] eq $kb[$_];
1059 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1060 }
1061
1062 } elsif ("ARRAY" eq ref $a) {
1063
1064 return 0 if @$a != @$b;
1065
1066 for (0 .. $#$a) {
1067 return 0 unless _object_equal $a->[$_], $b->[$_];
1068 }
1069
1070 } elsif ($a ne $b) {
1071 return 0;
1072 }
1073
1074 1
1075}
1076
1077our $SLOW_MERGES;#d#
967sub _can_merge { 1078sub _can_merge {
968 my ($ob1, $ob2) = @_; 1079 my ($ob1, $ob2) = @_;
969 1080
970 local $Storable::canonical = 1; 1081 ++$SLOW_MERGES;#d#
971 my $fob1 = Storable::freeze $ob1;
972 my $fob2 = Storable::freeze $ob2;
973 1082
974 $fob1 eq $fob2 1083 # we do the slow way here
1084 return _object_equal $ob1, $ob2
975} 1085}
976 1086
977sub reattach { 1087sub reattach {
978 # basically do the same as instantiate, without calling instantiate 1088 # basically do the same as instantiate, without calling instantiate
979 my ($obj) = @_; 1089 my ($obj) = @_;
1001cf::attachable->attach ( 1111cf::attachable->attach (
1002 prio => -1000000, 1112 prio => -1000000,
1003 on_instantiate => sub { 1113 on_instantiate => sub {
1004 my ($obj, $data) = @_; 1114 my ($obj, $data) = @_;
1005 1115
1006 $data = from_json $data; 1116 $data = decode_json $data;
1007 1117
1008 for (@$data) { 1118 for (@$data) {
1009 my ($name, $args) = @$_; 1119 my ($name, $args) = @$_;
1010 1120
1011 $obj->attach ($name, %{$args || {} }); 1121 $obj->attach ($name, %{$args || {} });
1024 }, 1134 },
1025); 1135);
1026 1136
1027sub object_freezer_save { 1137sub object_freezer_save {
1028 my ($filename, $rdata, $objs) = @_; 1138 my ($filename, $rdata, $objs) = @_;
1029
1030 my $guard = cf::lock_acquire "io";
1031 1139
1032 sync_job { 1140 sync_job {
1033 if (length $$rdata) { 1141 if (length $$rdata) {
1034 utf8::decode (my $decname = $filename); 1142 utf8::decode (my $decname = $filename);
1035 warn sprintf "saving %s (%d,%d)\n", 1143 warn sprintf "saving %s (%d,%d)\n",
1036 $decname, length $$rdata, scalar @$objs; 1144 $decname, length $$rdata, scalar @$objs;
1037 1145
1038 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1146 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1039 chmod SAVE_MODE, $fh; 1147 aio_chmod $fh, SAVE_MODE;
1040 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1148 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1041 aio_fsync $fh if $cf::USE_FSYNC; 1149 aio_fsync $fh if $cf::USE_FSYNC;
1042 close $fh; 1150 aio_close $fh;
1043 1151
1044 if (@$objs) { 1152 if (@$objs) {
1045 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1153 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1046 chmod SAVE_MODE, $fh; 1154 aio_chmod $fh, SAVE_MODE;
1047 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1155 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1048 aio_write $fh, 0, (length $data), $data, 0; 1156 aio_write $fh, 0, (length $data), $data, 0;
1049 aio_fsync $fh if $cf::USE_FSYNC; 1157 aio_fsync $fh if $cf::USE_FSYNC;
1050 close $fh; 1158 aio_close $fh;
1051 aio_rename "$filename.pst~", "$filename.pst"; 1159 aio_rename "$filename.pst~", "$filename.pst";
1052 } 1160 }
1053 } else { 1161 } else {
1054 aio_unlink "$filename.pst"; 1162 aio_unlink "$filename.pst";
1055 } 1163 }
1061 } else { 1169 } else {
1062 aio_unlink $filename; 1170 aio_unlink $filename;
1063 aio_unlink "$filename.pst"; 1171 aio_unlink "$filename.pst";
1064 } 1172 }
1065 }; 1173 };
1066
1067 undef $guard;
1068} 1174}
1069 1175
1070sub object_freezer_as_string { 1176sub object_freezer_as_string {
1071 my ($rdata, $objs) = @_; 1177 my ($rdata, $objs) = @_;
1072 1178
1077 1183
1078sub object_thawer_load { 1184sub object_thawer_load {
1079 my ($filename) = @_; 1185 my ($filename) = @_;
1080 1186
1081 my ($data, $av); 1187 my ($data, $av);
1082
1083 my $guard = cf::lock_acquire "io";
1084 1188
1085 (aio_load $filename, $data) >= 0 1189 (aio_load $filename, $data) >= 0
1086 or return; 1190 or return;
1087 1191
1088 unless (aio_stat "$filename.pst") { 1192 unless (aio_stat "$filename.pst") {
1089 (aio_load "$filename.pst", $av) >= 0 1193 (aio_load "$filename.pst", $av) >= 0
1090 or return; 1194 or return;
1091 1195
1092 undef $guard;
1093 $av = eval { (Storable::thaw $av)->{objs} }; 1196 my $st = eval { Coro::Storable::thaw $av };
1197 $av = $st->{objs};
1094 } 1198 }
1095 1199
1096 utf8::decode (my $decname = $filename); 1200 utf8::decode (my $decname = $filename);
1097 warn sprintf "loading %s (%d,%d)\n", 1201 warn sprintf "loading %s (%d,%d)\n",
1098 $decname, length $data, scalar @{$av || []}; 1202 $decname, length $data, scalar @{$av || []};
1254 my $msg = $@ ? "$v->{path}: $@\n" 1358 my $msg = $@ ? "$v->{path}: $@\n"
1255 : "$v->{base}: extension inactive.\n"; 1359 : "$v->{base}: extension inactive.\n";
1256 1360
1257 if (exists $v->{meta}{mandatory}) { 1361 if (exists $v->{meta}{mandatory}) {
1258 warn $msg; 1362 warn $msg;
1259 warn "mandatory extension failed to load, exiting.\n"; 1363 cf::cleanup "mandatory extension failed to load, exiting.";
1260 exit 1;
1261 } 1364 }
1262 1365
1263 warn $msg; 1366 warn $msg;
1264 } 1367 }
1265 1368
1352 aio_unlink +(playerdir $login) . "/$login.pl"; 1455 aio_unlink +(playerdir $login) . "/$login.pl";
1353 1456
1354 my $f = new_from_file cf::object::thawer path $login 1457 my $f = new_from_file cf::object::thawer path $login
1355 or return; 1458 or return;
1356 1459
1357 $f->next;
1358 my $pl = cf::player::load_pl $f 1460 my $pl = cf::player::load_pl $f
1359 or return; 1461 or return;
1462
1360 local $cf::PLAYER_LOADING{$login} = $pl; 1463 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs; 1464 $f->resolve_delayed_derefs;
1362 $cf::PLAYER{$login} = $pl 1465 $cf::PLAYER{$login} = $pl
1363 } 1466 }
1364 } 1467 }
1374 1477
1375 return if $pl->{deny_save}; 1478 return if $pl->{deny_save};
1376 1479
1377 aio_mkdir playerdir $pl, 0770; 1480 aio_mkdir playerdir $pl, 0770;
1378 $pl->{last_save} = $cf::RUNTIME; 1481 $pl->{last_save} = $cf::RUNTIME;
1482
1483 cf::get_slot 0.01;
1379 1484
1380 $pl->save_pl ($path); 1485 $pl->save_pl ($path);
1381 cf::cede_to_tick; 1486 cf::cede_to_tick;
1382} 1487}
1383 1488
1419 $pl->{deny_save} = 1; 1524 $pl->{deny_save} = 1;
1420 $pl->password ("*"); # this should lock out the player until we nuked the dir 1525 $pl->password ("*"); # this should lock out the player until we nuked the dir
1421 1526
1422 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1423 $pl->deactivate; 1528 $pl->deactivate;
1529 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1530 $pl->ob->check_score;
1424 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1531 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1425 $pl->ns->destroy if $pl->ns; 1532 $pl->ns->destroy if $pl->ns;
1426 1533
1427 my $path = playerdir $pl; 1534 my $path = playerdir $pl;
1428 my $temp = "$path~$cf::RUNTIME~deleting~"; 1535 my $temp = "$path~$cf::RUNTIME~deleting~";
1467 1574
1468 for my $login (@$dirs) { 1575 for my $login (@$dirs) {
1469 my $path = path $login; 1576 my $path = path $login;
1470 1577
1471 # a .pst is a dead give-away for a valid player 1578 # a .pst is a dead give-away for a valid player
1472 unless (-e "$path.pst") { 1579 # if no pst file found, open and chekc for blocked users
1580 if (aio_stat "$path.pst") {
1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1581 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1474 aio_read $fh, 0, 512, my $buf, 0 or next; 1582 aio_read $fh, 0, 512, my $buf, 0 or next;
1475 $buf !~ /^password -------------$/m or next; # official not-valid tag 1583 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 } 1584 }
1477 1585
1514 1622
1515Expand crossfire pod fragments into protocol xml. 1623Expand crossfire pod fragments into protocol xml.
1516 1624
1517=cut 1625=cut
1518 1626
1627use re 'eval';
1628
1629my $group;
1630my $interior; $interior = qr{
1631 # match a pod interior sequence sans C<< >>
1632 (?:
1633 \ (.*?)\ (?{ $group = $^N })
1634 | < (??{$interior}) >
1635 )
1636}x;
1637
1519sub expand_cfpod { 1638sub expand_cfpod {
1520 ((my $self), (local $_)) = @_; 1639 my ($self, $pod) = @_;
1521 1640
1522 # escape & and < 1641 my $xml;
1523 s/&/&amp;/g;
1524 s/(?<![BIUGHT])</&lt;/g;
1525 1642
1526 # this is buggy, it needs to properly take care of nested <'s 1643 while () {
1644 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1645 $group = $1;
1527 1646
1528 1 while 1647 $group =~ s/&/&amp;/g;
1529 # replace B<>, I<>, U<> etc. 1648 $group =~ s/</&lt;/g;
1530 s/B<([^\>]*)>/<b>$1<\/b>/ 1649
1531 || s/I<([^\>]*)>/<i>$1<\/i>/ 1650 $xml .= $group;
1532 || s/U<([^\>]*)>/<u>$1<\/u>/ 1651 } elsif ($pod =~ m%\G
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1652 ([BCGHITU])
1534 # replace G<male|female> tags 1653 <
1535 || s{G<([^>|]*)\|([^>]*)>}{ 1654 (?:
1536 $self->gender ? $2 : $1 1655 ([^<>]*) (?{ $group = $^N })
1537 }ge 1656 | < $interior >
1538 # replace H<hint text> 1657 )
1539 || s{H<([^\>]*)>} 1658 >
1659 %gcsx
1540 { 1660 ) {
1661 my ($code, $data) = ($1, $group);
1662
1663 if ($code eq "B") {
1664 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1665 } elsif ($code eq "I") {
1666 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1667 } elsif ($code eq "U") {
1668 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1669 } elsif ($code eq "C") {
1670 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1671 } elsif ($code eq "T") {
1672 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1673 } elsif ($code eq "G") {
1674 my ($male, $female) = split /\|/, $data;
1675 $data = $self->gender ? $female : $male;
1676 $xml .= expand_cfpod ($self, $data);
1677 } elsif ($code eq "H") {
1541 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1678 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1542 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1679 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1543 "") 1680 "")
1544 [$self->{hintmode}] 1681 [$self->{hintmode}];
1682 } else {
1683 $xml .= "error processing '$code($data)' directive";
1545 }ge; 1684 }
1685 } else {
1686 if ($pod =~ /\G(.+)/) {
1687 warn "parse error while expanding $pod (at $1)";
1688 }
1689 last;
1690 }
1691 }
1546 1692
1693 for ($xml) {
1547 # create single paragraphs (very hackish) 1694 # create single paragraphs (very hackish)
1548 s/(?<=\S)\n(?=\w)/ /g; 1695 s/(?<=\S)\n(?=\w)/ /g;
1549 1696
1550 # compress some whitespace 1697 # compress some whitespace
1551 s/\s+\n/\n/g; # ws line-ends 1698 s/\s+\n/\n/g; # ws line-ends
1552 s/\n\n+/\n/g; # double lines 1699 s/\n\n+/\n/g; # double lines
1553 s/^\n+//; # beginning lines 1700 s/^\n+//; # beginning lines
1554 s/\n+$//; # ending lines 1701 s/\n+$//; # ending lines
1702 }
1555 1703
1556 $_ 1704 $xml
1557} 1705}
1706
1707no re 'eval';
1558 1708
1559sub hintmode { 1709sub hintmode {
1560 $_[0]{hintmode} = $_[1] if @_ > 1; 1710 $_[0]{hintmode} = $_[1] if @_ > 1;
1561 $_[0]{hintmode} 1711 $_[0]{hintmode}
1562} 1712}
1634our $MAX_RESET = 3600; 1784our $MAX_RESET = 3600;
1635our $DEFAULT_RESET = 3000; 1785our $DEFAULT_RESET = 3000;
1636 1786
1637sub generate_random_map { 1787sub generate_random_map {
1638 my ($self, $rmp) = @_; 1788 my ($self, $rmp) = @_;
1789
1790 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1791
1639 # mit "rum" bekleckern, nicht 1792 # mit "rum" bekleckern, nicht
1640 $self->_create_random_map ( 1793 $self->_create_random_map (
1641 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1794 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1642 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1795 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1643 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1796 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1765 1918
1766# the temporary/swap location 1919# the temporary/swap location
1767sub save_path { 1920sub save_path {
1768 my ($self) = @_; 1921 my ($self) = @_;
1769 1922
1770 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1923 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1771 "$TMPDIR/$path.map" 1924 "$TMPDIR/$path.map"
1772} 1925}
1773 1926
1774# the unique path, undef == no special unique path 1927# the unique path, undef == no special unique path
1775sub uniq_path { 1928sub uniq_path {
1776 my ($self) = @_; 1929 my ($self) = @_;
1777 1930
1778 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1931 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1779 "$UNIQUEDIR/$path" 1932 "$UNIQUEDIR/$path"
1780} 1933}
1781 1934
1782# and all this just because we cannot iterate over 1935# and all this just because we cannot iterate over
1783# all maps in C++... 1936# all maps in C++...
1881 2034
1882 cf::lock_wait "map_data:$path";#d#remove 2035 cf::lock_wait "map_data:$path";#d#remove
1883 cf::lock_wait "map_find:$path"; 2036 cf::lock_wait "map_find:$path";
1884 2037
1885 $cf::MAP{$path} || do { 2038 $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 2039 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2040 my $guard2 = cf::lock_acquire "map_find:$path";
1888 2041
1889 my $map = new_from_path cf::map $path 2042 my $map = new_from_path cf::map $path
1890 or return; 2043 or return;
1891 2044
1892 $map->{last_save} = $cf::RUNTIME; 2045 $map->{last_save} = $cf::RUNTIME;
1895 or return; 2048 or return;
1896 2049
1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2050 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1898 # doing this can freeze the server in a sync job, obviously 2051 # doing this can freeze the server in a sync job, obviously
1899 #$cf::WAIT_FOR_TICK->wait; 2052 #$cf::WAIT_FOR_TICK->wait;
2053 undef $guard2;
1900 undef $guard1; 2054 undef $guard1;
1901 undef $guard2;
1902 $map->reset; 2055 $map->reset;
1903 return find $path; 2056 return find $path;
1904 } 2057 }
1905 2058
1906 $cf::MAP{$path} = $map 2059 $cf::MAP{$path} = $map
1969 } 2122 }
1970 2123
1971 $self->{last_save} = $cf::RUNTIME; 2124 $self->{last_save} = $cf::RUNTIME;
1972 $self->last_access ($cf::RUNTIME); 2125 $self->last_access ($cf::RUNTIME);
1973 2126
1974 $self->in_memory (cf::MAP_IN_MEMORY); 2127 $self->in_memory (cf::MAP_ACTIVE);
1975 } 2128 }
1976 2129
1977 $self->post_load; 2130 $self->post_load;
1978} 2131}
1979 2132
2037 my ($path, $origin, $load) = @_; 2190 my ($path, $origin, $load) = @_;
2038 2191
2039 $path = normalise $path, $origin && $origin->{path}; 2192 $path = normalise $path, $origin && $origin->{path};
2040 2193
2041 if (my $map = $cf::MAP{$path}) { 2194 if (my $map = $cf::MAP{$path}) {
2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2195 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2043 } 2196 }
2044 2197
2045 $MAP_PREFETCH{$path} |= $load; 2198 $MAP_PREFETCH{$path} |= $load;
2046 2199
2047 $MAP_PREFETCHER ||= cf::async { 2200 $MAP_PREFETCHER ||= cf::async {
2201 $Coro::current->{desc} = "map prefetcher";
2202
2048 while (%MAP_PREFETCH) { 2203 while (%MAP_PREFETCH) {
2049 while (my ($k, $v) = each %MAP_PREFETCH) { 2204 while (my ($k, $v) = each %MAP_PREFETCH) {
2050 if (my $map = find $k) { 2205 if (my $map = find $k) {
2051 $map->load if $v; 2206 $map->load if $v;
2052 } 2207 }
2078 return if $self->{deny_save}; 2233 return if $self->{deny_save};
2079 2234
2080 local $self->{last_access} = $self->last_access;#d# 2235 local $self->{last_access} = $self->last_access;#d#
2081 2236
2082 cf::async { 2237 cf::async {
2238 $Coro::current->{desc} = "map player save";
2083 $_->contr->save for $self->players; 2239 $_->contr->save for $self->players;
2084 }; 2240 };
2241
2242 cf::get_slot 0.02;
2085 2243
2086 if ($uniq) { 2244 if ($uniq) {
2087 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2088 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2246 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2089 } else { 2247 } else {
2098 $self->save; 2256 $self->save;
2099 2257
2100 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2258 my $lock = cf::lock_acquire "map_data:$self->{path}";
2101 2259
2102 return if $self->players; 2260 return if $self->players;
2103 return if $self->in_memory != cf::MAP_IN_MEMORY; 2261 return if $self->in_memory != cf::MAP_ACTIVE;
2104 return if $self->{deny_save}; 2262 return if $self->{deny_save};
2105 2263
2106 $self->in_memory (cf::MAP_SWAPPED); 2264 $self->in_memory (cf::MAP_SWAPPED);
2107 2265
2108 $self->deactivate; 2266 $self->deactivate;
2226 2384
2227sub unique_maps() { 2385sub unique_maps() {
2228 [ 2386 [
2229 map { 2387 map {
2230 utf8::decode $_; 2388 utf8::decode $_;
2231 /\.map$/ 2389 s/\.map$//; # TODO future compatibility hack
2390 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2391 ? ()
2232 ? normalise $_ 2392 : normalise $_
2233 : ()
2234 } @{ aio_readdir $UNIQUEDIR or [] } 2393 } @{ aio_readdir $UNIQUEDIR or [] }
2235 ] 2394 ]
2236} 2395}
2237 2396
2238package cf;
2239
2240=back 2397=back
2241 2398
2242=head3 cf::object 2399=head3 cf::object
2243 2400
2244=cut 2401=cut
2247 2404
2248=over 4 2405=over 4
2249 2406
2250=item $ob->inv_recursive 2407=item $ob->inv_recursive
2251 2408
2252Returns the inventory of the object _and_ their inventories, recursively. 2409Returns the inventory of the object I<and> their inventories, recursively,
2410but I<not> the object itself.
2253 2411
2254=cut 2412=cut
2255 2413
2256sub inv_recursive_; 2414sub inv_recursive_;
2257sub inv_recursive_ { 2415sub inv_recursive_ {
2262 inv_recursive_ inv $_[0] 2420 inv_recursive_ inv $_[0]
2263} 2421}
2264 2422
2265=item $ref = $ob->ref 2423=item $ref = $ob->ref
2266 2424
2267creates and returns a persistent reference to an objetc that can be stored as a string. 2425Creates and returns a persistent reference to an object that can be stored as a string.
2268 2426
2269=item $ob = cf::object::deref ($refstring) 2427=item $ob = cf::object::deref ($refstring)
2270 2428
2271returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2429returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2272even if the object actually exists. May block. 2430even if the object actually exists. May block.
2274=cut 2432=cut
2275 2433
2276sub deref { 2434sub deref {
2277 my ($ref) = @_; 2435 my ($ref) = @_;
2278 2436
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2437 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2); 2438 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2439 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return; 2440 or return;
2286 $pl->ob->uuid eq $uuid 2441 $pl->ob->uuid eq $uuid
2287 or return; 2442 or return;
2307can be C<undef>. Does the right thing when the player is currently in a 2462can be C<undef>. Does the right thing when the player is currently in a
2308dialogue with the given NPC character. 2463dialogue with the given NPC character.
2309 2464
2310=cut 2465=cut
2311 2466
2467our $SAY_CHANNEL = {
2468 id => "say",
2469 title => "Map",
2470 reply => "say ",
2471 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2472};
2473
2474our $CHAT_CHANNEL = {
2475 id => "chat",
2476 title => "Chat",
2477 reply => "chat ",
2478 tooltip => "Player chat and shouts, global to the server.",
2479};
2480
2312# rough implementation of a future "reply" method that works 2481# rough implementation of a future "reply" method that works
2313# with dialog boxes. 2482# with dialog boxes.
2314#TODO: the first argument must go, split into a $npc->reply_to ( method 2483#TODO: the first argument must go, split into a $npc->reply_to ( method
2315sub cf::object::player::reply($$$;$) { 2484sub cf::object::player::reply($$$;$) {
2316 my ($self, $npc, $msg, $flags) = @_; 2485 my ($self, $npc, $msg, $flags) = @_;
2327 my $dialog = $pl->{npc_dialog}; 2496 my $dialog = $pl->{npc_dialog};
2328 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2497 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2329 2498
2330 } else { 2499 } else {
2331 $msg = $npc->name . " says: $msg" if $npc; 2500 $msg = $npc->name . " says: $msg" if $npc;
2332 $self->message ($msg, $flags); 2501 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2333 } 2502 }
2334 } 2503 }
2335} 2504}
2336 2505
2337=item $object->send_msg ($channel, $msg, $color, [extra...]) 2506=item $object->send_msg ($channel, $msg, $color, [extra...])
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2627 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459 2628
2460 $self->enter_link; 2629 $self->enter_link;
2461 2630
2462 (async { 2631 (async {
2632 $Coro::current->{desc} = "player::goto $path $x $y";
2633
2634 # *tag paths override both path and x|y
2635 if ($path =~ /^\*(.*)$/) {
2636 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2637 my $ob = $obs[rand @obs];
2638
2639 # see if we actually can go there
2640 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2641 $ob = $obs[rand @obs];
2642 } else {
2643 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2644 }
2645 # else put us there anyways for now #d#
2646
2647 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2648 } else {
2649 ($path, $x, $y) = (undef, undef, undef);
2650 }
2651 }
2652
2463 my $map = eval { 2653 my $map = eval {
2464 my $map = cf::map::find $path; 2654 my $map = defined $path ? cf::map::find $path : undef;
2465 2655
2466 if ($map) { 2656 if ($map) {
2467 $map = $map->customise_for ($self); 2657 $map = $map->customise_for ($self);
2468 $map = $check->($map) if $check && $map; 2658 $map = $check->($map) if $check && $map;
2469 } else { 2659 } else {
2470 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2660 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2471 } 2661 }
2472 2662
2473 $map 2663 $map
2474 }; 2664 };
2475 2665
2511} 2701}
2512 2702
2513sub prepare_random_map { 2703sub prepare_random_map {
2514 my ($exit) = @_; 2704 my ($exit) = @_;
2515 2705
2516 my $guard = cf::lock_acquire "exit_prepare:$exit";
2517
2518 # all this does is basically replace the /! path by 2706 # all this does is basically replace the /! path by
2519 # a new random map path (?random/...) with a seed 2707 # a new random map path (?random/...) with a seed
2520 # that depends on the exit object 2708 # that depends on the exit object
2521 2709
2522 my $rmp = parse_random_map_params $exit->msg; 2710 my $rmp = parse_random_map_params $exit->msg;
2524 if ($exit->map) { 2712 if ($exit->map) {
2525 $rmp->{region} = $exit->region->name; 2713 $rmp->{region} = $exit->region->name;
2526 $rmp->{origin_map} = $exit->map->path; 2714 $rmp->{origin_map} = $exit->map->path;
2527 $rmp->{origin_x} = $exit->x; 2715 $rmp->{origin_x} = $exit->x;
2528 $rmp->{origin_y} = $exit->y; 2716 $rmp->{origin_y} = $exit->y;
2717
2718 $exit->map->touch;
2529 } 2719 }
2530 2720
2531 $rmp->{random_seed} ||= $exit->random_seed; 2721 $rmp->{random_seed} ||= $exit->random_seed;
2532 2722
2533 my $data = cf::to_json $rmp; 2723 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2534 my $md5 = Digest::MD5::md5_hex $data; 2724 my $md5 = Digest::MD5::md5_hex $data;
2535 my $meta = "$RANDOMDIR/$md5.meta"; 2725 my $meta = "$RANDOMDIR/$md5.meta";
2536 2726
2537 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2727 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2538 aio_write $fh, 0, (length $data), $data, 0; 2728 aio_write $fh, 0, (length $data), $data, 0;
2539 undef $fh; 2729 undef $fh;
2540 aio_rename "$meta~", $meta; 2730 aio_rename "$meta~", $meta;
2541 2731
2732 my $slaying = "?random/$md5";
2733
2734 if ($exit->valid) {
2542 $exit->slaying ("?random/$md5"); 2735 $exit->slaying ("?random/$md5");
2543 $exit->msg (undef); 2736 $exit->msg (undef);
2737 }
2544 } 2738 }
2545} 2739}
2546 2740
2547sub cf::object::player::enter_exit { 2741sub cf::object::player::enter_exit {
2548 my ($self, $exit) = @_; 2742 my ($self, $exit) = @_;
2549 2743
2550 return unless $self->type == cf::PLAYER; 2744 return unless $self->type == cf::PLAYER;
2551 2745
2552 if ($exit->slaying eq "/!") {
2553 #TODO: this should de-fi-ni-te-ly not be a sync-job
2554 # the problem is that $exit might not survive long enough
2555 # so it needs to be done right now, right here
2556 cf::sync_job { prepare_random_map $exit };
2557 }
2558
2559 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2560 my $hp = $exit->stats->hp;
2561 my $sp = $exit->stats->sp;
2562
2563 $self->enter_link; 2746 $self->enter_link;
2564 2747
2565 # if exit is damned, update players death & WoR home-position
2566 $self->contr->savebed ($slaying, $hp, $sp)
2567 if $exit->flag (FLAG_DAMNED);
2568
2569 (async { 2748 (async {
2570 $self->deactivate_recursive; # just to be sure 2749 $Coro::current->{desc} = "enter_exit";
2750
2571 unless (eval { 2751 unless (eval {
2752 $self->deactivate_recursive; # just to be sure
2753
2754 # random map handling
2755 {
2756 my $guard = cf::lock_acquire "exit_prepare:$exit";
2757
2758 prepare_random_map $exit
2759 if $exit->slaying eq "/!";
2760 }
2761
2762 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2763 my $x = $exit->stats->hp;
2764 my $y = $exit->stats->sp;
2765
2572 $self->goto ($slaying, $hp, $sp); 2766 $self->goto ($map, $x, $y);
2573 2767
2768 # if exit is damned, update players death & WoR home-position
2769 $self->contr->savebed ($map, $x, $y)
2770 if $exit->flag (cf::FLAG_DAMNED);
2771
2574 1; 2772 1
2575 }) { 2773 }) {
2576 $self->message ("Something went wrong deep within the crossfire server. " 2774 $self->message ("Something went wrong deep within the crossfire server. "
2577 . "I'll try to bring you back to the map you were before. " 2775 . "I'll try to bring you back to the map you were before. "
2578 . "Please report this to the dungeon master!", 2776 . "Please report this to the dungeon master!",
2579 cf::NDI_UNIQUE | cf::NDI_RED); 2777 cf::NDI_UNIQUE | cf::NDI_RED);
2609the message, with C<log> being the default. If C<$color> is negative, suppress 2807the message, with C<log> being the default. If C<$color> is negative, suppress
2610the message unless the client supports the msg packet. 2808the message unless the client supports the msg packet.
2611 2809
2612=cut 2810=cut
2613 2811
2812# non-persistent channels (usually the info channel)
2614our %CHANNEL = ( 2813our %CHANNEL = (
2615 "c/identify" => { 2814 "c/identify" => {
2616 id => "identify", 2815 id => "infobox",
2617 title => "Identify", 2816 title => "Identify",
2618 reply => undef, 2817 reply => undef,
2619 tooltip => "Items recently identified", 2818 tooltip => "Items recently identified",
2620 }, 2819 },
2621 "c/examine" => { 2820 "c/examine" => {
2622 id => "examine", 2821 id => "infobox",
2623 title => "Examine", 2822 title => "Examine",
2624 reply => undef, 2823 reply => undef,
2625 tooltip => "Signs and other items you examined", 2824 tooltip => "Signs and other items you examined",
2626 }, 2825 },
2826 "c/book" => {
2827 id => "infobox",
2828 title => "Book",
2829 reply => undef,
2830 tooltip => "The contents of a note or book",
2831 },
2832 "c/lookat" => {
2833 id => "infobox",
2834 title => "Look",
2835 reply => undef,
2836 tooltip => "What you saw there",
2837 },
2838 "c/who" => {
2839 id => "infobox",
2840 title => "Players",
2841 reply => undef,
2842 tooltip => "Shows players who are currently online",
2843 },
2844 "c/body" => {
2845 id => "infobox",
2846 title => "Body Parts",
2847 reply => undef,
2848 tooltip => "Shows which body parts you posess and are available",
2849 },
2850 "c/uptime" => {
2851 id => "infobox",
2852 title => "Uptime",
2853 reply => undef,
2854 tooltip => "How long the server has been running since last restart",
2855 },
2856 "c/mapinfo" => {
2857 id => "infobox",
2858 title => "Map Info",
2859 reply => undef,
2860 tooltip => "Information related to the maps",
2861 },
2862 "c/party" => {
2863 id => "party",
2864 title => "Party",
2865 reply => "gsay ",
2866 tooltip => "Messages and chat related to your party",
2867 },
2627); 2868);
2628 2869
2629sub cf::client::send_msg { 2870sub cf::client::send_msg {
2630 my ($self, $channel, $msg, $color, @extra) = @_; 2871 my ($self, $channel, $msg, $color, @extra) = @_;
2631 2872
2632 $msg = $self->pl->expand_cfpod ($msg); 2873 $msg = $self->pl->expand_cfpod ($msg);
2633 2874
2634 $color &= cf::NDI_CLIENT_MASK; # just in case... 2875 $color &= cf::NDI_CLIENT_MASK; # just in case...
2635 2876
2636 # check predefined channels, for the benefit of C 2877 # check predefined channels, for the benefit of C
2637 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2878 if ($CHANNEL{$channel}) {
2879 $channel = $CHANNEL{$channel};
2638 2880
2881 $self->ext_msg (channel_info => $channel)
2882 if $self->can_msg;
2883
2884 $channel = $channel->{id};
2885
2639 if (ref $channel) { 2886 } elsif (ref $channel) {
2640 # send meta info to client, if not yet sent 2887 # send meta info to client, if not yet sent
2641 unless (exists $self->{channel}{$channel->{id}}) { 2888 unless (exists $self->{channel}{$channel->{id}}) {
2642 $self->{channel}{$channel->{id}} = $channel; 2889 $self->{channel}{$channel->{id}} = $channel;
2643 $self->ext_msg (channel_info => $channel) 2890 $self->ext_msg (channel_info => $channel)
2644 if $self->can_msg; 2891 if $self->can_msg;
2861=pod 3108=pod
2862 3109
2863The following functions and methods are available within a safe environment: 3110The following functions and methods are available within a safe environment:
2864 3111
2865 cf::object 3112 cf::object
2866 contr pay_amount pay_player map x y force_find force_add 3113 contr pay_amount pay_player map x y force_find force_add destroy
2867 insert remove name archname title slaying race decrease_ob_nr 3114 insert remove name archname title slaying race decrease split
2868 3115
2869 cf::object::player 3116 cf::object::player
2870 player 3117 player
2871 3118
2872 cf::player 3119 cf::player
2877 3124
2878=cut 3125=cut
2879 3126
2880for ( 3127for (
2881 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3128 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2882 insert remove inv name archname title slaying race 3129 insert remove inv nrof name archname title slaying race
2883 decrease_ob_nr)], 3130 decrease split destroy)],
2884 ["cf::object::player" => qw(player)], 3131 ["cf::object::player" => qw(player)],
2885 ["cf::player" => qw(peaceful)], 3132 ["cf::player" => qw(peaceful)],
2886 ["cf::map" => qw(trigger)], 3133 ["cf::map" => qw(trigger)],
2887) { 3134) {
2888 no strict 'refs'; 3135 no strict 'refs';
2993 { 3240 {
2994 my $faces = $facedata->{faceinfo}; 3241 my $faces = $facedata->{faceinfo};
2995 3242
2996 while (my ($face, $info) = each %$faces) { 3243 while (my ($face, $info) = each %$faces) {
2997 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3244 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3245
2998 cf::face::set_visibility $idx, $info->{visibility}; 3246 cf::face::set_visibility $idx, $info->{visibility};
2999 cf::face::set_magicmap $idx, $info->{magicmap}; 3247 cf::face::set_magicmap $idx, $info->{magicmap};
3000 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3248 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3001 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3249 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3002 3250
3003 cf::cede_to_tick; 3251 cf::cede_to_tick;
3004 } 3252 }
3005 3253
3006 while (my ($face, $info) = each %$faces) { 3254 while (my ($face, $info) = each %$faces) {
3007 next unless $info->{smooth}; 3255 next unless $info->{smooth};
3256
3008 my $idx = cf::face::find $face 3257 my $idx = cf::face::find $face
3009 or next; 3258 or next;
3259
3010 if (my $smooth = cf::face::find $info->{smooth}) { 3260 if (my $smooth = cf::face::find $info->{smooth}) {
3011 cf::face::set_smooth $idx, $smooth; 3261 cf::face::set_smooth $idx, $smooth;
3012 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3262 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3013 } else { 3263 } else {
3014 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3264 warn "smooth face '$info->{smooth}' not found for face '$face'";
3032 { 3282 {
3033 # TODO: for gcfclient pleasure, we should give resources 3283 # TODO: for gcfclient pleasure, we should give resources
3034 # that gcfclient doesn't grok a >10000 face index. 3284 # that gcfclient doesn't grok a >10000 face index.
3035 my $res = $facedata->{resource}; 3285 my $res = $facedata->{resource};
3036 3286
3037 my $soundconf = delete $res->{"res/sound.conf"};
3038
3039 while (my ($name, $info) = each %$res) { 3287 while (my ($name, $info) = each %$res) {
3288 if (defined $info->{type}) {
3040 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3289 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3041 my $data; 3290 my $data;
3042 3291
3043 if ($info->{type} & 1) { 3292 if ($info->{type} & 1) {
3044 # prepend meta info 3293 # prepend meta info
3045 3294
3046 my $meta = $enc->encode ({ 3295 my $meta = $enc->encode ({
3047 name => $name, 3296 name => $name,
3048 %{ $info->{meta} || {} }, 3297 %{ $info->{meta} || {} },
3049 }); 3298 });
3050 3299
3051 $data = pack "(w/a*)*", $meta, $info->{data}; 3300 $data = pack "(w/a*)*", $meta, $info->{data};
3301 } else {
3302 $data = $info->{data};
3303 }
3304
3305 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3306 cf::face::set_type $idx, $info->{type};
3052 } else { 3307 } else {
3053 $data = $info->{data}; 3308 $RESOURCE{$name} = $info;
3054 } 3309 }
3055 3310
3056 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3057 cf::face::set_type $idx, $info->{type};
3058
3059 cf::cede_to_tick; 3311 cf::cede_to_tick;
3060 } 3312 }
3061
3062 if ($soundconf) {
3063 $soundconf = $enc->decode (delete $soundconf->{data});
3064
3065 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3066 my $sound = $soundconf->{compat}[$_]
3067 or next;
3068
3069 my $face = cf::face::find "sound/$sound->[1]";
3070 cf::sound::set $sound->[0] => $face;
3071 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3072 }
3073
3074 while (my ($k, $v) = each %{$soundconf->{event}}) {
3075 my $face = cf::face::find "sound/$v";
3076 cf::sound::set $k => $face;
3077 }
3078 }
3079 } 3313 }
3314
3315 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3080 3316
3081 1 3317 1
3082} 3318}
3319
3320cf::global->attach (on_resource_update => sub {
3321 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3322 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3323
3324 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3325 my $sound = $soundconf->{compat}[$_]
3326 or next;
3327
3328 my $face = cf::face::find "sound/$sound->[1]";
3329 cf::sound::set $sound->[0] => $face;
3330 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3331 }
3332
3333 while (my ($k, $v) = each %{$soundconf->{event}}) {
3334 my $face = cf::face::find "sound/$v";
3335 cf::sound::set $k => $face;
3336 }
3337 }
3338});
3083 3339
3084register_exticmd fx_want => sub { 3340register_exticmd fx_want => sub {
3085 my ($ns, $want) = @_; 3341 my ($ns, $want) = @_;
3086 3342
3087 while (my ($k, $v) = each %$want) { 3343 while (my ($k, $v) = each %$want) {
3088 $ns->fx_want ($k, $v); 3344 $ns->fx_want ($k, $v);
3089 } 3345 }
3090}; 3346};
3347
3348sub load_resource_file($) {
3349 my $guard = lock_acquire "load_resource_file";
3350
3351 my $status = load_resource_file_ $_[0];
3352 get_slot 0.1, 100;
3353 cf::arch::commit_load;
3354
3355 $status
3356}
3091 3357
3092sub reload_regions { 3358sub reload_regions {
3093 # HACK to clear player env face cache, we need some signal framework 3359 # HACK to clear player env face cache, we need some signal framework
3094 # for this (global event?) 3360 # for this (global event?)
3095 %ext::player_env::MUSIC_FACE_CACHE = (); 3361 %ext::player_env::MUSIC_FACE_CACHE = ();
3109} 3375}
3110 3376
3111sub reload_archetypes { 3377sub reload_archetypes {
3112 load_resource_file "$DATADIR/archetypes" 3378 load_resource_file "$DATADIR/archetypes"
3113 or die "unable to load archetypes\n"; 3379 or die "unable to load archetypes\n";
3114 #d# NEED to laod twice to resolve forward references
3115 # this really needs to be done in an extra post-pass
3116 # (which needs to be synchronous, so solve it differently)
3117 load_resource_file "$DATADIR/archetypes"
3118 or die "unable to load archetypes\n";
3119} 3380}
3120 3381
3121sub reload_treasures { 3382sub reload_treasures {
3122 load_resource_file "$DATADIR/treasures" 3383 load_resource_file "$DATADIR/treasures"
3123 or die "unable to load treasurelists\n"; 3384 or die "unable to load treasurelists\n";
3124} 3385}
3125 3386
3126sub reload_resources { 3387sub reload_resources {
3127 warn "reloading resource files...\n"; 3388 warn "reloading resource files...\n";
3128 3389
3390 reload_facedata;
3391 reload_archetypes;
3129 reload_regions; 3392 reload_regions;
3130 reload_facedata;
3131 #reload_archetypes;#d#
3132 reload_archetypes;
3133 reload_treasures; 3393 reload_treasures;
3134 3394
3135 warn "finished reloading resource files\n"; 3395 warn "finished reloading resource files\n";
3136} 3396}
3137 3397
3138sub init { 3398sub init {
3399 my $guard = freeze_mainloop;
3400
3139 reload_resources; 3401 reload_resources;
3140} 3402}
3141 3403
3142sub reload_config { 3404sub reload_config {
3143 open my $fh, "<:utf8", "$CONFDIR/config" 3405 open my $fh, "<:utf8", "$CONFDIR/config"
3144 or return; 3406 or return;
3145 3407
3146 local $/; 3408 local $/;
3147 *CFG = YAML::Syck::Load <$fh>; 3409 *CFG = YAML::Load <$fh>;
3148 3410
3149 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3411 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3150 3412
3151 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3413 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3152 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3414 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3163sub main { 3425sub main {
3164 # we must not ever block the main coroutine 3426 # we must not ever block the main coroutine
3165 local $Coro::idle = sub { 3427 local $Coro::idle = sub {
3166 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3428 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3167 (async { 3429 (async {
3168 Event::one_event; 3430 $Coro::current->{desc} = "IDLE BUG HANDLER";
3431 EV::loop EV::LOOP_ONESHOT;
3169 })->prio (Coro::PRIO_MAX); 3432 })->prio (Coro::PRIO_MAX);
3170 }; 3433 };
3171 3434
3435 {
3436 my $guard = freeze_mainloop;
3172 reload_config; 3437 reload_config;
3173 db_init; 3438 db_init;
3174 load_extensions; 3439 load_extensions;
3175 3440
3176 $TICK_WATCHER->start; 3441 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3442 evthread_start IO::AIO::poll_fileno;
3443 }
3444
3177 Event::loop; 3445 EV::loop;
3178} 3446}
3179 3447
3180############################################################################# 3448#############################################################################
3181# initialisation and cleanup 3449# initialisation and cleanup
3182 3450
3183# install some emergency cleanup handlers 3451# install some emergency cleanup handlers
3184BEGIN { 3452BEGIN {
3453 our %SIGWATCHER = ();
3185 for my $signal (qw(INT HUP TERM)) { 3454 for my $signal (qw(INT HUP TERM)) {
3186 Event->signal ( 3455 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3187 reentrant => 0,
3188 data => WF_AUTOCANCEL,
3189 signal => $signal,
3190 prio => 0,
3191 cb => sub {
3192 cf::cleanup "SIG$signal"; 3456 cf::cleanup "SIG$signal";
3193 },
3194 ); 3457 };
3195 } 3458 }
3196} 3459}
3197 3460
3198sub write_runtime { 3461sub write_runtime_sync {
3199 my $runtime = "$LOCALDIR/runtime"; 3462 my $runtime = "$LOCALDIR/runtime";
3200 3463
3201 # first touch the runtime file to show we are still running: 3464 # first touch the runtime file to show we are still running:
3202 # the fsync below can take a very very long time. 3465 # the fsync below can take a very very long time.
3203 3466
3229 and return; 3492 and return;
3230 3493
3231 warn "runtime file written.\n"; 3494 warn "runtime file written.\n";
3232 3495
3233 1 3496 1
3497}
3498
3499our $uuid_lock;
3500our $uuid_skip;
3501
3502sub write_uuid_sync($) {
3503 $uuid_skip ||= $_[0];
3504
3505 return if $uuid_lock;
3506 local $uuid_lock = 1;
3507
3508 my $uuid = "$LOCALDIR/uuid";
3509
3510 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3511 or return;
3512
3513 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3514 $uuid_skip = 0;
3515
3516 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3517 and return;
3518
3519 # always fsync - this file is important
3520 aio_fsync $fh
3521 and return;
3522
3523 close $fh
3524 or return;
3525
3526 aio_rename "$uuid~", $uuid
3527 and return;
3528
3529 warn "uuid file written ($value).\n";
3530
3531 1
3532
3533}
3534
3535sub write_uuid($$) {
3536 my ($skip, $sync) = @_;
3537
3538 $sync ? write_uuid_sync $skip
3539 : async { write_uuid_sync $skip };
3234} 3540}
3235 3541
3236sub emergency_save() { 3542sub emergency_save() {
3237 my $freeze_guard = cf::freeze_mainloop; 3543 my $freeze_guard = cf::freeze_mainloop;
3238 3544
3244 # and maps saved/destroyed asynchronously. 3550 # and maps saved/destroyed asynchronously.
3245 warn "begin emergency player save\n"; 3551 warn "begin emergency player save\n";
3246 for my $login (keys %cf::PLAYER) { 3552 for my $login (keys %cf::PLAYER) {
3247 my $pl = $cf::PLAYER{$login} or next; 3553 my $pl = $cf::PLAYER{$login} or next;
3248 $pl->valid or next; 3554 $pl->valid or next;
3555 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3249 $pl->save; 3556 $pl->save;
3250 } 3557 }
3251 warn "end emergency player save\n"; 3558 warn "end emergency player save\n";
3252 3559
3253 warn "begin emergency map save\n"; 3560 warn "begin emergency map save\n";
3259 warn "end emergency map save\n"; 3566 warn "end emergency map save\n";
3260 3567
3261 warn "begin emergency database checkpoint\n"; 3568 warn "begin emergency database checkpoint\n";
3262 BDB::db_env_txn_checkpoint $DB_ENV; 3569 BDB::db_env_txn_checkpoint $DB_ENV;
3263 warn "end emergency database checkpoint\n"; 3570 warn "end emergency database checkpoint\n";
3571
3572 warn "begin write uuid\n";
3573 write_uuid_sync 1;
3574 warn "end write uuid\n";
3264 }; 3575 };
3265 3576
3266 warn "leave emergency perl save\n"; 3577 warn "leave emergency perl save\n";
3267} 3578}
3268 3579
3283 warn "reloading..."; 3594 warn "reloading...";
3284 3595
3285 warn "entering sync_job"; 3596 warn "entering sync_job";
3286 3597
3287 cf::sync_job { 3598 cf::sync_job {
3288 cf::write_runtime; # external watchdog should not bark 3599 cf::write_runtime_sync; # external watchdog should not bark
3289 cf::emergency_save; 3600 cf::emergency_save;
3290 cf::write_runtime; # external watchdog should not bark 3601 cf::write_runtime_sync; # external watchdog should not bark
3291 3602
3292 warn "syncing database to disk"; 3603 warn "syncing database to disk";
3293 BDB::db_env_txn_checkpoint $DB_ENV; 3604 BDB::db_env_txn_checkpoint $DB_ENV;
3294 3605
3295 # if anything goes wrong in here, we should simply crash as we already saved 3606 # if anything goes wrong in here, we should simply crash as we already saved
3296
3297 warn "cancelling all WF_AUTOCANCEL watchers";
3298 for (Event::all_watchers) {
3299 $_->cancel if $_->data & WF_AUTOCANCEL;
3300 }
3301 3607
3302 warn "flushing outstanding aio requests"; 3608 warn "flushing outstanding aio requests";
3303 for (;;) { 3609 for (;;) {
3304 BDB::flush; 3610 BDB::flush;
3305 IO::AIO::flush; 3611 IO::AIO::flush;
3306 Coro::cede; 3612 Coro::cede_notself;
3307 last unless IO::AIO::nreqs || BDB::nreqs; 3613 last unless IO::AIO::nreqs || BDB::nreqs;
3308 warn "iterate..."; 3614 warn "iterate...";
3309 } 3615 }
3310 3616
3311 ++$RELOAD; 3617 ++$RELOAD;
3387 warn "leaving sync_job"; 3693 warn "leaving sync_job";
3388 3694
3389 1 3695 1
3390 } or do { 3696 } or do {
3391 warn $@; 3697 warn $@;
3392 warn "error while reloading, exiting."; 3698 cf::cleanup "error while reloading, exiting.";
3393 exit 1;
3394 }; 3699 };
3395 3700
3396 warn "reloaded"; 3701 warn "reloaded";
3397}; 3702};
3398 3703
3400 3705
3401sub reload_perl() { 3706sub reload_perl() {
3402 # doing reload synchronously and two reloads happen back-to-back, 3707 # doing reload synchronously and two reloads happen back-to-back,
3403 # coro crashes during coro_state_free->destroy here. 3708 # coro crashes during coro_state_free->destroy here.
3404 3709
3405 $RELOAD_WATCHER ||= Event->timer ( 3710 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3406 reentrant => 0,
3407 after => 0,
3408 data => WF_AUTOCANCEL,
3409 cb => sub {
3410 do_reload_perl; 3711 do_reload_perl;
3411 undef $RELOAD_WATCHER; 3712 undef $RELOAD_WATCHER;
3412 },
3413 ); 3713 };
3414} 3714}
3415 3715
3416register_command "reload" => sub { 3716register_command "reload" => sub {
3417 my ($who, $arg) = @_; 3717 my ($who, $arg) = @_;
3418 3718
3419 if ($who->flag (FLAG_WIZ)) { 3719 if ($who->flag (FLAG_WIZ)) {
3420 $who->message ("reloading server."); 3720 $who->message ("reloading server.");
3721 async {
3722 $Coro::current->{desc} = "perl_reload";
3421 async { reload_perl }; 3723 reload_perl;
3724 };
3422 } 3725 }
3423}; 3726};
3424 3727
3425unshift @INC, $LIBDIR; 3728unshift @INC, $LIBDIR;
3426 3729
3428 3731
3429our @WAIT_FOR_TICK; 3732our @WAIT_FOR_TICK;
3430our @WAIT_FOR_TICK_BEGIN; 3733our @WAIT_FOR_TICK_BEGIN;
3431 3734
3432sub wait_for_tick { 3735sub wait_for_tick {
3433 return unless $TICK_WATCHER->is_active;
3434 return if $Coro::current == $Coro::main; 3736 return if tick_inhibit || $Coro::current == $Coro::main;
3435 3737
3436 my $signal = new Coro::Signal; 3738 my $signal = new Coro::Signal;
3437 push @WAIT_FOR_TICK, $signal; 3739 push @WAIT_FOR_TICK, $signal;
3438 $signal->wait; 3740 $signal->wait;
3439} 3741}
3440 3742
3441sub wait_for_tick_begin { 3743sub wait_for_tick_begin {
3442 return unless $TICK_WATCHER->is_active;
3443 return if $Coro::current == $Coro::main; 3744 return if tick_inhibit || $Coro::current == $Coro::main;
3444 3745
3445 my $signal = new Coro::Signal; 3746 my $signal = new Coro::Signal;
3446 push @WAIT_FOR_TICK_BEGIN, $signal; 3747 push @WAIT_FOR_TICK_BEGIN, $signal;
3447 $signal->wait; 3748 $signal->wait;
3448} 3749}
3449 3750
3450our $stat_fh; 3751sub tick {
3451sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d#
3452
3453$TICK_WATCHER = Event->timer (
3454 reentrant => 0,
3455 parked => 1,
3456 prio => 0,
3457 at => $NEXT_TICK || $TICK,
3458 data => WF_AUTOCANCEL,
3459 cb => sub {
3460 if ($Coro::current != $Coro::main) { 3752 if ($Coro::current != $Coro::main) {
3461 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3753 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3462 unless ++$bug_warning > 10; 3754 unless ++$bug_warning > 10;
3463 return; 3755 return;
3464 } 3756 }
3465 3757
3466 my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
3467
3468 $NOW = $tick_start = Event::time;
3469
3470 cf::server_tick; # one server iteration 3758 cf::server_tick; # one server iteration
3471 3759
3472 $RUNTIME += $TICK;
3473 $NEXT_TICK += $TICK;
3474
3475 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3760 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3476 $NEXT_RUNTIME_WRITE = $NOW + 10; 3761 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3477 Coro::async_pool { 3762 Coro::async_pool {
3763 $Coro::current->{desc} = "runtime saver";
3478 write_runtime 3764 write_runtime_sync
3479 or warn "ERROR: unable to write runtime file: $!"; 3765 or warn "ERROR: unable to write runtime file: $!";
3480 };
3481 } 3766 };
3767 }
3482 3768
3483# my $AFTER = Event::time;
3484# warn $AFTER - $NOW;#d#
3485
3486 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3769 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3487 $sig->send; 3770 $sig->send;
3488 } 3771 }
3489 while (my $sig = shift @WAIT_FOR_TICK) { 3772 while (my $sig = shift @WAIT_FOR_TICK) {
3490 $sig->send; 3773 $sig->send;
3491 } 3774 }
3492 3775
3493 $NOW = Event::time; 3776 $LOAD = ($NOW - $TICK_START) / $TICK;
3494
3495 # if we are delayed by four ticks or more, skip them all
3496 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3497
3498 $TICK_WATCHER->at ($NEXT_TICK);
3499 $TICK_WATCHER->start;
3500
3501 $LOAD = ($NOW - $tick_start) / $TICK;
3502 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3777 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3503 3778
3504 _post_tick; 3779 if (0) {
3505 3780 if ($NEXT_TICK) {
3506 # gather some statistics#d# 3781 my $jitter = $TICK_START - $NEXT_TICK;
3507 $stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d# 3782 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3508 IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d# 3783 warn "jitter $JITTER\n";#d#
3784 }
3509 }, 3785 }
3510); 3786}
3511 3787
3512{ 3788{
3789 # configure BDB
3790
3513 BDB::min_parallel 8; 3791 BDB::min_parallel 8;
3514 BDB::max_poll_time $TICK * 0.1; 3792 BDB::max_poll_reqs $TICK * 0.1;
3515 $BDB_POLL_WATCHER = Event->io ( 3793 $AnyEvent::BDB::WATCHER->priority (1);
3516 reentrant => 0,
3517 fd => BDB::poll_fileno,
3518 poll => 'r',
3519 prio => 0,
3520 data => WF_AUTOCANCEL,
3521 cb => \&BDB::poll_cb,
3522 );
3523
3524 BDB::set_sync_prepare {
3525 my $status;
3526 my $current = $Coro::current;
3527 (
3528 sub {
3529 $status = $!;
3530 $current->ready; undef $current;
3531 },
3532 sub {
3533 Coro::schedule while defined $current;
3534 $! = $status;
3535 },
3536 )
3537 };
3538 3794
3539 unless ($DB_ENV) { 3795 unless ($DB_ENV) {
3540 $DB_ENV = BDB::db_env_create; 3796 $DB_ENV = BDB::db_env_create;
3797 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3798 | BDB::LOG_AUTOREMOVE, 1);
3799 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3800 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3541 3801
3542 cf::sync_job { 3802 cf::sync_job {
3543 eval { 3803 eval {
3544 BDB::db_env_open 3804 BDB::db_env_open
3545 $DB_ENV, 3805 $DB_ENV,
3547 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3807 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3548 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3808 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3549 0666; 3809 0666;
3550 3810
3551 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3811 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3552
3553 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3554 | BDB::LOG_AUTOREMOVE, 1);
3555 $DB_ENV->set_lk_detect;
3556 }; 3812 };
3557 3813
3558 cf::cleanup "db_env_open(db): $@" if $@; 3814 cf::cleanup "db_env_open(db): $@" if $@;
3559 }; 3815 };
3560 } 3816 }
3561 3817
3562 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3818 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3563 after => 11, 3819 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3564 interval => 60, 3820 };
3565 hard => 1, 3821 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3566 prio => 0,
3567 data => WF_AUTOCANCEL,
3568 cb => sub {
3569 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3822 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3570 },
3571 ); 3823 };
3572 $BDB_TRICKLE_WATCHER = Event->timer ( 3824 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3573 after => 5,
3574 interval => 10,
3575 hard => 1,
3576 prio => 0,
3577 data => WF_AUTOCANCEL,
3578 cb => sub {
3579 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3825 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3580 },
3581 ); 3826 };
3582} 3827}
3583 3828
3584{ 3829{
3830 # configure IO::AIO
3831
3585 IO::AIO::min_parallel 8; 3832 IO::AIO::min_parallel 8;
3586
3587 undef $Coro::AIO::WATCHER;
3588 IO::AIO::max_poll_time $TICK * 0.1; 3833 IO::AIO::max_poll_time $TICK * 0.1;
3589 $AIO_POLL_WATCHER = Event->io ( 3834 $AnyEvent::AIO::WATCHER->priority (1);
3590 reentrant => 0,
3591 data => WF_AUTOCANCEL,
3592 fd => IO::AIO::poll_fileno,
3593 poll => 'r',
3594 prio => 6,
3595 cb => \&IO::AIO::poll_cb,
3596 );
3597} 3835}
3598 3836
3599my $_log_backtrace; 3837my $_log_backtrace;
3600 3838
3601sub _log_backtrace { 3839sub _log_backtrace {
3605 3843
3606 # limit the # of concurrent backtraces 3844 # limit the # of concurrent backtraces
3607 if ($_log_backtrace < 2) { 3845 if ($_log_backtrace < 2) {
3608 ++$_log_backtrace; 3846 ++$_log_backtrace;
3609 async { 3847 async {
3848 $Coro::current->{desc} = "abt $msg";
3849
3610 my @bt = fork_call { 3850 my @bt = fork_call {
3611 @addr = map { sprintf "%x", $_ } @addr; 3851 @addr = map { sprintf "%x", $_ } @addr;
3612 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3852 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3613 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3853 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3614 or die "addr2line: $!"; 3854 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines