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.455 by root, Sat Sep 27 08:17:40 2008 UTC vs.
Revision 1.510 by root, Tue Apr 6 22:59:28 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
39use Guard ();
37use Coro (); 40use Coro ();
38use Coro::State; 41use Coro::State;
39use Coro::Handle; 42use Coro::Handle;
40use Coro::EV; 43use Coro::EV;
41use Coro::AnyEvent; 44use Coro::AnyEvent;
42use Coro::Timer; 45use Coro::Timer;
43use Coro::Signal; 46use Coro::Signal;
44use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
45use Coro::AnyEvent; 49use Coro::AnyEvent;
46use Coro::AIO; 50use Coro::AIO;
47use Coro::BDB 1.6; 51use Coro::BDB 1.6;
48use Coro::Storable; 52use Coro::Storable;
49use Coro::Util (); 53use Coro::Util ();
50 54
51use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
52use BDB (); 56use BDB ();
53use Data::Dumper; 57use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 58use Fcntl;
56use YAML (); 59use YAML::XS ();
57use IO::AIO (); 60use IO::AIO ();
58use Time::HiRes; 61use Time::HiRes;
59use Compress::LZF; 62use Compress::LZF;
60use Digest::MD5 (); 63use Digest::MD5 ();
61 64
… …
69$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
70 73
71# make sure c-lzf reinitialises itself 74# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
73Compress::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" };
74 80
75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
76 82
77our %COMMAND = (); 83our %COMMAND = ();
78our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
… …
83our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
84our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
85 91
86our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
87our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
88 96
89our $CONFDIR = confdir; 97our $CONFDIR = confdir;
90our $DATADIR = datadir; 98our $DATADIR = datadir;
91our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
92our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
… …
103our %RESOURCE; 111our %RESOURCE;
104 112
105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107our $NEXT_TICK; 115our $NEXT_TICK;
108our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
109 117
110our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
112our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
113our $DB_ENV; 121our $DB_ENV;
114 122
123our @EXTRA_MODULES = qw(pod match mapscript);
124
115our %CFG; 125our %CFG;
116 126
117our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
118our $RUNTIME; 128our $RUNTIME;
119our $NOW; 129our $NOW;
… …
129our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter 140our $JITTER; # average jitter
131our $TICK_START; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
132 142
133our @POST_INIT; 143our @POST_INIT;
144
145our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146our $REALLY_UNLOOP; # never set to true, please :)
134 147
135binmode STDOUT; 148binmode STDOUT;
136binmode STDERR; 149binmode STDERR;
137 150
138# read virtual server time, if available 151# read virtual server time, if available
… …
140 open my $fh, "<", $RUNTIMEFILE 153 open my $fh, "<", $RUNTIMEFILE
141 or die "unable to read $RUNTIMEFILE file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
142 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
143} 156}
144 157
158eval "sub TICK() { $TICK } 1" or die;
159
145mkdir $_ 160mkdir $_
146 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
147 162
148our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
149 164
150sub 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::"} };
151 177
152############################################################################# 178#############################################################################
153 179
154=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
155 181
… …
202returns 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
203per 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.
204 230
205=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
206 232
207This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
208C<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
209that call. 235that call.
210 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
211=back 243=back
212 244
213=cut 245=cut
214 246
215BEGIN { 247$Coro::State::WARNHOOK = sub {
216 *CORE::GLOBAL::warn = sub {
217 my $msg = join "", @_; 248 my $msg = join "", @_;
218 249
219 $msg .= "\n" 250 $msg .= "\n"
220 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
221 252
222 $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;
223 254
224 LOG llevError, $msg; 255 LOG llevError, $msg;
225 }; 256};
226}
227 257
228$Coro::State::DIEHOOK = sub { 258$Coro::State::DIEHOOK = sub {
229 return unless $^S eq 0; # "eq", not "==" 259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
230 262
231 if ($Coro::current == $Coro::main) {#d# 263 if ($Coro::current == $Coro::main) {#d#
232 warn "DIEHOOK called in main context, Coro bug?\n";#d# 264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
233 return;#d# 265 return;#d#
234 }#d# 266 }#d#
235 267
236 # kill coroutine otherwise 268 # kill coroutine otherwise
237 warn Carp::longmess $_[0];
238 Coro::terminate 269 Coro::terminate
239}; 270};
240
241$SIG{__DIE__} = sub { }; #d#?
242 271
243@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
244@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
245@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
246@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
260)) { 289)) {
261 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
262} 291}
263 292
264$EV::DIED = sub { 293$EV::DIED = sub {
265 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
266}; 295};
267 296
268############################################################################# 297#############################################################################
269 298
270=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
… …
328Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
329 358
330=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
331 360
332Wait until the given lock is available and then acquires it and returns 361Wait until the given lock is available and then acquires it and returns
333a Coro::guard object. If the guard object gets destroyed (goes out of scope, 362a L<Guard> object. If the guard object gets destroyed (goes out of scope,
334for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
335returned. 364returned.
336 365
337Locks are *not* recursive, locking from the same coro twice results in a 366Locks are *not* recursive, locking from the same coro twice results in a
338deadlocked coro. 367deadlocked coro.
… …
344 373
345Return true if the lock is currently active, i.e. somebody has locked it. 374Return true if the lock is currently active, i.e. somebody has locked it.
346 375
347=cut 376=cut
348 377
349our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
350our %LOCKER;#d#
351 379
352sub lock_wait($) { 380sub lock_wait($) {
353 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
354
355 if ($LOCKER{$key} == $Coro::current) {#d#
356 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
357 return;#d#
358 }#d#
359
360 # wait for lock, if any
361 while ($LOCK{$key}) {
362 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
363 push @{ $LOCK{$key} }, $Coro::current;
364 Coro::schedule;
365 }
366} 382}
367 383
368sub lock_acquire($) { 384sub lock_acquire($) {
369 my ($key) = @_; 385 $LOCKS->guard ($_[0])
370
371 # wait, to be sure we are not locked
372 lock_wait $key;
373
374 $LOCK{$key} = [];
375 $LOCKER{$key} = $Coro::current;#d#
376
377 Coro::guard {
378 delete $LOCKER{$key};#d#
379 # wake up all waiters, to be on the safe side
380 $_->ready for @{ delete $LOCK{$key} };
381 }
382} 386}
383 387
384sub lock_active($) { 388sub lock_active($) {
385 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
386
387 ! ! $LOCK{$key}
388} 390}
389 391
390sub freeze_mainloop { 392sub freeze_mainloop {
391 tick_inhibit_inc; 393 tick_inhibit_inc;
392 394
393 Coro::guard \&tick_inhibit_dec; 395 &Guard::guard (\&tick_inhibit_dec);
394} 396}
395 397
396=item cf::periodic $interval, $cb 398=item cf::periodic $interval, $cb
397 399
398Like EV::periodic, but randomly selects a starting point so that the actions 400Like EV::periodic, but randomly selects a starting point so that the actions
… …
421 423
422=cut 424=cut
423 425
424our @SLOT_QUEUE; 426our @SLOT_QUEUE;
425our $SLOT_QUEUE; 427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
426 429
427$SLOT_QUEUE->cancel if $SLOT_QUEUE; 430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
428$SLOT_QUEUE = Coro::async { 431$SLOT_QUEUE = Coro::async {
429 $Coro::current->desc ("timeslot manager"); 432 $Coro::current->desc ("timeslot manager");
430 433
431 my $signal = new Coro::Signal; 434 my $signal = new Coro::Signal;
435 my $busy;
432 436
433 while () { 437 while () {
434 next_job: 438 next_job:
439
435 my $avail = cf::till_tick; 440 my $avail = cf::till_tick;
436 if ($avail > 0.01) { 441
437 for (0 .. $#SLOT_QUEUE) { 442 for (0 .. $#SLOT_QUEUE) {
438 if ($SLOT_QUEUE[$_][0] < $avail) { 443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
439 my $job = splice @SLOT_QUEUE, $_, 1, (); 445 my $job = splice @SLOT_QUEUE, $_, 1, ();
440 $job->[2]->send; 446 $job->[2]->send;
441 Coro::cede; 447 Coro::cede;
442 goto next_job; 448 goto next_job;
443 } 449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
444 } 451 }
445 } 452 }
446 453
447 if (@SLOT_QUEUE) { 454 if (@SLOT_QUEUE) {
448 # 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
449 push @cf::WAIT_FOR_TICK, $signal; 456 push @cf::WAIT_FOR_TICK, $signal;
450 $signal->wait; 457 $signal->wait;
451 } else { 458 } else {
459 $busy = 0;
452 Coro::schedule; 460 Coro::schedule;
453 } 461 }
454 } 462 }
455}; 463};
456 464
457sub get_slot($;$$) { 465sub get_slot($;$$) {
458 return if tick_inhibit || $Coro::current == $Coro::main; 466 return if tick_inhibit || $Coro::current == $Coro::main;
459 467
460 my ($time, $pri, $name) = @_; 468 my ($time, $pri, $name) = @_;
461 469
462 $time = $TICK * .6 if $time > $TICK * .6; 470 $time = clamp $time, 0.01, $TICK * .6;
471
463 my $sig = new Coro::Signal; 472 my $sig = new Coro::Signal;
464 473
465 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
466 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
467 $SLOT_QUEUE->ready; 476 $SLOT_QUEUE->ready;
… …
1170 $decname, length $$rdata, scalar @$objs; 1179 $decname, length $$rdata, scalar @$objs;
1171 1180
1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1173 aio_chmod $fh, SAVE_MODE; 1182 aio_chmod $fh, SAVE_MODE;
1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1175 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 }
1176 aio_close $fh; 1188 aio_close $fh;
1177 1189
1178 if (@$objs) { 1190 if (@$objs) {
1179 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) {
1180 aio_chmod $fh, SAVE_MODE; 1192 aio_chmod $fh, SAVE_MODE;
1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1193 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1182 aio_write $fh, 0, (length $data), $data, 0; 1194 aio_write $fh, 0, (length $data), $data, 0;
1183 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 }
1184 aio_close $fh; 1199 aio_close $fh;
1185 aio_rename "$filename.pst~", "$filename.pst"; 1200 aio_rename "$filename.pst~", "$filename.pst";
1186 } 1201 }
1187 } else { 1202 } else {
1188 aio_unlink "$filename.pst"; 1203 aio_unlink "$filename.pst";
1189 } 1204 }
1190 1205
1191 aio_rename "$filename~", $filename; 1206 aio_rename "$filename~", $filename;
1207
1208 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC;
1192 } else { 1210 } else {
1193 warn "FATAL: $filename~: $!\n"; 1211 warn "unable to save objects: $filename~: $!\n";
1194 } 1212 }
1195 } else { 1213 } else {
1196 aio_unlink $filename; 1214 aio_unlink $filename;
1197 aio_unlink "$filename.pst"; 1215 aio_unlink "$filename.pst";
1198 } 1216 }
… …
1289 my ($name, $cb) = @_; 1307 my ($name, $cb) = @_;
1290 1308
1291 $EXTICMD{$name} = $cb; 1309 $EXTICMD{$name} = $cb;
1292} 1310}
1293 1311
1312use File::Glob ();
1313
1294cf::player->attach ( 1314cf::player->attach (
1295 on_command => sub { 1315 on_unknown_command => sub {
1296 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1297 1317
1298 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
1299 or return; 1319 or return;
1300 1320
… …
1330 1350
1331 cf::override; 1351 cf::override;
1332 }, 1352 },
1333); 1353);
1334 1354
1355# "readahead" all extensions
1356sub cache_extensions {
1357 my $grp = IO::AIO::aio_group;
1358
1359 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1360 for (grep /\.ext$/, @{$_[0]}) {
1361 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1362 }
1363 };
1364
1365 $grp
1366}
1367
1335sub load_extensions { 1368sub load_extensions {
1336 cf::sync_job { 1369 cf::sync_job {
1337 my %todo; 1370 my %todo;
1338 1371
1339 for my $path (<$LIBDIR/*.ext>) { 1372 for my $path (<$LIBDIR/*.ext>) {
… …
1366 . "\n};\n1"; 1399 . "\n};\n1";
1367 1400
1368 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
1369 } 1402 }
1370 1403
1404 my $pass = 0;
1371 my %done; 1405 my %done;
1372 while (%todo) { 1406 while (%todo) {
1373 my $progress; 1407 my $progress;
1374 1408
1409 ++$pass;
1410
1411 ext:
1375 while (my ($k, $v) = each %todo) { 1412 while (my ($k, $v) = each %todo) {
1376 for (split /,\s*/, $v->{meta}{depends}) { 1413 for (split /,\s*/, $v->{meta}{depends}) {
1377 goto skip 1414 next ext
1378 unless exists $done{$_}; 1415 unless exists $done{$_};
1379 } 1416 }
1380 1417
1381 warn "... loading '$k' into '$v->{pkg}'\n"; 1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1382 1419
1383 unless (eval $v->{source}) { 1420 my $active = eval $v->{source};
1421
1422 if (length $@) {
1384 my $msg = $@ ? "$v->{path}: $@\n" 1423 warn "$v->{path}: $@\n";
1385 : "$v->{base}: extension inactive.\n";
1386 1424
1387 if (exists $v->{meta}{mandatory}) {
1388 warn $msg;
1389 cf::cleanup "mandatory extension failed to load, exiting."; 1425 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1390 } 1426 if exists $v->{meta}{mandatory};
1391 1427 } else {
1392 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;
1393 } 1434 }
1394
1395 $done{$k} = delete $todo{$k};
1396 push @EXTS, $v->{pkg};
1397 $progress = 1;
1398 } 1435 }
1399 1436
1400 skip: 1437 unless ($progress) {
1401 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1438 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1402 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 }
1403 } 1445 }
1404 }; 1446 };
1405} 1447}
1406 1448
1407############################################################################# 1449#############################################################################
… …
1727 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
1728 1770
1729 # mit "rum" bekleckern, nicht 1771 # mit "rum" bekleckern, nicht
1730 $self->_create_random_map ( 1772 $self->_create_random_map (
1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1773 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1774 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1775 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1734 $rmp->{exit_on_final_map}, 1776 $rmp->{exit_on_final_map},
1735 $rmp->{xsize}, $rmp->{ysize}, 1777 $rmp->{xsize}, $rmp->{ysize},
1736 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1778 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1737 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1779 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1867 1909
1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1910 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1869 "$UNIQUEDIR/$path" 1911 "$UNIQUEDIR/$path"
1870} 1912}
1871 1913
1872# and all this just because we cannot iterate over
1873# all maps in C++...
1874sub change_all_map_light {
1875 my ($change) = @_;
1876
1877 $_->change_map_light ($change)
1878 for grep $_->outdoor, values %cf::MAP;
1879}
1880
1881sub decay_objects { 1914sub decay_objects {
1882 my ($self) = @_; 1915 my ($self) = @_;
1883 1916
1884 return if $self->{deny_reset}; 1917 return if $self->{deny_reset};
1885 1918
… …
1967sub find { 2000sub find {
1968 my ($path, $origin) = @_; 2001 my ($path, $origin) = @_;
1969 2002
1970 $path = normalise $path, $origin && $origin->path; 2003 $path = normalise $path, $origin && $origin->path;
1971 2004
1972 cf::lock_wait "map_data:$path";#d#remove 2005 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 cf::lock_wait "map_find:$path"; 2006 my $guard2 = cf::lock_acquire "map_find:$path";
1974 2007
1975 $cf::MAP{$path} || do { 2008 $cf::MAP{$path} || do {
1976 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1977 my $guard2 = cf::lock_acquire "map_find:$path";
1978
1979 my $map = new_from_path cf::map $path 2009 my $map = new_from_path cf::map $path
1980 or return; 2010 or return;
1981 2011
1982 $map->{last_save} = $cf::RUNTIME; 2012 $map->{last_save} = $cf::RUNTIME;
1983 2013
… …
1995 2025
1996 $cf::MAP{$path} = $map 2026 $cf::MAP{$path} = $map
1997 } 2027 }
1998} 2028}
1999 2029
2000sub pre_load { } 2030sub pre_load { }
2001sub post_load { } 2031#sub post_load { } # XS
2002 2032
2003sub load { 2033sub load {
2004 my ($self) = @_; 2034 my ($self) = @_;
2005 2035
2006 local $self->{deny_reset} = 1; # loading can take a long time 2036 local $self->{deny_reset} = 1; # loading can take a long time
… …
2051 unless ($self->{deny_activate}) { 2081 unless ($self->{deny_activate}) {
2052 $self->decay_objects; 2082 $self->decay_objects;
2053 $self->fix_auto_apply; 2083 $self->fix_auto_apply;
2054 $self->update_buttons; 2084 $self->update_buttons;
2055 cf::cede_to_tick; 2085 cf::cede_to_tick;
2056 $self->set_darkness_map;
2057 cf::cede_to_tick;
2058 $self->activate; 2086 $self->activate;
2059 } 2087 }
2060 2088
2061 $self->{last_save} = $cf::RUNTIME; 2089 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME); 2090 $self->last_access ($cf::RUNTIME);
… …
2065 } 2093 }
2066 2094
2067 $self->post_load; 2095 $self->post_load;
2068} 2096}
2069 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
2070sub customise_for { 2101sub customise_for {
2071 my ($self, $ob) = @_; 2102 my ($self, $ob) = @_;
2072 2103
2073 return find "~" . $ob->name . "/" . $self->{path} 2104 return find "~" . $ob->name . "/" . $self->{path}
2074 if $self->per_player; 2105 if $self->per_player;
… …
2228 2259
2229 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2230 2261
2231 return if $self->players; 2262 return if $self->players;
2232 2263
2233 warn "resetting map ", $self->path; 2264 warn "resetting map ", $self->path, "\n";
2234 2265
2235 $self->in_memory (cf::MAP_SWAPPED); 2266 $self->in_memory (cf::MAP_SWAPPED);
2236 2267
2237 # need to save uniques path 2268 # need to save uniques path
2238 unless ($self->{deny_save}) { 2269 unless ($self->{deny_save}) {
… …
2329 : normalise $_ 2360 : normalise $_
2330 } @{ aio_readdir $UNIQUEDIR or [] } 2361 } @{ aio_readdir $UNIQUEDIR or [] }
2331 ] 2362 ]
2332} 2363}
2333 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
2334=back 2397=back
2335 2398
2336=head3 cf::object 2399=head3 cf::object
2337 2400
2338=cut 2401=cut
… …
2403 2466
2404our $SAY_CHANNEL = { 2467our $SAY_CHANNEL = {
2405 id => "say", 2468 id => "say",
2406 title => "Map", 2469 title => "Map",
2407 reply => "say ", 2470 reply => "say ",
2408 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.",
2409}; 2472};
2410 2473
2411our $CHAT_CHANNEL = { 2474our $CHAT_CHANNEL = {
2412 id => "chat", 2475 id => "chat",
2413 title => "Chat", 2476 title => "Chat",
… …
2533 ($x, $y) = (-1, -1) 2596 ($x, $y) = (-1, -1)
2534 unless (defined $x) && (defined $y); 2597 unless (defined $x) && (defined $y);
2535 2598
2536 # use -1 or undef as default coordinates, not 0, 0 2599 # use -1 or undef as default coordinates, not 0, 0
2537 ($x, $y) = ($map->enter_x, $map->enter_y) 2600 ($x, $y) = ($map->enter_x, $map->enter_y)
2538 if $x <=0 && $y <= 0; 2601 if $x <= 0 && $y <= 0;
2539 2602
2540 $map->load; 2603 $map->load;
2541 $map->load_neighbours; 2604 $map->load_neighbours;
2542 2605
2543 return unless $self->contr->active; 2606 return unless $self->contr->active;
2544 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2545 $self->activate_recursive;
2546 2607
2547 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2608 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2548 $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;
2549} 2613}
2550 2614
2551=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2615=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2552 2616
2553Moves 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
… …
2741 2805
2742 utf8::encode $text; 2806 utf8::encode $text;
2743 $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);
2744} 2808}
2745 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
2746=item $client->send_msg ($channel, $msg, $color, [extra...]) 2835=item $client->send_msg ($channel, $msg, $color, [extra...])
2747 2836
2748Send 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
2749client 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
2750the 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
… …
2752 2841
2753=cut 2842=cut
2754 2843
2755# non-persistent channels (usually the info channel) 2844# non-persistent channels (usually the info channel)
2756our %CHANNEL = ( 2845our %CHANNEL = (
2846 "c/motd" => {
2847 id => "infobox",
2848 title => "MOTD",
2849 reply => undef,
2850 tooltip => "The message of the day",
2851 },
2757 "c/identify" => { 2852 "c/identify" => {
2758 id => "infobox", 2853 id => "infobox",
2759 title => "Identify", 2854 title => "Identify",
2760 reply => undef, 2855 reply => undef,
2761 tooltip => "Items recently identified", 2856 tooltip => "Items recently identified",
… …
2763 "c/examine" => { 2858 "c/examine" => {
2764 id => "infobox", 2859 id => "infobox",
2765 title => "Examine", 2860 title => "Examine",
2766 reply => undef, 2861 reply => undef,
2767 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",
2768 }, 2869 },
2769 "c/book" => { 2870 "c/book" => {
2770 id => "infobox", 2871 id => "infobox",
2771 title => "Book", 2872 title => "Book",
2772 reply => undef, 2873 reply => undef,
… …
2788 id => "infobox", 2889 id => "infobox",
2789 title => "Body Parts", 2890 title => "Body Parts",
2790 reply => undef, 2891 reply => undef,
2791 tooltip => "Shows which body parts you posess and are available", 2892 tooltip => "Shows which body parts you posess and are available",
2792 }, 2893 },
2894 "c/statistics" => {
2895 id => "infobox",
2896 title => "Statistics",
2897 reply => undef,
2898 tooltip => "Shows your primary statistics",
2899 },
2793 "c/skills" => { 2900 "c/skills" => {
2794 id => "infobox", 2901 id => "infobox",
2795 title => "Skills", 2902 title => "Skills",
2796 reply => undef, 2903 reply => undef,
2797 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",
2798 }, 2929 },
2799 "c/uptime" => { 2930 "c/uptime" => {
2800 id => "infobox", 2931 id => "infobox",
2801 title => "Uptime", 2932 title => "Uptime",
2802 reply => undef, 2933 reply => undef,
… …
2812 id => "party", 2943 id => "party",
2813 title => "Party", 2944 title => "Party",
2814 reply => "gsay ", 2945 reply => "gsay ",
2815 tooltip => "Messages and chat related to your party", 2946 tooltip => "Messages and chat related to your party",
2816 }, 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 },
2954 "c/say" => $SAY_CHANNEL,
2955 "c/chat" => $CHAT_CHANNEL,
2817); 2956);
2818 2957
2819sub cf::client::send_msg { 2958sub cf::client::send_msg {
2820 my ($self, $channel, $msg, $color, @extra) = @_; 2959 my ($self, $channel, $msg, $color, @extra) = @_;
2821 2960
… …
2826 2965
2827 # check predefined channels, for the benefit of C 2966 # check predefined channels, for the benefit of C
2828 if ($CHANNEL{$channel}) { 2967 if ($CHANNEL{$channel}) {
2829 $channel = $CHANNEL{$channel}; 2968 $channel = $CHANNEL{$channel};
2830 2969
2831 $self->ext_msg (channel_info => $channel) 2970 $self->ext_msg (channel_info => $channel);
2832 if $self->can_msg;
2833
2834 $channel = $channel->{id}; 2971 $channel = $channel->{id};
2835 2972
2836 } elsif (ref $channel) { 2973 } elsif (ref $channel) {
2837 # send meta info to client, if not yet sent 2974 # send meta info to client, if not yet sent
2838 unless (exists $self->{channel}{$channel->{id}}) { 2975 unless (exists $self->{channel}{$channel->{id}}) {
2839 $self->{channel}{$channel->{id}} = $channel; 2976 $self->{channel}{$channel->{id}} = $channel;
2840 $self->ext_msg (channel_info => $channel) 2977 $self->ext_msg (channel_info => $channel);
2841 if $self->can_msg;
2842 } 2978 }
2843 2979
2844 $channel = $channel->{id}; 2980 $channel = $channel->{id};
2845 } 2981 }
2846 2982
2847 return unless @extra || length $msg; 2983 return unless @extra || length $msg;
2848 2984
2849 if ($self->can_msg) {
2850 # default colour, mask it out 2985 # default colour, mask it out
2851 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2986 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2852 if $color & cf::NDI_DEF; 2987 if $color & cf::NDI_DEF;
2853 2988
2854 my $pkt = "msg " 2989 my $pkt = "msg "
2855 . $self->{json_coder}->encode ( 2990 . $self->{json_coder}->encode (
2856 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2991 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2857 ); 2992 );
2858 2993
2859 # try lzf for large packets
2860 $pkt = "lzf " . Compress::LZF::compress $pkt
2861 if 1024 <= length $pkt and $self->{can_lzf};
2862
2863 # split very large packets
2864 if (8192 < length $pkt and $self->{can_lzf}) {
2865 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2866 $pkt = "frag";
2867 }
2868
2869 $self->send_packet ($pkt); 2994 $self->send_big_packet ($pkt);
2870 } else {
2871 if ($color >= 0) {
2872 # replace some tags by gcfclient-compatible ones
2873 for ($msg) {
2874 1 while
2875 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2876 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2877 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2878 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2879 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2880 }
2881
2882 $color &= cf::NDI_COLOR_MASK;
2883
2884 utf8::encode $msg;
2885
2886 if (0 && $msg =~ /\[/) {
2887 # COMMAND/INFO
2888 $self->send_packet ("drawextinfo $color 10 8 $msg")
2889 } else {
2890 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2891 $self->send_packet ("drawinfo $color $msg")
2892 }
2893 }
2894 }
2895} 2995}
2896 2996
2897=item $client->ext_msg ($type, @msg) 2997=item $client->ext_msg ($type, @msg)
2898 2998
2899Sends an ext event to the client. 2999Sends an ext event to the client.
… …
2902 3002
2903sub cf::client::ext_msg($$@) { 3003sub cf::client::ext_msg($$@) {
2904 my ($self, $type, @msg) = @_; 3004 my ($self, $type, @msg) = @_;
2905 3005
2906 if ($self->extcmd == 2) { 3006 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3007 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2908 } elsif ($self->extcmd == 1) { # TODO: remove 3008 } elsif ($self->extcmd == 1) { # TODO: remove
2909 push @msg, msgtype => "event_$type"; 3009 push @msg, msgtype => "event_$type";
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3010 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 } 3011 }
2912} 3012}
2913 3013
2914=item $client->ext_reply ($msgid, @msg) 3014=item $client->ext_reply ($msgid, @msg)
2915 3015
… …
2919 3019
2920sub cf::client::ext_reply($$@) { 3020sub cf::client::ext_reply($$@) {
2921 my ($self, $id, @msg) = @_; 3021 my ($self, $id, @msg) = @_;
2922 3022
2923 if ($self->extcmd == 2) { 3023 if ($self->extcmd == 2) {
2924 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3024 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2925 } elsif ($self->extcmd == 1) { 3025 } elsif ($self->extcmd == 1) {
2926 #TODO: version 1, remove 3026 #TODO: version 1, remove
2927 unshift @msg, msgtype => "reply", msgid => $id; 3027 unshift @msg, msgtype => "reply", msgid => $id;
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3028 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2929 } 3029 }
2930} 3030}
2931 3031
2932=item $success = $client->query ($flags, "text", \&cb) 3032=item $success = $client->query ($flags, "text", \&cb)
2933 3033
… …
3034 3134
3035 $coro 3135 $coro
3036} 3136}
3037 3137
3038cf::client->attach ( 3138cf::client->attach (
3039 on_destroy => sub { 3139 on_client_destroy => sub {
3040 my ($ns) = @_; 3140 my ($ns) = @_;
3041 3141
3042 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3142 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3043 }, 3143 },
3044); 3144);
… …
3060our $safe_hole = new Safe::Hole; 3160our $safe_hole = new Safe::Hole;
3061 3161
3062$SIG{FPE} = 'IGNORE'; 3162$SIG{FPE} = 'IGNORE';
3063 3163
3064$safe->permit_only (Opcode::opset qw( 3164$safe->permit_only (Opcode::opset qw(
3065 :base_core :base_mem :base_orig :base_math 3165 :base_core :base_mem :base_orig :base_math :base_loop
3066 grepstart grepwhile mapstart mapwhile 3166 grepstart grepwhile mapstart mapwhile
3067 sort time 3167 sort time
3068)); 3168));
3069 3169
3070# here we export the classes and methods available to script code 3170# here we export the classes and methods available to script code
… …
3074The following functions and methods are available within a safe environment: 3174The following functions and methods are available within a safe environment:
3075 3175
3076 cf::object 3176 cf::object
3077 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
3078 insert remove name archname title slaying race decrease split 3178 insert remove name archname title slaying race decrease split
3179 value
3079 3180
3080 cf::object::player 3181 cf::object::player
3081 player 3182 player
3082 3183
3083 cf::player 3184 cf::player
… …
3089=cut 3190=cut
3090 3191
3091for ( 3192for (
3092 ["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
3093 insert remove inv nrof name archname title slaying race 3194 insert remove inv nrof name archname title slaying race
3094 decrease split destroy change_exp)], 3195 decrease split destroy change_exp value msg lore send_msg)],
3095 ["cf::object::player" => qw(player)], 3196 ["cf::object::player" => qw(player)],
3096 ["cf::player" => qw(peaceful)], 3197 ["cf::player" => qw(peaceful send_msg)],
3097 ["cf::map" => qw(trigger)], 3198 ["cf::map" => qw(trigger)],
3098) { 3199) {
3099 no strict 'refs'; 3200 no strict 'refs';
3100 my ($pkg, @funs) = @$_; 3201 my ($pkg, @funs) = @$_;
3101 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3202 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3119 3220
3120 my $qcode = $code; 3221 my $qcode = $code;
3121 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3222 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3122 $qcode =~ s/\n/\\n/g; 3223 $qcode =~ s/\n/\\n/g;
3123 3224
3225 %vars = (_dummy => 0) unless %vars;
3226
3227 my @res;
3124 local $_; 3228 local $_;
3125 local @safe::cf::_safe_eval_args = values %vars;
3126 3229
3127 my $eval = 3230 my $eval =
3128 "do {\n" 3231 "do {\n"
3129 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3232 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3130 . "#line 0 \"{$qcode}\"\n" 3233 . "#line 0 \"{$qcode}\"\n"
3131 . $code 3234 . $code
3132 . "\n}" 3235 . "\n}"
3133 ; 3236 ;
3134 3237
3238 if ($CFG{safe_eval}) {
3135 sub_generation_inc; 3239 sub_generation_inc;
3240 local @safe::cf::_safe_eval_args = values %vars;
3136 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3241 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3137 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 }
3138 3247
3139 if ($@) { 3248 if ($@) {
3140 warn "$@"; 3249 warn "$@";
3141 warn "while executing safe code '$code'\n"; 3250 warn "while executing safe code '$code'\n";
3142 warn "with arguments " . (join " ", %vars) . "\n"; 3251 warn "with arguments " . (join " ", %vars) . "\n";
… …
3161=cut 3270=cut
3162 3271
3163sub register_script_function { 3272sub register_script_function {
3164 my ($fun, $cb) = @_; 3273 my ($fun, $cb) = @_;
3165 3274
3166 no strict 'refs'; 3275 $fun = "safe::$fun" if $CFG{safe_eval};
3167 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3276 *$fun = $safe_hole->wrap ($cb);
3168} 3277}
3169 3278
3170=back 3279=back
3171 3280
3172=cut 3281=cut
… …
3193 3302
3194 $facedata->{version} == 2 3303 $facedata->{version} == 2
3195 or cf::cleanup "$path: version mismatch, cannot proceed."; 3304 or cf::cleanup "$path: version mismatch, cannot proceed.";
3196 3305
3197 # 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]);
3198 $facedata->{resource}{"res/exp_table"} = { 3308 $facedata->{resource}{"res/exp_table"} = {
3199 type => FT_RSRC, 3309 type => FT_RSRC,
3200 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),
3201 }; 3312 };
3202 cf::cede_to_tick; 3313 cf::cede_to_tick;
3203 3314
3204 { 3315 {
3205 my $faces = $facedata->{faceinfo}; 3316 my $faces = $facedata->{faceinfo};
… …
3207 while (my ($face, $info) = each %$faces) { 3318 while (my ($face, $info) = each %$faces) {
3208 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3319 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3209 3320
3210 cf::face::set_visibility $idx, $info->{visibility}; 3321 cf::face::set_visibility $idx, $info->{visibility};
3211 cf::face::set_magicmap $idx, $info->{magicmap}; 3322 cf::face::set_magicmap $idx, $info->{magicmap};
3212 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3323 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3213 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3324 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3214 3325
3215 cf::cede_to_tick; 3326 cf::cede_to_tick;
3216 } 3327 }
3217 3328
3218 while (my ($face, $info) = each %$faces) { 3329 while (my ($face, $info) = each %$faces) {
… …
3242 3353
3243 cf::anim::invalidate_all; # d'oh 3354 cf::anim::invalidate_all; # d'oh
3244 } 3355 }
3245 3356
3246 { 3357 {
3247 # TODO: for gcfclient pleasure, we should give resources
3248 # that gcfclient doesn't grok a >10000 face index.
3249 my $res = $facedata->{resource}; 3358 my $res = $facedata->{resource};
3250 3359
3251 while (my ($name, $info) = each %$res) { 3360 while (my ($name, $info) = each %$res) {
3252 if (defined $info->{type}) { 3361 if (defined $info->{type}) {
3253 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3362 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3254 my $data;
3255 3363
3256 if ($info->{type} & 1) { 3364 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3257 # prepend meta info
3258
3259 my $meta = $enc->encode ({
3260 name => $name,
3261 %{ $info->{meta} || {} },
3262 });
3263
3264 $data = pack "(w/a*)*", $meta, $info->{data};
3265 } else {
3266 $data = $info->{data};
3267 }
3268
3269 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3270 cf::face::set_type $idx, $info->{type}; 3365 cf::face::set_type $idx, $info->{type};
3271 } else { 3366 } else {
3272 $RESOURCE{$name} = $info; 3367 $RESOURCE{$name} = $info;
3273 } 3368 }
3274 3369
… …
3358 3453
3359 warn "finished reloading resource files\n"; 3454 warn "finished reloading resource files\n";
3360} 3455}
3361 3456
3362sub reload_config { 3457sub reload_config {
3458 warn "reloading config file...\n";
3459
3363 open my $fh, "<:utf8", "$CONFDIR/config" 3460 open my $fh, "<:utf8", "$CONFDIR/config"
3364 or return; 3461 or return;
3365 3462
3366 local $/; 3463 local $/;
3367 *CFG = YAML::Load <$fh>; 3464 *CFG = YAML::XS::Load scalar <$fh>;
3368 3465
3369 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3466 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3370 3467
3371 $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};
3372 $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};
… …
3376 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3473 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3377 and die "WARNING: m(un)lockall failed: $!\n"; 3474 and die "WARNING: m(un)lockall failed: $!\n";
3378 }; 3475 };
3379 warn $@ if $@; 3476 warn $@ if $@;
3380 } 3477 }
3478
3479 warn "finished reloading resource files\n";
3381} 3480}
3382 3481
3383sub pidfile() { 3482sub pidfile() {
3384 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3483 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3385 or die "$PIDFILE: $!"; 3484 or die "$PIDFILE: $!";
… …
3397 3496
3398 seek $fh, 0, 0; 3497 seek $fh, 0, 0;
3399 print $fh $$; 3498 print $fh $$;
3400} 3499}
3401 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;
3508}
3509
3402sub main { 3510sub main {
3403 cf::init_globals; # initialise logging 3511 cf::init_globals; # initialise logging
3404 3512
3405 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3513 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3406 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3514 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
… …
3409 3517
3410 cf::init_experience; 3518 cf::init_experience;
3411 cf::init_anim; 3519 cf::init_anim;
3412 cf::init_attackmess; 3520 cf::init_attackmess;
3413 cf::init_dynamic; 3521 cf::init_dynamic;
3414 cf::init_block;
3415 3522
3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3523 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3417 3524
3418 # we must not ever block the main coroutine 3525 # we must not ever block the main coroutine
3419 local $Coro::idle = sub { 3526 local $Coro::idle = sub {
… …
3425 }; 3532 };
3426 3533
3427 evthread_start IO::AIO::poll_fileno; 3534 evthread_start IO::AIO::poll_fileno;
3428 3535
3429 cf::sync_job { 3536 cf::sync_job {
3537 cf::load_settings;
3538 cf::load_materials;
3539
3430 reload_resources; 3540 reload_resources;
3431 reload_config; 3541 reload_config;
3432 db_init; 3542 db_init;
3433 3543
3434 cf::load_settings;
3435 cf::load_materials;
3436 cf::init_uuid; 3544 cf::init_uuid;
3437 cf::init_signals; 3545 cf::init_signals;
3438 cf::init_commands;
3439 cf::init_skills; 3546 cf::init_skills;
3440 3547
3441 cf::init_beforeplay; 3548 cf::init_beforeplay;
3442 3549
3443 atomic; 3550 atomic;
… …
3445 load_extensions; 3552 load_extensions;
3446 3553
3447 utime time, time, $RUNTIMEFILE; 3554 utime time, time, $RUNTIMEFILE;
3448 3555
3449 # no (long-running) fork's whatsoever before this point(!) 3556 # no (long-running) fork's whatsoever before this point(!)
3557 use POSIX ();
3450 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3558 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3451 3559
3452 (pop @POST_INIT)->(0) while @POST_INIT; 3560 (pop @POST_INIT)->(0) while @POST_INIT;
3453 }; 3561 };
3454 3562
3455 EV::loop; 3563 main_loop;
3456} 3564}
3457 3565
3458############################################################################# 3566#############################################################################
3459# initialisation and cleanup 3567# initialisation and cleanup
3460 3568
… …
3467 }; 3575 };
3468 } 3576 }
3469} 3577}
3470 3578
3471sub write_runtime_sync { 3579sub write_runtime_sync {
3580 my $t0 = EV::time;
3581
3472 # first touch the runtime file to show we are still running: 3582 # first touch the runtime file to show we are still running:
3473 # the fsync below can take a very very long time. 3583 # the fsync below can take a very very long time.
3474 3584
3475 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3585 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3476 3586
3477 my $guard = cf::lock_acquire "write_runtime"; 3587 my $guard = cf::lock_acquire "write_runtime";
3478 3588
3479 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3589 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3480 or return; 3590 or return;
3481 3591
3482 my $value = $cf::RUNTIME + 90 + 10; 3592 my $value = $cf::RUNTIME + 90 + 10;
3483 # 10 is the runtime save interval, for a monotonic clock 3593 # 10 is the runtime save interval, for a monotonic clock
3484 # 60 allows for the watchdog to kill the server. 3594 # 60 allows for the watchdog to kill the server.
… …
3497 or return; 3607 or return;
3498 3608
3499 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3609 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3500 and return; 3610 and return;
3501 3611
3502 warn "runtime file written.\n"; 3612 warn sprintf "runtime file written (%gs).\n", EV::time - $t0;
3503 3613
3504 1 3614 1
3505} 3615}
3506 3616
3507our $uuid_lock; 3617our $uuid_lock;
… …
3555} 3665}
3556 3666
3557sub emergency_save() { 3667sub emergency_save() {
3558 my $freeze_guard = cf::freeze_mainloop; 3668 my $freeze_guard = cf::freeze_mainloop;
3559 3669
3560 warn "enter emergency perl save\n"; 3670 warn "emergency_perl_save: enter\n";
3561 3671
3562 cf::sync_job { 3672 cf::sync_job {
3673 # this is a trade-off: we want to be very quick here, so
3674 # save all maps without fsync, and later call a global sync
3675 # (which in turn might be very very slow)
3676 local $USE_FSYNC = 0;
3677
3563 # use a peculiar iteration method to avoid tripping on perl 3678 # use a peculiar iteration method to avoid tripping on perl
3564 # refcount bugs in for. also avoids problems with players 3679 # refcount bugs in for. also avoids problems with players
3565 # and maps saved/destroyed asynchronously. 3680 # and maps saved/destroyed asynchronously.
3566 warn "begin emergency player save\n"; 3681 warn "emergency_perl_save: begin player save\n";
3567 for my $login (keys %cf::PLAYER) { 3682 for my $login (keys %cf::PLAYER) {
3568 my $pl = $cf::PLAYER{$login} or next; 3683 my $pl = $cf::PLAYER{$login} or next;
3569 $pl->valid or next; 3684 $pl->valid or next;
3570 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3685 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3571 $pl->save; 3686 $pl->save;
3572 } 3687 }
3573 warn "end emergency player save\n"; 3688 warn "emergency_perl_save: end player save\n";
3574 3689
3575 warn "begin emergency map save\n"; 3690 warn "emergency_perl_save: begin map save\n";
3576 for my $path (keys %cf::MAP) { 3691 for my $path (keys %cf::MAP) {
3577 my $map = $cf::MAP{$path} or next; 3692 my $map = $cf::MAP{$path} or next;
3578 $map->valid or next; 3693 $map->valid or next;
3579 $map->save; 3694 $map->save;
3580 } 3695 }
3581 warn "end emergency map save\n"; 3696 warn "emergency_perl_save: end map save\n";
3582 3697
3583 warn "begin emergency database checkpoint\n"; 3698 warn "emergency_perl_save: begin database checkpoint\n";
3584 BDB::db_env_txn_checkpoint $DB_ENV; 3699 BDB::db_env_txn_checkpoint $DB_ENV;
3585 warn "end emergency database checkpoint\n"; 3700 warn "emergency_perl_save: end database checkpoint\n";
3586 3701
3587 warn "begin write uuid\n"; 3702 warn "emergency_perl_save: begin write uuid\n";
3588 write_uuid_sync 1; 3703 write_uuid_sync 1;
3589 warn "end write uuid\n"; 3704 warn "emergency_perl_save: end write uuid\n";
3590 }; 3705 };
3591 3706
3707 warn "emergency_perl_save: starting sync()\n";
3708 IO::AIO::aio_sync sub {
3709 warn "emergency_perl_save: finished sync()\n";
3710 };
3711
3592 warn "leave emergency perl save\n"; 3712 warn "emergency_perl_save: leave\n";
3593} 3713}
3594 3714
3595sub post_cleanup { 3715sub post_cleanup {
3596 my ($make_core) = @_; 3716 my ($make_core) = @_;
3597 3717
… …
3634 warn "can only reload from main coroutine"; 3754 warn "can only reload from main coroutine";
3635 return; 3755 return;
3636 } 3756 }
3637 3757
3638 return if $RELOAD++; 3758 return if $RELOAD++;
3759
3760 my $t1 = EV::time;
3639 3761
3640 while ($RELOAD) { 3762 while ($RELOAD) {
3641 warn "reloading..."; 3763 warn "reloading...";
3642 3764
3643 warn "entering sync_job"; 3765 warn "entering sync_job";
… …
3704 clear_package "safe::$_" 3826 clear_package "safe::$_"
3705 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3827 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3706 3828
3707 warn "unloading cf.pm \"a bit\""; 3829 warn "unloading cf.pm \"a bit\"";
3708 delete $INC{"cf.pm"}; 3830 delete $INC{"cf.pm"};
3709 delete $INC{"cf/pod.pm"}; 3831 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3710 3832
3711 # don't, removes xs symbols, too, 3833 # don't, removes xs symbols, too,
3712 # and global variables created in xs 3834 # and global variables created in xs
3713 #clear_package __PACKAGE__; 3835 #clear_package __PACKAGE__;
3714 3836
3715 warn "unload completed, starting to reload now"; 3837 warn "unload completed, starting to reload now";
3716 3838
3717 warn "reloading cf.pm"; 3839 warn "reloading cf.pm";
3718 require cf; 3840 require cf;
3719 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3841 cf::_connect_to_perl_1;
3720 3842
3721 warn "loading config and database again"; 3843 warn "loading config and database again";
3722 cf::reload_config; 3844 cf::reload_config;
3723 3845
3724 warn "loading extensions"; 3846 warn "loading extensions";
3725 cf::load_extensions; 3847 cf::load_extensions;
3726 3848
3849 if ($REATTACH_ON_RELOAD) {
3727 warn "reattaching attachments to objects/players"; 3850 warn "reattaching attachments to objects/players";
3728 _global_reattach; # objects, sockets 3851 _global_reattach; # objects, sockets
3729 warn "reattaching attachments to maps"; 3852 warn "reattaching attachments to maps";
3730 reattach $_ for values %MAP; 3853 reattach $_ for values %MAP;
3731 warn "reattaching attachments to players"; 3854 warn "reattaching attachments to players";
3732 reattach $_ for values %PLAYER; 3855 reattach $_ for values %PLAYER;
3856 }
3733 3857
3734 warn "running post_load"; 3858 warn "running post_init jobs";
3735 (pop @POST_INIT)->(1) while @POST_INIT; 3859 (pop @POST_INIT)->(1) while @POST_INIT;
3736 3860
3737 warn "leaving sync_job"; 3861 warn "leaving sync_job";
3738 3862
3739 1 3863 1
… …
3743 }; 3867 };
3744 3868
3745 warn "reloaded"; 3869 warn "reloaded";
3746 --$RELOAD; 3870 --$RELOAD;
3747 } 3871 }
3872
3873 $t1 = EV::time - $t1;
3874 warn "reload completed in ${t1}s\n";
3748}; 3875};
3749 3876
3750our $RELOAD_WATCHER; # used only during reload 3877our $RELOAD_WATCHER; # used only during reload
3751 3878
3752sub reload_perl() { 3879sub reload_perl() {
3753 # doing reload synchronously and two reloads happen back-to-back, 3880 # doing reload synchronously and two reloads happen back-to-back,
3754 # coro crashes during coro_state_free->destroy here. 3881 # coro crashes during coro_state_free->destroy here.
3755 3882
3883 $RELOAD_WATCHER ||= cf::async {
3884 Coro::AIO::aio_wait cache_extensions;
3885
3756 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 3886 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3757 do_reload_perl; 3887 do_reload_perl;
3758 undef $RELOAD_WATCHER; 3888 undef $RELOAD_WATCHER;
3889 };
3759 }; 3890 };
3760} 3891}
3761 3892
3762register_command "reload" => sub { 3893register_command "reload" => sub {
3763 my ($who, $arg) = @_; 3894 my ($who, $arg) = @_;
… …
3777 3908
3778our @WAIT_FOR_TICK; 3909our @WAIT_FOR_TICK;
3779our @WAIT_FOR_TICK_BEGIN; 3910our @WAIT_FOR_TICK_BEGIN;
3780 3911
3781sub wait_for_tick { 3912sub wait_for_tick {
3782 return if tick_inhibit || $Coro::current == $Coro::main; 3913 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3783 3914
3784 my $signal = new Coro::Signal; 3915 my $signal = new Coro::Signal;
3785 push @WAIT_FOR_TICK, $signal; 3916 push @WAIT_FOR_TICK, $signal;
3786 $signal->wait; 3917 $signal->wait;
3787} 3918}
3788 3919
3789sub wait_for_tick_begin { 3920sub wait_for_tick_begin {
3790 return if tick_inhibit || $Coro::current == $Coro::main; 3921 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3791 3922
3792 my $signal = new Coro::Signal; 3923 my $signal = new Coro::Signal;
3793 push @WAIT_FOR_TICK_BEGIN, $signal; 3924 push @WAIT_FOR_TICK_BEGIN, $signal;
3794 $signal->wait; 3925 $signal->wait;
3795} 3926}
… …
3800 unless ++$bug_warning > 10; 3931 unless ++$bug_warning > 10;
3801 return; 3932 return;
3802 } 3933 }
3803 3934
3804 cf::server_tick; # one server iteration 3935 cf::server_tick; # one server iteration
3936
3937 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
3805 3938
3806 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3939 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3807 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3940 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3808 Coro::async_pool { 3941 Coro::async_pool {
3809 $Coro::current->{desc} = "runtime saver"; 3942 $Coro::current->{desc} = "runtime saver";
… …
3832} 3965}
3833 3966
3834{ 3967{
3835 # configure BDB 3968 # configure BDB
3836 3969
3837 BDB::min_parallel 8; 3970 BDB::min_parallel 16;
3838 BDB::max_poll_reqs $TICK * 0.1; 3971 BDB::max_poll_reqs $TICK * 0.1;
3839 $AnyEvent::BDB::WATCHER->priority (1); 3972 $AnyEvent::BDB::WATCHER->priority (1);
3840 3973
3841 unless ($DB_ENV) { 3974 unless ($DB_ENV) {
3842 $DB_ENV = BDB::db_env_create; 3975 $DB_ENV = BDB::db_env_create;
… …
3922 LOG llevInfo, "[ABT] [suppressed]\n"; 4055 LOG llevInfo, "[ABT] [suppressed]\n";
3923 } 4056 }
3924} 4057}
3925 4058
3926# load additional modules 4059# load additional modules
3927use cf::pod; 4060require "cf/$_.pm" for @EXTRA_MODULES;
4061cf::_connect_to_perl_2;
3928 4062
3929END { cf::emergency_save } 4063END { cf::emergency_save }
3930 4064
39311 40651
3932 4066

Diff Legend

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