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.446 by root, Tue Sep 16 16:03:02 2008 UTC vs.
Revision 1.490 by root, Sat Oct 24 06:16:40 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 ();
36 37
38use Guard ();
37use Coro (); 39use Coro ();
38use Coro::State; 40use Coro::State;
39use Coro::Handle; 41use Coro::Handle;
40use Coro::EV; 42use Coro::EV;
41use Coro::AnyEvent; 43use Coro::AnyEvent;
42use Coro::Timer; 44use Coro::Timer;
43use Coro::Signal; 45use Coro::Signal;
44use Coro::Semaphore; 46use Coro::Semaphore;
47use Coro::SemaphoreSet;
45use Coro::AnyEvent; 48use Coro::AnyEvent;
46use Coro::AIO; 49use Coro::AIO;
47use Coro::BDB 1.6; 50use Coro::BDB 1.6;
48use Coro::Storable; 51use Coro::Storable;
49use Coro::Util (); 52use Coro::Util ();
51use JSON::XS 2.01 (); 54use JSON::XS 2.01 ();
52use BDB (); 55use BDB ();
53use Data::Dumper; 56use Data::Dumper;
54use Digest::MD5; 57use 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';
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>). May block.
2350
2351=cut
2352
2353sub static_maps() {
2354 my @dirs = "";
2355 my @maps;
2356
2357 while (@dirs) {
2358 my $dir = shift @dirs;
2359
2360 next if $dir eq "/styles";
2361
2362 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2363 or return;
2364
2365 for (@$files) {
2366 s/\.map$// or next;
2367 utf8::decode $_;
2368 push @maps, "$dir/$_";
2369 }
2370
2371 push @dirs, map "$dir/$_", @$dirs;
2372 }
2373
2374 \@maps
2375}
2376
2314=back 2377=back
2315 2378
2316=head3 cf::object 2379=head3 cf::object
2317 2380
2318=cut 2381=cut
2383 2446
2384our $SAY_CHANNEL = { 2447our $SAY_CHANNEL = {
2385 id => "say", 2448 id => "say",
2386 title => "Map", 2449 title => "Map",
2387 reply => "say ", 2450 reply => "say ",
2388 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2451 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2389}; 2452};
2390 2453
2391our $CHAT_CHANNEL = { 2454our $CHAT_CHANNEL = {
2392 id => "chat", 2455 id => "chat",
2393 title => "Chat", 2456 title => "Chat",
2519 2582
2520 $map->load; 2583 $map->load;
2521 $map->load_neighbours; 2584 $map->load_neighbours;
2522 2585
2523 return unless $self->contr->active; 2586 return unless $self->contr->active;
2524 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2525 $self->activate_recursive;
2526 2587
2527 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2588 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2528 $self->enter_map ($map, $x, $y); 2589 $self->enter_map ($map, $x, $y);
2590
2591 # only activate afterwards, to support waiting in hooks
2592 $self->activate_recursive;
2529} 2593}
2530 2594
2531=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2595=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2532 2596
2533Moves the player to the given map-path and coordinates by first freezing 2597Moves the player to the given map-path and coordinates by first freezing
2692 $self->contr->savebed ($map, $x, $y) 2756 $self->contr->savebed ($map, $x, $y)
2693 if $exit->flag (cf::FLAG_DAMNED); 2757 if $exit->flag (cf::FLAG_DAMNED);
2694 2758
2695 1 2759 1
2696 }) { 2760 }) {
2697 $self->message ("Something went wrong deep within the crossfire server. " 2761 $self->message ("Something went wrong deep within the deliantra server. "
2698 . "I'll try to bring you back to the map you were before. " 2762 . "I'll try to bring you back to the map you were before. "
2699 . "Please report this to the dungeon master!", 2763 . "Please report this to the dungeon master!",
2700 cf::NDI_UNIQUE | cf::NDI_RED); 2764 cf::NDI_UNIQUE | cf::NDI_RED);
2701 2765
2702 warn "ERROR in enter_exit: $@"; 2766 warn "ERROR in enter_exit: $@";
2732 2796
2733=cut 2797=cut
2734 2798
2735# non-persistent channels (usually the info channel) 2799# non-persistent channels (usually the info channel)
2736our %CHANNEL = ( 2800our %CHANNEL = (
2801 "c/motd" => {
2802 id => "infobox",
2803 title => "MOTD",
2804 reply => undef,
2805 tooltip => "The message of the day",
2806 },
2737 "c/identify" => { 2807 "c/identify" => {
2738 id => "infobox", 2808 id => "infobox",
2739 title => "Identify", 2809 title => "Identify",
2740 reply => undef, 2810 reply => undef,
2741 tooltip => "Items recently identified", 2811 tooltip => "Items recently identified",
2743 "c/examine" => { 2813 "c/examine" => {
2744 id => "infobox", 2814 id => "infobox",
2745 title => "Examine", 2815 title => "Examine",
2746 reply => undef, 2816 reply => undef,
2747 tooltip => "Signs and other items you examined", 2817 tooltip => "Signs and other items you examined",
2818 },
2819 "c/shopinfo" => {
2820 id => "infobox",
2821 title => "Shop Info",
2822 reply => undef,
2823 tooltip => "What your bargaining skill tells you about the shop",
2748 }, 2824 },
2749 "c/book" => { 2825 "c/book" => {
2750 id => "infobox", 2826 id => "infobox",
2751 title => "Book", 2827 title => "Book",
2752 reply => undef, 2828 reply => undef,
2768 id => "infobox", 2844 id => "infobox",
2769 title => "Body Parts", 2845 title => "Body Parts",
2770 reply => undef, 2846 reply => undef,
2771 tooltip => "Shows which body parts you posess and are available", 2847 tooltip => "Shows which body parts you posess and are available",
2772 }, 2848 },
2849 "c/statistics" => {
2850 id => "infobox",
2851 title => "Statistics",
2852 reply => undef,
2853 tooltip => "Shows your primary statistics",
2854 },
2855 "c/skills" => {
2856 id => "infobox",
2857 title => "Skills",
2858 reply => undef,
2859 tooltip => "Shows your experience per skill and item power",
2860 },
2861 "c/shopitems" => {
2862 id => "infobox",
2863 title => "Shop Items",
2864 reply => undef,
2865 tooltip => "Shows the items currently for sale in this shop",
2866 },
2867 "c/resistances" => {
2868 id => "infobox",
2869 title => "Resistances",
2870 reply => undef,
2871 tooltip => "Shows your resistances",
2872 },
2873 "c/pets" => {
2874 id => "infobox",
2875 title => "Pets",
2876 reply => undef,
2877 tooltip => "Shows information abotu your pets/a specific pet",
2878 },
2879 "c/perceiveself" => {
2880 id => "infobox",
2881 title => "Perceive Self",
2882 reply => undef,
2883 tooltip => "You gained detailed knowledge about yourself",
2884 },
2773 "c/uptime" => { 2885 "c/uptime" => {
2774 id => "infobox", 2886 id => "infobox",
2775 title => "Uptime", 2887 title => "Uptime",
2776 reply => undef, 2888 reply => undef,
2777 tooltip => "How long the server has been running since last restart", 2889 tooltip => "How long the server has been running since last restart",
2786 id => "party", 2898 id => "party",
2787 title => "Party", 2899 title => "Party",
2788 reply => "gsay ", 2900 reply => "gsay ",
2789 tooltip => "Messages and chat related to your party", 2901 tooltip => "Messages and chat related to your party",
2790 }, 2902 },
2903 "c/death" => {
2904 id => "death",
2905 title => "Death",
2906 reply => undef,
2907 tooltip => "Reason for and more info about your most recent death",
2908 },
2909 "c/say" => $SAY_CHANNEL,
2910 "c/chat" => $CHAT_CHANNEL,
2791); 2911);
2792 2912
2793sub cf::client::send_msg { 2913sub cf::client::send_msg {
2794 my ($self, $channel, $msg, $color, @extra) = @_; 2914 my ($self, $channel, $msg, $color, @extra) = @_;
2795 2915
2796 $msg = $self->pl->expand_cfpod ($msg); 2916 $msg = $self->pl->expand_cfpod ($msg)
2917 unless $color & cf::NDI_VERBATIM;
2797 2918
2798 $color &= cf::NDI_CLIENT_MASK; # just in case... 2919 $color &= cf::NDI_CLIENT_MASK; # just in case...
2799 2920
2800 # check predefined channels, for the benefit of C 2921 # check predefined channels, for the benefit of C
2801 if ($CHANNEL{$channel}) { 2922 if ($CHANNEL{$channel}) {
2802 $channel = $CHANNEL{$channel}; 2923 $channel = $CHANNEL{$channel};
2803 2924
2804 $self->ext_msg (channel_info => $channel) 2925 $self->ext_msg (channel_info => $channel);
2805 if $self->can_msg;
2806
2807 $channel = $channel->{id}; 2926 $channel = $channel->{id};
2808 2927
2809 } elsif (ref $channel) { 2928 } elsif (ref $channel) {
2810 # send meta info to client, if not yet sent 2929 # send meta info to client, if not yet sent
2811 unless (exists $self->{channel}{$channel->{id}}) { 2930 unless (exists $self->{channel}{$channel->{id}}) {
2812 $self->{channel}{$channel->{id}} = $channel; 2931 $self->{channel}{$channel->{id}} = $channel;
2813 $self->ext_msg (channel_info => $channel) 2932 $self->ext_msg (channel_info => $channel);
2814 if $self->can_msg;
2815 } 2933 }
2816 2934
2817 $channel = $channel->{id}; 2935 $channel = $channel->{id};
2818 } 2936 }
2819 2937
2820 return unless @extra || length $msg; 2938 return unless @extra || length $msg;
2821 2939
2822 if ($self->can_msg) {
2823 # default colour, mask it out 2940 # default colour, mask it out
2824 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2941 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2825 if $color & cf::NDI_DEF; 2942 if $color & cf::NDI_DEF;
2826 2943
2827 my $pkt = "msg " 2944 my $pkt = "msg "
2828 . $self->{json_coder}->encode ( 2945 . $self->{json_coder}->encode (
2829 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2946 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2830 ); 2947 );
2831 2948
2832 # try lzf for large packets 2949 # try lzf for large packets
2833 $pkt = "lzf " . Compress::LZF::compress $pkt 2950 $pkt = "lzf " . Compress::LZF::compress $pkt
2834 if 1024 <= length $pkt and $self->{can_lzf}; 2951 if 1024 <= length $pkt and $self->{can_lzf};
2835 2952
2836 # split very large packets 2953 # split very large packets
2837 if (8192 < length $pkt and $self->{can_lzf}) { 2954 if (8192 < length $pkt and $self->{can_lzf}) {
2838 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; 2955 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2839 $pkt = "frag"; 2956 $pkt = "frag";
2840 } 2957 }
2841 2958
2842 $self->send_packet ($pkt); 2959 $self->send_packet ($pkt);
2843 } else {
2844 if ($color >= 0) {
2845 # replace some tags by gcfclient-compatible ones
2846 for ($msg) {
2847 1 while
2848 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2849 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2850 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2851 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2852 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2853 }
2854
2855 $color &= cf::NDI_COLOR_MASK;
2856
2857 utf8::encode $msg;
2858
2859 if (0 && $msg =~ /\[/) {
2860 # COMMAND/INFO
2861 $self->send_packet ("drawextinfo $color 10 8 $msg")
2862 } else {
2863 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2864 $self->send_packet ("drawinfo $color $msg")
2865 }
2866 }
2867 }
2868} 2960}
2869 2961
2870=item $client->ext_msg ($type, @msg) 2962=item $client->ext_msg ($type, @msg)
2871 2963
2872Sends an ext event to the client. 2964Sends an ext event to the client.
3047The following functions and methods are available within a safe environment: 3139The following functions and methods are available within a safe environment:
3048 3140
3049 cf::object 3141 cf::object
3050 contr pay_amount pay_player map x y force_find force_add destroy 3142 contr pay_amount pay_player map x y force_find force_add destroy
3051 insert remove name archname title slaying race decrease split 3143 insert remove name archname title slaying race decrease split
3144 value
3052 3145
3053 cf::object::player 3146 cf::object::player
3054 player 3147 player
3055 3148
3056 cf::player 3149 cf::player
3062=cut 3155=cut
3063 3156
3064for ( 3157for (
3065 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3158 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3066 insert remove inv nrof name archname title slaying race 3159 insert remove inv nrof name archname title slaying race
3067 decrease split destroy change_exp)], 3160 decrease split destroy change_exp value msg lore send_msg)],
3068 ["cf::object::player" => qw(player)], 3161 ["cf::object::player" => qw(player)],
3069 ["cf::player" => qw(peaceful)], 3162 ["cf::player" => qw(peaceful send_msg)],
3070 ["cf::map" => qw(trigger)], 3163 ["cf::map" => qw(trigger)],
3071) { 3164) {
3072 no strict 'refs'; 3165 no strict 'refs';
3073 my ($pkg, @funs) = @$_; 3166 my ($pkg, @funs) = @$_;
3074 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3167 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3091 my ($code, %vars) = @_; 3184 my ($code, %vars) = @_;
3092 3185
3093 my $qcode = $code; 3186 my $qcode = $code;
3094 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3187 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3095 $qcode =~ s/\n/\\n/g; 3188 $qcode =~ s/\n/\\n/g;
3189
3190 %vars = (_dummy => 0) unless %vars;
3096 3191
3097 local $_; 3192 local $_;
3098 local @safe::cf::_safe_eval_args = values %vars; 3193 local @safe::cf::_safe_eval_args = values %vars;
3099 3194
3100 my $eval = 3195 my $eval =
3330 reload_treasures; 3425 reload_treasures;
3331 3426
3332 warn "finished reloading resource files\n"; 3427 warn "finished reloading resource files\n";
3333} 3428}
3334 3429
3335sub init {
3336 my $guard = freeze_mainloop;
3337
3338 evthread_start IO::AIO::poll_fileno;
3339
3340 reload_resources;
3341}
3342
3343sub reload_config { 3430sub reload_config {
3431 warn "reloading config file...\n";
3432
3344 open my $fh, "<:utf8", "$CONFDIR/config" 3433 open my $fh, "<:utf8", "$CONFDIR/config"
3345 or return; 3434 or return;
3346 3435
3347 local $/; 3436 local $/;
3348 *CFG = YAML::Load <$fh>; 3437 *CFG = YAML::XS::Load scalar <$fh>;
3349 3438
3350 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3439 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3351 3440
3352 $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};
3353 $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};
3357 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3446 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3358 and die "WARNING: m(un)lockall failed: $!\n"; 3447 and die "WARNING: m(un)lockall failed: $!\n";
3359 }; 3448 };
3360 warn $@ if $@; 3449 warn $@ if $@;
3361 } 3450 }
3451
3452 warn "finished reloading resource files\n";
3362} 3453}
3363 3454
3364sub pidfile() { 3455sub pidfile() {
3365 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3456 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3366 or die "$PIDFILE: $!"; 3457 or die "$PIDFILE: $!";
3378 3469
3379 seek $fh, 0, 0; 3470 seek $fh, 0, 0;
3380 print $fh $$; 3471 print $fh $$;
3381} 3472}
3382 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
3383sub main { 3483sub main {
3384 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
3385 3497
3386 # we must not ever block the main coroutine 3498 # we must not ever block the main coroutine
3387 local $Coro::idle = sub { 3499 local $Coro::idle = sub {
3388 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#
3389 (async { 3501 (async {
3390 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3502 $Coro::current->{desc} = "IDLE BUG HANDLER";
3391 EV::loop EV::LOOP_ONESHOT; 3503 EV::loop EV::LOOP_ONESHOT;
3392 })->prio (Coro::PRIO_MAX); 3504 })->prio (Coro::PRIO_MAX);
3393 }; 3505 };
3394 3506
3395 { 3507 evthread_start IO::AIO::poll_fileno;
3396 my $guard = freeze_mainloop; 3508
3509 cf::sync_job {
3510 reload_resources;
3397 reload_config; 3511 reload_config;
3398 db_init; 3512 db_init;
3513
3514 cf::load_settings;
3515 cf::load_materials;
3516 cf::init_uuid;
3517 cf::init_signals;
3518 cf::init_commands;
3519 cf::init_skills;
3520
3521 cf::init_beforeplay;
3522
3523 atomic;
3524
3399 load_extensions; 3525 load_extensions;
3400 3526
3401 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3402 }
3403
3404 utime time, time, $RUNTIMEFILE; 3527 utime time, time, $RUNTIMEFILE;
3405 3528
3406 # no (long-running) fork's whatsoever before this point(!) 3529 # no (long-running) fork's whatsoever before this point(!)
3530 use POSIX ();
3407 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3531 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3408 3532
3409 EV::loop; 3533 (pop @POST_INIT)->(0) while @POST_INIT;
3534 };
3535
3536 main_loop;
3410} 3537}
3411 3538
3412############################################################################# 3539#############################################################################
3413# initialisation and cleanup 3540# initialisation and cleanup
3414 3541
3470 my $uuid = "$LOCALDIR/uuid"; 3597 my $uuid = "$LOCALDIR/uuid";
3471 3598
3472 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3599 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3473 or return; 3600 or return;
3474 3601
3475 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3602 my $value = uuid_seq uuid_cur;
3603
3604 unless ($value) {
3605 warn "cowardly refusing to write zero uuid value!\n";
3606 return;
3607 }
3608
3609 my $value = uuid_str $value + $uuid_skip;
3476 $uuid_skip = 0; 3610 $uuid_skip = 0;
3477 3611
3478 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3612 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3479 and return; 3613 and return;
3480 3614
3502} 3636}
3503 3637
3504sub emergency_save() { 3638sub emergency_save() {
3505 my $freeze_guard = cf::freeze_mainloop; 3639 my $freeze_guard = cf::freeze_mainloop;
3506 3640
3507 warn "enter emergency perl save\n"; 3641 warn "emergency_perl_save: enter\n";
3508 3642
3509 cf::sync_job { 3643 cf::sync_job {
3644 # this is a trade-off: we want to be very quick here, so
3645 # save all maps without fsync, and later call a global sync
3646 # (which in turn might be very very slow)
3647 local $USE_FSYNC = 0;
3648
3510 # use a peculiar iteration method to avoid tripping on perl 3649 # use a peculiar iteration method to avoid tripping on perl
3511 # refcount bugs in for. also avoids problems with players 3650 # refcount bugs in for. also avoids problems with players
3512 # and maps saved/destroyed asynchronously. 3651 # and maps saved/destroyed asynchronously.
3513 warn "begin emergency player save\n"; 3652 warn "emergency_perl_save: begin player save\n";
3514 for my $login (keys %cf::PLAYER) { 3653 for my $login (keys %cf::PLAYER) {
3515 my $pl = $cf::PLAYER{$login} or next; 3654 my $pl = $cf::PLAYER{$login} or next;
3516 $pl->valid or next; 3655 $pl->valid or next;
3517 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3656 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3518 $pl->save; 3657 $pl->save;
3519 } 3658 }
3520 warn "end emergency player save\n"; 3659 warn "emergency_perl_save: end player save\n";
3521 3660
3522 warn "begin emergency map save\n"; 3661 warn "emergency_perl_save: begin map save\n";
3523 for my $path (keys %cf::MAP) { 3662 for my $path (keys %cf::MAP) {
3524 my $map = $cf::MAP{$path} or next; 3663 my $map = $cf::MAP{$path} or next;
3525 $map->valid or next; 3664 $map->valid or next;
3526 $map->save; 3665 $map->save;
3527 } 3666 }
3528 warn "end emergency map save\n"; 3667 warn "emergency_perl_save: end map save\n";
3529 3668
3530 warn "begin emergency database checkpoint\n"; 3669 warn "emergency_perl_save: begin database checkpoint\n";
3531 BDB::db_env_txn_checkpoint $DB_ENV; 3670 BDB::db_env_txn_checkpoint $DB_ENV;
3532 warn "end emergency database checkpoint\n"; 3671 warn "emergency_perl_save: end database checkpoint\n";
3533 3672
3534 warn "begin write uuid\n"; 3673 warn "emergency_perl_save: begin write uuid\n";
3535 write_uuid_sync 1; 3674 write_uuid_sync 1;
3536 warn "end write uuid\n"; 3675 warn "emergency_perl_save: end write uuid\n";
3537 }; 3676 };
3538 3677
3678 warn "emergency_perl_save: starting sync()\n";
3679 IO::AIO::aio_sync sub {
3680 warn "emergency_perl_save: finished sync()\n";
3681 };
3682
3539 warn "leave emergency perl save\n"; 3683 warn "emergency_perl_save: leave\n";
3540} 3684}
3541 3685
3542sub post_cleanup { 3686sub post_cleanup {
3543 my ($make_core) = @_; 3687 my ($make_core) = @_;
3544 3688
3570 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3714 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3571 for my $name (keys %$leaf_symtab) { 3715 for my $name (keys %$leaf_symtab) {
3572 _gv_clear *{"$pkg$name"}; 3716 _gv_clear *{"$pkg$name"};
3573# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3717# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3574 } 3718 }
3575 warn "cleared package #$pkg\n";#d# 3719 warn "cleared package $pkg\n";#d#
3576} 3720}
3577
3578our $RELOAD; # how many times to reload
3579 3721
3580sub do_reload_perl() { 3722sub do_reload_perl() {
3581 # can/must only be called in main 3723 # can/must only be called in main
3582 if ($Coro::current != $Coro::main) { 3724 if ($Coro::current != $Coro::main) {
3583 warn "can only reload from main coroutine"; 3725 warn "can only reload from main coroutine";
3584 return; 3726 return;
3585 } 3727 }
3586 3728
3587 return if $RELOAD++; 3729 return if $RELOAD++;
3730
3731 my $t1 = EV::time;
3588 3732
3589 while ($RELOAD) { 3733 while ($RELOAD) {
3590 warn "reloading..."; 3734 warn "reloading...";
3591 3735
3592 warn "entering sync_job"; 3736 warn "entering sync_job";
3653 clear_package "safe::$_" 3797 clear_package "safe::$_"
3654 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3798 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3655 3799
3656 warn "unloading cf.pm \"a bit\""; 3800 warn "unloading cf.pm \"a bit\"";
3657 delete $INC{"cf.pm"}; 3801 delete $INC{"cf.pm"};
3658 delete $INC{"cf/pod.pm"}; 3802 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3659 3803
3660 # don't, removes xs symbols, too, 3804 # don't, removes xs symbols, too,
3661 # and global variables created in xs 3805 # and global variables created in xs
3662 #clear_package __PACKAGE__; 3806 #clear_package __PACKAGE__;
3663 3807
3664 warn "unload completed, starting to reload now"; 3808 warn "unload completed, starting to reload now";
3665 3809
3666 warn "reloading cf.pm"; 3810 warn "reloading cf.pm";
3667 require cf; 3811 require cf;
3668 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3812 cf::_connect_to_perl_1;
3669 3813
3670 warn "loading config and database again"; 3814 warn "loading config and database again";
3671 cf::reload_config; 3815 cf::reload_config;
3672 3816
3673 warn "loading extensions"; 3817 warn "loading extensions";
3674 cf::load_extensions; 3818 cf::load_extensions;
3675 3819
3820 if ($REATTACH_ON_RELOAD) {
3676 warn "reattaching attachments to objects/players"; 3821 warn "reattaching attachments to objects/players";
3677 _global_reattach; # objects, sockets 3822 _global_reattach; # objects, sockets
3678 warn "reattaching attachments to maps"; 3823 warn "reattaching attachments to maps";
3679 reattach $_ for values %MAP; 3824 reattach $_ for values %MAP;
3680 warn "reattaching attachments to players"; 3825 warn "reattaching attachments to players";
3681 reattach $_ for values %PLAYER; 3826 reattach $_ for values %PLAYER;
3827 }
3828
3829 warn "running post_init jobs";
3830 (pop @POST_INIT)->(1) while @POST_INIT;
3682 3831
3683 warn "leaving sync_job"; 3832 warn "leaving sync_job";
3684 3833
3685 1 3834 1
3686 } or do { 3835 } or do {
3689 }; 3838 };
3690 3839
3691 warn "reloaded"; 3840 warn "reloaded";
3692 --$RELOAD; 3841 --$RELOAD;
3693 } 3842 }
3843
3844 $t1 = EV::time - $t1;
3845 warn "reload completed in ${t1}s\n";
3694}; 3846};
3695 3847
3696our $RELOAD_WATCHER; # used only during reload 3848our $RELOAD_WATCHER; # used only during reload
3697 3849
3698sub reload_perl() { 3850sub reload_perl() {
3699 # doing reload synchronously and two reloads happen back-to-back, 3851 # doing reload synchronously and two reloads happen back-to-back,
3700 # coro crashes during coro_state_free->destroy here. 3852 # coro crashes during coro_state_free->destroy here.
3701 3853
3854 $RELOAD_WATCHER ||= cf::async {
3855 Coro::AIO::aio_wait cache_extensions;
3856
3702 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3857 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3703 do_reload_perl; 3858 do_reload_perl;
3704 undef $RELOAD_WATCHER; 3859 undef $RELOAD_WATCHER;
3860 };
3705 }; 3861 };
3706} 3862}
3707 3863
3708register_command "reload" => sub { 3864register_command "reload" => sub {
3709 my ($who, $arg) = @_; 3865 my ($who, $arg) = @_;
3868 LOG llevInfo, "[ABT] [suppressed]\n"; 4024 LOG llevInfo, "[ABT] [suppressed]\n";
3869 } 4025 }
3870} 4026}
3871 4027
3872# load additional modules 4028# load additional modules
3873use cf::pod; 4029require "cf/$_.pm" for @EXTRA_MODULES;
4030cf::_connect_to_perl_2;
3874 4031
3875END { cf::emergency_save } 4032END { cf::emergency_save }
3876 4033
38771 40341
3878 4035

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines