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

Diff Legend

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