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.394 by root, Thu Nov 8 19:43:25 2007 UTC vs.
Revision 1.445 by root, Wed Sep 10 18:18:10 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 Event; 31use EV;
10use Opcode; 32use Opcode;
11use Safe; 33use Safe;
12use Safe::Hole; 34use Safe::Hole;
13use Storable (); 35use Storable ();
14 36
15use Coro 4.1 (); 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.51 (); 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 69
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
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
52our %COMMAND = (); 74our %COMMAND = ();
59our %EXT_MAP = (); # pluggable maps 81our %EXT_MAP = (); # pluggable maps
60 82
61our $RELOAD; # number of reloads so far 83our $RELOAD; # number of reloads so far
62our @EVENT; 84our @EVENT;
63 85
64our $CONFDIR = confdir; 86our $CONFDIR = confdir;
65our $DATADIR = datadir; 87our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 88our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 89our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 90our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 91our $LOCALDIR = localdir;
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 $PIDFILE = "$LOCALDIR/pid";
98our $RUNTIMEFILE = "$LOCALDIR/runtime";
99
100our %RESOURCE;
75 101
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 102our $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 103our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 104our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 105our $USE_FSYNC = 1; # use fsync to write maps - default off
83 106
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 107our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 108our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 109our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 110our $DB_ENV;
89 111
90our %CFG; 112our %CFG;
91 113
92our $UPTIME; $UPTIME ||= time; 114our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 115our $RUNTIME;
116our $NOW;
94 117
95our (%PLAYER, %PLAYER_LOADING); # all users 118our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 119our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 120our $LINK_MAP; # the special {link} map, which is always available
98 121
99# used to convert map paths into valid unix filenames by replacing / by ∕ 122# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 123our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 124
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 125our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 126our $LOADAVG; # same thing, but with alpha-smoothing
127our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 128our $TICK_START; # for load detecting purposes
105 129
106binmode STDOUT; 130binmode STDOUT;
107binmode STDERR; 131binmode STDERR;
108 132
109# read virtual server time, if available 133# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 134unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 135 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 136 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 137 $RUNTIME = <$fh> + 0.;
114} 138}
115 139
116mkdir $_ 140mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 141 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
162 186
163The raw value load value from the last tick. 187The raw value load value from the last tick.
164 188
165=item %cf::CFG 189=item %cf::CFG
166 190
167Configuration for the server, loaded from C</etc/crossfire/config>, or 191Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 192from wherever your confdir points to.
169 193
170=item cf::wait_for_tick, cf::wait_for_tick_begin 194=item cf::wait_for_tick, cf::wait_for_tick_begin
171 195
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 196These 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; 217 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 218
195 LOG llevError, $msg; 219 LOG llevError, $msg;
196 }; 220 };
197} 221}
222
223$Coro::State::DIEHOOK = sub {
224 return unless $^S eq 0; # "eq", not "=="
225
226 if ($Coro::current == $Coro::main) {#d#
227 warn "DIEHOOK called in main context, Coro bug?\n";#d#
228 return;#d#
229 }#d#
230
231 # kill coroutine otherwise
232 warn Carp::longmess $_[0];
233 Coro::terminate
234};
235
236$SIG{__DIE__} = sub { }; #d#?
198 237
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 238@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 239@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 240@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 241@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 248for my $pkg (qw(
210 cf::global cf::attachable 249 cf::global cf::attachable
211 cf::object cf::object::player 250 cf::object cf::object::player
212 cf::client cf::player 251 cf::client cf::player
213 cf::arch cf::living 252 cf::arch cf::living
253 cf::map cf::mapspace
214 cf::map cf::party cf::region 254 cf::party cf::region
215)) { 255)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 256 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 257}
219 258
220$Event::DIED = sub { 259$EV::DIED = sub {
221 warn "error in event callback: @_"; 260 warn "error in event callback: @_";
222}; 261};
223 262
224############################################################################# 263#############################################################################
225 264
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 287 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 288 $d
250 } || "[unable to dump $_[0]: '$@']"; 289 } || "[unable to dump $_[0]: '$@']";
251} 290}
252 291
253=item $ref = cf::from_json $json 292=item $ref = cf::decode_json $json
254 293
255Converts a JSON string into the corresponding perl data structure. 294Converts a JSON string into the corresponding perl data structure.
256 295
257=item $json = cf::to_json $ref 296=item $json = cf::encode_json $ref
258 297
259Converts a perl data structure into its JSON representation. 298Converts a perl data structure into its JSON representation.
260 299
261=cut 300=cut
262 301
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 302our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 303
265sub to_json ($) { $json_coder->encode ($_[0]) } 304sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 305sub decode_json($) { $json_coder->decode ($_[0]) }
267 306
268=item cf::lock_wait $string 307=item cf::lock_wait $string
269 308
270Wait until the given lock is available. See cf::lock_acquire. 309Wait until the given lock is available. See cf::lock_acquire.
271 310
327 366
328 ! ! $LOCK{$key} 367 ! ! $LOCK{$key}
329} 368}
330 369
331sub freeze_mainloop { 370sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 371 tick_inhibit_inc;
333 372
334 my $guard = Coro::guard { 373 Coro::guard \&tick_inhibit_dec;
335 $TICK_WATCHER->start; 374}
336 }; 375
337 $TICK_WATCHER->stop; 376=item cf::periodic $interval, $cb
338 $guard 377
378Like EV::periodic, but randomly selects a starting point so that the actions
379get spread over timer.
380
381=cut
382
383sub periodic($$) {
384 my ($interval, $cb) = @_;
385
386 my $start = rand List::Util::min 180, $interval;
387
388 EV::periodic $start, $interval, 0, $cb
339} 389}
340 390
341=item cf::get_slot $time[, $priority[, $name]] 391=item cf::get_slot $time[, $priority[, $name]]
342 392
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 393Allocate $time seconds of blocking CPU time at priority C<$priority>:
383 } 433 }
384 } 434 }
385}; 435};
386 436
387sub get_slot($;$$) { 437sub get_slot($;$$) {
438 return if tick_inhibit || $Coro::current == $Coro::main;
439
388 my ($time, $pri, $name) = @_; 440 my ($time, $pri, $name) = @_;
389 441
390 $time = $TICK * .6 if $time > $TICK * .6; 442 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal; 443 my $sig = new Coro::Signal;
392 444
422 474
423sub sync_job(&) { 475sub sync_job(&) {
424 my ($job) = @_; 476 my ($job) = @_;
425 477
426 if ($Coro::current == $Coro::main) { 478 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 479 my $time = EV::time;
428 480
429 # this is the main coro, too bad, we have to block 481 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 482 # till the operation succeeds, freezing the server :/
431 483
432 LOG llevError, Carp::longmess "sync job";#d# 484 LOG llevError, Carp::longmess "sync job";#d#
433 485
434 # TODO: use suspend/resume instead
435 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 486 my $freeze_guard = freeze_mainloop;
437 487
438 my $busy = 1; 488 my $busy = 1;
439 my @res; 489 my @res;
440 490
447 497
448 while ($busy) { 498 while ($busy) {
449 if (Coro::nready) { 499 if (Coro::nready) {
450 Coro::cede_notself; 500 Coro::cede_notself;
451 } else { 501 } else {
452 Event::one_event; 502 EV::loop EV::LOOP_ONESHOT;
453 } 503 }
454 } 504 }
455 505
456 $time = Event::time - $time; 506 my $time = EV::time - $time;
457 507
458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
459 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
460
461 $tick_start += $time; # do not account sync jobs to server load 508 $TICK_START += $time; # do not account sync jobs to server load
462 509
463 wantarray ? @res : $res[0] 510 wantarray ? @res : $res[0]
464 } else { 511 } else {
465 # we are in another coroutine, how wonderful, everything just works 512 # we are in another coroutine, how wonderful, everything just works
466 513
491=item fork_call { }, $args 538=item fork_call { }, $args
492 539
493Executes the given code block with the given arguments in a seperate 540Executes the given code block with the given arguments in a seperate
494process, returning the results. Everything must be serialisable with 541process, returning the results. Everything must be serialisable with
495Coro::Storable. May, of course, block. Note that the executed sub may 542Coro::Storable. May, of course, block. Note that the executed sub may
496never block itself or use any form of Event handling. 543never block itself or use any form of event handling.
497 544
498=cut 545=cut
499 546
500sub fork_call(&@) { 547sub fork_call(&@) {
501 my ($cb, @args) = @_; 548 my ($cb, @args) = @_;
508 reset_signals; 555 reset_signals;
509 &$cb 556 &$cb
510 }, @args; 557 }, @args;
511 558
512 wantarray ? @res : $res[-1] 559 wantarray ? @res : $res[-1]
560}
561
562=item $coin = coin_from_name $name
563
564=cut
565
566our %coin_alias = (
567 "silver" => "silvercoin",
568 "silvercoin" => "silvercoin",
569 "silvercoins" => "silvercoin",
570 "gold" => "goldcoin",
571 "goldcoin" => "goldcoin",
572 "goldcoins" => "goldcoin",
573 "platinum" => "platinacoin",
574 "platinumcoin" => "platinacoin",
575 "platinumcoins" => "platinacoin",
576 "platina" => "platinacoin",
577 "platinacoin" => "platinacoin",
578 "platinacoins" => "platinacoin",
579 "royalty" => "royalty",
580 "royalties" => "royalty",
581);
582
583sub coin_from_name($) {
584 $coin_alias{$_[0]}
585 ? cf::arch::find $coin_alias{$_[0]}
586 : undef
513} 587}
514 588
515=item $value = cf::db_get $family => $key 589=item $value = cf::db_get $family => $key
516 590
517Returns a single value from the environment database. 591Returns a single value from the environment database.
954 } 1028 }
955 1029
956 0 1030 0
957} 1031}
958 1032
959=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1033=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
960 1034
961=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1035=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
962 1036
963Generate an object-specific event with the given arguments. 1037Generate an object-specific event with the given arguments.
964 1038
1017 1091
1018sub reattach { 1092sub reattach {
1019 # basically do the same as instantiate, without calling instantiate 1093 # basically do the same as instantiate, without calling instantiate
1020 my ($obj) = @_; 1094 my ($obj) = @_;
1021 1095
1096 # no longer needed after getting rid of delete_package?
1022 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1097 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1023 1098
1024 my $registry = $obj->registry; 1099 my $registry = $obj->registry;
1025 1100
1026 @$registry = (); 1101 @$registry = ();
1027 1102
1042cf::attachable->attach ( 1117cf::attachable->attach (
1043 prio => -1000000, 1118 prio => -1000000,
1044 on_instantiate => sub { 1119 on_instantiate => sub {
1045 my ($obj, $data) = @_; 1120 my ($obj, $data) = @_;
1046 1121
1047 $data = from_json $data; 1122 $data = decode_json $data;
1048 1123
1049 for (@$data) { 1124 for (@$data) {
1050 my ($name, $args) = @$_; 1125 my ($name, $args) = @$_;
1051 1126
1052 $obj->attach ($name, %{$args || {} }); 1127 $obj->attach ($name, %{$args || {} });
1073 utf8::decode (my $decname = $filename); 1148 utf8::decode (my $decname = $filename);
1074 warn sprintf "saving %s (%d,%d)\n", 1149 warn sprintf "saving %s (%d,%d)\n",
1075 $decname, length $$rdata, scalar @$objs; 1150 $decname, length $$rdata, scalar @$objs;
1076 1151
1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1152 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1078 chmod SAVE_MODE, $fh; 1153 aio_chmod $fh, SAVE_MODE;
1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1154 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1080 aio_fsync $fh if $cf::USE_FSYNC; 1155 aio_fsync $fh if $cf::USE_FSYNC;
1081 close $fh; 1156 aio_close $fh;
1082 1157
1083 if (@$objs) { 1158 if (@$objs) {
1084 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1159 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1085 chmod SAVE_MODE, $fh; 1160 aio_chmod $fh, SAVE_MODE;
1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1161 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1087 aio_write $fh, 0, (length $data), $data, 0; 1162 aio_write $fh, 0, (length $data), $data, 0;
1088 aio_fsync $fh if $cf::USE_FSYNC; 1163 aio_fsync $fh if $cf::USE_FSYNC;
1089 close $fh; 1164 aio_close $fh;
1090 aio_rename "$filename.pst~", "$filename.pst"; 1165 aio_rename "$filename.pst~", "$filename.pst";
1091 } 1166 }
1092 } else { 1167 } else {
1093 aio_unlink "$filename.pst"; 1168 aio_unlink "$filename.pst";
1094 } 1169 }
1263 1338
1264 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1339 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1265 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1340 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1266 1341
1267 $ext{source} = 1342 $ext{source} =
1268 "package $pkg; use strict; use utf8;\n" 1343 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1269 . "#line 1 \"$path\"\n{\n" 1344 . "#line 1 \"$path\"\n{\n"
1270 . $source 1345 . $source
1271 . "\n};\n1"; 1346 . "\n};\n1";
1272 1347
1273 $todo{$base} = \%ext; 1348 $todo{$base} = \%ext;
1289 my $msg = $@ ? "$v->{path}: $@\n" 1364 my $msg = $@ ? "$v->{path}: $@\n"
1290 : "$v->{base}: extension inactive.\n"; 1365 : "$v->{base}: extension inactive.\n";
1291 1366
1292 if (exists $v->{meta}{mandatory}) { 1367 if (exists $v->{meta}{mandatory}) {
1293 warn $msg; 1368 warn $msg;
1294 warn "mandatory extension failed to load, exiting.\n"; 1369 cf::cleanup "mandatory extension failed to load, exiting.";
1295 exit 1;
1296 } 1370 }
1297 1371
1298 warn $msg; 1372 warn $msg;
1299 } 1373 }
1300 1374
1389 my $f = new_from_file cf::object::thawer path $login 1463 my $f = new_from_file cf::object::thawer path $login
1390 or return; 1464 or return;
1391 1465
1392 my $pl = cf::player::load_pl $f 1466 my $pl = cf::player::load_pl $f
1393 or return; 1467 or return;
1468
1394 local $cf::PLAYER_LOADING{$login} = $pl; 1469 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs; 1470 $f->resolve_delayed_derefs;
1396 $cf::PLAYER{$login} = $pl 1471 $cf::PLAYER{$login} = $pl
1397 } 1472 }
1398 } 1473 }
1408 1483
1409 return if $pl->{deny_save}; 1484 return if $pl->{deny_save};
1410 1485
1411 aio_mkdir playerdir $pl, 0770; 1486 aio_mkdir playerdir $pl, 0770;
1412 $pl->{last_save} = $cf::RUNTIME; 1487 $pl->{last_save} = $cf::RUNTIME;
1488
1489 cf::get_slot 0.01;
1413 1490
1414 $pl->save_pl ($path); 1491 $pl->save_pl ($path);
1415 cf::cede_to_tick; 1492 cf::cede_to_tick;
1416} 1493}
1417 1494
1449 my ($pl) = @_; 1526 my ($pl) = @_;
1450 1527
1451 my $name = $pl->ob->name; 1528 my $name = $pl->ob->name;
1452 1529
1453 $pl->{deny_save} = 1; 1530 $pl->{deny_save} = 1;
1454 $pl->password ("*"); # this should lock out the player until we nuked the dir 1531 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1455 1532
1456 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1533 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1457 $pl->deactivate; 1534 $pl->deactivate;
1535 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1536 $pl->ob->check_score;
1458 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1537 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1459 $pl->ns->destroy if $pl->ns; 1538 $pl->ns->destroy if $pl->ns;
1460 1539
1461 my $path = playerdir $pl; 1540 my $path = playerdir $pl;
1462 my $temp = "$path~$cf::RUNTIME~deleting~"; 1541 my $temp = "$path~$cf::RUNTIME~deleting~";
1501 1580
1502 for my $login (@$dirs) { 1581 for my $login (@$dirs) {
1503 my $path = path $login; 1582 my $path = path $login;
1504 1583
1505 # a .pst is a dead give-away for a valid player 1584 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") { 1585 # if no pst file found, open and chekc for blocked users
1586 if (aio_stat "$path.pst") {
1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1587 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1508 aio_read $fh, 0, 512, my $buf, 0 or next; 1588 aio_read $fh, 0, 512, my $buf, 0 or next;
1509 $buf !~ /^password -------------$/m or next; # official not-valid tag 1589 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 } 1590 }
1511 1591
1546 1626
1547=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1627=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1548 1628
1549Expand crossfire pod fragments into protocol xml. 1629Expand crossfire pod fragments into protocol xml.
1550 1630
1551=cut
1552
1553use re 'eval';
1554
1555my $group;
1556my $interior; $interior = qr{
1557 # match a pod interior sequence sans C<< >>
1558 (?:
1559 \ (.*?)\ (?{ $group = $^N })
1560 | < (??{$interior}) >
1561 )
1562}x;
1563
1564sub expand_cfpod {
1565 my ($self, $pod) = @_;
1566
1567 my $xml;
1568
1569 while () {
1570 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1571 $group = $1;
1572
1573 $group =~ s/&/&amp;/g;
1574 $group =~ s/</&lt;/g;
1575
1576 $xml .= $group;
1577 } elsif ($pod =~ m%\G
1578 ([BCGHITU])
1579 <
1580 (?:
1581 ([^<>]*) (?{ $group = $^N })
1582 | < $interior >
1583 )
1584 >
1585 %gcsx
1586 ) {
1587 my ($code, $data) = ($1, $group);
1588
1589 if ($code eq "B") {
1590 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1591 } elsif ($code eq "I") {
1592 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1593 } elsif ($code eq "U") {
1594 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1595 } elsif ($code eq "C") {
1596 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1597 } elsif ($code eq "T") {
1598 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1599 } elsif ($code eq "G") {
1600 my ($male, $female) = split /\|/, $data;
1601 $data = $self->gender ? $female : $male;
1602 $xml .= expand_cfpod ($self, $data);
1603 } elsif ($code eq "H") {
1604 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1605 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1606 "")
1607 [$self->{hintmode}];
1608 } else {
1609 $xml .= "error processing '$code($data)' directive";
1610 }
1611 } else {
1612 if ($pod =~ /\G(.+)/) {
1613 warn "parse error while expanding $pod (at $1)";
1614 }
1615 last;
1616 }
1617 }
1618
1619 for ($xml) {
1620 # create single paragraphs (very hackish)
1621 s/(?<=\S)\n(?=\w)/ /g;
1622
1623 # compress some whitespace
1624 s/\s+\n/\n/g; # ws line-ends
1625 s/\n\n+/\n/g; # double lines
1626 s/^\n+//; # beginning lines
1627 s/\n+$//; # ending lines
1628 }
1629
1630 $xml
1631}
1632
1633no re 'eval';
1634
1635sub hintmode {
1636 $_[0]{hintmode} = $_[1] if @_ > 1;
1637 $_[0]{hintmode}
1638}
1639
1640=item $player->ext_reply ($msgid, @msg) 1631=item $player->ext_reply ($msgid, @msg)
1641 1632
1642Sends an ext reply to the player. 1633Sends an ext reply to the player.
1643 1634
1644=cut 1635=cut
1710our $MAX_RESET = 3600; 1701our $MAX_RESET = 3600;
1711our $DEFAULT_RESET = 3000; 1702our $DEFAULT_RESET = 3000;
1712 1703
1713sub generate_random_map { 1704sub generate_random_map {
1714 my ($self, $rmp) = @_; 1705 my ($self, $rmp) = @_;
1706
1707 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1708
1715 # mit "rum" bekleckern, nicht 1709 # mit "rum" bekleckern, nicht
1716 $self->_create_random_map ( 1710 $self->_create_random_map (
1717 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1711 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1718 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1712 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1719 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1713 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1841 1835
1842# the temporary/swap location 1836# the temporary/swap location
1843sub save_path { 1837sub save_path {
1844 my ($self) = @_; 1838 my ($self) = @_;
1845 1839
1846 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1840 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1847 "$TMPDIR/$path.map" 1841 "$TMPDIR/$path.map"
1848} 1842}
1849 1843
1850# the unique path, undef == no special unique path 1844# the unique path, undef == no special unique path
1851sub uniq_path { 1845sub uniq_path {
1852 my ($self) = @_; 1846 my ($self) = @_;
1853 1847
1854 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1848 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1855 "$UNIQUEDIR/$path" 1849 "$UNIQUEDIR/$path"
1856} 1850}
1857 1851
1858# and all this just because we cannot iterate over 1852# and all this just because we cannot iterate over
1859# all maps in C++... 1853# all maps in C++...
1957 1951
1958 cf::lock_wait "map_data:$path";#d#remove 1952 cf::lock_wait "map_data:$path";#d#remove
1959 cf::lock_wait "map_find:$path"; 1953 cf::lock_wait "map_find:$path";
1960 1954
1961 $cf::MAP{$path} || do { 1955 $cf::MAP{$path} || do {
1962 my $guard1 = cf::lock_acquire "map_find:$path";
1963 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 1956 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1957 my $guard2 = cf::lock_acquire "map_find:$path";
1964 1958
1965 my $map = new_from_path cf::map $path 1959 my $map = new_from_path cf::map $path
1966 or return; 1960 or return;
1967 1961
1968 $map->{last_save} = $cf::RUNTIME; 1962 $map->{last_save} = $cf::RUNTIME;
1971 or return; 1965 or return;
1972 1966
1973 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1967 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1974 # doing this can freeze the server in a sync job, obviously 1968 # doing this can freeze the server in a sync job, obviously
1975 #$cf::WAIT_FOR_TICK->wait; 1969 #$cf::WAIT_FOR_TICK->wait;
1970 undef $guard2;
1976 undef $guard1; 1971 undef $guard1;
1977 undef $guard2;
1978 $map->reset; 1972 $map->reset;
1979 return find $path; 1973 return find $path;
1980 } 1974 }
1981 1975
1982 $cf::MAP{$path} = $map 1976 $cf::MAP{$path} = $map
2009 my $f = new_from_file cf::object::thawer $self->{load_path}; 2003 my $f = new_from_file cf::object::thawer $self->{load_path};
2010 $f->skip_block; 2004 $f->skip_block;
2011 $self->_load_objects ($f) 2005 $self->_load_objects ($f)
2012 or return; 2006 or return;
2013 2007
2014 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2008 $self->post_load_original
2015 if delete $self->{load_original}; 2009 if delete $self->{load_original};
2016 2010
2017 if (my $uniq = $self->uniq_path) { 2011 if (my $uniq = $self->uniq_path) {
2018 utf8::encode $uniq; 2012 utf8::encode $uniq;
2019 unless (aio_stat $uniq) { 2013 unless (aio_stat $uniq) {
2045 } 2039 }
2046 2040
2047 $self->{last_save} = $cf::RUNTIME; 2041 $self->{last_save} = $cf::RUNTIME;
2048 $self->last_access ($cf::RUNTIME); 2042 $self->last_access ($cf::RUNTIME);
2049 2043
2050 $self->in_memory (cf::MAP_IN_MEMORY); 2044 $self->in_memory (cf::MAP_ACTIVE);
2051 } 2045 }
2052 2046
2053 $self->post_load; 2047 $self->post_load;
2054} 2048}
2055 2049
2113 my ($path, $origin, $load) = @_; 2107 my ($path, $origin, $load) = @_;
2114 2108
2115 $path = normalise $path, $origin && $origin->{path}; 2109 $path = normalise $path, $origin && $origin->{path};
2116 2110
2117 if (my $map = $cf::MAP{$path}) { 2111 if (my $map = $cf::MAP{$path}) {
2118 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2112 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2119 } 2113 }
2120 2114
2121 $MAP_PREFETCH{$path} |= $load; 2115 $MAP_PREFETCH{$path} |= $load;
2122 2116
2123 $MAP_PREFETCHER ||= cf::async { 2117 $MAP_PREFETCHER ||= cf::async {
2160 cf::async { 2154 cf::async {
2161 $Coro::current->{desc} = "map player save"; 2155 $Coro::current->{desc} = "map player save";
2162 $_->contr->save for $self->players; 2156 $_->contr->save for $self->players;
2163 }; 2157 };
2164 2158
2159 cf::get_slot 0.02;
2160
2165 if ($uniq) { 2161 if ($uniq) {
2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2162 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2167 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2163 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2168 } else { 2164 } else {
2169 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2165 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2177 $self->save; 2173 $self->save;
2178 2174
2179 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2175 my $lock = cf::lock_acquire "map_data:$self->{path}";
2180 2176
2181 return if $self->players; 2177 return if $self->players;
2182 return if $self->in_memory != cf::MAP_IN_MEMORY; 2178 return if $self->in_memory != cf::MAP_ACTIVE;
2183 return if $self->{deny_save}; 2179 return if $self->{deny_save};
2184 2180
2185 $self->in_memory (cf::MAP_SWAPPED); 2181 $self->in_memory (cf::MAP_SWAPPED);
2186 2182
2187 $self->deactivate; 2183 $self->deactivate;
2305 2301
2306sub unique_maps() { 2302sub unique_maps() {
2307 [ 2303 [
2308 map { 2304 map {
2309 utf8::decode $_; 2305 utf8::decode $_;
2310 /\.map$/ 2306 s/\.map$//; # TODO future compatibility hack
2307 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2308 ? ()
2311 ? normalise $_ 2309 : normalise $_
2312 : ()
2313 } @{ aio_readdir $UNIQUEDIR or [] } 2310 } @{ aio_readdir $UNIQUEDIR or [] }
2314 ] 2311 ]
2315} 2312}
2316 2313
2317package cf;
2318
2319=back 2314=back
2320 2315
2321=head3 cf::object 2316=head3 cf::object
2322 2317
2323=cut 2318=cut
2326 2321
2327=over 4 2322=over 4
2328 2323
2329=item $ob->inv_recursive 2324=item $ob->inv_recursive
2330 2325
2331Returns the inventory of the object _and_ their inventories, recursively. 2326Returns the inventory of the object I<and> their inventories, recursively,
2327but I<not> the object itself.
2332 2328
2333=cut 2329=cut
2334 2330
2335sub inv_recursive_; 2331sub inv_recursive_;
2336sub inv_recursive_ { 2332sub inv_recursive_ {
2341 inv_recursive_ inv $_[0] 2337 inv_recursive_ inv $_[0]
2342} 2338}
2343 2339
2344=item $ref = $ob->ref 2340=item $ref = $ob->ref
2345 2341
2346creates and returns a persistent reference to an objetc that can be stored as a string. 2342Creates and returns a persistent reference to an object that can be stored as a string.
2347 2343
2348=item $ob = cf::object::deref ($refstring) 2344=item $ob = cf::object::deref ($refstring)
2349 2345
2350returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2346returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2351even if the object actually exists. May block. 2347even if the object actually exists. May block.
2383can be C<undef>. Does the right thing when the player is currently in a 2379can be C<undef>. Does the right thing when the player is currently in a
2384dialogue with the given NPC character. 2380dialogue with the given NPC character.
2385 2381
2386=cut 2382=cut
2387 2383
2384our $SAY_CHANNEL = {
2385 id => "say",
2386 title => "Map",
2387 reply => "say ",
2388 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2389};
2390
2391our $CHAT_CHANNEL = {
2392 id => "chat",
2393 title => "Chat",
2394 reply => "chat ",
2395 tooltip => "Player chat and shouts, global to the server.",
2396};
2397
2388# rough implementation of a future "reply" method that works 2398# rough implementation of a future "reply" method that works
2389# with dialog boxes. 2399# with dialog boxes.
2390#TODO: the first argument must go, split into a $npc->reply_to ( method 2400#TODO: the first argument must go, split into a $npc->reply_to ( method
2391sub cf::object::player::reply($$$;$) { 2401sub cf::object::player::reply($$$;$) {
2392 my ($self, $npc, $msg, $flags) = @_; 2402 my ($self, $npc, $msg, $flags) = @_;
2403 my $dialog = $pl->{npc_dialog}; 2413 my $dialog = $pl->{npc_dialog};
2404 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2414 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2405 2415
2406 } else { 2416 } else {
2407 $msg = $npc->name . " says: $msg" if $npc; 2417 $msg = $npc->name . " says: $msg" if $npc;
2408 $self->message ($msg, $flags); 2418 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2409 } 2419 }
2410 } 2420 }
2411} 2421}
2412 2422
2413=item $object->send_msg ($channel, $msg, $color, [extra...]) 2423=item $object->send_msg ($channel, $msg, $color, [extra...])
2520Moves the player to the given map-path and coordinates by first freezing 2530Moves the player to the given map-path and coordinates by first freezing
2521her, loading and preparing them map, calling the provided $check callback 2531her, loading and preparing them map, calling the provided $check callback
2522that has to return the map if sucecssful, and then unfreezes the player on 2532that has to return the map if sucecssful, and then unfreezes the player on
2523the new (success) or old (failed) map position. In either case, $done will 2533the new (success) or old (failed) map position. In either case, $done will
2524be called at the end of this process. 2534be called at the end of this process.
2535
2536Note that $check will be called with a potentially non-loaded map, so if
2537it needs a loaded map it has to call C<< ->load >>.
2525 2538
2526=cut 2539=cut
2527 2540
2528our $GOTOGEN; 2541our $GOTOGEN;
2529 2542
2608} 2621}
2609 2622
2610sub prepare_random_map { 2623sub prepare_random_map {
2611 my ($exit) = @_; 2624 my ($exit) = @_;
2612 2625
2613 my $guard = cf::lock_acquire "exit_prepare:$exit";
2614
2615 # all this does is basically replace the /! path by 2626 # all this does is basically replace the /! path by
2616 # a new random map path (?random/...) with a seed 2627 # a new random map path (?random/...) with a seed
2617 # that depends on the exit object 2628 # that depends on the exit object
2618 2629
2619 my $rmp = parse_random_map_params $exit->msg; 2630 my $rmp = parse_random_map_params $exit->msg;
2621 if ($exit->map) { 2632 if ($exit->map) {
2622 $rmp->{region} = $exit->region->name; 2633 $rmp->{region} = $exit->region->name;
2623 $rmp->{origin_map} = $exit->map->path; 2634 $rmp->{origin_map} = $exit->map->path;
2624 $rmp->{origin_x} = $exit->x; 2635 $rmp->{origin_x} = $exit->x;
2625 $rmp->{origin_y} = $exit->y; 2636 $rmp->{origin_y} = $exit->y;
2637
2638 $exit->map->touch;
2626 } 2639 }
2627 2640
2628 $rmp->{random_seed} ||= $exit->random_seed; 2641 $rmp->{random_seed} ||= $exit->random_seed;
2629 2642
2630 my $data = cf::to_json $rmp; 2643 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2631 my $md5 = Digest::MD5::md5_hex $data; 2644 my $md5 = Digest::MD5::md5_hex $data;
2632 my $meta = "$RANDOMDIR/$md5.meta"; 2645 my $meta = "$RANDOMDIR/$md5.meta";
2633 2646
2634 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2647 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2635 aio_write $fh, 0, (length $data), $data, 0; 2648 aio_write $fh, 0, (length $data), $data, 0;
2636 undef $fh; 2649 undef $fh;
2637 aio_rename "$meta~", $meta; 2650 aio_rename "$meta~", $meta;
2638 2651
2652 my $slaying = "?random/$md5";
2653
2654 if ($exit->valid) {
2639 $exit->slaying ("?random/$md5"); 2655 $exit->slaying ("?random/$md5");
2640 $exit->msg (undef); 2656 $exit->msg (undef);
2657 }
2641 } 2658 }
2642} 2659}
2643 2660
2644sub cf::object::player::enter_exit { 2661sub cf::object::player::enter_exit {
2645 my ($self, $exit) = @_; 2662 my ($self, $exit) = @_;
2646 2663
2647 return unless $self->type == cf::PLAYER; 2664 return unless $self->type == cf::PLAYER;
2648 2665
2649 if ($exit->slaying eq "/!") {
2650 #TODO: this should de-fi-ni-te-ly not be a sync-job
2651 # the problem is that $exit might not survive long enough
2652 # so it needs to be done right now, right here
2653 cf::sync_job { prepare_random_map $exit };
2654 }
2655
2656 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2657 my $hp = $exit->stats->hp;
2658 my $sp = $exit->stats->sp;
2659
2660 $self->enter_link; 2666 $self->enter_link;
2661 2667
2662 # if exit is damned, update players death & WoR home-position
2663 $self->contr->savebed ($slaying, $hp, $sp)
2664 if $exit->flag (FLAG_DAMNED);
2665
2666 (async { 2668 (async {
2667 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2669 $Coro::current->{desc} = "enter_exit";
2668 2670
2669 $self->deactivate_recursive; # just to be sure
2670 unless (eval { 2671 unless (eval {
2672 $self->deactivate_recursive; # just to be sure
2673
2674 # random map handling
2675 {
2676 my $guard = cf::lock_acquire "exit_prepare:$exit";
2677
2678 prepare_random_map $exit
2679 if $exit->slaying eq "/!";
2680 }
2681
2682 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2683 my $x = $exit->stats->hp;
2684 my $y = $exit->stats->sp;
2685
2671 $self->goto ($slaying, $hp, $sp); 2686 $self->goto ($map, $x, $y);
2672 2687
2688 # if exit is damned, update players death & WoR home-position
2689 $self->contr->savebed ($map, $x, $y)
2690 if $exit->flag (cf::FLAG_DAMNED);
2691
2673 1; 2692 1
2674 }) { 2693 }) {
2675 $self->message ("Something went wrong deep within the crossfire server. " 2694 $self->message ("Something went wrong deep within the crossfire server. "
2676 . "I'll try to bring you back to the map you were before. " 2695 . "I'll try to bring you back to the map you were before. "
2677 . "Please report this to the dungeon master!", 2696 . "Please report this to the dungeon master!",
2678 cf::NDI_UNIQUE | cf::NDI_RED); 2697 cf::NDI_UNIQUE | cf::NDI_RED);
2758 id => "infobox", 2777 id => "infobox",
2759 title => "Map Info", 2778 title => "Map Info",
2760 reply => undef, 2779 reply => undef,
2761 tooltip => "Information related to the maps", 2780 tooltip => "Information related to the maps",
2762 }, 2781 },
2782 "c/party" => {
2783 id => "party",
2784 title => "Party",
2785 reply => "gsay ",
2786 tooltip => "Messages and chat related to your party",
2787 },
2763); 2788);
2764 2789
2765sub cf::client::send_msg { 2790sub cf::client::send_msg {
2766 my ($self, $channel, $msg, $color, @extra) = @_; 2791 my ($self, $channel, $msg, $color, @extra) = @_;
2767 2792
2794 if ($self->can_msg) { 2819 if ($self->can_msg) {
2795 # default colour, mask it out 2820 # default colour, mask it out
2796 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2821 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2797 if $color & cf::NDI_DEF; 2822 if $color & cf::NDI_DEF;
2798 2823
2799 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2824 my $pkt = "msg "
2825 . $self->{json_coder}->encode (
2800 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2826 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2827 );
2828
2829 # try lzf for large packets
2830 $pkt = "lzf " . Compress::LZF::compress $pkt
2831 if 1024 <= length $pkt and $self->{can_lzf};
2832
2833 # split very large packets
2834 if (8192 < length $pkt and $self->{can_lzf}) {
2835 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2836 $pkt = "frag";
2837 }
2838
2839 $self->send_packet ($pkt);
2801 } else { 2840 } else {
2802 if ($color >= 0) { 2841 if ($color >= 0) {
2803 # replace some tags by gcfclient-compatible ones 2842 # replace some tags by gcfclient-compatible ones
2804 for ($msg) { 2843 for ($msg) {
2805 1 while 2844 1 while
3004 3043
3005The following functions and methods are available within a safe environment: 3044The following functions and methods are available within a safe environment:
3006 3045
3007 cf::object 3046 cf::object
3008 contr pay_amount pay_player map x y force_find force_add destroy 3047 contr pay_amount pay_player map x y force_find force_add destroy
3009 insert remove name archname title slaying race decrease_ob_nr 3048 insert remove name archname title slaying race decrease split
3010 3049
3011 cf::object::player 3050 cf::object::player
3012 player 3051 player
3013 3052
3014 cf::player 3053 cf::player
3019 3058
3020=cut 3059=cut
3021 3060
3022for ( 3061for (
3023 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3062 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3024 insert remove inv name archname title slaying race 3063 insert remove inv nrof name archname title slaying race
3025 decrease_ob_nr destroy)], 3064 decrease split destroy change_exp)],
3026 ["cf::object::player" => qw(player)], 3065 ["cf::object::player" => qw(player)],
3027 ["cf::player" => qw(peaceful)], 3066 ["cf::player" => qw(peaceful)],
3028 ["cf::map" => qw(trigger)], 3067 ["cf::map" => qw(trigger)],
3029) { 3068) {
3030 no strict 'refs'; 3069 no strict 'refs';
3135 { 3174 {
3136 my $faces = $facedata->{faceinfo}; 3175 my $faces = $facedata->{faceinfo};
3137 3176
3138 while (my ($face, $info) = each %$faces) { 3177 while (my ($face, $info) = each %$faces) {
3139 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3178 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3179
3140 cf::face::set_visibility $idx, $info->{visibility}; 3180 cf::face::set_visibility $idx, $info->{visibility};
3141 cf::face::set_magicmap $idx, $info->{magicmap}; 3181 cf::face::set_magicmap $idx, $info->{magicmap};
3142 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3182 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3143 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3183 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3144 3184
3145 cf::cede_to_tick; 3185 cf::cede_to_tick;
3146 } 3186 }
3147 3187
3148 while (my ($face, $info) = each %$faces) { 3188 while (my ($face, $info) = each %$faces) {
3149 next unless $info->{smooth}; 3189 next unless $info->{smooth};
3190
3150 my $idx = cf::face::find $face 3191 my $idx = cf::face::find $face
3151 or next; 3192 or next;
3193
3152 if (my $smooth = cf::face::find $info->{smooth}) { 3194 if (my $smooth = cf::face::find $info->{smooth}) {
3153 cf::face::set_smooth $idx, $smooth; 3195 cf::face::set_smooth $idx, $smooth;
3154 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3196 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3155 } else { 3197 } else {
3156 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3198 warn "smooth face '$info->{smooth}' not found for face '$face'";
3174 { 3216 {
3175 # TODO: for gcfclient pleasure, we should give resources 3217 # TODO: for gcfclient pleasure, we should give resources
3176 # that gcfclient doesn't grok a >10000 face index. 3218 # that gcfclient doesn't grok a >10000 face index.
3177 my $res = $facedata->{resource}; 3219 my $res = $facedata->{resource};
3178 3220
3179 my $soundconf = delete $res->{"res/sound.conf"};
3180
3181 while (my ($name, $info) = each %$res) { 3221 while (my ($name, $info) = each %$res) {
3222 if (defined $info->{type}) {
3182 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3223 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3183 my $data; 3224 my $data;
3184 3225
3185 if ($info->{type} & 1) { 3226 if ($info->{type} & 1) {
3186 # prepend meta info 3227 # prepend meta info
3187 3228
3188 my $meta = $enc->encode ({ 3229 my $meta = $enc->encode ({
3189 name => $name, 3230 name => $name,
3190 %{ $info->{meta} || {} }, 3231 %{ $info->{meta} || {} },
3191 }); 3232 });
3192 3233
3193 $data = pack "(w/a*)*", $meta, $info->{data}; 3234 $data = pack "(w/a*)*", $meta, $info->{data};
3235 } else {
3236 $data = $info->{data};
3237 }
3238
3239 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3240 cf::face::set_type $idx, $info->{type};
3194 } else { 3241 } else {
3195 $data = $info->{data}; 3242 $RESOURCE{$name} = $info;
3196 } 3243 }
3197 3244
3198 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3199 cf::face::set_type $idx, $info->{type};
3200
3201 cf::cede_to_tick; 3245 cf::cede_to_tick;
3202 } 3246 }
3203
3204 if ($soundconf) {
3205 $soundconf = $enc->decode (delete $soundconf->{data});
3206
3207 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3208 my $sound = $soundconf->{compat}[$_]
3209 or next;
3210
3211 my $face = cf::face::find "sound/$sound->[1]";
3212 cf::sound::set $sound->[0] => $face;
3213 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3214 }
3215
3216 while (my ($k, $v) = each %{$soundconf->{event}}) {
3217 my $face = cf::face::find "sound/$v";
3218 cf::sound::set $k => $face;
3219 }
3220 }
3221 } 3247 }
3248
3249 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3222 3250
3223 1 3251 1
3224} 3252}
3253
3254cf::global->attach (on_resource_update => sub {
3255 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3256 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3257
3258 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3259 my $sound = $soundconf->{compat}[$_]
3260 or next;
3261
3262 my $face = cf::face::find "sound/$sound->[1]";
3263 cf::sound::set $sound->[0] => $face;
3264 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3265 }
3266
3267 while (my ($k, $v) = each %{$soundconf->{event}}) {
3268 my $face = cf::face::find "sound/$v";
3269 cf::sound::set $k => $face;
3270 }
3271 }
3272});
3225 3273
3226register_exticmd fx_want => sub { 3274register_exticmd fx_want => sub {
3227 my ($ns, $want) = @_; 3275 my ($ns, $want) = @_;
3228 3276
3229 while (my ($k, $v) = each %$want) { 3277 while (my ($k, $v) = each %$want) {
3230 $ns->fx_want ($k, $v); 3278 $ns->fx_want ($k, $v);
3231 } 3279 }
3232}; 3280};
3281
3282sub load_resource_file($) {
3283 my $guard = lock_acquire "load_resource_file";
3284
3285 my $status = load_resource_file_ $_[0];
3286 get_slot 0.1, 100;
3287 cf::arch::commit_load;
3288
3289 $status
3290}
3233 3291
3234sub reload_regions { 3292sub reload_regions {
3235 # HACK to clear player env face cache, we need some signal framework 3293 # HACK to clear player env face cache, we need some signal framework
3236 # for this (global event?) 3294 # for this (global event?)
3237 %ext::player_env::MUSIC_FACE_CACHE = (); 3295 %ext::player_env::MUSIC_FACE_CACHE = ();
3251} 3309}
3252 3310
3253sub reload_archetypes { 3311sub reload_archetypes {
3254 load_resource_file "$DATADIR/archetypes" 3312 load_resource_file "$DATADIR/archetypes"
3255 or die "unable to load archetypes\n"; 3313 or die "unable to load archetypes\n";
3256 #d# NEED to laod twice to resolve forward references
3257 # this really needs to be done in an extra post-pass
3258 # (which needs to be synchronous, so solve it differently)
3259 load_resource_file "$DATADIR/archetypes"
3260 or die "unable to load archetypes\n";
3261} 3314}
3262 3315
3263sub reload_treasures { 3316sub reload_treasures {
3264 load_resource_file "$DATADIR/treasures" 3317 load_resource_file "$DATADIR/treasures"
3265 or die "unable to load treasurelists\n"; 3318 or die "unable to load treasurelists\n";
3266} 3319}
3267 3320
3268sub reload_resources { 3321sub reload_resources {
3269 warn "reloading resource files...\n"; 3322 warn "reloading resource files...\n";
3270 3323
3324 reload_facedata;
3325 reload_archetypes;
3271 reload_regions; 3326 reload_regions;
3272 reload_facedata;
3273 #reload_archetypes;#d#
3274 reload_archetypes;
3275 reload_treasures; 3327 reload_treasures;
3276 3328
3277 warn "finished reloading resource files\n"; 3329 warn "finished reloading resource files\n";
3278} 3330}
3279 3331
3280sub init { 3332sub init {
3333 my $guard = freeze_mainloop;
3334
3335 evthread_start IO::AIO::poll_fileno;
3336
3281 reload_resources; 3337 reload_resources;
3282} 3338}
3283 3339
3284sub reload_config { 3340sub reload_config {
3285 open my $fh, "<:utf8", "$CONFDIR/config" 3341 open my $fh, "<:utf8", "$CONFDIR/config"
3286 or return; 3342 or return;
3287 3343
3288 local $/; 3344 local $/;
3289 *CFG = YAML::Syck::Load <$fh>; 3345 *CFG = YAML::Load <$fh>;
3290 3346
3291 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3347 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3292 3348
3293 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3349 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3294 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3350 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3300 }; 3356 };
3301 warn $@ if $@; 3357 warn $@ if $@;
3302 } 3358 }
3303} 3359}
3304 3360
3361sub pidfile() {
3362 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3363 or die "$PIDFILE: $!";
3364 flock $fh, &Fcntl::LOCK_EX
3365 or die "$PIDFILE: flock: $!";
3366 $fh
3367}
3368
3369# make sure only one server instance is running at any one time
3370sub atomic {
3371 my $fh = pidfile;
3372
3373 my $pid = <$fh>;
3374 kill 9, $pid if $pid > 0;
3375
3376 seek $fh, 0, 0;
3377 print $fh $$;
3378}
3379
3305sub main { 3380sub main {
3381 atomic;
3382
3306 # we must not ever block the main coroutine 3383 # we must not ever block the main coroutine
3307 local $Coro::idle = sub { 3384 local $Coro::idle = sub {
3308 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3385 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3309 (async { 3386 (async {
3310 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3387 $Coro::current->{desc} = "IDLE BUG HANDLER";
3311 Event::one_event; 3388 EV::loop EV::LOOP_ONESHOT;
3312 })->prio (Coro::PRIO_MAX); 3389 })->prio (Coro::PRIO_MAX);
3313 }; 3390 };
3314 3391
3392 {
3393 my $guard = freeze_mainloop;
3315 reload_config; 3394 reload_config;
3316 db_init; 3395 db_init;
3317 load_extensions; 3396 load_extensions;
3318 3397
3319 $TICK_WATCHER->start; 3398 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3399 }
3400
3401 utime time, time, $RUNTIMEFILE;
3402
3403 # no (long-running) fork's whatsoever before this point(!)
3404 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3405
3320 Event::loop; 3406 EV::loop;
3321} 3407}
3322 3408
3323############################################################################# 3409#############################################################################
3324# initialisation and cleanup 3410# initialisation and cleanup
3325 3411
3326# install some emergency cleanup handlers 3412# install some emergency cleanup handlers
3327BEGIN { 3413BEGIN {
3414 our %SIGWATCHER = ();
3328 for my $signal (qw(INT HUP TERM)) { 3415 for my $signal (qw(INT HUP TERM)) {
3329 Event->signal ( 3416 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3330 reentrant => 0,
3331 data => WF_AUTOCANCEL,
3332 signal => $signal,
3333 prio => 0,
3334 cb => sub {
3335 cf::cleanup "SIG$signal"; 3417 cf::cleanup "SIG$signal";
3336 },
3337 ); 3418 };
3338 } 3419 }
3339} 3420}
3340 3421
3341sub write_runtime { 3422sub write_runtime_sync {
3342 my $runtime = "$LOCALDIR/runtime";
3343
3344 # first touch the runtime file to show we are still running: 3423 # first touch the runtime file to show we are still running:
3345 # the fsync below can take a very very long time. 3424 # the fsync below can take a very very long time.
3346 3425
3347 IO::AIO::aio_utime $runtime, undef, undef; 3426 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3348 3427
3349 my $guard = cf::lock_acquire "write_runtime"; 3428 my $guard = cf::lock_acquire "write_runtime";
3350 3429
3351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3430 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3352 or return; 3431 or return;
3353 3432
3354 my $value = $cf::RUNTIME + 90 + 10; 3433 my $value = $cf::RUNTIME + 90 + 10;
3355 # 10 is the runtime save interval, for a monotonic clock 3434 # 10 is the runtime save interval, for a monotonic clock
3356 # 60 allows for the watchdog to kill the server. 3435 # 60 allows for the watchdog to kill the server.
3366 aio_utime $fh, undef, undef; 3445 aio_utime $fh, undef, undef;
3367 3446
3368 close $fh 3447 close $fh
3369 or return; 3448 or return;
3370 3449
3371 aio_rename "$runtime~", $runtime 3450 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3372 and return; 3451 and return;
3373 3452
3374 warn "runtime file written.\n"; 3453 warn "runtime file written.\n";
3375 3454
3376 1 3455 1
3456}
3457
3458our $uuid_lock;
3459our $uuid_skip;
3460
3461sub write_uuid_sync($) {
3462 $uuid_skip ||= $_[0];
3463
3464 return if $uuid_lock;
3465 local $uuid_lock = 1;
3466
3467 my $uuid = "$LOCALDIR/uuid";
3468
3469 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3470 or return;
3471
3472 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3473 $uuid_skip = 0;
3474
3475 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3476 and return;
3477
3478 # always fsync - this file is important
3479 aio_fsync $fh
3480 and return;
3481
3482 close $fh
3483 or return;
3484
3485 aio_rename "$uuid~", $uuid
3486 and return;
3487
3488 warn "uuid file written ($value).\n";
3489
3490 1
3491
3492}
3493
3494sub write_uuid($$) {
3495 my ($skip, $sync) = @_;
3496
3497 $sync ? write_uuid_sync $skip
3498 : async { write_uuid_sync $skip };
3377} 3499}
3378 3500
3379sub emergency_save() { 3501sub emergency_save() {
3380 my $freeze_guard = cf::freeze_mainloop; 3502 my $freeze_guard = cf::freeze_mainloop;
3381 3503
3403 warn "end emergency map save\n"; 3525 warn "end emergency map save\n";
3404 3526
3405 warn "begin emergency database checkpoint\n"; 3527 warn "begin emergency database checkpoint\n";
3406 BDB::db_env_txn_checkpoint $DB_ENV; 3528 BDB::db_env_txn_checkpoint $DB_ENV;
3407 warn "end emergency database checkpoint\n"; 3529 warn "end emergency database checkpoint\n";
3530
3531 warn "begin write uuid\n";
3532 write_uuid_sync 1;
3533 warn "end write uuid\n";
3408 }; 3534 };
3409 3535
3410 warn "leave emergency perl save\n"; 3536 warn "leave emergency perl save\n";
3411} 3537}
3412 3538
3413sub post_cleanup { 3539sub post_cleanup {
3414 my ($make_core) = @_; 3540 my ($make_core) = @_;
3415 3541
3416 warn Carp::longmess "post_cleanup backtrace" 3542 warn Carp::longmess "post_cleanup backtrace"
3417 if $make_core; 3543 if $make_core;
3544
3545 my $fh = pidfile;
3546 unlink $PIDFILE if <$fh> == $$;
3418} 3547}
3548
3549# a safer delete_package, copied from Symbol
3550sub clear_package($) {
3551 my $pkg = shift;
3552
3553 # expand to full symbol table name if needed
3554 unless ($pkg =~ /^main::.*::$/) {
3555 $pkg = "main$pkg" if $pkg =~ /^::/;
3556 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3557 $pkg .= '::' unless $pkg =~ /::$/;
3558 }
3559
3560 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3561 my $stem_symtab = *{$stem}{HASH};
3562
3563 defined $stem_symtab and exists $stem_symtab->{$leaf}
3564 or return;
3565
3566 # clear all symbols
3567 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3568 for my $name (keys %$leaf_symtab) {
3569 _gv_clear *{"$pkg$name"};
3570# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3571 }
3572 warn "cleared package #$pkg\n";#d#
3573}
3574
3575our $RELOAD; # how many times to reload
3419 3576
3420sub do_reload_perl() { 3577sub do_reload_perl() {
3421 # can/must only be called in main 3578 # can/must only be called in main
3422 if ($Coro::current != $Coro::main) { 3579 if ($Coro::current != $Coro::main) {
3423 warn "can only reload from main coroutine"; 3580 warn "can only reload from main coroutine";
3424 return; 3581 return;
3425 } 3582 }
3426 3583
3584 return if $RELOAD++;
3585
3586 while ($RELOAD) {
3427 warn "reloading..."; 3587 warn "reloading...";
3428 3588
3429 warn "entering sync_job"; 3589 warn "entering sync_job";
3430 3590
3431 cf::sync_job { 3591 cf::sync_job {
3432 cf::write_runtime; # external watchdog should not bark 3592 cf::write_runtime_sync; # external watchdog should not bark
3433 cf::emergency_save; 3593 cf::emergency_save;
3434 cf::write_runtime; # external watchdog should not bark 3594 cf::write_runtime_sync; # external watchdog should not bark
3435 3595
3436 warn "syncing database to disk"; 3596 warn "syncing database to disk";
3437 BDB::db_env_txn_checkpoint $DB_ENV; 3597 BDB::db_env_txn_checkpoint $DB_ENV;
3438 3598
3439 # if anything goes wrong in here, we should simply crash as we already saved 3599 # if anything goes wrong in here, we should simply crash as we already saved
3440 3600
3441 warn "cancelling all WF_AUTOCANCEL watchers";
3442 for (Event::all_watchers) {
3443 $_->cancel if $_->data & WF_AUTOCANCEL;
3444 }
3445
3446 warn "flushing outstanding aio requests"; 3601 warn "flushing outstanding aio requests";
3447 for (;;) {
3448 BDB::flush;
3449 IO::AIO::flush;
3450 Coro::cede_notself;
3451 last unless IO::AIO::nreqs || BDB::nreqs; 3602 while (IO::AIO::nreqs || BDB::nreqs) {
3452 warn "iterate..."; 3603 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3453 }
3454
3455 ++$RELOAD;
3456
3457 warn "cancelling all extension coros";
3458 $_->cancel for values %EXT_CORO;
3459 %EXT_CORO = ();
3460
3461 warn "removing commands";
3462 %COMMAND = ();
3463
3464 warn "removing ext/exti commands";
3465 %EXTCMD = ();
3466 %EXTICMD = ();
3467
3468 warn "unloading/nuking all extensions";
3469 for my $pkg (@EXTS) {
3470 warn "... unloading $pkg";
3471
3472 if (my $cb = $pkg->can ("unload")) {
3473 eval {
3474 $cb->($pkg);
3475 1
3476 } or warn "$pkg unloaded, but with errors: $@";
3477 } 3604 }
3478 3605
3479 warn "... nuking $pkg"; 3606 warn "cancelling all extension coros";
3480 Symbol::delete_package $pkg; 3607 $_->cancel for values %EXT_CORO;
3481 } 3608 %EXT_CORO = ();
3482 3609
3483 warn "unloading all perl modules loaded from $LIBDIR"; 3610 warn "removing commands";
3484 while (my ($k, $v) = each %INC) { 3611 %COMMAND = ();
3485 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3486 3612
3613 warn "removing ext/exti commands";
3614 %EXTCMD = ();
3615 %EXTICMD = ();
3616
3617 warn "unloading/nuking all extensions";
3618 for my $pkg (@EXTS) {
3487 warn "... unloading $k"; 3619 warn "... unloading $pkg";
3488 delete $INC{$k};
3489 3620
3490 $k =~ s/\.pm$//;
3491 $k =~ s/\//::/g;
3492
3493 if (my $cb = $k->can ("unload_module")) { 3621 if (my $cb = $pkg->can ("unload")) {
3622 eval {
3494 $cb->(); 3623 $cb->($pkg);
3624 1
3625 } or warn "$pkg unloaded, but with errors: $@";
3626 }
3627
3628 warn "... clearing $pkg";
3629 clear_package $pkg;
3495 } 3630 }
3496 3631
3497 Symbol::delete_package $k; 3632 warn "unloading all perl modules loaded from $LIBDIR";
3633 while (my ($k, $v) = each %INC) {
3634 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3635
3636 warn "... unloading $k";
3637 delete $INC{$k};
3638
3639 $k =~ s/\.pm$//;
3640 $k =~ s/\//::/g;
3641
3642 if (my $cb = $k->can ("unload_module")) {
3643 $cb->();
3644 }
3645
3646 clear_package $k;
3498 } 3647 }
3499 3648
3500 warn "getting rid of safe::, as good as possible"; 3649 warn "getting rid of safe::, as good as possible";
3501 Symbol::delete_package "safe::$_" 3650 clear_package "safe::$_"
3502 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3651 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3503 3652
3504 warn "unloading cf.pm \"a bit\""; 3653 warn "unloading cf.pm \"a bit\"";
3505 delete $INC{"cf.pm"}; 3654 delete $INC{"cf.pm"};
3506 delete $INC{"cf/pod.pm"}; 3655 delete $INC{"cf/pod.pm"};
3507 3656
3508 # don't, removes xs symbols, too, 3657 # don't, removes xs symbols, too,
3509 # and global variables created in xs 3658 # and global variables created in xs
3510 #Symbol::delete_package __PACKAGE__; 3659 #clear_package __PACKAGE__;
3511 3660
3512 warn "unload completed, starting to reload now"; 3661 warn "unload completed, starting to reload now";
3513 3662
3514 warn "reloading cf.pm"; 3663 warn "reloading cf.pm";
3515 require cf; 3664 require cf;
3516 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3665 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3517 3666
3518 warn "loading config and database again"; 3667 warn "loading config and database again";
3519 cf::reload_config; 3668 cf::reload_config;
3520 3669
3521 warn "loading extensions"; 3670 warn "loading extensions";
3522 cf::load_extensions; 3671 cf::load_extensions;
3523 3672
3524 warn "reattaching attachments to objects/players"; 3673 warn "reattaching attachments to objects/players";
3525 _global_reattach; # objects, sockets 3674 _global_reattach; # objects, sockets
3526 warn "reattaching attachments to maps"; 3675 warn "reattaching attachments to maps";
3527 reattach $_ for values %MAP; 3676 reattach $_ for values %MAP;
3528 warn "reattaching attachments to players"; 3677 warn "reattaching attachments to players";
3529 reattach $_ for values %PLAYER; 3678 reattach $_ for values %PLAYER;
3530 3679
3531 warn "leaving sync_job"; 3680 warn "leaving sync_job";
3532 3681
3533 1 3682 1
3534 } or do { 3683 } or do {
3535 warn $@; 3684 warn $@;
3536 warn "error while reloading, exiting."; 3685 cf::cleanup "error while reloading, exiting.";
3537 exit 1;
3538 }; 3686 };
3539 3687
3540 warn "reloaded"; 3688 warn "reloaded";
3689 --$RELOAD;
3690 }
3541}; 3691};
3542 3692
3543our $RELOAD_WATCHER; # used only during reload 3693our $RELOAD_WATCHER; # used only during reload
3544 3694
3545sub reload_perl() { 3695sub reload_perl() {
3546 # doing reload synchronously and two reloads happen back-to-back, 3696 # doing reload synchronously and two reloads happen back-to-back,
3547 # coro crashes during coro_state_free->destroy here. 3697 # coro crashes during coro_state_free->destroy here.
3548 3698
3549 $RELOAD_WATCHER ||= Event->timer ( 3699 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3550 reentrant => 0,
3551 after => 0,
3552 data => WF_AUTOCANCEL,
3553 cb => sub {
3554 do_reload_perl; 3700 do_reload_perl;
3555 undef $RELOAD_WATCHER; 3701 undef $RELOAD_WATCHER;
3556 },
3557 ); 3702 };
3558} 3703}
3559 3704
3560register_command "reload" => sub { 3705register_command "reload" => sub {
3561 my ($who, $arg) = @_; 3706 my ($who, $arg) = @_;
3562 3707
3575 3720
3576our @WAIT_FOR_TICK; 3721our @WAIT_FOR_TICK;
3577our @WAIT_FOR_TICK_BEGIN; 3722our @WAIT_FOR_TICK_BEGIN;
3578 3723
3579sub wait_for_tick { 3724sub wait_for_tick {
3580 return unless $TICK_WATCHER->is_active;
3581 return if $Coro::current == $Coro::main; 3725 return if tick_inhibit || $Coro::current == $Coro::main;
3582 3726
3583 my $signal = new Coro::Signal; 3727 my $signal = new Coro::Signal;
3584 push @WAIT_FOR_TICK, $signal; 3728 push @WAIT_FOR_TICK, $signal;
3585 $signal->wait; 3729 $signal->wait;
3586} 3730}
3587 3731
3588sub wait_for_tick_begin { 3732sub wait_for_tick_begin {
3589 return unless $TICK_WATCHER->is_active;
3590 return if $Coro::current == $Coro::main; 3733 return if tick_inhibit || $Coro::current == $Coro::main;
3591 3734
3592 my $signal = new Coro::Signal; 3735 my $signal = new Coro::Signal;
3593 push @WAIT_FOR_TICK_BEGIN, $signal; 3736 push @WAIT_FOR_TICK_BEGIN, $signal;
3594 $signal->wait; 3737 $signal->wait;
3595} 3738}
3596 3739
3597$TICK_WATCHER = Event->timer ( 3740sub tick {
3598 reentrant => 0,
3599 parked => 1,
3600 prio => 0,
3601 at => $NEXT_TICK || $TICK,
3602 data => WF_AUTOCANCEL,
3603 cb => sub {
3604 if ($Coro::current != $Coro::main) { 3741 if ($Coro::current != $Coro::main) {
3605 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3742 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3606 unless ++$bug_warning > 10; 3743 unless ++$bug_warning > 10;
3607 return; 3744 return;
3608 } 3745 }
3609 3746
3610 $NOW = $tick_start = Event::time;
3611
3612 cf::server_tick; # one server iteration 3747 cf::server_tick; # one server iteration
3613 3748
3614 $RUNTIME += $TICK;
3615 $NEXT_TICK += $TICK;
3616
3617 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3749 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3618 $NEXT_RUNTIME_WRITE = $NOW + 10; 3750 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3619 Coro::async_pool { 3751 Coro::async_pool {
3620 $Coro::current->{desc} = "runtime saver"; 3752 $Coro::current->{desc} = "runtime saver";
3621 write_runtime 3753 write_runtime_sync
3622 or warn "ERROR: unable to write runtime file: $!"; 3754 or warn "ERROR: unable to write runtime file: $!";
3623 };
3624 } 3755 };
3756 }
3625 3757
3626 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3758 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3627 $sig->send; 3759 $sig->send;
3628 } 3760 }
3629 while (my $sig = shift @WAIT_FOR_TICK) { 3761 while (my $sig = shift @WAIT_FOR_TICK) {
3630 $sig->send; 3762 $sig->send;
3631 } 3763 }
3632 3764
3633 $NOW = Event::time; 3765 $LOAD = ($NOW - $TICK_START) / $TICK;
3634
3635 # if we are delayed by four ticks or more, skip them all
3636 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3637
3638 $TICK_WATCHER->at ($NEXT_TICK);
3639 $TICK_WATCHER->start;
3640
3641 $LOAD = ($NOW - $tick_start) / $TICK;
3642 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3766 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3643 3767
3644 _post_tick; 3768 if (0) {
3769 if ($NEXT_TICK) {
3770 my $jitter = $TICK_START - $NEXT_TICK;
3771 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3772 warn "jitter $JITTER\n";#d#
3773 }
3645 }, 3774 }
3646); 3775}
3647 3776
3648{ 3777{
3778 # configure BDB
3779
3649 BDB::min_parallel 8; 3780 BDB::min_parallel 8;
3650 BDB::max_poll_time $TICK * 0.1; 3781 BDB::max_poll_reqs $TICK * 0.1;
3651 $BDB_POLL_WATCHER = Event->io ( 3782 $AnyEvent::BDB::WATCHER->priority (1);
3652 reentrant => 0,
3653 fd => BDB::poll_fileno,
3654 poll => 'r',
3655 prio => 0,
3656 data => WF_AUTOCANCEL,
3657 cb => \&BDB::poll_cb,
3658 );
3659
3660 BDB::set_sync_prepare {
3661 my $status;
3662 my $current = $Coro::current;
3663 (
3664 sub {
3665 $status = $!;
3666 $current->ready; undef $current;
3667 },
3668 sub {
3669 Coro::schedule while defined $current;
3670 $! = $status;
3671 },
3672 )
3673 };
3674 3783
3675 unless ($DB_ENV) { 3784 unless ($DB_ENV) {
3676 $DB_ENV = BDB::db_env_create; 3785 $DB_ENV = BDB::db_env_create;
3677 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3786 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3678 | BDB::LOG_AUTOREMOVE, 1); 3787 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3788 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3679 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3789 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3680 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3790 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3681 3791
3682 cf::sync_job { 3792 cf::sync_job {
3683 eval { 3793 eval {
3693 3803
3694 cf::cleanup "db_env_open(db): $@" if $@; 3804 cf::cleanup "db_env_open(db): $@" if $@;
3695 }; 3805 };
3696 } 3806 }
3697 3807
3698 $BDB_DEADLOCK_WATCHER = Event->timer ( 3808 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3699 after => 3,
3700 interval => 1,
3701 hard => 1,
3702 prio => 0,
3703 data => WF_AUTOCANCEL,
3704 cb => sub {
3705 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3809 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3706 },
3707 ); 3810 };
3708 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3811 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3709 after => 11,
3710 interval => 60,
3711 hard => 1,
3712 prio => 0,
3713 data => WF_AUTOCANCEL,
3714 cb => sub {
3715 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3812 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3716 },
3717 ); 3813 };
3718 $BDB_TRICKLE_WATCHER = Event->timer ( 3814 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3719 after => 5,
3720 interval => 10,
3721 hard => 1,
3722 prio => 0,
3723 data => WF_AUTOCANCEL,
3724 cb => sub {
3725 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3815 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3726 },
3727 ); 3816 };
3728} 3817}
3729 3818
3730{ 3819{
3820 # configure IO::AIO
3821
3731 IO::AIO::min_parallel 8; 3822 IO::AIO::min_parallel 8;
3732
3733 undef $Coro::AIO::WATCHER;
3734 IO::AIO::max_poll_time $TICK * 0.1; 3823 IO::AIO::max_poll_time $TICK * 0.1;
3735 $AIO_POLL_WATCHER = Event->io ( 3824 undef $AnyEvent::AIO::WATCHER;
3736 reentrant => 0,
3737 data => WF_AUTOCANCEL,
3738 fd => IO::AIO::poll_fileno,
3739 poll => 'r',
3740 prio => 0,
3741 cb => \&IO::AIO::poll_cb,
3742 );
3743} 3825}
3744 3826
3745my $_log_backtrace; 3827my $_log_backtrace;
3746 3828
3747sub _log_backtrace { 3829sub _log_backtrace {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines