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.451 by root, Mon Sep 22 05:42:41 2008 UTC vs.
Revision 1.489 by root, Fri Oct 23 03:08:35 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
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70 73
71# make sure c-lzf reinitialises itself 74# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
73Compress::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
77
78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
74 80
75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
76 82
77our %COMMAND = (); 83our %COMMAND = ();
78our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
83our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
84our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
85 91
86our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
87our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
88 96
89our $CONFDIR = confdir; 97our $CONFDIR = confdir;
90our $DATADIR = datadir; 98our $DATADIR = datadir;
91our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
92our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
103our %RESOURCE; 111our %RESOURCE;
104 112
105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107our $NEXT_TICK; 115our $NEXT_TICK;
108our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
109 117
110our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
112our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
113our $DB_ENV; 121our $DB_ENV;
114 122
123our @EXTRA_MODULES = qw(pod match mapscript);
124
115our %CFG; 125our %CFG;
116 126
117our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
118our $RUNTIME; 128our $RUNTIME;
119our $NOW; 129our $NOW;
127 137
128our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
129our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter 140our $JITTER; # average jitter
131our $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 :)
132 147
133binmode STDOUT; 148binmode STDOUT;
134binmode STDERR; 149binmode STDERR;
135 150
136# read virtual server time, if available 151# read virtual server time, if available
138 open my $fh, "<", $RUNTIMEFILE 153 open my $fh, "<", $RUNTIMEFILE
139 or die "unable to read $RUNTIMEFILE file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
140 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
141} 156}
142 157
158eval "sub TICK() { $TICK } 1" or die;
159
143mkdir $_ 160mkdir $_
144 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
145 162
146our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
147 164
148sub 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::"} };
149 177
150############################################################################# 178#############################################################################
151 179
152=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
153 181
200returns directly I<after> the tick processing (and consequently, can only wake one process 228returns directly I<after> the tick processing (and consequently, can only wake one process
201per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 229per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
202 230
203=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
204 232
205This array contains the results of the last C<invoke ()> call. When 233This 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 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
207that call. 235that call.
208 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
209=back 243=back
210 244
211=cut 245=cut
212 246
213BEGIN { 247$Coro::State::WARNHOOK = sub {
214 *CORE::GLOBAL::warn = sub {
215 my $msg = join "", @_; 248 my $msg = join "", @_;
216 249
217 $msg .= "\n" 250 $msg .= "\n"
218 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
219 252
220 $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;
221 254
222 LOG llevError, $msg; 255 LOG llevError, $msg;
223 }; 256};
224}
225 257
226$Coro::State::DIEHOOK = sub { 258$Coro::State::DIEHOOK = sub {
227 return unless $^S eq 0; # "eq", not "==" 259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
228 262
229 if ($Coro::current == $Coro::main) {#d# 263 if ($Coro::current == $Coro::main) {#d#
230 warn "DIEHOOK called in main context, Coro bug?\n";#d# 264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
231 return;#d# 265 return;#d#
232 }#d# 266 }#d#
233 267
234 # kill coroutine otherwise 268 # kill coroutine otherwise
235 warn Carp::longmess $_[0];
236 Coro::terminate 269 Coro::terminate
237}; 270};
238
239$SIG{__DIE__} = sub { }; #d#?
240 271
241@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
242@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
243@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
244@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
305our $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
306 337
307sub encode_json($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
308sub decode_json($) { $json_coder->decode ($_[0]) } 339sub decode_json($) { $json_coder->decode ($_[0]) }
309 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
310=item cf::lock_wait $string 355=item cf::lock_wait $string
311 356
312Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
313 358
314=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
315 360
316Wait 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
317a 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,
318for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
319returned. 364returned.
320 365
321Locks 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
322deadlocked coro. 367deadlocked coro.
328 373
329Return 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.
330 375
331=cut 376=cut
332 377
333our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
334our %LOCKER;#d#
335 379
336sub lock_wait($) { 380sub lock_wait($) {
337 my ($key) = @_; 381 $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 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
347 push @{ $LOCK{$key} }, $Coro::current;
348 Coro::schedule;
349 }
350} 382}
351 383
352sub lock_acquire($) { 384sub lock_acquire($) {
353 my ($key) = @_; 385 $LOCKS->guard ($_[0])
354
355 # wait, to be sure we are not locked
356 lock_wait $key;
357
358 $LOCK{$key} = [];
359 $LOCKER{$key} = $Coro::current;#d#
360
361 Coro::guard {
362 delete $LOCKER{$key};#d#
363 # wake up all waiters, to be on the safe side
364 $_->ready for @{ delete $LOCK{$key} };
365 }
366} 386}
367 387
368sub lock_active($) { 388sub lock_active($) {
369 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
370
371 ! ! $LOCK{$key}
372} 390}
373 391
374sub freeze_mainloop { 392sub freeze_mainloop {
375 tick_inhibit_inc; 393 tick_inhibit_inc;
376 394
377 Coro::guard \&tick_inhibit_dec; 395 &Guard::guard (\&tick_inhibit_dec);
378} 396}
379 397
380=item cf::periodic $interval, $cb 398=item cf::periodic $interval, $cb
381 399
382Like 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
1154 $decname, length $$rdata, scalar @$objs; 1172 $decname, length $$rdata, scalar @$objs;
1155 1173
1156 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1175 aio_chmod $fh, SAVE_MODE;
1158 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1159 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 }
1160 aio_close $fh; 1181 aio_close $fh;
1161 1182
1162 if (@$objs) { 1183 if (@$objs) {
1163 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) {
1164 aio_chmod $fh, SAVE_MODE; 1185 aio_chmod $fh, SAVE_MODE;
1165 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1186 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1166 aio_write $fh, 0, (length $data), $data, 0; 1187 aio_write $fh, 0, (length $data), $data, 0;
1167 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 }
1168 aio_close $fh; 1192 aio_close $fh;
1169 aio_rename "$filename.pst~", "$filename.pst"; 1193 aio_rename "$filename.pst~", "$filename.pst";
1170 } 1194 }
1171 } else { 1195 } else {
1172 aio_unlink "$filename.pst"; 1196 aio_unlink "$filename.pst";
1173 } 1197 }
1174 1198
1175 aio_rename "$filename~", $filename; 1199 aio_rename "$filename~", $filename;
1200
1201 $filename =~ s%/[^/]+$%%;
1202 aio_pathsync $filename if $cf::USE_FSYNC;
1176 } else { 1203 } else {
1177 warn "FATAL: $filename~: $!\n"; 1204 warn "unable to save objects: $filename~: $!\n";
1178 } 1205 }
1179 } else { 1206 } else {
1180 aio_unlink $filename; 1207 aio_unlink $filename;
1181 aio_unlink "$filename.pst"; 1208 aio_unlink "$filename.pst";
1182 } 1209 }
1273 my ($name, $cb) = @_; 1300 my ($name, $cb) = @_;
1274 1301
1275 $EXTICMD{$name} = $cb; 1302 $EXTICMD{$name} = $cb;
1276} 1303}
1277 1304
1305use File::Glob ();
1306
1278cf::player->attach ( 1307cf::player->attach (
1279 on_command => sub { 1308 on_command => sub {
1280 my ($pl, $name, $params) = @_; 1309 my ($pl, $name, $params) = @_;
1281 1310
1282 my $cb = $COMMAND{$name} 1311 my $cb = $COMMAND{$name}
1313 } 1342 }
1314 1343
1315 cf::override; 1344 cf::override;
1316 }, 1345 },
1317); 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}
1318 1360
1319sub load_extensions { 1361sub load_extensions {
1320 cf::sync_job { 1362 cf::sync_job {
1321 my %todo; 1363 my %todo;
1322 1364
1445 1487
1446sub exists($) { 1488sub exists($) {
1447 my ($login) = @_; 1489 my ($login) = @_;
1448 1490
1449 $cf::PLAYER{$login} 1491 $cf::PLAYER{$login}
1450 or cf::sync_job { !aio_stat path $login } 1492 or !aio_stat path $login
1451} 1493}
1452 1494
1453sub find($) { 1495sub find($) {
1454 return $cf::PLAYER{$_[0]} || do { 1496 return $cf::PLAYER{$_[0]} || do {
1455 my $login = $_[0]; 1497 my $login = $_[0];
1851 1893
1852 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1894 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1853 "$UNIQUEDIR/$path" 1895 "$UNIQUEDIR/$path"
1854} 1896}
1855 1897
1856# and all this just because we cannot iterate over
1857# all maps in C++...
1858sub change_all_map_light {
1859 my ($change) = @_;
1860
1861 $_->change_map_light ($change)
1862 for grep $_->outdoor, values %cf::MAP;
1863}
1864
1865sub decay_objects { 1898sub decay_objects {
1866 my ($self) = @_; 1899 my ($self) = @_;
1867 1900
1868 return if $self->{deny_reset}; 1901 return if $self->{deny_reset};
1869 1902
1951sub find { 1984sub find {
1952 my ($path, $origin) = @_; 1985 my ($path, $origin) = @_;
1953 1986
1954 $path = normalise $path, $origin && $origin->path; 1987 $path = normalise $path, $origin && $origin->path;
1955 1988
1956 cf::lock_wait "map_data:$path";#d#remove 1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1957 cf::lock_wait "map_find:$path"; 1990 my $guard2 = cf::lock_acquire "map_find:$path";
1958 1991
1959 $cf::MAP{$path} || do { 1992 $cf::MAP{$path} || do {
1960 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1961 my $guard2 = cf::lock_acquire "map_find:$path";
1962
1963 my $map = new_from_path cf::map $path 1993 my $map = new_from_path cf::map $path
1964 or return; 1994 or return;
1965 1995
1966 $map->{last_save} = $cf::RUNTIME; 1996 $map->{last_save} = $cf::RUNTIME;
1967 1997
2035 unless ($self->{deny_activate}) { 2065 unless ($self->{deny_activate}) {
2036 $self->decay_objects; 2066 $self->decay_objects;
2037 $self->fix_auto_apply; 2067 $self->fix_auto_apply;
2038 $self->update_buttons; 2068 $self->update_buttons;
2039 cf::cede_to_tick; 2069 cf::cede_to_tick;
2040 $self->set_darkness_map;
2041 cf::cede_to_tick;
2042 $self->activate; 2070 $self->activate;
2043 } 2071 }
2044 2072
2045 $self->{last_save} = $cf::RUNTIME; 2073 $self->{last_save} = $cf::RUNTIME;
2046 $self->last_access ($cf::RUNTIME); 2074 $self->last_access ($cf::RUNTIME);
2212 2240
2213 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2214 2242
2215 return if $self->players; 2243 return if $self->players;
2216 2244
2217 warn "resetting map ", $self->path; 2245 warn "resetting map ", $self->path, "\n";
2218 2246
2219 $self->in_memory (cf::MAP_SWAPPED); 2247 $self->in_memory (cf::MAP_SWAPPED);
2220 2248
2221 # need to save uniques path 2249 # need to save uniques path
2222 unless ($self->{deny_save}) { 2250 unless ($self->{deny_save}) {
2313 : normalise $_ 2341 : normalise $_
2314 } @{ aio_readdir $UNIQUEDIR or [] } 2342 } @{ aio_readdir $UNIQUEDIR or [] }
2315 ] 2343 ]
2316} 2344}
2317 2345
2346=item cf::map::static_maps
2347
2348Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2349file in the shared directory). May block.
2350
2351=cut
2352
2353sub static_maps() {
2354 my @dirs = "";
2355 my @maps;
2356
2357 while (@dirs) {
2358 my $dir = shift @dirs;
2359
2360 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2361 or return;
2362
2363 for (@$files) {
2364 s/\.map$// or next;
2365 utf8::decode $_;
2366 push @maps, "$dir/$_";
2367 }
2368
2369 push @dirs, map "$dir/$_", @$dirs;
2370 }
2371
2372 \@maps
2373}
2374
2318=back 2375=back
2319 2376
2320=head3 cf::object 2377=head3 cf::object
2321 2378
2322=cut 2379=cut
2387 2444
2388our $SAY_CHANNEL = { 2445our $SAY_CHANNEL = {
2389 id => "say", 2446 id => "say",
2390 title => "Map", 2447 title => "Map",
2391 reply => "say ", 2448 reply => "say ",
2392 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2449 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2393}; 2450};
2394 2451
2395our $CHAT_CHANNEL = { 2452our $CHAT_CHANNEL = {
2396 id => "chat", 2453 id => "chat",
2397 title => "Chat", 2454 title => "Chat",
2523 2580
2524 $map->load; 2581 $map->load;
2525 $map->load_neighbours; 2582 $map->load_neighbours;
2526 2583
2527 return unless $self->contr->active; 2584 return unless $self->contr->active;
2528 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2529 $self->activate_recursive;
2530 2585
2531 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2586 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2532 $self->enter_map ($map, $x, $y); 2587 $self->enter_map ($map, $x, $y);
2588
2589 # only activate afterwards, to support waiting in hooks
2590 $self->activate_recursive;
2533} 2591}
2534 2592
2535=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2593=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2536 2594
2537Moves the player to the given map-path and coordinates by first freezing 2595Moves the player to the given map-path and coordinates by first freezing
2736 2794
2737=cut 2795=cut
2738 2796
2739# non-persistent channels (usually the info channel) 2797# non-persistent channels (usually the info channel)
2740our %CHANNEL = ( 2798our %CHANNEL = (
2799 "c/motd" => {
2800 id => "infobox",
2801 title => "MOTD",
2802 reply => undef,
2803 tooltip => "The message of the day",
2804 },
2741 "c/identify" => { 2805 "c/identify" => {
2742 id => "infobox", 2806 id => "infobox",
2743 title => "Identify", 2807 title => "Identify",
2744 reply => undef, 2808 reply => undef,
2745 tooltip => "Items recently identified", 2809 tooltip => "Items recently identified",
2747 "c/examine" => { 2811 "c/examine" => {
2748 id => "infobox", 2812 id => "infobox",
2749 title => "Examine", 2813 title => "Examine",
2750 reply => undef, 2814 reply => undef,
2751 tooltip => "Signs and other items you examined", 2815 tooltip => "Signs and other items you examined",
2816 },
2817 "c/shopinfo" => {
2818 id => "infobox",
2819 title => "Shop Info",
2820 reply => undef,
2821 tooltip => "What your bargaining skill tells you about the shop",
2752 }, 2822 },
2753 "c/book" => { 2823 "c/book" => {
2754 id => "infobox", 2824 id => "infobox",
2755 title => "Book", 2825 title => "Book",
2756 reply => undef, 2826 reply => undef,
2772 id => "infobox", 2842 id => "infobox",
2773 title => "Body Parts", 2843 title => "Body Parts",
2774 reply => undef, 2844 reply => undef,
2775 tooltip => "Shows which body parts you posess and are available", 2845 tooltip => "Shows which body parts you posess and are available",
2776 }, 2846 },
2847 "c/statistics" => {
2848 id => "infobox",
2849 title => "Statistics",
2850 reply => undef,
2851 tooltip => "Shows your primary statistics",
2852 },
2777 "c/skills" => { 2853 "c/skills" => {
2778 id => "infobox", 2854 id => "infobox",
2779 title => "Skills", 2855 title => "Skills",
2780 reply => undef, 2856 reply => undef,
2781 tooltip => "Shows your experience per skill and item power", 2857 tooltip => "Shows your experience per skill and item power",
2858 },
2859 "c/shopitems" => {
2860 id => "infobox",
2861 title => "Shop Items",
2862 reply => undef,
2863 tooltip => "Shows the items currently for sale in this shop",
2864 },
2865 "c/resistances" => {
2866 id => "infobox",
2867 title => "Resistances",
2868 reply => undef,
2869 tooltip => "Shows your resistances",
2870 },
2871 "c/pets" => {
2872 id => "infobox",
2873 title => "Pets",
2874 reply => undef,
2875 tooltip => "Shows information abotu your pets/a specific pet",
2876 },
2877 "c/perceiveself" => {
2878 id => "infobox",
2879 title => "Perceive Self",
2880 reply => undef,
2881 tooltip => "You gained detailed knowledge about yourself",
2782 }, 2882 },
2783 "c/uptime" => { 2883 "c/uptime" => {
2784 id => "infobox", 2884 id => "infobox",
2785 title => "Uptime", 2885 title => "Uptime",
2786 reply => undef, 2886 reply => undef,
2796 id => "party", 2896 id => "party",
2797 title => "Party", 2897 title => "Party",
2798 reply => "gsay ", 2898 reply => "gsay ",
2799 tooltip => "Messages and chat related to your party", 2899 tooltip => "Messages and chat related to your party",
2800 }, 2900 },
2901 "c/death" => {
2902 id => "death",
2903 title => "Death",
2904 reply => undef,
2905 tooltip => "Reason for and more info about your most recent death",
2906 },
2907 "c/say" => $SAY_CHANNEL,
2908 "c/chat" => $CHAT_CHANNEL,
2801); 2909);
2802 2910
2803sub cf::client::send_msg { 2911sub cf::client::send_msg {
2804 my ($self, $channel, $msg, $color, @extra) = @_; 2912 my ($self, $channel, $msg, $color, @extra) = @_;
2805 2913
2810 2918
2811 # check predefined channels, for the benefit of C 2919 # check predefined channels, for the benefit of C
2812 if ($CHANNEL{$channel}) { 2920 if ($CHANNEL{$channel}) {
2813 $channel = $CHANNEL{$channel}; 2921 $channel = $CHANNEL{$channel};
2814 2922
2815 $self->ext_msg (channel_info => $channel) 2923 $self->ext_msg (channel_info => $channel);
2816 if $self->can_msg;
2817
2818 $channel = $channel->{id}; 2924 $channel = $channel->{id};
2819 2925
2820 } elsif (ref $channel) { 2926 } elsif (ref $channel) {
2821 # send meta info to client, if not yet sent 2927 # send meta info to client, if not yet sent
2822 unless (exists $self->{channel}{$channel->{id}}) { 2928 unless (exists $self->{channel}{$channel->{id}}) {
2823 $self->{channel}{$channel->{id}} = $channel; 2929 $self->{channel}{$channel->{id}} = $channel;
2824 $self->ext_msg (channel_info => $channel) 2930 $self->ext_msg (channel_info => $channel);
2825 if $self->can_msg;
2826 } 2931 }
2827 2932
2828 $channel = $channel->{id}; 2933 $channel = $channel->{id};
2829 } 2934 }
2830 2935
2831 return unless @extra || length $msg; 2936 return unless @extra || length $msg;
2832 2937
2833 if ($self->can_msg) {
2834 # default colour, mask it out 2938 # default colour, mask it out
2835 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2939 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2836 if $color & cf::NDI_DEF; 2940 if $color & cf::NDI_DEF;
2837 2941
2838 my $pkt = "msg " 2942 my $pkt = "msg "
2839 . $self->{json_coder}->encode ( 2943 . $self->{json_coder}->encode (
2840 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2944 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2841 ); 2945 );
2842 2946
2843 # try lzf for large packets 2947 # try lzf for large packets
2844 $pkt = "lzf " . Compress::LZF::compress $pkt 2948 $pkt = "lzf " . Compress::LZF::compress $pkt
2845 if 1024 <= length $pkt and $self->{can_lzf}; 2949 if 1024 <= length $pkt and $self->{can_lzf};
2846 2950
2847 # split very large packets 2951 # split very large packets
2848 if (8192 < length $pkt and $self->{can_lzf}) { 2952 if (8192 < length $pkt and $self->{can_lzf}) {
2849 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; 2953 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2850 $pkt = "frag"; 2954 $pkt = "frag";
2851 } 2955 }
2852 2956
2853 $self->send_packet ($pkt); 2957 $self->send_packet ($pkt);
2854 } else {
2855 if ($color >= 0) {
2856 # replace some tags by gcfclient-compatible ones
2857 for ($msg) {
2858 1 while
2859 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2860 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2861 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2862 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2863 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2864 }
2865
2866 $color &= cf::NDI_COLOR_MASK;
2867
2868 utf8::encode $msg;
2869
2870 if (0 && $msg =~ /\[/) {
2871 # COMMAND/INFO
2872 $self->send_packet ("drawextinfo $color 10 8 $msg")
2873 } else {
2874 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2875 $self->send_packet ("drawinfo $color $msg")
2876 }
2877 }
2878 }
2879} 2958}
2880 2959
2881=item $client->ext_msg ($type, @msg) 2960=item $client->ext_msg ($type, @msg)
2882 2961
2883Sends an ext event to the client. 2962Sends an ext event to the client.
3058The following functions and methods are available within a safe environment: 3137The following functions and methods are available within a safe environment:
3059 3138
3060 cf::object 3139 cf::object
3061 contr pay_amount pay_player map x y force_find force_add destroy 3140 contr pay_amount pay_player map x y force_find force_add destroy
3062 insert remove name archname title slaying race decrease split 3141 insert remove name archname title slaying race decrease split
3142 value
3063 3143
3064 cf::object::player 3144 cf::object::player
3065 player 3145 player
3066 3146
3067 cf::player 3147 cf::player
3073=cut 3153=cut
3074 3154
3075for ( 3155for (
3076 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3156 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3077 insert remove inv nrof name archname title slaying race 3157 insert remove inv nrof name archname title slaying race
3078 decrease split destroy change_exp)], 3158 decrease split destroy change_exp value msg lore send_msg)],
3079 ["cf::object::player" => qw(player)], 3159 ["cf::object::player" => qw(player)],
3080 ["cf::player" => qw(peaceful)], 3160 ["cf::player" => qw(peaceful send_msg)],
3081 ["cf::map" => qw(trigger)], 3161 ["cf::map" => qw(trigger)],
3082) { 3162) {
3083 no strict 'refs'; 3163 no strict 'refs';
3084 my ($pkg, @funs) = @$_; 3164 my ($pkg, @funs) = @$_;
3085 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3165 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3102 my ($code, %vars) = @_; 3182 my ($code, %vars) = @_;
3103 3183
3104 my $qcode = $code; 3184 my $qcode = $code;
3105 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3185 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3106 $qcode =~ s/\n/\\n/g; 3186 $qcode =~ s/\n/\\n/g;
3187
3188 %vars = (_dummy => 0) unless %vars;
3107 3189
3108 local $_; 3190 local $_;
3109 local @safe::cf::_safe_eval_args = values %vars; 3191 local @safe::cf::_safe_eval_args = values %vars;
3110 3192
3111 my $eval = 3193 my $eval =
3341 reload_treasures; 3423 reload_treasures;
3342 3424
3343 warn "finished reloading resource files\n"; 3425 warn "finished reloading resource files\n";
3344} 3426}
3345 3427
3346sub init {
3347 my $guard = freeze_mainloop;
3348
3349 evthread_start IO::AIO::poll_fileno;
3350
3351 reload_resources;
3352}
3353
3354sub reload_config { 3428sub reload_config {
3429 warn "reloading config file...\n";
3430
3355 open my $fh, "<:utf8", "$CONFDIR/config" 3431 open my $fh, "<:utf8", "$CONFDIR/config"
3356 or return; 3432 or return;
3357 3433
3358 local $/; 3434 local $/;
3359 *CFG = YAML::Load <$fh>; 3435 *CFG = YAML::XS::Load scalar <$fh>;
3360 3436
3361 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3437 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3362 3438
3363 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3439 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3364 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3440 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3368 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3444 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3369 and die "WARNING: m(un)lockall failed: $!\n"; 3445 and die "WARNING: m(un)lockall failed: $!\n";
3370 }; 3446 };
3371 warn $@ if $@; 3447 warn $@ if $@;
3372 } 3448 }
3449
3450 warn "finished reloading resource files\n";
3373} 3451}
3374 3452
3375sub pidfile() { 3453sub pidfile() {
3376 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3454 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3377 or die "$PIDFILE: $!"; 3455 or die "$PIDFILE: $!";
3389 3467
3390 seek $fh, 0, 0; 3468 seek $fh, 0, 0;
3391 print $fh $$; 3469 print $fh $$;
3392} 3470}
3393 3471
3472sub main_loop {
3473 warn "EV::loop starting\n";
3474 if (1) {
3475 EV::loop;
3476 }
3477 warn "EV::loop returned\n";
3478 goto &main_loop unless $REALLY_UNLOOP;
3479}
3480
3394sub main { 3481sub main {
3395 atomic; 3482 cf::init_globals; # initialise logging
3483
3484 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3485 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3486 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3487 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3488
3489 cf::init_experience;
3490 cf::init_anim;
3491 cf::init_attackmess;
3492 cf::init_dynamic;
3493
3494 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3396 3495
3397 # we must not ever block the main coroutine 3496 # we must not ever block the main coroutine
3398 local $Coro::idle = sub { 3497 local $Coro::idle = sub {
3399 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3498 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3400 (async { 3499 (async {
3401 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3500 $Coro::current->{desc} = "IDLE BUG HANDLER";
3402 EV::loop EV::LOOP_ONESHOT; 3501 EV::loop EV::LOOP_ONESHOT;
3403 })->prio (Coro::PRIO_MAX); 3502 })->prio (Coro::PRIO_MAX);
3404 }; 3503 };
3405 3504
3406 { 3505 evthread_start IO::AIO::poll_fileno;
3407 my $guard = freeze_mainloop; 3506
3507 cf::sync_job {
3508 reload_resources;
3408 reload_config; 3509 reload_config;
3409 db_init; 3510 db_init;
3511
3512 cf::load_settings;
3513 cf::load_materials;
3514 cf::init_uuid;
3515 cf::init_signals;
3516 cf::init_commands;
3517 cf::init_skills;
3518
3519 cf::init_beforeplay;
3520
3521 atomic;
3522
3410 load_extensions; 3523 load_extensions;
3411 3524
3412 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3413 }
3414
3415 utime time, time, $RUNTIMEFILE; 3525 utime time, time, $RUNTIMEFILE;
3416 3526
3417 # no (long-running) fork's whatsoever before this point(!) 3527 # no (long-running) fork's whatsoever before this point(!)
3528 use POSIX ();
3418 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3529 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3419 3530
3420 EV::loop; 3531 (pop @POST_INIT)->(0) while @POST_INIT;
3532 };
3533
3534 main_loop;
3421} 3535}
3422 3536
3423############################################################################# 3537#############################################################################
3424# initialisation and cleanup 3538# initialisation and cleanup
3425 3539
3481 my $uuid = "$LOCALDIR/uuid"; 3595 my $uuid = "$LOCALDIR/uuid";
3482 3596
3483 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3597 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3484 or return; 3598 or return;
3485 3599
3486 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3600 my $value = uuid_seq uuid_cur;
3601
3602 unless ($value) {
3603 warn "cowardly refusing to write zero uuid value!\n";
3604 return;
3605 }
3606
3607 my $value = uuid_str $value + $uuid_skip;
3487 $uuid_skip = 0; 3608 $uuid_skip = 0;
3488 3609
3489 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3610 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3490 and return; 3611 and return;
3491 3612
3513} 3634}
3514 3635
3515sub emergency_save() { 3636sub emergency_save() {
3516 my $freeze_guard = cf::freeze_mainloop; 3637 my $freeze_guard = cf::freeze_mainloop;
3517 3638
3518 warn "enter emergency perl save\n"; 3639 warn "emergency_perl_save: enter\n";
3519 3640
3520 cf::sync_job { 3641 cf::sync_job {
3642 # this is a trade-off: we want to be very quick here, so
3643 # save all maps without fsync, and later call a global sync
3644 # (which in turn might be very very slow)
3645 local $USE_FSYNC = 0;
3646
3521 # use a peculiar iteration method to avoid tripping on perl 3647 # use a peculiar iteration method to avoid tripping on perl
3522 # refcount bugs in for. also avoids problems with players 3648 # refcount bugs in for. also avoids problems with players
3523 # and maps saved/destroyed asynchronously. 3649 # and maps saved/destroyed asynchronously.
3524 warn "begin emergency player save\n"; 3650 warn "emergency_perl_save: begin player save\n";
3525 for my $login (keys %cf::PLAYER) { 3651 for my $login (keys %cf::PLAYER) {
3526 my $pl = $cf::PLAYER{$login} or next; 3652 my $pl = $cf::PLAYER{$login} or next;
3527 $pl->valid or next; 3653 $pl->valid or next;
3528 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3654 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3529 $pl->save; 3655 $pl->save;
3530 } 3656 }
3531 warn "end emergency player save\n"; 3657 warn "emergency_perl_save: end player save\n";
3532 3658
3533 warn "begin emergency map save\n"; 3659 warn "emergency_perl_save: begin map save\n";
3534 for my $path (keys %cf::MAP) { 3660 for my $path (keys %cf::MAP) {
3535 my $map = $cf::MAP{$path} or next; 3661 my $map = $cf::MAP{$path} or next;
3536 $map->valid or next; 3662 $map->valid or next;
3537 $map->save; 3663 $map->save;
3538 } 3664 }
3539 warn "end emergency map save\n"; 3665 warn "emergency_perl_save: end map save\n";
3540 3666
3541 warn "begin emergency database checkpoint\n"; 3667 warn "emergency_perl_save: begin database checkpoint\n";
3542 BDB::db_env_txn_checkpoint $DB_ENV; 3668 BDB::db_env_txn_checkpoint $DB_ENV;
3543 warn "end emergency database checkpoint\n"; 3669 warn "emergency_perl_save: end database checkpoint\n";
3544 3670
3545 warn "begin write uuid\n"; 3671 warn "emergency_perl_save: begin write uuid\n";
3546 write_uuid_sync 1; 3672 write_uuid_sync 1;
3547 warn "end write uuid\n"; 3673 warn "emergency_perl_save: end write uuid\n";
3548 }; 3674 };
3549 3675
3676 warn "emergency_perl_save: starting sync()\n";
3677 IO::AIO::aio_sync sub {
3678 warn "emergency_perl_save: finished sync()\n";
3679 };
3680
3550 warn "leave emergency perl save\n"; 3681 warn "emergency_perl_save: leave\n";
3551} 3682}
3552 3683
3553sub post_cleanup { 3684sub post_cleanup {
3554 my ($make_core) = @_; 3685 my ($make_core) = @_;
3555 3686
3592 warn "can only reload from main coroutine"; 3723 warn "can only reload from main coroutine";
3593 return; 3724 return;
3594 } 3725 }
3595 3726
3596 return if $RELOAD++; 3727 return if $RELOAD++;
3728
3729 my $t1 = EV::time;
3597 3730
3598 while ($RELOAD) { 3731 while ($RELOAD) {
3599 warn "reloading..."; 3732 warn "reloading...";
3600 3733
3601 warn "entering sync_job"; 3734 warn "entering sync_job";
3662 clear_package "safe::$_" 3795 clear_package "safe::$_"
3663 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3796 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3664 3797
3665 warn "unloading cf.pm \"a bit\""; 3798 warn "unloading cf.pm \"a bit\"";
3666 delete $INC{"cf.pm"}; 3799 delete $INC{"cf.pm"};
3667 delete $INC{"cf/pod.pm"}; 3800 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3668 3801
3669 # don't, removes xs symbols, too, 3802 # don't, removes xs symbols, too,
3670 # and global variables created in xs 3803 # and global variables created in xs
3671 #clear_package __PACKAGE__; 3804 #clear_package __PACKAGE__;
3672 3805
3673 warn "unload completed, starting to reload now"; 3806 warn "unload completed, starting to reload now";
3674 3807
3675 warn "reloading cf.pm"; 3808 warn "reloading cf.pm";
3676 require cf; 3809 require cf;
3677 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3810 cf::_connect_to_perl_1;
3678 3811
3679 warn "loading config and database again"; 3812 warn "loading config and database again";
3680 cf::reload_config; 3813 cf::reload_config;
3681 3814
3682 warn "loading extensions"; 3815 warn "loading extensions";
3683 cf::load_extensions; 3816 cf::load_extensions;
3684 3817
3818 if ($REATTACH_ON_RELOAD) {
3685 warn "reattaching attachments to objects/players"; 3819 warn "reattaching attachments to objects/players";
3686 _global_reattach; # objects, sockets 3820 _global_reattach; # objects, sockets
3687 warn "reattaching attachments to maps"; 3821 warn "reattaching attachments to maps";
3688 reattach $_ for values %MAP; 3822 reattach $_ for values %MAP;
3689 warn "reattaching attachments to players"; 3823 warn "reattaching attachments to players";
3690 reattach $_ for values %PLAYER; 3824 reattach $_ for values %PLAYER;
3825 }
3826
3827 warn "running post_init jobs";
3828 (pop @POST_INIT)->(1) while @POST_INIT;
3691 3829
3692 warn "leaving sync_job"; 3830 warn "leaving sync_job";
3693 3831
3694 1 3832 1
3695 } or do { 3833 } or do {
3698 }; 3836 };
3699 3837
3700 warn "reloaded"; 3838 warn "reloaded";
3701 --$RELOAD; 3839 --$RELOAD;
3702 } 3840 }
3841
3842 $t1 = EV::time - $t1;
3843 warn "reload completed in ${t1}s\n";
3703}; 3844};
3704 3845
3705our $RELOAD_WATCHER; # used only during reload 3846our $RELOAD_WATCHER; # used only during reload
3706 3847
3707sub reload_perl() { 3848sub reload_perl() {
3708 # doing reload synchronously and two reloads happen back-to-back, 3849 # doing reload synchronously and two reloads happen back-to-back,
3709 # coro crashes during coro_state_free->destroy here. 3850 # coro crashes during coro_state_free->destroy here.
3710 3851
3852 $RELOAD_WATCHER ||= cf::async {
3853 Coro::AIO::aio_wait cache_extensions;
3854
3711 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 3855 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3712 do_reload_perl; 3856 do_reload_perl;
3713 undef $RELOAD_WATCHER; 3857 undef $RELOAD_WATCHER;
3858 };
3714 }; 3859 };
3715} 3860}
3716 3861
3717register_command "reload" => sub { 3862register_command "reload" => sub {
3718 my ($who, $arg) = @_; 3863 my ($who, $arg) = @_;
3877 LOG llevInfo, "[ABT] [suppressed]\n"; 4022 LOG llevInfo, "[ABT] [suppressed]\n";
3878 } 4023 }
3879} 4024}
3880 4025
3881# load additional modules 4026# load additional modules
3882use cf::pod; 4027require "cf/$_.pm" for @EXTRA_MODULES;
4028cf::_connect_to_perl_2;
3883 4029
3884END { cf::emergency_save } 4030END { cf::emergency_save }
3885 4031
38861 40321
3887 4033

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines