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.503 by root, Sat Jan 30 23:46:39 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 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}
… …
1332 } 1349 }
1333 1350
1334 cf::override; 1351 cf::override;
1335 }, 1352 },
1336); 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}
1337 1367
1338sub load_extensions { 1368sub load_extensions {
1339 cf::sync_job { 1369 cf::sync_job {
1340 my %todo; 1370 my %todo;
1341 1371
… …
1870 1900
1871 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1901 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1872 "$UNIQUEDIR/$path" 1902 "$UNIQUEDIR/$path"
1873} 1903}
1874 1904
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 { 1905sub decay_objects {
1885 my ($self) = @_; 1906 my ($self) = @_;
1886 1907
1887 return if $self->{deny_reset}; 1908 return if $self->{deny_reset};
1888 1909
… …
1970sub find { 1991sub find {
1971 my ($path, $origin) = @_; 1992 my ($path, $origin) = @_;
1972 1993
1973 $path = normalise $path, $origin && $origin->path; 1994 $path = normalise $path, $origin && $origin->path;
1974 1995
1975 cf::lock_wait "map_data:$path";#d#remove 1996 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1976 cf::lock_wait "map_find:$path"; 1997 my $guard2 = cf::lock_acquire "map_find:$path";
1977 1998
1978 $cf::MAP{$path} || do { 1999 $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 2000 my $map = new_from_path cf::map $path
1983 or return; 2001 or return;
1984 2002
1985 $map->{last_save} = $cf::RUNTIME; 2003 $map->{last_save} = $cf::RUNTIME;
1986 2004
… …
1998 2016
1999 $cf::MAP{$path} = $map 2017 $cf::MAP{$path} = $map
2000 } 2018 }
2001} 2019}
2002 2020
2003sub pre_load { } 2021sub pre_load { }
2004sub post_load { } 2022#sub post_load { } # XS
2005 2023
2006sub load { 2024sub load {
2007 my ($self) = @_; 2025 my ($self) = @_;
2008 2026
2009 local $self->{deny_reset} = 1; # loading can take a long time 2027 local $self->{deny_reset} = 1; # loading can take a long time
… …
2054 unless ($self->{deny_activate}) { 2072 unless ($self->{deny_activate}) {
2055 $self->decay_objects; 2073 $self->decay_objects;
2056 $self->fix_auto_apply; 2074 $self->fix_auto_apply;
2057 $self->update_buttons; 2075 $self->update_buttons;
2058 cf::cede_to_tick; 2076 cf::cede_to_tick;
2059 $self->set_darkness_map;
2060 cf::cede_to_tick;
2061 $self->activate; 2077 $self->activate;
2062 } 2078 }
2063 2079
2064 $self->{last_save} = $cf::RUNTIME; 2080 $self->{last_save} = $cf::RUNTIME;
2065 $self->last_access ($cf::RUNTIME); 2081 $self->last_access ($cf::RUNTIME);
… …
2231 2247
2232 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2248 my $lock = cf::lock_acquire "map_data:$self->{path}";
2233 2249
2234 return if $self->players; 2250 return if $self->players;
2235 2251
2236 warn "resetting map ", $self->path; 2252 warn "resetting map ", $self->path, "\n";
2237 2253
2238 $self->in_memory (cf::MAP_SWAPPED); 2254 $self->in_memory (cf::MAP_SWAPPED);
2239 2255
2240 # need to save uniques path 2256 # need to save uniques path
2241 unless ($self->{deny_save}) { 2257 unless ($self->{deny_save}) {
… …
2332 : normalise $_ 2348 : normalise $_
2333 } @{ aio_readdir $UNIQUEDIR or [] } 2349 } @{ aio_readdir $UNIQUEDIR or [] }
2334 ] 2350 ]
2335} 2351}
2336 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
2337=back 2385=back
2338 2386
2339=head3 cf::object 2387=head3 cf::object
2340 2388
2341=cut 2389=cut
… …
2406 2454
2407our $SAY_CHANNEL = { 2455our $SAY_CHANNEL = {
2408 id => "say", 2456 id => "say",
2409 title => "Map", 2457 title => "Map",
2410 reply => "say ", 2458 reply => "say ",
2411 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.",
2412}; 2460};
2413 2461
2414our $CHAT_CHANNEL = { 2462our $CHAT_CHANNEL = {
2415 id => "chat", 2463 id => "chat",
2416 title => "Chat", 2464 title => "Chat",
… …
2536 ($x, $y) = (-1, -1) 2584 ($x, $y) = (-1, -1)
2537 unless (defined $x) && (defined $y); 2585 unless (defined $x) && (defined $y);
2538 2586
2539 # use -1 or undef as default coordinates, not 0, 0 2587 # use -1 or undef as default coordinates, not 0, 0
2540 ($x, $y) = ($map->enter_x, $map->enter_y) 2588 ($x, $y) = ($map->enter_x, $map->enter_y)
2541 if $x <=0 && $y <= 0; 2589 if $x <= 0 && $y <= 0;
2542 2590
2543 $map->load; 2591 $map->load;
2544 $map->load_neighbours; 2592 $map->load_neighbours;
2545 2593
2546 return unless $self->contr->active; 2594 return unless $self->contr->active;
2547 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2548 $self->activate_recursive;
2549 2595
2550 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2596 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2551 $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;
2552} 2601}
2553 2602
2554=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2603=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2555 2604
2556Moves 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
… …
2744 2793
2745 utf8::encode $text; 2794 utf8::encode $text;
2746 $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);
2747} 2796}
2748 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
2749=item $client->send_msg ($channel, $msg, $color, [extra...]) 2823=item $client->send_msg ($channel, $msg, $color, [extra...])
2750 2824
2751Send 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
2752client 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
2753the 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
… …
2755 2829
2756=cut 2830=cut
2757 2831
2758# non-persistent channels (usually the info channel) 2832# non-persistent channels (usually the info channel)
2759our %CHANNEL = ( 2833our %CHANNEL = (
2834 "c/motd" => {
2835 id => "infobox",
2836 title => "MOTD",
2837 reply => undef,
2838 tooltip => "The message of the day",
2839 },
2760 "c/identify" => { 2840 "c/identify" => {
2761 id => "infobox", 2841 id => "infobox",
2762 title => "Identify", 2842 title => "Identify",
2763 reply => undef, 2843 reply => undef,
2764 tooltip => "Items recently identified", 2844 tooltip => "Items recently identified",
… …
2766 "c/examine" => { 2846 "c/examine" => {
2767 id => "infobox", 2847 id => "infobox",
2768 title => "Examine", 2848 title => "Examine",
2769 reply => undef, 2849 reply => undef,
2770 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",
2771 }, 2857 },
2772 "c/book" => { 2858 "c/book" => {
2773 id => "infobox", 2859 id => "infobox",
2774 title => "Book", 2860 title => "Book",
2775 reply => undef, 2861 reply => undef,
… …
2791 id => "infobox", 2877 id => "infobox",
2792 title => "Body Parts", 2878 title => "Body Parts",
2793 reply => undef, 2879 reply => undef,
2794 tooltip => "Shows which body parts you posess and are available", 2880 tooltip => "Shows which body parts you posess and are available",
2795 }, 2881 },
2882 "c/statistics" => {
2883 id => "infobox",
2884 title => "Statistics",
2885 reply => undef,
2886 tooltip => "Shows your primary statistics",
2887 },
2796 "c/skills" => { 2888 "c/skills" => {
2797 id => "infobox", 2889 id => "infobox",
2798 title => "Skills", 2890 title => "Skills",
2799 reply => undef, 2891 reply => undef,
2800 tooltip => "Shows your experience per skill and item power", 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",
2801 }, 2917 },
2802 "c/uptime" => { 2918 "c/uptime" => {
2803 id => "infobox", 2919 id => "infobox",
2804 title => "Uptime", 2920 title => "Uptime",
2805 reply => undef, 2921 reply => undef,
… …
2815 id => "party", 2931 id => "party",
2816 title => "Party", 2932 title => "Party",
2817 reply => "gsay ", 2933 reply => "gsay ",
2818 tooltip => "Messages and chat related to your party", 2934 tooltip => "Messages and chat related to your party",
2819 }, 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,
2820); 2944);
2821 2945
2822sub cf::client::send_msg { 2946sub cf::client::send_msg {
2823 my ($self, $channel, $msg, $color, @extra) = @_; 2947 my ($self, $channel, $msg, $color, @extra) = @_;
2824 2948
… …
2829 2953
2830 # check predefined channels, for the benefit of C 2954 # check predefined channels, for the benefit of C
2831 if ($CHANNEL{$channel}) { 2955 if ($CHANNEL{$channel}) {
2832 $channel = $CHANNEL{$channel}; 2956 $channel = $CHANNEL{$channel};
2833 2957
2834 $self->ext_msg (channel_info => $channel) 2958 $self->ext_msg (channel_info => $channel);
2835 if $self->can_msg;
2836
2837 $channel = $channel->{id}; 2959 $channel = $channel->{id};
2838 2960
2839 } elsif (ref $channel) { 2961 } elsif (ref $channel) {
2840 # send meta info to client, if not yet sent 2962 # send meta info to client, if not yet sent
2841 unless (exists $self->{channel}{$channel->{id}}) { 2963 unless (exists $self->{channel}{$channel->{id}}) {
2842 $self->{channel}{$channel->{id}} = $channel; 2964 $self->{channel}{$channel->{id}} = $channel;
2843 $self->ext_msg (channel_info => $channel) 2965 $self->ext_msg (channel_info => $channel);
2844 if $self->can_msg;
2845 } 2966 }
2846 2967
2847 $channel = $channel->{id}; 2968 $channel = $channel->{id};
2848 } 2969 }
2849 2970
2850 return unless @extra || length $msg; 2971 return unless @extra || length $msg;
2851 2972
2852 if ($self->can_msg) {
2853 # default colour, mask it out 2973 # default colour, mask it out
2854 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2974 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2855 if $color & cf::NDI_DEF; 2975 if $color & cf::NDI_DEF;
2856 2976
2857 my $pkt = "msg " 2977 my $pkt = "msg "
2858 . $self->{json_coder}->encode ( 2978 . $self->{json_coder}->encode (
2859 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2979 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2860 ); 2980 );
2861 2981
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); 2982 $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} 2983}
2899 2984
2900=item $client->ext_msg ($type, @msg) 2985=item $client->ext_msg ($type, @msg)
2901 2986
2902Sends an ext event to the client. 2987Sends an ext event to the client.
… …
2905 2990
2906sub cf::client::ext_msg($$@) { 2991sub cf::client::ext_msg($$@) {
2907 my ($self, $type, @msg) = @_; 2992 my ($self, $type, @msg) = @_;
2908 2993
2909 if ($self->extcmd == 2) { 2994 if ($self->extcmd == 2) {
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2995 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2911 } elsif ($self->extcmd == 1) { # TODO: remove 2996 } elsif ($self->extcmd == 1) { # TODO: remove
2912 push @msg, msgtype => "event_$type"; 2997 push @msg, msgtype => "event_$type";
2913 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2998 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2914 } 2999 }
2915} 3000}
2916 3001
2917=item $client->ext_reply ($msgid, @msg) 3002=item $client->ext_reply ($msgid, @msg)
2918 3003
… …
2922 3007
2923sub cf::client::ext_reply($$@) { 3008sub cf::client::ext_reply($$@) {
2924 my ($self, $id, @msg) = @_; 3009 my ($self, $id, @msg) = @_;
2925 3010
2926 if ($self->extcmd == 2) { 3011 if ($self->extcmd == 2) {
2927 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3012 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2928 } elsif ($self->extcmd == 1) { 3013 } elsif ($self->extcmd == 1) {
2929 #TODO: version 1, remove 3014 #TODO: version 1, remove
2930 unshift @msg, msgtype => "reply", msgid => $id; 3015 unshift @msg, msgtype => "reply", msgid => $id;
2931 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3016 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2932 } 3017 }
2933} 3018}
2934 3019
2935=item $success = $client->query ($flags, "text", \&cb) 3020=item $success = $client->query ($flags, "text", \&cb)
2936 3021
… …
3063our $safe_hole = new Safe::Hole; 3148our $safe_hole = new Safe::Hole;
3064 3149
3065$SIG{FPE} = 'IGNORE'; 3150$SIG{FPE} = 'IGNORE';
3066 3151
3067$safe->permit_only (Opcode::opset qw( 3152$safe->permit_only (Opcode::opset qw(
3068 :base_core :base_mem :base_orig :base_math 3153 :base_core :base_mem :base_orig :base_math :base_loop
3069 grepstart grepwhile mapstart mapwhile 3154 grepstart grepwhile mapstart mapwhile
3070 sort time 3155 sort time
3071)); 3156));
3072 3157
3073# here we export the classes and methods available to script code 3158# here we export the classes and methods available to script code
… …
3077The following functions and methods are available within a safe environment: 3162The following functions and methods are available within a safe environment:
3078 3163
3079 cf::object 3164 cf::object
3080 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
3081 insert remove name archname title slaying race decrease split 3166 insert remove name archname title slaying race decrease split
3167 value
3082 3168
3083 cf::object::player 3169 cf::object::player
3084 player 3170 player
3085 3171
3086 cf::player 3172 cf::player
… …
3092=cut 3178=cut
3093 3179
3094for ( 3180for (
3095 ["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
3096 insert remove inv nrof name archname title slaying race 3182 insert remove inv nrof name archname title slaying race
3097 decrease split destroy change_exp)], 3183 decrease split destroy change_exp value msg lore send_msg)],
3098 ["cf::object::player" => qw(player)], 3184 ["cf::object::player" => qw(player)],
3099 ["cf::player" => qw(peaceful)], 3185 ["cf::player" => qw(peaceful send_msg)],
3100 ["cf::map" => qw(trigger)], 3186 ["cf::map" => qw(trigger)],
3101) { 3187) {
3102 no strict 'refs'; 3188 no strict 'refs';
3103 my ($pkg, @funs) = @$_; 3189 my ($pkg, @funs) = @$_;
3104 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3190 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3122 3208
3123 my $qcode = $code; 3209 my $qcode = $code;
3124 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3210 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3125 $qcode =~ s/\n/\\n/g; 3211 $qcode =~ s/\n/\\n/g;
3126 3212
3213 %vars = (_dummy => 0) unless %vars;
3214
3215 my @res;
3127 local $_; 3216 local $_;
3128 local @safe::cf::_safe_eval_args = values %vars;
3129 3217
3130 my $eval = 3218 my $eval =
3131 "do {\n" 3219 "do {\n"
3132 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3220 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3133 . "#line 0 \"{$qcode}\"\n" 3221 . "#line 0 \"{$qcode}\"\n"
3134 . $code 3222 . $code
3135 . "\n}" 3223 . "\n}"
3136 ; 3224 ;
3137 3225
3226 if ($CFG{safe_eval}) {
3138 sub_generation_inc; 3227 sub_generation_inc;
3228 local @safe::cf::_safe_eval_args = values %vars;
3139 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3229 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3140 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 }
3141 3235
3142 if ($@) { 3236 if ($@) {
3143 warn "$@"; 3237 warn "$@";
3144 warn "while executing safe code '$code'\n"; 3238 warn "while executing safe code '$code'\n";
3145 warn "with arguments " . (join " ", %vars) . "\n"; 3239 warn "with arguments " . (join " ", %vars) . "\n";
… …
3164=cut 3258=cut
3165 3259
3166sub register_script_function { 3260sub register_script_function {
3167 my ($fun, $cb) = @_; 3261 my ($fun, $cb) = @_;
3168 3262
3169 no strict 'refs'; 3263 $fun = "safe::$fun" if $CFG{safe_eval};
3170 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3264 *$fun = $safe_hole->wrap ($cb);
3171} 3265}
3172 3266
3173=back 3267=back
3174 3268
3175=cut 3269=cut
… …
3196 3290
3197 $facedata->{version} == 2 3291 $facedata->{version} == 2
3198 or cf::cleanup "$path: version mismatch, cannot proceed."; 3292 or cf::cleanup "$path: version mismatch, cannot proceed.";
3199 3293
3200 # 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]);
3201 $facedata->{resource}{"res/exp_table"} = { 3296 $facedata->{resource}{"res/exp_table"} = {
3202 type => FT_RSRC, 3297 type => FT_RSRC,
3203 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),
3204 }; 3300 };
3205 cf::cede_to_tick; 3301 cf::cede_to_tick;
3206 3302
3207 { 3303 {
3208 my $faces = $facedata->{faceinfo}; 3304 my $faces = $facedata->{faceinfo};
… …
3210 while (my ($face, $info) = each %$faces) { 3306 while (my ($face, $info) = each %$faces) {
3211 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3307 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3212 3308
3213 cf::face::set_visibility $idx, $info->{visibility}; 3309 cf::face::set_visibility $idx, $info->{visibility};
3214 cf::face::set_magicmap $idx, $info->{magicmap}; 3310 cf::face::set_magicmap $idx, $info->{magicmap};
3215 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3311 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3216 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3312 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3217 3313
3218 cf::cede_to_tick; 3314 cf::cede_to_tick;
3219 } 3315 }
3220 3316
3221 while (my ($face, $info) = each %$faces) { 3317 while (my ($face, $info) = each %$faces) {
… …
3245 3341
3246 cf::anim::invalidate_all; # d'oh 3342 cf::anim::invalidate_all; # d'oh
3247 } 3343 }
3248 3344
3249 { 3345 {
3250 # TODO: for gcfclient pleasure, we should give resources
3251 # that gcfclient doesn't grok a >10000 face index.
3252 my $res = $facedata->{resource}; 3346 my $res = $facedata->{resource};
3253 3347
3254 while (my ($name, $info) = each %$res) { 3348 while (my ($name, $info) = each %$res) {
3255 if (defined $info->{type}) { 3349 if (defined $info->{type}) {
3256 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3350 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3257 my $data;
3258 3351
3259 if ($info->{type} & 1) { 3352 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}; 3353 cf::face::set_type $idx, $info->{type};
3274 } else { 3354 } else {
3275 $RESOURCE{$name} = $info; 3355 $RESOURCE{$name} = $info;
3276 } 3356 }
3277 3357
… …
3361 3441
3362 warn "finished reloading resource files\n"; 3442 warn "finished reloading resource files\n";
3363} 3443}
3364 3444
3365sub reload_config { 3445sub reload_config {
3446 warn "reloading config file...\n";
3447
3366 open my $fh, "<:utf8", "$CONFDIR/config" 3448 open my $fh, "<:utf8", "$CONFDIR/config"
3367 or return; 3449 or return;
3368 3450
3369 local $/; 3451 local $/;
3370 *CFG = YAML::Load <$fh>; 3452 *CFG = YAML::XS::Load scalar <$fh>;
3371 3453
3372 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3454 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3373 3455
3374 $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};
3375 $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};
… …
3379 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3461 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3380 and die "WARNING: m(un)lockall failed: $!\n"; 3462 and die "WARNING: m(un)lockall failed: $!\n";
3381 }; 3463 };
3382 warn $@ if $@; 3464 warn $@ if $@;
3383 } 3465 }
3466
3467 warn "finished reloading resource files\n";
3384} 3468}
3385 3469
3386sub pidfile() { 3470sub pidfile() {
3387 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3471 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3388 or die "$PIDFILE: $!"; 3472 or die "$PIDFILE: $!";
… …
3400 3484
3401 seek $fh, 0, 0; 3485 seek $fh, 0, 0;
3402 print $fh $$; 3486 print $fh $$;
3403} 3487}
3404 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
3405sub main { 3498sub main {
3406 cf::init_globals; # initialise logging 3499 cf::init_globals; # initialise logging
3407 3500
3408 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3501 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3409 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3502 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
… …
3412 3505
3413 cf::init_experience; 3506 cf::init_experience;
3414 cf::init_anim; 3507 cf::init_anim;
3415 cf::init_attackmess; 3508 cf::init_attackmess;
3416 cf::init_dynamic; 3509 cf::init_dynamic;
3417 cf::init_block;
3418 3510
3419 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3511 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3420 3512
3421 # we must not ever block the main coroutine 3513 # we must not ever block the main coroutine
3422 local $Coro::idle = sub { 3514 local $Coro::idle = sub {
… …
3428 }; 3520 };
3429 3521
3430 evthread_start IO::AIO::poll_fileno; 3522 evthread_start IO::AIO::poll_fileno;
3431 3523
3432 cf::sync_job { 3524 cf::sync_job {
3525 cf::load_settings;
3526 cf::load_materials;
3527
3433 reload_resources; 3528 reload_resources;
3434 reload_config; 3529 reload_config;
3435 db_init; 3530 db_init;
3436 3531
3437 cf::load_settings;
3438 cf::load_materials;
3439 cf::init_uuid; 3532 cf::init_uuid;
3440 cf::init_signals; 3533 cf::init_signals;
3441 cf::init_commands; 3534 cf::init_commands;
3442 cf::init_skills; 3535 cf::init_skills;
3443 3536
… …
3448 load_extensions; 3541 load_extensions;
3449 3542
3450 utime time, time, $RUNTIMEFILE; 3543 utime time, time, $RUNTIMEFILE;
3451 3544
3452 # no (long-running) fork's whatsoever before this point(!) 3545 # no (long-running) fork's whatsoever before this point(!)
3546 use POSIX ();
3453 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};
3454 3548
3455 (pop @POST_INIT)->(0) while @POST_INIT; 3549 (pop @POST_INIT)->(0) while @POST_INIT;
3456 }; 3550 };
3457 3551
3458 EV::loop; 3552 main_loop;
3459} 3553}
3460 3554
3461############################################################################# 3555#############################################################################
3462# initialisation and cleanup 3556# initialisation and cleanup
3463 3557
… …
3558} 3652}
3559 3653
3560sub emergency_save() { 3654sub emergency_save() {
3561 my $freeze_guard = cf::freeze_mainloop; 3655 my $freeze_guard = cf::freeze_mainloop;
3562 3656
3563 warn "enter emergency perl save\n"; 3657 warn "emergency_perl_save: enter\n";
3564 3658
3565 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
3566 # use a peculiar iteration method to avoid tripping on perl 3665 # use a peculiar iteration method to avoid tripping on perl
3567 # refcount bugs in for. also avoids problems with players 3666 # refcount bugs in for. also avoids problems with players
3568 # and maps saved/destroyed asynchronously. 3667 # and maps saved/destroyed asynchronously.
3569 warn "begin emergency player save\n"; 3668 warn "emergency_perl_save: begin player save\n";
3570 for my $login (keys %cf::PLAYER) { 3669 for my $login (keys %cf::PLAYER) {
3571 my $pl = $cf::PLAYER{$login} or next; 3670 my $pl = $cf::PLAYER{$login} or next;
3572 $pl->valid or next; 3671 $pl->valid or next;
3573 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3672 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3574 $pl->save; 3673 $pl->save;
3575 } 3674 }
3576 warn "end emergency player save\n"; 3675 warn "emergency_perl_save: end player save\n";
3577 3676
3578 warn "begin emergency map save\n"; 3677 warn "emergency_perl_save: begin map save\n";
3579 for my $path (keys %cf::MAP) { 3678 for my $path (keys %cf::MAP) {
3580 my $map = $cf::MAP{$path} or next; 3679 my $map = $cf::MAP{$path} or next;
3581 $map->valid or next; 3680 $map->valid or next;
3582 $map->save; 3681 $map->save;
3583 } 3682 }
3584 warn "end emergency map save\n"; 3683 warn "emergency_perl_save: end map save\n";
3585 3684
3586 warn "begin emergency database checkpoint\n"; 3685 warn "emergency_perl_save: begin database checkpoint\n";
3587 BDB::db_env_txn_checkpoint $DB_ENV; 3686 BDB::db_env_txn_checkpoint $DB_ENV;
3588 warn "end emergency database checkpoint\n"; 3687 warn "emergency_perl_save: end database checkpoint\n";
3589 3688
3590 warn "begin write uuid\n"; 3689 warn "emergency_perl_save: begin write uuid\n";
3591 write_uuid_sync 1; 3690 write_uuid_sync 1;
3592 warn "end write uuid\n"; 3691 warn "emergency_perl_save: end write uuid\n";
3593 }; 3692 };
3594 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
3595 warn "leave emergency perl save\n"; 3699 warn "emergency_perl_save: leave\n";
3596} 3700}
3597 3701
3598sub post_cleanup { 3702sub post_cleanup {
3599 my ($make_core) = @_; 3703 my ($make_core) = @_;
3600 3704
… …
3637 warn "can only reload from main coroutine"; 3741 warn "can only reload from main coroutine";
3638 return; 3742 return;
3639 } 3743 }
3640 3744
3641 return if $RELOAD++; 3745 return if $RELOAD++;
3746
3747 my $t1 = EV::time;
3642 3748
3643 while ($RELOAD) { 3749 while ($RELOAD) {
3644 warn "reloading..."; 3750 warn "reloading...";
3645 3751
3646 warn "entering sync_job"; 3752 warn "entering sync_job";
… …
3707 clear_package "safe::$_" 3813 clear_package "safe::$_"
3708 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);
3709 3815
3710 warn "unloading cf.pm \"a bit\""; 3816 warn "unloading cf.pm \"a bit\"";
3711 delete $INC{"cf.pm"}; 3817 delete $INC{"cf.pm"};
3712 delete $INC{"cf/pod.pm"}; 3818 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3713 3819
3714 # don't, removes xs symbols, too, 3820 # don't, removes xs symbols, too,
3715 # and global variables created in xs 3821 # and global variables created in xs
3716 #clear_package __PACKAGE__; 3822 #clear_package __PACKAGE__;
3717 3823
3718 warn "unload completed, starting to reload now"; 3824 warn "unload completed, starting to reload now";
3719 3825
3720 warn "reloading cf.pm"; 3826 warn "reloading cf.pm";
3721 require cf; 3827 require cf;
3722 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3828 cf::_connect_to_perl_1;
3723 3829
3724 warn "loading config and database again"; 3830 warn "loading config and database again";
3725 cf::reload_config; 3831 cf::reload_config;
3726 3832
3727 warn "loading extensions"; 3833 warn "loading extensions";
3728 cf::load_extensions; 3834 cf::load_extensions;
3729 3835
3836 if ($REATTACH_ON_RELOAD) {
3730 warn "reattaching attachments to objects/players"; 3837 warn "reattaching attachments to objects/players";
3731 _global_reattach; # objects, sockets 3838 _global_reattach; # objects, sockets
3732 warn "reattaching attachments to maps"; 3839 warn "reattaching attachments to maps";
3733 reattach $_ for values %MAP; 3840 reattach $_ for values %MAP;
3734 warn "reattaching attachments to players"; 3841 warn "reattaching attachments to players";
3735 reattach $_ for values %PLAYER; 3842 reattach $_ for values %PLAYER;
3843 }
3736 3844
3737 warn "running post_load"; 3845 warn "running post_init jobs";
3738 (pop @POST_INIT)->(1) while @POST_INIT; 3846 (pop @POST_INIT)->(1) while @POST_INIT;
3739 3847
3740 warn "leaving sync_job"; 3848 warn "leaving sync_job";
3741 3849
3742 1 3850 1
… …
3746 }; 3854 };
3747 3855
3748 warn "reloaded"; 3856 warn "reloaded";
3749 --$RELOAD; 3857 --$RELOAD;
3750 } 3858 }
3859
3860 $t1 = EV::time - $t1;
3861 warn "reload completed in ${t1}s\n";
3751}; 3862};
3752 3863
3753our $RELOAD_WATCHER; # used only during reload 3864our $RELOAD_WATCHER; # used only during reload
3754 3865
3755sub reload_perl() { 3866sub reload_perl() {
3756 # doing reload synchronously and two reloads happen back-to-back, 3867 # doing reload synchronously and two reloads happen back-to-back,
3757 # coro crashes during coro_state_free->destroy here. 3868 # coro crashes during coro_state_free->destroy here.
3758 3869
3870 $RELOAD_WATCHER ||= cf::async {
3871 Coro::AIO::aio_wait cache_extensions;
3872
3759 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 3873 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3760 do_reload_perl; 3874 do_reload_perl;
3761 undef $RELOAD_WATCHER; 3875 undef $RELOAD_WATCHER;
3876 };
3762 }; 3877 };
3763} 3878}
3764 3879
3765register_command "reload" => sub { 3880register_command "reload" => sub {
3766 my ($who, $arg) = @_; 3881 my ($who, $arg) = @_;
… …
3780 3895
3781our @WAIT_FOR_TICK; 3896our @WAIT_FOR_TICK;
3782our @WAIT_FOR_TICK_BEGIN; 3897our @WAIT_FOR_TICK_BEGIN;
3783 3898
3784sub wait_for_tick { 3899sub wait_for_tick {
3785 return if tick_inhibit || $Coro::current == $Coro::main; 3900 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3786 3901
3787 my $signal = new Coro::Signal; 3902 my $signal = new Coro::Signal;
3788 push @WAIT_FOR_TICK, $signal; 3903 push @WAIT_FOR_TICK, $signal;
3789 $signal->wait; 3904 $signal->wait;
3790} 3905}
3791 3906
3792sub wait_for_tick_begin { 3907sub wait_for_tick_begin {
3793 return if tick_inhibit || $Coro::current == $Coro::main; 3908 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3794 3909
3795 my $signal = new Coro::Signal; 3910 my $signal = new Coro::Signal;
3796 push @WAIT_FOR_TICK_BEGIN, $signal; 3911 push @WAIT_FOR_TICK_BEGIN, $signal;
3797 $signal->wait; 3912 $signal->wait;
3798} 3913}
… …
3803 unless ++$bug_warning > 10; 3918 unless ++$bug_warning > 10;
3804 return; 3919 return;
3805 } 3920 }
3806 3921
3807 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#
3808 3925
3809 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3926 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3810 $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.;
3811 Coro::async_pool { 3928 Coro::async_pool {
3812 $Coro::current->{desc} = "runtime saver"; 3929 $Coro::current->{desc} = "runtime saver";
… …
3835} 3952}
3836 3953
3837{ 3954{
3838 # configure BDB 3955 # configure BDB
3839 3956
3840 BDB::min_parallel 8; 3957 BDB::min_parallel 16;
3841 BDB::max_poll_reqs $TICK * 0.1; 3958 BDB::max_poll_reqs $TICK * 0.1;
3842 $AnyEvent::BDB::WATCHER->priority (1); 3959 $AnyEvent::BDB::WATCHER->priority (1);
3843 3960
3844 unless ($DB_ENV) { 3961 unless ($DB_ENV) {
3845 $DB_ENV = BDB::db_env_create; 3962 $DB_ENV = BDB::db_env_create;
… …
3925 LOG llevInfo, "[ABT] [suppressed]\n"; 4042 LOG llevInfo, "[ABT] [suppressed]\n";
3926 } 4043 }
3927} 4044}
3928 4045
3929# load additional modules 4046# load additional modules
3930use cf::pod; 4047require "cf/$_.pm" for @EXTRA_MODULES;
4048cf::_connect_to_perl_2;
3931 4049
3932END { cf::emergency_save } 4050END { cf::emergency_save }
3933 4051
39341 40521
3935 4053

Diff Legend

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