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.457 by root, Wed Oct 1 05:50:19 2008 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
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;
… …
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;
134 144
135our $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 :)
136 147
137binmode STDOUT; 148binmode STDOUT;
138binmode STDERR; 149binmode STDERR;
139 150
140# read virtual server time, if available 151# read virtual server time, if available
… …
142 open my $fh, "<", $RUNTIMEFILE 153 open my $fh, "<", $RUNTIMEFILE
143 or die "unable to read $RUNTIMEFILE file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
144 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
145} 156}
146 157
158eval "sub TICK() { $TICK } 1" or die;
159
147mkdir $_ 160mkdir $_
148 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
149 162
150our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
151 164
152sub 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::"} };
153 177
154############################################################################# 178#############################################################################
155 179
156=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
157 181
… …
204returns 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
205per 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.
206 230
207=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
208 232
209This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
210C<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
211that call. 235that call.
212 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
213=back 243=back
214 244
215=cut 245=cut
216 246
217BEGIN { 247$Coro::State::WARNHOOK = sub {
218 *CORE::GLOBAL::warn = sub {
219 my $msg = join "", @_; 248 my $msg = join "", @_;
220 249
221 $msg .= "\n" 250 $msg .= "\n"
222 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
223 252
224 $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;
225 254
226 LOG llevError, $msg; 255 LOG llevError, $msg;
227 }; 256};
228}
229 257
230$Coro::State::DIEHOOK = sub { 258$Coro::State::DIEHOOK = sub {
231 return unless $^S eq 0; # "eq", not "==" 259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
232 262
233 if ($Coro::current == $Coro::main) {#d# 263 if ($Coro::current == $Coro::main) {#d#
234 warn "DIEHOOK called in main context, Coro bug?\n";#d# 264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
235 return;#d# 265 return;#d#
236 }#d# 266 }#d#
237 267
238 # kill coroutine otherwise 268 # kill coroutine otherwise
239 warn Carp::longmess $_[0];
240 Coro::terminate 269 Coro::terminate
241}; 270};
242
243$SIG{__DIE__} = sub { }; #d#?
244 271
245@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
246@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
247@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
248@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
262)) { 289)) {
263 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
264} 291}
265 292
266$EV::DIED = sub { 293$EV::DIED = sub {
267 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
268}; 295};
269 296
270############################################################################# 297#############################################################################
271 298
272=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
… …
330Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
331 358
332=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
333 360
334Wait 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
335a 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,
336for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
337returned. 364returned.
338 365
339Locks 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
340deadlocked coro. 367deadlocked coro.
… …
346 373
347Return 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.
348 375
349=cut 376=cut
350 377
351our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
352our %LOCKER;#d#
353 379
354sub lock_wait($) { 380sub lock_wait($) {
355 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
356
357 if ($LOCKER{$key} == $Coro::current) {#d#
358 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
359 return;#d#
360 }#d#
361
362 # wait for lock, if any
363 while ($LOCK{$key}) {
364 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
365 push @{ $LOCK{$key} }, $Coro::current;
366 Coro::schedule;
367 }
368} 382}
369 383
370sub lock_acquire($) { 384sub lock_acquire($) {
371 my ($key) = @_; 385 $LOCKS->guard ($_[0])
372
373 # wait, to be sure we are not locked
374 lock_wait $key;
375
376 $LOCK{$key} = [];
377 $LOCKER{$key} = $Coro::current;#d#
378
379 Coro::guard {
380 delete $LOCKER{$key};#d#
381 # wake up all waiters, to be on the safe side
382 $_->ready for @{ delete $LOCK{$key} };
383 }
384} 386}
385 387
386sub lock_active($) { 388sub lock_active($) {
387 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
388
389 ! ! $LOCK{$key}
390} 390}
391 391
392sub freeze_mainloop { 392sub freeze_mainloop {
393 tick_inhibit_inc; 393 tick_inhibit_inc;
394 394
395 Coro::guard \&tick_inhibit_dec; 395 &Guard::guard (\&tick_inhibit_dec);
396} 396}
397 397
398=item cf::periodic $interval, $cb 398=item cf::periodic $interval, $cb
399 399
400Like 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
… …
423 423
424=cut 424=cut
425 425
426our @SLOT_QUEUE; 426our @SLOT_QUEUE;
427our $SLOT_QUEUE; 427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
428 429
429$SLOT_QUEUE->cancel if $SLOT_QUEUE; 430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
430$SLOT_QUEUE = Coro::async { 431$SLOT_QUEUE = Coro::async {
431 $Coro::current->desc ("timeslot manager"); 432 $Coro::current->desc ("timeslot manager");
432 433
433 my $signal = new Coro::Signal; 434 my $signal = new Coro::Signal;
435 my $busy;
434 436
435 while () { 437 while () {
436 next_job: 438 next_job:
439
437 my $avail = cf::till_tick; 440 my $avail = cf::till_tick;
438 if ($avail > 0.01) { 441
439 for (0 .. $#SLOT_QUEUE) { 442 for (0 .. $#SLOT_QUEUE) {
440 if ($SLOT_QUEUE[$_][0] < $avail) { 443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
441 my $job = splice @SLOT_QUEUE, $_, 1, (); 445 my $job = splice @SLOT_QUEUE, $_, 1, ();
442 $job->[2]->send; 446 $job->[2]->send;
443 Coro::cede; 447 Coro::cede;
444 goto next_job; 448 goto next_job;
445 } 449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
446 } 451 }
447 } 452 }
448 453
449 if (@SLOT_QUEUE) { 454 if (@SLOT_QUEUE) {
450 # 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
451 push @cf::WAIT_FOR_TICK, $signal; 456 push @cf::WAIT_FOR_TICK, $signal;
452 $signal->wait; 457 $signal->wait;
453 } else { 458 } else {
459 $busy = 0;
454 Coro::schedule; 460 Coro::schedule;
455 } 461 }
456 } 462 }
457}; 463};
458 464
459sub get_slot($;$$) { 465sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main; 466 return if tick_inhibit || $Coro::current == $Coro::main;
461 467
462 my ($time, $pri, $name) = @_; 468 my ($time, $pri, $name) = @_;
463 469
464 $time = $TICK * .6 if $time > $TICK * .6; 470 $time = clamp $time, 0.01, $TICK * .6;
471
465 my $sig = new Coro::Signal; 472 my $sig = new Coro::Signal;
466 473
467 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
468 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
469 $SLOT_QUEUE->ready; 476 $SLOT_QUEUE->ready;
… …
1172 $decname, length $$rdata, scalar @$objs; 1179 $decname, length $$rdata, scalar @$objs;
1173 1180
1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1175 aio_chmod $fh, SAVE_MODE; 1182 aio_chmod $fh, SAVE_MODE;
1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1177 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 }
1178 aio_close $fh; 1188 aio_close $fh;
1179 1189
1180 if (@$objs) { 1190 if (@$objs) {
1181 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) {
1182 aio_chmod $fh, SAVE_MODE; 1192 aio_chmod $fh, SAVE_MODE;
1183 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1193 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1184 aio_write $fh, 0, (length $data), $data, 0; 1194 aio_write $fh, 0, (length $data), $data, 0;
1185 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 }
1186 aio_close $fh; 1199 aio_close $fh;
1187 aio_rename "$filename.pst~", "$filename.pst"; 1200 aio_rename "$filename.pst~", "$filename.pst";
1188 } 1201 }
1189 } else { 1202 } else {
1190 aio_unlink "$filename.pst"; 1203 aio_unlink "$filename.pst";
… …
1193 aio_rename "$filename~", $filename; 1206 aio_rename "$filename~", $filename;
1194 1207
1195 $filename =~ s%/[^/]+$%%; 1208 $filename =~ s%/[^/]+$%%;
1196 aio_pathsync $filename if $cf::USE_FSYNC; 1209 aio_pathsync $filename if $cf::USE_FSYNC;
1197 } else { 1210 } else {
1198 warn "FATAL: $filename~: $!\n"; 1211 warn "unable to save objects: $filename~: $!\n";
1199 } 1212 }
1200 } else { 1213 } else {
1201 aio_unlink $filename; 1214 aio_unlink $filename;
1202 aio_unlink "$filename.pst"; 1215 aio_unlink "$filename.pst";
1203 } 1216 }
… …
1341 1354
1342# "readahead" all extensions 1355# "readahead" all extensions
1343sub cache_extensions { 1356sub cache_extensions {
1344 my $grp = IO::AIO::aio_group; 1357 my $grp = IO::AIO::aio_group;
1345 1358
1346 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1359 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1347 for (grep /\.ext$/, @{$_[0]}) { 1360 for (grep /\.ext$/, @{$_[0]}) {
1348 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1361 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1349 } 1362 }
1350 }; 1363 };
1351 1364
… …
1386 . "\n};\n1"; 1399 . "\n};\n1";
1387 1400
1388 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
1389 } 1402 }
1390 1403
1404 my $pass = 0;
1391 my %done; 1405 my %done;
1392 while (%todo) { 1406 while (%todo) {
1393 my $progress; 1407 my $progress;
1394 1408
1409 ++$pass;
1410
1411 ext:
1395 while (my ($k, $v) = each %todo) { 1412 while (my ($k, $v) = each %todo) {
1396 for (split /,\s*/, $v->{meta}{depends}) { 1413 for (split /,\s*/, $v->{meta}{depends}) {
1397 goto skip 1414 next ext
1398 unless exists $done{$_}; 1415 unless exists $done{$_};
1399 } 1416 }
1400 1417
1401 warn "... loading '$k' into '$v->{pkg}'\n"; 1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1402 1419
1403 unless (eval $v->{source}) { 1420 my $active = eval $v->{source};
1421
1422 if (length $@) {
1404 my $msg = $@ ? "$v->{path}: $@\n" 1423 warn "$v->{path}: $@\n";
1405 : "$v->{base}: extension inactive.\n";
1406 1424
1407 if (exists $v->{meta}{mandatory}) {
1408 warn $msg;
1409 cf::cleanup "mandatory extension failed to load, exiting."; 1425 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1410 } 1426 if exists $v->{meta}{mandatory};
1411 1427 } else {
1412 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;
1413 } 1434 }
1414
1415 $done{$k} = delete $todo{$k};
1416 push @EXTS, $v->{pkg};
1417 $progress = 1;
1418 } 1435 }
1419 1436
1420 skip: 1437 unless ($progress) {
1421 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1438 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1422 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 }
1423 } 1445 }
1424 }; 1446 };
1425} 1447}
1426 1448
1427############################################################################# 1449#############################################################################
… …
1887 1909
1888 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1910 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1889 "$UNIQUEDIR/$path" 1911 "$UNIQUEDIR/$path"
1890} 1912}
1891 1913
1892# and all this just because we cannot iterate over
1893# all maps in C++...
1894sub change_all_map_light {
1895 my ($change) = @_;
1896
1897 $_->change_map_light ($change)
1898 for grep $_->outdoor, values %cf::MAP;
1899}
1900
1901sub decay_objects { 1914sub decay_objects {
1902 my ($self) = @_; 1915 my ($self) = @_;
1903 1916
1904 return if $self->{deny_reset}; 1917 return if $self->{deny_reset};
1905 1918
… …
1987sub find { 2000sub find {
1988 my ($path, $origin) = @_; 2001 my ($path, $origin) = @_;
1989 2002
1990 $path = normalise $path, $origin && $origin->path; 2003 $path = normalise $path, $origin && $origin->path;
1991 2004
1992 cf::lock_wait "map_data:$path";#d#remove 2005 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1993 cf::lock_wait "map_find:$path"; 2006 my $guard2 = cf::lock_acquire "map_find:$path";
1994 2007
1995 $cf::MAP{$path} || do { 2008 $cf::MAP{$path} || do {
1996 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1997 my $guard2 = cf::lock_acquire "map_find:$path";
1998
1999 my $map = new_from_path cf::map $path 2009 my $map = new_from_path cf::map $path
2000 or return; 2010 or return;
2001 2011
2002 $map->{last_save} = $cf::RUNTIME; 2012 $map->{last_save} = $cf::RUNTIME;
2003 2013
… …
2015 2025
2016 $cf::MAP{$path} = $map 2026 $cf::MAP{$path} = $map
2017 } 2027 }
2018} 2028}
2019 2029
2020sub pre_load { } 2030sub pre_load { }
2021sub post_load { } 2031#sub post_load { } # XS
2022 2032
2023sub load { 2033sub load {
2024 my ($self) = @_; 2034 my ($self) = @_;
2025 2035
2026 local $self->{deny_reset} = 1; # loading can take a long time 2036 local $self->{deny_reset} = 1; # loading can take a long time
… …
2071 unless ($self->{deny_activate}) { 2081 unless ($self->{deny_activate}) {
2072 $self->decay_objects; 2082 $self->decay_objects;
2073 $self->fix_auto_apply; 2083 $self->fix_auto_apply;
2074 $self->update_buttons; 2084 $self->update_buttons;
2075 cf::cede_to_tick; 2085 cf::cede_to_tick;
2076 $self->set_darkness_map;
2077 cf::cede_to_tick;
2078 $self->activate; 2086 $self->activate;
2079 } 2087 }
2080 2088
2081 $self->{last_save} = $cf::RUNTIME; 2089 $self->{last_save} = $cf::RUNTIME;
2082 $self->last_access ($cf::RUNTIME); 2090 $self->last_access ($cf::RUNTIME);
… …
2248 2256
2249 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2257 my $lock = cf::lock_acquire "map_data:$self->{path}";
2250 2258
2251 return if $self->players; 2259 return if $self->players;
2252 2260
2253 warn "resetting map ", $self->path; 2261 warn "resetting map ", $self->path, "\n";
2254 2262
2255 $self->in_memory (cf::MAP_SWAPPED); 2263 $self->in_memory (cf::MAP_SWAPPED);
2256 2264
2257 # need to save uniques path 2265 # need to save uniques path
2258 unless ($self->{deny_save}) { 2266 unless ($self->{deny_save}) {
… …
2349 : normalise $_ 2357 : normalise $_
2350 } @{ aio_readdir $UNIQUEDIR or [] } 2358 } @{ aio_readdir $UNIQUEDIR or [] }
2351 ] 2359 ]
2352} 2360}
2353 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
2354=back 2394=back
2355 2395
2356=head3 cf::object 2396=head3 cf::object
2357 2397
2358=cut 2398=cut
… …
2423 2463
2424our $SAY_CHANNEL = { 2464our $SAY_CHANNEL = {
2425 id => "say", 2465 id => "say",
2426 title => "Map", 2466 title => "Map",
2427 reply => "say ", 2467 reply => "say ",
2428 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.",
2429}; 2469};
2430 2470
2431our $CHAT_CHANNEL = { 2471our $CHAT_CHANNEL = {
2432 id => "chat", 2472 id => "chat",
2433 title => "Chat", 2473 title => "Chat",
… …
2553 ($x, $y) = (-1, -1) 2593 ($x, $y) = (-1, -1)
2554 unless (defined $x) && (defined $y); 2594 unless (defined $x) && (defined $y);
2555 2595
2556 # use -1 or undef as default coordinates, not 0, 0 2596 # use -1 or undef as default coordinates, not 0, 0
2557 ($x, $y) = ($map->enter_x, $map->enter_y) 2597 ($x, $y) = ($map->enter_x, $map->enter_y)
2558 if $x <=0 && $y <= 0; 2598 if $x <= 0 && $y <= 0;
2559 2599
2560 $map->load; 2600 $map->load;
2561 $map->load_neighbours; 2601 $map->load_neighbours;
2562 2602
2563 return unless $self->contr->active; 2603 return unless $self->contr->active;
2564 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2565 $self->activate_recursive;
2566 2604
2567 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2605 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2568 $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;
2569} 2610}
2570 2611
2571=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2612=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2572 2613
2573Moves 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
… …
2761 2802
2762 utf8::encode $text; 2803 utf8::encode $text;
2763 $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);
2764} 2805}
2765 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
2766=item $client->send_msg ($channel, $msg, $color, [extra...]) 2832=item $client->send_msg ($channel, $msg, $color, [extra...])
2767 2833
2768Send 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
2769client 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
2770the 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
… …
2772 2838
2773=cut 2839=cut
2774 2840
2775# non-persistent channels (usually the info channel) 2841# non-persistent channels (usually the info channel)
2776our %CHANNEL = ( 2842our %CHANNEL = (
2843 "c/motd" => {
2844 id => "infobox",
2845 title => "MOTD",
2846 reply => undef,
2847 tooltip => "The message of the day",
2848 },
2777 "c/identify" => { 2849 "c/identify" => {
2778 id => "infobox", 2850 id => "infobox",
2779 title => "Identify", 2851 title => "Identify",
2780 reply => undef, 2852 reply => undef,
2781 tooltip => "Items recently identified", 2853 tooltip => "Items recently identified",
… …
2783 "c/examine" => { 2855 "c/examine" => {
2784 id => "infobox", 2856 id => "infobox",
2785 title => "Examine", 2857 title => "Examine",
2786 reply => undef, 2858 reply => undef,
2787 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",
2788 }, 2866 },
2789 "c/book" => { 2867 "c/book" => {
2790 id => "infobox", 2868 id => "infobox",
2791 title => "Book", 2869 title => "Book",
2792 reply => undef, 2870 reply => undef,
… …
2808 id => "infobox", 2886 id => "infobox",
2809 title => "Body Parts", 2887 title => "Body Parts",
2810 reply => undef, 2888 reply => undef,
2811 tooltip => "Shows which body parts you posess and are available", 2889 tooltip => "Shows which body parts you posess and are available",
2812 }, 2890 },
2891 "c/statistics" => {
2892 id => "infobox",
2893 title => "Statistics",
2894 reply => undef,
2895 tooltip => "Shows your primary statistics",
2896 },
2813 "c/skills" => { 2897 "c/skills" => {
2814 id => "infobox", 2898 id => "infobox",
2815 title => "Skills", 2899 title => "Skills",
2816 reply => undef, 2900 reply => undef,
2817 tooltip => "Shows your experience per skill and item power", 2901 tooltip => "Shows your experience per skill and item power",
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 },
2909 "c/resistances" => {
2910 id => "infobox",
2911 title => "Resistances",
2912 reply => undef,
2913 tooltip => "Shows your resistances",
2914 },
2915 "c/pets" => {
2916 id => "infobox",
2917 title => "Pets",
2918 reply => undef,
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",
2818 }, 2926 },
2819 "c/uptime" => { 2927 "c/uptime" => {
2820 id => "infobox", 2928 id => "infobox",
2821 title => "Uptime", 2929 title => "Uptime",
2822 reply => undef, 2930 reply => undef,
… …
2832 id => "party", 2940 id => "party",
2833 title => "Party", 2941 title => "Party",
2834 reply => "gsay ", 2942 reply => "gsay ",
2835 tooltip => "Messages and chat related to your party", 2943 tooltip => "Messages and chat related to your party",
2836 }, 2944 },
2945 "c/death" => {
2946 id => "death",
2947 title => "Death",
2948 reply => undef,
2949 tooltip => "Reason for and more info about your most recent death",
2950 },
2951 "c/say" => $SAY_CHANNEL,
2952 "c/chat" => $CHAT_CHANNEL,
2837); 2953);
2838 2954
2839sub cf::client::send_msg { 2955sub cf::client::send_msg {
2840 my ($self, $channel, $msg, $color, @extra) = @_; 2956 my ($self, $channel, $msg, $color, @extra) = @_;
2841 2957
… …
2846 2962
2847 # check predefined channels, for the benefit of C 2963 # check predefined channels, for the benefit of C
2848 if ($CHANNEL{$channel}) { 2964 if ($CHANNEL{$channel}) {
2849 $channel = $CHANNEL{$channel}; 2965 $channel = $CHANNEL{$channel};
2850 2966
2851 $self->ext_msg (channel_info => $channel) 2967 $self->ext_msg (channel_info => $channel);
2852 if $self->can_msg;
2853
2854 $channel = $channel->{id}; 2968 $channel = $channel->{id};
2855 2969
2856 } elsif (ref $channel) { 2970 } elsif (ref $channel) {
2857 # send meta info to client, if not yet sent 2971 # send meta info to client, if not yet sent
2858 unless (exists $self->{channel}{$channel->{id}}) { 2972 unless (exists $self->{channel}{$channel->{id}}) {
2859 $self->{channel}{$channel->{id}} = $channel; 2973 $self->{channel}{$channel->{id}} = $channel;
2860 $self->ext_msg (channel_info => $channel) 2974 $self->ext_msg (channel_info => $channel);
2861 if $self->can_msg;
2862 } 2975 }
2863 2976
2864 $channel = $channel->{id}; 2977 $channel = $channel->{id};
2865 } 2978 }
2866 2979
2867 return unless @extra || length $msg; 2980 return unless @extra || length $msg;
2868 2981
2869 if ($self->can_msg) {
2870 # default colour, mask it out 2982 # default colour, mask it out
2871 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2983 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2872 if $color & cf::NDI_DEF; 2984 if $color & cf::NDI_DEF;
2873 2985
2874 my $pkt = "msg " 2986 my $pkt = "msg "
2875 . $self->{json_coder}->encode ( 2987 . $self->{json_coder}->encode (
2876 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2988 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2877 ); 2989 );
2878 2990
2879 # try lzf for large packets
2880 $pkt = "lzf " . Compress::LZF::compress $pkt
2881 if 1024 <= length $pkt and $self->{can_lzf};
2882
2883 # split very large packets
2884 if (8192 < length $pkt and $self->{can_lzf}) {
2885 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2886 $pkt = "frag";
2887 }
2888
2889 $self->send_packet ($pkt); 2991 $self->send_big_packet ($pkt);
2890 } else {
2891 if ($color >= 0) {
2892 # replace some tags by gcfclient-compatible ones
2893 for ($msg) {
2894 1 while
2895 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2896 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2897 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2898 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2899 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2900 }
2901
2902 $color &= cf::NDI_COLOR_MASK;
2903
2904 utf8::encode $msg;
2905
2906 if (0 && $msg =~ /\[/) {
2907 # COMMAND/INFO
2908 $self->send_packet ("drawextinfo $color 10 8 $msg")
2909 } else {
2910 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2911 $self->send_packet ("drawinfo $color $msg")
2912 }
2913 }
2914 }
2915} 2992}
2916 2993
2917=item $client->ext_msg ($type, @msg) 2994=item $client->ext_msg ($type, @msg)
2918 2995
2919Sends an ext event to the client. 2996Sends an ext event to the client.
… …
2922 2999
2923sub cf::client::ext_msg($$@) { 3000sub cf::client::ext_msg($$@) {
2924 my ($self, $type, @msg) = @_; 3001 my ($self, $type, @msg) = @_;
2925 3002
2926 if ($self->extcmd == 2) { 3003 if ($self->extcmd == 2) {
2927 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3004 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2928 } elsif ($self->extcmd == 1) { # TODO: remove 3005 } elsif ($self->extcmd == 1) { # TODO: remove
2929 push @msg, msgtype => "event_$type"; 3006 push @msg, msgtype => "event_$type";
2930 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3007 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2931 } 3008 }
2932} 3009}
2933 3010
2934=item $client->ext_reply ($msgid, @msg) 3011=item $client->ext_reply ($msgid, @msg)
2935 3012
… …
2939 3016
2940sub cf::client::ext_reply($$@) { 3017sub cf::client::ext_reply($$@) {
2941 my ($self, $id, @msg) = @_; 3018 my ($self, $id, @msg) = @_;
2942 3019
2943 if ($self->extcmd == 2) { 3020 if ($self->extcmd == 2) {
2944 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3021 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2945 } elsif ($self->extcmd == 1) { 3022 } elsif ($self->extcmd == 1) {
2946 #TODO: version 1, remove 3023 #TODO: version 1, remove
2947 unshift @msg, msgtype => "reply", msgid => $id; 3024 unshift @msg, msgtype => "reply", msgid => $id;
2948 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3025 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2949 } 3026 }
2950} 3027}
2951 3028
2952=item $success = $client->query ($flags, "text", \&cb) 3029=item $success = $client->query ($flags, "text", \&cb)
2953 3030
… …
3080our $safe_hole = new Safe::Hole; 3157our $safe_hole = new Safe::Hole;
3081 3158
3082$SIG{FPE} = 'IGNORE'; 3159$SIG{FPE} = 'IGNORE';
3083 3160
3084$safe->permit_only (Opcode::opset qw( 3161$safe->permit_only (Opcode::opset qw(
3085 :base_core :base_mem :base_orig :base_math 3162 :base_core :base_mem :base_orig :base_math :base_loop
3086 grepstart grepwhile mapstart mapwhile 3163 grepstart grepwhile mapstart mapwhile
3087 sort time 3164 sort time
3088)); 3165));
3089 3166
3090# here we export the classes and methods available to script code 3167# here we export the classes and methods available to script code
… …
3094The following functions and methods are available within a safe environment: 3171The following functions and methods are available within a safe environment:
3095 3172
3096 cf::object 3173 cf::object
3097 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
3098 insert remove name archname title slaying race decrease split 3175 insert remove name archname title slaying race decrease split
3176 value
3099 3177
3100 cf::object::player 3178 cf::object::player
3101 player 3179 player
3102 3180
3103 cf::player 3181 cf::player
… …
3109=cut 3187=cut
3110 3188
3111for ( 3189for (
3112 ["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
3113 insert remove inv nrof name archname title slaying race 3191 insert remove inv nrof name archname title slaying race
3114 decrease split destroy change_exp)], 3192 decrease split destroy change_exp value msg lore send_msg)],
3115 ["cf::object::player" => qw(player)], 3193 ["cf::object::player" => qw(player)],
3116 ["cf::player" => qw(peaceful)], 3194 ["cf::player" => qw(peaceful send_msg)],
3117 ["cf::map" => qw(trigger)], 3195 ["cf::map" => qw(trigger)],
3118) { 3196) {
3119 no strict 'refs'; 3197 no strict 'refs';
3120 my ($pkg, @funs) = @$_; 3198 my ($pkg, @funs) = @$_;
3121 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3199 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3139 3217
3140 my $qcode = $code; 3218 my $qcode = $code;
3141 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3219 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3142 $qcode =~ s/\n/\\n/g; 3220 $qcode =~ s/\n/\\n/g;
3143 3221
3222 %vars = (_dummy => 0) unless %vars;
3223
3224 my @res;
3144 local $_; 3225 local $_;
3145 local @safe::cf::_safe_eval_args = values %vars;
3146 3226
3147 my $eval = 3227 my $eval =
3148 "do {\n" 3228 "do {\n"
3149 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3229 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3150 . "#line 0 \"{$qcode}\"\n" 3230 . "#line 0 \"{$qcode}\"\n"
3151 . $code 3231 . $code
3152 . "\n}" 3232 . "\n}"
3153 ; 3233 ;
3154 3234
3235 if ($CFG{safe_eval}) {
3155 sub_generation_inc; 3236 sub_generation_inc;
3237 local @safe::cf::_safe_eval_args = values %vars;
3156 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3238 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3157 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 }
3158 3244
3159 if ($@) { 3245 if ($@) {
3160 warn "$@"; 3246 warn "$@";
3161 warn "while executing safe code '$code'\n"; 3247 warn "while executing safe code '$code'\n";
3162 warn "with arguments " . (join " ", %vars) . "\n"; 3248 warn "with arguments " . (join " ", %vars) . "\n";
… …
3181=cut 3267=cut
3182 3268
3183sub register_script_function { 3269sub register_script_function {
3184 my ($fun, $cb) = @_; 3270 my ($fun, $cb) = @_;
3185 3271
3186 no strict 'refs'; 3272 $fun = "safe::$fun" if $CFG{safe_eval};
3187 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3273 *$fun = $safe_hole->wrap ($cb);
3188} 3274}
3189 3275
3190=back 3276=back
3191 3277
3192=cut 3278=cut
… …
3213 3299
3214 $facedata->{version} == 2 3300 $facedata->{version} == 2
3215 or cf::cleanup "$path: version mismatch, cannot proceed."; 3301 or cf::cleanup "$path: version mismatch, cannot proceed.";
3216 3302
3217 # 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]);
3218 $facedata->{resource}{"res/exp_table"} = { 3305 $facedata->{resource}{"res/exp_table"} = {
3219 type => FT_RSRC, 3306 type => FT_RSRC,
3220 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),
3221 }; 3309 };
3222 cf::cede_to_tick; 3310 cf::cede_to_tick;
3223 3311
3224 { 3312 {
3225 my $faces = $facedata->{faceinfo}; 3313 my $faces = $facedata->{faceinfo};
… …
3227 while (my ($face, $info) = each %$faces) { 3315 while (my ($face, $info) = each %$faces) {
3228 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3316 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3229 3317
3230 cf::face::set_visibility $idx, $info->{visibility}; 3318 cf::face::set_visibility $idx, $info->{visibility};
3231 cf::face::set_magicmap $idx, $info->{magicmap}; 3319 cf::face::set_magicmap $idx, $info->{magicmap};
3232 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3320 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3233 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3321 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3234 3322
3235 cf::cede_to_tick; 3323 cf::cede_to_tick;
3236 } 3324 }
3237 3325
3238 while (my ($face, $info) = each %$faces) { 3326 while (my ($face, $info) = each %$faces) {
… …
3262 3350
3263 cf::anim::invalidate_all; # d'oh 3351 cf::anim::invalidate_all; # d'oh
3264 } 3352 }
3265 3353
3266 { 3354 {
3267 # TODO: for gcfclient pleasure, we should give resources
3268 # that gcfclient doesn't grok a >10000 face index.
3269 my $res = $facedata->{resource}; 3355 my $res = $facedata->{resource};
3270 3356
3271 while (my ($name, $info) = each %$res) { 3357 while (my ($name, $info) = each %$res) {
3272 if (defined $info->{type}) { 3358 if (defined $info->{type}) {
3273 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3359 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3274 my $data;
3275 3360
3276 if ($info->{type} & 1) { 3361 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3277 # prepend meta info
3278
3279 my $meta = $enc->encode ({
3280 name => $name,
3281 %{ $info->{meta} || {} },
3282 });
3283
3284 $data = pack "(w/a*)*", $meta, $info->{data};
3285 } else {
3286 $data = $info->{data};
3287 }
3288
3289 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3290 cf::face::set_type $idx, $info->{type}; 3362 cf::face::set_type $idx, $info->{type};
3291 } else { 3363 } else {
3292 $RESOURCE{$name} = $info; 3364 $RESOURCE{$name} = $info;
3293 } 3365 }
3294 3366
… …
3378 3450
3379 warn "finished reloading resource files\n"; 3451 warn "finished reloading resource files\n";
3380} 3452}
3381 3453
3382sub reload_config { 3454sub reload_config {
3455 warn "reloading config file...\n";
3456
3383 open my $fh, "<:utf8", "$CONFDIR/config" 3457 open my $fh, "<:utf8", "$CONFDIR/config"
3384 or return; 3458 or return;
3385 3459
3386 local $/; 3460 local $/;
3387 *CFG = YAML::Load <$fh>; 3461 *CFG = YAML::XS::Load scalar <$fh>;
3388 3462
3389 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3463 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3390 3464
3391 $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};
3392 $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};
… …
3396 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3470 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3397 and die "WARNING: m(un)lockall failed: $!\n"; 3471 and die "WARNING: m(un)lockall failed: $!\n";
3398 }; 3472 };
3399 warn $@ if $@; 3473 warn $@ if $@;
3400 } 3474 }
3475
3476 warn "finished reloading resource files\n";
3401} 3477}
3402 3478
3403sub pidfile() { 3479sub pidfile() {
3404 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3480 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3405 or die "$PIDFILE: $!"; 3481 or die "$PIDFILE: $!";
… …
3417 3493
3418 seek $fh, 0, 0; 3494 seek $fh, 0, 0;
3419 print $fh $$; 3495 print $fh $$;
3420} 3496}
3421 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;
3505}
3506
3422sub main { 3507sub main {
3423 cf::init_globals; # initialise logging 3508 cf::init_globals; # initialise logging
3424 3509
3425 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3510 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3426 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3511 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
… …
3429 3514
3430 cf::init_experience; 3515 cf::init_experience;
3431 cf::init_anim; 3516 cf::init_anim;
3432 cf::init_attackmess; 3517 cf::init_attackmess;
3433 cf::init_dynamic; 3518 cf::init_dynamic;
3434 cf::init_block;
3435 3519
3436 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3520 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3437 3521
3438 # we must not ever block the main coroutine 3522 # we must not ever block the main coroutine
3439 local $Coro::idle = sub { 3523 local $Coro::idle = sub {
… …
3445 }; 3529 };
3446 3530
3447 evthread_start IO::AIO::poll_fileno; 3531 evthread_start IO::AIO::poll_fileno;
3448 3532
3449 cf::sync_job { 3533 cf::sync_job {
3534 cf::load_settings;
3535 cf::load_materials;
3536
3450 reload_resources; 3537 reload_resources;
3451 reload_config; 3538 reload_config;
3452 db_init; 3539 db_init;
3453 3540
3454 cf::load_settings;
3455 cf::load_materials;
3456 cf::init_uuid; 3541 cf::init_uuid;
3457 cf::init_signals; 3542 cf::init_signals;
3458 cf::init_commands; 3543 cf::init_commands;
3459 cf::init_skills; 3544 cf::init_skills;
3460 3545
… …
3465 load_extensions; 3550 load_extensions;
3466 3551
3467 utime time, time, $RUNTIMEFILE; 3552 utime time, time, $RUNTIMEFILE;
3468 3553
3469 # no (long-running) fork's whatsoever before this point(!) 3554 # no (long-running) fork's whatsoever before this point(!)
3555 use POSIX ();
3470 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};
3471 3557
3472 (pop @POST_INIT)->(0) while @POST_INIT; 3558 (pop @POST_INIT)->(0) while @POST_INIT;
3473 }; 3559 };
3474 3560
3475 EV::loop; 3561 main_loop;
3476} 3562}
3477 3563
3478############################################################################# 3564#############################################################################
3479# initialisation and cleanup 3565# initialisation and cleanup
3480 3566
… …
3487 }; 3573 };
3488 } 3574 }
3489} 3575}
3490 3576
3491sub write_runtime_sync { 3577sub write_runtime_sync {
3578 my $t0 = EV::time;
3579
3492 # first touch the runtime file to show we are still running: 3580 # first touch the runtime file to show we are still running:
3493 # the fsync below can take a very very long time. 3581 # the fsync below can take a very very long time.
3494 3582
3495 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3583 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3496 3584
3497 my $guard = cf::lock_acquire "write_runtime"; 3585 my $guard = cf::lock_acquire "write_runtime";
3498 3586
3499 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3587 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3500 or return; 3588 or return;
3501 3589
3502 my $value = $cf::RUNTIME + 90 + 10; 3590 my $value = $cf::RUNTIME + 90 + 10;
3503 # 10 is the runtime save interval, for a monotonic clock 3591 # 10 is the runtime save interval, for a monotonic clock
3504 # 60 allows for the watchdog to kill the server. 3592 # 60 allows for the watchdog to kill the server.
… …
3517 or return; 3605 or return;
3518 3606
3519 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3607 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3520 and return; 3608 and return;
3521 3609
3522 warn "runtime file written.\n"; 3610 warn sprintf "runtime file written (%gs).\n", EV::time - $t0;
3523 3611
3524 1 3612 1
3525} 3613}
3526 3614
3527our $uuid_lock; 3615our $uuid_lock;
… …
3736 clear_package "safe::$_" 3824 clear_package "safe::$_"
3737 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);
3738 3826
3739 warn "unloading cf.pm \"a bit\""; 3827 warn "unloading cf.pm \"a bit\"";
3740 delete $INC{"cf.pm"}; 3828 delete $INC{"cf.pm"};
3741 delete $INC{"cf/pod.pm"}; 3829 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3742 3830
3743 # don't, removes xs symbols, too, 3831 # don't, removes xs symbols, too,
3744 # and global variables created in xs 3832 # and global variables created in xs
3745 #clear_package __PACKAGE__; 3833 #clear_package __PACKAGE__;
3746 3834
3747 warn "unload completed, starting to reload now"; 3835 warn "unload completed, starting to reload now";
3748 3836
3749 warn "reloading cf.pm"; 3837 warn "reloading cf.pm";
3750 require cf; 3838 require cf;
3751 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3839 cf::_connect_to_perl_1;
3752 3840
3753 warn "loading config and database again"; 3841 warn "loading config and database again";
3754 cf::reload_config; 3842 cf::reload_config;
3755 3843
3756 warn "loading extensions"; 3844 warn "loading extensions";
… …
3818 3906
3819our @WAIT_FOR_TICK; 3907our @WAIT_FOR_TICK;
3820our @WAIT_FOR_TICK_BEGIN; 3908our @WAIT_FOR_TICK_BEGIN;
3821 3909
3822sub wait_for_tick { 3910sub wait_for_tick {
3823 return if tick_inhibit || $Coro::current == $Coro::main; 3911 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3824 3912
3825 my $signal = new Coro::Signal; 3913 my $signal = new Coro::Signal;
3826 push @WAIT_FOR_TICK, $signal; 3914 push @WAIT_FOR_TICK, $signal;
3827 $signal->wait; 3915 $signal->wait;
3828} 3916}
3829 3917
3830sub wait_for_tick_begin { 3918sub wait_for_tick_begin {
3831 return if tick_inhibit || $Coro::current == $Coro::main; 3919 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3832 3920
3833 my $signal = new Coro::Signal; 3921 my $signal = new Coro::Signal;
3834 push @WAIT_FOR_TICK_BEGIN, $signal; 3922 push @WAIT_FOR_TICK_BEGIN, $signal;
3835 $signal->wait; 3923 $signal->wait;
3836} 3924}
… …
3841 unless ++$bug_warning > 10; 3929 unless ++$bug_warning > 10;
3842 return; 3930 return;
3843 } 3931 }
3844 3932
3845 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#
3846 3936
3847 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3937 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3848 $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.;
3849 Coro::async_pool { 3939 Coro::async_pool {
3850 $Coro::current->{desc} = "runtime saver"; 3940 $Coro::current->{desc} = "runtime saver";
… …
3873} 3963}
3874 3964
3875{ 3965{
3876 # configure BDB 3966 # configure BDB
3877 3967
3878 BDB::min_parallel 8; 3968 BDB::min_parallel 16;
3879 BDB::max_poll_reqs $TICK * 0.1; 3969 BDB::max_poll_reqs $TICK * 0.1;
3880 $AnyEvent::BDB::WATCHER->priority (1); 3970 $AnyEvent::BDB::WATCHER->priority (1);
3881 3971
3882 unless ($DB_ENV) { 3972 unless ($DB_ENV) {
3883 $DB_ENV = BDB::db_env_create; 3973 $DB_ENV = BDB::db_env_create;
… …
3963 LOG llevInfo, "[ABT] [suppressed]\n"; 4053 LOG llevInfo, "[ABT] [suppressed]\n";
3964 } 4054 }
3965} 4055}
3966 4056
3967# load additional modules 4057# load additional modules
3968use cf::pod; 4058require "cf/$_.pm" for @EXTRA_MODULES;
4059cf::_connect_to_perl_2;
3969 4060
3970END { cf::emergency_save } 4061END { cf::emergency_save }
3971 4062
39721 40631
3973 4064

Diff Legend

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