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.448 by root, Fri Sep 19 05:30:23 2008 UTC vs.
Revision 1.504 by root, Sat Jan 30 23:50:16 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
… …
66$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
68 71
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{ 74# make sure c-lzf reinitialises itself
72 # very ugly, but ensure we acquire the storable lock
73
74 sub net_mstore {
75 my $guard = Coro::Storable::guard;
76 &Storable::net_mstore
77 }
78
79 sub mretrieve {
80 my $guard = Coro::Storable::guard;
81 &Storable::mretrieve
82 }
83
84 Compress::LZF::set_serializer "Coro::Storable", "cf::net_mstore", "cf::mretrieve"; 75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
85 Compress::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
86} 77
78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
87 80
88sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
89 82
90our %COMMAND = (); 83our %COMMAND = ();
91our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
… …
94our %EXTCMD = (); 87our %EXTCMD = ();
95our %EXTICMD = (); 88our %EXTICMD = ();
96our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
97our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
98 91
99our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
100our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
101 96
102our $CONFDIR = confdir; 97our $CONFDIR = confdir;
103our $DATADIR = datadir; 98our $DATADIR = datadir;
104our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
105our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
… …
116our %RESOURCE; 111our %RESOURCE;
117 112
118our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
119our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
120our $NEXT_TICK; 115our $NEXT_TICK;
121our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
122 117
123our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
124our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
125our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
126our $DB_ENV; 121our $DB_ENV;
127 122
123our @EXTRA_MODULES = qw(pod match mapscript);
124
128our %CFG; 125our %CFG;
129 126
130our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
131our $RUNTIME; 128our $RUNTIME;
132our $NOW; 129our $NOW;
… …
140 137
141our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
142our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
143our $JITTER; # average jitter 140our $JITTER; # average jitter
144our $TICK_START; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
142
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 :)
145 147
146binmode STDOUT; 148binmode STDOUT;
147binmode STDERR; 149binmode STDERR;
148 150
149# read virtual server time, if available 151# read virtual server time, if available
… …
151 open my $fh, "<", $RUNTIMEFILE 153 open my $fh, "<", $RUNTIMEFILE
152 or die "unable to read $RUNTIMEFILE file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
153 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
154} 156}
155 157
158eval "sub TICK() { $TICK } 1" or die;
159
156mkdir $_ 160mkdir $_
157 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
158 162
159our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
160 164
161sub 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::"} };
162 177
163############################################################################# 178#############################################################################
164 179
165=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
166 181
… …
213returns 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
214per 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.
215 230
216=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
217 232
218This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
219C<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
220that call. 235that call.
221 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
222=back 243=back
223 244
224=cut 245=cut
225 246
226BEGIN { 247$Coro::State::WARNHOOK = sub {
227 *CORE::GLOBAL::warn = sub {
228 my $msg = join "", @_; 248 my $msg = join "", @_;
229 249
230 $msg .= "\n" 250 $msg .= "\n"
231 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
232 252
233 $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;
234 254
235 LOG llevError, $msg; 255 LOG llevError, $msg;
236 }; 256};
237}
238 257
239$Coro::State::DIEHOOK = sub { 258$Coro::State::DIEHOOK = sub {
240 return unless $^S eq 0; # "eq", not "==" 259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
241 262
242 if ($Coro::current == $Coro::main) {#d# 263 if ($Coro::current == $Coro::main) {#d#
243 warn "DIEHOOK called in main context, Coro bug?\n";#d# 264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
244 return;#d# 265 return;#d#
245 }#d# 266 }#d#
246 267
247 # kill coroutine otherwise 268 # kill coroutine otherwise
248 warn Carp::longmess $_[0];
249 Coro::terminate 269 Coro::terminate
250}; 270};
251
252$SIG{__DIE__} = sub { }; #d#?
253 271
254@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
255@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
256@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
257@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
271)) { 289)) {
272 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
273} 291}
274 292
275$EV::DIED = sub { 293$EV::DIED = sub {
276 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
277}; 295};
278 296
279############################################################################# 297#############################################################################
280 298
281=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
… …
318our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
319 337
320sub encode_json($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
321sub decode_json($) { $json_coder->decode ($_[0]) } 339sub decode_json($) { $json_coder->decode ($_[0]) }
322 340
341=item cf::post_init { BLOCK }
342
343Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again.
345
346The cdoeblock will have a single boolean argument to indicate whether this
347is a reload or not.
348
349=cut
350
351sub post_init(&) {
352 push @POST_INIT, shift;
353}
354
323=item cf::lock_wait $string 355=item cf::lock_wait $string
324 356
325Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
326 358
327=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
328 360
329Wait 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
330a 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,
331for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
332returned. 364returned.
333 365
334Locks 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
335deadlocked coro. 367deadlocked coro.
… …
341 373
342Return 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.
343 375
344=cut 376=cut
345 377
346our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
347our %LOCKER;#d#
348 379
349sub lock_wait($) { 380sub lock_wait($) {
350 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
351
352 if ($LOCKER{$key} == $Coro::current) {#d#
353 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
354 return;#d#
355 }#d#
356
357 # wait for lock, if any
358 while ($LOCK{$key}) {
359 push @{ $LOCK{$key} }, $Coro::current;
360 Coro::schedule;
361 }
362} 382}
363 383
364sub lock_acquire($) { 384sub lock_acquire($) {
365 my ($key) = @_; 385 $LOCKS->guard ($_[0])
366
367 # wait, to be sure we are not locked
368 lock_wait $key;
369
370 $LOCK{$key} = [];
371 $LOCKER{$key} = $Coro::current;#d#
372
373 Coro::guard {
374 delete $LOCKER{$key};#d#
375 # wake up all waiters, to be on the safe side
376 $_->ready for @{ delete $LOCK{$key} };
377 }
378} 386}
379 387
380sub lock_active($) { 388sub lock_active($) {
381 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
382
383 ! ! $LOCK{$key}
384} 390}
385 391
386sub freeze_mainloop { 392sub freeze_mainloop {
387 tick_inhibit_inc; 393 tick_inhibit_inc;
388 394
389 Coro::guard \&tick_inhibit_dec; 395 &Guard::guard (\&tick_inhibit_dec);
390} 396}
391 397
392=item cf::periodic $interval, $cb 398=item cf::periodic $interval, $cb
393 399
394Like 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
… …
417 423
418=cut 424=cut
419 425
420our @SLOT_QUEUE; 426our @SLOT_QUEUE;
421our $SLOT_QUEUE; 427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
422 429
423$SLOT_QUEUE->cancel if $SLOT_QUEUE; 430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
424$SLOT_QUEUE = Coro::async { 431$SLOT_QUEUE = Coro::async {
425 $Coro::current->desc ("timeslot manager"); 432 $Coro::current->desc ("timeslot manager");
426 433
427 my $signal = new Coro::Signal; 434 my $signal = new Coro::Signal;
435 my $busy;
428 436
429 while () { 437 while () {
430 next_job: 438 next_job:
439
431 my $avail = cf::till_tick; 440 my $avail = cf::till_tick;
432 if ($avail > 0.01) { 441
433 for (0 .. $#SLOT_QUEUE) { 442 for (0 .. $#SLOT_QUEUE) {
434 if ($SLOT_QUEUE[$_][0] < $avail) { 443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
435 my $job = splice @SLOT_QUEUE, $_, 1, (); 445 my $job = splice @SLOT_QUEUE, $_, 1, ();
436 $job->[2]->send; 446 $job->[2]->send;
437 Coro::cede; 447 Coro::cede;
438 goto next_job; 448 goto next_job;
439 } 449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
440 } 451 }
441 } 452 }
442 453
443 if (@SLOT_QUEUE) { 454 if (@SLOT_QUEUE) {
444 # 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
445 push @cf::WAIT_FOR_TICK, $signal; 456 push @cf::WAIT_FOR_TICK, $signal;
446 $signal->wait; 457 $signal->wait;
447 } else { 458 } else {
459 $busy = 0;
448 Coro::schedule; 460 Coro::schedule;
449 } 461 }
450 } 462 }
451}; 463};
452 464
453sub get_slot($;$$) { 465sub get_slot($;$$) {
454 return if tick_inhibit || $Coro::current == $Coro::main; 466 return if tick_inhibit || $Coro::current == $Coro::main;
455 467
456 my ($time, $pri, $name) = @_; 468 my ($time, $pri, $name) = @_;
457 469
458 $time = $TICK * .6 if $time > $TICK * .6; 470 $time = clamp $time, 0.01, $TICK * .6;
471
459 my $sig = new Coro::Signal; 472 my $sig = new Coro::Signal;
460 473
461 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
462 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
463 $SLOT_QUEUE->ready; 476 $SLOT_QUEUE->ready;
… …
1166 $decname, length $$rdata, scalar @$objs; 1179 $decname, length $$rdata, scalar @$objs;
1167 1180
1168 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1169 aio_chmod $fh, SAVE_MODE; 1182 aio_chmod $fh, SAVE_MODE;
1170 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1171 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 }
1172 aio_close $fh; 1188 aio_close $fh;
1173 1189
1174 if (@$objs) { 1190 if (@$objs) {
1175 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) {
1176 aio_chmod $fh, SAVE_MODE; 1192 aio_chmod $fh, SAVE_MODE;
1177 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1193 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1178 aio_write $fh, 0, (length $data), $data, 0; 1194 aio_write $fh, 0, (length $data), $data, 0;
1179 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 }
1180 aio_close $fh; 1199 aio_close $fh;
1181 aio_rename "$filename.pst~", "$filename.pst"; 1200 aio_rename "$filename.pst~", "$filename.pst";
1182 } 1201 }
1183 } else { 1202 } else {
1184 aio_unlink "$filename.pst"; 1203 aio_unlink "$filename.pst";
1185 } 1204 }
1186 1205
1187 aio_rename "$filename~", $filename; 1206 aio_rename "$filename~", $filename;
1207
1208 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC;
1188 } else { 1210 } else {
1189 warn "FATAL: $filename~: $!\n"; 1211 warn "unable to save objects: $filename~: $!\n";
1190 } 1212 }
1191 } else { 1213 } else {
1192 aio_unlink $filename; 1214 aio_unlink $filename;
1193 aio_unlink "$filename.pst"; 1215 aio_unlink "$filename.pst";
1194 } 1216 }
… …
1285 my ($name, $cb) = @_; 1307 my ($name, $cb) = @_;
1286 1308
1287 $EXTICMD{$name} = $cb; 1309 $EXTICMD{$name} = $cb;
1288} 1310}
1289 1311
1312use File::Glob ();
1313
1290cf::player->attach ( 1314cf::player->attach (
1291 on_command => sub { 1315 on_command => sub {
1292 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1293 1317
1294 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
… …
1325 } 1349 }
1326 1350
1327 cf::override; 1351 cf::override;
1328 }, 1352 },
1329); 1353);
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}
1330 1367
1331sub load_extensions { 1368sub load_extensions {
1332 cf::sync_job { 1369 cf::sync_job {
1333 my %todo; 1370 my %todo;
1334 1371
… …
1457 1494
1458sub exists($) { 1495sub exists($) {
1459 my ($login) = @_; 1496 my ($login) = @_;
1460 1497
1461 $cf::PLAYER{$login} 1498 $cf::PLAYER{$login}
1462 or cf::sync_job { !aio_stat path $login } 1499 or !aio_stat path $login
1463} 1500}
1464 1501
1465sub find($) { 1502sub find($) {
1466 return $cf::PLAYER{$_[0]} || do { 1503 return $cf::PLAYER{$_[0]} || do {
1467 my $login = $_[0]; 1504 my $login = $_[0];
… …
1863 1900
1864 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1901 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1865 "$UNIQUEDIR/$path" 1902 "$UNIQUEDIR/$path"
1866} 1903}
1867 1904
1868# and all this just because we cannot iterate over
1869# all maps in C++...
1870sub change_all_map_light {
1871 my ($change) = @_;
1872
1873 $_->change_map_light ($change)
1874 for grep $_->outdoor, values %cf::MAP;
1875}
1876
1877sub decay_objects { 1905sub decay_objects {
1878 my ($self) = @_; 1906 my ($self) = @_;
1879 1907
1880 return if $self->{deny_reset}; 1908 return if $self->{deny_reset};
1881 1909
… …
1963sub find { 1991sub find {
1964 my ($path, $origin) = @_; 1992 my ($path, $origin) = @_;
1965 1993
1966 $path = normalise $path, $origin && $origin->path; 1994 $path = normalise $path, $origin && $origin->path;
1967 1995
1968 cf::lock_wait "map_data:$path";#d#remove 1996 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1969 cf::lock_wait "map_find:$path"; 1997 my $guard2 = cf::lock_acquire "map_find:$path";
1970 1998
1971 $cf::MAP{$path} || do { 1999 $cf::MAP{$path} || do {
1972 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1973 my $guard2 = cf::lock_acquire "map_find:$path";
1974
1975 my $map = new_from_path cf::map $path 2000 my $map = new_from_path cf::map $path
1976 or return; 2001 or return;
1977 2002
1978 $map->{last_save} = $cf::RUNTIME; 2003 $map->{last_save} = $cf::RUNTIME;
1979 2004
… …
1991 2016
1992 $cf::MAP{$path} = $map 2017 $cf::MAP{$path} = $map
1993 } 2018 }
1994} 2019}
1995 2020
1996sub pre_load { } 2021sub pre_load { }
1997sub post_load { } 2022#sub post_load { } # XS
1998 2023
1999sub load { 2024sub load {
2000 my ($self) = @_; 2025 my ($self) = @_;
2001 2026
2002 local $self->{deny_reset} = 1; # loading can take a long time 2027 local $self->{deny_reset} = 1; # loading can take a long time
… …
2047 unless ($self->{deny_activate}) { 2072 unless ($self->{deny_activate}) {
2048 $self->decay_objects; 2073 $self->decay_objects;
2049 $self->fix_auto_apply; 2074 $self->fix_auto_apply;
2050 $self->update_buttons; 2075 $self->update_buttons;
2051 cf::cede_to_tick; 2076 cf::cede_to_tick;
2052 $self->set_darkness_map;
2053 cf::cede_to_tick;
2054 $self->activate; 2077 $self->activate;
2055 } 2078 }
2056 2079
2057 $self->{last_save} = $cf::RUNTIME; 2080 $self->{last_save} = $cf::RUNTIME;
2058 $self->last_access ($cf::RUNTIME); 2081 $self->last_access ($cf::RUNTIME);
… …
2224 2247
2225 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2248 my $lock = cf::lock_acquire "map_data:$self->{path}";
2226 2249
2227 return if $self->players; 2250 return if $self->players;
2228 2251
2229 warn "resetting map ", $self->path; 2252 warn "resetting map ", $self->path, "\n";
2230 2253
2231 $self->in_memory (cf::MAP_SWAPPED); 2254 $self->in_memory (cf::MAP_SWAPPED);
2232 2255
2233 # need to save uniques path 2256 # need to save uniques path
2234 unless ($self->{deny_save}) { 2257 unless ($self->{deny_save}) {
… …
2325 : normalise $_ 2348 : normalise $_
2326 } @{ aio_readdir $UNIQUEDIR or [] } 2349 } @{ aio_readdir $UNIQUEDIR or [] }
2327 ] 2350 ]
2328} 2351}
2329 2352
2353=item cf::map::static_maps
2354
2355Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2356file in the shared directory excluding F</styles> and F</editor>). May
2357block.
2358
2359=cut
2360
2361sub static_maps() {
2362 my @dirs = "";
2363 my @maps;
2364
2365 while (@dirs) {
2366 my $dir = shift @dirs;
2367
2368 next if $dir eq "/styles" || $dir eq "/editor";
2369
2370 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2371 or return;
2372
2373 for (@$files) {
2374 s/\.map$// or next;
2375 utf8::decode $_;
2376 push @maps, "$dir/$_";
2377 }
2378
2379 push @dirs, map "$dir/$_", @$dirs;
2380 }
2381
2382 \@maps
2383}
2384
2330=back 2385=back
2331 2386
2332=head3 cf::object 2387=head3 cf::object
2333 2388
2334=cut 2389=cut
… …
2399 2454
2400our $SAY_CHANNEL = { 2455our $SAY_CHANNEL = {
2401 id => "say", 2456 id => "say",
2402 title => "Map", 2457 title => "Map",
2403 reply => "say ", 2458 reply => "say ",
2404 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2459 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2405}; 2460};
2406 2461
2407our $CHAT_CHANNEL = { 2462our $CHAT_CHANNEL = {
2408 id => "chat", 2463 id => "chat",
2409 title => "Chat", 2464 title => "Chat",
… …
2529 ($x, $y) = (-1, -1) 2584 ($x, $y) = (-1, -1)
2530 unless (defined $x) && (defined $y); 2585 unless (defined $x) && (defined $y);
2531 2586
2532 # use -1 or undef as default coordinates, not 0, 0 2587 # use -1 or undef as default coordinates, not 0, 0
2533 ($x, $y) = ($map->enter_x, $map->enter_y) 2588 ($x, $y) = ($map->enter_x, $map->enter_y)
2534 if $x <=0 && $y <= 0; 2589 if $x <= 0 && $y <= 0;
2535 2590
2536 $map->load; 2591 $map->load;
2537 $map->load_neighbours; 2592 $map->load_neighbours;
2538 2593
2539 return unless $self->contr->active; 2594 return unless $self->contr->active;
2540 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2541 $self->activate_recursive;
2542 2595
2543 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2596 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2544 $self->enter_map ($map, $x, $y); 2597 $self->enter_map ($map, $x, $y);
2598
2599 # only activate afterwards, to support waiting in hooks
2600 $self->activate_recursive;
2545} 2601}
2546 2602
2547=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2603=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2548 2604
2549Moves the player to the given map-path and coordinates by first freezing 2605Moves the player to the given map-path and coordinates by first freezing
… …
2737 2793
2738 utf8::encode $text; 2794 utf8::encode $text;
2739 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2795 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2740} 2796}
2741 2797
2798=item $client->send_big_packet ($pkt)
2799
2800Like C<send_packet>, but tries to compress large packets, and fragments
2801them as required.
2802
2803=cut
2804
2805our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2806
2807sub cf::client::send_big_packet {
2808 my ($self, $pkt) = @_;
2809
2810 # try lzf for large packets
2811 $pkt = "lzf " . Compress::LZF::compress $pkt
2812 if 1024 <= length $pkt and $self->{can_lzf};
2813
2814 # split very large packets
2815 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2816 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2817 $pkt = "frag";
2818 }
2819
2820 $self->send_packet ($pkt);
2821}
2822
2742=item $client->send_msg ($channel, $msg, $color, [extra...]) 2823=item $client->send_msg ($channel, $msg, $color, [extra...])
2743 2824
2744Send a drawinfo or msg packet to the client, formatting the msg for the 2825Send a drawinfo or msg packet to the client, formatting the msg for the
2745client if neccessary. C<$type> should be a string identifying the type of 2826client if neccessary. C<$type> should be a string identifying the type of
2746the message, with C<log> being the default. If C<$color> is negative, suppress 2827the message, with C<log> being the default. If C<$color> is negative, suppress
… …
2748 2829
2749=cut 2830=cut
2750 2831
2751# non-persistent channels (usually the info channel) 2832# non-persistent channels (usually the info channel)
2752our %CHANNEL = ( 2833our %CHANNEL = (
2834 "c/motd" => {
2835 id => "infobox",
2836 title => "MOTD",
2837 reply => undef,
2838 tooltip => "The message of the day",
2839 },
2753 "c/identify" => { 2840 "c/identify" => {
2754 id => "infobox", 2841 id => "infobox",
2755 title => "Identify", 2842 title => "Identify",
2756 reply => undef, 2843 reply => undef,
2757 tooltip => "Items recently identified", 2844 tooltip => "Items recently identified",
… …
2759 "c/examine" => { 2846 "c/examine" => {
2760 id => "infobox", 2847 id => "infobox",
2761 title => "Examine", 2848 title => "Examine",
2762 reply => undef, 2849 reply => undef,
2763 tooltip => "Signs and other items you examined", 2850 tooltip => "Signs and other items you examined",
2851 },
2852 "c/shopinfo" => {
2853 id => "infobox",
2854 title => "Shop Info",
2855 reply => undef,
2856 tooltip => "What your bargaining skill tells you about the shop",
2764 }, 2857 },
2765 "c/book" => { 2858 "c/book" => {
2766 id => "infobox", 2859 id => "infobox",
2767 title => "Book", 2860 title => "Book",
2768 reply => undef, 2861 reply => undef,
… …
2784 id => "infobox", 2877 id => "infobox",
2785 title => "Body Parts", 2878 title => "Body Parts",
2786 reply => undef, 2879 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available", 2880 tooltip => "Shows which body parts you posess and are available",
2788 }, 2881 },
2882 "c/statistics" => {
2883 id => "infobox",
2884 title => "Statistics",
2885 reply => undef,
2886 tooltip => "Shows your primary statistics",
2887 },
2888 "c/skills" => {
2889 id => "infobox",
2890 title => "Skills",
2891 reply => undef,
2892 tooltip => "Shows your experience per skill and item power",
2893 },
2894 "c/shopitems" => {
2895 id => "infobox",
2896 title => "Shop Items",
2897 reply => undef,
2898 tooltip => "Shows the items currently for sale in this shop",
2899 },
2900 "c/resistances" => {
2901 id => "infobox",
2902 title => "Resistances",
2903 reply => undef,
2904 tooltip => "Shows your resistances",
2905 },
2906 "c/pets" => {
2907 id => "infobox",
2908 title => "Pets",
2909 reply => undef,
2910 tooltip => "Shows information abotu your pets/a specific pet",
2911 },
2912 "c/perceiveself" => {
2913 id => "infobox",
2914 title => "Perceive Self",
2915 reply => undef,
2916 tooltip => "You gained detailed knowledge about yourself",
2917 },
2789 "c/uptime" => { 2918 "c/uptime" => {
2790 id => "infobox", 2919 id => "infobox",
2791 title => "Uptime", 2920 title => "Uptime",
2792 reply => undef, 2921 reply => undef,
2793 tooltip => "How long the server has been running since last restart", 2922 tooltip => "How long the server has been running since last restart",
… …
2802 id => "party", 2931 id => "party",
2803 title => "Party", 2932 title => "Party",
2804 reply => "gsay ", 2933 reply => "gsay ",
2805 tooltip => "Messages and chat related to your party", 2934 tooltip => "Messages and chat related to your party",
2806 }, 2935 },
2936 "c/death" => {
2937 id => "death",
2938 title => "Death",
2939 reply => undef,
2940 tooltip => "Reason for and more info about your most recent death",
2941 },
2942 "c/say" => $SAY_CHANNEL,
2943 "c/chat" => $CHAT_CHANNEL,
2807); 2944);
2808 2945
2809sub cf::client::send_msg { 2946sub cf::client::send_msg {
2810 my ($self, $channel, $msg, $color, @extra) = @_; 2947 my ($self, $channel, $msg, $color, @extra) = @_;
2811 2948
… …
2816 2953
2817 # check predefined channels, for the benefit of C 2954 # check predefined channels, for the benefit of C
2818 if ($CHANNEL{$channel}) { 2955 if ($CHANNEL{$channel}) {
2819 $channel = $CHANNEL{$channel}; 2956 $channel = $CHANNEL{$channel};
2820 2957
2821 $self->ext_msg (channel_info => $channel) 2958 $self->ext_msg (channel_info => $channel);
2822 if $self->can_msg;
2823
2824 $channel = $channel->{id}; 2959 $channel = $channel->{id};
2825 2960
2826 } elsif (ref $channel) { 2961 } elsif (ref $channel) {
2827 # send meta info to client, if not yet sent 2962 # send meta info to client, if not yet sent
2828 unless (exists $self->{channel}{$channel->{id}}) { 2963 unless (exists $self->{channel}{$channel->{id}}) {
2829 $self->{channel}{$channel->{id}} = $channel; 2964 $self->{channel}{$channel->{id}} = $channel;
2830 $self->ext_msg (channel_info => $channel) 2965 $self->ext_msg (channel_info => $channel);
2831 if $self->can_msg;
2832 } 2966 }
2833 2967
2834 $channel = $channel->{id}; 2968 $channel = $channel->{id};
2835 } 2969 }
2836 2970
2837 return unless @extra || length $msg; 2971 return unless @extra || length $msg;
2838 2972
2839 if ($self->can_msg) {
2840 # default colour, mask it out 2973 # default colour, mask it out
2841 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2974 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2842 if $color & cf::NDI_DEF; 2975 if $color & cf::NDI_DEF;
2843 2976
2844 my $pkt = "msg " 2977 my $pkt = "msg "
2845 . $self->{json_coder}->encode ( 2978 . $self->{json_coder}->encode (
2846 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2979 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2847 ); 2980 );
2848 2981
2849 # try lzf for large packets
2850 $pkt = "lzf " . Compress::LZF::compress $pkt
2851 if 1024 <= length $pkt and $self->{can_lzf};
2852
2853 # split very large packets
2854 if (8192 < length $pkt and $self->{can_lzf}) {
2855 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2856 $pkt = "frag";
2857 }
2858
2859 $self->send_packet ($pkt); 2982 $self->send_big_packet ($pkt);
2860 } else {
2861 if ($color >= 0) {
2862 # replace some tags by gcfclient-compatible ones
2863 for ($msg) {
2864 1 while
2865 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2866 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2867 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2868 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2869 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2870 }
2871
2872 $color &= cf::NDI_COLOR_MASK;
2873
2874 utf8::encode $msg;
2875
2876 if (0 && $msg =~ /\[/) {
2877 # COMMAND/INFO
2878 $self->send_packet ("drawextinfo $color 10 8 $msg")
2879 } else {
2880 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2881 $self->send_packet ("drawinfo $color $msg")
2882 }
2883 }
2884 }
2885} 2983}
2886 2984
2887=item $client->ext_msg ($type, @msg) 2985=item $client->ext_msg ($type, @msg)
2888 2986
2889Sends an ext event to the client. 2987Sends an ext event to the client.
… …
2892 2990
2893sub cf::client::ext_msg($$@) { 2991sub cf::client::ext_msg($$@) {
2894 my ($self, $type, @msg) = @_; 2992 my ($self, $type, @msg) = @_;
2895 2993
2896 if ($self->extcmd == 2) { 2994 if ($self->extcmd == 2) {
2897 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2995 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2898 } elsif ($self->extcmd == 1) { # TODO: remove 2996 } elsif ($self->extcmd == 1) { # TODO: remove
2899 push @msg, msgtype => "event_$type"; 2997 push @msg, msgtype => "event_$type";
2900 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2998 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2901 } 2999 }
2902} 3000}
2903 3001
2904=item $client->ext_reply ($msgid, @msg) 3002=item $client->ext_reply ($msgid, @msg)
2905 3003
… …
2909 3007
2910sub cf::client::ext_reply($$@) { 3008sub cf::client::ext_reply($$@) {
2911 my ($self, $id, @msg) = @_; 3009 my ($self, $id, @msg) = @_;
2912 3010
2913 if ($self->extcmd == 2) { 3011 if ($self->extcmd == 2) {
2914 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3012 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2915 } elsif ($self->extcmd == 1) { 3013 } elsif ($self->extcmd == 1) {
2916 #TODO: version 1, remove 3014 #TODO: version 1, remove
2917 unshift @msg, msgtype => "reply", msgid => $id; 3015 unshift @msg, msgtype => "reply", msgid => $id;
2918 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3016 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2919 } 3017 }
2920} 3018}
2921 3019
2922=item $success = $client->query ($flags, "text", \&cb) 3020=item $success = $client->query ($flags, "text", \&cb)
2923 3021
… …
3050our $safe_hole = new Safe::Hole; 3148our $safe_hole = new Safe::Hole;
3051 3149
3052$SIG{FPE} = 'IGNORE'; 3150$SIG{FPE} = 'IGNORE';
3053 3151
3054$safe->permit_only (Opcode::opset qw( 3152$safe->permit_only (Opcode::opset qw(
3055 :base_core :base_mem :base_orig :base_math 3153 :base_core :base_mem :base_orig :base_math :base_loop
3056 grepstart grepwhile mapstart mapwhile 3154 grepstart grepwhile mapstart mapwhile
3057 sort time 3155 sort time
3058)); 3156));
3059 3157
3060# here we export the classes and methods available to script code 3158# here we export the classes and methods available to script code
… …
3064The following functions and methods are available within a safe environment: 3162The following functions and methods are available within a safe environment:
3065 3163
3066 cf::object 3164 cf::object
3067 contr pay_amount pay_player map x y force_find force_add destroy 3165 contr pay_amount pay_player map x y force_find force_add destroy
3068 insert remove name archname title slaying race decrease split 3166 insert remove name archname title slaying race decrease split
3167 value
3069 3168
3070 cf::object::player 3169 cf::object::player
3071 player 3170 player
3072 3171
3073 cf::player 3172 cf::player
… …
3079=cut 3178=cut
3080 3179
3081for ( 3180for (
3082 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3181 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3083 insert remove inv nrof name archname title slaying race 3182 insert remove inv nrof name archname title slaying race
3084 decrease split destroy change_exp)], 3183 decrease split destroy change_exp value msg lore send_msg)],
3085 ["cf::object::player" => qw(player)], 3184 ["cf::object::player" => qw(player)],
3086 ["cf::player" => qw(peaceful)], 3185 ["cf::player" => qw(peaceful send_msg)],
3087 ["cf::map" => qw(trigger)], 3186 ["cf::map" => qw(trigger)],
3088) { 3187) {
3089 no strict 'refs'; 3188 no strict 'refs';
3090 my ($pkg, @funs) = @$_; 3189 my ($pkg, @funs) = @$_;
3091 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3190 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3109 3208
3110 my $qcode = $code; 3209 my $qcode = $code;
3111 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3210 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3112 $qcode =~ s/\n/\\n/g; 3211 $qcode =~ s/\n/\\n/g;
3113 3212
3213 %vars = (_dummy => 0) unless %vars;
3214
3215 my @res;
3114 local $_; 3216 local $_;
3115 local @safe::cf::_safe_eval_args = values %vars;
3116 3217
3117 my $eval = 3218 my $eval =
3118 "do {\n" 3219 "do {\n"
3119 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3220 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3120 . "#line 0 \"{$qcode}\"\n" 3221 . "#line 0 \"{$qcode}\"\n"
3121 . $code 3222 . $code
3122 . "\n}" 3223 . "\n}"
3123 ; 3224 ;
3124 3225
3226 if ($CFG{safe_eval}) {
3125 sub_generation_inc; 3227 sub_generation_inc;
3228 local @safe::cf::_safe_eval_args = values %vars;
3126 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3229 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3127 sub_generation_inc; 3230 sub_generation_inc;
3231 } else {
3232 local @cf::_safe_eval_args = values %vars;
3233 @res = wantarray ? eval eval : scalar eval $eval;
3234 }
3128 3235
3129 if ($@) { 3236 if ($@) {
3130 warn "$@"; 3237 warn "$@";
3131 warn "while executing safe code '$code'\n"; 3238 warn "while executing safe code '$code'\n";
3132 warn "with arguments " . (join " ", %vars) . "\n"; 3239 warn "with arguments " . (join " ", %vars) . "\n";
… …
3151=cut 3258=cut
3152 3259
3153sub register_script_function { 3260sub register_script_function {
3154 my ($fun, $cb) = @_; 3261 my ($fun, $cb) = @_;
3155 3262
3156 no strict 'refs'; 3263 $fun = "safe::$fun" if $CFG{safe_eval};
3157 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3264 *$fun = $safe_hole->wrap ($cb);
3158} 3265}
3159 3266
3160=back 3267=back
3161 3268
3162=cut 3269=cut
… …
3183 3290
3184 $facedata->{version} == 2 3291 $facedata->{version} == 2
3185 or cf::cleanup "$path: version mismatch, cannot proceed."; 3292 or cf::cleanup "$path: version mismatch, cannot proceed.";
3186 3293
3187 # patch in the exptable 3294 # patch in the exptable
3295 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3188 $facedata->{resource}{"res/exp_table"} = { 3296 $facedata->{resource}{"res/exp_table"} = {
3189 type => FT_RSRC, 3297 type => FT_RSRC,
3190 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3298 data => $exp_table,
3299 hash => (Digest::MD5::md5 $exp_table),
3191 }; 3300 };
3192 cf::cede_to_tick; 3301 cf::cede_to_tick;
3193 3302
3194 { 3303 {
3195 my $faces = $facedata->{faceinfo}; 3304 my $faces = $facedata->{faceinfo};
… …
3197 while (my ($face, $info) = each %$faces) { 3306 while (my ($face, $info) = each %$faces) {
3198 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3307 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3199 3308
3200 cf::face::set_visibility $idx, $info->{visibility}; 3309 cf::face::set_visibility $idx, $info->{visibility};
3201 cf::face::set_magicmap $idx, $info->{magicmap}; 3310 cf::face::set_magicmap $idx, $info->{magicmap};
3202 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3311 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3203 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3312 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3204 3313
3205 cf::cede_to_tick; 3314 cf::cede_to_tick;
3206 } 3315 }
3207 3316
3208 while (my ($face, $info) = each %$faces) { 3317 while (my ($face, $info) = each %$faces) {
… …
3232 3341
3233 cf::anim::invalidate_all; # d'oh 3342 cf::anim::invalidate_all; # d'oh
3234 } 3343 }
3235 3344
3236 { 3345 {
3237 # TODO: for gcfclient pleasure, we should give resources
3238 # that gcfclient doesn't grok a >10000 face index.
3239 my $res = $facedata->{resource}; 3346 my $res = $facedata->{resource};
3240 3347
3241 while (my ($name, $info) = each %$res) { 3348 while (my ($name, $info) = each %$res) {
3242 if (defined $info->{type}) { 3349 if (defined $info->{type}) {
3243 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3350 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3244 my $data;
3245 3351
3246 if ($info->{type} & 1) { 3352 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3247 # prepend meta info
3248
3249 my $meta = $enc->encode ({
3250 name => $name,
3251 %{ $info->{meta} || {} },
3252 });
3253
3254 $data = pack "(w/a*)*", $meta, $info->{data};
3255 } else {
3256 $data = $info->{data};
3257 }
3258
3259 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3260 cf::face::set_type $idx, $info->{type}; 3353 cf::face::set_type $idx, $info->{type};
3261 } else { 3354 } else {
3262 $RESOURCE{$name} = $info; 3355 $RESOURCE{$name} = $info;
3263 } 3356 }
3264 3357
… …
3347 reload_treasures; 3440 reload_treasures;
3348 3441
3349 warn "finished reloading resource files\n"; 3442 warn "finished reloading resource files\n";
3350} 3443}
3351 3444
3352sub init {
3353 my $guard = freeze_mainloop;
3354
3355 evthread_start IO::AIO::poll_fileno;
3356
3357 reload_resources;
3358}
3359
3360sub reload_config { 3445sub reload_config {
3446 warn "reloading config file...\n";
3447
3361 open my $fh, "<:utf8", "$CONFDIR/config" 3448 open my $fh, "<:utf8", "$CONFDIR/config"
3362 or return; 3449 or return;
3363 3450
3364 local $/; 3451 local $/;
3365 *CFG = YAML::Load <$fh>; 3452 *CFG = YAML::XS::Load scalar <$fh>;
3366 3453
3367 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3454 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3368 3455
3369 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3456 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3370 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3457 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3374 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3461 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3375 and die "WARNING: m(un)lockall failed: $!\n"; 3462 and die "WARNING: m(un)lockall failed: $!\n";
3376 }; 3463 };
3377 warn $@ if $@; 3464 warn $@ if $@;
3378 } 3465 }
3466
3467 warn "finished reloading resource files\n";
3379} 3468}
3380 3469
3381sub pidfile() { 3470sub pidfile() {
3382 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3471 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3383 or die "$PIDFILE: $!"; 3472 or die "$PIDFILE: $!";
… …
3395 3484
3396 seek $fh, 0, 0; 3485 seek $fh, 0, 0;
3397 print $fh $$; 3486 print $fh $$;
3398} 3487}
3399 3488
3489sub main_loop {
3490 warn "EV::loop starting\n";
3491 if (1) {
3492 EV::loop;
3493 }
3494 warn "EV::loop returned\n";
3495 goto &main_loop unless $REALLY_UNLOOP;
3496}
3497
3400sub main { 3498sub main {
3401 atomic; 3499 cf::init_globals; # initialise logging
3500
3501 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3502 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3503 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3504 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3505
3506 cf::init_experience;
3507 cf::init_anim;
3508 cf::init_attackmess;
3509 cf::init_dynamic;
3510
3511 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3402 3512
3403 # we must not ever block the main coroutine 3513 # we must not ever block the main coroutine
3404 local $Coro::idle = sub { 3514 local $Coro::idle = sub {
3405 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3515 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3406 (async { 3516 (async {
3407 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3517 $Coro::current->{desc} = "IDLE BUG HANDLER";
3408 EV::loop EV::LOOP_ONESHOT; 3518 EV::loop EV::LOOP_ONESHOT;
3409 })->prio (Coro::PRIO_MAX); 3519 })->prio (Coro::PRIO_MAX);
3410 }; 3520 };
3411 3521
3412 { 3522 evthread_start IO::AIO::poll_fileno;
3413 my $guard = freeze_mainloop; 3523
3524 cf::sync_job {
3525 cf::load_settings;
3526 cf::load_materials;
3527
3528 reload_resources;
3414 reload_config; 3529 reload_config;
3415 db_init; 3530 db_init;
3531
3532 cf::init_uuid;
3533 cf::init_signals;
3534 cf::init_commands;
3535 cf::init_skills;
3536
3537 cf::init_beforeplay;
3538
3539 atomic;
3540
3416 load_extensions; 3541 load_extensions;
3417 3542
3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3419 }
3420
3421 utime time, time, $RUNTIMEFILE; 3543 utime time, time, $RUNTIMEFILE;
3422 3544
3423 # no (long-running) fork's whatsoever before this point(!) 3545 # no (long-running) fork's whatsoever before this point(!)
3546 use POSIX ();
3424 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3547 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3425 3548
3426 EV::loop; 3549 (pop @POST_INIT)->(0) while @POST_INIT;
3550 };
3551
3552 main_loop;
3427} 3553}
3428 3554
3429############################################################################# 3555#############################################################################
3430# initialisation and cleanup 3556# initialisation and cleanup
3431 3557
… …
3487 my $uuid = "$LOCALDIR/uuid"; 3613 my $uuid = "$LOCALDIR/uuid";
3488 3614
3489 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3615 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3490 or return; 3616 or return;
3491 3617
3492 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3618 my $value = uuid_seq uuid_cur;
3619
3620 unless ($value) {
3621 warn "cowardly refusing to write zero uuid value!\n";
3622 return;
3623 }
3624
3625 my $value = uuid_str $value + $uuid_skip;
3493 $uuid_skip = 0; 3626 $uuid_skip = 0;
3494 3627
3495 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3628 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3496 and return; 3629 and return;
3497 3630
… …
3519} 3652}
3520 3653
3521sub emergency_save() { 3654sub emergency_save() {
3522 my $freeze_guard = cf::freeze_mainloop; 3655 my $freeze_guard = cf::freeze_mainloop;
3523 3656
3524 warn "enter emergency perl save\n"; 3657 warn "emergency_perl_save: enter\n";
3525 3658
3526 cf::sync_job { 3659 cf::sync_job {
3660 # this is a trade-off: we want to be very quick here, so
3661 # save all maps without fsync, and later call a global sync
3662 # (which in turn might be very very slow)
3663 local $USE_FSYNC = 0;
3664
3527 # use a peculiar iteration method to avoid tripping on perl 3665 # use a peculiar iteration method to avoid tripping on perl
3528 # refcount bugs in for. also avoids problems with players 3666 # refcount bugs in for. also avoids problems with players
3529 # and maps saved/destroyed asynchronously. 3667 # and maps saved/destroyed asynchronously.
3530 warn "begin emergency player save\n"; 3668 warn "emergency_perl_save: begin player save\n";
3531 for my $login (keys %cf::PLAYER) { 3669 for my $login (keys %cf::PLAYER) {
3532 my $pl = $cf::PLAYER{$login} or next; 3670 my $pl = $cf::PLAYER{$login} or next;
3533 $pl->valid or next; 3671 $pl->valid or next;
3534 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3672 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3535 $pl->save; 3673 $pl->save;
3536 } 3674 }
3537 warn "end emergency player save\n"; 3675 warn "emergency_perl_save: end player save\n";
3538 3676
3539 warn "begin emergency map save\n"; 3677 warn "emergency_perl_save: begin map save\n";
3540 for my $path (keys %cf::MAP) { 3678 for my $path (keys %cf::MAP) {
3541 my $map = $cf::MAP{$path} or next; 3679 my $map = $cf::MAP{$path} or next;
3542 $map->valid or next; 3680 $map->valid or next;
3543 $map->save; 3681 $map->save;
3544 } 3682 }
3545 warn "end emergency map save\n"; 3683 warn "emergency_perl_save: end map save\n";
3546 3684
3547 warn "begin emergency database checkpoint\n"; 3685 warn "emergency_perl_save: begin database checkpoint\n";
3548 BDB::db_env_txn_checkpoint $DB_ENV; 3686 BDB::db_env_txn_checkpoint $DB_ENV;
3549 warn "end emergency database checkpoint\n"; 3687 warn "emergency_perl_save: end database checkpoint\n";
3550 3688
3551 warn "begin write uuid\n"; 3689 warn "emergency_perl_save: begin write uuid\n";
3552 write_uuid_sync 1; 3690 write_uuid_sync 1;
3553 warn "end write uuid\n"; 3691 warn "emergency_perl_save: end write uuid\n";
3554 }; 3692 };
3555 3693
3694 warn "emergency_perl_save: starting sync()\n";
3695 IO::AIO::aio_sync sub {
3696 warn "emergency_perl_save: finished sync()\n";
3697 };
3698
3556 warn "leave emergency perl save\n"; 3699 warn "emergency_perl_save: leave\n";
3557} 3700}
3558 3701
3559sub post_cleanup { 3702sub post_cleanup {
3560 my ($make_core) = @_; 3703 my ($make_core) = @_;
3561 3704
… …
3587 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3730 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3588 for my $name (keys %$leaf_symtab) { 3731 for my $name (keys %$leaf_symtab) {
3589 _gv_clear *{"$pkg$name"}; 3732 _gv_clear *{"$pkg$name"};
3590# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3733# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3591 } 3734 }
3592 warn "cleared package #$pkg\n";#d# 3735 warn "cleared package $pkg\n";#d#
3593} 3736}
3594
3595our $RELOAD; # how many times to reload
3596 3737
3597sub do_reload_perl() { 3738sub do_reload_perl() {
3598 # can/must only be called in main 3739 # can/must only be called in main
3599 if ($Coro::current != $Coro::main) { 3740 if ($Coro::current != $Coro::main) {
3600 warn "can only reload from main coroutine"; 3741 warn "can only reload from main coroutine";
3601 return; 3742 return;
3602 } 3743 }
3603 3744
3604 return if $RELOAD++; 3745 return if $RELOAD++;
3746
3747 my $t1 = EV::time;
3605 3748
3606 while ($RELOAD) { 3749 while ($RELOAD) {
3607 warn "reloading..."; 3750 warn "reloading...";
3608 3751
3609 warn "entering sync_job"; 3752 warn "entering sync_job";
… …
3670 clear_package "safe::$_" 3813 clear_package "safe::$_"
3671 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3814 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3672 3815
3673 warn "unloading cf.pm \"a bit\""; 3816 warn "unloading cf.pm \"a bit\"";
3674 delete $INC{"cf.pm"}; 3817 delete $INC{"cf.pm"};
3675 delete $INC{"cf/pod.pm"}; 3818 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3676 3819
3677 # don't, removes xs symbols, too, 3820 # don't, removes xs symbols, too,
3678 # and global variables created in xs 3821 # and global variables created in xs
3679 #clear_package __PACKAGE__; 3822 #clear_package __PACKAGE__;
3680 3823
3681 warn "unload completed, starting to reload now"; 3824 warn "unload completed, starting to reload now";
3682 3825
3683 warn "reloading cf.pm"; 3826 warn "reloading cf.pm";
3684 require cf; 3827 require cf;
3685 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3828 cf::_connect_to_perl_1;
3686 3829
3687 warn "loading config and database again"; 3830 warn "loading config and database again";
3688 cf::reload_config; 3831 cf::reload_config;
3689 3832
3690 warn "loading extensions"; 3833 warn "loading extensions";
3691 cf::load_extensions; 3834 cf::load_extensions;
3692 3835
3836 if ($REATTACH_ON_RELOAD) {
3693 warn "reattaching attachments to objects/players"; 3837 warn "reattaching attachments to objects/players";
3694 _global_reattach; # objects, sockets 3838 _global_reattach; # objects, sockets
3695 warn "reattaching attachments to maps"; 3839 warn "reattaching attachments to maps";
3696 reattach $_ for values %MAP; 3840 reattach $_ for values %MAP;
3697 warn "reattaching attachments to players"; 3841 warn "reattaching attachments to players";
3698 reattach $_ for values %PLAYER; 3842 reattach $_ for values %PLAYER;
3843 }
3844
3845 warn "running post_init jobs";
3846 (pop @POST_INIT)->(1) while @POST_INIT;
3699 3847
3700 warn "leaving sync_job"; 3848 warn "leaving sync_job";
3701 3849
3702 1 3850 1
3703 } or do { 3851 } or do {
… …
3706 }; 3854 };
3707 3855
3708 warn "reloaded"; 3856 warn "reloaded";
3709 --$RELOAD; 3857 --$RELOAD;
3710 } 3858 }
3859
3860 $t1 = EV::time - $t1;
3861 warn "reload completed in ${t1}s\n";
3711}; 3862};
3712 3863
3713our $RELOAD_WATCHER; # used only during reload 3864our $RELOAD_WATCHER; # used only during reload
3714 3865
3715sub reload_perl() { 3866sub reload_perl() {
3716 # doing reload synchronously and two reloads happen back-to-back, 3867 # doing reload synchronously and two reloads happen back-to-back,
3717 # coro crashes during coro_state_free->destroy here. 3868 # coro crashes during coro_state_free->destroy here.
3718 3869
3870 $RELOAD_WATCHER ||= cf::async {
3871 Coro::AIO::aio_wait cache_extensions;
3872
3719 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3873 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3720 do_reload_perl; 3874 do_reload_perl;
3721 undef $RELOAD_WATCHER; 3875 undef $RELOAD_WATCHER;
3876 };
3722 }; 3877 };
3723} 3878}
3724 3879
3725register_command "reload" => sub { 3880register_command "reload" => sub {
3726 my ($who, $arg) = @_; 3881 my ($who, $arg) = @_;
… …
3740 3895
3741our @WAIT_FOR_TICK; 3896our @WAIT_FOR_TICK;
3742our @WAIT_FOR_TICK_BEGIN; 3897our @WAIT_FOR_TICK_BEGIN;
3743 3898
3744sub wait_for_tick { 3899sub wait_for_tick {
3745 return if tick_inhibit || $Coro::current == $Coro::main; 3900 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3746 3901
3747 my $signal = new Coro::Signal; 3902 my $signal = new Coro::Signal;
3748 push @WAIT_FOR_TICK, $signal; 3903 push @WAIT_FOR_TICK, $signal;
3749 $signal->wait; 3904 $signal->wait;
3750} 3905}
3751 3906
3752sub wait_for_tick_begin { 3907sub wait_for_tick_begin {
3753 return if tick_inhibit || $Coro::current == $Coro::main; 3908 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3754 3909
3755 my $signal = new Coro::Signal; 3910 my $signal = new Coro::Signal;
3756 push @WAIT_FOR_TICK_BEGIN, $signal; 3911 push @WAIT_FOR_TICK_BEGIN, $signal;
3757 $signal->wait; 3912 $signal->wait;
3758} 3913}
… …
3763 unless ++$bug_warning > 10; 3918 unless ++$bug_warning > 10;
3764 return; 3919 return;
3765 } 3920 }
3766 3921
3767 cf::server_tick; # one server iteration 3922 cf::server_tick; # one server iteration
3923
3924 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
3768 3925
3769 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3926 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3770 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3927 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3771 Coro::async_pool { 3928 Coro::async_pool {
3772 $Coro::current->{desc} = "runtime saver"; 3929 $Coro::current->{desc} = "runtime saver";
… …
3795} 3952}
3796 3953
3797{ 3954{
3798 # configure BDB 3955 # configure BDB
3799 3956
3800 BDB::min_parallel 8; 3957 BDB::min_parallel 16;
3801 BDB::max_poll_reqs $TICK * 0.1; 3958 BDB::max_poll_reqs $TICK * 0.1;
3802 $AnyEvent::BDB::WATCHER->priority (1); 3959 $AnyEvent::BDB::WATCHER->priority (1);
3803 3960
3804 unless ($DB_ENV) { 3961 unless ($DB_ENV) {
3805 $DB_ENV = BDB::db_env_create; 3962 $DB_ENV = BDB::db_env_create;
… …
3885 LOG llevInfo, "[ABT] [suppressed]\n"; 4042 LOG llevInfo, "[ABT] [suppressed]\n";
3886 } 4043 }
3887} 4044}
3888 4045
3889# load additional modules 4046# load additional modules
3890use cf::pod; 4047require "cf/$_.pm" for @EXTRA_MODULES;
4048cf::_connect_to_perl_2;
3891 4049
3892END { cf::emergency_save } 4050END { cf::emergency_save }
3893 4051
38941 40521
3895 4053

Diff Legend

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