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.450 by root, Mon Sep 22 01:33:09 2008 UTC vs.
Revision 1.493 by root, Mon Oct 26 02:34:37 2009 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use 5.10.0;
25use utf8; 26use utf8;
26use strict "vars", "subs"; 27use strict qw(vars subs);
27 28
28use Symbol; 29use Symbol;
29use List::Util; 30use List::Util;
30use Socket; 31use Socket;
31use EV; 32use EV;
32use Opcode; 33use Opcode;
33use Safe; 34use Safe;
34use Safe::Hole; 35use Safe::Hole;
35use Storable (); 36use Storable ();
37use Carp ();
36 38
39use Guard ();
37use Coro (); 40use Coro ();
38use Coro::State; 41use Coro::State;
39use Coro::Handle; 42use Coro::Handle;
40use Coro::EV; 43use Coro::EV;
41use Coro::AnyEvent; 44use Coro::AnyEvent;
42use Coro::Timer; 45use Coro::Timer;
43use Coro::Signal; 46use Coro::Signal;
44use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
45use Coro::AnyEvent; 49use Coro::AnyEvent;
46use Coro::AIO; 50use Coro::AIO;
47use Coro::BDB 1.6; 51use Coro::BDB 1.6;
48use Coro::Storable; 52use Coro::Storable;
49use Coro::Util (); 53use Coro::Util ();
51use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
52use BDB (); 56use BDB ();
53use Data::Dumper; 57use Data::Dumper;
54use Digest::MD5; 58use Digest::MD5;
55use Fcntl; 59use Fcntl;
56use YAML (); 60use YAML::XS ();
57use IO::AIO (); 61use IO::AIO ();
58use Time::HiRes; 62use Time::HiRes;
59use Compress::LZF; 63use Compress::LZF;
60use Digest::MD5 (); 64use Digest::MD5 ();
61 65
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 73$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70 74
71# make sure c-lzf reinitialises itself 75# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 76Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
73Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 77Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
78
79# strictly for debugging
80$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
74 81
75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
76 83
77our %COMMAND = (); 84our %COMMAND = ();
78our %COMMAND_TIME = (); 85our %COMMAND_TIME = ();
81our %EXTCMD = (); 88our %EXTCMD = ();
82our %EXTICMD = (); 89our %EXTICMD = ();
83our %EXT_CORO = (); # coroutines bound to extensions 90our %EXT_CORO = (); # coroutines bound to extensions
84our %EXT_MAP = (); # pluggable maps 91our %EXT_MAP = (); # pluggable maps
85 92
86our $RELOAD; # number of reloads so far 93our $RELOAD; # number of reloads so far, non-zero while in reload
87our @EVENT; 94our @EVENT;
95our @REFLECT; # set by XS
96our %REFLECT; # set by us
88 97
89our $CONFDIR = confdir; 98our $CONFDIR = confdir;
90our $DATADIR = datadir; 99our $DATADIR = datadir;
91our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
92our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
103our %RESOURCE; 112our %RESOURCE;
104 113
105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 114our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 115our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107our $NEXT_TICK; 116our $NEXT_TICK;
108our $USE_FSYNC = 1; # use fsync to write maps - default off 117our $USE_FSYNC = 1; # use fsync to write maps - default on
109 118
110our $BDB_DEADLOCK_WATCHER; 119our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER; 120our $BDB_CHECKPOINT_WATCHER;
112our $BDB_TRICKLE_WATCHER; 121our $BDB_TRICKLE_WATCHER;
113our $DB_ENV; 122our $DB_ENV;
114 123
124our @EXTRA_MODULES = qw(pod match mapscript);
125
115our %CFG; 126our %CFG;
116 127
117our $UPTIME; $UPTIME ||= time; 128our $UPTIME; $UPTIME ||= time;
118our $RUNTIME; 129our $RUNTIME;
119our $NOW; 130our $NOW;
127 138
128our $LOAD; # a number between 0 (idle) and 1 (too many objects) 139our $LOAD; # a number between 0 (idle) and 1 (too many objects)
129our $LOADAVG; # same thing, but with alpha-smoothing 140our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter 141our $JITTER; # average jitter
131our $TICK_START; # for load detecting purposes 142our $TICK_START; # for load detecting purposes
143
144our @POST_INIT;
145
146our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
147our $REALLY_UNLOOP; # never set to true, please :)
132 148
133binmode STDOUT; 149binmode STDOUT;
134binmode STDERR; 150binmode STDERR;
135 151
136# read virtual server time, if available 152# read virtual server time, if available
138 open my $fh, "<", $RUNTIMEFILE 154 open my $fh, "<", $RUNTIMEFILE
139 or die "unable to read $RUNTIMEFILE file: $!"; 155 or die "unable to read $RUNTIMEFILE file: $!";
140 $RUNTIME = <$fh> + 0.; 156 $RUNTIME = <$fh> + 0.;
141} 157}
142 158
159eval "sub TICK() { $TICK } 1" or die;
160
143mkdir $_ 161mkdir $_
144 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 162 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
145 163
146our $EMERGENCY_POSITION; 164our $EMERGENCY_POSITION;
147 165
148sub cf::map::normalise; 166sub cf::map::normalise;
167
168#############################################################################
169
170%REFLECT = ();
171for (@REFLECT) {
172 my $reflect = JSON::XS::decode_json $_;
173 $REFLECT{$reflect->{class}} = $reflect;
174}
175
176# this is decidedly evil
177$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
149 178
150############################################################################# 179#############################################################################
151 180
152=head2 GLOBAL VARIABLES 181=head2 GLOBAL VARIABLES
153 182
200returns directly I<after> the tick processing (and consequently, can only wake one process 229returns directly I<after> the tick processing (and consequently, can only wake one process
201per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 230per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
202 231
203=item @cf::INVOKE_RESULTS 232=item @cf::INVOKE_RESULTS
204 233
205This array contains the results of the last C<invoke ()> call. When 234This array contains the results of the last C<invoke ()> call. When
206C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 235C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
207that call. 236that call.
208 237
238=item %cf::REFLECT
239
240Contains, for each (C++) class name, a hash reference with information
241about object members (methods, scalars, arrays and flags) and other
242metadata, which is useful for introspection.
243
209=back 244=back
210 245
211=cut 246=cut
212 247
213BEGIN { 248$Coro::State::WARNHOOK = sub {
214 *CORE::GLOBAL::warn = sub {
215 my $msg = join "", @_; 249 my $msg = join "", @_;
216 250
217 $msg .= "\n" 251 $msg .= "\n"
218 unless $msg =~ /\n$/; 252 unless $msg =~ /\n$/;
219 253
220 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 254 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
221 255
222 LOG llevError, $msg; 256 LOG llevError, $msg;
223 }; 257};
224}
225 258
226$Coro::State::DIEHOOK = sub { 259$Coro::State::DIEHOOK = sub {
227 return unless $^S eq 0; # "eq", not "==" 260 return unless $^S eq 0; # "eq", not "=="
261
262 warn Carp::longmess $_[0];
228 263
229 if ($Coro::current == $Coro::main) {#d# 264 if ($Coro::current == $Coro::main) {#d#
230 warn "DIEHOOK called in main context, Coro bug?\n";#d# 265 warn "DIEHOOK called in main context, Coro bug?\n";#d#
231 return;#d# 266 return;#d#
232 }#d# 267 }#d#
233 268
234 # kill coroutine otherwise 269 # kill coroutine otherwise
235 warn Carp::longmess $_[0];
236 Coro::terminate 270 Coro::terminate
237}; 271};
238
239$SIG{__DIE__} = sub { }; #d#?
240 272
241@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 273@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
242@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 274@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
243@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 275@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
244@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 276@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
258)) { 290)) {
259 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 291 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
260} 292}
261 293
262$EV::DIED = sub { 294$EV::DIED = sub {
263 warn "error in event callback: @_"; 295 Carp::cluck "error in event callback: @_";
264}; 296};
265 297
266############################################################################# 298#############################################################################
267 299
268=head2 UTILITY FUNCTIONS 300=head2 UTILITY FUNCTIONS
305our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 337our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
306 338
307sub encode_json($) { $json_coder->encode ($_[0]) } 339sub encode_json($) { $json_coder->encode ($_[0]) }
308sub decode_json($) { $json_coder->decode ($_[0]) } 340sub decode_json($) { $json_coder->decode ($_[0]) }
309 341
342=item cf::post_init { BLOCK }
343
344Execute the given codeblock, I<after> all extensions have been (re-)loaded,
345but I<before> the server starts ticking again.
346
347The cdoeblock will have a single boolean argument to indicate whether this
348is a reload or not.
349
350=cut
351
352sub post_init(&) {
353 push @POST_INIT, shift;
354}
355
310=item cf::lock_wait $string 356=item cf::lock_wait $string
311 357
312Wait until the given lock is available. See cf::lock_acquire. 358Wait until the given lock is available. See cf::lock_acquire.
313 359
314=item my $lock = cf::lock_acquire $string 360=item my $lock = cf::lock_acquire $string
315 361
316Wait until the given lock is available and then acquires it and returns 362Wait until the given lock is available and then acquires it and returns
317a Coro::guard object. If the guard object gets destroyed (goes out of scope, 363a L<Guard> object. If the guard object gets destroyed (goes out of scope,
318for example when the coroutine gets canceled), the lock is automatically 364for example when the coroutine gets canceled), the lock is automatically
319returned. 365returned.
320 366
321Locks are *not* recursive, locking from the same coro twice results in a 367Locks are *not* recursive, locking from the same coro twice results in a
322deadlocked coro. 368deadlocked coro.
328 374
329Return true if the lock is currently active, i.e. somebody has locked it. 375Return true if the lock is currently active, i.e. somebody has locked it.
330 376
331=cut 377=cut
332 378
333our %LOCK; 379our $LOCKS = new Coro::SemaphoreSet;
334our %LOCKER;#d#
335 380
336sub lock_wait($) { 381sub lock_wait($) {
337 my ($key) = @_; 382 $LOCKS->wait ($_[0]);
338
339 if ($LOCKER{$key} == $Coro::current) {#d#
340 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
341 return;#d#
342 }#d#
343
344 # wait for lock, if any
345 while ($LOCK{$key}) {
346 push @{ $LOCK{$key} }, $Coro::current;
347 Coro::schedule;
348 }
349} 383}
350 384
351sub lock_acquire($) { 385sub lock_acquire($) {
352 my ($key) = @_; 386 $LOCKS->guard ($_[0])
353
354 # wait, to be sure we are not locked
355 lock_wait $key;
356
357 $LOCK{$key} = [];
358 $LOCKER{$key} = $Coro::current;#d#
359
360 Coro::guard {
361 delete $LOCKER{$key};#d#
362 # wake up all waiters, to be on the safe side
363 $_->ready for @{ delete $LOCK{$key} };
364 }
365} 387}
366 388
367sub lock_active($) { 389sub lock_active($) {
368 my ($key) = @_; 390 $LOCKS->count ($_[0]) < 1
369
370 ! ! $LOCK{$key}
371} 391}
372 392
373sub freeze_mainloop { 393sub freeze_mainloop {
374 tick_inhibit_inc; 394 tick_inhibit_inc;
375 395
376 Coro::guard \&tick_inhibit_dec; 396 &Guard::guard (\&tick_inhibit_dec);
377} 397}
378 398
379=item cf::periodic $interval, $cb 399=item cf::periodic $interval, $cb
380 400
381Like EV::periodic, but randomly selects a starting point so that the actions 401Like EV::periodic, but randomly selects a starting point so that the actions
1153 $decname, length $$rdata, scalar @$objs; 1173 $decname, length $$rdata, scalar @$objs;
1154 1174
1155 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1175 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1156 aio_chmod $fh, SAVE_MODE; 1176 aio_chmod $fh, SAVE_MODE;
1157 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1177 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1158 aio_fsync $fh if $cf::USE_FSYNC; 1178 if ($cf::USE_FSYNC) {
1179 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;
1180 aio_fsync $fh;
1181 }
1159 aio_close $fh; 1182 aio_close $fh;
1160 1183
1161 if (@$objs) { 1184 if (@$objs) {
1162 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1185 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1163 aio_chmod $fh, SAVE_MODE; 1186 aio_chmod $fh, SAVE_MODE;
1164 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1187 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1165 aio_write $fh, 0, (length $data), $data, 0; 1188 aio_write $fh, 0, (length $data), $data, 0;
1166 aio_fsync $fh if $cf::USE_FSYNC; 1189 if ($cf::USE_FSYNC) {
1190 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;
1191 aio_fsync $fh;
1192 }
1167 aio_close $fh; 1193 aio_close $fh;
1168 aio_rename "$filename.pst~", "$filename.pst"; 1194 aio_rename "$filename.pst~", "$filename.pst";
1169 } 1195 }
1170 } else { 1196 } else {
1171 aio_unlink "$filename.pst"; 1197 aio_unlink "$filename.pst";
1172 } 1198 }
1173 1199
1174 aio_rename "$filename~", $filename; 1200 aio_rename "$filename~", $filename;
1201
1202 $filename =~ s%/[^/]+$%%;
1203 aio_pathsync $filename if $cf::USE_FSYNC;
1175 } else { 1204 } else {
1176 warn "FATAL: $filename~: $!\n"; 1205 warn "unable to save objects: $filename~: $!\n";
1177 } 1206 }
1178 } else { 1207 } else {
1179 aio_unlink $filename; 1208 aio_unlink $filename;
1180 aio_unlink "$filename.pst"; 1209 aio_unlink "$filename.pst";
1181 } 1210 }
1272 my ($name, $cb) = @_; 1301 my ($name, $cb) = @_;
1273 1302
1274 $EXTICMD{$name} = $cb; 1303 $EXTICMD{$name} = $cb;
1275} 1304}
1276 1305
1306use File::Glob ();
1307
1277cf::player->attach ( 1308cf::player->attach (
1278 on_command => sub { 1309 on_command => sub {
1279 my ($pl, $name, $params) = @_; 1310 my ($pl, $name, $params) = @_;
1280 1311
1281 my $cb = $COMMAND{$name} 1312 my $cb = $COMMAND{$name}
1312 } 1343 }
1313 1344
1314 cf::override; 1345 cf::override;
1315 }, 1346 },
1316); 1347);
1348
1349# "readahead" all extensions
1350sub cache_extensions {
1351 my $grp = IO::AIO::aio_group;
1352
1353 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1354 for (grep /\.ext$/, @{$_[0]}) {
1355 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1356 }
1357 };
1358
1359 $grp
1360}
1317 1361
1318sub load_extensions { 1362sub load_extensions {
1319 cf::sync_job { 1363 cf::sync_job {
1320 my %todo; 1364 my %todo;
1321 1365
1444 1488
1445sub exists($) { 1489sub exists($) {
1446 my ($login) = @_; 1490 my ($login) = @_;
1447 1491
1448 $cf::PLAYER{$login} 1492 $cf::PLAYER{$login}
1449 or cf::sync_job { !aio_stat path $login } 1493 or !aio_stat path $login
1450} 1494}
1451 1495
1452sub find($) { 1496sub find($) {
1453 return $cf::PLAYER{$_[0]} || do { 1497 return $cf::PLAYER{$_[0]} || do {
1454 my $login = $_[0]; 1498 my $login = $_[0];
1850 1894
1851 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1895 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1852 "$UNIQUEDIR/$path" 1896 "$UNIQUEDIR/$path"
1853} 1897}
1854 1898
1855# and all this just because we cannot iterate over
1856# all maps in C++...
1857sub change_all_map_light {
1858 my ($change) = @_;
1859
1860 $_->change_map_light ($change)
1861 for grep $_->outdoor, values %cf::MAP;
1862}
1863
1864sub decay_objects { 1899sub decay_objects {
1865 my ($self) = @_; 1900 my ($self) = @_;
1866 1901
1867 return if $self->{deny_reset}; 1902 return if $self->{deny_reset};
1868 1903
1950sub find { 1985sub find {
1951 my ($path, $origin) = @_; 1986 my ($path, $origin) = @_;
1952 1987
1953 $path = normalise $path, $origin && $origin->path; 1988 $path = normalise $path, $origin && $origin->path;
1954 1989
1955 cf::lock_wait "map_data:$path";#d#remove 1990 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1956 cf::lock_wait "map_find:$path"; 1991 my $guard2 = cf::lock_acquire "map_find:$path";
1957 1992
1958 $cf::MAP{$path} || do { 1993 $cf::MAP{$path} || do {
1959 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1960 my $guard2 = cf::lock_acquire "map_find:$path";
1961
1962 my $map = new_from_path cf::map $path 1994 my $map = new_from_path cf::map $path
1963 or return; 1995 or return;
1964 1996
1965 $map->{last_save} = $cf::RUNTIME; 1997 $map->{last_save} = $cf::RUNTIME;
1966 1998
2034 unless ($self->{deny_activate}) { 2066 unless ($self->{deny_activate}) {
2035 $self->decay_objects; 2067 $self->decay_objects;
2036 $self->fix_auto_apply; 2068 $self->fix_auto_apply;
2037 $self->update_buttons; 2069 $self->update_buttons;
2038 cf::cede_to_tick; 2070 cf::cede_to_tick;
2039 $self->set_darkness_map;
2040 cf::cede_to_tick;
2041 $self->activate; 2071 $self->activate;
2042 } 2072 }
2043 2073
2044 $self->{last_save} = $cf::RUNTIME; 2074 $self->{last_save} = $cf::RUNTIME;
2045 $self->last_access ($cf::RUNTIME); 2075 $self->last_access ($cf::RUNTIME);
2211 2241
2212 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2213 2243
2214 return if $self->players; 2244 return if $self->players;
2215 2245
2216 warn "resetting map ", $self->path; 2246 warn "resetting map ", $self->path, "\n";
2217 2247
2218 $self->in_memory (cf::MAP_SWAPPED); 2248 $self->in_memory (cf::MAP_SWAPPED);
2219 2249
2220 # need to save uniques path 2250 # need to save uniques path
2221 unless ($self->{deny_save}) { 2251 unless ($self->{deny_save}) {
2312 : normalise $_ 2342 : normalise $_
2313 } @{ aio_readdir $UNIQUEDIR or [] } 2343 } @{ aio_readdir $UNIQUEDIR or [] }
2314 ] 2344 ]
2315} 2345}
2316 2346
2347=item cf::map::static_maps
2348
2349Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2350file in the shared directory excluding F</styles> and F</editor>). May
2351block.
2352
2353=cut
2354
2355sub static_maps() {
2356 my @dirs = "";
2357 my @maps;
2358
2359 while (@dirs) {
2360 my $dir = shift @dirs;
2361
2362 next if $dir eq "/styles" || $dir eq "/editor";
2363
2364 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2365 or return;
2366
2367 for (@$files) {
2368 s/\.map$// or next;
2369 utf8::decode $_;
2370 push @maps, "$dir/$_";
2371 }
2372
2373 push @dirs, map "$dir/$_", @$dirs;
2374 }
2375
2376 \@maps
2377}
2378
2317=back 2379=back
2318 2380
2319=head3 cf::object 2381=head3 cf::object
2320 2382
2321=cut 2383=cut
2386 2448
2387our $SAY_CHANNEL = { 2449our $SAY_CHANNEL = {
2388 id => "say", 2450 id => "say",
2389 title => "Map", 2451 title => "Map",
2390 reply => "say ", 2452 reply => "say ",
2391 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2453 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2392}; 2454};
2393 2455
2394our $CHAT_CHANNEL = { 2456our $CHAT_CHANNEL = {
2395 id => "chat", 2457 id => "chat",
2396 title => "Chat", 2458 title => "Chat",
2516 ($x, $y) = (-1, -1) 2578 ($x, $y) = (-1, -1)
2517 unless (defined $x) && (defined $y); 2579 unless (defined $x) && (defined $y);
2518 2580
2519 # use -1 or undef as default coordinates, not 0, 0 2581 # use -1 or undef as default coordinates, not 0, 0
2520 ($x, $y) = ($map->enter_x, $map->enter_y) 2582 ($x, $y) = ($map->enter_x, $map->enter_y)
2521 if $x <=0 && $y <= 0; 2583 if $x <= 0 && $y <= 0;
2522 2584
2523 $map->load; 2585 $map->load;
2524 $map->load_neighbours; 2586 $map->load_neighbours;
2525 2587
2526 return unless $self->contr->active; 2588 return unless $self->contr->active;
2527 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2528 $self->activate_recursive;
2529 2589
2530 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2590 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2531 $self->enter_map ($map, $x, $y); 2591 $self->enter_map ($map, $x, $y);
2592
2593 # only activate afterwards, to support waiting in hooks
2594 $self->activate_recursive;
2532} 2595}
2533 2596
2534=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2597=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2535 2598
2536Moves the player to the given map-path and coordinates by first freezing 2599Moves the player to the given map-path and coordinates by first freezing
2735 2798
2736=cut 2799=cut
2737 2800
2738# non-persistent channels (usually the info channel) 2801# non-persistent channels (usually the info channel)
2739our %CHANNEL = ( 2802our %CHANNEL = (
2803 "c/motd" => {
2804 id => "infobox",
2805 title => "MOTD",
2806 reply => undef,
2807 tooltip => "The message of the day",
2808 },
2740 "c/identify" => { 2809 "c/identify" => {
2741 id => "infobox", 2810 id => "infobox",
2742 title => "Identify", 2811 title => "Identify",
2743 reply => undef, 2812 reply => undef,
2744 tooltip => "Items recently identified", 2813 tooltip => "Items recently identified",
2746 "c/examine" => { 2815 "c/examine" => {
2747 id => "infobox", 2816 id => "infobox",
2748 title => "Examine", 2817 title => "Examine",
2749 reply => undef, 2818 reply => undef,
2750 tooltip => "Signs and other items you examined", 2819 tooltip => "Signs and other items you examined",
2820 },
2821 "c/shopinfo" => {
2822 id => "infobox",
2823 title => "Shop Info",
2824 reply => undef,
2825 tooltip => "What your bargaining skill tells you about the shop",
2751 }, 2826 },
2752 "c/book" => { 2827 "c/book" => {
2753 id => "infobox", 2828 id => "infobox",
2754 title => "Book", 2829 title => "Book",
2755 reply => undef, 2830 reply => undef,
2771 id => "infobox", 2846 id => "infobox",
2772 title => "Body Parts", 2847 title => "Body Parts",
2773 reply => undef, 2848 reply => undef,
2774 tooltip => "Shows which body parts you posess and are available", 2849 tooltip => "Shows which body parts you posess and are available",
2775 }, 2850 },
2851 "c/statistics" => {
2852 id => "infobox",
2853 title => "Statistics",
2854 reply => undef,
2855 tooltip => "Shows your primary statistics",
2856 },
2776 "c/skills" => { 2857 "c/skills" => {
2777 id => "infobox", 2858 id => "infobox",
2778 title => "Skills", 2859 title => "Skills",
2779 reply => undef, 2860 reply => undef,
2780 tooltip => "Shows your experience per skill and item power", 2861 tooltip => "Shows your experience per skill and item power",
2862 },
2863 "c/shopitems" => {
2864 id => "infobox",
2865 title => "Shop Items",
2866 reply => undef,
2867 tooltip => "Shows the items currently for sale in this shop",
2868 },
2869 "c/resistances" => {
2870 id => "infobox",
2871 title => "Resistances",
2872 reply => undef,
2873 tooltip => "Shows your resistances",
2874 },
2875 "c/pets" => {
2876 id => "infobox",
2877 title => "Pets",
2878 reply => undef,
2879 tooltip => "Shows information abotu your pets/a specific pet",
2880 },
2881 "c/perceiveself" => {
2882 id => "infobox",
2883 title => "Perceive Self",
2884 reply => undef,
2885 tooltip => "You gained detailed knowledge about yourself",
2781 }, 2886 },
2782 "c/uptime" => { 2887 "c/uptime" => {
2783 id => "infobox", 2888 id => "infobox",
2784 title => "Uptime", 2889 title => "Uptime",
2785 reply => undef, 2890 reply => undef,
2795 id => "party", 2900 id => "party",
2796 title => "Party", 2901 title => "Party",
2797 reply => "gsay ", 2902 reply => "gsay ",
2798 tooltip => "Messages and chat related to your party", 2903 tooltip => "Messages and chat related to your party",
2799 }, 2904 },
2905 "c/death" => {
2906 id => "death",
2907 title => "Death",
2908 reply => undef,
2909 tooltip => "Reason for and more info about your most recent death",
2910 },
2911 "c/say" => $SAY_CHANNEL,
2912 "c/chat" => $CHAT_CHANNEL,
2800); 2913);
2801 2914
2802sub cf::client::send_msg { 2915sub cf::client::send_msg {
2803 my ($self, $channel, $msg, $color, @extra) = @_; 2916 my ($self, $channel, $msg, $color, @extra) = @_;
2804 2917
2809 2922
2810 # check predefined channels, for the benefit of C 2923 # check predefined channels, for the benefit of C
2811 if ($CHANNEL{$channel}) { 2924 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel}; 2925 $channel = $CHANNEL{$channel};
2813 2926
2814 $self->ext_msg (channel_info => $channel) 2927 $self->ext_msg (channel_info => $channel);
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id}; 2928 $channel = $channel->{id};
2818 2929
2819 } elsif (ref $channel) { 2930 } elsif (ref $channel) {
2820 # send meta info to client, if not yet sent 2931 # send meta info to client, if not yet sent
2821 unless (exists $self->{channel}{$channel->{id}}) { 2932 unless (exists $self->{channel}{$channel->{id}}) {
2822 $self->{channel}{$channel->{id}} = $channel; 2933 $self->{channel}{$channel->{id}} = $channel;
2823 $self->ext_msg (channel_info => $channel) 2934 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825 } 2935 }
2826 2936
2827 $channel = $channel->{id}; 2937 $channel = $channel->{id};
2828 } 2938 }
2829 2939
2830 return unless @extra || length $msg; 2940 return unless @extra || length $msg;
2831 2941
2832 if ($self->can_msg) {
2833 # default colour, mask it out 2942 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2943 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF; 2944 if $color & cf::NDI_DEF;
2836 2945
2837 my $pkt = "msg " 2946 my $pkt = "msg "
2838 . $self->{json_coder}->encode ( 2947 . $self->{json_coder}->encode (
2839 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2948 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2840 ); 2949 );
2841 2950
2842 # try lzf for large packets 2951 # try lzf for large packets
2843 $pkt = "lzf " . Compress::LZF::compress $pkt 2952 $pkt = "lzf " . Compress::LZF::compress $pkt
2844 if 1024 <= length $pkt and $self->{can_lzf}; 2953 if 1024 <= length $pkt and $self->{can_lzf};
2845 2954
2846 # split very large packets 2955 # split very large packets
2847 if (8192 < length $pkt and $self->{can_lzf}) { 2956 if (8192 < length $pkt and $self->{can_lzf}) {
2848 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; 2957 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2849 $pkt = "frag"; 2958 $pkt = "frag";
2850 } 2959 }
2851 2960
2852 $self->send_packet ($pkt); 2961 $self->send_packet ($pkt);
2853 } else {
2854 if ($color >= 0) {
2855 # replace some tags by gcfclient-compatible ones
2856 for ($msg) {
2857 1 while
2858 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2859 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2860 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2861 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2862 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2863 }
2864
2865 $color &= cf::NDI_COLOR_MASK;
2866
2867 utf8::encode $msg;
2868
2869 if (0 && $msg =~ /\[/) {
2870 # COMMAND/INFO
2871 $self->send_packet ("drawextinfo $color 10 8 $msg")
2872 } else {
2873 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2874 $self->send_packet ("drawinfo $color $msg")
2875 }
2876 }
2877 }
2878} 2962}
2879 2963
2880=item $client->ext_msg ($type, @msg) 2964=item $client->ext_msg ($type, @msg)
2881 2965
2882Sends an ext event to the client. 2966Sends an ext event to the client.
3057The following functions and methods are available within a safe environment: 3141The following functions and methods are available within a safe environment:
3058 3142
3059 cf::object 3143 cf::object
3060 contr pay_amount pay_player map x y force_find force_add destroy 3144 contr pay_amount pay_player map x y force_find force_add destroy
3061 insert remove name archname title slaying race decrease split 3145 insert remove name archname title slaying race decrease split
3146 value
3062 3147
3063 cf::object::player 3148 cf::object::player
3064 player 3149 player
3065 3150
3066 cf::player 3151 cf::player
3072=cut 3157=cut
3073 3158
3074for ( 3159for (
3075 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3160 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3076 insert remove inv nrof name archname title slaying race 3161 insert remove inv nrof name archname title slaying race
3077 decrease split destroy change_exp)], 3162 decrease split destroy change_exp value msg lore send_msg)],
3078 ["cf::object::player" => qw(player)], 3163 ["cf::object::player" => qw(player)],
3079 ["cf::player" => qw(peaceful)], 3164 ["cf::player" => qw(peaceful send_msg)],
3080 ["cf::map" => qw(trigger)], 3165 ["cf::map" => qw(trigger)],
3081) { 3166) {
3082 no strict 'refs'; 3167 no strict 'refs';
3083 my ($pkg, @funs) = @$_; 3168 my ($pkg, @funs) = @$_;
3084 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3169 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3101 my ($code, %vars) = @_; 3186 my ($code, %vars) = @_;
3102 3187
3103 my $qcode = $code; 3188 my $qcode = $code;
3104 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3189 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3105 $qcode =~ s/\n/\\n/g; 3190 $qcode =~ s/\n/\\n/g;
3191
3192 %vars = (_dummy => 0) unless %vars;
3106 3193
3107 local $_; 3194 local $_;
3108 local @safe::cf::_safe_eval_args = values %vars; 3195 local @safe::cf::_safe_eval_args = values %vars;
3109 3196
3110 my $eval = 3197 my $eval =
3340 reload_treasures; 3427 reload_treasures;
3341 3428
3342 warn "finished reloading resource files\n"; 3429 warn "finished reloading resource files\n";
3343} 3430}
3344 3431
3345sub init {
3346 my $guard = freeze_mainloop;
3347
3348 evthread_start IO::AIO::poll_fileno;
3349
3350 reload_resources;
3351}
3352
3353sub reload_config { 3432sub reload_config {
3433 warn "reloading config file...\n";
3434
3354 open my $fh, "<:utf8", "$CONFDIR/config" 3435 open my $fh, "<:utf8", "$CONFDIR/config"
3355 or return; 3436 or return;
3356 3437
3357 local $/; 3438 local $/;
3358 *CFG = YAML::Load <$fh>; 3439 *CFG = YAML::XS::Load scalar <$fh>;
3359 3440
3360 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3441 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3361 3442
3362 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3443 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3363 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3444 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3367 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3448 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3368 and die "WARNING: m(un)lockall failed: $!\n"; 3449 and die "WARNING: m(un)lockall failed: $!\n";
3369 }; 3450 };
3370 warn $@ if $@; 3451 warn $@ if $@;
3371 } 3452 }
3453
3454 warn "finished reloading resource files\n";
3372} 3455}
3373 3456
3374sub pidfile() { 3457sub pidfile() {
3375 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3458 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3376 or die "$PIDFILE: $!"; 3459 or die "$PIDFILE: $!";
3388 3471
3389 seek $fh, 0, 0; 3472 seek $fh, 0, 0;
3390 print $fh $$; 3473 print $fh $$;
3391} 3474}
3392 3475
3476sub main_loop {
3477 warn "EV::loop starting\n";
3478 if (1) {
3479 EV::loop;
3480 }
3481 warn "EV::loop returned\n";
3482 goto &main_loop unless $REALLY_UNLOOP;
3483}
3484
3393sub main { 3485sub main {
3394 atomic; 3486 cf::init_globals; # initialise logging
3487
3488 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3489 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3490 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3491 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3492
3493 cf::init_experience;
3494 cf::init_anim;
3495 cf::init_attackmess;
3496 cf::init_dynamic;
3497
3498 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3395 3499
3396 # we must not ever block the main coroutine 3500 # we must not ever block the main coroutine
3397 local $Coro::idle = sub { 3501 local $Coro::idle = sub {
3398 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3502 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3399 (async { 3503 (async {
3400 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3504 $Coro::current->{desc} = "IDLE BUG HANDLER";
3401 EV::loop EV::LOOP_ONESHOT; 3505 EV::loop EV::LOOP_ONESHOT;
3402 })->prio (Coro::PRIO_MAX); 3506 })->prio (Coro::PRIO_MAX);
3403 }; 3507 };
3404 3508
3405 { 3509 evthread_start IO::AIO::poll_fileno;
3406 my $guard = freeze_mainloop; 3510
3511 cf::sync_job {
3512 reload_resources;
3407 reload_config; 3513 reload_config;
3408 db_init; 3514 db_init;
3515
3516 cf::load_settings;
3517 cf::load_materials;
3518 cf::init_uuid;
3519 cf::init_signals;
3520 cf::init_commands;
3521 cf::init_skills;
3522
3523 cf::init_beforeplay;
3524
3525 atomic;
3526
3409 load_extensions; 3527 load_extensions;
3410 3528
3411 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3412 }
3413
3414 utime time, time, $RUNTIMEFILE; 3529 utime time, time, $RUNTIMEFILE;
3415 3530
3416 # no (long-running) fork's whatsoever before this point(!) 3531 # no (long-running) fork's whatsoever before this point(!)
3532 use POSIX ();
3417 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3533 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3418 3534
3419 EV::loop; 3535 (pop @POST_INIT)->(0) while @POST_INIT;
3536 };
3537
3538 main_loop;
3420} 3539}
3421 3540
3422############################################################################# 3541#############################################################################
3423# initialisation and cleanup 3542# initialisation and cleanup
3424 3543
3480 my $uuid = "$LOCALDIR/uuid"; 3599 my $uuid = "$LOCALDIR/uuid";
3481 3600
3482 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3601 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3483 or return; 3602 or return;
3484 3603
3485 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3604 my $value = uuid_seq uuid_cur;
3605
3606 unless ($value) {
3607 warn "cowardly refusing to write zero uuid value!\n";
3608 return;
3609 }
3610
3611 my $value = uuid_str $value + $uuid_skip;
3486 $uuid_skip = 0; 3612 $uuid_skip = 0;
3487 3613
3488 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3614 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3489 and return; 3615 and return;
3490 3616
3512} 3638}
3513 3639
3514sub emergency_save() { 3640sub emergency_save() {
3515 my $freeze_guard = cf::freeze_mainloop; 3641 my $freeze_guard = cf::freeze_mainloop;
3516 3642
3517 warn "enter emergency perl save\n"; 3643 warn "emergency_perl_save: enter\n";
3518 3644
3519 cf::sync_job { 3645 cf::sync_job {
3646 # this is a trade-off: we want to be very quick here, so
3647 # save all maps without fsync, and later call a global sync
3648 # (which in turn might be very very slow)
3649 local $USE_FSYNC = 0;
3650
3520 # use a peculiar iteration method to avoid tripping on perl 3651 # use a peculiar iteration method to avoid tripping on perl
3521 # refcount bugs in for. also avoids problems with players 3652 # refcount bugs in for. also avoids problems with players
3522 # and maps saved/destroyed asynchronously. 3653 # and maps saved/destroyed asynchronously.
3523 warn "begin emergency player save\n"; 3654 warn "emergency_perl_save: begin player save\n";
3524 for my $login (keys %cf::PLAYER) { 3655 for my $login (keys %cf::PLAYER) {
3525 my $pl = $cf::PLAYER{$login} or next; 3656 my $pl = $cf::PLAYER{$login} or next;
3526 $pl->valid or next; 3657 $pl->valid or next;
3527 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3658 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3528 $pl->save; 3659 $pl->save;
3529 } 3660 }
3530 warn "end emergency player save\n"; 3661 warn "emergency_perl_save: end player save\n";
3531 3662
3532 warn "begin emergency map save\n"; 3663 warn "emergency_perl_save: begin map save\n";
3533 for my $path (keys %cf::MAP) { 3664 for my $path (keys %cf::MAP) {
3534 my $map = $cf::MAP{$path} or next; 3665 my $map = $cf::MAP{$path} or next;
3535 $map->valid or next; 3666 $map->valid or next;
3536 $map->save; 3667 $map->save;
3537 } 3668 }
3538 warn "end emergency map save\n"; 3669 warn "emergency_perl_save: end map save\n";
3539 3670
3540 warn "begin emergency database checkpoint\n"; 3671 warn "emergency_perl_save: begin database checkpoint\n";
3541 BDB::db_env_txn_checkpoint $DB_ENV; 3672 BDB::db_env_txn_checkpoint $DB_ENV;
3542 warn "end emergency database checkpoint\n"; 3673 warn "emergency_perl_save: end database checkpoint\n";
3543 3674
3544 warn "begin write uuid\n"; 3675 warn "emergency_perl_save: begin write uuid\n";
3545 write_uuid_sync 1; 3676 write_uuid_sync 1;
3546 warn "end write uuid\n"; 3677 warn "emergency_perl_save: end write uuid\n";
3547 }; 3678 };
3548 3679
3680 warn "emergency_perl_save: starting sync()\n";
3681 IO::AIO::aio_sync sub {
3682 warn "emergency_perl_save: finished sync()\n";
3683 };
3684
3549 warn "leave emergency perl save\n"; 3685 warn "emergency_perl_save: leave\n";
3550} 3686}
3551 3687
3552sub post_cleanup { 3688sub post_cleanup {
3553 my ($make_core) = @_; 3689 my ($make_core) = @_;
3554 3690
3580 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3716 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3581 for my $name (keys %$leaf_symtab) { 3717 for my $name (keys %$leaf_symtab) {
3582 _gv_clear *{"$pkg$name"}; 3718 _gv_clear *{"$pkg$name"};
3583# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3719# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3584 } 3720 }
3585 warn "cleared package #$pkg\n";#d# 3721 warn "cleared package $pkg\n";#d#
3586} 3722}
3587
3588our $RELOAD; # how many times to reload
3589 3723
3590sub do_reload_perl() { 3724sub do_reload_perl() {
3591 # can/must only be called in main 3725 # can/must only be called in main
3592 if ($Coro::current != $Coro::main) { 3726 if ($Coro::current != $Coro::main) {
3593 warn "can only reload from main coroutine"; 3727 warn "can only reload from main coroutine";
3594 return; 3728 return;
3595 } 3729 }
3596 3730
3597 return if $RELOAD++; 3731 return if $RELOAD++;
3732
3733 my $t1 = EV::time;
3598 3734
3599 while ($RELOAD) { 3735 while ($RELOAD) {
3600 warn "reloading..."; 3736 warn "reloading...";
3601 3737
3602 warn "entering sync_job"; 3738 warn "entering sync_job";
3663 clear_package "safe::$_" 3799 clear_package "safe::$_"
3664 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3800 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3665 3801
3666 warn "unloading cf.pm \"a bit\""; 3802 warn "unloading cf.pm \"a bit\"";
3667 delete $INC{"cf.pm"}; 3803 delete $INC{"cf.pm"};
3668 delete $INC{"cf/pod.pm"}; 3804 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3669 3805
3670 # don't, removes xs symbols, too, 3806 # don't, removes xs symbols, too,
3671 # and global variables created in xs 3807 # and global variables created in xs
3672 #clear_package __PACKAGE__; 3808 #clear_package __PACKAGE__;
3673 3809
3674 warn "unload completed, starting to reload now"; 3810 warn "unload completed, starting to reload now";
3675 3811
3676 warn "reloading cf.pm"; 3812 warn "reloading cf.pm";
3677 require cf; 3813 require cf;
3678 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3814 cf::_connect_to_perl_1;
3679 3815
3680 warn "loading config and database again"; 3816 warn "loading config and database again";
3681 cf::reload_config; 3817 cf::reload_config;
3682 3818
3683 warn "loading extensions"; 3819 warn "loading extensions";
3684 cf::load_extensions; 3820 cf::load_extensions;
3685 3821
3822 if ($REATTACH_ON_RELOAD) {
3686 warn "reattaching attachments to objects/players"; 3823 warn "reattaching attachments to objects/players";
3687 _global_reattach; # objects, sockets 3824 _global_reattach; # objects, sockets
3688 warn "reattaching attachments to maps"; 3825 warn "reattaching attachments to maps";
3689 reattach $_ for values %MAP; 3826 reattach $_ for values %MAP;
3690 warn "reattaching attachments to players"; 3827 warn "reattaching attachments to players";
3691 reattach $_ for values %PLAYER; 3828 reattach $_ for values %PLAYER;
3829 }
3830
3831 warn "running post_init jobs";
3832 (pop @POST_INIT)->(1) while @POST_INIT;
3692 3833
3693 warn "leaving sync_job"; 3834 warn "leaving sync_job";
3694 3835
3695 1 3836 1
3696 } or do { 3837 } or do {
3699 }; 3840 };
3700 3841
3701 warn "reloaded"; 3842 warn "reloaded";
3702 --$RELOAD; 3843 --$RELOAD;
3703 } 3844 }
3845
3846 $t1 = EV::time - $t1;
3847 warn "reload completed in ${t1}s\n";
3704}; 3848};
3705 3849
3706our $RELOAD_WATCHER; # used only during reload 3850our $RELOAD_WATCHER; # used only during reload
3707 3851
3708sub reload_perl() { 3852sub reload_perl() {
3709 # doing reload synchronously and two reloads happen back-to-back, 3853 # doing reload synchronously and two reloads happen back-to-back,
3710 # coro crashes during coro_state_free->destroy here. 3854 # coro crashes during coro_state_free->destroy here.
3711 3855
3856 $RELOAD_WATCHER ||= cf::async {
3857 Coro::AIO::aio_wait cache_extensions;
3858
3712 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3859 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3713 do_reload_perl; 3860 do_reload_perl;
3714 undef $RELOAD_WATCHER; 3861 undef $RELOAD_WATCHER;
3862 };
3715 }; 3863 };
3716} 3864}
3717 3865
3718register_command "reload" => sub { 3866register_command "reload" => sub {
3719 my ($who, $arg) = @_; 3867 my ($who, $arg) = @_;
3878 LOG llevInfo, "[ABT] [suppressed]\n"; 4026 LOG llevInfo, "[ABT] [suppressed]\n";
3879 } 4027 }
3880} 4028}
3881 4029
3882# load additional modules 4030# load additional modules
3883use cf::pod; 4031require "cf/$_.pm" for @EXTRA_MODULES;
4032cf::_connect_to_perl_2;
3884 4033
3885END { cf::emergency_save } 4034END { cf::emergency_save }
3886 4035
38871 40361
3888 4037

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines