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.378 by root, Thu Oct 4 11:36:54 2007 UTC vs.
Revision 1.443 by root, Sun Aug 31 10:05:26 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
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "vars", "subs";
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Storable; 31use EV;
10use Event;
11use Opcode; 32use Opcode;
12use Safe; 33use Safe;
13use Safe::Hole; 34use Safe::Hole;
35use Storable ();
14 36
15use Coro 3.64 (); 37use Coro ();
16use Coro::State; 38use Coro::State;
17use Coro::Handle; 39use Coro::Handle;
40use Coro::EV;
18use Coro::Event; 41use Coro::AnyEvent;
19use Coro::Timer; 42use Coro::Timer;
20use Coro::Signal; 43use Coro::Signal;
21use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
22use Coro::AIO; 46use Coro::AIO;
47use Coro::BDB 1.6;
23use Coro::Storable; 48use Coro::Storable;
24use Coro::Util (); 49use Coro::Util ();
25 50
26use JSON::XS (); 51use JSON::XS 2.01 ();
27use BDB (); 52use BDB ();
28use Data::Dumper; 53use Data::Dumper;
29use Digest::MD5; 54use Digest::MD5;
30use Fcntl; 55use Fcntl;
31use YAML::Syck (); 56use YAML ();
32use IO::AIO 2.32 (); 57use IO::AIO ();
33use Time::HiRes; 58use Time::HiRes;
34use Compress::LZF; 59use Compress::LZF;
35use Digest::MD5 (); 60use Digest::MD5 ();
61
62AnyEvent::detect;
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;
85our $BDB_DEADLOCK_WATCHER; 104our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 105our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 106our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 107our $DB_ENV;
89 108
90our %CFG; 109our %CFG;
91 110
92our $UPTIME; $UPTIME ||= time; 111our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 112our $RUNTIME;
113our $NOW;
94 114
95our (%PLAYER, %PLAYER_LOADING); # all users 115our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 116our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 117our $LINK_MAP; # the special {link} map, which is always available
98 118
99# 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 ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 120our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 121
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 122our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 123our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 125our $TICK_START; # for load detecting purposes
105 126
106binmode STDOUT; 127binmode STDOUT;
107binmode STDERR; 128binmode STDERR;
108 129
109# read virtual server time, if available 130# read virtual server time, if available
162 183
163The raw value load value from the last tick. 184The raw value load value from the last tick.
164 185
165=item %cf::CFG 186=item %cf::CFG
166 187
167Configuration for the server, loaded from C</etc/crossfire/config>, or 188Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 189from wherever your confdir points to.
169 190
170=item cf::wait_for_tick, cf::wait_for_tick_begin 191=item cf::wait_for_tick, cf::wait_for_tick_begin
171 192
172These 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
193 $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;
194 215
195 LOG llevError, $msg; 216 LOG llevError, $msg;
196 }; 217 };
197} 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#?
198 234
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 245for my $pkg (qw(
210 cf::global cf::attachable 246 cf::global cf::attachable
211 cf::object cf::object::player 247 cf::object cf::object::player
212 cf::client cf::player 248 cf::client cf::player
213 cf::arch cf::living 249 cf::arch cf::living
250 cf::map cf::mapspace
214 cf::map cf::party cf::region 251 cf::party cf::region
215)) { 252)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 254}
219 255
220$Event::DIED = sub { 256$EV::DIED = sub {
221 warn "error in event callback: @_"; 257 warn "error in event callback: @_";
222}; 258};
223 259
224############################################################################# 260#############################################################################
225 261
248 $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;
249 $d 285 $d
250 } || "[unable to dump $_[0]: '$@']"; 286 } || "[unable to dump $_[0]: '$@']";
251} 287}
252 288
253=item $ref = cf::from_json $json 289=item $ref = cf::decode_json $json
254 290
255Converts a JSON string into the corresponding perl data structure. 291Converts a JSON string into the corresponding perl data structure.
256 292
257=item $json = cf::to_json $ref 293=item $json = cf::encode_json $ref
258 294
259Converts a perl data structure into its JSON representation. 295Converts a perl data structure into its JSON representation.
260 296
261=cut 297=cut
262 298
263our $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
264 300
265sub to_json ($) { $json_coder->encode ($_[0]) } 301sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 302sub decode_json($) { $json_coder->decode ($_[0]) }
267 303
268=item cf::lock_wait $string 304=item cf::lock_wait $string
269 305
270Wait until the given lock is available. See cf::lock_acquire. 306Wait until the given lock is available. See cf::lock_acquire.
271 307
327 363
328 ! ! $LOCK{$key} 364 ! ! $LOCK{$key}
329} 365}
330 366
331sub freeze_mainloop { 367sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
333 369
334 my $guard = Coro::guard { 370 Coro::guard \&tick_inhibit_dec;
335 $TICK_WATCHER->start; 371}
336 }; 372
337 $TICK_WATCHER->stop; 373=item cf::periodic $interval, $cb
338 $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
339} 386}
340 387
341=item cf::get_slot $time[, $priority[, $name]] 388=item cf::get_slot $time[, $priority[, $name]]
342 389
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 390Allocate $time seconds of blocking CPU time at priority C<$priority>:
373 } 420 }
374 } 421 }
375 } 422 }
376 423
377 if (@SLOT_QUEUE) { 424 if (@SLOT_QUEUE) {
378 # 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
379 push @cf::WAIT_FOR_TICK, $signal; 426 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait; 427 $signal->wait;
381 } else { 428 } else {
382 Coro::schedule; 429 Coro::schedule;
383 } 430 }
384 } 431 }
385}; 432};
386 433
387sub get_slot($;$$) { 434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
388 my ($time, $pri, $name) = @_; 437 my ($time, $pri, $name) = @_;
389 438
390 $time = $TICK * .6 if $time > $TICK * .6; 439 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal; 440 my $sig = new Coro::Signal;
392 441
406 455
407BEGIN { *async = \&Coro::async_pool } 456BEGIN { *async = \&Coro::async_pool }
408 457
409=item cf::sync_job { BLOCK } 458=item cf::sync_job { BLOCK }
410 459
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 460The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 461is always able to handle events or runnable, as Deliantra is only
413partly 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
414acceptable. 463acceptable.
415 464
416If 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
417the given BLOCK in another coroutine while waiting for the result. The 466the given BLOCK in another coroutine while waiting for the result. The
422 471
423sub sync_job(&) { 472sub sync_job(&) {
424 my ($job) = @_; 473 my ($job) = @_;
425 474
426 if ($Coro::current == $Coro::main) { 475 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 476 my $time = EV::time;
428 477
429 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
431 480
432 # TODO: use suspend/resume instead 481 LOG llevError, Carp::longmess "sync job";#d#
433 # (but this is cancel-safe) 482
434 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
435 484
436 my $busy = 1; 485 my $busy = 1;
437 my @res; 486 my @res;
438 487
442 warn $@ if $@; 491 warn $@ if $@;
443 undef $busy; 492 undef $busy;
444 })->prio (Coro::PRIO_MAX); 493 })->prio (Coro::PRIO_MAX);
445 494
446 while ($busy) { 495 while ($busy) {
447 Coro::cede or Event::one_event; 496 if (Coro::nready) {
497 Coro::cede_notself;
498 } else {
499 EV::loop EV::LOOP_ONESHOT;
448 } 500 }
501 }
449 502
450 $time = Event::time - $time; 503 my $time = EV::time - $time;
451 504
452 LOG llevError | logBacktrace, Carp::longmess "long sync job"
453 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
454
455 $tick_start += $time; # do not account sync jobs to server load 505 $TICK_START += $time; # do not account sync jobs to server load
456 506
457 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
458 } else { 508 } else {
459 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
460 510
485=item fork_call { }, $args 535=item fork_call { }, $args
486 536
487Executes the given code block with the given arguments in a seperate 537Executes the given code block with the given arguments in a seperate
488process, returning the results. Everything must be serialisable with 538process, returning the results. Everything must be serialisable with
489Coro::Storable. May, of course, block. Note that the executed sub may 539Coro::Storable. May, of course, block. Note that the executed sub may
490never block itself or use any form of Event handling. 540never block itself or use any form of event handling.
491 541
492=cut 542=cut
493 543
494sub fork_call(&@) { 544sub fork_call(&@) {
495 my ($cb, @args) = @_; 545 my ($cb, @args) = @_;
502 reset_signals; 552 reset_signals;
503 &$cb 553 &$cb
504 }, @args; 554 }, @args;
505 555
506 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
507} 584}
508 585
509=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
510 587
511Returns a single value from the environment database. 588Returns a single value from the environment database.
656attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
657to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
658 735
659In 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>
660C<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
661Crossfire TRT). 738Deliantra).
662 739
663=over 4 740=over 4
664 741
665=item $attachable->attach ($attachment, key => $value...) 742=item $attachable->attach ($attachment, key => $value...)
666 743
948 } 1025 }
949 1026
950 0 1027 0
951} 1028}
952 1029
953=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
954 1031
955=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
956 1033
957Generate an object-specific event with the given arguments. 1034Generate an object-specific event with the given arguments.
958 1035
964 1041
965=cut 1042=cut
966 1043
967############################################################################# 1044#############################################################################
968# object support 1045# object support
969#
970 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#
971sub _can_merge { 1080sub _can_merge {
972 my ($ob1, $ob2) = @_; 1081 my ($ob1, $ob2) = @_;
973 1082
974 local $Storable::canonical = 1; 1083 ++$SLOW_MERGES;#d#
975 my $fob1 = Storable::freeze $ob1;
976 my $fob2 = Storable::freeze $ob2;
977 1084
978 $fob1 eq $fob2 1085 # we do the slow way here
1086 return _object_equal $ob1, $ob2
979} 1087}
980 1088
981sub reattach { 1089sub reattach {
982 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
983 my ($obj) = @_; 1091 my ($obj) = @_;
984 1092
1093 # no longer needed after getting rid of delete_package?
985 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1094 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
986 1095
987 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
988 1097
989 @$registry = (); 1098 @$registry = ();
990 1099
1005cf::attachable->attach ( 1114cf::attachable->attach (
1006 prio => -1000000, 1115 prio => -1000000,
1007 on_instantiate => sub { 1116 on_instantiate => sub {
1008 my ($obj, $data) = @_; 1117 my ($obj, $data) = @_;
1009 1118
1010 $data = from_json $data; 1119 $data = decode_json $data;
1011 1120
1012 for (@$data) { 1121 for (@$data) {
1013 my ($name, $args) = @$_; 1122 my ($name, $args) = @$_;
1014 1123
1015 $obj->attach ($name, %{$args || {} }); 1124 $obj->attach ($name, %{$args || {} });
1036 utf8::decode (my $decname = $filename); 1145 utf8::decode (my $decname = $filename);
1037 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
1038 $decname, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
1039 1148
1040 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1041 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
1042 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1043 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
1044 close $fh; 1153 aio_close $fh;
1045 1154
1046 if (@$objs) { 1155 if (@$objs) {
1047 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1048 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
1049 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1050 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
1051 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
1052 close $fh; 1161 aio_close $fh;
1053 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
1054 } 1163 }
1055 } else { 1164 } else {
1056 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1057 } 1166 }
1085 1194
1086 unless (aio_stat "$filename.pst") { 1195 unless (aio_stat "$filename.pst") {
1087 (aio_load "$filename.pst", $av) >= 0 1196 (aio_load "$filename.pst", $av) >= 0
1088 or return; 1197 or return;
1089 1198
1090 $av = eval { (Storable::thaw $av)->{objs} }; 1199 my $st = eval { Coro::Storable::thaw $av };
1200 $av = $st->{objs};
1091 } 1201 }
1092 1202
1093 utf8::decode (my $decname = $filename); 1203 utf8::decode (my $decname = $filename);
1094 warn sprintf "loading %s (%d,%d)\n", 1204 warn sprintf "loading %s (%d,%d)\n",
1095 $decname, length $data, scalar @{$av || []}; 1205 $decname, length $data, scalar @{$av || []};
1225 1335
1226 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1227 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1228 1338
1229 $ext{source} = 1339 $ext{source} =
1230 "package $pkg; use strict; use utf8;\n" 1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1231 . "#line 1 \"$path\"\n{\n" 1341 . "#line 1 \"$path\"\n{\n"
1232 . $source 1342 . $source
1233 . "\n};\n1"; 1343 . "\n};\n1";
1234 1344
1235 $todo{$base} = \%ext; 1345 $todo{$base} = \%ext;
1251 my $msg = $@ ? "$v->{path}: $@\n" 1361 my $msg = $@ ? "$v->{path}: $@\n"
1252 : "$v->{base}: extension inactive.\n"; 1362 : "$v->{base}: extension inactive.\n";
1253 1363
1254 if (exists $v->{meta}{mandatory}) { 1364 if (exists $v->{meta}{mandatory}) {
1255 warn $msg; 1365 warn $msg;
1256 warn "mandatory extension failed to load, exiting.\n"; 1366 cf::cleanup "mandatory extension failed to load, exiting.";
1257 exit 1;
1258 } 1367 }
1259 1368
1260 warn $msg; 1369 warn $msg;
1261 } 1370 }
1262 1371
1351 my $f = new_from_file cf::object::thawer path $login 1460 my $f = new_from_file cf::object::thawer path $login
1352 or return; 1461 or return;
1353 1462
1354 my $pl = cf::player::load_pl $f 1463 my $pl = cf::player::load_pl $f
1355 or return; 1464 or return;
1465
1356 local $cf::PLAYER_LOADING{$login} = $pl; 1466 local $cf::PLAYER_LOADING{$login} = $pl;
1357 $f->resolve_delayed_derefs; 1467 $f->resolve_delayed_derefs;
1358 $cf::PLAYER{$login} = $pl 1468 $cf::PLAYER{$login} = $pl
1359 } 1469 }
1360 } 1470 }
1370 1480
1371 return if $pl->{deny_save}; 1481 return if $pl->{deny_save};
1372 1482
1373 aio_mkdir playerdir $pl, 0770; 1483 aio_mkdir playerdir $pl, 0770;
1374 $pl->{last_save} = $cf::RUNTIME; 1484 $pl->{last_save} = $cf::RUNTIME;
1485
1486 cf::get_slot 0.01;
1375 1487
1376 $pl->save_pl ($path); 1488 $pl->save_pl ($path);
1377 cf::cede_to_tick; 1489 cf::cede_to_tick;
1378} 1490}
1379 1491
1411 my ($pl) = @_; 1523 my ($pl) = @_;
1412 1524
1413 my $name = $pl->ob->name; 1525 my $name = $pl->ob->name;
1414 1526
1415 $pl->{deny_save} = 1; 1527 $pl->{deny_save} = 1;
1416 $pl->password ("*"); # this should lock out the player until we nuked the dir 1528 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1417 1529
1418 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1419 $pl->deactivate; 1531 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1420 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1534 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1421 $pl->ns->destroy if $pl->ns; 1535 $pl->ns->destroy if $pl->ns;
1422 1536
1423 my $path = playerdir $pl; 1537 my $path = playerdir $pl;
1424 my $temp = "$path~$cf::RUNTIME~deleting~"; 1538 my $temp = "$path~$cf::RUNTIME~deleting~";
1463 1577
1464 for my $login (@$dirs) { 1578 for my $login (@$dirs) {
1465 my $path = path $login; 1579 my $path = path $login;
1466 1580
1467 # a .pst is a dead give-away for a valid player 1581 # a .pst is a dead give-away for a valid player
1468 unless (-e "$path.pst") { 1582 # if no pst file found, open and chekc for blocked users
1583 if (aio_stat "$path.pst") {
1469 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1584 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1470 aio_read $fh, 0, 512, my $buf, 0 or next; 1585 aio_read $fh, 0, 512, my $buf, 0 or next;
1471 $buf !~ /^password -------------$/m or next; # official not-valid tag 1586 $buf !~ /^password -------------$/m or next; # official not-valid tag
1472 } 1587 }
1473 1588
1511Expand crossfire pod fragments into protocol xml. 1626Expand crossfire pod fragments into protocol xml.
1512 1627
1513=cut 1628=cut
1514 1629
1515sub expand_cfpod { 1630sub expand_cfpod {
1516 ((my $self), (local $_)) = @_; 1631 my ($self, $pod) = @_;
1517 1632
1518 # escape & and < 1633 my @nest = [qr<\G$>, undef, ""];
1519 s/&/&amp;/g; 1634 my $xml;
1520 s/(?<![BIUGHT])</&lt;/g;
1521 1635
1522 # this is buggy, it needs to properly take care of nested <'s 1636 for ($pod) {
1637 while () {
1638 if (/\G( (?: [^BCEGHITUZ&>\n\ ]+ | [BCEGHITUZ](?!<) | \ (?!>) )+ )/xgcs) {
1639 $xml .= $1;
1640 } elsif (/\G\n(?=\S)/xgcs) {
1641 $xml .= " ";
1642 } elsif (/\G\n/xgcs) {
1643 $xml .= "\n";
1644 } elsif (/\G ([BCEGHITUZ]) (< (?: <+\ | (?!<) ) )/xgcs) {
1645 my ($code, $delim) = ($1, scalar reverse $2);
1646 $delim =~ y/</>/; # delim now contains the stop sequence
1647 $delim = qr{\G\Q$delim};
1523 1648
1524 1 while 1649 my $cb;
1525 # replace B<>, I<>, U<> etc. 1650
1526 s/B<([^\>]*)>/<b>$1<\/b>/ 1651 if ($code eq "B") {
1527 || s/I<([^\>]*)>/<i>$1<\/i>/ 1652 $cb = sub { "<b>$_[0]</b>" };
1528 || s/U<([^\>]*)>/<u>$1<\/u>/ 1653 } elsif ($code eq "C") {
1529 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1654 $cb = sub { "<tt>$_[0]</tt>" };
1530 # replace G<male|female> tags 1655 } elsif ($code eq "E") {
1531 || s{G<([^>|]*)\|([^>]*)>}{ 1656 $cb = sub { warn "E<$_[0]>\n";"&$_[0];" };
1532 $self->gender ? $2 : $1 1657 } elsif ($code eq "G") {
1533 }ge 1658 $cb = sub {
1534 # replace H<hint text> 1659 my ($male, $female) = split /\|/, $_[0];
1535 || s{H<([^\>]*)>} 1660 $self->gender ? $female : $male
1536 { 1661 };
1662 } elsif ($code eq "H") {
1663 $cb = sub {
1664 (
1537 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1665 "<fg name=\"lightblue\">[$_[0] (Use hintmode to suppress hints)]</fg>",
1538 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1666 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1539 "") 1667 "",
1540 [$self->{hintmode}] 1668 )[$self->{hintmode}];
1669 };
1670 } elsif ($code eq "I") {
1671 $cb = sub { "<i>$_[0]</i>" };
1672 } elsif ($code eq "T") {
1673 $cb = sub { "<big><b>$_[0]</b></big>" };
1674 } elsif ($code eq "U") {
1675 $cb = sub { "<u>$_[0]</u>" };
1676 } elsif ($code eq "Z") {
1677 $cb = sub { };
1678 } else {
1679 die "FATAL error in expand_cfpod";
1680 }
1681
1682 push @nest, [$delim, $cb, $xml];
1683 undef $xml;
1684
1685 } elsif ($_ =~ /$nest[-1][0]/gcs) {
1686 my $nest = pop @nest;
1687
1688 if ($nest->[1]) {
1689 $xml = $nest->[2] . $nest->[1]->($xml);
1690 } else {
1691 last;
1692 }
1693 } elsif (/\G</xgcs) {
1694 $xml .= "&lt;";
1695 } elsif (/\G&/xgcs) {
1696 $xml .= "&amp;";
1697 } elsif (/\G>/xgcs) {
1698 $xml .= ">";
1699 } else {
1700 if ($pod =~ /\G(.+)/xgcs) {
1701 warn "parse error (at $1)($nest[-1][0]) while expanding cfpod:\n$pod";
1702 last;
1703 } else {
1704 warn "parse error (unclosed interior sequence at end of cfpod) while expanding cfpod:\n$pod";
1705 return "<b>Sorry, the server encountered an internal error when formatting this message, please report this.</b>";
1706 }
1541 }ge; 1707 }
1708 }
1709 }
1542 1710
1543 # create single paragraphs (very hackish) 1711 $xml
1544 s/(?<=\S)\n(?=\w)/ /g;
1545
1546 # compress some whitespace
1547 s/\s+\n/\n/g; # ws line-ends
1548 s/\n\n+/\n/g; # double lines
1549 s/^\n+//; # beginning lines
1550 s/\n+$//; # ending lines
1551
1552 $_
1553} 1712}
1554 1713
1555sub hintmode { 1714sub hintmode {
1556 $_[0]{hintmode} = $_[1] if @_ > 1; 1715 $_[0]{hintmode} = $_[1] if @_ > 1;
1557 $_[0]{hintmode} 1716 $_[0]{hintmode}
1630our $MAX_RESET = 3600; 1789our $MAX_RESET = 3600;
1631our $DEFAULT_RESET = 3000; 1790our $DEFAULT_RESET = 3000;
1632 1791
1633sub generate_random_map { 1792sub generate_random_map {
1634 my ($self, $rmp) = @_; 1793 my ($self, $rmp) = @_;
1794
1795 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1796
1635 # mit "rum" bekleckern, nicht 1797 # mit "rum" bekleckern, nicht
1636 $self->_create_random_map ( 1798 $self->_create_random_map (
1637 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1799 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1638 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1800 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1639 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1801 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1761 1923
1762# the temporary/swap location 1924# the temporary/swap location
1763sub save_path { 1925sub save_path {
1764 my ($self) = @_; 1926 my ($self) = @_;
1765 1927
1766 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1767 "$TMPDIR/$path.map" 1929 "$TMPDIR/$path.map"
1768} 1930}
1769 1931
1770# the unique path, undef == no special unique path 1932# the unique path, undef == no special unique path
1771sub uniq_path { 1933sub uniq_path {
1772 my ($self) = @_; 1934 my ($self) = @_;
1773 1935
1774 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1936 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1775 "$UNIQUEDIR/$path" 1937 "$UNIQUEDIR/$path"
1776} 1938}
1777 1939
1778# and all this just because we cannot iterate over 1940# and all this just because we cannot iterate over
1779# all maps in C++... 1941# all maps in C++...
1877 2039
1878 cf::lock_wait "map_data:$path";#d#remove 2040 cf::lock_wait "map_data:$path";#d#remove
1879 cf::lock_wait "map_find:$path"; 2041 cf::lock_wait "map_find:$path";
1880 2042
1881 $cf::MAP{$path} || do { 2043 $cf::MAP{$path} || do {
1882 my $guard1 = cf::lock_acquire "map_find:$path";
1883 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 2044 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2045 my $guard2 = cf::lock_acquire "map_find:$path";
1884 2046
1885 my $map = new_from_path cf::map $path 2047 my $map = new_from_path cf::map $path
1886 or return; 2048 or return;
1887 2049
1888 $map->{last_save} = $cf::RUNTIME; 2050 $map->{last_save} = $cf::RUNTIME;
1891 or return; 2053 or return;
1892 2054
1893 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2055 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1894 # doing this can freeze the server in a sync job, obviously 2056 # doing this can freeze the server in a sync job, obviously
1895 #$cf::WAIT_FOR_TICK->wait; 2057 #$cf::WAIT_FOR_TICK->wait;
2058 undef $guard2;
1896 undef $guard1; 2059 undef $guard1;
1897 undef $guard2;
1898 $map->reset; 2060 $map->reset;
1899 return find $path; 2061 return find $path;
1900 } 2062 }
1901 2063
1902 $cf::MAP{$path} = $map 2064 $cf::MAP{$path} = $map
1929 my $f = new_from_file cf::object::thawer $self->{load_path}; 2091 my $f = new_from_file cf::object::thawer $self->{load_path};
1930 $f->skip_block; 2092 $f->skip_block;
1931 $self->_load_objects ($f) 2093 $self->_load_objects ($f)
1932 or return; 2094 or return;
1933 2095
1934 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2096 $self->post_load_original
1935 if delete $self->{load_original}; 2097 if delete $self->{load_original};
1936 2098
1937 if (my $uniq = $self->uniq_path) { 2099 if (my $uniq = $self->uniq_path) {
1938 utf8::encode $uniq; 2100 utf8::encode $uniq;
1939 unless (aio_stat $uniq) { 2101 unless (aio_stat $uniq) {
1965 } 2127 }
1966 2128
1967 $self->{last_save} = $cf::RUNTIME; 2129 $self->{last_save} = $cf::RUNTIME;
1968 $self->last_access ($cf::RUNTIME); 2130 $self->last_access ($cf::RUNTIME);
1969 2131
1970 $self->in_memory (cf::MAP_IN_MEMORY); 2132 $self->in_memory (cf::MAP_ACTIVE);
1971 } 2133 }
1972 2134
1973 $self->post_load; 2135 $self->post_load;
1974} 2136}
1975 2137
2033 my ($path, $origin, $load) = @_; 2195 my ($path, $origin, $load) = @_;
2034 2196
2035 $path = normalise $path, $origin && $origin->{path}; 2197 $path = normalise $path, $origin && $origin->{path};
2036 2198
2037 if (my $map = $cf::MAP{$path}) { 2199 if (my $map = $cf::MAP{$path}) {
2038 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2200 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2039 } 2201 }
2040 2202
2041 $MAP_PREFETCH{$path} |= $load; 2203 $MAP_PREFETCH{$path} |= $load;
2042 2204
2043 $MAP_PREFETCHER ||= cf::async { 2205 $MAP_PREFETCHER ||= cf::async {
2080 cf::async { 2242 cf::async {
2081 $Coro::current->{desc} = "map player save"; 2243 $Coro::current->{desc} = "map player save";
2082 $_->contr->save for $self->players; 2244 $_->contr->save for $self->players;
2083 }; 2245 };
2084 2246
2247 cf::get_slot 0.02;
2248
2085 if ($uniq) { 2249 if ($uniq) {
2086 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2250 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2087 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2251 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2088 } else { 2252 } else {
2089 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2253 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2097 $self->save; 2261 $self->save;
2098 2262
2099 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2100 2264
2101 return if $self->players; 2265 return if $self->players;
2102 return if $self->in_memory != cf::MAP_IN_MEMORY; 2266 return if $self->in_memory != cf::MAP_ACTIVE;
2103 return if $self->{deny_save}; 2267 return if $self->{deny_save};
2104 2268
2105 $self->in_memory (cf::MAP_SWAPPED); 2269 $self->in_memory (cf::MAP_SWAPPED);
2106 2270
2107 $self->deactivate; 2271 $self->deactivate;
2225 2389
2226sub unique_maps() { 2390sub unique_maps() {
2227 [ 2391 [
2228 map { 2392 map {
2229 utf8::decode $_; 2393 utf8::decode $_;
2230 /\.map$/ 2394 s/\.map$//; # TODO future compatibility hack
2395 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2396 ? ()
2231 ? normalise $_ 2397 : normalise $_
2232 : ()
2233 } @{ aio_readdir $UNIQUEDIR or [] } 2398 } @{ aio_readdir $UNIQUEDIR or [] }
2234 ] 2399 ]
2235} 2400}
2236 2401
2237package cf;
2238
2239=back 2402=back
2240 2403
2241=head3 cf::object 2404=head3 cf::object
2242 2405
2243=cut 2406=cut
2246 2409
2247=over 4 2410=over 4
2248 2411
2249=item $ob->inv_recursive 2412=item $ob->inv_recursive
2250 2413
2251Returns the inventory of the object _and_ their inventories, recursively. 2414Returns the inventory of the object I<and> their inventories, recursively,
2415but I<not> the object itself.
2252 2416
2253=cut 2417=cut
2254 2418
2255sub inv_recursive_; 2419sub inv_recursive_;
2256sub inv_recursive_ { 2420sub inv_recursive_ {
2261 inv_recursive_ inv $_[0] 2425 inv_recursive_ inv $_[0]
2262} 2426}
2263 2427
2264=item $ref = $ob->ref 2428=item $ref = $ob->ref
2265 2429
2266creates and returns a persistent reference to an objetc that can be stored as a string. 2430Creates and returns a persistent reference to an object that can be stored as a string.
2267 2431
2268=item $ob = cf::object::deref ($refstring) 2432=item $ob = cf::object::deref ($refstring)
2269 2433
2270returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2434returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2271even if the object actually exists. May block. 2435even if the object actually exists. May block.
2303can be C<undef>. Does the right thing when the player is currently in a 2467can be C<undef>. Does the right thing when the player is currently in a
2304dialogue with the given NPC character. 2468dialogue with the given NPC character.
2305 2469
2306=cut 2470=cut
2307 2471
2472our $SAY_CHANNEL = {
2473 id => "say",
2474 title => "Map",
2475 reply => "say ",
2476 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2477};
2478
2479our $CHAT_CHANNEL = {
2480 id => "chat",
2481 title => "Chat",
2482 reply => "chat ",
2483 tooltip => "Player chat and shouts, global to the server.",
2484};
2485
2308# rough implementation of a future "reply" method that works 2486# rough implementation of a future "reply" method that works
2309# with dialog boxes. 2487# with dialog boxes.
2310#TODO: the first argument must go, split into a $npc->reply_to ( method 2488#TODO: the first argument must go, split into a $npc->reply_to ( method
2311sub cf::object::player::reply($$$;$) { 2489sub cf::object::player::reply($$$;$) {
2312 my ($self, $npc, $msg, $flags) = @_; 2490 my ($self, $npc, $msg, $flags) = @_;
2323 my $dialog = $pl->{npc_dialog}; 2501 my $dialog = $pl->{npc_dialog};
2324 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2502 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2325 2503
2326 } else { 2504 } else {
2327 $msg = $npc->name . " says: $msg" if $npc; 2505 $msg = $npc->name . " says: $msg" if $npc;
2328 $self->message ($msg, $flags); 2506 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2329 } 2507 }
2330 } 2508 }
2331} 2509}
2332 2510
2333=item $object->send_msg ($channel, $msg, $color, [extra...]) 2511=item $object->send_msg ($channel, $msg, $color, [extra...])
2440Moves the player to the given map-path and coordinates by first freezing 2618Moves the player to the given map-path and coordinates by first freezing
2441her, loading and preparing them map, calling the provided $check callback 2619her, loading and preparing them map, calling the provided $check callback
2442that has to return the map if sucecssful, and then unfreezes the player on 2620that has to return the map if sucecssful, and then unfreezes the player on
2443the new (success) or old (failed) map position. In either case, $done will 2621the new (success) or old (failed) map position. In either case, $done will
2444be called at the end of this process. 2622be called at the end of this process.
2623
2624Note that $check will be called with a potentially non-loaded map, so if
2625it needs a loaded map it has to call C<< ->load >>.
2445 2626
2446=cut 2627=cut
2447 2628
2448our $GOTOGEN; 2629our $GOTOGEN;
2449 2630
2528} 2709}
2529 2710
2530sub prepare_random_map { 2711sub prepare_random_map {
2531 my ($exit) = @_; 2712 my ($exit) = @_;
2532 2713
2533 my $guard = cf::lock_acquire "exit_prepare:$exit";
2534
2535 # all this does is basically replace the /! path by 2714 # all this does is basically replace the /! path by
2536 # a new random map path (?random/...) with a seed 2715 # a new random map path (?random/...) with a seed
2537 # that depends on the exit object 2716 # that depends on the exit object
2538 2717
2539 my $rmp = parse_random_map_params $exit->msg; 2718 my $rmp = parse_random_map_params $exit->msg;
2541 if ($exit->map) { 2720 if ($exit->map) {
2542 $rmp->{region} = $exit->region->name; 2721 $rmp->{region} = $exit->region->name;
2543 $rmp->{origin_map} = $exit->map->path; 2722 $rmp->{origin_map} = $exit->map->path;
2544 $rmp->{origin_x} = $exit->x; 2723 $rmp->{origin_x} = $exit->x;
2545 $rmp->{origin_y} = $exit->y; 2724 $rmp->{origin_y} = $exit->y;
2725
2726 $exit->map->touch;
2546 } 2727 }
2547 2728
2548 $rmp->{random_seed} ||= $exit->random_seed; 2729 $rmp->{random_seed} ||= $exit->random_seed;
2549 2730
2550 my $data = cf::to_json $rmp; 2731 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2551 my $md5 = Digest::MD5::md5_hex $data; 2732 my $md5 = Digest::MD5::md5_hex $data;
2552 my $meta = "$RANDOMDIR/$md5.meta"; 2733 my $meta = "$RANDOMDIR/$md5.meta";
2553 2734
2554 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2735 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2555 aio_write $fh, 0, (length $data), $data, 0; 2736 aio_write $fh, 0, (length $data), $data, 0;
2556 undef $fh; 2737 undef $fh;
2557 aio_rename "$meta~", $meta; 2738 aio_rename "$meta~", $meta;
2558 2739
2740 my $slaying = "?random/$md5";
2741
2742 if ($exit->valid) {
2559 $exit->slaying ("?random/$md5"); 2743 $exit->slaying ("?random/$md5");
2560 $exit->msg (undef); 2744 $exit->msg (undef);
2745 }
2561 } 2746 }
2562} 2747}
2563 2748
2564sub cf::object::player::enter_exit { 2749sub cf::object::player::enter_exit {
2565 my ($self, $exit) = @_; 2750 my ($self, $exit) = @_;
2566 2751
2567 return unless $self->type == cf::PLAYER; 2752 return unless $self->type == cf::PLAYER;
2568 2753
2569 if ($exit->slaying eq "/!") {
2570 #TODO: this should de-fi-ni-te-ly not be a sync-job
2571 # the problem is that $exit might not survive long enough
2572 # so it needs to be done right now, right here
2573 cf::sync_job { prepare_random_map $exit };
2574 }
2575
2576 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2577 my $hp = $exit->stats->hp;
2578 my $sp = $exit->stats->sp;
2579
2580 $self->enter_link; 2754 $self->enter_link;
2581 2755
2582 # if exit is damned, update players death & WoR home-position
2583 $self->contr->savebed ($slaying, $hp, $sp)
2584 if $exit->flag (FLAG_DAMNED);
2585
2586 (async { 2756 (async {
2587 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2757 $Coro::current->{desc} = "enter_exit";
2588 2758
2589 $self->deactivate_recursive; # just to be sure
2590 unless (eval { 2759 unless (eval {
2760 $self->deactivate_recursive; # just to be sure
2761
2762 # random map handling
2763 {
2764 my $guard = cf::lock_acquire "exit_prepare:$exit";
2765
2766 prepare_random_map $exit
2767 if $exit->slaying eq "/!";
2768 }
2769
2770 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2771 my $x = $exit->stats->hp;
2772 my $y = $exit->stats->sp;
2773
2591 $self->goto ($slaying, $hp, $sp); 2774 $self->goto ($map, $x, $y);
2592 2775
2776 # if exit is damned, update players death & WoR home-position
2777 $self->contr->savebed ($map, $x, $y)
2778 if $exit->flag (cf::FLAG_DAMNED);
2779
2593 1; 2780 1
2594 }) { 2781 }) {
2595 $self->message ("Something went wrong deep within the crossfire server. " 2782 $self->message ("Something went wrong deep within the crossfire server. "
2596 . "I'll try to bring you back to the map you were before. " 2783 . "I'll try to bring you back to the map you were before. "
2597 . "Please report this to the dungeon master!", 2784 . "Please report this to the dungeon master!",
2598 cf::NDI_UNIQUE | cf::NDI_RED); 2785 cf::NDI_UNIQUE | cf::NDI_RED);
2628the message, with C<log> being the default. If C<$color> is negative, suppress 2815the message, with C<log> being the default. If C<$color> is negative, suppress
2629the message unless the client supports the msg packet. 2816the message unless the client supports the msg packet.
2630 2817
2631=cut 2818=cut
2632 2819
2820# non-persistent channels (usually the info channel)
2633our %CHANNEL = ( 2821our %CHANNEL = (
2634 "c/identify" => { 2822 "c/identify" => {
2635 id => "infobox", 2823 id => "infobox",
2636 title => "Identify", 2824 title => "Identify",
2637 reply => undef, 2825 reply => undef,
2641 id => "infobox", 2829 id => "infobox",
2642 title => "Examine", 2830 title => "Examine",
2643 reply => undef, 2831 reply => undef,
2644 tooltip => "Signs and other items you examined", 2832 tooltip => "Signs and other items you examined",
2645 }, 2833 },
2834 "c/book" => {
2835 id => "infobox",
2836 title => "Book",
2837 reply => undef,
2838 tooltip => "The contents of a note or book",
2839 },
2646 "c/lookat" => { 2840 "c/lookat" => {
2647 id => "infobox", 2841 id => "infobox",
2648 title => "Look", 2842 title => "Look",
2649 reply => undef, 2843 reply => undef,
2650 tooltip => "What you saw there", 2844 tooltip => "What you saw there",
2651 }, 2845 },
2846 "c/who" => {
2847 id => "infobox",
2848 title => "Players",
2849 reply => undef,
2850 tooltip => "Shows players who are currently online",
2851 },
2852 "c/body" => {
2853 id => "infobox",
2854 title => "Body Parts",
2855 reply => undef,
2856 tooltip => "Shows which body parts you posess and are available",
2857 },
2858 "c/uptime" => {
2859 id => "infobox",
2860 title => "Uptime",
2861 reply => undef,
2862 tooltip => "How long the server has been running since last restart",
2863 },
2864 "c/mapinfo" => {
2865 id => "infobox",
2866 title => "Map Info",
2867 reply => undef,
2868 tooltip => "Information related to the maps",
2869 },
2870 "c/party" => {
2871 id => "party",
2872 title => "Party",
2873 reply => "gsay ",
2874 tooltip => "Messages and chat related to your party",
2875 },
2652); 2876);
2653 2877
2654sub cf::client::send_msg { 2878sub cf::client::send_msg {
2655 my ($self, $channel, $msg, $color, @extra) = @_; 2879 my ($self, $channel, $msg, $color, @extra) = @_;
2656 2880
2683 if ($self->can_msg) { 2907 if ($self->can_msg) {
2684 # default colour, mask it out 2908 # default colour, mask it out
2685 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2909 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2686 if $color & cf::NDI_DEF; 2910 if $color & cf::NDI_DEF;
2687 2911
2688 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2912 my $pkt = "msg "
2913 . $self->{json_coder}->encode (
2689 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2914 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2915 );
2916
2917 # try lzf for large packets
2918 $pkt = "lzf " . Compress::LZF::compress $pkt
2919 if 1024 <= length $pkt and $self->{can_lzf};
2920
2921 # split very large packets
2922 if (8192 < length $pkt and $self->{can_lzf}) {
2923 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2924 $pkt = "frag";
2925 }
2926
2927 $self->send_packet ($pkt);
2690 } else { 2928 } else {
2691 if ($color >= 0) { 2929 if ($color >= 0) {
2692 # replace some tags by gcfclient-compatible ones 2930 # replace some tags by gcfclient-compatible ones
2693 for ($msg) { 2931 for ($msg) {
2694 1 while 2932 1 while
2892=pod 3130=pod
2893 3131
2894The following functions and methods are available within a safe environment: 3132The following functions and methods are available within a safe environment:
2895 3133
2896 cf::object 3134 cf::object
2897 contr pay_amount pay_player map x y force_find force_add 3135 contr pay_amount pay_player map x y force_find force_add destroy
2898 insert remove name archname title slaying race decrease_ob_nr 3136 insert remove name archname title slaying race decrease split
2899 3137
2900 cf::object::player 3138 cf::object::player
2901 player 3139 player
2902 3140
2903 cf::player 3141 cf::player
2908 3146
2909=cut 3147=cut
2910 3148
2911for ( 3149for (
2912 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3150 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2913 insert remove inv name archname title slaying race 3151 insert remove inv nrof name archname title slaying race
2914 decrease_ob_nr)], 3152 decrease split destroy change_exp)],
2915 ["cf::object::player" => qw(player)], 3153 ["cf::object::player" => qw(player)],
2916 ["cf::player" => qw(peaceful)], 3154 ["cf::player" => qw(peaceful)],
2917 ["cf::map" => qw(trigger)], 3155 ["cf::map" => qw(trigger)],
2918) { 3156) {
2919 no strict 'refs'; 3157 no strict 'refs';
3024 { 3262 {
3025 my $faces = $facedata->{faceinfo}; 3263 my $faces = $facedata->{faceinfo};
3026 3264
3027 while (my ($face, $info) = each %$faces) { 3265 while (my ($face, $info) = each %$faces) {
3028 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3266 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3267
3029 cf::face::set_visibility $idx, $info->{visibility}; 3268 cf::face::set_visibility $idx, $info->{visibility};
3030 cf::face::set_magicmap $idx, $info->{magicmap}; 3269 cf::face::set_magicmap $idx, $info->{magicmap};
3031 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3270 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3032 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3271 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3033 3272
3034 cf::cede_to_tick; 3273 cf::cede_to_tick;
3035 } 3274 }
3036 3275
3037 while (my ($face, $info) = each %$faces) { 3276 while (my ($face, $info) = each %$faces) {
3038 next unless $info->{smooth}; 3277 next unless $info->{smooth};
3278
3039 my $idx = cf::face::find $face 3279 my $idx = cf::face::find $face
3040 or next; 3280 or next;
3281
3041 if (my $smooth = cf::face::find $info->{smooth}) { 3282 if (my $smooth = cf::face::find $info->{smooth}) {
3042 cf::face::set_smooth $idx, $smooth; 3283 cf::face::set_smooth $idx, $smooth;
3043 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3284 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3044 } else { 3285 } else {
3045 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3286 warn "smooth face '$info->{smooth}' not found for face '$face'";
3063 { 3304 {
3064 # TODO: for gcfclient pleasure, we should give resources 3305 # TODO: for gcfclient pleasure, we should give resources
3065 # that gcfclient doesn't grok a >10000 face index. 3306 # that gcfclient doesn't grok a >10000 face index.
3066 my $res = $facedata->{resource}; 3307 my $res = $facedata->{resource};
3067 3308
3068 my $soundconf = delete $res->{"res/sound.conf"};
3069
3070 while (my ($name, $info) = each %$res) { 3309 while (my ($name, $info) = each %$res) {
3310 if (defined $info->{type}) {
3071 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3311 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3072 my $data; 3312 my $data;
3073 3313
3074 if ($info->{type} & 1) { 3314 if ($info->{type} & 1) {
3075 # prepend meta info 3315 # prepend meta info
3076 3316
3077 my $meta = $enc->encode ({ 3317 my $meta = $enc->encode ({
3078 name => $name, 3318 name => $name,
3079 %{ $info->{meta} || {} }, 3319 %{ $info->{meta} || {} },
3080 }); 3320 });
3081 3321
3082 $data = pack "(w/a*)*", $meta, $info->{data}; 3322 $data = pack "(w/a*)*", $meta, $info->{data};
3323 } else {
3324 $data = $info->{data};
3325 }
3326
3327 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3328 cf::face::set_type $idx, $info->{type};
3083 } else { 3329 } else {
3084 $data = $info->{data}; 3330 $RESOURCE{$name} = $info;
3085 } 3331 }
3086 3332
3087 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3088 cf::face::set_type $idx, $info->{type};
3089
3090 cf::cede_to_tick; 3333 cf::cede_to_tick;
3091 } 3334 }
3092
3093 if ($soundconf) {
3094 $soundconf = $enc->decode (delete $soundconf->{data});
3095
3096 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3097 my $sound = $soundconf->{compat}[$_]
3098 or next;
3099
3100 my $face = cf::face::find "sound/$sound->[1]";
3101 cf::sound::set $sound->[0] => $face;
3102 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3103 }
3104
3105 while (my ($k, $v) = each %{$soundconf->{event}}) {
3106 my $face = cf::face::find "sound/$v";
3107 cf::sound::set $k => $face;
3108 }
3109 }
3110 } 3335 }
3336
3337 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3111 3338
3112 1 3339 1
3113} 3340}
3341
3342cf::global->attach (on_resource_update => sub {
3343 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3344 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3345
3346 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3347 my $sound = $soundconf->{compat}[$_]
3348 or next;
3349
3350 my $face = cf::face::find "sound/$sound->[1]";
3351 cf::sound::set $sound->[0] => $face;
3352 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3353 }
3354
3355 while (my ($k, $v) = each %{$soundconf->{event}}) {
3356 my $face = cf::face::find "sound/$v";
3357 cf::sound::set $k => $face;
3358 }
3359 }
3360});
3114 3361
3115register_exticmd fx_want => sub { 3362register_exticmd fx_want => sub {
3116 my ($ns, $want) = @_; 3363 my ($ns, $want) = @_;
3117 3364
3118 while (my ($k, $v) = each %$want) { 3365 while (my ($k, $v) = each %$want) {
3119 $ns->fx_want ($k, $v); 3366 $ns->fx_want ($k, $v);
3120 } 3367 }
3121}; 3368};
3369
3370sub load_resource_file($) {
3371 my $guard = lock_acquire "load_resource_file";
3372
3373 my $status = load_resource_file_ $_[0];
3374 get_slot 0.1, 100;
3375 cf::arch::commit_load;
3376
3377 $status
3378}
3122 3379
3123sub reload_regions { 3380sub reload_regions {
3124 # HACK to clear player env face cache, we need some signal framework 3381 # HACK to clear player env face cache, we need some signal framework
3125 # for this (global event?) 3382 # for this (global event?)
3126 %ext::player_env::MUSIC_FACE_CACHE = (); 3383 %ext::player_env::MUSIC_FACE_CACHE = ();
3140} 3397}
3141 3398
3142sub reload_archetypes { 3399sub reload_archetypes {
3143 load_resource_file "$DATADIR/archetypes" 3400 load_resource_file "$DATADIR/archetypes"
3144 or die "unable to load archetypes\n"; 3401 or die "unable to load archetypes\n";
3145 #d# NEED to laod twice to resolve forward references
3146 # this really needs to be done in an extra post-pass
3147 # (which needs to be synchronous, so solve it differently)
3148 load_resource_file "$DATADIR/archetypes"
3149 or die "unable to load archetypes\n";
3150} 3402}
3151 3403
3152sub reload_treasures { 3404sub reload_treasures {
3153 load_resource_file "$DATADIR/treasures" 3405 load_resource_file "$DATADIR/treasures"
3154 or die "unable to load treasurelists\n"; 3406 or die "unable to load treasurelists\n";
3155} 3407}
3156 3408
3157sub reload_resources { 3409sub reload_resources {
3158 warn "reloading resource files...\n"; 3410 warn "reloading resource files...\n";
3159 3411
3412 reload_facedata;
3413 reload_archetypes;
3160 reload_regions; 3414 reload_regions;
3161 reload_facedata;
3162 #reload_archetypes;#d#
3163 reload_archetypes;
3164 reload_treasures; 3415 reload_treasures;
3165 3416
3166 warn "finished reloading resource files\n"; 3417 warn "finished reloading resource files\n";
3167} 3418}
3168 3419
3169sub init { 3420sub init {
3421 my $guard = freeze_mainloop;
3422
3423 evthread_start IO::AIO::poll_fileno;
3424
3170 reload_resources; 3425 reload_resources;
3171} 3426}
3172 3427
3173sub reload_config { 3428sub reload_config {
3174 open my $fh, "<:utf8", "$CONFDIR/config" 3429 open my $fh, "<:utf8", "$CONFDIR/config"
3175 or return; 3430 or return;
3176 3431
3177 local $/; 3432 local $/;
3178 *CFG = YAML::Syck::Load <$fh>; 3433 *CFG = YAML::Load <$fh>;
3179 3434
3180 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3435 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3181 3436
3182 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3437 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3183 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3438 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3195 # we must not ever block the main coroutine 3450 # we must not ever block the main coroutine
3196 local $Coro::idle = sub { 3451 local $Coro::idle = sub {
3197 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3452 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3198 (async { 3453 (async {
3199 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3454 $Coro::current->{desc} = "IDLE BUG HANDLER";
3200 Event::one_event; 3455 EV::loop EV::LOOP_ONESHOT;
3201 })->prio (Coro::PRIO_MAX); 3456 })->prio (Coro::PRIO_MAX);
3202 }; 3457 };
3203 3458
3459 {
3460 my $guard = freeze_mainloop;
3204 reload_config; 3461 reload_config;
3205 db_init; 3462 db_init;
3206 load_extensions; 3463 load_extensions;
3207 3464
3208 $TICK_WATCHER->start; 3465 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3466 }
3467
3209 Event::loop; 3468 EV::loop;
3210} 3469}
3211 3470
3212############################################################################# 3471#############################################################################
3213# initialisation and cleanup 3472# initialisation and cleanup
3214 3473
3215# install some emergency cleanup handlers 3474# install some emergency cleanup handlers
3216BEGIN { 3475BEGIN {
3476 our %SIGWATCHER = ();
3217 for my $signal (qw(INT HUP TERM)) { 3477 for my $signal (qw(INT HUP TERM)) {
3218 Event->signal ( 3478 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3219 reentrant => 0,
3220 data => WF_AUTOCANCEL,
3221 signal => $signal,
3222 prio => 0,
3223 cb => sub {
3224 cf::cleanup "SIG$signal"; 3479 cf::cleanup "SIG$signal";
3225 },
3226 ); 3480 };
3227 } 3481 }
3228} 3482}
3229 3483
3230sub write_runtime { 3484sub write_runtime_sync {
3231 my $runtime = "$LOCALDIR/runtime"; 3485 my $runtime = "$LOCALDIR/runtime";
3232 3486
3233 # first touch the runtime file to show we are still running: 3487 # first touch the runtime file to show we are still running:
3234 # the fsync below can take a very very long time. 3488 # the fsync below can take a very very long time.
3235 3489
3261 and return; 3515 and return;
3262 3516
3263 warn "runtime file written.\n"; 3517 warn "runtime file written.\n";
3264 3518
3265 1 3519 1
3520}
3521
3522our $uuid_lock;
3523our $uuid_skip;
3524
3525sub write_uuid_sync($) {
3526 $uuid_skip ||= $_[0];
3527
3528 return if $uuid_lock;
3529 local $uuid_lock = 1;
3530
3531 my $uuid = "$LOCALDIR/uuid";
3532
3533 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3534 or return;
3535
3536 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3537 $uuid_skip = 0;
3538
3539 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3540 and return;
3541
3542 # always fsync - this file is important
3543 aio_fsync $fh
3544 and return;
3545
3546 close $fh
3547 or return;
3548
3549 aio_rename "$uuid~", $uuid
3550 and return;
3551
3552 warn "uuid file written ($value).\n";
3553
3554 1
3555
3556}
3557
3558sub write_uuid($$) {
3559 my ($skip, $sync) = @_;
3560
3561 $sync ? write_uuid_sync $skip
3562 : async { write_uuid_sync $skip };
3266} 3563}
3267 3564
3268sub emergency_save() { 3565sub emergency_save() {
3269 my $freeze_guard = cf::freeze_mainloop; 3566 my $freeze_guard = cf::freeze_mainloop;
3270 3567
3276 # and maps saved/destroyed asynchronously. 3573 # and maps saved/destroyed asynchronously.
3277 warn "begin emergency player save\n"; 3574 warn "begin emergency player save\n";
3278 for my $login (keys %cf::PLAYER) { 3575 for my $login (keys %cf::PLAYER) {
3279 my $pl = $cf::PLAYER{$login} or next; 3576 my $pl = $cf::PLAYER{$login} or next;
3280 $pl->valid or next; 3577 $pl->valid or next;
3578 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3281 $pl->save; 3579 $pl->save;
3282 } 3580 }
3283 warn "end emergency player save\n"; 3581 warn "end emergency player save\n";
3284 3582
3285 warn "begin emergency map save\n"; 3583 warn "begin emergency map save\n";
3291 warn "end emergency map save\n"; 3589 warn "end emergency map save\n";
3292 3590
3293 warn "begin emergency database checkpoint\n"; 3591 warn "begin emergency database checkpoint\n";
3294 BDB::db_env_txn_checkpoint $DB_ENV; 3592 BDB::db_env_txn_checkpoint $DB_ENV;
3295 warn "end emergency database checkpoint\n"; 3593 warn "end emergency database checkpoint\n";
3594
3595 warn "begin write uuid\n";
3596 write_uuid_sync 1;
3597 warn "end write uuid\n";
3296 }; 3598 };
3297 3599
3298 warn "leave emergency perl save\n"; 3600 warn "leave emergency perl save\n";
3299} 3601}
3300 3602
3302 my ($make_core) = @_; 3604 my ($make_core) = @_;
3303 3605
3304 warn Carp::longmess "post_cleanup backtrace" 3606 warn Carp::longmess "post_cleanup backtrace"
3305 if $make_core; 3607 if $make_core;
3306} 3608}
3609
3610# a safer delete_package, copied from Symbol
3611sub clear_package($) {
3612 my $pkg = shift;
3613
3614 # expand to full symbol table name if needed
3615 unless ($pkg =~ /^main::.*::$/) {
3616 $pkg = "main$pkg" if $pkg =~ /^::/;
3617 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3618 $pkg .= '::' unless $pkg =~ /::$/;
3619 }
3620
3621 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3622 my $stem_symtab = *{$stem}{HASH};
3623
3624 defined $stem_symtab and exists $stem_symtab->{$leaf}
3625 or return;
3626
3627 # clear all symbols
3628 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3629 for my $name (keys %$leaf_symtab) {
3630 _gv_clear *{"$pkg$name"};
3631# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3632 }
3633 warn "cleared package #$pkg\n";#d#
3634}
3635
3636our $RELOAD; # how many times to reload
3307 3637
3308sub do_reload_perl() { 3638sub do_reload_perl() {
3309 # can/must only be called in main 3639 # can/must only be called in main
3310 if ($Coro::current != $Coro::main) { 3640 if ($Coro::current != $Coro::main) {
3311 warn "can only reload from main coroutine"; 3641 warn "can only reload from main coroutine";
3312 return; 3642 return;
3313 } 3643 }
3314 3644
3645 return if $RELOAD++;
3646
3647 while ($RELOAD) {
3315 warn "reloading..."; 3648 warn "reloading...";
3316 3649
3317 warn "entering sync_job"; 3650 warn "entering sync_job";
3318 3651
3319 cf::sync_job { 3652 cf::sync_job {
3320 cf::write_runtime; # external watchdog should not bark 3653 cf::write_runtime_sync; # external watchdog should not bark
3321 cf::emergency_save; 3654 cf::emergency_save;
3322 cf::write_runtime; # external watchdog should not bark 3655 cf::write_runtime_sync; # external watchdog should not bark
3323 3656
3324 warn "syncing database to disk"; 3657 warn "syncing database to disk";
3325 BDB::db_env_txn_checkpoint $DB_ENV; 3658 BDB::db_env_txn_checkpoint $DB_ENV;
3326 3659
3327 # if anything goes wrong in here, we should simply crash as we already saved 3660 # if anything goes wrong in here, we should simply crash as we already saved
3328 3661
3329 warn "cancelling all WF_AUTOCANCEL watchers";
3330 for (Event::all_watchers) {
3331 $_->cancel if $_->data & WF_AUTOCANCEL;
3332 }
3333
3334 warn "flushing outstanding aio requests"; 3662 warn "flushing outstanding aio requests";
3335 for (;;) {
3336 BDB::flush;
3337 IO::AIO::flush;
3338 Coro::cede;
3339 last unless IO::AIO::nreqs || BDB::nreqs; 3663 while (IO::AIO::nreqs || BDB::nreqs) {
3340 warn "iterate..."; 3664 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3341 }
3342
3343 ++$RELOAD;
3344
3345 warn "cancelling all extension coros";
3346 $_->cancel for values %EXT_CORO;
3347 %EXT_CORO = ();
3348
3349 warn "removing commands";
3350 %COMMAND = ();
3351
3352 warn "removing ext/exti commands";
3353 %EXTCMD = ();
3354 %EXTICMD = ();
3355
3356 warn "unloading/nuking all extensions";
3357 for my $pkg (@EXTS) {
3358 warn "... unloading $pkg";
3359
3360 if (my $cb = $pkg->can ("unload")) {
3361 eval {
3362 $cb->($pkg);
3363 1
3364 } or warn "$pkg unloaded, but with errors: $@";
3365 } 3665 }
3366 3666
3367 warn "... nuking $pkg"; 3667 warn "cancelling all extension coros";
3368 Symbol::delete_package $pkg; 3668 $_->cancel for values %EXT_CORO;
3369 } 3669 %EXT_CORO = ();
3370 3670
3371 warn "unloading all perl modules loaded from $LIBDIR"; 3671 warn "removing commands";
3372 while (my ($k, $v) = each %INC) { 3672 %COMMAND = ();
3373 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3374 3673
3674 warn "removing ext/exti commands";
3675 %EXTCMD = ();
3676 %EXTICMD = ();
3677
3678 warn "unloading/nuking all extensions";
3679 for my $pkg (@EXTS) {
3375 warn "... unloading $k"; 3680 warn "... unloading $pkg";
3376 delete $INC{$k};
3377 3681
3378 $k =~ s/\.pm$//;
3379 $k =~ s/\//::/g;
3380
3381 if (my $cb = $k->can ("unload_module")) { 3682 if (my $cb = $pkg->can ("unload")) {
3683 eval {
3382 $cb->(); 3684 $cb->($pkg);
3685 1
3686 } or warn "$pkg unloaded, but with errors: $@";
3687 }
3688
3689 warn "... clearing $pkg";
3690 clear_package $pkg;
3383 } 3691 }
3384 3692
3385 Symbol::delete_package $k; 3693 warn "unloading all perl modules loaded from $LIBDIR";
3694 while (my ($k, $v) = each %INC) {
3695 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3696
3697 warn "... unloading $k";
3698 delete $INC{$k};
3699
3700 $k =~ s/\.pm$//;
3701 $k =~ s/\//::/g;
3702
3703 if (my $cb = $k->can ("unload_module")) {
3704 $cb->();
3705 }
3706
3707 clear_package $k;
3386 } 3708 }
3387 3709
3388 warn "getting rid of safe::, as good as possible"; 3710 warn "getting rid of safe::, as good as possible";
3389 Symbol::delete_package "safe::$_" 3711 clear_package "safe::$_"
3390 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3712 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3391 3713
3392 warn "unloading cf.pm \"a bit\""; 3714 warn "unloading cf.pm \"a bit\"";
3393 delete $INC{"cf.pm"}; 3715 delete $INC{"cf.pm"};
3394 delete $INC{"cf/pod.pm"}; 3716 delete $INC{"cf/pod.pm"};
3395 3717
3396 # don't, removes xs symbols, too, 3718 # don't, removes xs symbols, too,
3397 # and global variables created in xs 3719 # and global variables created in xs
3398 #Symbol::delete_package __PACKAGE__; 3720 #clear_package __PACKAGE__;
3399 3721
3400 warn "unload completed, starting to reload now"; 3722 warn "unload completed, starting to reload now";
3401 3723
3402 warn "reloading cf.pm"; 3724 warn "reloading cf.pm";
3403 require cf; 3725 require cf;
3404 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3726 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3405 3727
3406 warn "loading config and database again"; 3728 warn "loading config and database again";
3407 cf::reload_config; 3729 cf::reload_config;
3408 3730
3409 warn "loading extensions"; 3731 warn "loading extensions";
3410 cf::load_extensions; 3732 cf::load_extensions;
3411 3733
3412 warn "reattaching attachments to objects/players"; 3734 warn "reattaching attachments to objects/players";
3413 _global_reattach; # objects, sockets 3735 _global_reattach; # objects, sockets
3414 warn "reattaching attachments to maps"; 3736 warn "reattaching attachments to maps";
3415 reattach $_ for values %MAP; 3737 reattach $_ for values %MAP;
3416 warn "reattaching attachments to players"; 3738 warn "reattaching attachments to players";
3417 reattach $_ for values %PLAYER; 3739 reattach $_ for values %PLAYER;
3418 3740
3419 warn "leaving sync_job"; 3741 warn "leaving sync_job";
3420 3742
3421 1 3743 1
3422 } or do { 3744 } or do {
3423 warn $@; 3745 warn $@;
3424 warn "error while reloading, exiting."; 3746 cf::cleanup "error while reloading, exiting.";
3425 exit 1;
3426 }; 3747 };
3427 3748
3428 warn "reloaded"; 3749 warn "reloaded";
3750 --$RELOAD;
3751 }
3429}; 3752};
3430 3753
3431our $RELOAD_WATCHER; # used only during reload 3754our $RELOAD_WATCHER; # used only during reload
3432 3755
3433sub reload_perl() { 3756sub reload_perl() {
3434 # doing reload synchronously and two reloads happen back-to-back, 3757 # doing reload synchronously and two reloads happen back-to-back,
3435 # coro crashes during coro_state_free->destroy here. 3758 # coro crashes during coro_state_free->destroy here.
3436 3759
3437 $RELOAD_WATCHER ||= Event->timer ( 3760 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3438 reentrant => 0,
3439 after => 0,
3440 data => WF_AUTOCANCEL,
3441 cb => sub {
3442 do_reload_perl; 3761 do_reload_perl;
3443 undef $RELOAD_WATCHER; 3762 undef $RELOAD_WATCHER;
3444 },
3445 ); 3763 };
3446} 3764}
3447 3765
3448register_command "reload" => sub { 3766register_command "reload" => sub {
3449 my ($who, $arg) = @_; 3767 my ($who, $arg) = @_;
3450 3768
3463 3781
3464our @WAIT_FOR_TICK; 3782our @WAIT_FOR_TICK;
3465our @WAIT_FOR_TICK_BEGIN; 3783our @WAIT_FOR_TICK_BEGIN;
3466 3784
3467sub wait_for_tick { 3785sub wait_for_tick {
3468 return unless $TICK_WATCHER->is_active;
3469 return if $Coro::current == $Coro::main; 3786 return if tick_inhibit || $Coro::current == $Coro::main;
3470 3787
3471 my $signal = new Coro::Signal; 3788 my $signal = new Coro::Signal;
3472 push @WAIT_FOR_TICK, $signal; 3789 push @WAIT_FOR_TICK, $signal;
3473 $signal->wait; 3790 $signal->wait;
3474} 3791}
3475 3792
3476sub wait_for_tick_begin { 3793sub wait_for_tick_begin {
3477 return unless $TICK_WATCHER->is_active;
3478 return if $Coro::current == $Coro::main; 3794 return if tick_inhibit || $Coro::current == $Coro::main;
3479 3795
3480 my $signal = new Coro::Signal; 3796 my $signal = new Coro::Signal;
3481 push @WAIT_FOR_TICK_BEGIN, $signal; 3797 push @WAIT_FOR_TICK_BEGIN, $signal;
3482 $signal->wait; 3798 $signal->wait;
3483} 3799}
3484 3800
3485$TICK_WATCHER = Event->timer ( 3801sub tick {
3486 reentrant => 0,
3487 parked => 1,
3488 prio => 0,
3489 at => $NEXT_TICK || $TICK,
3490 data => WF_AUTOCANCEL,
3491 cb => sub {
3492 if ($Coro::current != $Coro::main) { 3802 if ($Coro::current != $Coro::main) {
3493 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3803 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3494 unless ++$bug_warning > 10; 3804 unless ++$bug_warning > 10;
3495 return; 3805 return;
3496 } 3806 }
3497 3807
3498 $NOW = $tick_start = Event::time;
3499
3500 cf::server_tick; # one server iteration 3808 cf::server_tick; # one server iteration
3501 3809
3502 $RUNTIME += $TICK;
3503 $NEXT_TICK += $TICK;
3504
3505 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3810 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3506 $NEXT_RUNTIME_WRITE = $NOW + 10; 3811 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3507 Coro::async_pool { 3812 Coro::async_pool {
3508 $Coro::current->{desc} = "runtime saver"; 3813 $Coro::current->{desc} = "runtime saver";
3509 write_runtime 3814 write_runtime_sync
3510 or warn "ERROR: unable to write runtime file: $!"; 3815 or warn "ERROR: unable to write runtime file: $!";
3511 };
3512 } 3816 };
3817 }
3513 3818
3514 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3819 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3515 $sig->send; 3820 $sig->send;
3516 } 3821 }
3517 while (my $sig = shift @WAIT_FOR_TICK) { 3822 while (my $sig = shift @WAIT_FOR_TICK) {
3518 $sig->send; 3823 $sig->send;
3519 } 3824 }
3520 3825
3521 $NOW = Event::time; 3826 $LOAD = ($NOW - $TICK_START) / $TICK;
3522
3523 # if we are delayed by four ticks or more, skip them all
3524 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3525
3526 $TICK_WATCHER->at ($NEXT_TICK);
3527 $TICK_WATCHER->start;
3528
3529 $LOAD = ($NOW - $tick_start) / $TICK;
3530 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3827 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3531 3828
3532 _post_tick; 3829 if (0) {
3830 if ($NEXT_TICK) {
3831 my $jitter = $TICK_START - $NEXT_TICK;
3832 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3833 warn "jitter $JITTER\n";#d#
3834 }
3533 }, 3835 }
3534); 3836}
3535 3837
3536{ 3838{
3839 # configure BDB
3840
3537 BDB::min_parallel 8; 3841 BDB::min_parallel 8;
3538 BDB::max_poll_time $TICK * 0.1; 3842 BDB::max_poll_reqs $TICK * 0.1;
3539 $BDB_POLL_WATCHER = Event->io ( 3843 $AnyEvent::BDB::WATCHER->priority (1);
3540 reentrant => 0,
3541 fd => BDB::poll_fileno,
3542 poll => 'r',
3543 prio => 0,
3544 data => WF_AUTOCANCEL,
3545 cb => \&BDB::poll_cb,
3546 );
3547
3548 BDB::set_sync_prepare {
3549 my $status;
3550 my $current = $Coro::current;
3551 (
3552 sub {
3553 $status = $!;
3554 $current->ready; undef $current;
3555 },
3556 sub {
3557 Coro::schedule while defined $current;
3558 $! = $status;
3559 },
3560 )
3561 };
3562 3844
3563 unless ($DB_ENV) { 3845 unless ($DB_ENV) {
3564 $DB_ENV = BDB::db_env_create; 3846 $DB_ENV = BDB::db_env_create;
3565 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3847 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3566 | BDB::LOG_AUTOREMOVE, 1); 3848 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3849 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3567 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3850 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3568 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3851 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3569 3852
3570 cf::sync_job { 3853 cf::sync_job {
3571 eval { 3854 eval {
3581 3864
3582 cf::cleanup "db_env_open(db): $@" if $@; 3865 cf::cleanup "db_env_open(db): $@" if $@;
3583 }; 3866 };
3584 } 3867 }
3585 3868
3586 $BDB_DEADLOCK_WATCHER = Event->timer ( 3869 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3587 after => 3,
3588 interval => 1,
3589 hard => 1,
3590 prio => 0,
3591 data => WF_AUTOCANCEL,
3592 cb => sub {
3593 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3870 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3594 },
3595 ); 3871 };
3596 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3872 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3597 after => 11,
3598 interval => 60,
3599 hard => 1,
3600 prio => 0,
3601 data => WF_AUTOCANCEL,
3602 cb => sub {
3603 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3873 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3604 },
3605 ); 3874 };
3606 $BDB_TRICKLE_WATCHER = Event->timer ( 3875 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3607 after => 5,
3608 interval => 10,
3609 hard => 1,
3610 prio => 0,
3611 data => WF_AUTOCANCEL,
3612 cb => sub {
3613 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3876 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3614 },
3615 ); 3877 };
3616} 3878}
3617 3879
3618{ 3880{
3881 # configure IO::AIO
3882
3619 IO::AIO::min_parallel 8; 3883 IO::AIO::min_parallel 8;
3620
3621 undef $Coro::AIO::WATCHER;
3622 IO::AIO::max_poll_time $TICK * 0.1; 3884 IO::AIO::max_poll_time $TICK * 0.1;
3623 $AIO_POLL_WATCHER = Event->io ( 3885 undef $AnyEvent::AIO::WATCHER;
3624 reentrant => 0,
3625 data => WF_AUTOCANCEL,
3626 fd => IO::AIO::poll_fileno,
3627 poll => 'r',
3628 prio => 0,
3629 cb => \&IO::AIO::poll_cb,
3630 );
3631} 3886}
3632 3887
3633my $_log_backtrace; 3888my $_log_backtrace;
3634 3889
3635sub _log_backtrace { 3890sub _log_backtrace {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines