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.462 by root, Tue Dec 23 06:58:23 2008 UTC vs.
Revision 1.508 by root, Sun Mar 28 22:29:50 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use 5.10.0;
25use utf8; 26use utf8;
26use strict "vars", "subs"; 27use strict qw(vars subs);
27 28
28use Symbol; 29use Symbol;
29use List::Util; 30use List::Util;
30use Socket; 31use Socket;
31use EV; 32use EV;
32use Opcode; 33use Opcode;
33use Safe; 34use Safe;
34use Safe::Hole; 35use Safe::Hole;
35use Storable (); 36use Storable ();
37use Carp ();
36 38
37use Guard (); 39use Guard ();
38use Coro (); 40use Coro ();
39use Coro::State; 41use Coro::State;
40use Coro::Handle; 42use Coro::Handle;
… …
51use Coro::Util (); 53use Coro::Util ();
52 54
53use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
54use BDB (); 56use BDB ();
55use Data::Dumper; 57use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 58use Fcntl;
58use YAML (); 59use YAML::XS ();
59use IO::AIO (); 60use IO::AIO ();
60use Time::HiRes; 61use Time::HiRes;
61use Compress::LZF; 62use Compress::LZF;
62use Digest::MD5 (); 63use Digest::MD5 ();
63 64
… …
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72 73
73# make sure c-lzf reinitialises itself 74# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
77
78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
76 80
77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
78 82
79our %COMMAND = (); 83our %COMMAND = ();
80our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
… …
85our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
86our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
87 91
88our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
89our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
90 96
91our $CONFDIR = confdir; 97our $CONFDIR = confdir;
92our $DATADIR = datadir; 98our $DATADIR = datadir;
93our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
94our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
… …
105our %RESOURCE; 111our %RESOURCE;
106 112
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 115our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
111 117
112our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 121our $DB_ENV;
116 122
123our @EXTRA_MODULES = qw(pod match mapscript);
124
117our %CFG; 125our %CFG;
118 126
119our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
120our $RUNTIME; 128our $RUNTIME;
121our $NOW; 129our $NOW;
… …
132our $JITTER; # average jitter 140our $JITTER; # average jitter
133our $TICK_START; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
134 142
135our @POST_INIT; 143our @POST_INIT;
136 144
137our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 145our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146our $REALLY_UNLOOP; # never set to true, please :)
138 147
139binmode STDOUT; 148binmode STDOUT;
140binmode STDERR; 149binmode STDERR;
141 150
142# read virtual server time, if available 151# read virtual server time, if available
… …
144 open my $fh, "<", $RUNTIMEFILE 153 open my $fh, "<", $RUNTIMEFILE
145 or die "unable to read $RUNTIMEFILE file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
146 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
147} 156}
148 157
158eval "sub TICK() { $TICK } 1" or die;
159
149mkdir $_ 160mkdir $_
150 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
151 162
152our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
153 164
154sub cf::map::normalise; 165sub cf::map::normalise;
166
167#############################################################################
168
169%REFLECT = ();
170for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_;
172 $REFLECT{$reflect->{class}} = $reflect;
173}
174
175# this is decidedly evil
176$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
155 177
156############################################################################# 178#############################################################################
157 179
158=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
159 181
… …
206returns directly I<after> the tick processing (and consequently, can only wake one process 228returns directly I<after> the tick processing (and consequently, can only wake one process
207per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 229per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
208 230
209=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
210 232
211This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
212C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
213that call. 235that call.
214 236
237=item %cf::REFLECT
238
239Contains, for each (C++) class name, a hash reference with information
240about object members (methods, scalars, arrays and flags) and other
241metadata, which is useful for introspection.
242
215=back 243=back
216 244
217=cut 245=cut
218 246
219BEGIN { 247$Coro::State::WARNHOOK = sub {
220 *CORE::GLOBAL::warn = sub {
221 my $msg = join "", @_; 248 my $msg = join "", @_;
222 249
223 $msg .= "\n" 250 $msg .= "\n"
224 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
225 252
226 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
227 254
228 LOG llevError, $msg; 255 LOG llevError, $msg;
229 }; 256};
230}
231 257
232$Coro::State::DIEHOOK = sub { 258$Coro::State::DIEHOOK = sub {
233 return unless $^S eq 0; # "eq", not "==" 259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
234 262
235 if ($Coro::current == $Coro::main) {#d# 263 if ($Coro::current == $Coro::main) {#d#
236 warn "DIEHOOK called in main context, Coro bug?\n";#d# 264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
237 return;#d# 265 return;#d#
238 }#d# 266 }#d#
239 267
240 # kill coroutine otherwise 268 # kill coroutine otherwise
241 warn Carp::longmess $_[0];
242 Coro::terminate 269 Coro::terminate
243}; 270};
244
245$SIG{__DIE__} = sub { }; #d#?
246 271
247@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
248@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
249@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
250@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
264)) { 289)) {
265 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
266} 291}
267 292
268$EV::DIED = sub { 293$EV::DIED = sub {
269 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
270}; 295};
271 296
272############################################################################# 297#############################################################################
273 298
274=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
… …
398 423
399=cut 424=cut
400 425
401our @SLOT_QUEUE; 426our @SLOT_QUEUE;
402our $SLOT_QUEUE; 427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
403 429
404$SLOT_QUEUE->cancel if $SLOT_QUEUE; 430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async { 431$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager"); 432 $Coro::current->desc ("timeslot manager");
407 433
408 my $signal = new Coro::Signal; 434 my $signal = new Coro::Signal;
435 my $busy;
409 436
410 while () { 437 while () {
411 next_job: 438 next_job:
439
412 my $avail = cf::till_tick; 440 my $avail = cf::till_tick;
413 if ($avail > 0.01) { 441
414 for (0 .. $#SLOT_QUEUE) { 442 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) { 443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
416 my $job = splice @SLOT_QUEUE, $_, 1, (); 445 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send; 446 $job->[2]->send;
418 Coro::cede; 447 Coro::cede;
419 goto next_job; 448 goto next_job;
420 } 449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
421 } 451 }
422 } 452 }
423 453
424 if (@SLOT_QUEUE) { 454 if (@SLOT_QUEUE) {
425 # we do not use wait_for_tick() as it returns immediately when tick is inactive 455 # we do not use wait_for_tick() as it returns immediately when tick is inactive
426 push @cf::WAIT_FOR_TICK, $signal; 456 push @cf::WAIT_FOR_TICK, $signal;
427 $signal->wait; 457 $signal->wait;
428 } else { 458 } else {
459 $busy = 0;
429 Coro::schedule; 460 Coro::schedule;
430 } 461 }
431 } 462 }
432}; 463};
433 464
434sub get_slot($;$$) { 465sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main; 466 return if tick_inhibit || $Coro::current == $Coro::main;
436 467
437 my ($time, $pri, $name) = @_; 468 my ($time, $pri, $name) = @_;
438 469
439 $time = $TICK * .6 if $time > $TICK * .6; 470 $time = clamp $time, 0.01, $TICK * .6;
471
440 my $sig = new Coro::Signal; 472 my $sig = new Coro::Signal;
441 473
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready; 476 $SLOT_QUEUE->ready;
… …
1147 $decname, length $$rdata, scalar @$objs; 1179 $decname, length $$rdata, scalar @$objs;
1148 1180
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1182 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 aio_fsync $fh if $cf::USE_FSYNC; 1184 if ($cf::USE_FSYNC) {
1185 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1186 aio_fsync $fh;
1187 }
1153 aio_close $fh; 1188 aio_close $fh;
1154 1189
1155 if (@$objs) { 1190 if (@$objs) {
1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1191 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1192 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1193 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1194 aio_write $fh, 0, (length $data), $data, 0;
1160 aio_fsync $fh if $cf::USE_FSYNC; 1195 if ($cf::USE_FSYNC) {
1196 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1197 aio_fsync $fh;
1198 }
1161 aio_close $fh; 1199 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1200 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1201 }
1164 } else { 1202 } else {
1165 aio_unlink "$filename.pst"; 1203 aio_unlink "$filename.pst";
… …
1316 1354
1317# "readahead" all extensions 1355# "readahead" all extensions
1318sub cache_extensions { 1356sub cache_extensions {
1319 my $grp = IO::AIO::aio_group; 1357 my $grp = IO::AIO::aio_group;
1320 1358
1321 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1359 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1322 for (grep /\.ext$/, @{$_[0]}) { 1360 for (grep /\.ext$/, @{$_[0]}) {
1323 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1361 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324 } 1362 }
1325 }; 1363 };
1326 1364
… …
1361 . "\n};\n1"; 1399 . "\n};\n1";
1362 1400
1363 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
1364 } 1402 }
1365 1403
1404 my $pass = 0;
1366 my %done; 1405 my %done;
1367 while (%todo) { 1406 while (%todo) {
1368 my $progress; 1407 my $progress;
1369 1408
1409 ++$pass;
1410
1411 ext:
1370 while (my ($k, $v) = each %todo) { 1412 while (my ($k, $v) = each %todo) {
1371 for (split /,\s*/, $v->{meta}{depends}) { 1413 for (split /,\s*/, $v->{meta}{depends}) {
1372 goto skip 1414 next ext
1373 unless exists $done{$_}; 1415 unless exists $done{$_};
1374 } 1416 }
1375 1417
1376 warn "... loading '$k' into '$v->{pkg}'\n"; 1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1377 1419
1378 unless (eval $v->{source}) { 1420 my $active = eval $v->{source};
1421
1422 if (length $@) {
1379 my $msg = $@ ? "$v->{path}: $@\n" 1423 warn "$v->{path}: $@\n";
1380 : "$v->{base}: extension inactive.\n";
1381 1424
1382 if (exists $v->{meta}{mandatory}) {
1383 warn $msg;
1384 cf::cleanup "mandatory extension failed to load, exiting."; 1425 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1385 } 1426 if exists $v->{meta}{mandatory};
1386 1427 } else {
1387 warn $msg; 1428 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg};
1430 $progress = 1;
1431
1432 warn "$v->{base}: extension inactive.\n"
1433 unless $active;
1388 } 1434 }
1389
1390 $done{$k} = delete $todo{$k};
1391 push @EXTS, $v->{pkg};
1392 $progress = 1;
1393 } 1435 }
1394 1436
1395 skip: 1437 unless ($progress) {
1396 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1438 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1397 unless $progress; 1439
1440 while (my ($k, $v) = each %todo) {
1441 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1442 if exists $v->{meta}{mandatory};
1443 }
1444 }
1398 } 1445 }
1399 }; 1446 };
1400} 1447}
1401 1448
1402############################################################################# 1449#############################################################################
… …
1722 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1769 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1723 1770
1724 # mit "rum" bekleckern, nicht 1771 # mit "rum" bekleckern, nicht
1725 $self->_create_random_map ( 1772 $self->_create_random_map (
1726 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1773 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1727 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1774 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1728 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1775 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1729 $rmp->{exit_on_final_map}, 1776 $rmp->{exit_on_final_map},
1730 $rmp->{xsize}, $rmp->{ysize}, 1777 $rmp->{xsize}, $rmp->{ysize},
1731 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1778 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1732 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1779 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1978 2025
1979 $cf::MAP{$path} = $map 2026 $cf::MAP{$path} = $map
1980 } 2027 }
1981} 2028}
1982 2029
1983sub pre_load { } 2030sub pre_load { }
1984sub post_load { } 2031#sub post_load { } # XS
1985 2032
1986sub load { 2033sub load {
1987 my ($self) = @_; 2034 my ($self) = @_;
1988 2035
1989 local $self->{deny_reset} = 1; # loading can take a long time 2036 local $self->{deny_reset} = 1; # loading can take a long time
… …
2046 } 2093 }
2047 2094
2048 $self->post_load; 2095 $self->post_load;
2049} 2096}
2050 2097
2098# customize the map for a given player, i.e.
2099# return the _real_ map. used by e.g. per-player
2100# maps to change the path to ~playername/mappath
2051sub customise_for { 2101sub customise_for {
2052 my ($self, $ob) = @_; 2102 my ($self, $ob) = @_;
2053 2103
2054 return find "~" . $ob->name . "/" . $self->{path} 2104 return find "~" . $ob->name . "/" . $self->{path}
2055 if $self->per_player; 2105 if $self->per_player;
… …
2209 2259
2210 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2211 2261
2212 return if $self->players; 2262 return if $self->players;
2213 2263
2214 warn "resetting map ", $self->path; 2264 warn "resetting map ", $self->path, "\n";
2215 2265
2216 $self->in_memory (cf::MAP_SWAPPED); 2266 $self->in_memory (cf::MAP_SWAPPED);
2217 2267
2218 # need to save uniques path 2268 # need to save uniques path
2219 unless ($self->{deny_save}) { 2269 unless ($self->{deny_save}) {
… …
2310 : normalise $_ 2360 : normalise $_
2311 } @{ aio_readdir $UNIQUEDIR or [] } 2361 } @{ aio_readdir $UNIQUEDIR or [] }
2312 ] 2362 ]
2313} 2363}
2314 2364
2365=item cf::map::static_maps
2366
2367Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2368file in the shared directory excluding F</styles> and F</editor>). May
2369block.
2370
2371=cut
2372
2373sub static_maps() {
2374 my @dirs = "";
2375 my @maps;
2376
2377 while (@dirs) {
2378 my $dir = shift @dirs;
2379
2380 next if $dir eq "/styles" || $dir eq "/editor";
2381
2382 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2383 or return;
2384
2385 for (@$files) {
2386 s/\.map$// or next;
2387 utf8::decode $_;
2388 push @maps, "$dir/$_";
2389 }
2390
2391 push @dirs, map "$dir/$_", @$dirs;
2392 }
2393
2394 \@maps
2395}
2396
2315=back 2397=back
2316 2398
2317=head3 cf::object 2399=head3 cf::object
2318 2400
2319=cut 2401=cut
… …
2384 2466
2385our $SAY_CHANNEL = { 2467our $SAY_CHANNEL = {
2386 id => "say", 2468 id => "say",
2387 title => "Map", 2469 title => "Map",
2388 reply => "say ", 2470 reply => "say ",
2389 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2471 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2390}; 2472};
2391 2473
2392our $CHAT_CHANNEL = { 2474our $CHAT_CHANNEL = {
2393 id => "chat", 2475 id => "chat",
2394 title => "Chat", 2476 title => "Chat",
… …
2514 ($x, $y) = (-1, -1) 2596 ($x, $y) = (-1, -1)
2515 unless (defined $x) && (defined $y); 2597 unless (defined $x) && (defined $y);
2516 2598
2517 # use -1 or undef as default coordinates, not 0, 0 2599 # use -1 or undef as default coordinates, not 0, 0
2518 ($x, $y) = ($map->enter_x, $map->enter_y) 2600 ($x, $y) = ($map->enter_x, $map->enter_y)
2519 if $x <=0 && $y <= 0; 2601 if $x <= 0 && $y <= 0;
2520 2602
2521 $map->load; 2603 $map->load;
2522 $map->load_neighbours; 2604 $map->load_neighbours;
2523 2605
2524 return unless $self->contr->active; 2606 return unless $self->contr->active;
2525 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2526 $self->activate_recursive;
2527 2607
2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2608 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2529 $self->enter_map ($map, $x, $y); 2609 $self->enter_map ($map, $x, $y);
2610
2611 # only activate afterwards, to support waiting in hooks
2612 $self->activate_recursive;
2530} 2613}
2531 2614
2532=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2615=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2533 2616
2534Moves the player to the given map-path and coordinates by first freezing 2617Moves the player to the given map-path and coordinates by first freezing
… …
2722 2805
2723 utf8::encode $text; 2806 utf8::encode $text;
2724 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2807 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2725} 2808}
2726 2809
2810=item $client->send_big_packet ($pkt)
2811
2812Like C<send_packet>, but tries to compress large packets, and fragments
2813them as required.
2814
2815=cut
2816
2817our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2818
2819sub cf::client::send_big_packet {
2820 my ($self, $pkt) = @_;
2821
2822 # try lzf for large packets
2823 $pkt = "lzf " . Compress::LZF::compress $pkt
2824 if 1024 <= length $pkt and $self->{can_lzf};
2825
2826 # split very large packets
2827 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2828 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2829 $pkt = "frag";
2830 }
2831
2832 $self->send_packet ($pkt);
2833}
2834
2727=item $client->send_msg ($channel, $msg, $color, [extra...]) 2835=item $client->send_msg ($channel, $msg, $color, [extra...])
2728 2836
2729Send a drawinfo or msg packet to the client, formatting the msg for the 2837Send a drawinfo or msg packet to the client, formatting the msg for the
2730client if neccessary. C<$type> should be a string identifying the type of 2838client if neccessary. C<$type> should be a string identifying the type of
2731the message, with C<log> being the default. If C<$color> is negative, suppress 2839the message, with C<log> being the default. If C<$color> is negative, suppress
… …
2733 2841
2734=cut 2842=cut
2735 2843
2736# non-persistent channels (usually the info channel) 2844# non-persistent channels (usually the info channel)
2737our %CHANNEL = ( 2845our %CHANNEL = (
2846 "c/motd" => {
2847 id => "infobox",
2848 title => "MOTD",
2849 reply => undef,
2850 tooltip => "The message of the day",
2851 },
2738 "c/identify" => { 2852 "c/identify" => {
2739 id => "infobox", 2853 id => "infobox",
2740 title => "Identify", 2854 title => "Identify",
2741 reply => undef, 2855 reply => undef,
2742 tooltip => "Items recently identified", 2856 tooltip => "Items recently identified",
… …
2744 "c/examine" => { 2858 "c/examine" => {
2745 id => "infobox", 2859 id => "infobox",
2746 title => "Examine", 2860 title => "Examine",
2747 reply => undef, 2861 reply => undef,
2748 tooltip => "Signs and other items you examined", 2862 tooltip => "Signs and other items you examined",
2863 },
2864 "c/shopinfo" => {
2865 id => "infobox",
2866 title => "Shop Info",
2867 reply => undef,
2868 tooltip => "What your bargaining skill tells you about the shop",
2749 }, 2869 },
2750 "c/book" => { 2870 "c/book" => {
2751 id => "infobox", 2871 id => "infobox",
2752 title => "Book", 2872 title => "Book",
2753 reply => undef, 2873 reply => undef,
… …
2769 id => "infobox", 2889 id => "infobox",
2770 title => "Body Parts", 2890 title => "Body Parts",
2771 reply => undef, 2891 reply => undef,
2772 tooltip => "Shows which body parts you posess and are available", 2892 tooltip => "Shows which body parts you posess and are available",
2773 }, 2893 },
2894 "c/statistics" => {
2895 id => "infobox",
2896 title => "Statistics",
2897 reply => undef,
2898 tooltip => "Shows your primary statistics",
2899 },
2774 "c/skills" => { 2900 "c/skills" => {
2775 id => "infobox", 2901 id => "infobox",
2776 title => "Skills", 2902 title => "Skills",
2777 reply => undef, 2903 reply => undef,
2778 tooltip => "Shows your experience per skill and item power", 2904 tooltip => "Shows your experience per skill and item power",
2905 },
2906 "c/shopitems" => {
2907 id => "infobox",
2908 title => "Shop Items",
2909 reply => undef,
2910 tooltip => "Shows the items currently for sale in this shop",
2911 },
2912 "c/resistances" => {
2913 id => "infobox",
2914 title => "Resistances",
2915 reply => undef,
2916 tooltip => "Shows your resistances",
2917 },
2918 "c/pets" => {
2919 id => "infobox",
2920 title => "Pets",
2921 reply => undef,
2922 tooltip => "Shows information abotu your pets/a specific pet",
2923 },
2924 "c/perceiveself" => {
2925 id => "infobox",
2926 title => "Perceive Self",
2927 reply => undef,
2928 tooltip => "You gained detailed knowledge about yourself",
2779 }, 2929 },
2780 "c/uptime" => { 2930 "c/uptime" => {
2781 id => "infobox", 2931 id => "infobox",
2782 title => "Uptime", 2932 title => "Uptime",
2783 reply => undef, 2933 reply => undef,
… …
2793 id => "party", 2943 id => "party",
2794 title => "Party", 2944 title => "Party",
2795 reply => "gsay ", 2945 reply => "gsay ",
2796 tooltip => "Messages and chat related to your party", 2946 tooltip => "Messages and chat related to your party",
2797 }, 2947 },
2948 "c/death" => {
2949 id => "death",
2950 title => "Death",
2951 reply => undef,
2952 tooltip => "Reason for and more info about your most recent death",
2953 },
2798 "c/say" => $SAY_CHANNEL, 2954 "c/say" => $SAY_CHANNEL,
2799 "c/chat" => $CHAT_CHANNEL, 2955 "c/chat" => $CHAT_CHANNEL,
2800); 2956);
2801 2957
2802sub cf::client::send_msg { 2958sub cf::client::send_msg {
… …
2809 2965
2810 # check predefined channels, for the benefit of C 2966 # check predefined channels, for the benefit of C
2811 if ($CHANNEL{$channel}) { 2967 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel}; 2968 $channel = $CHANNEL{$channel};
2813 2969
2814 $self->ext_msg (channel_info => $channel) 2970 $self->ext_msg (channel_info => $channel);
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id}; 2971 $channel = $channel->{id};
2818 2972
2819 } elsif (ref $channel) { 2973 } elsif (ref $channel) {
2820 # send meta info to client, if not yet sent 2974 # send meta info to client, if not yet sent
2821 unless (exists $self->{channel}{$channel->{id}}) { 2975 unless (exists $self->{channel}{$channel->{id}}) {
2822 $self->{channel}{$channel->{id}} = $channel; 2976 $self->{channel}{$channel->{id}} = $channel;
2823 $self->ext_msg (channel_info => $channel) 2977 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825 } 2978 }
2826 2979
2827 $channel = $channel->{id}; 2980 $channel = $channel->{id};
2828 } 2981 }
2829 2982
2830 return unless @extra || length $msg; 2983 return unless @extra || length $msg;
2831 2984
2832 if ($self->can_msg) {
2833 # default colour, mask it out 2985 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2986 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF; 2987 if $color & cf::NDI_DEF;
2836 2988
2837 my $pkt = "msg " 2989 my $pkt = "msg "
2838 . $self->{json_coder}->encode ( 2990 . $self->{json_coder}->encode (
2839 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2991 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2840 ); 2992 );
2841 2993
2842 # try lzf for large packets
2843 $pkt = "lzf " . Compress::LZF::compress $pkt
2844 if 1024 <= length $pkt and $self->{can_lzf};
2845
2846 # split very large packets
2847 if (8192 < length $pkt and $self->{can_lzf}) {
2848 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2849 $pkt = "frag";
2850 }
2851
2852 $self->send_packet ($pkt); 2994 $self->send_big_packet ($pkt);
2853 } else {
2854 if ($color >= 0) {
2855 # replace some tags by gcfclient-compatible ones
2856 for ($msg) {
2857 1 while
2858 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2859 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2860 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2861 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2862 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2863 }
2864
2865 $color &= cf::NDI_COLOR_MASK;
2866
2867 utf8::encode $msg;
2868
2869 if (0 && $msg =~ /\[/) {
2870 # COMMAND/INFO
2871 $self->send_packet ("drawextinfo $color 10 8 $msg")
2872 } else {
2873 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2874 $self->send_packet ("drawinfo $color $msg")
2875 }
2876 }
2877 }
2878} 2995}
2879 2996
2880=item $client->ext_msg ($type, @msg) 2997=item $client->ext_msg ($type, @msg)
2881 2998
2882Sends an ext event to the client. 2999Sends an ext event to the client.
… …
2885 3002
2886sub cf::client::ext_msg($$@) { 3003sub cf::client::ext_msg($$@) {
2887 my ($self, $type, @msg) = @_; 3004 my ($self, $type, @msg) = @_;
2888 3005
2889 if ($self->extcmd == 2) { 3006 if ($self->extcmd == 2) {
2890 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3007 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2891 } elsif ($self->extcmd == 1) { # TODO: remove 3008 } elsif ($self->extcmd == 1) { # TODO: remove
2892 push @msg, msgtype => "event_$type"; 3009 push @msg, msgtype => "event_$type";
2893 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3010 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2894 } 3011 }
2895} 3012}
2896 3013
2897=item $client->ext_reply ($msgid, @msg) 3014=item $client->ext_reply ($msgid, @msg)
2898 3015
… …
2902 3019
2903sub cf::client::ext_reply($$@) { 3020sub cf::client::ext_reply($$@) {
2904 my ($self, $id, @msg) = @_; 3021 my ($self, $id, @msg) = @_;
2905 3022
2906 if ($self->extcmd == 2) { 3023 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3024 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2908 } elsif ($self->extcmd == 1) { 3025 } elsif ($self->extcmd == 1) {
2909 #TODO: version 1, remove 3026 #TODO: version 1, remove
2910 unshift @msg, msgtype => "reply", msgid => $id; 3027 unshift @msg, msgtype => "reply", msgid => $id;
2911 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3028 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2912 } 3029 }
2913} 3030}
2914 3031
2915=item $success = $client->query ($flags, "text", \&cb) 3032=item $success = $client->query ($flags, "text", \&cb)
2916 3033
… …
3043our $safe_hole = new Safe::Hole; 3160our $safe_hole = new Safe::Hole;
3044 3161
3045$SIG{FPE} = 'IGNORE'; 3162$SIG{FPE} = 'IGNORE';
3046 3163
3047$safe->permit_only (Opcode::opset qw( 3164$safe->permit_only (Opcode::opset qw(
3048 :base_core :base_mem :base_orig :base_math 3165 :base_core :base_mem :base_orig :base_math :base_loop
3049 grepstart grepwhile mapstart mapwhile 3166 grepstart grepwhile mapstart mapwhile
3050 sort time 3167 sort time
3051)); 3168));
3052 3169
3053# here we export the classes and methods available to script code 3170# here we export the classes and methods available to script code
… …
3057The following functions and methods are available within a safe environment: 3174The following functions and methods are available within a safe environment:
3058 3175
3059 cf::object 3176 cf::object
3060 contr pay_amount pay_player map x y force_find force_add destroy 3177 contr pay_amount pay_player map x y force_find force_add destroy
3061 insert remove name archname title slaying race decrease split 3178 insert remove name archname title slaying race decrease split
3179 value
3062 3180
3063 cf::object::player 3181 cf::object::player
3064 player 3182 player
3065 3183
3066 cf::player 3184 cf::player
… …
3072=cut 3190=cut
3073 3191
3074for ( 3192for (
3075 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3193 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3076 insert remove inv nrof name archname title slaying race 3194 insert remove inv nrof name archname title slaying race
3077 decrease split destroy change_exp)], 3195 decrease split destroy change_exp value msg lore send_msg)],
3078 ["cf::object::player" => qw(player)], 3196 ["cf::object::player" => qw(player)],
3079 ["cf::player" => qw(peaceful)], 3197 ["cf::player" => qw(peaceful send_msg)],
3080 ["cf::map" => qw(trigger)], 3198 ["cf::map" => qw(trigger)],
3081) { 3199) {
3082 no strict 'refs'; 3200 no strict 'refs';
3083 my ($pkg, @funs) = @$_; 3201 my ($pkg, @funs) = @$_;
3084 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3202 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3102 3220
3103 my $qcode = $code; 3221 my $qcode = $code;
3104 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3222 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3105 $qcode =~ s/\n/\\n/g; 3223 $qcode =~ s/\n/\\n/g;
3106 3224
3225 %vars = (_dummy => 0) unless %vars;
3226
3227 my @res;
3107 local $_; 3228 local $_;
3108 local @safe::cf::_safe_eval_args = values %vars;
3109 3229
3110 my $eval = 3230 my $eval =
3111 "do {\n" 3231 "do {\n"
3112 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3232 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3113 . "#line 0 \"{$qcode}\"\n" 3233 . "#line 0 \"{$qcode}\"\n"
3114 . $code 3234 . $code
3115 . "\n}" 3235 . "\n}"
3116 ; 3236 ;
3117 3237
3238 if ($CFG{safe_eval}) {
3118 sub_generation_inc; 3239 sub_generation_inc;
3240 local @safe::cf::_safe_eval_args = values %vars;
3119 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3241 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3120 sub_generation_inc; 3242 sub_generation_inc;
3243 } else {
3244 local @cf::_safe_eval_args = values %vars;
3245 @res = wantarray ? eval eval : scalar eval $eval;
3246 }
3121 3247
3122 if ($@) { 3248 if ($@) {
3123 warn "$@"; 3249 warn "$@";
3124 warn "while executing safe code '$code'\n"; 3250 warn "while executing safe code '$code'\n";
3125 warn "with arguments " . (join " ", %vars) . "\n"; 3251 warn "with arguments " . (join " ", %vars) . "\n";
… …
3144=cut 3270=cut
3145 3271
3146sub register_script_function { 3272sub register_script_function {
3147 my ($fun, $cb) = @_; 3273 my ($fun, $cb) = @_;
3148 3274
3149 no strict 'refs'; 3275 $fun = "safe::$fun" if $CFG{safe_eval};
3150 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3276 *$fun = $safe_hole->wrap ($cb);
3151} 3277}
3152 3278
3153=back 3279=back
3154 3280
3155=cut 3281=cut
… …
3176 3302
3177 $facedata->{version} == 2 3303 $facedata->{version} == 2
3178 or cf::cleanup "$path: version mismatch, cannot proceed."; 3304 or cf::cleanup "$path: version mismatch, cannot proceed.";
3179 3305
3180 # patch in the exptable 3306 # patch in the exptable
3307 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3181 $facedata->{resource}{"res/exp_table"} = { 3308 $facedata->{resource}{"res/exp_table"} = {
3182 type => FT_RSRC, 3309 type => FT_RSRC,
3183 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3310 data => $exp_table,
3311 hash => (Digest::MD5::md5 $exp_table),
3184 }; 3312 };
3185 cf::cede_to_tick; 3313 cf::cede_to_tick;
3186 3314
3187 { 3315 {
3188 my $faces = $facedata->{faceinfo}; 3316 my $faces = $facedata->{faceinfo};
… …
3190 while (my ($face, $info) = each %$faces) { 3318 while (my ($face, $info) = each %$faces) {
3191 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3319 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3192 3320
3193 cf::face::set_visibility $idx, $info->{visibility}; 3321 cf::face::set_visibility $idx, $info->{visibility};
3194 cf::face::set_magicmap $idx, $info->{magicmap}; 3322 cf::face::set_magicmap $idx, $info->{magicmap};
3195 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3323 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3196 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3324 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3197 3325
3198 cf::cede_to_tick; 3326 cf::cede_to_tick;
3199 } 3327 }
3200 3328
3201 while (my ($face, $info) = each %$faces) { 3329 while (my ($face, $info) = each %$faces) {
… …
3225 3353
3226 cf::anim::invalidate_all; # d'oh 3354 cf::anim::invalidate_all; # d'oh
3227 } 3355 }
3228 3356
3229 { 3357 {
3230 # TODO: for gcfclient pleasure, we should give resources
3231 # that gcfclient doesn't grok a >10000 face index.
3232 my $res = $facedata->{resource}; 3358 my $res = $facedata->{resource};
3233 3359
3234 while (my ($name, $info) = each %$res) { 3360 while (my ($name, $info) = each %$res) {
3235 if (defined $info->{type}) { 3361 if (defined $info->{type}) {
3236 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3362 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3237 my $data;
3238 3363
3239 if ($info->{type} & 1) { 3364 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3240 # prepend meta info
3241
3242 my $meta = $enc->encode ({
3243 name => $name,
3244 %{ $info->{meta} || {} },
3245 });
3246
3247 $data = pack "(w/a*)*", $meta, $info->{data};
3248 } else {
3249 $data = $info->{data};
3250 }
3251
3252 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3253 cf::face::set_type $idx, $info->{type}; 3365 cf::face::set_type $idx, $info->{type};
3254 } else { 3366 } else {
3255 $RESOURCE{$name} = $info; 3367 $RESOURCE{$name} = $info;
3256 } 3368 }
3257 3369
… …
3341 3453
3342 warn "finished reloading resource files\n"; 3454 warn "finished reloading resource files\n";
3343} 3455}
3344 3456
3345sub reload_config { 3457sub reload_config {
3458 warn "reloading config file...\n";
3459
3346 open my $fh, "<:utf8", "$CONFDIR/config" 3460 open my $fh, "<:utf8", "$CONFDIR/config"
3347 or return; 3461 or return;
3348 3462
3349 local $/; 3463 local $/;
3350 *CFG = YAML::Load <$fh>; 3464 *CFG = YAML::XS::Load scalar <$fh>;
3351 3465
3352 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3466 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3353 3467
3354 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3468 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3355 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3469 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3359 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3473 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3360 and die "WARNING: m(un)lockall failed: $!\n"; 3474 and die "WARNING: m(un)lockall failed: $!\n";
3361 }; 3475 };
3362 warn $@ if $@; 3476 warn $@ if $@;
3363 } 3477 }
3478
3479 warn "finished reloading resource files\n";
3364} 3480}
3365 3481
3366sub pidfile() { 3482sub pidfile() {
3367 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3483 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3368 or die "$PIDFILE: $!"; 3484 or die "$PIDFILE: $!";
… …
3378 my $pid = <$fh>; 3494 my $pid = <$fh>;
3379 kill 9, $pid if $pid > 0; 3495 kill 9, $pid if $pid > 0;
3380 3496
3381 seek $fh, 0, 0; 3497 seek $fh, 0, 0;
3382 print $fh $$; 3498 print $fh $$;
3499}
3500
3501sub main_loop {
3502 warn "EV::loop starting\n";
3503 if (1) {
3504 EV::loop;
3505 }
3506 warn "EV::loop returned\n";
3507 goto &main_loop unless $REALLY_UNLOOP;
3383} 3508}
3384 3509
3385sub main { 3510sub main {
3386 cf::init_globals; # initialise logging 3511 cf::init_globals; # initialise logging
3387 3512
… …
3407 }; 3532 };
3408 3533
3409 evthread_start IO::AIO::poll_fileno; 3534 evthread_start IO::AIO::poll_fileno;
3410 3535
3411 cf::sync_job { 3536 cf::sync_job {
3537 cf::load_settings;
3538 cf::load_materials;
3539
3412 reload_resources; 3540 reload_resources;
3413 reload_config; 3541 reload_config;
3414 db_init; 3542 db_init;
3415 3543
3416 cf::load_settings;
3417 cf::load_materials;
3418 cf::init_uuid; 3544 cf::init_uuid;
3419 cf::init_signals; 3545 cf::init_signals;
3420 cf::init_commands; 3546 cf::init_commands;
3421 cf::init_skills; 3547 cf::init_skills;
3422 3548
… …
3427 load_extensions; 3553 load_extensions;
3428 3554
3429 utime time, time, $RUNTIMEFILE; 3555 utime time, time, $RUNTIMEFILE;
3430 3556
3431 # no (long-running) fork's whatsoever before this point(!) 3557 # no (long-running) fork's whatsoever before this point(!)
3558 use POSIX ();
3432 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3559 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3433 3560
3434 (pop @POST_INIT)->(0) while @POST_INIT; 3561 (pop @POST_INIT)->(0) while @POST_INIT;
3435 }; 3562 };
3436 3563
3437 EV::loop; 3564 main_loop;
3438} 3565}
3439 3566
3440############################################################################# 3567#############################################################################
3441# initialisation and cleanup 3568# initialisation and cleanup
3442 3569
… …
3449 }; 3576 };
3450 } 3577 }
3451} 3578}
3452 3579
3453sub write_runtime_sync { 3580sub write_runtime_sync {
3581 my $t0 = EV::time;
3582
3454 # first touch the runtime file to show we are still running: 3583 # first touch the runtime file to show we are still running:
3455 # the fsync below can take a very very long time. 3584 # the fsync below can take a very very long time.
3456 3585
3457 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3586 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3458 3587
3459 my $guard = cf::lock_acquire "write_runtime"; 3588 my $guard = cf::lock_acquire "write_runtime";
3460 3589
3461 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3590 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3462 or return; 3591 or return;
3463 3592
3464 my $value = $cf::RUNTIME + 90 + 10; 3593 my $value = $cf::RUNTIME + 90 + 10;
3465 # 10 is the runtime save interval, for a monotonic clock 3594 # 10 is the runtime save interval, for a monotonic clock
3466 # 60 allows for the watchdog to kill the server. 3595 # 60 allows for the watchdog to kill the server.
… …
3479 or return; 3608 or return;
3480 3609
3481 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3610 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3482 and return; 3611 and return;
3483 3612
3484 warn "runtime file written.\n"; 3613 warn sprintf "runtime file written (%gs).\n", EV::time - $t0;
3485 3614
3486 1 3615 1
3487} 3616}
3488 3617
3489our $uuid_lock; 3618our $uuid_lock;
… …
3698 clear_package "safe::$_" 3827 clear_package "safe::$_"
3699 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3828 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3700 3829
3701 warn "unloading cf.pm \"a bit\""; 3830 warn "unloading cf.pm \"a bit\"";
3702 delete $INC{"cf.pm"}; 3831 delete $INC{"cf.pm"};
3703 delete $INC{"cf/pod.pm"}; 3832 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3704 3833
3705 # don't, removes xs symbols, too, 3834 # don't, removes xs symbols, too,
3706 # and global variables created in xs 3835 # and global variables created in xs
3707 #clear_package __PACKAGE__; 3836 #clear_package __PACKAGE__;
3708 3837
3709 warn "unload completed, starting to reload now"; 3838 warn "unload completed, starting to reload now";
3710 3839
3711 warn "reloading cf.pm"; 3840 warn "reloading cf.pm";
3712 require cf; 3841 require cf;
3713 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3842 cf::_connect_to_perl_1;
3714 3843
3715 warn "loading config and database again"; 3844 warn "loading config and database again";
3716 cf::reload_config; 3845 cf::reload_config;
3717 3846
3718 warn "loading extensions"; 3847 warn "loading extensions";
… …
3780 3909
3781our @WAIT_FOR_TICK; 3910our @WAIT_FOR_TICK;
3782our @WAIT_FOR_TICK_BEGIN; 3911our @WAIT_FOR_TICK_BEGIN;
3783 3912
3784sub wait_for_tick { 3913sub wait_for_tick {
3785 return if tick_inhibit || $Coro::current == $Coro::main; 3914 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3786 3915
3787 my $signal = new Coro::Signal; 3916 my $signal = new Coro::Signal;
3788 push @WAIT_FOR_TICK, $signal; 3917 push @WAIT_FOR_TICK, $signal;
3789 $signal->wait; 3918 $signal->wait;
3790} 3919}
3791 3920
3792sub wait_for_tick_begin { 3921sub wait_for_tick_begin {
3793 return if tick_inhibit || $Coro::current == $Coro::main; 3922 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3794 3923
3795 my $signal = new Coro::Signal; 3924 my $signal = new Coro::Signal;
3796 push @WAIT_FOR_TICK_BEGIN, $signal; 3925 push @WAIT_FOR_TICK_BEGIN, $signal;
3797 $signal->wait; 3926 $signal->wait;
3798} 3927}
… …
3803 unless ++$bug_warning > 10; 3932 unless ++$bug_warning > 10;
3804 return; 3933 return;
3805 } 3934 }
3806 3935
3807 cf::server_tick; # one server iteration 3936 cf::server_tick; # one server iteration
3937
3938 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
3808 3939
3809 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3940 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3810 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3941 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3811 Coro::async_pool { 3942 Coro::async_pool {
3812 $Coro::current->{desc} = "runtime saver"; 3943 $Coro::current->{desc} = "runtime saver";
… …
3835} 3966}
3836 3967
3837{ 3968{
3838 # configure BDB 3969 # configure BDB
3839 3970
3840 BDB::min_parallel 8; 3971 BDB::min_parallel 16;
3841 BDB::max_poll_reqs $TICK * 0.1; 3972 BDB::max_poll_reqs $TICK * 0.1;
3842 $AnyEvent::BDB::WATCHER->priority (1); 3973 $AnyEvent::BDB::WATCHER->priority (1);
3843 3974
3844 unless ($DB_ENV) { 3975 unless ($DB_ENV) {
3845 $DB_ENV = BDB::db_env_create; 3976 $DB_ENV = BDB::db_env_create;
… …
3925 LOG llevInfo, "[ABT] [suppressed]\n"; 4056 LOG llevInfo, "[ABT] [suppressed]\n";
3926 } 4057 }
3927} 4058}
3928 4059
3929# load additional modules 4060# load additional modules
3930use cf::pod; 4061require "cf/$_.pm" for @EXTRA_MODULES;
4062cf::_connect_to_perl_2;
3931 4063
3932END { cf::emergency_save } 4064END { cf::emergency_save }
3933 4065
39341 40661
3935 4067

Diff Legend

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