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.456 by root, Tue Sep 30 04:00:35 2008 UTC vs.
Revision 1.507 by root, Sat Mar 20 02:24:38 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;
1192 1207
1193 $filename =~ s%/[^/]+$%%; 1208 $filename =~ s%/[^/]+$%%;
1194 aio_pathsync $filename; 1209 aio_pathsync $filename if $cf::USE_FSYNC;
1195 } else { 1210 } else {
1196 warn "FATAL: $filename~: $!\n"; 1211 warn "unable to save objects: $filename~: $!\n";
1197 } 1212 }
1198 } else { 1213 } else {
1199 aio_unlink $filename; 1214 aio_unlink $filename;
1200 aio_unlink "$filename.pst"; 1215 aio_unlink "$filename.pst";
1201 } 1216 }
… …
1292 my ($name, $cb) = @_; 1307 my ($name, $cb) = @_;
1293 1308
1294 $EXTICMD{$name} = $cb; 1309 $EXTICMD{$name} = $cb;
1295} 1310}
1296 1311
1312use File::Glob ();
1313
1297cf::player->attach ( 1314cf::player->attach (
1298 on_command => sub { 1315 on_command => sub {
1299 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1300 1317
1301 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
… …
1333 1350
1334 cf::override; 1351 cf::override;
1335 }, 1352 },
1336); 1353);
1337 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
1338sub load_extensions { 1368sub load_extensions {
1339 cf::sync_job { 1369 cf::sync_job {
1340 my %todo; 1370 my %todo;
1341 1371
1342 for my $path (<$LIBDIR/*.ext>) { 1372 for my $path (<$LIBDIR/*.ext>) {
… …
1369 . "\n};\n1"; 1399 . "\n};\n1";
1370 1400
1371 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
1372 } 1402 }
1373 1403
1404 my $pass = 0;
1374 my %done; 1405 my %done;
1375 while (%todo) { 1406 while (%todo) {
1376 my $progress; 1407 my $progress;
1377 1408
1409 ++$pass;
1410
1411 ext:
1378 while (my ($k, $v) = each %todo) { 1412 while (my ($k, $v) = each %todo) {
1379 for (split /,\s*/, $v->{meta}{depends}) { 1413 for (split /,\s*/, $v->{meta}{depends}) {
1380 goto skip 1414 next ext
1381 unless exists $done{$_}; 1415 unless exists $done{$_};
1382 } 1416 }
1383 1417
1384 warn "... loading '$k' into '$v->{pkg}'\n"; 1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1385 1419
1386 unless (eval $v->{source}) { 1420 my $active = eval $v->{source};
1421
1422 if (length $@) {
1387 my $msg = $@ ? "$v->{path}: $@\n" 1423 warn "$v->{path}: $@\n";
1388 : "$v->{base}: extension inactive.\n";
1389 1424
1390 if (exists $v->{meta}{mandatory}) {
1391 warn $msg;
1392 cf::cleanup "mandatory extension failed to load, exiting."; 1425 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1393 } 1426 if exists $v->{meta}{mandatory};
1394 1427 } else {
1395 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;
1396 } 1434 }
1397
1398 $done{$k} = delete $todo{$k};
1399 push @EXTS, $v->{pkg};
1400 $progress = 1;
1401 } 1435 }
1402 1436
1403 skip: 1437 unless ($progress) {
1404 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1438 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1405 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 }
1406 } 1445 }
1407 }; 1446 };
1408} 1447}
1409 1448
1410############################################################################# 1449#############################################################################
… …
1870 1909
1871 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1910 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1872 "$UNIQUEDIR/$path" 1911 "$UNIQUEDIR/$path"
1873} 1912}
1874 1913
1875# and all this just because we cannot iterate over
1876# all maps in C++...
1877sub change_all_map_light {
1878 my ($change) = @_;
1879
1880 $_->change_map_light ($change)
1881 for grep $_->outdoor, values %cf::MAP;
1882}
1883
1884sub decay_objects { 1914sub decay_objects {
1885 my ($self) = @_; 1915 my ($self) = @_;
1886 1916
1887 return if $self->{deny_reset}; 1917 return if $self->{deny_reset};
1888 1918
… …
1970sub find { 2000sub find {
1971 my ($path, $origin) = @_; 2001 my ($path, $origin) = @_;
1972 2002
1973 $path = normalise $path, $origin && $origin->path; 2003 $path = normalise $path, $origin && $origin->path;
1974 2004
1975 cf::lock_wait "map_data:$path";#d#remove 2005 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1976 cf::lock_wait "map_find:$path"; 2006 my $guard2 = cf::lock_acquire "map_find:$path";
1977 2007
1978 $cf::MAP{$path} || do { 2008 $cf::MAP{$path} || do {
1979 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1980 my $guard2 = cf::lock_acquire "map_find:$path";
1981
1982 my $map = new_from_path cf::map $path 2009 my $map = new_from_path cf::map $path
1983 or return; 2010 or return;
1984 2011
1985 $map->{last_save} = $cf::RUNTIME; 2012 $map->{last_save} = $cf::RUNTIME;
1986 2013
… …
1998 2025
1999 $cf::MAP{$path} = $map 2026 $cf::MAP{$path} = $map
2000 } 2027 }
2001} 2028}
2002 2029
2003sub pre_load { } 2030sub pre_load { }
2004sub post_load { } 2031#sub post_load { } # XS
2005 2032
2006sub load { 2033sub load {
2007 my ($self) = @_; 2034 my ($self) = @_;
2008 2035
2009 local $self->{deny_reset} = 1; # loading can take a long time 2036 local $self->{deny_reset} = 1; # loading can take a long time
… …
2054 unless ($self->{deny_activate}) { 2081 unless ($self->{deny_activate}) {
2055 $self->decay_objects; 2082 $self->decay_objects;
2056 $self->fix_auto_apply; 2083 $self->fix_auto_apply;
2057 $self->update_buttons; 2084 $self->update_buttons;
2058 cf::cede_to_tick; 2085 cf::cede_to_tick;
2059 $self->set_darkness_map;
2060 cf::cede_to_tick;
2061 $self->activate; 2086 $self->activate;
2062 } 2087 }
2063 2088
2064 $self->{last_save} = $cf::RUNTIME; 2089 $self->{last_save} = $cf::RUNTIME;
2065 $self->last_access ($cf::RUNTIME); 2090 $self->last_access ($cf::RUNTIME);
… …
2068 } 2093 }
2069 2094
2070 $self->post_load; 2095 $self->post_load;
2071} 2096}
2072 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
2073sub customise_for { 2101sub customise_for {
2074 my ($self, $ob) = @_; 2102 my ($self, $ob) = @_;
2075 2103
2076 return find "~" . $ob->name . "/" . $self->{path} 2104 return find "~" . $ob->name . "/" . $self->{path}
2077 if $self->per_player; 2105 if $self->per_player;
… …
2231 2259
2232 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2233 2261
2234 return if $self->players; 2262 return if $self->players;
2235 2263
2236 warn "resetting map ", $self->path; 2264 warn "resetting map ", $self->path, "\n";
2237 2265
2238 $self->in_memory (cf::MAP_SWAPPED); 2266 $self->in_memory (cf::MAP_SWAPPED);
2239 2267
2240 # need to save uniques path 2268 # need to save uniques path
2241 unless ($self->{deny_save}) { 2269 unless ($self->{deny_save}) {
… …
2332 : normalise $_ 2360 : normalise $_
2333 } @{ aio_readdir $UNIQUEDIR or [] } 2361 } @{ aio_readdir $UNIQUEDIR or [] }
2334 ] 2362 ]
2335} 2363}
2336 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
2337=back 2397=back
2338 2398
2339=head3 cf::object 2399=head3 cf::object
2340 2400
2341=cut 2401=cut
… …
2406 2466
2407our $SAY_CHANNEL = { 2467our $SAY_CHANNEL = {
2408 id => "say", 2468 id => "say",
2409 title => "Map", 2469 title => "Map",
2410 reply => "say ", 2470 reply => "say ",
2411 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.",
2412}; 2472};
2413 2473
2414our $CHAT_CHANNEL = { 2474our $CHAT_CHANNEL = {
2415 id => "chat", 2475 id => "chat",
2416 title => "Chat", 2476 title => "Chat",
… …
2536 ($x, $y) = (-1, -1) 2596 ($x, $y) = (-1, -1)
2537 unless (defined $x) && (defined $y); 2597 unless (defined $x) && (defined $y);
2538 2598
2539 # use -1 or undef as default coordinates, not 0, 0 2599 # use -1 or undef as default coordinates, not 0, 0
2540 ($x, $y) = ($map->enter_x, $map->enter_y) 2600 ($x, $y) = ($map->enter_x, $map->enter_y)
2541 if $x <=0 && $y <= 0; 2601 if $x <= 0 && $y <= 0;
2542 2602
2543 $map->load; 2603 $map->load;
2544 $map->load_neighbours; 2604 $map->load_neighbours;
2545 2605
2546 return unless $self->contr->active; 2606 return unless $self->contr->active;
2547 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2548 $self->activate_recursive;
2549 2607
2550 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2608 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2551 $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;
2552} 2613}
2553 2614
2554=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2615=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2555 2616
2556Moves 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
… …
2744 2805
2745 utf8::encode $text; 2806 utf8::encode $text;
2746 $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);
2747} 2808}
2748 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
2749=item $client->send_msg ($channel, $msg, $color, [extra...]) 2835=item $client->send_msg ($channel, $msg, $color, [extra...])
2750 2836
2751Send 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
2752client 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
2753the 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
… …
2755 2841
2756=cut 2842=cut
2757 2843
2758# non-persistent channels (usually the info channel) 2844# non-persistent channels (usually the info channel)
2759our %CHANNEL = ( 2845our %CHANNEL = (
2846 "c/motd" => {
2847 id => "infobox",
2848 title => "MOTD",
2849 reply => undef,
2850 tooltip => "The message of the day",
2851 },
2760 "c/identify" => { 2852 "c/identify" => {
2761 id => "infobox", 2853 id => "infobox",
2762 title => "Identify", 2854 title => "Identify",
2763 reply => undef, 2855 reply => undef,
2764 tooltip => "Items recently identified", 2856 tooltip => "Items recently identified",
… …
2766 "c/examine" => { 2858 "c/examine" => {
2767 id => "infobox", 2859 id => "infobox",
2768 title => "Examine", 2860 title => "Examine",
2769 reply => undef, 2861 reply => undef,
2770 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",
2771 }, 2869 },
2772 "c/book" => { 2870 "c/book" => {
2773 id => "infobox", 2871 id => "infobox",
2774 title => "Book", 2872 title => "Book",
2775 reply => undef, 2873 reply => undef,
… …
2791 id => "infobox", 2889 id => "infobox",
2792 title => "Body Parts", 2890 title => "Body Parts",
2793 reply => undef, 2891 reply => undef,
2794 tooltip => "Shows which body parts you posess and are available", 2892 tooltip => "Shows which body parts you posess and are available",
2795 }, 2893 },
2894 "c/statistics" => {
2895 id => "infobox",
2896 title => "Statistics",
2897 reply => undef,
2898 tooltip => "Shows your primary statistics",
2899 },
2796 "c/skills" => { 2900 "c/skills" => {
2797 id => "infobox", 2901 id => "infobox",
2798 title => "Skills", 2902 title => "Skills",
2799 reply => undef, 2903 reply => undef,
2800 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",
2801 }, 2929 },
2802 "c/uptime" => { 2930 "c/uptime" => {
2803 id => "infobox", 2931 id => "infobox",
2804 title => "Uptime", 2932 title => "Uptime",
2805 reply => undef, 2933 reply => undef,
… …
2815 id => "party", 2943 id => "party",
2816 title => "Party", 2944 title => "Party",
2817 reply => "gsay ", 2945 reply => "gsay ",
2818 tooltip => "Messages and chat related to your party", 2946 tooltip => "Messages and chat related to your party",
2819 }, 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,
2820); 2956);
2821 2957
2822sub cf::client::send_msg { 2958sub cf::client::send_msg {
2823 my ($self, $channel, $msg, $color, @extra) = @_; 2959 my ($self, $channel, $msg, $color, @extra) = @_;
2824 2960
… …
2829 2965
2830 # check predefined channels, for the benefit of C 2966 # check predefined channels, for the benefit of C
2831 if ($CHANNEL{$channel}) { 2967 if ($CHANNEL{$channel}) {
2832 $channel = $CHANNEL{$channel}; 2968 $channel = $CHANNEL{$channel};
2833 2969
2834 $self->ext_msg (channel_info => $channel) 2970 $self->ext_msg (channel_info => $channel);
2835 if $self->can_msg;
2836
2837 $channel = $channel->{id}; 2971 $channel = $channel->{id};
2838 2972
2839 } elsif (ref $channel) { 2973 } elsif (ref $channel) {
2840 # send meta info to client, if not yet sent 2974 # send meta info to client, if not yet sent
2841 unless (exists $self->{channel}{$channel->{id}}) { 2975 unless (exists $self->{channel}{$channel->{id}}) {
2842 $self->{channel}{$channel->{id}} = $channel; 2976 $self->{channel}{$channel->{id}} = $channel;
2843 $self->ext_msg (channel_info => $channel) 2977 $self->ext_msg (channel_info => $channel);
2844 if $self->can_msg;
2845 } 2978 }
2846 2979
2847 $channel = $channel->{id}; 2980 $channel = $channel->{id};
2848 } 2981 }
2849 2982
2850 return unless @extra || length $msg; 2983 return unless @extra || length $msg;
2851 2984
2852 if ($self->can_msg) {
2853 # default colour, mask it out 2985 # default colour, mask it out
2854 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2986 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2855 if $color & cf::NDI_DEF; 2987 if $color & cf::NDI_DEF;
2856 2988
2857 my $pkt = "msg " 2989 my $pkt = "msg "
2858 . $self->{json_coder}->encode ( 2990 . $self->{json_coder}->encode (
2859 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2991 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2860 ); 2992 );
2861 2993
2862 # try lzf for large packets
2863 $pkt = "lzf " . Compress::LZF::compress $pkt
2864 if 1024 <= length $pkt and $self->{can_lzf};
2865
2866 # split very large packets
2867 if (8192 < length $pkt and $self->{can_lzf}) {
2868 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2869 $pkt = "frag";
2870 }
2871
2872 $self->send_packet ($pkt); 2994 $self->send_big_packet ($pkt);
2873 } else {
2874 if ($color >= 0) {
2875 # replace some tags by gcfclient-compatible ones
2876 for ($msg) {
2877 1 while
2878 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2879 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2880 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2881 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2882 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2883 }
2884
2885 $color &= cf::NDI_COLOR_MASK;
2886
2887 utf8::encode $msg;
2888
2889 if (0 && $msg =~ /\[/) {
2890 # COMMAND/INFO
2891 $self->send_packet ("drawextinfo $color 10 8 $msg")
2892 } else {
2893 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2894 $self->send_packet ("drawinfo $color $msg")
2895 }
2896 }
2897 }
2898} 2995}
2899 2996
2900=item $client->ext_msg ($type, @msg) 2997=item $client->ext_msg ($type, @msg)
2901 2998
2902Sends an ext event to the client. 2999Sends an ext event to the client.
… …
2905 3002
2906sub cf::client::ext_msg($$@) { 3003sub cf::client::ext_msg($$@) {
2907 my ($self, $type, @msg) = @_; 3004 my ($self, $type, @msg) = @_;
2908 3005
2909 if ($self->extcmd == 2) { 3006 if ($self->extcmd == 2) {
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3007 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2911 } elsif ($self->extcmd == 1) { # TODO: remove 3008 } elsif ($self->extcmd == 1) { # TODO: remove
2912 push @msg, msgtype => "event_$type"; 3009 push @msg, msgtype => "event_$type";
2913 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3010 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2914 } 3011 }
2915} 3012}
2916 3013
2917=item $client->ext_reply ($msgid, @msg) 3014=item $client->ext_reply ($msgid, @msg)
2918 3015
… …
2922 3019
2923sub cf::client::ext_reply($$@) { 3020sub cf::client::ext_reply($$@) {
2924 my ($self, $id, @msg) = @_; 3021 my ($self, $id, @msg) = @_;
2925 3022
2926 if ($self->extcmd == 2) { 3023 if ($self->extcmd == 2) {
2927 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3024 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2928 } elsif ($self->extcmd == 1) { 3025 } elsif ($self->extcmd == 1) {
2929 #TODO: version 1, remove 3026 #TODO: version 1, remove
2930 unshift @msg, msgtype => "reply", msgid => $id; 3027 unshift @msg, msgtype => "reply", msgid => $id;
2931 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3028 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2932 } 3029 }
2933} 3030}
2934 3031
2935=item $success = $client->query ($flags, "text", \&cb) 3032=item $success = $client->query ($flags, "text", \&cb)
2936 3033
… …
3063our $safe_hole = new Safe::Hole; 3160our $safe_hole = new Safe::Hole;
3064 3161
3065$SIG{FPE} = 'IGNORE'; 3162$SIG{FPE} = 'IGNORE';
3066 3163
3067$safe->permit_only (Opcode::opset qw( 3164$safe->permit_only (Opcode::opset qw(
3068 :base_core :base_mem :base_orig :base_math 3165 :base_core :base_mem :base_orig :base_math :base_loop
3069 grepstart grepwhile mapstart mapwhile 3166 grepstart grepwhile mapstart mapwhile
3070 sort time 3167 sort time
3071)); 3168));
3072 3169
3073# here we export the classes and methods available to script code 3170# here we export the classes and methods available to script code
… …
3077The following functions and methods are available within a safe environment: 3174The following functions and methods are available within a safe environment:
3078 3175
3079 cf::object 3176 cf::object
3080 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
3081 insert remove name archname title slaying race decrease split 3178 insert remove name archname title slaying race decrease split
3179 value
3082 3180
3083 cf::object::player 3181 cf::object::player
3084 player 3182 player
3085 3183
3086 cf::player 3184 cf::player
… …
3092=cut 3190=cut
3093 3191
3094for ( 3192for (
3095 ["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
3096 insert remove inv nrof name archname title slaying race 3194 insert remove inv nrof name archname title slaying race
3097 decrease split destroy change_exp)], 3195 decrease split destroy change_exp value msg lore send_msg)],
3098 ["cf::object::player" => qw(player)], 3196 ["cf::object::player" => qw(player)],
3099 ["cf::player" => qw(peaceful)], 3197 ["cf::player" => qw(peaceful send_msg)],
3100 ["cf::map" => qw(trigger)], 3198 ["cf::map" => qw(trigger)],
3101) { 3199) {
3102 no strict 'refs'; 3200 no strict 'refs';
3103 my ($pkg, @funs) = @$_; 3201 my ($pkg, @funs) = @$_;
3104 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3202 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3122 3220
3123 my $qcode = $code; 3221 my $qcode = $code;
3124 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3222 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3125 $qcode =~ s/\n/\\n/g; 3223 $qcode =~ s/\n/\\n/g;
3126 3224
3225 %vars = (_dummy => 0) unless %vars;
3226
3227 my @res;
3127 local $_; 3228 local $_;
3128 local @safe::cf::_safe_eval_args = values %vars;
3129 3229
3130 my $eval = 3230 my $eval =
3131 "do {\n" 3231 "do {\n"
3132 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3232 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3133 . "#line 0 \"{$qcode}\"\n" 3233 . "#line 0 \"{$qcode}\"\n"
3134 . $code 3234 . $code
3135 . "\n}" 3235 . "\n}"
3136 ; 3236 ;
3137 3237
3238 if ($CFG{safe_eval}) {
3138 sub_generation_inc; 3239 sub_generation_inc;
3240 local @safe::cf::_safe_eval_args = values %vars;
3139 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3241 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3140 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 }
3141 3247
3142 if ($@) { 3248 if ($@) {
3143 warn "$@"; 3249 warn "$@";
3144 warn "while executing safe code '$code'\n"; 3250 warn "while executing safe code '$code'\n";
3145 warn "with arguments " . (join " ", %vars) . "\n"; 3251 warn "with arguments " . (join " ", %vars) . "\n";
… …
3164=cut 3270=cut
3165 3271
3166sub register_script_function { 3272sub register_script_function {
3167 my ($fun, $cb) = @_; 3273 my ($fun, $cb) = @_;
3168 3274
3169 no strict 'refs'; 3275 $fun = "safe::$fun" if $CFG{safe_eval};
3170 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3276 *$fun = $safe_hole->wrap ($cb);
3171} 3277}
3172 3278
3173=back 3279=back
3174 3280
3175=cut 3281=cut
… …
3196 3302
3197 $facedata->{version} == 2 3303 $facedata->{version} == 2
3198 or cf::cleanup "$path: version mismatch, cannot proceed."; 3304 or cf::cleanup "$path: version mismatch, cannot proceed.";
3199 3305
3200 # 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]);
3201 $facedata->{resource}{"res/exp_table"} = { 3308 $facedata->{resource}{"res/exp_table"} = {
3202 type => FT_RSRC, 3309 type => FT_RSRC,
3203 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),
3204 }; 3312 };
3205 cf::cede_to_tick; 3313 cf::cede_to_tick;
3206 3314
3207 { 3315 {
3208 my $faces = $facedata->{faceinfo}; 3316 my $faces = $facedata->{faceinfo};
… …
3210 while (my ($face, $info) = each %$faces) { 3318 while (my ($face, $info) = each %$faces) {
3211 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3319 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3212 3320
3213 cf::face::set_visibility $idx, $info->{visibility}; 3321 cf::face::set_visibility $idx, $info->{visibility};
3214 cf::face::set_magicmap $idx, $info->{magicmap}; 3322 cf::face::set_magicmap $idx, $info->{magicmap};
3215 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3323 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3216 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3324 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3217 3325
3218 cf::cede_to_tick; 3326 cf::cede_to_tick;
3219 } 3327 }
3220 3328
3221 while (my ($face, $info) = each %$faces) { 3329 while (my ($face, $info) = each %$faces) {
… …
3245 3353
3246 cf::anim::invalidate_all; # d'oh 3354 cf::anim::invalidate_all; # d'oh
3247 } 3355 }
3248 3356
3249 { 3357 {
3250 # TODO: for gcfclient pleasure, we should give resources
3251 # that gcfclient doesn't grok a >10000 face index.
3252 my $res = $facedata->{resource}; 3358 my $res = $facedata->{resource};
3253 3359
3254 while (my ($name, $info) = each %$res) { 3360 while (my ($name, $info) = each %$res) {
3255 if (defined $info->{type}) { 3361 if (defined $info->{type}) {
3256 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3362 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3257 my $data;
3258 3363
3259 if ($info->{type} & 1) { 3364 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3260 # prepend meta info
3261
3262 my $meta = $enc->encode ({
3263 name => $name,
3264 %{ $info->{meta} || {} },
3265 });
3266
3267 $data = pack "(w/a*)*", $meta, $info->{data};
3268 } else {
3269 $data = $info->{data};
3270 }
3271
3272 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3273 cf::face::set_type $idx, $info->{type}; 3365 cf::face::set_type $idx, $info->{type};
3274 } else { 3366 } else {
3275 $RESOURCE{$name} = $info; 3367 $RESOURCE{$name} = $info;
3276 } 3368 }
3277 3369
… …
3361 3453
3362 warn "finished reloading resource files\n"; 3454 warn "finished reloading resource files\n";
3363} 3455}
3364 3456
3365sub reload_config { 3457sub reload_config {
3458 warn "reloading config file...\n";
3459
3366 open my $fh, "<:utf8", "$CONFDIR/config" 3460 open my $fh, "<:utf8", "$CONFDIR/config"
3367 or return; 3461 or return;
3368 3462
3369 local $/; 3463 local $/;
3370 *CFG = YAML::Load <$fh>; 3464 *CFG = YAML::XS::Load scalar <$fh>;
3371 3465
3372 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3466 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3373 3467
3374 $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};
3375 $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};
… …
3379 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3473 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3380 and die "WARNING: m(un)lockall failed: $!\n"; 3474 and die "WARNING: m(un)lockall failed: $!\n";
3381 }; 3475 };
3382 warn $@ if $@; 3476 warn $@ if $@;
3383 } 3477 }
3478
3479 warn "finished reloading resource files\n";
3384} 3480}
3385 3481
3386sub pidfile() { 3482sub pidfile() {
3387 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3483 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3388 or die "$PIDFILE: $!"; 3484 or die "$PIDFILE: $!";
… …
3400 3496
3401 seek $fh, 0, 0; 3497 seek $fh, 0, 0;
3402 print $fh $$; 3498 print $fh $$;
3403} 3499}
3404 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
3405sub main { 3510sub main {
3406 cf::init_globals; # initialise logging 3511 cf::init_globals; # initialise logging
3407 3512
3408 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3513 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3409 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.";
… …
3412 3517
3413 cf::init_experience; 3518 cf::init_experience;
3414 cf::init_anim; 3519 cf::init_anim;
3415 cf::init_attackmess; 3520 cf::init_attackmess;
3416 cf::init_dynamic; 3521 cf::init_dynamic;
3417 cf::init_block;
3418 3522
3419 $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
3420 3524
3421 # we must not ever block the main coroutine 3525 # we must not ever block the main coroutine
3422 local $Coro::idle = sub { 3526 local $Coro::idle = sub {
… …
3428 }; 3532 };
3429 3533
3430 evthread_start IO::AIO::poll_fileno; 3534 evthread_start IO::AIO::poll_fileno;
3431 3535
3432 cf::sync_job { 3536 cf::sync_job {
3537 cf::load_settings;
3538 cf::load_materials;
3539
3433 reload_resources; 3540 reload_resources;
3434 reload_config; 3541 reload_config;
3435 db_init; 3542 db_init;
3436 3543
3437 cf::load_settings;
3438 cf::load_materials;
3439 cf::init_uuid; 3544 cf::init_uuid;
3440 cf::init_signals; 3545 cf::init_signals;
3441 cf::init_commands; 3546 cf::init_commands;
3442 cf::init_skills; 3547 cf::init_skills;
3443 3548
… …
3448 load_extensions; 3553 load_extensions;
3449 3554
3450 utime time, time, $RUNTIMEFILE; 3555 utime time, time, $RUNTIMEFILE;
3451 3556
3452 # no (long-running) fork's whatsoever before this point(!) 3557 # no (long-running) fork's whatsoever before this point(!)
3558 use POSIX ();
3453 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3559 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3454 3560
3455 (pop @POST_INIT)->(0) while @POST_INIT; 3561 (pop @POST_INIT)->(0) while @POST_INIT;
3456 }; 3562 };
3457 3563
3458 EV::loop; 3564 main_loop;
3459} 3565}
3460 3566
3461############################################################################# 3567#############################################################################
3462# initialisation and cleanup 3568# initialisation and cleanup
3463 3569
… …
3470 }; 3576 };
3471 } 3577 }
3472} 3578}
3473 3579
3474sub write_runtime_sync { 3580sub write_runtime_sync {
3581 my $t0 = EV::time;
3582
3475 # first touch the runtime file to show we are still running: 3583 # first touch the runtime file to show we are still running:
3476 # the fsync below can take a very very long time. 3584 # the fsync below can take a very very long time.
3477 3585
3478 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3586 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3479 3587
3480 my $guard = cf::lock_acquire "write_runtime"; 3588 my $guard = cf::lock_acquire "write_runtime";
3481 3589
3482 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3590 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3483 or return; 3591 or return;
3484 3592
3485 my $value = $cf::RUNTIME + 90 + 10; 3593 my $value = $cf::RUNTIME + 90 + 10;
3486 # 10 is the runtime save interval, for a monotonic clock 3594 # 10 is the runtime save interval, for a monotonic clock
3487 # 60 allows for the watchdog to kill the server. 3595 # 60 allows for the watchdog to kill the server.
… …
3500 or return; 3608 or return;
3501 3609
3502 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3610 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3503 and return; 3611 and return;
3504 3612
3505 warn "runtime file written.\n"; 3613 warn sprintf "runtime file written (%gs).\n", EV::time - $t0;
3506 3614
3507 1 3615 1
3508} 3616}
3509 3617
3510our $uuid_lock; 3618our $uuid_lock;
… …
3558} 3666}
3559 3667
3560sub emergency_save() { 3668sub emergency_save() {
3561 my $freeze_guard = cf::freeze_mainloop; 3669 my $freeze_guard = cf::freeze_mainloop;
3562 3670
3563 warn "enter emergency perl save\n"; 3671 warn "emergency_perl_save: enter\n";
3564 3672
3565 cf::sync_job { 3673 cf::sync_job {
3674 # this is a trade-off: we want to be very quick here, so
3675 # save all maps without fsync, and later call a global sync
3676 # (which in turn might be very very slow)
3677 local $USE_FSYNC = 0;
3678
3566 # use a peculiar iteration method to avoid tripping on perl 3679 # use a peculiar iteration method to avoid tripping on perl
3567 # refcount bugs in for. also avoids problems with players 3680 # refcount bugs in for. also avoids problems with players
3568 # and maps saved/destroyed asynchronously. 3681 # and maps saved/destroyed asynchronously.
3569 warn "begin emergency player save\n"; 3682 warn "emergency_perl_save: begin player save\n";
3570 for my $login (keys %cf::PLAYER) { 3683 for my $login (keys %cf::PLAYER) {
3571 my $pl = $cf::PLAYER{$login} or next; 3684 my $pl = $cf::PLAYER{$login} or next;
3572 $pl->valid or next; 3685 $pl->valid or next;
3573 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3686 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3574 $pl->save; 3687 $pl->save;
3575 } 3688 }
3576 warn "end emergency player save\n"; 3689 warn "emergency_perl_save: end player save\n";
3577 3690
3578 warn "begin emergency map save\n"; 3691 warn "emergency_perl_save: begin map save\n";
3579 for my $path (keys %cf::MAP) { 3692 for my $path (keys %cf::MAP) {
3580 my $map = $cf::MAP{$path} or next; 3693 my $map = $cf::MAP{$path} or next;
3581 $map->valid or next; 3694 $map->valid or next;
3582 $map->save; 3695 $map->save;
3583 } 3696 }
3584 warn "end emergency map save\n"; 3697 warn "emergency_perl_save: end map save\n";
3585 3698
3586 warn "begin emergency database checkpoint\n"; 3699 warn "emergency_perl_save: begin database checkpoint\n";
3587 BDB::db_env_txn_checkpoint $DB_ENV; 3700 BDB::db_env_txn_checkpoint $DB_ENV;
3588 warn "end emergency database checkpoint\n"; 3701 warn "emergency_perl_save: end database checkpoint\n";
3589 3702
3590 warn "begin write uuid\n"; 3703 warn "emergency_perl_save: begin write uuid\n";
3591 write_uuid_sync 1; 3704 write_uuid_sync 1;
3592 warn "end write uuid\n"; 3705 warn "emergency_perl_save: end write uuid\n";
3593 }; 3706 };
3594 3707
3708 warn "emergency_perl_save: starting sync()\n";
3709 IO::AIO::aio_sync sub {
3710 warn "emergency_perl_save: finished sync()\n";
3711 };
3712
3595 warn "leave emergency perl save\n"; 3713 warn "emergency_perl_save: leave\n";
3596} 3714}
3597 3715
3598sub post_cleanup { 3716sub post_cleanup {
3599 my ($make_core) = @_; 3717 my ($make_core) = @_;
3600 3718
… …
3637 warn "can only reload from main coroutine"; 3755 warn "can only reload from main coroutine";
3638 return; 3756 return;
3639 } 3757 }
3640 3758
3641 return if $RELOAD++; 3759 return if $RELOAD++;
3760
3761 my $t1 = EV::time;
3642 3762
3643 while ($RELOAD) { 3763 while ($RELOAD) {
3644 warn "reloading..."; 3764 warn "reloading...";
3645 3765
3646 warn "entering sync_job"; 3766 warn "entering sync_job";
… …
3707 clear_package "safe::$_" 3827 clear_package "safe::$_"
3708 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3828 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3709 3829
3710 warn "unloading cf.pm \"a bit\""; 3830 warn "unloading cf.pm \"a bit\"";
3711 delete $INC{"cf.pm"}; 3831 delete $INC{"cf.pm"};
3712 delete $INC{"cf/pod.pm"}; 3832 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3713 3833
3714 # don't, removes xs symbols, too, 3834 # don't, removes xs symbols, too,
3715 # and global variables created in xs 3835 # and global variables created in xs
3716 #clear_package __PACKAGE__; 3836 #clear_package __PACKAGE__;
3717 3837
3718 warn "unload completed, starting to reload now"; 3838 warn "unload completed, starting to reload now";
3719 3839
3720 warn "reloading cf.pm"; 3840 warn "reloading cf.pm";
3721 require cf; 3841 require cf;
3722 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3842 cf::_connect_to_perl_1;
3723 3843
3724 warn "loading config and database again"; 3844 warn "loading config and database again";
3725 cf::reload_config; 3845 cf::reload_config;
3726 3846
3727 warn "loading extensions"; 3847 warn "loading extensions";
3728 cf::load_extensions; 3848 cf::load_extensions;
3729 3849
3850 if ($REATTACH_ON_RELOAD) {
3730 warn "reattaching attachments to objects/players"; 3851 warn "reattaching attachments to objects/players";
3731 _global_reattach; # objects, sockets 3852 _global_reattach; # objects, sockets
3732 warn "reattaching attachments to maps"; 3853 warn "reattaching attachments to maps";
3733 reattach $_ for values %MAP; 3854 reattach $_ for values %MAP;
3734 warn "reattaching attachments to players"; 3855 warn "reattaching attachments to players";
3735 reattach $_ for values %PLAYER; 3856 reattach $_ for values %PLAYER;
3857 }
3736 3858
3737 warn "running post_load"; 3859 warn "running post_init jobs";
3738 (pop @POST_INIT)->(1) while @POST_INIT; 3860 (pop @POST_INIT)->(1) while @POST_INIT;
3739 3861
3740 warn "leaving sync_job"; 3862 warn "leaving sync_job";
3741 3863
3742 1 3864 1
… …
3746 }; 3868 };
3747 3869
3748 warn "reloaded"; 3870 warn "reloaded";
3749 --$RELOAD; 3871 --$RELOAD;
3750 } 3872 }
3873
3874 $t1 = EV::time - $t1;
3875 warn "reload completed in ${t1}s\n";
3751}; 3876};
3752 3877
3753our $RELOAD_WATCHER; # used only during reload 3878our $RELOAD_WATCHER; # used only during reload
3754 3879
3755sub reload_perl() { 3880sub reload_perl() {
3756 # doing reload synchronously and two reloads happen back-to-back, 3881 # doing reload synchronously and two reloads happen back-to-back,
3757 # coro crashes during coro_state_free->destroy here. 3882 # coro crashes during coro_state_free->destroy here.
3758 3883
3884 $RELOAD_WATCHER ||= cf::async {
3885 Coro::AIO::aio_wait cache_extensions;
3886
3759 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 3887 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3760 do_reload_perl; 3888 do_reload_perl;
3761 undef $RELOAD_WATCHER; 3889 undef $RELOAD_WATCHER;
3890 };
3762 }; 3891 };
3763} 3892}
3764 3893
3765register_command "reload" => sub { 3894register_command "reload" => sub {
3766 my ($who, $arg) = @_; 3895 my ($who, $arg) = @_;
… …
3780 3909
3781our @WAIT_FOR_TICK; 3910our @WAIT_FOR_TICK;
3782our @WAIT_FOR_TICK_BEGIN; 3911our @WAIT_FOR_TICK_BEGIN;
3783 3912
3784sub wait_for_tick { 3913sub wait_for_tick {
3785 return if tick_inhibit || $Coro::current == $Coro::main; 3914 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3786 3915
3787 my $signal = new Coro::Signal; 3916 my $signal = new Coro::Signal;
3788 push @WAIT_FOR_TICK, $signal; 3917 push @WAIT_FOR_TICK, $signal;
3789 $signal->wait; 3918 $signal->wait;
3790} 3919}
3791 3920
3792sub wait_for_tick_begin { 3921sub wait_for_tick_begin {
3793 return if tick_inhibit || $Coro::current == $Coro::main; 3922 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3794 3923
3795 my $signal = new Coro::Signal; 3924 my $signal = new Coro::Signal;
3796 push @WAIT_FOR_TICK_BEGIN, $signal; 3925 push @WAIT_FOR_TICK_BEGIN, $signal;
3797 $signal->wait; 3926 $signal->wait;
3798} 3927}
… …
3803 unless ++$bug_warning > 10; 3932 unless ++$bug_warning > 10;
3804 return; 3933 return;
3805 } 3934 }
3806 3935
3807 cf::server_tick; # one server iteration 3936 cf::server_tick; # one server iteration
3937
3938 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
3808 3939
3809 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3940 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3810 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3941 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3811 Coro::async_pool { 3942 Coro::async_pool {
3812 $Coro::current->{desc} = "runtime saver"; 3943 $Coro::current->{desc} = "runtime saver";
… …
3835} 3966}
3836 3967
3837{ 3968{
3838 # configure BDB 3969 # configure BDB
3839 3970
3840 BDB::min_parallel 8; 3971 BDB::min_parallel 16;
3841 BDB::max_poll_reqs $TICK * 0.1; 3972 BDB::max_poll_reqs $TICK * 0.1;
3842 $AnyEvent::BDB::WATCHER->priority (1); 3973 $AnyEvent::BDB::WATCHER->priority (1);
3843 3974
3844 unless ($DB_ENV) { 3975 unless ($DB_ENV) {
3845 $DB_ENV = BDB::db_env_create; 3976 $DB_ENV = BDB::db_env_create;
… …
3925 LOG llevInfo, "[ABT] [suppressed]\n"; 4056 LOG llevInfo, "[ABT] [suppressed]\n";
3926 } 4057 }
3927} 4058}
3928 4059
3929# load additional modules 4060# load additional modules
3930use cf::pod; 4061require "cf/$_.pm" for @EXTRA_MODULES;
4062cf::_connect_to_perl_2;
3931 4063
3932END { cf::emergency_save } 4064END { cf::emergency_save }
3933 4065
39341 40661
3935 4067

Diff Legend

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