ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.373 by root, Sat Sep 15 15:58:06 2007 UTC vs.
Revision 1.440 by root, Mon Aug 11 23:23:41 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::AnyEvent;
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 1.6;
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;
85our $BDB_DEADLOCK_WATCHER; 102our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 103our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 104our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 105our $DB_ENV;
89 106
90our %CFG; 107our %CFG;
91 108
92our $UPTIME; $UPTIME ||= time; 109our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 110our $RUNTIME;
111our $NOW;
94 112
95our (%PLAYER, %PLAYER_LOADING); # all users 113our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 114our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 115our $LINK_MAP; # the special {link} map, which is always available
98 116
99# 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 ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 118our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 119
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 120our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 121our $LOADAVG; # same thing, but with alpha-smoothing
122our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 123our $TICK_START; # for load detecting purposes
105 124
106binmode STDOUT; 125binmode STDOUT;
107binmode STDERR; 126binmode STDERR;
108 127
109# read virtual server time, if available 128# read virtual server time, if available
162 181
163The raw value load value from the last tick. 182The raw value load value from the last tick.
164 183
165=item %cf::CFG 184=item %cf::CFG
166 185
167Configuration for the server, loaded from C</etc/crossfire/config>, or 186Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 187from wherever your confdir points to.
169 188
170=item cf::wait_for_tick, cf::wait_for_tick_begin 189=item cf::wait_for_tick, cf::wait_for_tick_begin
171 190
172These 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
193 $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;
194 213
195 LOG llevError, $msg; 214 LOG llevError, $msg;
196 }; 215 };
197} 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#?
198 232
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 233@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 234@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 235@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 236@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 243for my $pkg (qw(
210 cf::global cf::attachable 244 cf::global cf::attachable
211 cf::object cf::object::player 245 cf::object cf::object::player
212 cf::client cf::player 246 cf::client cf::player
213 cf::arch cf::living 247 cf::arch cf::living
248 cf::map cf::mapspace
214 cf::map cf::party cf::region 249 cf::party cf::region
215)) { 250)) {
216 no strict 'refs'; 251 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 252 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 253}
219 254
220$Event::DIED = sub { 255$EV::DIED = sub {
221 warn "error in event callback: @_"; 256 warn "error in event callback: @_";
222}; 257};
223 258
224############################################################################# 259#############################################################################
225 260
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 283 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 284 $d
250 } || "[unable to dump $_[0]: '$@']"; 285 } || "[unable to dump $_[0]: '$@']";
251} 286}
252 287
253=item $ref = cf::from_json $json 288=item $ref = cf::decode_json $json
254 289
255Converts a JSON string into the corresponding perl data structure. 290Converts a JSON string into the corresponding perl data structure.
256 291
257=item $json = cf::to_json $ref 292=item $json = cf::encode_json $ref
258 293
259Converts a perl data structure into its JSON representation. 294Converts a perl data structure into its JSON representation.
260 295
261=cut 296=cut
262 297
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 298our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 299
265sub to_json ($) { $json_coder->encode ($_[0]) } 300sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 301sub decode_json($) { $json_coder->decode ($_[0]) }
267 302
268=item cf::lock_wait $string 303=item cf::lock_wait $string
269 304
270Wait until the given lock is available. See cf::lock_acquire. 305Wait until the given lock is available. See cf::lock_acquire.
271 306
327 362
328 ! ! $LOCK{$key} 363 ! ! $LOCK{$key}
329} 364}
330 365
331sub freeze_mainloop { 366sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 367 tick_inhibit_inc;
333 368
334 my $guard = Coro::guard { 369 Coro::guard \&tick_inhibit_dec;
335 $TICK_WATCHER->start; 370}
336 }; 371
337 $TICK_WATCHER->stop; 372=item cf::periodic $interval, $cb
338 $guard 373
374Like EV::periodic, but randomly selects a starting point so that the actions
375get spread over timer.
376
377=cut
378
379sub periodic($$) {
380 my ($interval, $cb) = @_;
381
382 my $start = rand List::Util::min 180, $interval;
383
384 EV::periodic $start, $interval, 0, $cb
339} 385}
340 386
341=item cf::get_slot $time[, $priority[, $name]] 387=item cf::get_slot $time[, $priority[, $name]]
342 388
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 389Allocate $time seconds of blocking CPU time at priority C<$priority>:
354our @SLOT_QUEUE; 400our @SLOT_QUEUE;
355our $SLOT_QUEUE; 401our $SLOT_QUEUE;
356 402
357$SLOT_QUEUE->cancel if $SLOT_QUEUE; 403$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async { 404$SLOT_QUEUE = Coro::async {
405 $Coro::current->desc ("timeslot manager");
406
359 my $signal = new Coro::Signal; 407 my $signal = new Coro::Signal;
360 408
361 while () { 409 while () {
362 next_job: 410 next_job:
363 my $avail = cf::till_tick; 411 my $avail = cf::till_tick;
371 } 419 }
372 } 420 }
373 } 421 }
374 422
375 if (@SLOT_QUEUE) { 423 if (@SLOT_QUEUE) {
376 # we do not use wait_For_tick() as it returns immediately when tick is inactive 424 # we do not use wait_for_tick() as it returns immediately when tick is inactive
377 push @cf::WAIT_FOR_TICK, $signal; 425 push @cf::WAIT_FOR_TICK, $signal;
378 $signal->wait; 426 $signal->wait;
379 } else { 427 } else {
380 Coro::schedule; 428 Coro::schedule;
381 } 429 }
382 } 430 }
383}; 431};
384 432
385sub get_slot($;$$) { 433sub get_slot($;$$) {
434 return if tick_inhibit || $Coro::current == $Coro::main;
435
386 my ($time, $pri, $name) = @_; 436 my ($time, $pri, $name) = @_;
387 437
388 $time = $TICK * .6 if $time > $TICK * .6; 438 $time = $TICK * .6 if $time > $TICK * .6;
389 my $sig = new Coro::Signal; 439 my $sig = new Coro::Signal;
390 440
404 454
405BEGIN { *async = \&Coro::async_pool } 455BEGIN { *async = \&Coro::async_pool }
406 456
407=item cf::sync_job { BLOCK } 457=item cf::sync_job { BLOCK }
408 458
409The design of Crossfire TRT requires that the main coroutine ($Coro::main) 459The design of Deliantra requires that the main coroutine ($Coro::main)
410is always able to handle events or runnable, as Crossfire TRT is only 460is always able to handle events or runnable, as Deliantra is only
411partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 461partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
412acceptable. 462acceptable.
413 463
414If it must be done, put the blocking parts into C<sync_job>. This will run 464If it must be done, put the blocking parts into C<sync_job>. This will run
415the given BLOCK in another coroutine while waiting for the result. The 465the given BLOCK in another coroutine while waiting for the result. The
420 470
421sub sync_job(&) { 471sub sync_job(&) {
422 my ($job) = @_; 472 my ($job) = @_;
423 473
424 if ($Coro::current == $Coro::main) { 474 if ($Coro::current == $Coro::main) {
425 my $time = Event::time; 475 my $time = EV::time;
426 476
427 # this is the main coro, too bad, we have to block 477 # this is the main coro, too bad, we have to block
428 # till the operation succeeds, freezing the server :/ 478 # till the operation succeeds, freezing the server :/
429 479
430 # TODO: use suspend/resume instead 480 LOG llevError, Carp::longmess "sync job";#d#
431 # (but this is cancel-safe) 481
432 my $freeze_guard = freeze_mainloop; 482 my $freeze_guard = freeze_mainloop;
433 483
434 my $busy = 1; 484 my $busy = 1;
435 my @res; 485 my @res;
436 486
437 (async { 487 (async {
488 $Coro::current->desc ("sync job coro");
438 @res = eval { $job->() }; 489 @res = eval { $job->() };
439 warn $@ if $@; 490 warn $@ if $@;
440 undef $busy; 491 undef $busy;
441 })->prio (Coro::PRIO_MAX); 492 })->prio (Coro::PRIO_MAX);
442 493
443 while ($busy) { 494 while ($busy) {
444 Coro::cede or Event::one_event; 495 if (Coro::nready) {
496 Coro::cede_notself;
497 } else {
498 EV::loop EV::LOOP_ONESHOT;
445 } 499 }
500 }
446 501
447 $time = Event::time - $time; 502 my $time = EV::time - $time;
448 503
449 LOG llevError | logBacktrace, Carp::longmess "long sync job"
450 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
451
452 $tick_start += $time; # do not account sync jobs to server load 504 $TICK_START += $time; # do not account sync jobs to server load
453 505
454 wantarray ? @res : $res[0] 506 wantarray ? @res : $res[0]
455 } else { 507 } else {
456 # we are in another coroutine, how wonderful, everything just works 508 # we are in another coroutine, how wonderful, everything just works
457 509
482=item fork_call { }, $args 534=item fork_call { }, $args
483 535
484Executes the given code block with the given arguments in a seperate 536Executes the given code block with the given arguments in a seperate
485process, returning the results. Everything must be serialisable with 537process, returning the results. Everything must be serialisable with
486Coro::Storable. May, of course, block. Note that the executed sub may 538Coro::Storable. May, of course, block. Note that the executed sub may
487never block itself or use any form of Event handling. 539never block itself or use any form of event handling.
488 540
489=cut 541=cut
490 542
491sub fork_call(&@) { 543sub fork_call(&@) {
492 my ($cb, @args) = @_; 544 my ($cb, @args) = @_;
499 reset_signals; 551 reset_signals;
500 &$cb 552 &$cb
501 }, @args; 553 }, @args;
502 554
503 wantarray ? @res : $res[-1] 555 wantarray ? @res : $res[-1]
556}
557
558=item $coin = coin_from_name $name
559
560=cut
561
562our %coin_alias = (
563 "silver" => "silvercoin",
564 "silvercoin" => "silvercoin",
565 "silvercoins" => "silvercoin",
566 "gold" => "goldcoin",
567 "goldcoin" => "goldcoin",
568 "goldcoins" => "goldcoin",
569 "platinum" => "platinacoin",
570 "platinumcoin" => "platinacoin",
571 "platinumcoins" => "platinacoin",
572 "platina" => "platinacoin",
573 "platinacoin" => "platinacoin",
574 "platinacoins" => "platinacoin",
575 "royalty" => "royalty",
576 "royalties" => "royalty",
577);
578
579sub coin_from_name($) {
580 $coin_alias{$_[0]}
581 ? cf::arch::find $coin_alias{$_[0]}
582 : undef
504} 583}
505 584
506=item $value = cf::db_get $family => $key 585=item $value = cf::db_get $family => $key
507 586
508Returns a single value from the environment database. 587Returns a single value from the environment database.
653attach callbacks/event handlers (a collection of which is called an "attachment") 732attach callbacks/event handlers (a collection of which is called an "attachment")
654to it. All such attachable objects support the following methods. 733to it. All such attachable objects support the following methods.
655 734
656In the following description, CLASS can be any of C<global>, C<object> 735In the following description, CLASS can be any of C<global>, C<object>
657C<player>, C<client> or C<map> (i.e. the attachable objects in 736C<player>, C<client> or C<map> (i.e. the attachable objects in
658Crossfire TRT). 737Deliantra).
659 738
660=over 4 739=over 4
661 740
662=item $attachable->attach ($attachment, key => $value...) 741=item $attachable->attach ($attachment, key => $value...)
663 742
945 } 1024 }
946 1025
947 0 1026 0
948} 1027}
949 1028
950=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1029=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
951 1030
952=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1031=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
953 1032
954Generate an object-specific event with the given arguments. 1033Generate an object-specific event with the given arguments.
955 1034
961 1040
962=cut 1041=cut
963 1042
964############################################################################# 1043#############################################################################
965# object support 1044# object support
966#
967 1045
1046sub _object_equal($$);
1047sub _object_equal($$) {
1048 my ($a, $b) = @_;
1049
1050 return 0 unless (ref $a) eq (ref $b);
1051
1052 if ("HASH" eq ref $a) {
1053 my @ka = keys %$a;
1054 my @kb = keys %$b;
1055
1056 return 0 if @ka != @kb;
1057
1058 for (0 .. $#ka) {
1059 return 0 unless $ka[$_] eq $kb[$_];
1060 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1061 }
1062
1063 } elsif ("ARRAY" eq ref $a) {
1064
1065 return 0 if @$a != @$b;
1066
1067 for (0 .. $#$a) {
1068 return 0 unless _object_equal $a->[$_], $b->[$_];
1069 }
1070
1071 } elsif ($a ne $b) {
1072 return 0;
1073 }
1074
1075 1
1076}
1077
1078our $SLOW_MERGES;#d#
968sub _can_merge { 1079sub _can_merge {
969 my ($ob1, $ob2) = @_; 1080 my ($ob1, $ob2) = @_;
970 1081
971 local $Storable::canonical = 1; 1082 ++$SLOW_MERGES;#d#
972 my $fob1 = Storable::freeze $ob1;
973 my $fob2 = Storable::freeze $ob2;
974 1083
975 $fob1 eq $fob2 1084 # we do the slow way here
1085 return _object_equal $ob1, $ob2
976} 1086}
977 1087
978sub reattach { 1088sub reattach {
979 # basically do the same as instantiate, without calling instantiate 1089 # basically do the same as instantiate, without calling instantiate
980 my ($obj) = @_; 1090 my ($obj) = @_;
1002cf::attachable->attach ( 1112cf::attachable->attach (
1003 prio => -1000000, 1113 prio => -1000000,
1004 on_instantiate => sub { 1114 on_instantiate => sub {
1005 my ($obj, $data) = @_; 1115 my ($obj, $data) = @_;
1006 1116
1007 $data = from_json $data; 1117 $data = decode_json $data;
1008 1118
1009 for (@$data) { 1119 for (@$data) {
1010 my ($name, $args) = @$_; 1120 my ($name, $args) = @$_;
1011 1121
1012 $obj->attach ($name, %{$args || {} }); 1122 $obj->attach ($name, %{$args || {} });
1033 utf8::decode (my $decname = $filename); 1143 utf8::decode (my $decname = $filename);
1034 warn sprintf "saving %s (%d,%d)\n", 1144 warn sprintf "saving %s (%d,%d)\n",
1035 $decname, length $$rdata, scalar @$objs; 1145 $decname, length $$rdata, scalar @$objs;
1036 1146
1037 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1147 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1038 chmod SAVE_MODE, $fh; 1148 aio_chmod $fh, SAVE_MODE;
1039 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1149 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1040 aio_fsync $fh if $cf::USE_FSYNC; 1150 aio_fsync $fh if $cf::USE_FSYNC;
1041 close $fh; 1151 aio_close $fh;
1042 1152
1043 if (@$objs) { 1153 if (@$objs) {
1044 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1154 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1045 chmod SAVE_MODE, $fh; 1155 aio_chmod $fh, SAVE_MODE;
1046 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1156 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1047 aio_write $fh, 0, (length $data), $data, 0; 1157 aio_write $fh, 0, (length $data), $data, 0;
1048 aio_fsync $fh if $cf::USE_FSYNC; 1158 aio_fsync $fh if $cf::USE_FSYNC;
1049 close $fh; 1159 aio_close $fh;
1050 aio_rename "$filename.pst~", "$filename.pst"; 1160 aio_rename "$filename.pst~", "$filename.pst";
1051 } 1161 }
1052 } else { 1162 } else {
1053 aio_unlink "$filename.pst"; 1163 aio_unlink "$filename.pst";
1054 } 1164 }
1082 1192
1083 unless (aio_stat "$filename.pst") { 1193 unless (aio_stat "$filename.pst") {
1084 (aio_load "$filename.pst", $av) >= 0 1194 (aio_load "$filename.pst", $av) >= 0
1085 or return; 1195 or return;
1086 1196
1087 $av = eval { (Storable::thaw $av)->{objs} }; 1197 my $st = eval { Coro::Storable::thaw $av };
1198 $av = $st->{objs};
1088 } 1199 }
1089 1200
1090 utf8::decode (my $decname = $filename); 1201 utf8::decode (my $decname = $filename);
1091 warn sprintf "loading %s (%d,%d)\n", 1202 warn sprintf "loading %s (%d,%d)\n",
1092 $decname, length $data, scalar @{$av || []}; 1203 $decname, length $data, scalar @{$av || []};
1248 my $msg = $@ ? "$v->{path}: $@\n" 1359 my $msg = $@ ? "$v->{path}: $@\n"
1249 : "$v->{base}: extension inactive.\n"; 1360 : "$v->{base}: extension inactive.\n";
1250 1361
1251 if (exists $v->{meta}{mandatory}) { 1362 if (exists $v->{meta}{mandatory}) {
1252 warn $msg; 1363 warn $msg;
1253 warn "mandatory extension failed to load, exiting.\n"; 1364 cf::cleanup "mandatory extension failed to load, exiting.";
1254 exit 1;
1255 } 1365 }
1256 1366
1257 warn $msg; 1367 warn $msg;
1258 } 1368 }
1259 1369
1348 my $f = new_from_file cf::object::thawer path $login 1458 my $f = new_from_file cf::object::thawer path $login
1349 or return; 1459 or return;
1350 1460
1351 my $pl = cf::player::load_pl $f 1461 my $pl = cf::player::load_pl $f
1352 or return; 1462 or return;
1463
1353 local $cf::PLAYER_LOADING{$login} = $pl; 1464 local $cf::PLAYER_LOADING{$login} = $pl;
1354 $f->resolve_delayed_derefs; 1465 $f->resolve_delayed_derefs;
1355 $cf::PLAYER{$login} = $pl 1466 $cf::PLAYER{$login} = $pl
1356 } 1467 }
1357 } 1468 }
1367 1478
1368 return if $pl->{deny_save}; 1479 return if $pl->{deny_save};
1369 1480
1370 aio_mkdir playerdir $pl, 0770; 1481 aio_mkdir playerdir $pl, 0770;
1371 $pl->{last_save} = $cf::RUNTIME; 1482 $pl->{last_save} = $cf::RUNTIME;
1483
1484 cf::get_slot 0.01;
1372 1485
1373 $pl->save_pl ($path); 1486 $pl->save_pl ($path);
1374 cf::cede_to_tick; 1487 cf::cede_to_tick;
1375} 1488}
1376 1489
1412 $pl->{deny_save} = 1; 1525 $pl->{deny_save} = 1;
1413 $pl->password ("*"); # this should lock out the player until we nuked the dir 1526 $pl->password ("*"); # this should lock out the player until we nuked the dir
1414 1527
1415 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1528 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1416 $pl->deactivate; 1529 $pl->deactivate;
1530 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1531 $pl->ob->check_score;
1417 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1532 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1418 $pl->ns->destroy if $pl->ns; 1533 $pl->ns->destroy if $pl->ns;
1419 1534
1420 my $path = playerdir $pl; 1535 my $path = playerdir $pl;
1421 my $temp = "$path~$cf::RUNTIME~deleting~"; 1536 my $temp = "$path~$cf::RUNTIME~deleting~";
1460 1575
1461 for my $login (@$dirs) { 1576 for my $login (@$dirs) {
1462 my $path = path $login; 1577 my $path = path $login;
1463 1578
1464 # a .pst is a dead give-away for a valid player 1579 # a .pst is a dead give-away for a valid player
1465 unless (-e "$path.pst") { 1580 # if no pst file found, open and chekc for blocked users
1581 if (aio_stat "$path.pst") {
1466 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1582 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1467 aio_read $fh, 0, 512, my $buf, 0 or next; 1583 aio_read $fh, 0, 512, my $buf, 0 or next;
1468 $buf !~ /^password -------------$/m or next; # official not-valid tag 1584 $buf !~ /^password -------------$/m or next; # official not-valid tag
1469 } 1585 }
1470 1586
1507 1623
1508Expand crossfire pod fragments into protocol xml. 1624Expand crossfire pod fragments into protocol xml.
1509 1625
1510=cut 1626=cut
1511 1627
1628use re 'eval';
1629
1630my $group;
1631my $interior; $interior = qr{
1632 # match a pod interior sequence sans C<< >>
1633 (?:
1634 \ (.*?)\ (?{ $group = $^N })
1635 | < (??{$interior}) >
1636 )
1637}x;
1638
1512sub expand_cfpod { 1639sub expand_cfpod {
1513 ((my $self), (local $_)) = @_; 1640 my ($self, $pod) = @_;
1514 1641
1515 # escape & and < 1642 my $xml;
1516 s/&/&amp;/g;
1517 s/(?<![BIUGHT])</&lt;/g;
1518 1643
1519 # this is buggy, it needs to properly take care of nested <'s 1644 while () {
1645 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1646 $group = $1;
1520 1647
1521 1 while 1648 $group =~ s/&/&amp;/g;
1522 # replace B<>, I<>, U<> etc. 1649 $group =~ s/</&lt;/g;
1523 s/B<([^\>]*)>/<b>$1<\/b>/ 1650
1524 || s/I<([^\>]*)>/<i>$1<\/i>/ 1651 $xml .= $group;
1525 || s/U<([^\>]*)>/<u>$1<\/u>/ 1652 } elsif ($pod =~ m%\G
1526 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1653 ([BCGHITU])
1527 # replace G<male|female> tags 1654 <
1528 || s{G<([^>|]*)\|([^>]*)>}{ 1655 (?:
1529 $self->gender ? $2 : $1 1656 ([^<>]*) (?{ $group = $^N })
1530 }ge 1657 | < $interior >
1531 # replace H<hint text> 1658 )
1532 || s{H<([^\>]*)>} 1659 >
1660 %gcsx
1533 { 1661 ) {
1662 my ($code, $data) = ($1, $group);
1663
1664 if ($code eq "B") {
1665 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1666 } elsif ($code eq "I") {
1667 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1668 } elsif ($code eq "U") {
1669 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1670 } elsif ($code eq "C") {
1671 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1672 } elsif ($code eq "T") {
1673 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1674 } elsif ($code eq "G") {
1675 my ($male, $female) = split /\|/, $data;
1676 $data = $self->gender ? $female : $male;
1677 $xml .= expand_cfpod ($self, $data);
1678 } elsif ($code eq "H") {
1534 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1679 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1535 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1680 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1536 "") 1681 "")
1537 [$self->{hintmode}] 1682 [$self->{hintmode}];
1683 } else {
1684 $xml .= "error processing '$code($data)' directive";
1538 }ge; 1685 }
1686 } else {
1687 if ($pod =~ /\G(.+)/) {
1688 warn "parse error while expanding $pod (at $1)";
1689 }
1690 last;
1691 }
1692 }
1539 1693
1694 for ($xml) {
1540 # create single paragraphs (very hackish) 1695 # create single paragraphs (very hackish)
1541 s/(?<=\S)\n(?=\w)/ /g; 1696 s/(?<=\S)\n(?=\w)/ /g;
1542 1697
1543 # compress some whitespace 1698 # compress some whitespace
1544 s/\s+\n/\n/g; # ws line-ends 1699 s/\s+\n/\n/g; # ws line-ends
1545 s/\n\n+/\n/g; # double lines 1700 s/\n\n+/\n/g; # double lines
1546 s/^\n+//; # beginning lines 1701 s/^\n+//; # beginning lines
1547 s/\n+$//; # ending lines 1702 s/\n+$//; # ending lines
1703 }
1548 1704
1549 $_ 1705 $xml
1550} 1706}
1707
1708no re 'eval';
1551 1709
1552sub hintmode { 1710sub hintmode {
1553 $_[0]{hintmode} = $_[1] if @_ > 1; 1711 $_[0]{hintmode} = $_[1] if @_ > 1;
1554 $_[0]{hintmode} 1712 $_[0]{hintmode}
1555} 1713}
1627our $MAX_RESET = 3600; 1785our $MAX_RESET = 3600;
1628our $DEFAULT_RESET = 3000; 1786our $DEFAULT_RESET = 3000;
1629 1787
1630sub generate_random_map { 1788sub generate_random_map {
1631 my ($self, $rmp) = @_; 1789 my ($self, $rmp) = @_;
1790
1791 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1792
1632 # mit "rum" bekleckern, nicht 1793 # mit "rum" bekleckern, nicht
1633 $self->_create_random_map ( 1794 $self->_create_random_map (
1634 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1795 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1635 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1796 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1636 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1797 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1758 1919
1759# the temporary/swap location 1920# the temporary/swap location
1760sub save_path { 1921sub save_path {
1761 my ($self) = @_; 1922 my ($self) = @_;
1762 1923
1763 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1924 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1764 "$TMPDIR/$path.map" 1925 "$TMPDIR/$path.map"
1765} 1926}
1766 1927
1767# the unique path, undef == no special unique path 1928# the unique path, undef == no special unique path
1768sub uniq_path { 1929sub uniq_path {
1769 my ($self) = @_; 1930 my ($self) = @_;
1770 1931
1771 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1932 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1772 "$UNIQUEDIR/$path" 1933 "$UNIQUEDIR/$path"
1773} 1934}
1774 1935
1775# and all this just because we cannot iterate over 1936# and all this just because we cannot iterate over
1776# all maps in C++... 1937# all maps in C++...
1874 2035
1875 cf::lock_wait "map_data:$path";#d#remove 2036 cf::lock_wait "map_data:$path";#d#remove
1876 cf::lock_wait "map_find:$path"; 2037 cf::lock_wait "map_find:$path";
1877 2038
1878 $cf::MAP{$path} || do { 2039 $cf::MAP{$path} || do {
1879 my $guard1 = cf::lock_acquire "map_find:$path";
1880 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 2040 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2041 my $guard2 = cf::lock_acquire "map_find:$path";
1881 2042
1882 my $map = new_from_path cf::map $path 2043 my $map = new_from_path cf::map $path
1883 or return; 2044 or return;
1884 2045
1885 $map->{last_save} = $cf::RUNTIME; 2046 $map->{last_save} = $cf::RUNTIME;
1888 or return; 2049 or return;
1889 2050
1890 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2051 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1891 # doing this can freeze the server in a sync job, obviously 2052 # doing this can freeze the server in a sync job, obviously
1892 #$cf::WAIT_FOR_TICK->wait; 2053 #$cf::WAIT_FOR_TICK->wait;
2054 undef $guard2;
1893 undef $guard1; 2055 undef $guard1;
1894 undef $guard2;
1895 $map->reset; 2056 $map->reset;
1896 return find $path; 2057 return find $path;
1897 } 2058 }
1898 2059
1899 $cf::MAP{$path} = $map 2060 $cf::MAP{$path} = $map
1926 my $f = new_from_file cf::object::thawer $self->{load_path}; 2087 my $f = new_from_file cf::object::thawer $self->{load_path};
1927 $f->skip_block; 2088 $f->skip_block;
1928 $self->_load_objects ($f) 2089 $self->_load_objects ($f)
1929 or return; 2090 or return;
1930 2091
1931 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2092 $self->post_load_original
1932 if delete $self->{load_original}; 2093 if delete $self->{load_original};
1933 2094
1934 if (my $uniq = $self->uniq_path) { 2095 if (my $uniq = $self->uniq_path) {
1935 utf8::encode $uniq; 2096 utf8::encode $uniq;
1936 unless (aio_stat $uniq) { 2097 unless (aio_stat $uniq) {
1962 } 2123 }
1963 2124
1964 $self->{last_save} = $cf::RUNTIME; 2125 $self->{last_save} = $cf::RUNTIME;
1965 $self->last_access ($cf::RUNTIME); 2126 $self->last_access ($cf::RUNTIME);
1966 2127
1967 $self->in_memory (cf::MAP_IN_MEMORY); 2128 $self->in_memory (cf::MAP_ACTIVE);
1968 } 2129 }
1969 2130
1970 $self->post_load; 2131 $self->post_load;
1971} 2132}
1972 2133
2030 my ($path, $origin, $load) = @_; 2191 my ($path, $origin, $load) = @_;
2031 2192
2032 $path = normalise $path, $origin && $origin->{path}; 2193 $path = normalise $path, $origin && $origin->{path};
2033 2194
2034 if (my $map = $cf::MAP{$path}) { 2195 if (my $map = $cf::MAP{$path}) {
2035 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2196 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2036 } 2197 }
2037 2198
2038 $MAP_PREFETCH{$path} |= $load; 2199 $MAP_PREFETCH{$path} |= $load;
2039 2200
2040 $MAP_PREFETCHER ||= cf::async { 2201 $MAP_PREFETCHER ||= cf::async {
2202 $Coro::current->{desc} = "map prefetcher";
2203
2041 while (%MAP_PREFETCH) { 2204 while (%MAP_PREFETCH) {
2042 while (my ($k, $v) = each %MAP_PREFETCH) { 2205 while (my ($k, $v) = each %MAP_PREFETCH) {
2043 if (my $map = find $k) { 2206 if (my $map = find $k) {
2044 $map->load if $v; 2207 $map->load if $v;
2045 } 2208 }
2071 return if $self->{deny_save}; 2234 return if $self->{deny_save};
2072 2235
2073 local $self->{last_access} = $self->last_access;#d# 2236 local $self->{last_access} = $self->last_access;#d#
2074 2237
2075 cf::async { 2238 cf::async {
2239 $Coro::current->{desc} = "map player save";
2076 $_->contr->save for $self->players; 2240 $_->contr->save for $self->players;
2077 }; 2241 };
2242
2243 cf::get_slot 0.02;
2078 2244
2079 if ($uniq) { 2245 if ($uniq) {
2080 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2246 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2081 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2247 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2082 } else { 2248 } else {
2091 $self->save; 2257 $self->save;
2092 2258
2093 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2259 my $lock = cf::lock_acquire "map_data:$self->{path}";
2094 2260
2095 return if $self->players; 2261 return if $self->players;
2096 return if $self->in_memory != cf::MAP_IN_MEMORY; 2262 return if $self->in_memory != cf::MAP_ACTIVE;
2097 return if $self->{deny_save}; 2263 return if $self->{deny_save};
2098 2264
2099 $self->in_memory (cf::MAP_SWAPPED); 2265 $self->in_memory (cf::MAP_SWAPPED);
2100 2266
2101 $self->deactivate; 2267 $self->deactivate;
2219 2385
2220sub unique_maps() { 2386sub unique_maps() {
2221 [ 2387 [
2222 map { 2388 map {
2223 utf8::decode $_; 2389 utf8::decode $_;
2224 /\.map$/ 2390 s/\.map$//; # TODO future compatibility hack
2391 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2392 ? ()
2225 ? normalise $_ 2393 : normalise $_
2226 : ()
2227 } @{ aio_readdir $UNIQUEDIR or [] } 2394 } @{ aio_readdir $UNIQUEDIR or [] }
2228 ] 2395 ]
2229} 2396}
2230 2397
2231package cf;
2232
2233=back 2398=back
2234 2399
2235=head3 cf::object 2400=head3 cf::object
2236 2401
2237=cut 2402=cut
2240 2405
2241=over 4 2406=over 4
2242 2407
2243=item $ob->inv_recursive 2408=item $ob->inv_recursive
2244 2409
2245Returns the inventory of the object _and_ their inventories, recursively. 2410Returns the inventory of the object I<and> their inventories, recursively,
2411but I<not> the object itself.
2246 2412
2247=cut 2413=cut
2248 2414
2249sub inv_recursive_; 2415sub inv_recursive_;
2250sub inv_recursive_ { 2416sub inv_recursive_ {
2255 inv_recursive_ inv $_[0] 2421 inv_recursive_ inv $_[0]
2256} 2422}
2257 2423
2258=item $ref = $ob->ref 2424=item $ref = $ob->ref
2259 2425
2260creates and returns a persistent reference to an objetc that can be stored as a string. 2426Creates and returns a persistent reference to an object that can be stored as a string.
2261 2427
2262=item $ob = cf::object::deref ($refstring) 2428=item $ob = cf::object::deref ($refstring)
2263 2429
2264returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2430returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2265even if the object actually exists. May block. 2431even if the object actually exists. May block.
2267=cut 2433=cut
2268 2434
2269sub deref { 2435sub deref {
2270 my ($ref) = @_; 2436 my ($ref) = @_;
2271 2437
2272 # temporary compatibility#TODO#remove
2273 $ref =~ s{^<}{player/<};
2274
2275 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2438 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2276 my ($uuid, $name) = ($1, $2); 2439 my ($uuid, $name) = ($1, $2);
2277 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2440 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2278 or return; 2441 or return;
2279 $pl->ob->uuid eq $uuid 2442 $pl->ob->uuid eq $uuid
2280 or return; 2443 or return;
2300can be C<undef>. Does the right thing when the player is currently in a 2463can be C<undef>. Does the right thing when the player is currently in a
2301dialogue with the given NPC character. 2464dialogue with the given NPC character.
2302 2465
2303=cut 2466=cut
2304 2467
2468our $SAY_CHANNEL = {
2469 id => "say",
2470 title => "Map",
2471 reply => "say ",
2472 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2473};
2474
2475our $CHAT_CHANNEL = {
2476 id => "chat",
2477 title => "Chat",
2478 reply => "chat ",
2479 tooltip => "Player chat and shouts, global to the server.",
2480};
2481
2305# rough implementation of a future "reply" method that works 2482# rough implementation of a future "reply" method that works
2306# with dialog boxes. 2483# with dialog boxes.
2307#TODO: the first argument must go, split into a $npc->reply_to ( method 2484#TODO: the first argument must go, split into a $npc->reply_to ( method
2308sub cf::object::player::reply($$$;$) { 2485sub cf::object::player::reply($$$;$) {
2309 my ($self, $npc, $msg, $flags) = @_; 2486 my ($self, $npc, $msg, $flags) = @_;
2320 my $dialog = $pl->{npc_dialog}; 2497 my $dialog = $pl->{npc_dialog};
2321 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2498 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2322 2499
2323 } else { 2500 } else {
2324 $msg = $npc->name . " says: $msg" if $npc; 2501 $msg = $npc->name . " says: $msg" if $npc;
2325 $self->message ($msg, $flags); 2502 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2326 } 2503 }
2327 } 2504 }
2328} 2505}
2329 2506
2330=item $object->send_msg ($channel, $msg, $color, [extra...]) 2507=item $object->send_msg ($channel, $msg, $color, [extra...])
2438her, loading and preparing them map, calling the provided $check callback 2615her, loading and preparing them map, calling the provided $check callback
2439that has to return the map if sucecssful, and then unfreezes the player on 2616that has to return the map if sucecssful, and then unfreezes the player on
2440the new (success) or old (failed) map position. In either case, $done will 2617the new (success) or old (failed) map position. In either case, $done will
2441be called at the end of this process. 2618be called at the end of this process.
2442 2619
2620Note that $check will be called with a potentially non-loaded map, so if
2621it needs a loaded map it has to call C<< ->load >>.
2622
2443=cut 2623=cut
2444 2624
2445our $GOTOGEN; 2625our $GOTOGEN;
2446 2626
2447sub cf::object::player::goto { 2627sub cf::object::player::goto {
2451 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2631 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2452 2632
2453 $self->enter_link; 2633 $self->enter_link;
2454 2634
2455 (async { 2635 (async {
2636 $Coro::current->{desc} = "player::goto $path $x $y";
2637
2456 # *tag paths override both path and x|y 2638 # *tag paths override both path and x|y
2457 if ($path =~ /^\*(.*)$/) { 2639 if ($path =~ /^\*(.*)$/) {
2458 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2640 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2459 my $ob = $obs[rand @obs]; 2641 my $ob = $obs[rand @obs];
2460 2642
2523} 2705}
2524 2706
2525sub prepare_random_map { 2707sub prepare_random_map {
2526 my ($exit) = @_; 2708 my ($exit) = @_;
2527 2709
2528 my $guard = cf::lock_acquire "exit_prepare:$exit";
2529
2530 # all this does is basically replace the /! path by 2710 # all this does is basically replace the /! path by
2531 # a new random map path (?random/...) with a seed 2711 # a new random map path (?random/...) with a seed
2532 # that depends on the exit object 2712 # that depends on the exit object
2533 2713
2534 my $rmp = parse_random_map_params $exit->msg; 2714 my $rmp = parse_random_map_params $exit->msg;
2536 if ($exit->map) { 2716 if ($exit->map) {
2537 $rmp->{region} = $exit->region->name; 2717 $rmp->{region} = $exit->region->name;
2538 $rmp->{origin_map} = $exit->map->path; 2718 $rmp->{origin_map} = $exit->map->path;
2539 $rmp->{origin_x} = $exit->x; 2719 $rmp->{origin_x} = $exit->x;
2540 $rmp->{origin_y} = $exit->y; 2720 $rmp->{origin_y} = $exit->y;
2721
2722 $exit->map->touch;
2541 } 2723 }
2542 2724
2543 $rmp->{random_seed} ||= $exit->random_seed; 2725 $rmp->{random_seed} ||= $exit->random_seed;
2544 2726
2545 my $data = cf::to_json $rmp; 2727 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2546 my $md5 = Digest::MD5::md5_hex $data; 2728 my $md5 = Digest::MD5::md5_hex $data;
2547 my $meta = "$RANDOMDIR/$md5.meta"; 2729 my $meta = "$RANDOMDIR/$md5.meta";
2548 2730
2549 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2731 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2550 aio_write $fh, 0, (length $data), $data, 0; 2732 aio_write $fh, 0, (length $data), $data, 0;
2551 undef $fh; 2733 undef $fh;
2552 aio_rename "$meta~", $meta; 2734 aio_rename "$meta~", $meta;
2553 2735
2736 my $slaying = "?random/$md5";
2737
2738 if ($exit->valid) {
2554 $exit->slaying ("?random/$md5"); 2739 $exit->slaying ("?random/$md5");
2555 $exit->msg (undef); 2740 $exit->msg (undef);
2741 }
2556 } 2742 }
2557} 2743}
2558 2744
2559sub cf::object::player::enter_exit { 2745sub cf::object::player::enter_exit {
2560 my ($self, $exit) = @_; 2746 my ($self, $exit) = @_;
2561 2747
2562 return unless $self->type == cf::PLAYER; 2748 return unless $self->type == cf::PLAYER;
2563 2749
2564 if ($exit->slaying eq "/!") {
2565 #TODO: this should de-fi-ni-te-ly not be a sync-job
2566 # the problem is that $exit might not survive long enough
2567 # so it needs to be done right now, right here
2568 cf::sync_job { prepare_random_map $exit };
2569 }
2570
2571 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2572 my $hp = $exit->stats->hp;
2573 my $sp = $exit->stats->sp;
2574
2575 $self->enter_link; 2750 $self->enter_link;
2576 2751
2577 # if exit is damned, update players death & WoR home-position
2578 $self->contr->savebed ($slaying, $hp, $sp)
2579 if $exit->flag (FLAG_DAMNED);
2580
2581 (async { 2752 (async {
2582 $self->deactivate_recursive; # just to be sure 2753 $Coro::current->{desc} = "enter_exit";
2754
2583 unless (eval { 2755 unless (eval {
2756 $self->deactivate_recursive; # just to be sure
2757
2758 # random map handling
2759 {
2760 my $guard = cf::lock_acquire "exit_prepare:$exit";
2761
2762 prepare_random_map $exit
2763 if $exit->slaying eq "/!";
2764 }
2765
2766 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2767 my $x = $exit->stats->hp;
2768 my $y = $exit->stats->sp;
2769
2584 $self->goto ($slaying, $hp, $sp); 2770 $self->goto ($map, $x, $y);
2585 2771
2772 # if exit is damned, update players death & WoR home-position
2773 $self->contr->savebed ($map, $x, $y)
2774 if $exit->flag (cf::FLAG_DAMNED);
2775
2586 1; 2776 1
2587 }) { 2777 }) {
2588 $self->message ("Something went wrong deep within the crossfire server. " 2778 $self->message ("Something went wrong deep within the crossfire server. "
2589 . "I'll try to bring you back to the map you were before. " 2779 . "I'll try to bring you back to the map you were before. "
2590 . "Please report this to the dungeon master!", 2780 . "Please report this to the dungeon master!",
2591 cf::NDI_UNIQUE | cf::NDI_RED); 2781 cf::NDI_UNIQUE | cf::NDI_RED);
2621the message, with C<log> being the default. If C<$color> is negative, suppress 2811the message, with C<log> being the default. If C<$color> is negative, suppress
2622the message unless the client supports the msg packet. 2812the message unless the client supports the msg packet.
2623 2813
2624=cut 2814=cut
2625 2815
2816# non-persistent channels (usually the info channel)
2626our %CHANNEL = ( 2817our %CHANNEL = (
2627 "c/identify" => { 2818 "c/identify" => {
2628 id => "identify", 2819 id => "infobox",
2629 title => "Identify", 2820 title => "Identify",
2630 reply => undef, 2821 reply => undef,
2631 tooltip => "Items recently identified", 2822 tooltip => "Items recently identified",
2632 }, 2823 },
2633 "c/examine" => { 2824 "c/examine" => {
2634 id => "examine", 2825 id => "infobox",
2635 title => "Examine", 2826 title => "Examine",
2636 reply => undef, 2827 reply => undef,
2637 tooltip => "Signs and other items you examined", 2828 tooltip => "Signs and other items you examined",
2638 }, 2829 },
2830 "c/book" => {
2831 id => "infobox",
2832 title => "Book",
2833 reply => undef,
2834 tooltip => "The contents of a note or book",
2835 },
2836 "c/lookat" => {
2837 id => "infobox",
2838 title => "Look",
2839 reply => undef,
2840 tooltip => "What you saw there",
2841 },
2842 "c/who" => {
2843 id => "infobox",
2844 title => "Players",
2845 reply => undef,
2846 tooltip => "Shows players who are currently online",
2847 },
2848 "c/body" => {
2849 id => "infobox",
2850 title => "Body Parts",
2851 reply => undef,
2852 tooltip => "Shows which body parts you posess and are available",
2853 },
2854 "c/uptime" => {
2855 id => "infobox",
2856 title => "Uptime",
2857 reply => undef,
2858 tooltip => "How long the server has been running since last restart",
2859 },
2860 "c/mapinfo" => {
2861 id => "infobox",
2862 title => "Map Info",
2863 reply => undef,
2864 tooltip => "Information related to the maps",
2865 },
2866 "c/party" => {
2867 id => "party",
2868 title => "Party",
2869 reply => "gsay ",
2870 tooltip => "Messages and chat related to your party",
2871 },
2639); 2872);
2640 2873
2641sub cf::client::send_msg { 2874sub cf::client::send_msg {
2642 my ($self, $channel, $msg, $color, @extra) = @_; 2875 my ($self, $channel, $msg, $color, @extra) = @_;
2643 2876
2644 $msg = $self->pl->expand_cfpod ($msg); 2877 $msg = $self->pl->expand_cfpod ($msg);
2645 2878
2646 $color &= cf::NDI_CLIENT_MASK; # just in case... 2879 $color &= cf::NDI_CLIENT_MASK; # just in case...
2647 2880
2648 # check predefined channels, for the benefit of C 2881 # check predefined channels, for the benefit of C
2649 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2882 if ($CHANNEL{$channel}) {
2883 $channel = $CHANNEL{$channel};
2650 2884
2885 $self->ext_msg (channel_info => $channel)
2886 if $self->can_msg;
2887
2888 $channel = $channel->{id};
2889
2651 if (ref $channel) { 2890 } elsif (ref $channel) {
2652 # send meta info to client, if not yet sent 2891 # send meta info to client, if not yet sent
2653 unless (exists $self->{channel}{$channel->{id}}) { 2892 unless (exists $self->{channel}{$channel->{id}}) {
2654 $self->{channel}{$channel->{id}} = $channel; 2893 $self->{channel}{$channel->{id}} = $channel;
2655 $self->ext_msg (channel_info => $channel) 2894 $self->ext_msg (channel_info => $channel)
2656 if $self->can_msg; 2895 if $self->can_msg;
2873=pod 3112=pod
2874 3113
2875The following functions and methods are available within a safe environment: 3114The following functions and methods are available within a safe environment:
2876 3115
2877 cf::object 3116 cf::object
2878 contr pay_amount pay_player map x y force_find force_add 3117 contr pay_amount pay_player map x y force_find force_add destroy
2879 insert remove name archname title slaying race decrease_ob_nr 3118 insert remove name archname title slaying race decrease split
2880 3119
2881 cf::object::player 3120 cf::object::player
2882 player 3121 player
2883 3122
2884 cf::player 3123 cf::player
2889 3128
2890=cut 3129=cut
2891 3130
2892for ( 3131for (
2893 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3132 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2894 insert remove inv name archname title slaying race 3133 insert remove inv nrof name archname title slaying race
2895 decrease_ob_nr)], 3134 decrease split destroy change_exp)],
2896 ["cf::object::player" => qw(player)], 3135 ["cf::object::player" => qw(player)],
2897 ["cf::player" => qw(peaceful)], 3136 ["cf::player" => qw(peaceful)],
2898 ["cf::map" => qw(trigger)], 3137 ["cf::map" => qw(trigger)],
2899) { 3138) {
2900 no strict 'refs'; 3139 no strict 'refs';
3005 { 3244 {
3006 my $faces = $facedata->{faceinfo}; 3245 my $faces = $facedata->{faceinfo};
3007 3246
3008 while (my ($face, $info) = each %$faces) { 3247 while (my ($face, $info) = each %$faces) {
3009 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3248 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3249
3010 cf::face::set_visibility $idx, $info->{visibility}; 3250 cf::face::set_visibility $idx, $info->{visibility};
3011 cf::face::set_magicmap $idx, $info->{magicmap}; 3251 cf::face::set_magicmap $idx, $info->{magicmap};
3012 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3252 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3013 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3253 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3014 3254
3015 cf::cede_to_tick; 3255 cf::cede_to_tick;
3016 } 3256 }
3017 3257
3018 while (my ($face, $info) = each %$faces) { 3258 while (my ($face, $info) = each %$faces) {
3019 next unless $info->{smooth}; 3259 next unless $info->{smooth};
3260
3020 my $idx = cf::face::find $face 3261 my $idx = cf::face::find $face
3021 or next; 3262 or next;
3263
3022 if (my $smooth = cf::face::find $info->{smooth}) { 3264 if (my $smooth = cf::face::find $info->{smooth}) {
3023 cf::face::set_smooth $idx, $smooth; 3265 cf::face::set_smooth $idx, $smooth;
3024 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3266 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3025 } else { 3267 } else {
3026 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3268 warn "smooth face '$info->{smooth}' not found for face '$face'";
3044 { 3286 {
3045 # TODO: for gcfclient pleasure, we should give resources 3287 # TODO: for gcfclient pleasure, we should give resources
3046 # that gcfclient doesn't grok a >10000 face index. 3288 # that gcfclient doesn't grok a >10000 face index.
3047 my $res = $facedata->{resource}; 3289 my $res = $facedata->{resource};
3048 3290
3049 my $soundconf = delete $res->{"res/sound.conf"};
3050
3051 while (my ($name, $info) = each %$res) { 3291 while (my ($name, $info) = each %$res) {
3292 if (defined $info->{type}) {
3052 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3293 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3053 my $data; 3294 my $data;
3054 3295
3055 if ($info->{type} & 1) { 3296 if ($info->{type} & 1) {
3056 # prepend meta info 3297 # prepend meta info
3057 3298
3058 my $meta = $enc->encode ({ 3299 my $meta = $enc->encode ({
3059 name => $name, 3300 name => $name,
3060 %{ $info->{meta} || {} }, 3301 %{ $info->{meta} || {} },
3061 }); 3302 });
3062 3303
3063 $data = pack "(w/a*)*", $meta, $info->{data}; 3304 $data = pack "(w/a*)*", $meta, $info->{data};
3305 } else {
3306 $data = $info->{data};
3307 }
3308
3309 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3310 cf::face::set_type $idx, $info->{type};
3064 } else { 3311 } else {
3065 $data = $info->{data}; 3312 $RESOURCE{$name} = $info;
3066 } 3313 }
3067 3314
3068 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3069 cf::face::set_type $idx, $info->{type};
3070
3071 cf::cede_to_tick; 3315 cf::cede_to_tick;
3072 } 3316 }
3073
3074 if ($soundconf) {
3075 $soundconf = $enc->decode (delete $soundconf->{data});
3076
3077 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3078 my $sound = $soundconf->{compat}[$_]
3079 or next;
3080
3081 my $face = cf::face::find "sound/$sound->[1]";
3082 cf::sound::set $sound->[0] => $face;
3083 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3084 }
3085
3086 while (my ($k, $v) = each %{$soundconf->{event}}) {
3087 my $face = cf::face::find "sound/$v";
3088 cf::sound::set $k => $face;
3089 }
3090 }
3091 } 3317 }
3318
3319 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3092 3320
3093 1 3321 1
3094} 3322}
3323
3324cf::global->attach (on_resource_update => sub {
3325 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3326 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3327
3328 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3329 my $sound = $soundconf->{compat}[$_]
3330 or next;
3331
3332 my $face = cf::face::find "sound/$sound->[1]";
3333 cf::sound::set $sound->[0] => $face;
3334 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3335 }
3336
3337 while (my ($k, $v) = each %{$soundconf->{event}}) {
3338 my $face = cf::face::find "sound/$v";
3339 cf::sound::set $k => $face;
3340 }
3341 }
3342});
3095 3343
3096register_exticmd fx_want => sub { 3344register_exticmd fx_want => sub {
3097 my ($ns, $want) = @_; 3345 my ($ns, $want) = @_;
3098 3346
3099 while (my ($k, $v) = each %$want) { 3347 while (my ($k, $v) = each %$want) {
3100 $ns->fx_want ($k, $v); 3348 $ns->fx_want ($k, $v);
3101 } 3349 }
3102}; 3350};
3351
3352sub load_resource_file($) {
3353 my $guard = lock_acquire "load_resource_file";
3354
3355 my $status = load_resource_file_ $_[0];
3356 get_slot 0.1, 100;
3357 cf::arch::commit_load;
3358
3359 $status
3360}
3103 3361
3104sub reload_regions { 3362sub reload_regions {
3105 # HACK to clear player env face cache, we need some signal framework 3363 # HACK to clear player env face cache, we need some signal framework
3106 # for this (global event?) 3364 # for this (global event?)
3107 %ext::player_env::MUSIC_FACE_CACHE = (); 3365 %ext::player_env::MUSIC_FACE_CACHE = ();
3121} 3379}
3122 3380
3123sub reload_archetypes { 3381sub reload_archetypes {
3124 load_resource_file "$DATADIR/archetypes" 3382 load_resource_file "$DATADIR/archetypes"
3125 or die "unable to load archetypes\n"; 3383 or die "unable to load archetypes\n";
3126 #d# NEED to laod twice to resolve forward references
3127 # this really needs to be done in an extra post-pass
3128 # (which needs to be synchronous, so solve it differently)
3129 load_resource_file "$DATADIR/archetypes"
3130 or die "unable to load archetypes\n";
3131} 3384}
3132 3385
3133sub reload_treasures { 3386sub reload_treasures {
3134 load_resource_file "$DATADIR/treasures" 3387 load_resource_file "$DATADIR/treasures"
3135 or die "unable to load treasurelists\n"; 3388 or die "unable to load treasurelists\n";
3136} 3389}
3137 3390
3138sub reload_resources { 3391sub reload_resources {
3139 warn "reloading resource files...\n"; 3392 warn "reloading resource files...\n";
3140 3393
3394 reload_facedata;
3395 reload_archetypes;
3141 reload_regions; 3396 reload_regions;
3142 reload_facedata;
3143 #reload_archetypes;#d#
3144 reload_archetypes;
3145 reload_treasures; 3397 reload_treasures;
3146 3398
3147 warn "finished reloading resource files\n"; 3399 warn "finished reloading resource files\n";
3148} 3400}
3149 3401
3150sub init { 3402sub init {
3403 my $guard = freeze_mainloop;
3404
3405 evthread_start IO::AIO::poll_fileno;
3406
3151 reload_resources; 3407 reload_resources;
3152} 3408}
3153 3409
3154sub reload_config { 3410sub reload_config {
3155 open my $fh, "<:utf8", "$CONFDIR/config" 3411 open my $fh, "<:utf8", "$CONFDIR/config"
3156 or return; 3412 or return;
3157 3413
3158 local $/; 3414 local $/;
3159 *CFG = YAML::Syck::Load <$fh>; 3415 *CFG = YAML::Load <$fh>;
3160 3416
3161 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3417 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3162 3418
3163 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3419 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3164 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3420 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3175sub main { 3431sub main {
3176 # we must not ever block the main coroutine 3432 # we must not ever block the main coroutine
3177 local $Coro::idle = sub { 3433 local $Coro::idle = sub {
3178 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3434 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3179 (async { 3435 (async {
3180 Event::one_event; 3436 $Coro::current->{desc} = "IDLE BUG HANDLER";
3437 EV::loop EV::LOOP_ONESHOT;
3181 })->prio (Coro::PRIO_MAX); 3438 })->prio (Coro::PRIO_MAX);
3182 }; 3439 };
3183 3440
3441 {
3442 my $guard = freeze_mainloop;
3184 reload_config; 3443 reload_config;
3185 db_init; 3444 db_init;
3186 load_extensions; 3445 load_extensions;
3187 3446
3188 $TICK_WATCHER->start; 3447 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3448 }
3449
3189 Event::loop; 3450 EV::loop;
3190} 3451}
3191 3452
3192############################################################################# 3453#############################################################################
3193# initialisation and cleanup 3454# initialisation and cleanup
3194 3455
3195# install some emergency cleanup handlers 3456# install some emergency cleanup handlers
3196BEGIN { 3457BEGIN {
3458 our %SIGWATCHER = ();
3197 for my $signal (qw(INT HUP TERM)) { 3459 for my $signal (qw(INT HUP TERM)) {
3198 Event->signal ( 3460 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3199 reentrant => 0,
3200 data => WF_AUTOCANCEL,
3201 signal => $signal,
3202 prio => 0,
3203 cb => sub {
3204 cf::cleanup "SIG$signal"; 3461 cf::cleanup "SIG$signal";
3205 },
3206 ); 3462 };
3207 } 3463 }
3208} 3464}
3209 3465
3210sub write_runtime { 3466sub write_runtime_sync {
3211 my $runtime = "$LOCALDIR/runtime"; 3467 my $runtime = "$LOCALDIR/runtime";
3212 3468
3213 # first touch the runtime file to show we are still running: 3469 # first touch the runtime file to show we are still running:
3214 # the fsync below can take a very very long time. 3470 # the fsync below can take a very very long time.
3215 3471
3241 and return; 3497 and return;
3242 3498
3243 warn "runtime file written.\n"; 3499 warn "runtime file written.\n";
3244 3500
3245 1 3501 1
3502}
3503
3504our $uuid_lock;
3505our $uuid_skip;
3506
3507sub write_uuid_sync($) {
3508 $uuid_skip ||= $_[0];
3509
3510 return if $uuid_lock;
3511 local $uuid_lock = 1;
3512
3513 my $uuid = "$LOCALDIR/uuid";
3514
3515 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3516 or return;
3517
3518 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3519 $uuid_skip = 0;
3520
3521 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3522 and return;
3523
3524 # always fsync - this file is important
3525 aio_fsync $fh
3526 and return;
3527
3528 close $fh
3529 or return;
3530
3531 aio_rename "$uuid~", $uuid
3532 and return;
3533
3534 warn "uuid file written ($value).\n";
3535
3536 1
3537
3538}
3539
3540sub write_uuid($$) {
3541 my ($skip, $sync) = @_;
3542
3543 $sync ? write_uuid_sync $skip
3544 : async { write_uuid_sync $skip };
3246} 3545}
3247 3546
3248sub emergency_save() { 3547sub emergency_save() {
3249 my $freeze_guard = cf::freeze_mainloop; 3548 my $freeze_guard = cf::freeze_mainloop;
3250 3549
3256 # and maps saved/destroyed asynchronously. 3555 # and maps saved/destroyed asynchronously.
3257 warn "begin emergency player save\n"; 3556 warn "begin emergency player save\n";
3258 for my $login (keys %cf::PLAYER) { 3557 for my $login (keys %cf::PLAYER) {
3259 my $pl = $cf::PLAYER{$login} or next; 3558 my $pl = $cf::PLAYER{$login} or next;
3260 $pl->valid or next; 3559 $pl->valid or next;
3560 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3261 $pl->save; 3561 $pl->save;
3262 } 3562 }
3263 warn "end emergency player save\n"; 3563 warn "end emergency player save\n";
3264 3564
3265 warn "begin emergency map save\n"; 3565 warn "begin emergency map save\n";
3271 warn "end emergency map save\n"; 3571 warn "end emergency map save\n";
3272 3572
3273 warn "begin emergency database checkpoint\n"; 3573 warn "begin emergency database checkpoint\n";
3274 BDB::db_env_txn_checkpoint $DB_ENV; 3574 BDB::db_env_txn_checkpoint $DB_ENV;
3275 warn "end emergency database checkpoint\n"; 3575 warn "end emergency database checkpoint\n";
3576
3577 warn "begin write uuid\n";
3578 write_uuid_sync 1;
3579 warn "end write uuid\n";
3276 }; 3580 };
3277 3581
3278 warn "leave emergency perl save\n"; 3582 warn "leave emergency perl save\n";
3279} 3583}
3280 3584
3295 warn "reloading..."; 3599 warn "reloading...";
3296 3600
3297 warn "entering sync_job"; 3601 warn "entering sync_job";
3298 3602
3299 cf::sync_job { 3603 cf::sync_job {
3300 cf::write_runtime; # external watchdog should not bark 3604 cf::write_runtime_sync; # external watchdog should not bark
3301 cf::emergency_save; 3605 cf::emergency_save;
3302 cf::write_runtime; # external watchdog should not bark 3606 cf::write_runtime_sync; # external watchdog should not bark
3303 3607
3304 warn "syncing database to disk"; 3608 warn "syncing database to disk";
3305 BDB::db_env_txn_checkpoint $DB_ENV; 3609 BDB::db_env_txn_checkpoint $DB_ENV;
3306 3610
3307 # if anything goes wrong in here, we should simply crash as we already saved 3611 # if anything goes wrong in here, we should simply crash as we already saved
3308
3309 warn "cancelling all WF_AUTOCANCEL watchers";
3310 for (Event::all_watchers) {
3311 $_->cancel if $_->data & WF_AUTOCANCEL;
3312 }
3313 3612
3314 warn "flushing outstanding aio requests"; 3613 warn "flushing outstanding aio requests";
3315 for (;;) { 3614 for (;;) {
3316 BDB::flush; 3615 BDB::flush;
3317 IO::AIO::flush; 3616 IO::AIO::flush;
3318 Coro::cede; 3617 Coro::cede_notself;
3319 last unless IO::AIO::nreqs || BDB::nreqs; 3618 last unless IO::AIO::nreqs || BDB::nreqs;
3320 warn "iterate..."; 3619 warn "iterate...";
3321 } 3620 }
3322 3621
3323 ++$RELOAD; 3622 ++$RELOAD;
3399 warn "leaving sync_job"; 3698 warn "leaving sync_job";
3400 3699
3401 1 3700 1
3402 } or do { 3701 } or do {
3403 warn $@; 3702 warn $@;
3404 warn "error while reloading, exiting."; 3703 cf::cleanup "error while reloading, exiting.";
3405 exit 1;
3406 }; 3704 };
3407 3705
3408 warn "reloaded"; 3706 warn "reloaded";
3409}; 3707};
3410 3708
3412 3710
3413sub reload_perl() { 3711sub reload_perl() {
3414 # doing reload synchronously and two reloads happen back-to-back, 3712 # doing reload synchronously and two reloads happen back-to-back,
3415 # coro crashes during coro_state_free->destroy here. 3713 # coro crashes during coro_state_free->destroy here.
3416 3714
3417 $RELOAD_WATCHER ||= Event->timer ( 3715 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3418 reentrant => 0,
3419 after => 0,
3420 data => WF_AUTOCANCEL,
3421 cb => sub {
3422 do_reload_perl; 3716 do_reload_perl;
3423 undef $RELOAD_WATCHER; 3717 undef $RELOAD_WATCHER;
3424 },
3425 ); 3718 };
3426} 3719}
3427 3720
3428register_command "reload" => sub { 3721register_command "reload" => sub {
3429 my ($who, $arg) = @_; 3722 my ($who, $arg) = @_;
3430 3723
3431 if ($who->flag (FLAG_WIZ)) { 3724 if ($who->flag (FLAG_WIZ)) {
3432 $who->message ("reloading server."); 3725 $who->message ("reloading server.");
3726 async {
3727 $Coro::current->{desc} = "perl_reload";
3433 async { reload_perl }; 3728 reload_perl;
3729 };
3434 } 3730 }
3435}; 3731};
3436 3732
3437unshift @INC, $LIBDIR; 3733unshift @INC, $LIBDIR;
3438 3734
3440 3736
3441our @WAIT_FOR_TICK; 3737our @WAIT_FOR_TICK;
3442our @WAIT_FOR_TICK_BEGIN; 3738our @WAIT_FOR_TICK_BEGIN;
3443 3739
3444sub wait_for_tick { 3740sub wait_for_tick {
3445 return unless $TICK_WATCHER->is_active;
3446 return if $Coro::current == $Coro::main; 3741 return if tick_inhibit || $Coro::current == $Coro::main;
3447 3742
3448 my $signal = new Coro::Signal; 3743 my $signal = new Coro::Signal;
3449 push @WAIT_FOR_TICK, $signal; 3744 push @WAIT_FOR_TICK, $signal;
3450 $signal->wait; 3745 $signal->wait;
3451} 3746}
3452 3747
3453sub wait_for_tick_begin { 3748sub wait_for_tick_begin {
3454 return unless $TICK_WATCHER->is_active;
3455 return if $Coro::current == $Coro::main; 3749 return if tick_inhibit || $Coro::current == $Coro::main;
3456 3750
3457 my $signal = new Coro::Signal; 3751 my $signal = new Coro::Signal;
3458 push @WAIT_FOR_TICK_BEGIN, $signal; 3752 push @WAIT_FOR_TICK_BEGIN, $signal;
3459 $signal->wait; 3753 $signal->wait;
3460} 3754}
3461 3755
3462$TICK_WATCHER = Event->timer ( 3756sub tick {
3463 reentrant => 0,
3464 parked => 1,
3465 prio => 0,
3466 at => $NEXT_TICK || $TICK,
3467 data => WF_AUTOCANCEL,
3468 cb => sub {
3469 if ($Coro::current != $Coro::main) { 3757 if ($Coro::current != $Coro::main) {
3470 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3758 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3471 unless ++$bug_warning > 10; 3759 unless ++$bug_warning > 10;
3472 return; 3760 return;
3473 } 3761 }
3474 3762
3475 $NOW = $tick_start = Event::time;
3476
3477 cf::server_tick; # one server iteration 3763 cf::server_tick; # one server iteration
3478 3764
3479 $RUNTIME += $TICK;
3480 $NEXT_TICK += $TICK;
3481
3482 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3765 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3483 $NEXT_RUNTIME_WRITE = $NOW + 10; 3766 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3484 Coro::async_pool { 3767 Coro::async_pool {
3768 $Coro::current->{desc} = "runtime saver";
3485 write_runtime 3769 write_runtime_sync
3486 or warn "ERROR: unable to write runtime file: $!"; 3770 or warn "ERROR: unable to write runtime file: $!";
3487 };
3488 } 3771 };
3772 }
3489 3773
3490 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3774 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3491 $sig->send; 3775 $sig->send;
3492 } 3776 }
3493 while (my $sig = shift @WAIT_FOR_TICK) { 3777 while (my $sig = shift @WAIT_FOR_TICK) {
3494 $sig->send; 3778 $sig->send;
3495 } 3779 }
3496 3780
3497 $NOW = Event::time; 3781 $LOAD = ($NOW - $TICK_START) / $TICK;
3498
3499 # if we are delayed by four ticks or more, skip them all
3500 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3501
3502 $TICK_WATCHER->at ($NEXT_TICK);
3503 $TICK_WATCHER->start;
3504
3505 $LOAD = ($NOW - $tick_start) / $TICK;
3506 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3782 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3507 3783
3508 _post_tick; 3784 if (0) {
3785 if ($NEXT_TICK) {
3786 my $jitter = $TICK_START - $NEXT_TICK;
3787 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3788 warn "jitter $JITTER\n";#d#
3789 }
3509 }, 3790 }
3510); 3791}
3511 3792
3512{ 3793{
3794 # configure BDB
3795
3513 BDB::min_parallel 8; 3796 BDB::min_parallel 8;
3514 BDB::max_poll_time $TICK * 0.1; 3797 BDB::max_poll_reqs $TICK * 0.1;
3515 $BDB_POLL_WATCHER = Event->io ( 3798 $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 3799
3539 unless ($DB_ENV) { 3800 unless ($DB_ENV) {
3540 $DB_ENV = BDB::db_env_create; 3801 $DB_ENV = BDB::db_env_create;
3541 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3802 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3542 | BDB::LOG_AUTOREMOVE, 1); 3803 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3804 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3543 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3805 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3544 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3806 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3545 3807
3546 cf::sync_job { 3808 cf::sync_job {
3547 eval { 3809 eval {
3557 3819
3558 cf::cleanup "db_env_open(db): $@" if $@; 3820 cf::cleanup "db_env_open(db): $@" if $@;
3559 }; 3821 };
3560 } 3822 }
3561 3823
3562 $BDB_DEADLOCK_WATCHER = Event->timer ( 3824 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3563 after => 3,
3564 interval => 1,
3565 hard => 1,
3566 prio => 0,
3567 data => WF_AUTOCANCEL,
3568 cb => sub {
3569 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3825 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3570 },
3571 ); 3826 };
3572 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3827 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3573 after => 11,
3574 interval => 60,
3575 hard => 1,
3576 prio => 0,
3577 data => WF_AUTOCANCEL,
3578 cb => sub {
3579 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3828 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3580 },
3581 ); 3829 };
3582 $BDB_TRICKLE_WATCHER = Event->timer ( 3830 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3583 after => 5,
3584 interval => 10,
3585 hard => 1,
3586 prio => 0,
3587 data => WF_AUTOCANCEL,
3588 cb => sub {
3589 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3831 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3590 },
3591 ); 3832 };
3592} 3833}
3593 3834
3594{ 3835{
3836 # configure IO::AIO
3837
3595 IO::AIO::min_parallel 8; 3838 IO::AIO::min_parallel 8;
3596
3597 undef $Coro::AIO::WATCHER;
3598 IO::AIO::max_poll_time $TICK * 0.1; 3839 IO::AIO::max_poll_time $TICK * 0.1;
3599 $AIO_POLL_WATCHER = Event->io ( 3840 undef $AnyEvent::AIO::WATCHER;
3600 reentrant => 0,
3601 data => WF_AUTOCANCEL,
3602 fd => IO::AIO::poll_fileno,
3603 poll => 'r',
3604 prio => 6,
3605 cb => \&IO::AIO::poll_cb,
3606 );
3607} 3841}
3608 3842
3609my $_log_backtrace; 3843my $_log_backtrace;
3610 3844
3611sub _log_backtrace { 3845sub _log_backtrace {
3615 3849
3616 # limit the # of concurrent backtraces 3850 # limit the # of concurrent backtraces
3617 if ($_log_backtrace < 2) { 3851 if ($_log_backtrace < 2) {
3618 ++$_log_backtrace; 3852 ++$_log_backtrace;
3619 async { 3853 async {
3854 $Coro::current->{desc} = "abt $msg";
3855
3620 my @bt = fork_call { 3856 my @bt = fork_call {
3621 @addr = map { sprintf "%x", $_ } @addr; 3857 @addr = map { sprintf "%x", $_ } @addr;
3622 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3858 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3623 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3859 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3624 or die "addr2line: $!"; 3860 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines