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.485 by root, Mon Oct 12 14:12:54 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
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}) {
2383 2415
2384our $SAY_CHANNEL = { 2416our $SAY_CHANNEL = {
2385 id => "say", 2417 id => "say",
2386 title => "Map", 2418 title => "Map",
2387 reply => "say ", 2419 reply => "say ",
2388 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2420 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2389}; 2421};
2390 2422
2391our $CHAT_CHANNEL = { 2423our $CHAT_CHANNEL = {
2392 id => "chat", 2424 id => "chat",
2393 title => "Chat", 2425 title => "Chat",
2448 2480
2449=item $player_object->enter_link 2481=item $player_object->enter_link
2450 2482
2451Freezes the player and moves him/her to a special map (C<{link}>). 2483Freezes the player and moves him/her to a special map (C<{link}>).
2452 2484
2453The player should be reasonably safe there for short amounts of time. You 2485The player should be reasonably safe there for short amounts of time (e.g.
2454I<MUST> call C<leave_link> as soon as possible, though. 2486for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2487though, as the palyer cannot control the character while it is on the link
2488map.
2455 2489
2456Will never block. 2490Will never block.
2457 2491
2458=item $player_object->leave_link ($map, $x, $y) 2492=item $player_object->leave_link ($map, $x, $y)
2459 2493
2517 2551
2518 $map->load; 2552 $map->load;
2519 $map->load_neighbours; 2553 $map->load_neighbours;
2520 2554
2521 return unless $self->contr->active; 2555 return unless $self->contr->active;
2522 $self->activate_recursive;
2523 2556
2524 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2557 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2525 $self->enter_map ($map, $x, $y); 2558 $self->enter_map ($map, $x, $y);
2559
2560 # only activate afterwards, to support waiting in hooks
2561 $self->activate_recursive;
2526} 2562}
2527 2563
2528=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2564=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2529 2565
2530Moves the player to the given map-path and coordinates by first freezing 2566Moves the player to the given map-path and coordinates by first freezing
2689 $self->contr->savebed ($map, $x, $y) 2725 $self->contr->savebed ($map, $x, $y)
2690 if $exit->flag (cf::FLAG_DAMNED); 2726 if $exit->flag (cf::FLAG_DAMNED);
2691 2727
2692 1 2728 1
2693 }) { 2729 }) {
2694 $self->message ("Something went wrong deep within the crossfire server. " 2730 $self->message ("Something went wrong deep within the deliantra server. "
2695 . "I'll try to bring you back to the map you were before. " 2731 . "I'll try to bring you back to the map you were before. "
2696 . "Please report this to the dungeon master!", 2732 . "Please report this to the dungeon master!",
2697 cf::NDI_UNIQUE | cf::NDI_RED); 2733 cf::NDI_UNIQUE | cf::NDI_RED);
2698 2734
2699 warn "ERROR in enter_exit: $@"; 2735 warn "ERROR in enter_exit: $@";
2765 id => "infobox", 2801 id => "infobox",
2766 title => "Body Parts", 2802 title => "Body Parts",
2767 reply => undef, 2803 reply => undef,
2768 tooltip => "Shows which body parts you posess and are available", 2804 tooltip => "Shows which body parts you posess and are available",
2769 }, 2805 },
2806 "c/statistics" => {
2807 id => "infobox",
2808 title => "Statistics",
2809 reply => undef,
2810 tooltip => "Shows your primary statistics",
2811 },
2812 "c/skills" => {
2813 id => "infobox",
2814 title => "Skills",
2815 reply => undef,
2816 tooltip => "Shows your experience per skill and item power",
2817 },
2818 "c/shopitems" => {
2819 id => "infobox",
2820 title => "Shop Items",
2821 reply => undef,
2822 tooltip => "Shows the items currently for sale in this shop",
2823 },
2824 "c/resistances" => {
2825 id => "infobox",
2826 title => "Resistances",
2827 reply => undef,
2828 tooltip => "Shows your resistances",
2829 },
2830 "c/pets" => {
2831 id => "infobox",
2832 title => "Pets",
2833 reply => undef,
2834 tooltip => "Shows information abotu your pets/a specific pet",
2835 },
2836 "c/perceiveself" => {
2837 id => "infobox",
2838 title => "Perceive Self",
2839 reply => undef,
2840 tooltip => "You gained detailed knowledge about yourself",
2841 },
2770 "c/uptime" => { 2842 "c/uptime" => {
2771 id => "infobox", 2843 id => "infobox",
2772 title => "Uptime", 2844 title => "Uptime",
2773 reply => undef, 2845 reply => undef,
2774 tooltip => "How long the server has been running since last restart", 2846 tooltip => "How long the server has been running since last restart",
2783 id => "party", 2855 id => "party",
2784 title => "Party", 2856 title => "Party",
2785 reply => "gsay ", 2857 reply => "gsay ",
2786 tooltip => "Messages and chat related to your party", 2858 tooltip => "Messages and chat related to your party",
2787 }, 2859 },
2860 "c/death" => {
2861 id => "death",
2862 title => "Death",
2863 reply => undef,
2864 tooltip => "Reason for and more info about your most recent death",
2865 },
2866 "c/say" => $SAY_CHANNEL,
2867 "c/chat" => $CHAT_CHANNEL,
2788); 2868);
2789 2869
2790sub cf::client::send_msg { 2870sub cf::client::send_msg {
2791 my ($self, $channel, $msg, $color, @extra) = @_; 2871 my ($self, $channel, $msg, $color, @extra) = @_;
2792 2872
2793 $msg = $self->pl->expand_cfpod ($msg); 2873 $msg = $self->pl->expand_cfpod ($msg)
2874 unless $color & cf::NDI_VERBATIM;
2794 2875
2795 $color &= cf::NDI_CLIENT_MASK; # just in case... 2876 $color &= cf::NDI_CLIENT_MASK; # just in case...
2796 2877
2797 # check predefined channels, for the benefit of C 2878 # check predefined channels, for the benefit of C
2798 if ($CHANNEL{$channel}) { 2879 if ($CHANNEL{$channel}) {
2799 $channel = $CHANNEL{$channel}; 2880 $channel = $CHANNEL{$channel};
2800 2881
2801 $self->ext_msg (channel_info => $channel) 2882 $self->ext_msg (channel_info => $channel);
2802 if $self->can_msg;
2803
2804 $channel = $channel->{id}; 2883 $channel = $channel->{id};
2805 2884
2806 } elsif (ref $channel) { 2885 } elsif (ref $channel) {
2807 # send meta info to client, if not yet sent 2886 # send meta info to client, if not yet sent
2808 unless (exists $self->{channel}{$channel->{id}}) { 2887 unless (exists $self->{channel}{$channel->{id}}) {
2809 $self->{channel}{$channel->{id}} = $channel; 2888 $self->{channel}{$channel->{id}} = $channel;
2810 $self->ext_msg (channel_info => $channel) 2889 $self->ext_msg (channel_info => $channel);
2811 if $self->can_msg;
2812 } 2890 }
2813 2891
2814 $channel = $channel->{id}; 2892 $channel = $channel->{id};
2815 } 2893 }
2816 2894
2817 return unless @extra || length $msg; 2895 return unless @extra || length $msg;
2818 2896
2819 if ($self->can_msg) {
2820 # default colour, mask it out 2897 # default colour, mask it out
2821 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2898 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2822 if $color & cf::NDI_DEF; 2899 if $color & cf::NDI_DEF;
2823 2900
2824 my $pkt = "msg " 2901 my $pkt = "msg "
2825 . $self->{json_coder}->encode ( 2902 . $self->{json_coder}->encode (
2826 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2903 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2827 ); 2904 );
2828 2905
2829 # try lzf for large packets 2906 # try lzf for large packets
2830 $pkt = "lzf " . Compress::LZF::compress $pkt 2907 $pkt = "lzf " . Compress::LZF::compress $pkt
2831 if 1024 <= length $pkt and $self->{can_lzf}; 2908 if 1024 <= length $pkt and $self->{can_lzf};
2832 2909
2833 # split very large packets 2910 # split very large packets
2834 if (8192 < length $pkt and $self->{can_lzf}) { 2911 if (8192 < length $pkt and $self->{can_lzf}) {
2835 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; 2912 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2836 $pkt = "frag"; 2913 $pkt = "frag";
2837 } 2914 }
2838 2915
2839 $self->send_packet ($pkt); 2916 $self->send_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} 2917}
2866 2918
2867=item $client->ext_msg ($type, @msg) 2919=item $client->ext_msg ($type, @msg)
2868 2920
2869Sends an ext event to the client. 2921Sends an ext event to the client.
3044The following functions and methods are available within a safe environment: 3096The following functions and methods are available within a safe environment:
3045 3097
3046 cf::object 3098 cf::object
3047 contr pay_amount pay_player map x y force_find force_add destroy 3099 contr pay_amount pay_player map x y force_find force_add destroy
3048 insert remove name archname title slaying race decrease split 3100 insert remove name archname title slaying race decrease split
3101 value
3049 3102
3050 cf::object::player 3103 cf::object::player
3051 player 3104 player
3052 3105
3053 cf::player 3106 cf::player
3059=cut 3112=cut
3060 3113
3061for ( 3114for (
3062 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3115 ["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 3116 insert remove inv nrof name archname title slaying race
3064 decrease split destroy change_exp)], 3117 decrease split destroy change_exp value msg lore send_msg)],
3065 ["cf::object::player" => qw(player)], 3118 ["cf::object::player" => qw(player)],
3066 ["cf::player" => qw(peaceful)], 3119 ["cf::player" => qw(peaceful send_msg)],
3067 ["cf::map" => qw(trigger)], 3120 ["cf::map" => qw(trigger)],
3068) { 3121) {
3069 no strict 'refs'; 3122 no strict 'refs';
3070 my ($pkg, @funs) = @$_; 3123 my ($pkg, @funs) = @$_;
3071 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3124 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3088 my ($code, %vars) = @_; 3141 my ($code, %vars) = @_;
3089 3142
3090 my $qcode = $code; 3143 my $qcode = $code;
3091 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3144 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3092 $qcode =~ s/\n/\\n/g; 3145 $qcode =~ s/\n/\\n/g;
3146
3147 %vars = (_dummy => 0) unless %vars;
3093 3148
3094 local $_; 3149 local $_;
3095 local @safe::cf::_safe_eval_args = values %vars; 3150 local @safe::cf::_safe_eval_args = values %vars;
3096 3151
3097 my $eval = 3152 my $eval =
3327 reload_treasures; 3382 reload_treasures;
3328 3383
3329 warn "finished reloading resource files\n"; 3384 warn "finished reloading resource files\n";
3330} 3385}
3331 3386
3332sub init {
3333 my $guard = freeze_mainloop;
3334
3335 evthread_start IO::AIO::poll_fileno;
3336
3337 reload_resources;
3338}
3339
3340sub reload_config { 3387sub reload_config {
3388 warn "reloading config file...\n";
3389
3341 open my $fh, "<:utf8", "$CONFDIR/config" 3390 open my $fh, "<:utf8", "$CONFDIR/config"
3342 or return; 3391 or return;
3343 3392
3344 local $/; 3393 local $/;
3345 *CFG = YAML::Load <$fh>; 3394 *CFG = YAML::XS::Load scalar <$fh>;
3346 3395
3347 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3396 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3348 3397
3349 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3398 $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}; 3399 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3354 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3403 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3355 and die "WARNING: m(un)lockall failed: $!\n"; 3404 and die "WARNING: m(un)lockall failed: $!\n";
3356 }; 3405 };
3357 warn $@ if $@; 3406 warn $@ if $@;
3358 } 3407 }
3408
3409 warn "finished reloading resource files\n";
3359} 3410}
3360 3411
3361sub pidfile() { 3412sub pidfile() {
3362 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3413 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3363 or die "$PIDFILE: $!"; 3414 or die "$PIDFILE: $!";
3375 3426
3376 seek $fh, 0, 0; 3427 seek $fh, 0, 0;
3377 print $fh $$; 3428 print $fh $$;
3378} 3429}
3379 3430
3431sub main_loop {
3432 warn "EV::loop starting\n";
3433 if (1) {
3434 EV::loop;
3435 }
3436 warn "EV::loop returned\n";
3437 goto &main_loop unless $REALLY_UNLOOP;
3438}
3439
3380sub main { 3440sub main {
3381 atomic; 3441 cf::init_globals; # initialise logging
3442
3443 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3444 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3445 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3446 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3447
3448 cf::init_experience;
3449 cf::init_anim;
3450 cf::init_attackmess;
3451 cf::init_dynamic;
3452
3453 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3382 3454
3383 # we must not ever block the main coroutine 3455 # we must not ever block the main coroutine
3384 local $Coro::idle = sub { 3456 local $Coro::idle = sub {
3385 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3457 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3386 (async { 3458 (async {
3387 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3459 $Coro::current->{desc} = "IDLE BUG HANDLER";
3388 EV::loop EV::LOOP_ONESHOT; 3460 EV::loop EV::LOOP_ONESHOT;
3389 })->prio (Coro::PRIO_MAX); 3461 })->prio (Coro::PRIO_MAX);
3390 }; 3462 };
3391 3463
3392 { 3464 evthread_start IO::AIO::poll_fileno;
3393 my $guard = freeze_mainloop; 3465
3466 cf::sync_job {
3467 reload_resources;
3394 reload_config; 3468 reload_config;
3395 db_init; 3469 db_init;
3470
3471 cf::load_settings;
3472 cf::load_materials;
3473 cf::init_uuid;
3474 cf::init_signals;
3475 cf::init_commands;
3476 cf::init_skills;
3477
3478 cf::init_beforeplay;
3479
3480 atomic;
3481
3396 load_extensions; 3482 load_extensions;
3397 3483
3398 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3399 }
3400
3401 utime time, time, $RUNTIMEFILE; 3484 utime time, time, $RUNTIMEFILE;
3402 3485
3403 # no (long-running) fork's whatsoever before this point(!) 3486 # no (long-running) fork's whatsoever before this point(!)
3487 use POSIX ();
3404 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3488 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3405 3489
3406 EV::loop; 3490 (pop @POST_INIT)->(0) while @POST_INIT;
3491 };
3492
3493 main_loop;
3407} 3494}
3408 3495
3409############################################################################# 3496#############################################################################
3410# initialisation and cleanup 3497# initialisation and cleanup
3411 3498
3467 my $uuid = "$LOCALDIR/uuid"; 3554 my $uuid = "$LOCALDIR/uuid";
3468 3555
3469 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3556 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3470 or return; 3557 or return;
3471 3558
3472 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3559 my $value = uuid_seq uuid_cur;
3560
3561 unless ($value) {
3562 warn "cowardly refusing to write zero uuid value!\n";
3563 return;
3564 }
3565
3566 my $value = uuid_str $value + $uuid_skip;
3473 $uuid_skip = 0; 3567 $uuid_skip = 0;
3474 3568
3475 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3569 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3476 and return; 3570 and return;
3477 3571
3499} 3593}
3500 3594
3501sub emergency_save() { 3595sub emergency_save() {
3502 my $freeze_guard = cf::freeze_mainloop; 3596 my $freeze_guard = cf::freeze_mainloop;
3503 3597
3504 warn "enter emergency perl save\n"; 3598 warn "emergency_perl_save: enter\n";
3505 3599
3506 cf::sync_job { 3600 cf::sync_job {
3601 # this is a trade-off: we want to be very quick here, so
3602 # save all maps without fsync, and later call a global sync
3603 # (which in turn might be very very slow)
3604 local $USE_FSYNC = 0;
3605
3507 # use a peculiar iteration method to avoid tripping on perl 3606 # use a peculiar iteration method to avoid tripping on perl
3508 # refcount bugs in for. also avoids problems with players 3607 # refcount bugs in for. also avoids problems with players
3509 # and maps saved/destroyed asynchronously. 3608 # and maps saved/destroyed asynchronously.
3510 warn "begin emergency player save\n"; 3609 warn "emergency_perl_save: begin player save\n";
3511 for my $login (keys %cf::PLAYER) { 3610 for my $login (keys %cf::PLAYER) {
3512 my $pl = $cf::PLAYER{$login} or next; 3611 my $pl = $cf::PLAYER{$login} or next;
3513 $pl->valid or next; 3612 $pl->valid or next;
3514 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3613 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3515 $pl->save; 3614 $pl->save;
3516 } 3615 }
3517 warn "end emergency player save\n"; 3616 warn "emergency_perl_save: end player save\n";
3518 3617
3519 warn "begin emergency map save\n"; 3618 warn "emergency_perl_save: begin map save\n";
3520 for my $path (keys %cf::MAP) { 3619 for my $path (keys %cf::MAP) {
3521 my $map = $cf::MAP{$path} or next; 3620 my $map = $cf::MAP{$path} or next;
3522 $map->valid or next; 3621 $map->valid or next;
3523 $map->save; 3622 $map->save;
3524 } 3623 }
3525 warn "end emergency map save\n"; 3624 warn "emergency_perl_save: end map save\n";
3526 3625
3527 warn "begin emergency database checkpoint\n"; 3626 warn "emergency_perl_save: begin database checkpoint\n";
3528 BDB::db_env_txn_checkpoint $DB_ENV; 3627 BDB::db_env_txn_checkpoint $DB_ENV;
3529 warn "end emergency database checkpoint\n"; 3628 warn "emergency_perl_save: end database checkpoint\n";
3530 3629
3531 warn "begin write uuid\n"; 3630 warn "emergency_perl_save: begin write uuid\n";
3532 write_uuid_sync 1; 3631 write_uuid_sync 1;
3533 warn "end write uuid\n"; 3632 warn "emergency_perl_save: end write uuid\n";
3534 }; 3633 };
3535 3634
3635 warn "emergency_perl_save: starting sync()\n";
3636 IO::AIO::aio_sync sub {
3637 warn "emergency_perl_save: finished sync()\n";
3638 };
3639
3536 warn "leave emergency perl save\n"; 3640 warn "emergency_perl_save: leave\n";
3537} 3641}
3538 3642
3539sub post_cleanup { 3643sub post_cleanup {
3540 my ($make_core) = @_; 3644 my ($make_core) = @_;
3541 3645
3567 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3671 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3568 for my $name (keys %$leaf_symtab) { 3672 for my $name (keys %$leaf_symtab) {
3569 _gv_clear *{"$pkg$name"}; 3673 _gv_clear *{"$pkg$name"};
3570# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3674# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3571 } 3675 }
3572 warn "cleared package #$pkg\n";#d# 3676 warn "cleared package $pkg\n";#d#
3573} 3677}
3574
3575our $RELOAD; # how many times to reload
3576 3678
3577sub do_reload_perl() { 3679sub do_reload_perl() {
3578 # can/must only be called in main 3680 # can/must only be called in main
3579 if ($Coro::current != $Coro::main) { 3681 if ($Coro::current != $Coro::main) {
3580 warn "can only reload from main coroutine"; 3682 warn "can only reload from main coroutine";
3581 return; 3683 return;
3582 } 3684 }
3583 3685
3584 return if $RELOAD++; 3686 return if $RELOAD++;
3687
3688 my $t1 = EV::time;
3585 3689
3586 while ($RELOAD) { 3690 while ($RELOAD) {
3587 warn "reloading..."; 3691 warn "reloading...";
3588 3692
3589 warn "entering sync_job"; 3693 warn "entering sync_job";
3650 clear_package "safe::$_" 3754 clear_package "safe::$_"
3651 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3755 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3652 3756
3653 warn "unloading cf.pm \"a bit\""; 3757 warn "unloading cf.pm \"a bit\"";
3654 delete $INC{"cf.pm"}; 3758 delete $INC{"cf.pm"};
3655 delete $INC{"cf/pod.pm"}; 3759 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3656 3760
3657 # don't, removes xs symbols, too, 3761 # don't, removes xs symbols, too,
3658 # and global variables created in xs 3762 # and global variables created in xs
3659 #clear_package __PACKAGE__; 3763 #clear_package __PACKAGE__;
3660 3764
3661 warn "unload completed, starting to reload now"; 3765 warn "unload completed, starting to reload now";
3662 3766
3663 warn "reloading cf.pm"; 3767 warn "reloading cf.pm";
3664 require cf; 3768 require cf;
3665 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3769 cf::_connect_to_perl_1;
3666 3770
3667 warn "loading config and database again"; 3771 warn "loading config and database again";
3668 cf::reload_config; 3772 cf::reload_config;
3669 3773
3670 warn "loading extensions"; 3774 warn "loading extensions";
3671 cf::load_extensions; 3775 cf::load_extensions;
3672 3776
3777 if ($REATTACH_ON_RELOAD) {
3673 warn "reattaching attachments to objects/players"; 3778 warn "reattaching attachments to objects/players";
3674 _global_reattach; # objects, sockets 3779 _global_reattach; # objects, sockets
3675 warn "reattaching attachments to maps"; 3780 warn "reattaching attachments to maps";
3676 reattach $_ for values %MAP; 3781 reattach $_ for values %MAP;
3677 warn "reattaching attachments to players"; 3782 warn "reattaching attachments to players";
3678 reattach $_ for values %PLAYER; 3783 reattach $_ for values %PLAYER;
3784 }
3785
3786 warn "running post_init jobs";
3787 (pop @POST_INIT)->(1) while @POST_INIT;
3679 3788
3680 warn "leaving sync_job"; 3789 warn "leaving sync_job";
3681 3790
3682 1 3791 1
3683 } or do { 3792 } or do {
3686 }; 3795 };
3687 3796
3688 warn "reloaded"; 3797 warn "reloaded";
3689 --$RELOAD; 3798 --$RELOAD;
3690 } 3799 }
3800
3801 $t1 = EV::time - $t1;
3802 warn "reload completed in ${t1}s\n";
3691}; 3803};
3692 3804
3693our $RELOAD_WATCHER; # used only during reload 3805our $RELOAD_WATCHER; # used only during reload
3694 3806
3695sub reload_perl() { 3807sub reload_perl() {
3696 # doing reload synchronously and two reloads happen back-to-back, 3808 # doing reload synchronously and two reloads happen back-to-back,
3697 # coro crashes during coro_state_free->destroy here. 3809 # coro crashes during coro_state_free->destroy here.
3698 3810
3811 $RELOAD_WATCHER ||= cf::async {
3812 Coro::AIO::aio_wait cache_extensions;
3813
3699 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3814 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3700 do_reload_perl; 3815 do_reload_perl;
3701 undef $RELOAD_WATCHER; 3816 undef $RELOAD_WATCHER;
3817 };
3702 }; 3818 };
3703} 3819}
3704 3820
3705register_command "reload" => sub { 3821register_command "reload" => sub {
3706 my ($who, $arg) = @_; 3822 my ($who, $arg) = @_;
3832 $msg =~ s/\n//; 3948 $msg =~ s/\n//;
3833 3949
3834 # limit the # of concurrent backtraces 3950 # limit the # of concurrent backtraces
3835 if ($_log_backtrace < 2) { 3951 if ($_log_backtrace < 2) {
3836 ++$_log_backtrace; 3952 ++$_log_backtrace;
3953 my $perl_bt = Carp::longmess $msg;
3837 async { 3954 async {
3838 $Coro::current->{desc} = "abt $msg"; 3955 $Coro::current->{desc} = "abt $msg";
3839 3956
3840 my @bt = fork_call { 3957 my @bt = fork_call {
3841 @addr = map { sprintf "%x", $_ } @addr; 3958 @addr = map { sprintf "%x", $_ } @addr;
3852 } 3969 }
3853 3970
3854 @funcs 3971 @funcs
3855 }; 3972 };
3856 3973
3857 LOG llevInfo, "[ABT] $msg\n"; 3974 LOG llevInfo, "[ABT] $perl_bt\n";
3975 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3858 LOG llevInfo, "[ABT] $_\n" for @bt; 3976 LOG llevInfo, "[ABT] $_\n" for @bt;
3859 --$_log_backtrace; 3977 --$_log_backtrace;
3860 }; 3978 };
3861 } else { 3979 } else {
3862 LOG llevInfo, "[ABT] $msg\n"; 3980 LOG llevInfo, "[ABT] $msg\n";
3863 LOG llevInfo, "[ABT] [suppressed]\n"; 3981 LOG llevInfo, "[ABT] [suppressed]\n";
3864 } 3982 }
3865} 3983}
3866 3984
3867# load additional modules 3985# load additional modules
3868use cf::pod; 3986require "cf/$_.pm" for @EXTRA_MODULES;
3987cf::_connect_to_perl_2;
3869 3988
3870END { cf::emergency_save } 3989END { cf::emergency_save }
3871 3990
38721 39911
3873 3992

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines