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.501 by root, Sat Jan 16 23:27:21 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
… …
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
… …
1166 $decname, length $$rdata, scalar @$objs; 1172 $decname, length $$rdata, scalar @$objs;
1167 1173
1168 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1169 aio_chmod $fh, SAVE_MODE; 1175 aio_chmod $fh, SAVE_MODE;
1170 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1171 aio_fsync $fh if $cf::USE_FSYNC; 1177 if ($cf::USE_FSYNC) {
1178 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;
1179 aio_fsync $fh;
1180 }
1172 aio_close $fh; 1181 aio_close $fh;
1173 1182
1174 if (@$objs) { 1183 if (@$objs) {
1175 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1184 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1176 aio_chmod $fh, SAVE_MODE; 1185 aio_chmod $fh, SAVE_MODE;
1177 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1186 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1178 aio_write $fh, 0, (length $data), $data, 0; 1187 aio_write $fh, 0, (length $data), $data, 0;
1179 aio_fsync $fh if $cf::USE_FSYNC; 1188 if ($cf::USE_FSYNC) {
1189 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;
1190 aio_fsync $fh;
1191 }
1180 aio_close $fh; 1192 aio_close $fh;
1181 aio_rename "$filename.pst~", "$filename.pst"; 1193 aio_rename "$filename.pst~", "$filename.pst";
1182 } 1194 }
1183 } else { 1195 } else {
1184 aio_unlink "$filename.pst"; 1196 aio_unlink "$filename.pst";
1185 } 1197 }
1186 1198
1187 aio_rename "$filename~", $filename; 1199 aio_rename "$filename~", $filename;
1200
1201 $filename =~ s%/[^/]+$%%;
1202 aio_pathsync $filename if $cf::USE_FSYNC;
1188 } else { 1203 } else {
1189 warn "FATAL: $filename~: $!\n"; 1204 warn "unable to save objects: $filename~: $!\n";
1190 } 1205 }
1191 } else { 1206 } else {
1192 aio_unlink $filename; 1207 aio_unlink $filename;
1193 aio_unlink "$filename.pst"; 1208 aio_unlink "$filename.pst";
1194 } 1209 }
… …
1285 my ($name, $cb) = @_; 1300 my ($name, $cb) = @_;
1286 1301
1287 $EXTICMD{$name} = $cb; 1302 $EXTICMD{$name} = $cb;
1288} 1303}
1289 1304
1305use File::Glob ();
1306
1290cf::player->attach ( 1307cf::player->attach (
1291 on_command => sub { 1308 on_command => sub {
1292 my ($pl, $name, $params) = @_; 1309 my ($pl, $name, $params) = @_;
1293 1310
1294 my $cb = $COMMAND{$name} 1311 my $cb = $COMMAND{$name}
… …
1325 } 1342 }
1326 1343
1327 cf::override; 1344 cf::override;
1328 }, 1345 },
1329); 1346);
1347
1348# "readahead" all extensions
1349sub cache_extensions {
1350 my $grp = IO::AIO::aio_group;
1351
1352 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1353 for (grep /\.ext$/, @{$_[0]}) {
1354 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1355 }
1356 };
1357
1358 $grp
1359}
1330 1360
1331sub load_extensions { 1361sub load_extensions {
1332 cf::sync_job { 1362 cf::sync_job {
1333 my %todo; 1363 my %todo;
1334 1364
… …
1457 1487
1458sub exists($) { 1488sub exists($) {
1459 my ($login) = @_; 1489 my ($login) = @_;
1460 1490
1461 $cf::PLAYER{$login} 1491 $cf::PLAYER{$login}
1462 or cf::sync_job { !aio_stat path $login } 1492 or !aio_stat path $login
1463} 1493}
1464 1494
1465sub find($) { 1495sub find($) {
1466 return $cf::PLAYER{$_[0]} || do { 1496 return $cf::PLAYER{$_[0]} || do {
1467 my $login = $_[0]; 1497 my $login = $_[0];
… …
1863 1893
1864 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1894 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1865 "$UNIQUEDIR/$path" 1895 "$UNIQUEDIR/$path"
1866} 1896}
1867 1897
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 { 1898sub decay_objects {
1878 my ($self) = @_; 1899 my ($self) = @_;
1879 1900
1880 return if $self->{deny_reset}; 1901 return if $self->{deny_reset};
1881 1902
… …
1963sub find { 1984sub find {
1964 my ($path, $origin) = @_; 1985 my ($path, $origin) = @_;
1965 1986
1966 $path = normalise $path, $origin && $origin->path; 1987 $path = normalise $path, $origin && $origin->path;
1967 1988
1968 cf::lock_wait "map_data:$path";#d#remove 1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1969 cf::lock_wait "map_find:$path"; 1990 my $guard2 = cf::lock_acquire "map_find:$path";
1970 1991
1971 $cf::MAP{$path} || do { 1992 $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 1993 my $map = new_from_path cf::map $path
1976 or return; 1994 or return;
1977 1995
1978 $map->{last_save} = $cf::RUNTIME; 1996 $map->{last_save} = $cf::RUNTIME;
1979 1997
… …
1991 2009
1992 $cf::MAP{$path} = $map 2010 $cf::MAP{$path} = $map
1993 } 2011 }
1994} 2012}
1995 2013
1996sub pre_load { } 2014sub pre_load { }
1997sub post_load { } 2015#sub post_load { } # XS
1998 2016
1999sub load { 2017sub load {
2000 my ($self) = @_; 2018 my ($self) = @_;
2001 2019
2002 local $self->{deny_reset} = 1; # loading can take a long time 2020 local $self->{deny_reset} = 1; # loading can take a long time
… …
2047 unless ($self->{deny_activate}) { 2065 unless ($self->{deny_activate}) {
2048 $self->decay_objects; 2066 $self->decay_objects;
2049 $self->fix_auto_apply; 2067 $self->fix_auto_apply;
2050 $self->update_buttons; 2068 $self->update_buttons;
2051 cf::cede_to_tick; 2069 cf::cede_to_tick;
2052 $self->set_darkness_map;
2053 cf::cede_to_tick;
2054 $self->activate; 2070 $self->activate;
2055 } 2071 }
2056 2072
2057 $self->{last_save} = $cf::RUNTIME; 2073 $self->{last_save} = $cf::RUNTIME;
2058 $self->last_access ($cf::RUNTIME); 2074 $self->last_access ($cf::RUNTIME);
… …
2224 2240
2225 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2226 2242
2227 return if $self->players; 2243 return if $self->players;
2228 2244
2229 warn "resetting map ", $self->path; 2245 warn "resetting map ", $self->path, "\n";
2230 2246
2231 $self->in_memory (cf::MAP_SWAPPED); 2247 $self->in_memory (cf::MAP_SWAPPED);
2232 2248
2233 # need to save uniques path 2249 # need to save uniques path
2234 unless ($self->{deny_save}) { 2250 unless ($self->{deny_save}) {
… …
2325 : normalise $_ 2341 : normalise $_
2326 } @{ aio_readdir $UNIQUEDIR or [] } 2342 } @{ aio_readdir $UNIQUEDIR or [] }
2327 ] 2343 ]
2328} 2344}
2329 2345
2346=item cf::map::static_maps
2347
2348Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2349file in the shared directory excluding F</styles> and F</editor>). May
2350block.
2351
2352=cut
2353
2354sub static_maps() {
2355 my @dirs = "";
2356 my @maps;
2357
2358 while (@dirs) {
2359 my $dir = shift @dirs;
2360
2361 next if $dir eq "/styles" || $dir eq "/editor";
2362
2363 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2364 or return;
2365
2366 for (@$files) {
2367 s/\.map$// or next;
2368 utf8::decode $_;
2369 push @maps, "$dir/$_";
2370 }
2371
2372 push @dirs, map "$dir/$_", @$dirs;
2373 }
2374
2375 \@maps
2376}
2377
2330=back 2378=back
2331 2379
2332=head3 cf::object 2380=head3 cf::object
2333 2381
2334=cut 2382=cut
… …
2399 2447
2400our $SAY_CHANNEL = { 2448our $SAY_CHANNEL = {
2401 id => "say", 2449 id => "say",
2402 title => "Map", 2450 title => "Map",
2403 reply => "say ", 2451 reply => "say ",
2404 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2452 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2405}; 2453};
2406 2454
2407our $CHAT_CHANNEL = { 2455our $CHAT_CHANNEL = {
2408 id => "chat", 2456 id => "chat",
2409 title => "Chat", 2457 title => "Chat",
… …
2529 ($x, $y) = (-1, -1) 2577 ($x, $y) = (-1, -1)
2530 unless (defined $x) && (defined $y); 2578 unless (defined $x) && (defined $y);
2531 2579
2532 # use -1 or undef as default coordinates, not 0, 0 2580 # use -1 or undef as default coordinates, not 0, 0
2533 ($x, $y) = ($map->enter_x, $map->enter_y) 2581 ($x, $y) = ($map->enter_x, $map->enter_y)
2534 if $x <=0 && $y <= 0; 2582 if $x <= 0 && $y <= 0;
2535 2583
2536 $map->load; 2584 $map->load;
2537 $map->load_neighbours; 2585 $map->load_neighbours;
2538 2586
2539 return unless $self->contr->active; 2587 return unless $self->contr->active;
2540 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2541 $self->activate_recursive;
2542 2588
2543 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2589 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2544 $self->enter_map ($map, $x, $y); 2590 $self->enter_map ($map, $x, $y);
2591
2592 # only activate afterwards, to support waiting in hooks
2593 $self->activate_recursive;
2545} 2594}
2546 2595
2547=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2596=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2548 2597
2549Moves the player to the given map-path and coordinates by first freezing 2598Moves the player to the given map-path and coordinates by first freezing
… …
2737 2786
2738 utf8::encode $text; 2787 utf8::encode $text;
2739 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2788 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2740} 2789}
2741 2790
2791=item $client->send_big_packet ($pkt)
2792
2793Like C<send_packet>, but tries to compress large packets, and fragments
2794them as required.
2795
2796=cut
2797
2798our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2799
2800sub cf::client::send_big_packet {
2801 my ($self, $pkt) = @_;
2802
2803 # try lzf for large packets
2804 $pkt = "lzf " . Compress::LZF::compress $pkt
2805 if 1024 <= length $pkt and $self->{can_lzf};
2806
2807 # split very large packets
2808 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2809 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2810 $pkt = "frag";
2811 }
2812
2813 $self->send_packet ($pkt);
2814}
2815
2742=item $client->send_msg ($channel, $msg, $color, [extra...]) 2816=item $client->send_msg ($channel, $msg, $color, [extra...])
2743 2817
2744Send a drawinfo or msg packet to the client, formatting the msg for the 2818Send 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 2819client 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 2820the message, with C<log> being the default. If C<$color> is negative, suppress
… …
2748 2822
2749=cut 2823=cut
2750 2824
2751# non-persistent channels (usually the info channel) 2825# non-persistent channels (usually the info channel)
2752our %CHANNEL = ( 2826our %CHANNEL = (
2827 "c/motd" => {
2828 id => "infobox",
2829 title => "MOTD",
2830 reply => undef,
2831 tooltip => "The message of the day",
2832 },
2753 "c/identify" => { 2833 "c/identify" => {
2754 id => "infobox", 2834 id => "infobox",
2755 title => "Identify", 2835 title => "Identify",
2756 reply => undef, 2836 reply => undef,
2757 tooltip => "Items recently identified", 2837 tooltip => "Items recently identified",
… …
2759 "c/examine" => { 2839 "c/examine" => {
2760 id => "infobox", 2840 id => "infobox",
2761 title => "Examine", 2841 title => "Examine",
2762 reply => undef, 2842 reply => undef,
2763 tooltip => "Signs and other items you examined", 2843 tooltip => "Signs and other items you examined",
2844 },
2845 "c/shopinfo" => {
2846 id => "infobox",
2847 title => "Shop Info",
2848 reply => undef,
2849 tooltip => "What your bargaining skill tells you about the shop",
2764 }, 2850 },
2765 "c/book" => { 2851 "c/book" => {
2766 id => "infobox", 2852 id => "infobox",
2767 title => "Book", 2853 title => "Book",
2768 reply => undef, 2854 reply => undef,
… …
2784 id => "infobox", 2870 id => "infobox",
2785 title => "Body Parts", 2871 title => "Body Parts",
2786 reply => undef, 2872 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available", 2873 tooltip => "Shows which body parts you posess and are available",
2788 }, 2874 },
2875 "c/statistics" => {
2876 id => "infobox",
2877 title => "Statistics",
2878 reply => undef,
2879 tooltip => "Shows your primary statistics",
2880 },
2881 "c/skills" => {
2882 id => "infobox",
2883 title => "Skills",
2884 reply => undef,
2885 tooltip => "Shows your experience per skill and item power",
2886 },
2887 "c/shopitems" => {
2888 id => "infobox",
2889 title => "Shop Items",
2890 reply => undef,
2891 tooltip => "Shows the items currently for sale in this shop",
2892 },
2893 "c/resistances" => {
2894 id => "infobox",
2895 title => "Resistances",
2896 reply => undef,
2897 tooltip => "Shows your resistances",
2898 },
2899 "c/pets" => {
2900 id => "infobox",
2901 title => "Pets",
2902 reply => undef,
2903 tooltip => "Shows information abotu your pets/a specific pet",
2904 },
2905 "c/perceiveself" => {
2906 id => "infobox",
2907 title => "Perceive Self",
2908 reply => undef,
2909 tooltip => "You gained detailed knowledge about yourself",
2910 },
2789 "c/uptime" => { 2911 "c/uptime" => {
2790 id => "infobox", 2912 id => "infobox",
2791 title => "Uptime", 2913 title => "Uptime",
2792 reply => undef, 2914 reply => undef,
2793 tooltip => "How long the server has been running since last restart", 2915 tooltip => "How long the server has been running since last restart",
… …
2802 id => "party", 2924 id => "party",
2803 title => "Party", 2925 title => "Party",
2804 reply => "gsay ", 2926 reply => "gsay ",
2805 tooltip => "Messages and chat related to your party", 2927 tooltip => "Messages and chat related to your party",
2806 }, 2928 },
2929 "c/death" => {
2930 id => "death",
2931 title => "Death",
2932 reply => undef,
2933 tooltip => "Reason for and more info about your most recent death",
2934 },
2935 "c/say" => $SAY_CHANNEL,
2936 "c/chat" => $CHAT_CHANNEL,
2807); 2937);
2808 2938
2809sub cf::client::send_msg { 2939sub cf::client::send_msg {
2810 my ($self, $channel, $msg, $color, @extra) = @_; 2940 my ($self, $channel, $msg, $color, @extra) = @_;
2811 2941
… …
2816 2946
2817 # check predefined channels, for the benefit of C 2947 # check predefined channels, for the benefit of C
2818 if ($CHANNEL{$channel}) { 2948 if ($CHANNEL{$channel}) {
2819 $channel = $CHANNEL{$channel}; 2949 $channel = $CHANNEL{$channel};
2820 2950
2821 $self->ext_msg (channel_info => $channel) 2951 $self->ext_msg (channel_info => $channel);
2822 if $self->can_msg;
2823
2824 $channel = $channel->{id}; 2952 $channel = $channel->{id};
2825 2953
2826 } elsif (ref $channel) { 2954 } elsif (ref $channel) {
2827 # send meta info to client, if not yet sent 2955 # send meta info to client, if not yet sent
2828 unless (exists $self->{channel}{$channel->{id}}) { 2956 unless (exists $self->{channel}{$channel->{id}}) {
2829 $self->{channel}{$channel->{id}} = $channel; 2957 $self->{channel}{$channel->{id}} = $channel;
2830 $self->ext_msg (channel_info => $channel) 2958 $self->ext_msg (channel_info => $channel);
2831 if $self->can_msg;
2832 } 2959 }
2833 2960
2834 $channel = $channel->{id}; 2961 $channel = $channel->{id};
2835 } 2962 }
2836 2963
2837 return unless @extra || length $msg; 2964 return unless @extra || length $msg;
2838 2965
2839 if ($self->can_msg) {
2840 # default colour, mask it out 2966 # default colour, mask it out
2841 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2967 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2842 if $color & cf::NDI_DEF; 2968 if $color & cf::NDI_DEF;
2843 2969
2844 my $pkt = "msg " 2970 my $pkt = "msg "
2845 . $self->{json_coder}->encode ( 2971 . $self->{json_coder}->encode (
2846 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2972 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2847 ); 2973 );
2848 2974
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); 2975 $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} 2976}
2886 2977
2887=item $client->ext_msg ($type, @msg) 2978=item $client->ext_msg ($type, @msg)
2888 2979
2889Sends an ext event to the client. 2980Sends an ext event to the client.
… …
2892 2983
2893sub cf::client::ext_msg($$@) { 2984sub cf::client::ext_msg($$@) {
2894 my ($self, $type, @msg) = @_; 2985 my ($self, $type, @msg) = @_;
2895 2986
2896 if ($self->extcmd == 2) { 2987 if ($self->extcmd == 2) {
2897 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2988 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2898 } elsif ($self->extcmd == 1) { # TODO: remove 2989 } elsif ($self->extcmd == 1) { # TODO: remove
2899 push @msg, msgtype => "event_$type"; 2990 push @msg, msgtype => "event_$type";
2900 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2991 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2901 } 2992 }
2902} 2993}
2903 2994
2904=item $client->ext_reply ($msgid, @msg) 2995=item $client->ext_reply ($msgid, @msg)
2905 2996
… …
2909 3000
2910sub cf::client::ext_reply($$@) { 3001sub cf::client::ext_reply($$@) {
2911 my ($self, $id, @msg) = @_; 3002 my ($self, $id, @msg) = @_;
2912 3003
2913 if ($self->extcmd == 2) { 3004 if ($self->extcmd == 2) {
2914 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3005 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2915 } elsif ($self->extcmd == 1) { 3006 } elsif ($self->extcmd == 1) {
2916 #TODO: version 1, remove 3007 #TODO: version 1, remove
2917 unshift @msg, msgtype => "reply", msgid => $id; 3008 unshift @msg, msgtype => "reply", msgid => $id;
2918 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3009 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2919 } 3010 }
2920} 3011}
2921 3012
2922=item $success = $client->query ($flags, "text", \&cb) 3013=item $success = $client->query ($flags, "text", \&cb)
2923 3014
… …
3050our $safe_hole = new Safe::Hole; 3141our $safe_hole = new Safe::Hole;
3051 3142
3052$SIG{FPE} = 'IGNORE'; 3143$SIG{FPE} = 'IGNORE';
3053 3144
3054$safe->permit_only (Opcode::opset qw( 3145$safe->permit_only (Opcode::opset qw(
3055 :base_core :base_mem :base_orig :base_math 3146 :base_core :base_mem :base_orig :base_math :base_loop
3056 grepstart grepwhile mapstart mapwhile 3147 grepstart grepwhile mapstart mapwhile
3057 sort time 3148 sort time
3058)); 3149));
3059 3150
3060# here we export the classes and methods available to script code 3151# here we export the classes and methods available to script code
… …
3064The following functions and methods are available within a safe environment: 3155The following functions and methods are available within a safe environment:
3065 3156
3066 cf::object 3157 cf::object
3067 contr pay_amount pay_player map x y force_find force_add destroy 3158 contr pay_amount pay_player map x y force_find force_add destroy
3068 insert remove name archname title slaying race decrease split 3159 insert remove name archname title slaying race decrease split
3160 value
3069 3161
3070 cf::object::player 3162 cf::object::player
3071 player 3163 player
3072 3164
3073 cf::player 3165 cf::player
… …
3079=cut 3171=cut
3080 3172
3081for ( 3173for (
3082 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3174 ["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 3175 insert remove inv nrof name archname title slaying race
3084 decrease split destroy change_exp)], 3176 decrease split destroy change_exp value msg lore send_msg)],
3085 ["cf::object::player" => qw(player)], 3177 ["cf::object::player" => qw(player)],
3086 ["cf::player" => qw(peaceful)], 3178 ["cf::player" => qw(peaceful send_msg)],
3087 ["cf::map" => qw(trigger)], 3179 ["cf::map" => qw(trigger)],
3088) { 3180) {
3089 no strict 'refs'; 3181 no strict 'refs';
3090 my ($pkg, @funs) = @$_; 3182 my ($pkg, @funs) = @$_;
3091 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3183 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3109 3201
3110 my $qcode = $code; 3202 my $qcode = $code;
3111 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3203 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3112 $qcode =~ s/\n/\\n/g; 3204 $qcode =~ s/\n/\\n/g;
3113 3205
3206 %vars = (_dummy => 0) unless %vars;
3207
3208 my @res;
3114 local $_; 3209 local $_;
3115 local @safe::cf::_safe_eval_args = values %vars;
3116 3210
3117 my $eval = 3211 my $eval =
3118 "do {\n" 3212 "do {\n"
3119 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3213 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3120 . "#line 0 \"{$qcode}\"\n" 3214 . "#line 0 \"{$qcode}\"\n"
3121 . $code 3215 . $code
3122 . "\n}" 3216 . "\n}"
3123 ; 3217 ;
3124 3218
3219 if ($CFG{safe_eval}) {
3125 sub_generation_inc; 3220 sub_generation_inc;
3221 local @safe::cf::_safe_eval_args = values %vars;
3126 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3222 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3127 sub_generation_inc; 3223 sub_generation_inc;
3224 } else {
3225 local @cf::_safe_eval_args = values %vars;
3226 @res = wantarray ? eval eval : scalar eval $eval;
3227 }
3128 3228
3129 if ($@) { 3229 if ($@) {
3130 warn "$@"; 3230 warn "$@";
3131 warn "while executing safe code '$code'\n"; 3231 warn "while executing safe code '$code'\n";
3132 warn "with arguments " . (join " ", %vars) . "\n"; 3232 warn "with arguments " . (join " ", %vars) . "\n";
… …
3151=cut 3251=cut
3152 3252
3153sub register_script_function { 3253sub register_script_function {
3154 my ($fun, $cb) = @_; 3254 my ($fun, $cb) = @_;
3155 3255
3156 no strict 'refs'; 3256 $fun = "safe::$fun" if $CFG{safe_eval};
3157 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3257 *$fun = $safe_hole->wrap ($cb);
3158} 3258}
3159 3259
3160=back 3260=back
3161 3261
3162=cut 3262=cut
… …
3183 3283
3184 $facedata->{version} == 2 3284 $facedata->{version} == 2
3185 or cf::cleanup "$path: version mismatch, cannot proceed."; 3285 or cf::cleanup "$path: version mismatch, cannot proceed.";
3186 3286
3187 # patch in the exptable 3287 # patch in the exptable
3288 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3188 $facedata->{resource}{"res/exp_table"} = { 3289 $facedata->{resource}{"res/exp_table"} = {
3189 type => FT_RSRC, 3290 type => FT_RSRC,
3190 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3291 data => $exp_table,
3292 hash => (Digest::MD5::md5 $exp_table),
3191 }; 3293 };
3192 cf::cede_to_tick; 3294 cf::cede_to_tick;
3193 3295
3194 { 3296 {
3195 my $faces = $facedata->{faceinfo}; 3297 my $faces = $facedata->{faceinfo};
… …
3197 while (my ($face, $info) = each %$faces) { 3299 while (my ($face, $info) = each %$faces) {
3198 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3300 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3199 3301
3200 cf::face::set_visibility $idx, $info->{visibility}; 3302 cf::face::set_visibility $idx, $info->{visibility};
3201 cf::face::set_magicmap $idx, $info->{magicmap}; 3303 cf::face::set_magicmap $idx, $info->{magicmap};
3202 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3304 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3203 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3305 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3204 3306
3205 cf::cede_to_tick; 3307 cf::cede_to_tick;
3206 } 3308 }
3207 3309
3208 while (my ($face, $info) = each %$faces) { 3310 while (my ($face, $info) = each %$faces) {
… …
3232 3334
3233 cf::anim::invalidate_all; # d'oh 3335 cf::anim::invalidate_all; # d'oh
3234 } 3336 }
3235 3337
3236 { 3338 {
3237 # TODO: for gcfclient pleasure, we should give resources
3238 # that gcfclient doesn't grok a >10000 face index.
3239 my $res = $facedata->{resource}; 3339 my $res = $facedata->{resource};
3240 3340
3241 while (my ($name, $info) = each %$res) { 3341 while (my ($name, $info) = each %$res) {
3242 if (defined $info->{type}) { 3342 if (defined $info->{type}) {
3243 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3343 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3244 my $data;
3245 3344
3246 if ($info->{type} & 1) { 3345 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}; 3346 cf::face::set_type $idx, $info->{type};
3261 } else { 3347 } else {
3262 $RESOURCE{$name} = $info; 3348 $RESOURCE{$name} = $info;
3263 } 3349 }
3264 3350
… …
3347 reload_treasures; 3433 reload_treasures;
3348 3434
3349 warn "finished reloading resource files\n"; 3435 warn "finished reloading resource files\n";
3350} 3436}
3351 3437
3352sub init {
3353 my $guard = freeze_mainloop;
3354
3355 evthread_start IO::AIO::poll_fileno;
3356
3357 reload_resources;
3358}
3359
3360sub reload_config { 3438sub reload_config {
3439 warn "reloading config file...\n";
3440
3361 open my $fh, "<:utf8", "$CONFDIR/config" 3441 open my $fh, "<:utf8", "$CONFDIR/config"
3362 or return; 3442 or return;
3363 3443
3364 local $/; 3444 local $/;
3365 *CFG = YAML::Load <$fh>; 3445 *CFG = YAML::XS::Load scalar <$fh>;
3366 3446
3367 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3447 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3368 3448
3369 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3449 $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}; 3450 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3374 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3454 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3375 and die "WARNING: m(un)lockall failed: $!\n"; 3455 and die "WARNING: m(un)lockall failed: $!\n";
3376 }; 3456 };
3377 warn $@ if $@; 3457 warn $@ if $@;
3378 } 3458 }
3459
3460 warn "finished reloading resource files\n";
3379} 3461}
3380 3462
3381sub pidfile() { 3463sub pidfile() {
3382 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3464 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3383 or die "$PIDFILE: $!"; 3465 or die "$PIDFILE: $!";
… …
3395 3477
3396 seek $fh, 0, 0; 3478 seek $fh, 0, 0;
3397 print $fh $$; 3479 print $fh $$;
3398} 3480}
3399 3481
3482sub main_loop {
3483 warn "EV::loop starting\n";
3484 if (1) {
3485 EV::loop;
3486 }
3487 warn "EV::loop returned\n";
3488 goto &main_loop unless $REALLY_UNLOOP;
3489}
3490
3400sub main { 3491sub main {
3401 atomic; 3492 cf::init_globals; # initialise logging
3493
3494 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3495 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3496 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3497 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3498
3499 cf::init_experience;
3500 cf::init_anim;
3501 cf::init_attackmess;
3502 cf::init_dynamic;
3503
3504 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3402 3505
3403 # we must not ever block the main coroutine 3506 # we must not ever block the main coroutine
3404 local $Coro::idle = sub { 3507 local $Coro::idle = sub {
3405 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3508 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3406 (async { 3509 (async {
3407 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3510 $Coro::current->{desc} = "IDLE BUG HANDLER";
3408 EV::loop EV::LOOP_ONESHOT; 3511 EV::loop EV::LOOP_ONESHOT;
3409 })->prio (Coro::PRIO_MAX); 3512 })->prio (Coro::PRIO_MAX);
3410 }; 3513 };
3411 3514
3412 { 3515 evthread_start IO::AIO::poll_fileno;
3413 my $guard = freeze_mainloop; 3516
3517 cf::sync_job {
3518 cf::load_settings;
3519 cf::load_materials;
3520
3521 reload_resources;
3414 reload_config; 3522 reload_config;
3415 db_init; 3523 db_init;
3524
3525 cf::init_uuid;
3526 cf::init_signals;
3527 cf::init_commands;
3528 cf::init_skills;
3529
3530 cf::init_beforeplay;
3531
3532 atomic;
3533
3416 load_extensions; 3534 load_extensions;
3417 3535
3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3419 }
3420
3421 utime time, time, $RUNTIMEFILE; 3536 utime time, time, $RUNTIMEFILE;
3422 3537
3423 # no (long-running) fork's whatsoever before this point(!) 3538 # no (long-running) fork's whatsoever before this point(!)
3539 use POSIX ();
3424 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3540 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3425 3541
3426 EV::loop; 3542 (pop @POST_INIT)->(0) while @POST_INIT;
3543 };
3544
3545 main_loop;
3427} 3546}
3428 3547
3429############################################################################# 3548#############################################################################
3430# initialisation and cleanup 3549# initialisation and cleanup
3431 3550
… …
3487 my $uuid = "$LOCALDIR/uuid"; 3606 my $uuid = "$LOCALDIR/uuid";
3488 3607
3489 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3608 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3490 or return; 3609 or return;
3491 3610
3492 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3611 my $value = uuid_seq uuid_cur;
3612
3613 unless ($value) {
3614 warn "cowardly refusing to write zero uuid value!\n";
3615 return;
3616 }
3617
3618 my $value = uuid_str $value + $uuid_skip;
3493 $uuid_skip = 0; 3619 $uuid_skip = 0;
3494 3620
3495 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3621 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3496 and return; 3622 and return;
3497 3623
… …
3519} 3645}
3520 3646
3521sub emergency_save() { 3647sub emergency_save() {
3522 my $freeze_guard = cf::freeze_mainloop; 3648 my $freeze_guard = cf::freeze_mainloop;
3523 3649
3524 warn "enter emergency perl save\n"; 3650 warn "emergency_perl_save: enter\n";
3525 3651
3526 cf::sync_job { 3652 cf::sync_job {
3653 # this is a trade-off: we want to be very quick here, so
3654 # save all maps without fsync, and later call a global sync
3655 # (which in turn might be very very slow)
3656 local $USE_FSYNC = 0;
3657
3527 # use a peculiar iteration method to avoid tripping on perl 3658 # use a peculiar iteration method to avoid tripping on perl
3528 # refcount bugs in for. also avoids problems with players 3659 # refcount bugs in for. also avoids problems with players
3529 # and maps saved/destroyed asynchronously. 3660 # and maps saved/destroyed asynchronously.
3530 warn "begin emergency player save\n"; 3661 warn "emergency_perl_save: begin player save\n";
3531 for my $login (keys %cf::PLAYER) { 3662 for my $login (keys %cf::PLAYER) {
3532 my $pl = $cf::PLAYER{$login} or next; 3663 my $pl = $cf::PLAYER{$login} or next;
3533 $pl->valid or next; 3664 $pl->valid or next;
3534 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3665 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3535 $pl->save; 3666 $pl->save;
3536 } 3667 }
3537 warn "end emergency player save\n"; 3668 warn "emergency_perl_save: end player save\n";
3538 3669
3539 warn "begin emergency map save\n"; 3670 warn "emergency_perl_save: begin map save\n";
3540 for my $path (keys %cf::MAP) { 3671 for my $path (keys %cf::MAP) {
3541 my $map = $cf::MAP{$path} or next; 3672 my $map = $cf::MAP{$path} or next;
3542 $map->valid or next; 3673 $map->valid or next;
3543 $map->save; 3674 $map->save;
3544 } 3675 }
3545 warn "end emergency map save\n"; 3676 warn "emergency_perl_save: end map save\n";
3546 3677
3547 warn "begin emergency database checkpoint\n"; 3678 warn "emergency_perl_save: begin database checkpoint\n";
3548 BDB::db_env_txn_checkpoint $DB_ENV; 3679 BDB::db_env_txn_checkpoint $DB_ENV;
3549 warn "end emergency database checkpoint\n"; 3680 warn "emergency_perl_save: end database checkpoint\n";
3550 3681
3551 warn "begin write uuid\n"; 3682 warn "emergency_perl_save: begin write uuid\n";
3552 write_uuid_sync 1; 3683 write_uuid_sync 1;
3553 warn "end write uuid\n"; 3684 warn "emergency_perl_save: end write uuid\n";
3554 }; 3685 };
3555 3686
3687 warn "emergency_perl_save: starting sync()\n";
3688 IO::AIO::aio_sync sub {
3689 warn "emergency_perl_save: finished sync()\n";
3690 };
3691
3556 warn "leave emergency perl save\n"; 3692 warn "emergency_perl_save: leave\n";
3557} 3693}
3558 3694
3559sub post_cleanup { 3695sub post_cleanup {
3560 my ($make_core) = @_; 3696 my ($make_core) = @_;
3561 3697
… …
3587 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3723 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3588 for my $name (keys %$leaf_symtab) { 3724 for my $name (keys %$leaf_symtab) {
3589 _gv_clear *{"$pkg$name"}; 3725 _gv_clear *{"$pkg$name"};
3590# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3726# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3591 } 3727 }
3592 warn "cleared package #$pkg\n";#d# 3728 warn "cleared package $pkg\n";#d#
3593} 3729}
3594
3595our $RELOAD; # how many times to reload
3596 3730
3597sub do_reload_perl() { 3731sub do_reload_perl() {
3598 # can/must only be called in main 3732 # can/must only be called in main
3599 if ($Coro::current != $Coro::main) { 3733 if ($Coro::current != $Coro::main) {
3600 warn "can only reload from main coroutine"; 3734 warn "can only reload from main coroutine";
3601 return; 3735 return;
3602 } 3736 }
3603 3737
3604 return if $RELOAD++; 3738 return if $RELOAD++;
3739
3740 my $t1 = EV::time;
3605 3741
3606 while ($RELOAD) { 3742 while ($RELOAD) {
3607 warn "reloading..."; 3743 warn "reloading...";
3608 3744
3609 warn "entering sync_job"; 3745 warn "entering sync_job";
… …
3670 clear_package "safe::$_" 3806 clear_package "safe::$_"
3671 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3807 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3672 3808
3673 warn "unloading cf.pm \"a bit\""; 3809 warn "unloading cf.pm \"a bit\"";
3674 delete $INC{"cf.pm"}; 3810 delete $INC{"cf.pm"};
3675 delete $INC{"cf/pod.pm"}; 3811 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3676 3812
3677 # don't, removes xs symbols, too, 3813 # don't, removes xs symbols, too,
3678 # and global variables created in xs 3814 # and global variables created in xs
3679 #clear_package __PACKAGE__; 3815 #clear_package __PACKAGE__;
3680 3816
3681 warn "unload completed, starting to reload now"; 3817 warn "unload completed, starting to reload now";
3682 3818
3683 warn "reloading cf.pm"; 3819 warn "reloading cf.pm";
3684 require cf; 3820 require cf;
3685 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3821 cf::_connect_to_perl_1;
3686 3822
3687 warn "loading config and database again"; 3823 warn "loading config and database again";
3688 cf::reload_config; 3824 cf::reload_config;
3689 3825
3690 warn "loading extensions"; 3826 warn "loading extensions";
3691 cf::load_extensions; 3827 cf::load_extensions;
3692 3828
3829 if ($REATTACH_ON_RELOAD) {
3693 warn "reattaching attachments to objects/players"; 3830 warn "reattaching attachments to objects/players";
3694 _global_reattach; # objects, sockets 3831 _global_reattach; # objects, sockets
3695 warn "reattaching attachments to maps"; 3832 warn "reattaching attachments to maps";
3696 reattach $_ for values %MAP; 3833 reattach $_ for values %MAP;
3697 warn "reattaching attachments to players"; 3834 warn "reattaching attachments to players";
3698 reattach $_ for values %PLAYER; 3835 reattach $_ for values %PLAYER;
3836 }
3837
3838 warn "running post_init jobs";
3839 (pop @POST_INIT)->(1) while @POST_INIT;
3699 3840
3700 warn "leaving sync_job"; 3841 warn "leaving sync_job";
3701 3842
3702 1 3843 1
3703 } or do { 3844 } or do {
… …
3706 }; 3847 };
3707 3848
3708 warn "reloaded"; 3849 warn "reloaded";
3709 --$RELOAD; 3850 --$RELOAD;
3710 } 3851 }
3852
3853 $t1 = EV::time - $t1;
3854 warn "reload completed in ${t1}s\n";
3711}; 3855};
3712 3856
3713our $RELOAD_WATCHER; # used only during reload 3857our $RELOAD_WATCHER; # used only during reload
3714 3858
3715sub reload_perl() { 3859sub reload_perl() {
3716 # doing reload synchronously and two reloads happen back-to-back, 3860 # doing reload synchronously and two reloads happen back-to-back,
3717 # coro crashes during coro_state_free->destroy here. 3861 # coro crashes during coro_state_free->destroy here.
3718 3862
3863 $RELOAD_WATCHER ||= cf::async {
3864 Coro::AIO::aio_wait cache_extensions;
3865
3719 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3866 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3720 do_reload_perl; 3867 do_reload_perl;
3721 undef $RELOAD_WATCHER; 3868 undef $RELOAD_WATCHER;
3869 };
3722 }; 3870 };
3723} 3871}
3724 3872
3725register_command "reload" => sub { 3873register_command "reload" => sub {
3726 my ($who, $arg) = @_; 3874 my ($who, $arg) = @_;
… …
3740 3888
3741our @WAIT_FOR_TICK; 3889our @WAIT_FOR_TICK;
3742our @WAIT_FOR_TICK_BEGIN; 3890our @WAIT_FOR_TICK_BEGIN;
3743 3891
3744sub wait_for_tick { 3892sub wait_for_tick {
3745 return if tick_inhibit || $Coro::current == $Coro::main; 3893 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3746 3894
3747 my $signal = new Coro::Signal; 3895 my $signal = new Coro::Signal;
3748 push @WAIT_FOR_TICK, $signal; 3896 push @WAIT_FOR_TICK, $signal;
3749 $signal->wait; 3897 $signal->wait;
3750} 3898}
3751 3899
3752sub wait_for_tick_begin { 3900sub wait_for_tick_begin {
3753 return if tick_inhibit || $Coro::current == $Coro::main; 3901 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3754 3902
3755 my $signal = new Coro::Signal; 3903 my $signal = new Coro::Signal;
3756 push @WAIT_FOR_TICK_BEGIN, $signal; 3904 push @WAIT_FOR_TICK_BEGIN, $signal;
3757 $signal->wait; 3905 $signal->wait;
3758} 3906}
… …
3885 LOG llevInfo, "[ABT] [suppressed]\n"; 4033 LOG llevInfo, "[ABT] [suppressed]\n";
3886 } 4034 }
3887} 4035}
3888 4036
3889# load additional modules 4037# load additional modules
3890use cf::pod; 4038require "cf/$_.pm" for @EXTRA_MODULES;
4039cf::_connect_to_perl_2;
3891 4040
3892END { cf::emergency_save } 4041END { cf::emergency_save }
3893 4042
38941 40431
3895 4044

Diff Legend

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