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.445 by root, Wed Sep 10 18:18:10 2008 UTC vs.
Revision 1.496 by root, Sun Nov 15 18:03:59 2009 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
… …
63 66
64# configure various modules to our taste 67# configure various modules to our taste
65# 68#
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
71
72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
73
74# make sure c-lzf reinitialises itself
75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
68Compress::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
69 77
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
71 80
72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
73 82
74our %COMMAND = (); 83our %COMMAND = ();
75our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
… …
78our %EXTCMD = (); 87our %EXTCMD = ();
79our %EXTICMD = (); 88our %EXTICMD = ();
80our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
81our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
82 91
83our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
84our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
85 96
86our $CONFDIR = confdir; 97our $CONFDIR = confdir;
87our $DATADIR = datadir; 98our $DATADIR = datadir;
88our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
89our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
… …
100our %RESOURCE; 111our %RESOURCE;
101 112
102our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
103our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
104our $NEXT_TICK; 115our $NEXT_TICK;
105our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
106 117
107our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
108our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
109our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
110our $DB_ENV; 121our $DB_ENV;
111 122
123our @EXTRA_MODULES = qw(pod match mapscript);
124
112our %CFG; 125our %CFG;
113 126
114our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
115our $RUNTIME; 128our $RUNTIME;
116our $NOW; 129our $NOW;
… …
124 137
125our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
126our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
127our $JITTER; # average jitter 140our $JITTER; # average jitter
128our $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 :)
129 147
130binmode STDOUT; 148binmode STDOUT;
131binmode STDERR; 149binmode STDERR;
132 150
133# read virtual server time, if available 151# read virtual server time, if available
… …
135 open my $fh, "<", $RUNTIMEFILE 153 open my $fh, "<", $RUNTIMEFILE
136 or die "unable to read $RUNTIMEFILE file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
137 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
138} 156}
139 157
158eval "sub TICK() { $TICK } 1" or die;
159
140mkdir $_ 160mkdir $_
141 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
142 162
143our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
144 164
145sub 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::"} };
146 177
147############################################################################# 178#############################################################################
148 179
149=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
150 181
… …
197returns 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
198per 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.
199 230
200=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
201 232
202This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
203C<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
204that call. 235that call.
205 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
206=back 243=back
207 244
208=cut 245=cut
209 246
210BEGIN { 247$Coro::State::WARNHOOK = sub {
211 *CORE::GLOBAL::warn = sub {
212 my $msg = join "", @_; 248 my $msg = join "", @_;
213 249
214 $msg .= "\n" 250 $msg .= "\n"
215 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
216 252
217 $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;
218 254
219 LOG llevError, $msg; 255 LOG llevError, $msg;
220 }; 256};
221}
222 257
223$Coro::State::DIEHOOK = sub { 258$Coro::State::DIEHOOK = sub {
224 return unless $^S eq 0; # "eq", not "==" 259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
225 262
226 if ($Coro::current == $Coro::main) {#d# 263 if ($Coro::current == $Coro::main) {#d#
227 warn "DIEHOOK called in main context, Coro bug?\n";#d# 264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
228 return;#d# 265 return;#d#
229 }#d# 266 }#d#
230 267
231 # kill coroutine otherwise 268 # kill coroutine otherwise
232 warn Carp::longmess $_[0];
233 Coro::terminate 269 Coro::terminate
234}; 270};
235
236$SIG{__DIE__} = sub { }; #d#?
237 271
238@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
239@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
240@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
241@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
255)) { 289)) {
256 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
257} 291}
258 292
259$EV::DIED = sub { 293$EV::DIED = sub {
260 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
261}; 295};
262 296
263############################################################################# 297#############################################################################
264 298
265=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
… …
302our $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
303 337
304sub encode_json($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
305sub decode_json($) { $json_coder->decode ($_[0]) } 339sub decode_json($) { $json_coder->decode ($_[0]) }
306 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
307=item cf::lock_wait $string 355=item cf::lock_wait $string
308 356
309Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
310 358
311=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
312 360
313Wait 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
314a 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,
315for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
316returned. 364returned.
317 365
318Locks 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
319deadlocked coro. 367deadlocked coro.
… …
325 373
326Return 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.
327 375
328=cut 376=cut
329 377
330our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
331our %LOCKER;#d#
332 379
333sub lock_wait($) { 380sub lock_wait($) {
334 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
335
336 if ($LOCKER{$key} == $Coro::current) {#d#
337 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
338 return;#d#
339 }#d#
340
341 # wait for lock, if any
342 while ($LOCK{$key}) {
343 push @{ $LOCK{$key} }, $Coro::current;
344 Coro::schedule;
345 }
346} 382}
347 383
348sub lock_acquire($) { 384sub lock_acquire($) {
349 my ($key) = @_; 385 $LOCKS->guard ($_[0])
350
351 # wait, to be sure we are not locked
352 lock_wait $key;
353
354 $LOCK{$key} = [];
355 $LOCKER{$key} = $Coro::current;#d#
356
357 Coro::guard {
358 delete $LOCKER{$key};#d#
359 # wake up all waiters, to be on the safe side
360 $_->ready for @{ delete $LOCK{$key} };
361 }
362} 386}
363 387
364sub lock_active($) { 388sub lock_active($) {
365 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
366
367 ! ! $LOCK{$key}
368} 390}
369 391
370sub freeze_mainloop { 392sub freeze_mainloop {
371 tick_inhibit_inc; 393 tick_inhibit_inc;
372 394
373 Coro::guard \&tick_inhibit_dec; 395 &Guard::guard (\&tick_inhibit_dec);
374} 396}
375 397
376=item cf::periodic $interval, $cb 398=item cf::periodic $interval, $cb
377 399
378Like 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
… …
730 752
731############################################################################# 753#############################################################################
732 754
733=head2 ATTACHABLE OBJECTS 755=head2 ATTACHABLE OBJECTS
734 756
735Many objects in crossfire are so-called attachable objects. That means you can 757Many objects in deliantra are so-called attachable objects. That means you can
736attach callbacks/event handlers (a collection of which is called an "attachment") 758attach callbacks/event handlers (a collection of which is called an "attachment")
737to it. All such attachable objects support the following methods. 759to it. All such attachable objects support the following methods.
738 760
739In the following description, CLASS can be any of C<global>, C<object> 761In the following description, CLASS can be any of C<global>, C<object>
740C<player>, C<client> or C<map> (i.e. the attachable objects in 762C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
790=item cf::CLASS::attachment $name, ... 812=item cf::CLASS::attachment $name, ...
791 813
792Register an attachment by C<$name> through which attachable objects of the 814Register an attachment by C<$name> through which attachable objects of the
793given CLASS can refer to this attachment. 815given CLASS can refer to this attachment.
794 816
795Some classes such as crossfire maps and objects can specify attachments 817Some classes such as deliantra maps and objects can specify attachments
796that are attached at load/instantiate time, thus the need for a name. 818that are attached at load/instantiate time, thus the need for a name.
797 819
798These calls expect any number of the following handler/hook descriptions: 820These calls expect any number of the following handler/hook descriptions:
799 821
800=over 4 822=over 4
… …
1150 $decname, length $$rdata, scalar @$objs; 1172 $decname, length $$rdata, scalar @$objs;
1151 1173
1152 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1153 aio_chmod $fh, SAVE_MODE; 1175 aio_chmod $fh, SAVE_MODE;
1154 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1155 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 }
1156 aio_close $fh; 1181 aio_close $fh;
1157 1182
1158 if (@$objs) { 1183 if (@$objs) {
1159 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) {
1160 aio_chmod $fh, SAVE_MODE; 1185 aio_chmod $fh, SAVE_MODE;
1161 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1186 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1162 aio_write $fh, 0, (length $data), $data, 0; 1187 aio_write $fh, 0, (length $data), $data, 0;
1163 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 }
1164 aio_close $fh; 1192 aio_close $fh;
1165 aio_rename "$filename.pst~", "$filename.pst"; 1193 aio_rename "$filename.pst~", "$filename.pst";
1166 } 1194 }
1167 } else { 1195 } else {
1168 aio_unlink "$filename.pst"; 1196 aio_unlink "$filename.pst";
1169 } 1197 }
1170 1198
1171 aio_rename "$filename~", $filename; 1199 aio_rename "$filename~", $filename;
1200
1201 $filename =~ s%/[^/]+$%%;
1202 aio_pathsync $filename if $cf::USE_FSYNC;
1172 } else { 1203 } else {
1173 warn "FATAL: $filename~: $!\n"; 1204 warn "unable to save objects: $filename~: $!\n";
1174 } 1205 }
1175 } else { 1206 } else {
1176 aio_unlink $filename; 1207 aio_unlink $filename;
1177 aio_unlink "$filename.pst"; 1208 aio_unlink "$filename.pst";
1178 } 1209 }
… …
1269 my ($name, $cb) = @_; 1300 my ($name, $cb) = @_;
1270 1301
1271 $EXTICMD{$name} = $cb; 1302 $EXTICMD{$name} = $cb;
1272} 1303}
1273 1304
1305use File::Glob ();
1306
1274cf::player->attach ( 1307cf::player->attach (
1275 on_command => sub { 1308 on_command => sub {
1276 my ($pl, $name, $params) = @_; 1309 my ($pl, $name, $params) = @_;
1277 1310
1278 my $cb = $COMMAND{$name} 1311 my $cb = $COMMAND{$name}
… …
1309 } 1342 }
1310 1343
1311 cf::override; 1344 cf::override;
1312 }, 1345 },
1313); 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}
1314 1360
1315sub load_extensions { 1361sub load_extensions {
1316 cf::sync_job { 1362 cf::sync_job {
1317 my %todo; 1363 my %todo;
1318 1364
… …
1388 1434
1389=back 1435=back
1390 1436
1391=head2 CORE EXTENSIONS 1437=head2 CORE EXTENSIONS
1392 1438
1393Functions and methods that extend core crossfire objects. 1439Functions and methods that extend core deliantra objects.
1394 1440
1395=cut 1441=cut
1396 1442
1397package cf::player; 1443package cf::player;
1398 1444
… …
1441 1487
1442sub exists($) { 1488sub exists($) {
1443 my ($login) = @_; 1489 my ($login) = @_;
1444 1490
1445 $cf::PLAYER{$login} 1491 $cf::PLAYER{$login}
1446 or cf::sync_job { !aio_stat path $login } 1492 or !aio_stat path $login
1447} 1493}
1448 1494
1449sub find($) { 1495sub find($) {
1450 return $cf::PLAYER{$_[0]} || do { 1496 return $cf::PLAYER{$_[0]} || do {
1451 my $login = $_[0]; 1497 my $login = $_[0];
… …
1622 } 1668 }
1623 1669
1624 \@paths 1670 \@paths
1625} 1671}
1626 1672
1627=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1673=item $protocol_xml = $player->expand_cfpod ($cfpod)
1628 1674
1629Expand crossfire pod fragments into protocol xml. 1675Expand deliantra pod fragments into protocol xml.
1630 1676
1631=item $player->ext_reply ($msgid, @msg) 1677=item $player->ext_reply ($msgid, @msg)
1632 1678
1633Sends an ext reply to the player. 1679Sends an ext reply to the player.
1634 1680
… …
1847 1893
1848 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1894 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1849 "$UNIQUEDIR/$path" 1895 "$UNIQUEDIR/$path"
1850} 1896}
1851 1897
1852# and all this just because we cannot iterate over
1853# all maps in C++...
1854sub change_all_map_light {
1855 my ($change) = @_;
1856
1857 $_->change_map_light ($change)
1858 for grep $_->outdoor, values %cf::MAP;
1859}
1860
1861sub decay_objects { 1898sub decay_objects {
1862 my ($self) = @_; 1899 my ($self) = @_;
1863 1900
1864 return if $self->{deny_reset}; 1901 return if $self->{deny_reset};
1865 1902
… …
1947sub find { 1984sub find {
1948 my ($path, $origin) = @_; 1985 my ($path, $origin) = @_;
1949 1986
1950 $path = normalise $path, $origin && $origin->path; 1987 $path = normalise $path, $origin && $origin->path;
1951 1988
1952 cf::lock_wait "map_data:$path";#d#remove 1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1953 cf::lock_wait "map_find:$path"; 1990 my $guard2 = cf::lock_acquire "map_find:$path";
1954 1991
1955 $cf::MAP{$path} || do { 1992 $cf::MAP{$path} || do {
1956 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1957 my $guard2 = cf::lock_acquire "map_find:$path";
1958
1959 my $map = new_from_path cf::map $path 1993 my $map = new_from_path cf::map $path
1960 or return; 1994 or return;
1961 1995
1962 $map->{last_save} = $cf::RUNTIME; 1996 $map->{last_save} = $cf::RUNTIME;
1963 1997
… …
2031 unless ($self->{deny_activate}) { 2065 unless ($self->{deny_activate}) {
2032 $self->decay_objects; 2066 $self->decay_objects;
2033 $self->fix_auto_apply; 2067 $self->fix_auto_apply;
2034 $self->update_buttons; 2068 $self->update_buttons;
2035 cf::cede_to_tick; 2069 cf::cede_to_tick;
2036 $self->set_darkness_map;
2037 cf::cede_to_tick;
2038 $self->activate; 2070 $self->activate;
2039 } 2071 }
2040 2072
2041 $self->{last_save} = $cf::RUNTIME; 2073 $self->{last_save} = $cf::RUNTIME;
2042 $self->last_access ($cf::RUNTIME); 2074 $self->last_access ($cf::RUNTIME);
… …
2208 2240
2209 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2210 2242
2211 return if $self->players; 2243 return if $self->players;
2212 2244
2213 warn "resetting map ", $self->path; 2245 warn "resetting map ", $self->path, "\n";
2214 2246
2215 $self->in_memory (cf::MAP_SWAPPED); 2247 $self->in_memory (cf::MAP_SWAPPED);
2216 2248
2217 # need to save uniques path 2249 # need to save uniques path
2218 unless ($self->{deny_save}) { 2250 unless ($self->{deny_save}) {
… …
2309 : normalise $_ 2341 : normalise $_
2310 } @{ aio_readdir $UNIQUEDIR or [] } 2342 } @{ aio_readdir $UNIQUEDIR or [] }
2311 ] 2343 ]
2312} 2344}
2313 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
2314=back 2378=back
2315 2379
2316=head3 cf::object 2380=head3 cf::object
2317 2381
2318=cut 2382=cut
… …
2383 2447
2384our $SAY_CHANNEL = { 2448our $SAY_CHANNEL = {
2385 id => "say", 2449 id => "say",
2386 title => "Map", 2450 title => "Map",
2387 reply => "say ", 2451 reply => "say ",
2388 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.",
2389}; 2453};
2390 2454
2391our $CHAT_CHANNEL = { 2455our $CHAT_CHANNEL = {
2392 id => "chat", 2456 id => "chat",
2393 title => "Chat", 2457 title => "Chat",
… …
2448 2512
2449=item $player_object->enter_link 2513=item $player_object->enter_link
2450 2514
2451Freezes the player and moves him/her to a special map (C<{link}>). 2515Freezes the player and moves him/her to a special map (C<{link}>).
2452 2516
2453The player should be reasonably safe there for short amounts of time. You 2517The player should be reasonably safe there for short amounts of time (e.g.
2454I<MUST> call C<leave_link> as soon as possible, though. 2518for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2519though, as the palyer cannot control the character while it is on the link
2520map.
2455 2521
2456Will never block. 2522Will never block.
2457 2523
2458=item $player_object->leave_link ($map, $x, $y) 2524=item $player_object->leave_link ($map, $x, $y)
2459 2525
… …
2511 ($x, $y) = (-1, -1) 2577 ($x, $y) = (-1, -1)
2512 unless (defined $x) && (defined $y); 2578 unless (defined $x) && (defined $y);
2513 2579
2514 # use -1 or undef as default coordinates, not 0, 0 2580 # use -1 or undef as default coordinates, not 0, 0
2515 ($x, $y) = ($map->enter_x, $map->enter_y) 2581 ($x, $y) = ($map->enter_x, $map->enter_y)
2516 if $x <=0 && $y <= 0; 2582 if $x <= 0 && $y <= 0;
2517 2583
2518 $map->load; 2584 $map->load;
2519 $map->load_neighbours; 2585 $map->load_neighbours;
2520 2586
2521 return unless $self->contr->active; 2587 return unless $self->contr->active;
2522 $self->activate_recursive;
2523 2588
2524 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2589 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2525 $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;
2526} 2594}
2527 2595
2528=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2596=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2529 2597
2530Moves 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
… …
2689 $self->contr->savebed ($map, $x, $y) 2757 $self->contr->savebed ($map, $x, $y)
2690 if $exit->flag (cf::FLAG_DAMNED); 2758 if $exit->flag (cf::FLAG_DAMNED);
2691 2759
2692 1 2760 1
2693 }) { 2761 }) {
2694 $self->message ("Something went wrong deep within the crossfire server. " 2762 $self->message ("Something went wrong deep within the deliantra server. "
2695 . "I'll try to bring you back to the map you were before. " 2763 . "I'll try to bring you back to the map you were before. "
2696 . "Please report this to the dungeon master!", 2764 . "Please report this to the dungeon master!",
2697 cf::NDI_UNIQUE | cf::NDI_RED); 2765 cf::NDI_UNIQUE | cf::NDI_RED);
2698 2766
2699 warn "ERROR in enter_exit: $@"; 2767 warn "ERROR in enter_exit: $@";
… …
2716sub cf::client::send_drawinfo { 2784sub cf::client::send_drawinfo {
2717 my ($self, $text, $flags) = @_; 2785 my ($self, $text, $flags) = @_;
2718 2786
2719 utf8::encode $text; 2787 utf8::encode $text;
2720 $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);
2789}
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);
2721} 2814}
2722 2815
2723=item $client->send_msg ($channel, $msg, $color, [extra...]) 2816=item $client->send_msg ($channel, $msg, $color, [extra...])
2724 2817
2725Send 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
… …
2729 2822
2730=cut 2823=cut
2731 2824
2732# non-persistent channels (usually the info channel) 2825# non-persistent channels (usually the info channel)
2733our %CHANNEL = ( 2826our %CHANNEL = (
2827 "c/motd" => {
2828 id => "infobox",
2829 title => "MOTD",
2830 reply => undef,
2831 tooltip => "The message of the day",
2832 },
2734 "c/identify" => { 2833 "c/identify" => {
2735 id => "infobox", 2834 id => "infobox",
2736 title => "Identify", 2835 title => "Identify",
2737 reply => undef, 2836 reply => undef,
2738 tooltip => "Items recently identified", 2837 tooltip => "Items recently identified",
… …
2740 "c/examine" => { 2839 "c/examine" => {
2741 id => "infobox", 2840 id => "infobox",
2742 title => "Examine", 2841 title => "Examine",
2743 reply => undef, 2842 reply => undef,
2744 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",
2745 }, 2850 },
2746 "c/book" => { 2851 "c/book" => {
2747 id => "infobox", 2852 id => "infobox",
2748 title => "Book", 2853 title => "Book",
2749 reply => undef, 2854 reply => undef,
… …
2765 id => "infobox", 2870 id => "infobox",
2766 title => "Body Parts", 2871 title => "Body Parts",
2767 reply => undef, 2872 reply => undef,
2768 tooltip => "Shows which body parts you posess and are available", 2873 tooltip => "Shows which body parts you posess and are available",
2769 }, 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 },
2770 "c/uptime" => { 2911 "c/uptime" => {
2771 id => "infobox", 2912 id => "infobox",
2772 title => "Uptime", 2913 title => "Uptime",
2773 reply => undef, 2914 reply => undef,
2774 tooltip => "How long the server has been running since last restart", 2915 tooltip => "How long the server has been running since last restart",
… …
2783 id => "party", 2924 id => "party",
2784 title => "Party", 2925 title => "Party",
2785 reply => "gsay ", 2926 reply => "gsay ",
2786 tooltip => "Messages and chat related to your party", 2927 tooltip => "Messages and chat related to your party",
2787 }, 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,
2788); 2937);
2789 2938
2790sub cf::client::send_msg { 2939sub cf::client::send_msg {
2791 my ($self, $channel, $msg, $color, @extra) = @_; 2940 my ($self, $channel, $msg, $color, @extra) = @_;
2792 2941
2793 $msg = $self->pl->expand_cfpod ($msg); 2942 $msg = $self->pl->expand_cfpod ($msg)
2943 unless $color & cf::NDI_VERBATIM;
2794 2944
2795 $color &= cf::NDI_CLIENT_MASK; # just in case... 2945 $color &= cf::NDI_CLIENT_MASK; # just in case...
2796 2946
2797 # check predefined channels, for the benefit of C 2947 # check predefined channels, for the benefit of C
2798 if ($CHANNEL{$channel}) { 2948 if ($CHANNEL{$channel}) {
2799 $channel = $CHANNEL{$channel}; 2949 $channel = $CHANNEL{$channel};
2800 2950
2801 $self->ext_msg (channel_info => $channel) 2951 $self->ext_msg (channel_info => $channel);
2802 if $self->can_msg;
2803
2804 $channel = $channel->{id}; 2952 $channel = $channel->{id};
2805 2953
2806 } elsif (ref $channel) { 2954 } elsif (ref $channel) {
2807 # send meta info to client, if not yet sent 2955 # send meta info to client, if not yet sent
2808 unless (exists $self->{channel}{$channel->{id}}) { 2956 unless (exists $self->{channel}{$channel->{id}}) {
2809 $self->{channel}{$channel->{id}} = $channel; 2957 $self->{channel}{$channel->{id}} = $channel;
2810 $self->ext_msg (channel_info => $channel) 2958 $self->ext_msg (channel_info => $channel);
2811 if $self->can_msg;
2812 } 2959 }
2813 2960
2814 $channel = $channel->{id}; 2961 $channel = $channel->{id};
2815 } 2962 }
2816 2963
2817 return unless @extra || length $msg; 2964 return unless @extra || length $msg;
2818 2965
2819 if ($self->can_msg) {
2820 # default colour, mask it out 2966 # default colour, mask it out
2821 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2967 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2822 if $color & cf::NDI_DEF; 2968 if $color & cf::NDI_DEF;
2823 2969
2824 my $pkt = "msg " 2970 my $pkt = "msg "
2825 . $self->{json_coder}->encode ( 2971 . $self->{json_coder}->encode (
2826 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2972 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2827 ); 2973 );
2828 2974
2829 # try lzf for large packets
2830 $pkt = "lzf " . Compress::LZF::compress $pkt
2831 if 1024 <= length $pkt and $self->{can_lzf};
2832
2833 # split very large packets
2834 if (8192 < length $pkt and $self->{can_lzf}) {
2835 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2836 $pkt = "frag";
2837 }
2838
2839 $self->send_packet ($pkt); 2975 $self->send_big_packet ($pkt);
2840 } else {
2841 if ($color >= 0) {
2842 # replace some tags by gcfclient-compatible ones
2843 for ($msg) {
2844 1 while
2845 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2846 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2847 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2848 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2849 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2850 }
2851
2852 $color &= cf::NDI_COLOR_MASK;
2853
2854 utf8::encode $msg;
2855
2856 if (0 && $msg =~ /\[/) {
2857 # COMMAND/INFO
2858 $self->send_packet ("drawextinfo $color 10 8 $msg")
2859 } else {
2860 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2861 $self->send_packet ("drawinfo $color $msg")
2862 }
2863 }
2864 }
2865} 2976}
2866 2977
2867=item $client->ext_msg ($type, @msg) 2978=item $client->ext_msg ($type, @msg)
2868 2979
2869Sends an ext event to the client. 2980Sends an ext event to the client.
… …
2872 2983
2873sub cf::client::ext_msg($$@) { 2984sub cf::client::ext_msg($$@) {
2874 my ($self, $type, @msg) = @_; 2985 my ($self, $type, @msg) = @_;
2875 2986
2876 if ($self->extcmd == 2) { 2987 if ($self->extcmd == 2) {
2877 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2988 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2878 } elsif ($self->extcmd == 1) { # TODO: remove 2989 } elsif ($self->extcmd == 1) { # TODO: remove
2879 push @msg, msgtype => "event_$type"; 2990 push @msg, msgtype => "event_$type";
2880 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2991 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2881 } 2992 }
2882} 2993}
2883 2994
2884=item $client->ext_reply ($msgid, @msg) 2995=item $client->ext_reply ($msgid, @msg)
2885 2996
… …
2889 3000
2890sub cf::client::ext_reply($$@) { 3001sub cf::client::ext_reply($$@) {
2891 my ($self, $id, @msg) = @_; 3002 my ($self, $id, @msg) = @_;
2892 3003
2893 if ($self->extcmd == 2) { 3004 if ($self->extcmd == 2) {
2894 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3005 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2895 } elsif ($self->extcmd == 1) { 3006 } elsif ($self->extcmd == 1) {
2896 #TODO: version 1, remove 3007 #TODO: version 1, remove
2897 unshift @msg, msgtype => "reply", msgid => $id; 3008 unshift @msg, msgtype => "reply", msgid => $id;
2898 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3009 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2899 } 3010 }
2900} 3011}
2901 3012
2902=item $success = $client->query ($flags, "text", \&cb) 3013=item $success = $client->query ($flags, "text", \&cb)
2903 3014
… …
3044The following functions and methods are available within a safe environment: 3155The following functions and methods are available within a safe environment:
3045 3156
3046 cf::object 3157 cf::object
3047 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
3048 insert remove name archname title slaying race decrease split 3159 insert remove name archname title slaying race decrease split
3160 value
3049 3161
3050 cf::object::player 3162 cf::object::player
3051 player 3163 player
3052 3164
3053 cf::player 3165 cf::player
… …
3059=cut 3171=cut
3060 3172
3061for ( 3173for (
3062 ["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
3063 insert remove inv nrof name archname title slaying race 3175 insert remove inv nrof name archname title slaying race
3064 decrease split destroy change_exp)], 3176 decrease split destroy change_exp value msg lore send_msg)],
3065 ["cf::object::player" => qw(player)], 3177 ["cf::object::player" => qw(player)],
3066 ["cf::player" => qw(peaceful)], 3178 ["cf::player" => qw(peaceful send_msg)],
3067 ["cf::map" => qw(trigger)], 3179 ["cf::map" => qw(trigger)],
3068) { 3180) {
3069 no strict 'refs'; 3181 no strict 'refs';
3070 my ($pkg, @funs) = @$_; 3182 my ($pkg, @funs) = @$_;
3071 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3183 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3088 my ($code, %vars) = @_; 3200 my ($code, %vars) = @_;
3089 3201
3090 my $qcode = $code; 3202 my $qcode = $code;
3091 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3203 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3092 $qcode =~ s/\n/\\n/g; 3204 $qcode =~ s/\n/\\n/g;
3205
3206 %vars = (_dummy => 0) unless %vars;
3093 3207
3094 local $_; 3208 local $_;
3095 local @safe::cf::_safe_eval_args = values %vars; 3209 local @safe::cf::_safe_eval_args = values %vars;
3096 3210
3097 my $eval = 3211 my $eval =
… …
3177 while (my ($face, $info) = each %$faces) { 3291 while (my ($face, $info) = each %$faces) {
3178 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3292 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3179 3293
3180 cf::face::set_visibility $idx, $info->{visibility}; 3294 cf::face::set_visibility $idx, $info->{visibility};
3181 cf::face::set_magicmap $idx, $info->{magicmap}; 3295 cf::face::set_magicmap $idx, $info->{magicmap};
3182 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3296 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3183 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3297 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3184 3298
3185 cf::cede_to_tick; 3299 cf::cede_to_tick;
3186 } 3300 }
3187 3301
3188 while (my ($face, $info) = each %$faces) { 3302 while (my ($face, $info) = each %$faces) {
… …
3212 3326
3213 cf::anim::invalidate_all; # d'oh 3327 cf::anim::invalidate_all; # d'oh
3214 } 3328 }
3215 3329
3216 { 3330 {
3217 # TODO: for gcfclient pleasure, we should give resources
3218 # that gcfclient doesn't grok a >10000 face index.
3219 my $res = $facedata->{resource}; 3331 my $res = $facedata->{resource};
3220 3332
3221 while (my ($name, $info) = each %$res) { 3333 while (my ($name, $info) = each %$res) {
3222 if (defined $info->{type}) { 3334 if (defined $info->{type}) {
3223 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3335 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3224 my $data;
3225 3336
3226 if ($info->{type} & 1) { 3337 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3227 # prepend meta info
3228
3229 my $meta = $enc->encode ({
3230 name => $name,
3231 %{ $info->{meta} || {} },
3232 });
3233
3234 $data = pack "(w/a*)*", $meta, $info->{data};
3235 } else {
3236 $data = $info->{data};
3237 }
3238
3239 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3240 cf::face::set_type $idx, $info->{type}; 3338 cf::face::set_type $idx, $info->{type};
3241 } else { 3339 } else {
3242 $RESOURCE{$name} = $info; 3340 $RESOURCE{$name} = $info;
3243 } 3341 }
3244 3342
… …
3327 reload_treasures; 3425 reload_treasures;
3328 3426
3329 warn "finished reloading resource files\n"; 3427 warn "finished reloading resource files\n";
3330} 3428}
3331 3429
3332sub init {
3333 my $guard = freeze_mainloop;
3334
3335 evthread_start IO::AIO::poll_fileno;
3336
3337 reload_resources;
3338}
3339
3340sub reload_config { 3430sub reload_config {
3431 warn "reloading config file...\n";
3432
3341 open my $fh, "<:utf8", "$CONFDIR/config" 3433 open my $fh, "<:utf8", "$CONFDIR/config"
3342 or return; 3434 or return;
3343 3435
3344 local $/; 3436 local $/;
3345 *CFG = YAML::Load <$fh>; 3437 *CFG = YAML::XS::Load scalar <$fh>;
3346 3438
3347 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3439 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3348 3440
3349 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3441 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3350 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3442 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3354 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3446 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3355 and die "WARNING: m(un)lockall failed: $!\n"; 3447 and die "WARNING: m(un)lockall failed: $!\n";
3356 }; 3448 };
3357 warn $@ if $@; 3449 warn $@ if $@;
3358 } 3450 }
3451
3452 warn "finished reloading resource files\n";
3359} 3453}
3360 3454
3361sub pidfile() { 3455sub pidfile() {
3362 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3456 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3363 or die "$PIDFILE: $!"; 3457 or die "$PIDFILE: $!";
… …
3375 3469
3376 seek $fh, 0, 0; 3470 seek $fh, 0, 0;
3377 print $fh $$; 3471 print $fh $$;
3378} 3472}
3379 3473
3474sub main_loop {
3475 warn "EV::loop starting\n";
3476 if (1) {
3477 EV::loop;
3478 }
3479 warn "EV::loop returned\n";
3480 goto &main_loop unless $REALLY_UNLOOP;
3481}
3482
3380sub main { 3483sub main {
3381 atomic; 3484 cf::init_globals; # initialise logging
3485
3486 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3487 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3488 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3489 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3490
3491 cf::init_experience;
3492 cf::init_anim;
3493 cf::init_attackmess;
3494 cf::init_dynamic;
3495
3496 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3382 3497
3383 # we must not ever block the main coroutine 3498 # we must not ever block the main coroutine
3384 local $Coro::idle = sub { 3499 local $Coro::idle = sub {
3385 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3500 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3386 (async { 3501 (async {
3387 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3502 $Coro::current->{desc} = "IDLE BUG HANDLER";
3388 EV::loop EV::LOOP_ONESHOT; 3503 EV::loop EV::LOOP_ONESHOT;
3389 })->prio (Coro::PRIO_MAX); 3504 })->prio (Coro::PRIO_MAX);
3390 }; 3505 };
3391 3506
3392 { 3507 evthread_start IO::AIO::poll_fileno;
3393 my $guard = freeze_mainloop; 3508
3509 cf::sync_job {
3510 cf::load_settings;
3511 cf::load_materials;
3512
3513 reload_resources;
3394 reload_config; 3514 reload_config;
3395 db_init; 3515 db_init;
3516
3517 cf::init_uuid;
3518 cf::init_signals;
3519 cf::init_commands;
3520 cf::init_skills;
3521
3522 cf::init_beforeplay;
3523
3524 atomic;
3525
3396 load_extensions; 3526 load_extensions;
3397 3527
3398 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3399 }
3400
3401 utime time, time, $RUNTIMEFILE; 3528 utime time, time, $RUNTIMEFILE;
3402 3529
3403 # no (long-running) fork's whatsoever before this point(!) 3530 # no (long-running) fork's whatsoever before this point(!)
3531 use POSIX ();
3404 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3532 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3405 3533
3406 EV::loop; 3534 (pop @POST_INIT)->(0) while @POST_INIT;
3535 };
3536
3537 main_loop;
3407} 3538}
3408 3539
3409############################################################################# 3540#############################################################################
3410# initialisation and cleanup 3541# initialisation and cleanup
3411 3542
… …
3467 my $uuid = "$LOCALDIR/uuid"; 3598 my $uuid = "$LOCALDIR/uuid";
3468 3599
3469 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3600 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3470 or return; 3601 or return;
3471 3602
3472 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3603 my $value = uuid_seq uuid_cur;
3604
3605 unless ($value) {
3606 warn "cowardly refusing to write zero uuid value!\n";
3607 return;
3608 }
3609
3610 my $value = uuid_str $value + $uuid_skip;
3473 $uuid_skip = 0; 3611 $uuid_skip = 0;
3474 3612
3475 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3613 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3476 and return; 3614 and return;
3477 3615
… …
3499} 3637}
3500 3638
3501sub emergency_save() { 3639sub emergency_save() {
3502 my $freeze_guard = cf::freeze_mainloop; 3640 my $freeze_guard = cf::freeze_mainloop;
3503 3641
3504 warn "enter emergency perl save\n"; 3642 warn "emergency_perl_save: enter\n";
3505 3643
3506 cf::sync_job { 3644 cf::sync_job {
3645 # this is a trade-off: we want to be very quick here, so
3646 # save all maps without fsync, and later call a global sync
3647 # (which in turn might be very very slow)
3648 local $USE_FSYNC = 0;
3649
3507 # use a peculiar iteration method to avoid tripping on perl 3650 # use a peculiar iteration method to avoid tripping on perl
3508 # refcount bugs in for. also avoids problems with players 3651 # refcount bugs in for. also avoids problems with players
3509 # and maps saved/destroyed asynchronously. 3652 # and maps saved/destroyed asynchronously.
3510 warn "begin emergency player save\n"; 3653 warn "emergency_perl_save: begin player save\n";
3511 for my $login (keys %cf::PLAYER) { 3654 for my $login (keys %cf::PLAYER) {
3512 my $pl = $cf::PLAYER{$login} or next; 3655 my $pl = $cf::PLAYER{$login} or next;
3513 $pl->valid or next; 3656 $pl->valid or next;
3514 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3657 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3515 $pl->save; 3658 $pl->save;
3516 } 3659 }
3517 warn "end emergency player save\n"; 3660 warn "emergency_perl_save: end player save\n";
3518 3661
3519 warn "begin emergency map save\n"; 3662 warn "emergency_perl_save: begin map save\n";
3520 for my $path (keys %cf::MAP) { 3663 for my $path (keys %cf::MAP) {
3521 my $map = $cf::MAP{$path} or next; 3664 my $map = $cf::MAP{$path} or next;
3522 $map->valid or next; 3665 $map->valid or next;
3523 $map->save; 3666 $map->save;
3524 } 3667 }
3525 warn "end emergency map save\n"; 3668 warn "emergency_perl_save: end map save\n";
3526 3669
3527 warn "begin emergency database checkpoint\n"; 3670 warn "emergency_perl_save: begin database checkpoint\n";
3528 BDB::db_env_txn_checkpoint $DB_ENV; 3671 BDB::db_env_txn_checkpoint $DB_ENV;
3529 warn "end emergency database checkpoint\n"; 3672 warn "emergency_perl_save: end database checkpoint\n";
3530 3673
3531 warn "begin write uuid\n"; 3674 warn "emergency_perl_save: begin write uuid\n";
3532 write_uuid_sync 1; 3675 write_uuid_sync 1;
3533 warn "end write uuid\n"; 3676 warn "emergency_perl_save: end write uuid\n";
3534 }; 3677 };
3535 3678
3679 warn "emergency_perl_save: starting sync()\n";
3680 IO::AIO::aio_sync sub {
3681 warn "emergency_perl_save: finished sync()\n";
3682 };
3683
3536 warn "leave emergency perl save\n"; 3684 warn "emergency_perl_save: leave\n";
3537} 3685}
3538 3686
3539sub post_cleanup { 3687sub post_cleanup {
3540 my ($make_core) = @_; 3688 my ($make_core) = @_;
3541 3689
… …
3567 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3715 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3568 for my $name (keys %$leaf_symtab) { 3716 for my $name (keys %$leaf_symtab) {
3569 _gv_clear *{"$pkg$name"}; 3717 _gv_clear *{"$pkg$name"};
3570# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3718# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3571 } 3719 }
3572 warn "cleared package #$pkg\n";#d# 3720 warn "cleared package $pkg\n";#d#
3573} 3721}
3574
3575our $RELOAD; # how many times to reload
3576 3722
3577sub do_reload_perl() { 3723sub do_reload_perl() {
3578 # can/must only be called in main 3724 # can/must only be called in main
3579 if ($Coro::current != $Coro::main) { 3725 if ($Coro::current != $Coro::main) {
3580 warn "can only reload from main coroutine"; 3726 warn "can only reload from main coroutine";
3581 return; 3727 return;
3582 } 3728 }
3583 3729
3584 return if $RELOAD++; 3730 return if $RELOAD++;
3731
3732 my $t1 = EV::time;
3585 3733
3586 while ($RELOAD) { 3734 while ($RELOAD) {
3587 warn "reloading..."; 3735 warn "reloading...";
3588 3736
3589 warn "entering sync_job"; 3737 warn "entering sync_job";
… …
3650 clear_package "safe::$_" 3798 clear_package "safe::$_"
3651 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3799 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3652 3800
3653 warn "unloading cf.pm \"a bit\""; 3801 warn "unloading cf.pm \"a bit\"";
3654 delete $INC{"cf.pm"}; 3802 delete $INC{"cf.pm"};
3655 delete $INC{"cf/pod.pm"}; 3803 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3656 3804
3657 # don't, removes xs symbols, too, 3805 # don't, removes xs symbols, too,
3658 # and global variables created in xs 3806 # and global variables created in xs
3659 #clear_package __PACKAGE__; 3807 #clear_package __PACKAGE__;
3660 3808
3661 warn "unload completed, starting to reload now"; 3809 warn "unload completed, starting to reload now";
3662 3810
3663 warn "reloading cf.pm"; 3811 warn "reloading cf.pm";
3664 require cf; 3812 require cf;
3665 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3813 cf::_connect_to_perl_1;
3666 3814
3667 warn "loading config and database again"; 3815 warn "loading config and database again";
3668 cf::reload_config; 3816 cf::reload_config;
3669 3817
3670 warn "loading extensions"; 3818 warn "loading extensions";
3671 cf::load_extensions; 3819 cf::load_extensions;
3672 3820
3821 if ($REATTACH_ON_RELOAD) {
3673 warn "reattaching attachments to objects/players"; 3822 warn "reattaching attachments to objects/players";
3674 _global_reattach; # objects, sockets 3823 _global_reattach; # objects, sockets
3675 warn "reattaching attachments to maps"; 3824 warn "reattaching attachments to maps";
3676 reattach $_ for values %MAP; 3825 reattach $_ for values %MAP;
3677 warn "reattaching attachments to players"; 3826 warn "reattaching attachments to players";
3678 reattach $_ for values %PLAYER; 3827 reattach $_ for values %PLAYER;
3828 }
3829
3830 warn "running post_init jobs";
3831 (pop @POST_INIT)->(1) while @POST_INIT;
3679 3832
3680 warn "leaving sync_job"; 3833 warn "leaving sync_job";
3681 3834
3682 1 3835 1
3683 } or do { 3836 } or do {
… …
3686 }; 3839 };
3687 3840
3688 warn "reloaded"; 3841 warn "reloaded";
3689 --$RELOAD; 3842 --$RELOAD;
3690 } 3843 }
3844
3845 $t1 = EV::time - $t1;
3846 warn "reload completed in ${t1}s\n";
3691}; 3847};
3692 3848
3693our $RELOAD_WATCHER; # used only during reload 3849our $RELOAD_WATCHER; # used only during reload
3694 3850
3695sub reload_perl() { 3851sub reload_perl() {
3696 # doing reload synchronously and two reloads happen back-to-back, 3852 # doing reload synchronously and two reloads happen back-to-back,
3697 # coro crashes during coro_state_free->destroy here. 3853 # coro crashes during coro_state_free->destroy here.
3698 3854
3855 $RELOAD_WATCHER ||= cf::async {
3856 Coro::AIO::aio_wait cache_extensions;
3857
3699 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3858 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3700 do_reload_perl; 3859 do_reload_perl;
3701 undef $RELOAD_WATCHER; 3860 undef $RELOAD_WATCHER;
3861 };
3702 }; 3862 };
3703} 3863}
3704 3864
3705register_command "reload" => sub { 3865register_command "reload" => sub {
3706 my ($who, $arg) = @_; 3866 my ($who, $arg) = @_;
… …
3832 $msg =~ s/\n//; 3992 $msg =~ s/\n//;
3833 3993
3834 # limit the # of concurrent backtraces 3994 # limit the # of concurrent backtraces
3835 if ($_log_backtrace < 2) { 3995 if ($_log_backtrace < 2) {
3836 ++$_log_backtrace; 3996 ++$_log_backtrace;
3997 my $perl_bt = Carp::longmess $msg;
3837 async { 3998 async {
3838 $Coro::current->{desc} = "abt $msg"; 3999 $Coro::current->{desc} = "abt $msg";
3839 4000
3840 my @bt = fork_call { 4001 my @bt = fork_call {
3841 @addr = map { sprintf "%x", $_ } @addr; 4002 @addr = map { sprintf "%x", $_ } @addr;
… …
3852 } 4013 }
3853 4014
3854 @funcs 4015 @funcs
3855 }; 4016 };
3856 4017
3857 LOG llevInfo, "[ABT] $msg\n"; 4018 LOG llevInfo, "[ABT] $perl_bt\n";
4019 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3858 LOG llevInfo, "[ABT] $_\n" for @bt; 4020 LOG llevInfo, "[ABT] $_\n" for @bt;
3859 --$_log_backtrace; 4021 --$_log_backtrace;
3860 }; 4022 };
3861 } else { 4023 } else {
3862 LOG llevInfo, "[ABT] $msg\n"; 4024 LOG llevInfo, "[ABT] $msg\n";
3863 LOG llevInfo, "[ABT] [suppressed]\n"; 4025 LOG llevInfo, "[ABT] [suppressed]\n";
3864 } 4026 }
3865} 4027}
3866 4028
3867# load additional modules 4029# load additional modules
3868use cf::pod; 4030require "cf/$_.pm" for @EXTRA_MODULES;
4031cf::_connect_to_perl_2;
3869 4032
3870END { cf::emergency_save } 4033END { cf::emergency_save }
3871 4034
38721 40351
3873 4036

Diff Legend

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