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.465 by root, Thu Jan 8 00:54:55 2009 UTC vs.
Revision 1.506 by root, Wed Feb 3 20:48:22 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#############################################################################
… …
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
… …
2209 2256
2210 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2257 my $lock = cf::lock_acquire "map_data:$self->{path}";
2211 2258
2212 return if $self->players; 2259 return if $self->players;
2213 2260
2214 warn "resetting map ", $self->path; 2261 warn "resetting map ", $self->path, "\n";
2215 2262
2216 $self->in_memory (cf::MAP_SWAPPED); 2263 $self->in_memory (cf::MAP_SWAPPED);
2217 2264
2218 # need to save uniques path 2265 # need to save uniques path
2219 unless ($self->{deny_save}) { 2266 unless ($self->{deny_save}) {
… …
2310 : normalise $_ 2357 : normalise $_
2311 } @{ aio_readdir $UNIQUEDIR or [] } 2358 } @{ aio_readdir $UNIQUEDIR or [] }
2312 ] 2359 ]
2313} 2360}
2314 2361
2362=item cf::map::static_maps
2363
2364Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2365file in the shared directory excluding F</styles> and F</editor>). May
2366block.
2367
2368=cut
2369
2370sub static_maps() {
2371 my @dirs = "";
2372 my @maps;
2373
2374 while (@dirs) {
2375 my $dir = shift @dirs;
2376
2377 next if $dir eq "/styles" || $dir eq "/editor";
2378
2379 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2380 or return;
2381
2382 for (@$files) {
2383 s/\.map$// or next;
2384 utf8::decode $_;
2385 push @maps, "$dir/$_";
2386 }
2387
2388 push @dirs, map "$dir/$_", @$dirs;
2389 }
2390
2391 \@maps
2392}
2393
2315=back 2394=back
2316 2395
2317=head3 cf::object 2396=head3 cf::object
2318 2397
2319=cut 2398=cut
… …
2384 2463
2385our $SAY_CHANNEL = { 2464our $SAY_CHANNEL = {
2386 id => "say", 2465 id => "say",
2387 title => "Map", 2466 title => "Map",
2388 reply => "say ", 2467 reply => "say ",
2389 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2468 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2390}; 2469};
2391 2470
2392our $CHAT_CHANNEL = { 2471our $CHAT_CHANNEL = {
2393 id => "chat", 2472 id => "chat",
2394 title => "Chat", 2473 title => "Chat",
… …
2514 ($x, $y) = (-1, -1) 2593 ($x, $y) = (-1, -1)
2515 unless (defined $x) && (defined $y); 2594 unless (defined $x) && (defined $y);
2516 2595
2517 # use -1 or undef as default coordinates, not 0, 0 2596 # use -1 or undef as default coordinates, not 0, 0
2518 ($x, $y) = ($map->enter_x, $map->enter_y) 2597 ($x, $y) = ($map->enter_x, $map->enter_y)
2519 if $x <=0 && $y <= 0; 2598 if $x <= 0 && $y <= 0;
2520 2599
2521 $map->load; 2600 $map->load;
2522 $map->load_neighbours; 2601 $map->load_neighbours;
2523 2602
2524 return unless $self->contr->active; 2603 return unless $self->contr->active;
2525 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2526 $self->activate_recursive;
2527 2604
2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2605 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2529 $self->enter_map ($map, $x, $y); 2606 $self->enter_map ($map, $x, $y);
2607
2608 # only activate afterwards, to support waiting in hooks
2609 $self->activate_recursive;
2530} 2610}
2531 2611
2532=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2612=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2533 2613
2534Moves the player to the given map-path and coordinates by first freezing 2614Moves the player to the given map-path and coordinates by first freezing
… …
2722 2802
2723 utf8::encode $text; 2803 utf8::encode $text;
2724 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2804 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2725} 2805}
2726 2806
2807=item $client->send_big_packet ($pkt)
2808
2809Like C<send_packet>, but tries to compress large packets, and fragments
2810them as required.
2811
2812=cut
2813
2814our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2815
2816sub cf::client::send_big_packet {
2817 my ($self, $pkt) = @_;
2818
2819 # try lzf for large packets
2820 $pkt = "lzf " . Compress::LZF::compress $pkt
2821 if 1024 <= length $pkt and $self->{can_lzf};
2822
2823 # split very large packets
2824 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2825 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2826 $pkt = "frag";
2827 }
2828
2829 $self->send_packet ($pkt);
2830}
2831
2727=item $client->send_msg ($channel, $msg, $color, [extra...]) 2832=item $client->send_msg ($channel, $msg, $color, [extra...])
2728 2833
2729Send a drawinfo or msg packet to the client, formatting the msg for the 2834Send 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 2835client 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 2836the message, with C<log> being the default. If C<$color> is negative, suppress
… …
2733 2838
2734=cut 2839=cut
2735 2840
2736# non-persistent channels (usually the info channel) 2841# non-persistent channels (usually the info channel)
2737our %CHANNEL = ( 2842our %CHANNEL = (
2843 "c/motd" => {
2844 id => "infobox",
2845 title => "MOTD",
2846 reply => undef,
2847 tooltip => "The message of the day",
2848 },
2738 "c/identify" => { 2849 "c/identify" => {
2739 id => "infobox", 2850 id => "infobox",
2740 title => "Identify", 2851 title => "Identify",
2741 reply => undef, 2852 reply => undef,
2742 tooltip => "Items recently identified", 2853 tooltip => "Items recently identified",
… …
2744 "c/examine" => { 2855 "c/examine" => {
2745 id => "infobox", 2856 id => "infobox",
2746 title => "Examine", 2857 title => "Examine",
2747 reply => undef, 2858 reply => undef,
2748 tooltip => "Signs and other items you examined", 2859 tooltip => "Signs and other items you examined",
2860 },
2861 "c/shopinfo" => {
2862 id => "infobox",
2863 title => "Shop Info",
2864 reply => undef,
2865 tooltip => "What your bargaining skill tells you about the shop",
2749 }, 2866 },
2750 "c/book" => { 2867 "c/book" => {
2751 id => "infobox", 2868 id => "infobox",
2752 title => "Book", 2869 title => "Book",
2753 reply => undef, 2870 reply => undef,
… …
2781 id => "infobox", 2898 id => "infobox",
2782 title => "Skills", 2899 title => "Skills",
2783 reply => undef, 2900 reply => undef,
2784 tooltip => "Shows your experience per skill and item power", 2901 tooltip => "Shows your experience per skill and item power",
2785 }, 2902 },
2903 "c/shopitems" => {
2904 id => "infobox",
2905 title => "Shop Items",
2906 reply => undef,
2907 tooltip => "Shows the items currently for sale in this shop",
2908 },
2786 "c/resistances" => { 2909 "c/resistances" => {
2787 id => "infobox", 2910 id => "infobox",
2788 title => "Resistances", 2911 title => "Resistances",
2789 reply => undef, 2912 reply => undef,
2790 tooltip => "Shows your resistances", 2913 tooltip => "Shows your resistances",
… …
2792 "c/pets" => { 2915 "c/pets" => {
2793 id => "infobox", 2916 id => "infobox",
2794 title => "Pets", 2917 title => "Pets",
2795 reply => undef, 2918 reply => undef,
2796 tooltip => "Shows information abotu your pets/a specific pet", 2919 tooltip => "Shows information abotu your pets/a specific pet",
2920 },
2921 "c/perceiveself" => {
2922 id => "infobox",
2923 title => "Perceive Self",
2924 reply => undef,
2925 tooltip => "You gained detailed knowledge about yourself",
2797 }, 2926 },
2798 "c/uptime" => { 2927 "c/uptime" => {
2799 id => "infobox", 2928 id => "infobox",
2800 title => "Uptime", 2929 title => "Uptime",
2801 reply => undef, 2930 reply => undef,
… …
2857 my $pkt = "msg " 2986 my $pkt = "msg "
2858 . $self->{json_coder}->encode ( 2987 . $self->{json_coder}->encode (
2859 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2988 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2860 ); 2989 );
2861 2990
2862 # try lzf for large packets
2863 $pkt = "lzf " . Compress::LZF::compress $pkt
2864 if 1024 <= length $pkt and $self->{can_lzf};
2865
2866 # split very large packets
2867 if (8192 < length $pkt and $self->{can_lzf}) {
2868 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2869 $pkt = "frag";
2870 }
2871
2872 $self->send_packet ($pkt); 2991 $self->send_big_packet ($pkt);
2873} 2992}
2874 2993
2875=item $client->ext_msg ($type, @msg) 2994=item $client->ext_msg ($type, @msg)
2876 2995
2877Sends an ext event to the client. 2996Sends an ext event to the client.
… …
2880 2999
2881sub cf::client::ext_msg($$@) { 3000sub cf::client::ext_msg($$@) {
2882 my ($self, $type, @msg) = @_; 3001 my ($self, $type, @msg) = @_;
2883 3002
2884 if ($self->extcmd == 2) { 3003 if ($self->extcmd == 2) {
2885 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3004 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2886 } elsif ($self->extcmd == 1) { # TODO: remove 3005 } elsif ($self->extcmd == 1) { # TODO: remove
2887 push @msg, msgtype => "event_$type"; 3006 push @msg, msgtype => "event_$type";
2888 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3007 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2889 } 3008 }
2890} 3009}
2891 3010
2892=item $client->ext_reply ($msgid, @msg) 3011=item $client->ext_reply ($msgid, @msg)
2893 3012
… …
2897 3016
2898sub cf::client::ext_reply($$@) { 3017sub cf::client::ext_reply($$@) {
2899 my ($self, $id, @msg) = @_; 3018 my ($self, $id, @msg) = @_;
2900 3019
2901 if ($self->extcmd == 2) { 3020 if ($self->extcmd == 2) {
2902 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3021 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2903 } elsif ($self->extcmd == 1) { 3022 } elsif ($self->extcmd == 1) {
2904 #TODO: version 1, remove 3023 #TODO: version 1, remove
2905 unshift @msg, msgtype => "reply", msgid => $id; 3024 unshift @msg, msgtype => "reply", msgid => $id;
2906 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3025 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2907 } 3026 }
2908} 3027}
2909 3028
2910=item $success = $client->query ($flags, "text", \&cb) 3029=item $success = $client->query ($flags, "text", \&cb)
2911 3030
… …
3038our $safe_hole = new Safe::Hole; 3157our $safe_hole = new Safe::Hole;
3039 3158
3040$SIG{FPE} = 'IGNORE'; 3159$SIG{FPE} = 'IGNORE';
3041 3160
3042$safe->permit_only (Opcode::opset qw( 3161$safe->permit_only (Opcode::opset qw(
3043 :base_core :base_mem :base_orig :base_math 3162 :base_core :base_mem :base_orig :base_math :base_loop
3044 grepstart grepwhile mapstart mapwhile 3163 grepstart grepwhile mapstart mapwhile
3045 sort time 3164 sort time
3046)); 3165));
3047 3166
3048# here we export the classes and methods available to script code 3167# here we export the classes and methods available to script code
… …
3052The following functions and methods are available within a safe environment: 3171The following functions and methods are available within a safe environment:
3053 3172
3054 cf::object 3173 cf::object
3055 contr pay_amount pay_player map x y force_find force_add destroy 3174 contr pay_amount pay_player map x y force_find force_add destroy
3056 insert remove name archname title slaying race decrease split 3175 insert remove name archname title slaying race decrease split
3176 value
3057 3177
3058 cf::object::player 3178 cf::object::player
3059 player 3179 player
3060 3180
3061 cf::player 3181 cf::player
… …
3067=cut 3187=cut
3068 3188
3069for ( 3189for (
3070 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3190 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3071 insert remove inv nrof name archname title slaying race 3191 insert remove inv nrof name archname title slaying race
3072 decrease split destroy change_exp)], 3192 decrease split destroy change_exp value msg lore send_msg)],
3073 ["cf::object::player" => qw(player)], 3193 ["cf::object::player" => qw(player)],
3074 ["cf::player" => qw(peaceful)], 3194 ["cf::player" => qw(peaceful send_msg)],
3075 ["cf::map" => qw(trigger)], 3195 ["cf::map" => qw(trigger)],
3076) { 3196) {
3077 no strict 'refs'; 3197 no strict 'refs';
3078 my ($pkg, @funs) = @$_; 3198 my ($pkg, @funs) = @$_;
3079 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3199 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3097 3217
3098 my $qcode = $code; 3218 my $qcode = $code;
3099 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3219 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3100 $qcode =~ s/\n/\\n/g; 3220 $qcode =~ s/\n/\\n/g;
3101 3221
3222 %vars = (_dummy => 0) unless %vars;
3223
3224 my @res;
3102 local $_; 3225 local $_;
3103 local @safe::cf::_safe_eval_args = values %vars;
3104 3226
3105 my $eval = 3227 my $eval =
3106 "do {\n" 3228 "do {\n"
3107 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3229 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3108 . "#line 0 \"{$qcode}\"\n" 3230 . "#line 0 \"{$qcode}\"\n"
3109 . $code 3231 . $code
3110 . "\n}" 3232 . "\n}"
3111 ; 3233 ;
3112 3234
3235 if ($CFG{safe_eval}) {
3113 sub_generation_inc; 3236 sub_generation_inc;
3237 local @safe::cf::_safe_eval_args = values %vars;
3114 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3238 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3115 sub_generation_inc; 3239 sub_generation_inc;
3240 } else {
3241 local @cf::_safe_eval_args = values %vars;
3242 @res = wantarray ? eval eval : scalar eval $eval;
3243 }
3116 3244
3117 if ($@) { 3245 if ($@) {
3118 warn "$@"; 3246 warn "$@";
3119 warn "while executing safe code '$code'\n"; 3247 warn "while executing safe code '$code'\n";
3120 warn "with arguments " . (join " ", %vars) . "\n"; 3248 warn "with arguments " . (join " ", %vars) . "\n";
… …
3139=cut 3267=cut
3140 3268
3141sub register_script_function { 3269sub register_script_function {
3142 my ($fun, $cb) = @_; 3270 my ($fun, $cb) = @_;
3143 3271
3144 no strict 'refs'; 3272 $fun = "safe::$fun" if $CFG{safe_eval};
3145 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3273 *$fun = $safe_hole->wrap ($cb);
3146} 3274}
3147 3275
3148=back 3276=back
3149 3277
3150=cut 3278=cut
… …
3171 3299
3172 $facedata->{version} == 2 3300 $facedata->{version} == 2
3173 or cf::cleanup "$path: version mismatch, cannot proceed."; 3301 or cf::cleanup "$path: version mismatch, cannot proceed.";
3174 3302
3175 # patch in the exptable 3303 # patch in the exptable
3304 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3176 $facedata->{resource}{"res/exp_table"} = { 3305 $facedata->{resource}{"res/exp_table"} = {
3177 type => FT_RSRC, 3306 type => FT_RSRC,
3178 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3307 data => $exp_table,
3308 hash => (Digest::MD5::md5 $exp_table),
3179 }; 3309 };
3180 cf::cede_to_tick; 3310 cf::cede_to_tick;
3181 3311
3182 { 3312 {
3183 my $faces = $facedata->{faceinfo}; 3313 my $faces = $facedata->{faceinfo};
… …
3185 while (my ($face, $info) = each %$faces) { 3315 while (my ($face, $info) = each %$faces) {
3186 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3316 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3187 3317
3188 cf::face::set_visibility $idx, $info->{visibility}; 3318 cf::face::set_visibility $idx, $info->{visibility};
3189 cf::face::set_magicmap $idx, $info->{magicmap}; 3319 cf::face::set_magicmap $idx, $info->{magicmap};
3190 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3320 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3191 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3321 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3192 3322
3193 cf::cede_to_tick; 3323 cf::cede_to_tick;
3194 } 3324 }
3195 3325
3196 while (my ($face, $info) = each %$faces) { 3326 while (my ($face, $info) = each %$faces) {
… …
3220 3350
3221 cf::anim::invalidate_all; # d'oh 3351 cf::anim::invalidate_all; # d'oh
3222 } 3352 }
3223 3353
3224 { 3354 {
3225 # TODO: for gcfclient pleasure, we should give resources
3226 # that gcfclient doesn't grok a >10000 face index.
3227 my $res = $facedata->{resource}; 3355 my $res = $facedata->{resource};
3228 3356
3229 while (my ($name, $info) = each %$res) { 3357 while (my ($name, $info) = each %$res) {
3230 if (defined $info->{type}) { 3358 if (defined $info->{type}) {
3231 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3359 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3232 my $data;
3233 3360
3234 if ($info->{type} & 1) { 3361 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3235 # prepend meta info
3236
3237 my $meta = $enc->encode ({
3238 name => $name,
3239 %{ $info->{meta} || {} },
3240 });
3241
3242 $data = pack "(w/a*)*", $meta, $info->{data};
3243 } else {
3244 $data = $info->{data};
3245 }
3246
3247 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3248 cf::face::set_type $idx, $info->{type}; 3362 cf::face::set_type $idx, $info->{type};
3249 } else { 3363 } else {
3250 $RESOURCE{$name} = $info; 3364 $RESOURCE{$name} = $info;
3251 } 3365 }
3252 3366
… …
3336 3450
3337 warn "finished reloading resource files\n"; 3451 warn "finished reloading resource files\n";
3338} 3452}
3339 3453
3340sub reload_config { 3454sub reload_config {
3455 warn "reloading config file...\n";
3456
3341 open my $fh, "<:utf8", "$CONFDIR/config" 3457 open my $fh, "<:utf8", "$CONFDIR/config"
3342 or return; 3458 or return;
3343 3459
3344 local $/; 3460 local $/;
3345 *CFG = YAML::Load <$fh>; 3461 *CFG = YAML::XS::Load scalar <$fh>;
3346 3462
3347 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3463 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3348 3464
3349 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3465 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3350 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3466 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3354 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3470 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3355 and die "WARNING: m(un)lockall failed: $!\n"; 3471 and die "WARNING: m(un)lockall failed: $!\n";
3356 }; 3472 };
3357 warn $@ if $@; 3473 warn $@ if $@;
3358 } 3474 }
3475
3476 warn "finished reloading resource files\n";
3359} 3477}
3360 3478
3361sub pidfile() { 3479sub pidfile() {
3362 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3480 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3363 or die "$PIDFILE: $!"; 3481 or die "$PIDFILE: $!";
… …
3373 my $pid = <$fh>; 3491 my $pid = <$fh>;
3374 kill 9, $pid if $pid > 0; 3492 kill 9, $pid if $pid > 0;
3375 3493
3376 seek $fh, 0, 0; 3494 seek $fh, 0, 0;
3377 print $fh $$; 3495 print $fh $$;
3496}
3497
3498sub main_loop {
3499 warn "EV::loop starting\n";
3500 if (1) {
3501 EV::loop;
3502 }
3503 warn "EV::loop returned\n";
3504 goto &main_loop unless $REALLY_UNLOOP;
3378} 3505}
3379 3506
3380sub main { 3507sub main {
3381 cf::init_globals; # initialise logging 3508 cf::init_globals; # initialise logging
3382 3509
… …
3402 }; 3529 };
3403 3530
3404 evthread_start IO::AIO::poll_fileno; 3531 evthread_start IO::AIO::poll_fileno;
3405 3532
3406 cf::sync_job { 3533 cf::sync_job {
3534 cf::load_settings;
3535 cf::load_materials;
3536
3407 reload_resources; 3537 reload_resources;
3408 reload_config; 3538 reload_config;
3409 db_init; 3539 db_init;
3410 3540
3411 cf::load_settings;
3412 cf::load_materials;
3413 cf::init_uuid; 3541 cf::init_uuid;
3414 cf::init_signals; 3542 cf::init_signals;
3415 cf::init_commands; 3543 cf::init_commands;
3416 cf::init_skills; 3544 cf::init_skills;
3417 3545
… …
3422 load_extensions; 3550 load_extensions;
3423 3551
3424 utime time, time, $RUNTIMEFILE; 3552 utime time, time, $RUNTIMEFILE;
3425 3553
3426 # no (long-running) fork's whatsoever before this point(!) 3554 # no (long-running) fork's whatsoever before this point(!)
3555 use POSIX ();
3427 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3556 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3428 3557
3429 (pop @POST_INIT)->(0) while @POST_INIT; 3558 (pop @POST_INIT)->(0) while @POST_INIT;
3430 }; 3559 };
3431 3560
3432 EV::loop; 3561 main_loop;
3433} 3562}
3434 3563
3435############################################################################# 3564#############################################################################
3436# initialisation and cleanup 3565# initialisation and cleanup
3437 3566
… …
3444 }; 3573 };
3445 } 3574 }
3446} 3575}
3447 3576
3448sub write_runtime_sync { 3577sub write_runtime_sync {
3578 my $t0 = EV::time;
3579
3449 # first touch the runtime file to show we are still running: 3580 # first touch the runtime file to show we are still running:
3450 # the fsync below can take a very very long time. 3581 # the fsync below can take a very very long time.
3451 3582
3452 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3583 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3453 3584
3454 my $guard = cf::lock_acquire "write_runtime"; 3585 my $guard = cf::lock_acquire "write_runtime";
3455 3586
3456 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3587 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3457 or return; 3588 or return;
3458 3589
3459 my $value = $cf::RUNTIME + 90 + 10; 3590 my $value = $cf::RUNTIME + 90 + 10;
3460 # 10 is the runtime save interval, for a monotonic clock 3591 # 10 is the runtime save interval, for a monotonic clock
3461 # 60 allows for the watchdog to kill the server. 3592 # 60 allows for the watchdog to kill the server.
… …
3474 or return; 3605 or return;
3475 3606
3476 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3607 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3477 and return; 3608 and return;
3478 3609
3479 warn "runtime file written.\n"; 3610 warn sprintf "runtime file written (%gs).\n", EV::time - $t0;
3480 3611
3481 1 3612 1
3482} 3613}
3483 3614
3484our $uuid_lock; 3615our $uuid_lock;
… …
3693 clear_package "safe::$_" 3824 clear_package "safe::$_"
3694 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3825 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3695 3826
3696 warn "unloading cf.pm \"a bit\""; 3827 warn "unloading cf.pm \"a bit\"";
3697 delete $INC{"cf.pm"}; 3828 delete $INC{"cf.pm"};
3698 delete $INC{"cf/pod.pm"}; 3829 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3699 3830
3700 # don't, removes xs symbols, too, 3831 # don't, removes xs symbols, too,
3701 # and global variables created in xs 3832 # and global variables created in xs
3702 #clear_package __PACKAGE__; 3833 #clear_package __PACKAGE__;
3703 3834
3704 warn "unload completed, starting to reload now"; 3835 warn "unload completed, starting to reload now";
3705 3836
3706 warn "reloading cf.pm"; 3837 warn "reloading cf.pm";
3707 require cf; 3838 require cf;
3708 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3839 cf::_connect_to_perl_1;
3709 3840
3710 warn "loading config and database again"; 3841 warn "loading config and database again";
3711 cf::reload_config; 3842 cf::reload_config;
3712 3843
3713 warn "loading extensions"; 3844 warn "loading extensions";
… …
3775 3906
3776our @WAIT_FOR_TICK; 3907our @WAIT_FOR_TICK;
3777our @WAIT_FOR_TICK_BEGIN; 3908our @WAIT_FOR_TICK_BEGIN;
3778 3909
3779sub wait_for_tick { 3910sub wait_for_tick {
3780 return if tick_inhibit || $Coro::current == $Coro::main; 3911 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3781 3912
3782 my $signal = new Coro::Signal; 3913 my $signal = new Coro::Signal;
3783 push @WAIT_FOR_TICK, $signal; 3914 push @WAIT_FOR_TICK, $signal;
3784 $signal->wait; 3915 $signal->wait;
3785} 3916}
3786 3917
3787sub wait_for_tick_begin { 3918sub wait_for_tick_begin {
3788 return if tick_inhibit || $Coro::current == $Coro::main; 3919 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3789 3920
3790 my $signal = new Coro::Signal; 3921 my $signal = new Coro::Signal;
3791 push @WAIT_FOR_TICK_BEGIN, $signal; 3922 push @WAIT_FOR_TICK_BEGIN, $signal;
3792 $signal->wait; 3923 $signal->wait;
3793} 3924}
… …
3798 unless ++$bug_warning > 10; 3929 unless ++$bug_warning > 10;
3799 return; 3930 return;
3800 } 3931 }
3801 3932
3802 cf::server_tick; # one server iteration 3933 cf::server_tick; # one server iteration
3934
3935 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
3803 3936
3804 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3937 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3805 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3938 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3806 Coro::async_pool { 3939 Coro::async_pool {
3807 $Coro::current->{desc} = "runtime saver"; 3940 $Coro::current->{desc} = "runtime saver";
… …
3830} 3963}
3831 3964
3832{ 3965{
3833 # configure BDB 3966 # configure BDB
3834 3967
3835 BDB::min_parallel 8; 3968 BDB::min_parallel 16;
3836 BDB::max_poll_reqs $TICK * 0.1; 3969 BDB::max_poll_reqs $TICK * 0.1;
3837 $AnyEvent::BDB::WATCHER->priority (1); 3970 $AnyEvent::BDB::WATCHER->priority (1);
3838 3971
3839 unless ($DB_ENV) { 3972 unless ($DB_ENV) {
3840 $DB_ENV = BDB::db_env_create; 3973 $DB_ENV = BDB::db_env_create;
… …
3920 LOG llevInfo, "[ABT] [suppressed]\n"; 4053 LOG llevInfo, "[ABT] [suppressed]\n";
3921 } 4054 }
3922} 4055}
3923 4056
3924# load additional modules 4057# load additional modules
3925use cf::pod; 4058require "cf/$_.pm" for @EXTRA_MODULES;
4059cf::_connect_to_perl_2;
3926 4060
3927END { cf::emergency_save } 4061END { cf::emergency_save }
3928 4062
39291 40631
3930 4064

Diff Legend

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