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.453 by root, Tue Sep 23 04:29:11 2008 UTC vs.
Revision 1.490 by root, Sat Oct 24 06:16:40 2009 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use 5.10.0;
25use utf8; 26use utf8;
26use strict "vars", "subs"; 27use strict qw(vars subs);
27 28
28use Symbol; 29use Symbol;
29use List::Util; 30use List::Util;
30use Socket; 31use Socket;
31use EV; 32use EV;
32use Opcode; 33use Opcode;
33use Safe; 34use Safe;
34use Safe::Hole; 35use Safe::Hole;
35use Storable (); 36use Storable ();
36 37
38use Guard ();
37use Coro (); 39use Coro ();
38use Coro::State; 40use Coro::State;
39use Coro::Handle; 41use Coro::Handle;
40use Coro::EV; 42use Coro::EV;
41use Coro::AnyEvent; 43use Coro::AnyEvent;
42use Coro::Timer; 44use Coro::Timer;
43use Coro::Signal; 45use Coro::Signal;
44use Coro::Semaphore; 46use Coro::Semaphore;
47use Coro::SemaphoreSet;
45use Coro::AnyEvent; 48use Coro::AnyEvent;
46use Coro::AIO; 49use Coro::AIO;
47use Coro::BDB 1.6; 50use Coro::BDB 1.6;
48use Coro::Storable; 51use Coro::Storable;
49use Coro::Util (); 52use Coro::Util ();
… …
51use JSON::XS 2.01 (); 54use JSON::XS 2.01 ();
52use BDB (); 55use BDB ();
53use Data::Dumper; 56use Data::Dumper;
54use Digest::MD5; 57use Digest::MD5;
55use Fcntl; 58use Fcntl;
56use YAML (); 59use YAML::XS ();
57use IO::AIO (); 60use IO::AIO ();
58use Time::HiRes; 61use Time::HiRes;
59use Compress::LZF; 62use Compress::LZF;
60use Digest::MD5 (); 63use Digest::MD5 ();
61 64
… …
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;
… …
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
132 142
133our @POST_INIT; 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 :)
134 147
135binmode STDOUT; 148binmode STDOUT;
136binmode STDERR; 149binmode STDERR;
137 150
138# read virtual server time, if available 151# read virtual server time, if available
… …
140 open my $fh, "<", $RUNTIMEFILE 153 open my $fh, "<", $RUNTIMEFILE
141 or die "unable to read $RUNTIMEFILE file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
142 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
143} 156}
144 157
158eval "sub TICK() { $TICK } 1" or die;
159
145mkdir $_ 160mkdir $_
146 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
147 162
148our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
149 164
150sub 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::"} };
151 177
152############################################################################# 178#############################################################################
153 179
154=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
155 181
… …
202returns 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
203per 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.
204 230
205=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
206 232
207This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
208C<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
209that call. 235that call.
210 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
211=back 243=back
212 244
213=cut 245=cut
214 246
215BEGIN { 247$Coro::State::WARNHOOK = sub {
216 *CORE::GLOBAL::warn = sub {
217 my $msg = join "", @_; 248 my $msg = join "", @_;
218 249
219 $msg .= "\n" 250 $msg .= "\n"
220 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
221 252
222 $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;
223 254
224 LOG llevError, $msg; 255 LOG llevError, $msg;
225 }; 256};
226}
227 257
228$Coro::State::DIEHOOK = sub { 258$Coro::State::DIEHOOK = sub {
229 return unless $^S eq 0; # "eq", not "==" 259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
230 262
231 if ($Coro::current == $Coro::main) {#d# 263 if ($Coro::current == $Coro::main) {#d#
232 warn "DIEHOOK called in main context, Coro bug?\n";#d# 264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
233 return;#d# 265 return;#d#
234 }#d# 266 }#d#
235 267
236 # kill coroutine otherwise 268 # kill coroutine otherwise
237 warn Carp::longmess $_[0];
238 Coro::terminate 269 Coro::terminate
239}; 270};
240
241$SIG{__DIE__} = sub { }; #d#?
242 271
243@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
244@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
245@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
246@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
328Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
329 358
330=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
331 360
332Wait 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
333a 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,
334for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
335returned. 364returned.
336 365
337Locks 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
338deadlocked coro. 367deadlocked coro.
… …
344 373
345Return 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.
346 375
347=cut 376=cut
348 377
349our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
350our %LOCKER;#d#
351 379
352sub lock_wait($) { 380sub lock_wait($) {
353 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
354
355 if ($LOCKER{$key} == $Coro::current) {#d#
356 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
357 return;#d#
358 }#d#
359
360 # wait for lock, if any
361 while ($LOCK{$key}) {
362 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
363 push @{ $LOCK{$key} }, $Coro::current;
364 Coro::schedule;
365 }
366} 382}
367 383
368sub lock_acquire($) { 384sub lock_acquire($) {
369 my ($key) = @_; 385 $LOCKS->guard ($_[0])
370
371 # wait, to be sure we are not locked
372 lock_wait $key;
373
374 $LOCK{$key} = [];
375 $LOCKER{$key} = $Coro::current;#d#
376
377 Coro::guard {
378 delete $LOCKER{$key};#d#
379 # wake up all waiters, to be on the safe side
380 $_->ready for @{ delete $LOCK{$key} };
381 }
382} 386}
383 387
384sub lock_active($) { 388sub lock_active($) {
385 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
386
387 ! ! $LOCK{$key}
388} 390}
389 391
390sub freeze_mainloop { 392sub freeze_mainloop {
391 tick_inhibit_inc; 393 tick_inhibit_inc;
392 394
393 Coro::guard \&tick_inhibit_dec; 395 &Guard::guard (\&tick_inhibit_dec);
394} 396}
395 397
396=item cf::periodic $interval, $cb 398=item cf::periodic $interval, $cb
397 399
398Like 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
… …
1170 $decname, length $$rdata, scalar @$objs; 1172 $decname, length $$rdata, scalar @$objs;
1171 1173
1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1173 aio_chmod $fh, SAVE_MODE; 1175 aio_chmod $fh, SAVE_MODE;
1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1175 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 }
1176 aio_close $fh; 1181 aio_close $fh;
1177 1182
1178 if (@$objs) { 1183 if (@$objs) {
1179 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) {
1180 aio_chmod $fh, SAVE_MODE; 1185 aio_chmod $fh, SAVE_MODE;
1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1186 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1182 aio_write $fh, 0, (length $data), $data, 0; 1187 aio_write $fh, 0, (length $data), $data, 0;
1183 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 }
1184 aio_close $fh; 1192 aio_close $fh;
1185 aio_rename "$filename.pst~", "$filename.pst"; 1193 aio_rename "$filename.pst~", "$filename.pst";
1186 } 1194 }
1187 } else { 1195 } else {
1188 aio_unlink "$filename.pst"; 1196 aio_unlink "$filename.pst";
1189 } 1197 }
1190 1198
1191 aio_rename "$filename~", $filename; 1199 aio_rename "$filename~", $filename;
1200
1201 $filename =~ s%/[^/]+$%%;
1202 aio_pathsync $filename if $cf::USE_FSYNC;
1192 } else { 1203 } else {
1193 warn "FATAL: $filename~: $!\n"; 1204 warn "unable to save objects: $filename~: $!\n";
1194 } 1205 }
1195 } else { 1206 } else {
1196 aio_unlink $filename; 1207 aio_unlink $filename;
1197 aio_unlink "$filename.pst"; 1208 aio_unlink "$filename.pst";
1198 } 1209 }
… …
1289 my ($name, $cb) = @_; 1300 my ($name, $cb) = @_;
1290 1301
1291 $EXTICMD{$name} = $cb; 1302 $EXTICMD{$name} = $cb;
1292} 1303}
1293 1304
1305use File::Glob ();
1306
1294cf::player->attach ( 1307cf::player->attach (
1295 on_command => sub { 1308 on_command => sub {
1296 my ($pl, $name, $params) = @_; 1309 my ($pl, $name, $params) = @_;
1297 1310
1298 my $cb = $COMMAND{$name} 1311 my $cb = $COMMAND{$name}
… …
1329 } 1342 }
1330 1343
1331 cf::override; 1344 cf::override;
1332 }, 1345 },
1333); 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}
1334 1360
1335sub load_extensions { 1361sub load_extensions {
1336 cf::sync_job { 1362 cf::sync_job {
1337 my %todo; 1363 my %todo;
1338 1364
… …
1867 1893
1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1894 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1869 "$UNIQUEDIR/$path" 1895 "$UNIQUEDIR/$path"
1870} 1896}
1871 1897
1872# and all this just because we cannot iterate over
1873# all maps in C++...
1874sub change_all_map_light {
1875 my ($change) = @_;
1876
1877 $_->change_map_light ($change)
1878 for grep $_->outdoor, values %cf::MAP;
1879}
1880
1881sub decay_objects { 1898sub decay_objects {
1882 my ($self) = @_; 1899 my ($self) = @_;
1883 1900
1884 return if $self->{deny_reset}; 1901 return if $self->{deny_reset};
1885 1902
… …
1967sub find { 1984sub find {
1968 my ($path, $origin) = @_; 1985 my ($path, $origin) = @_;
1969 1986
1970 $path = normalise $path, $origin && $origin->path; 1987 $path = normalise $path, $origin && $origin->path;
1971 1988
1972 cf::lock_wait "map_data:$path";#d#remove 1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 cf::lock_wait "map_find:$path"; 1990 my $guard2 = cf::lock_acquire "map_find:$path";
1974 1991
1975 $cf::MAP{$path} || do { 1992 $cf::MAP{$path} || do {
1976 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1977 my $guard2 = cf::lock_acquire "map_find:$path";
1978
1979 my $map = new_from_path cf::map $path 1993 my $map = new_from_path cf::map $path
1980 or return; 1994 or return;
1981 1995
1982 $map->{last_save} = $cf::RUNTIME; 1996 $map->{last_save} = $cf::RUNTIME;
1983 1997
… …
2051 unless ($self->{deny_activate}) { 2065 unless ($self->{deny_activate}) {
2052 $self->decay_objects; 2066 $self->decay_objects;
2053 $self->fix_auto_apply; 2067 $self->fix_auto_apply;
2054 $self->update_buttons; 2068 $self->update_buttons;
2055 cf::cede_to_tick; 2069 cf::cede_to_tick;
2056 $self->set_darkness_map;
2057 cf::cede_to_tick;
2058 $self->activate; 2070 $self->activate;
2059 } 2071 }
2060 2072
2061 $self->{last_save} = $cf::RUNTIME; 2073 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME); 2074 $self->last_access ($cf::RUNTIME);
… …
2228 2240
2229 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2230 2242
2231 return if $self->players; 2243 return if $self->players;
2232 2244
2233 warn "resetting map ", $self->path; 2245 warn "resetting map ", $self->path, "\n";
2234 2246
2235 $self->in_memory (cf::MAP_SWAPPED); 2247 $self->in_memory (cf::MAP_SWAPPED);
2236 2248
2237 # need to save uniques path 2249 # need to save uniques path
2238 unless ($self->{deny_save}) { 2250 unless ($self->{deny_save}) {
… …
2329 : normalise $_ 2341 : normalise $_
2330 } @{ aio_readdir $UNIQUEDIR or [] } 2342 } @{ aio_readdir $UNIQUEDIR or [] }
2331 ] 2343 ]
2332} 2344}
2333 2345
2346=item cf::map::static_maps
2347
2348Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2349file in the shared directory excluding F</styles>). May block.
2350
2351=cut
2352
2353sub static_maps() {
2354 my @dirs = "";
2355 my @maps;
2356
2357 while (@dirs) {
2358 my $dir = shift @dirs;
2359
2360 next if $dir eq "/styles";
2361
2362 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2363 or return;
2364
2365 for (@$files) {
2366 s/\.map$// or next;
2367 utf8::decode $_;
2368 push @maps, "$dir/$_";
2369 }
2370
2371 push @dirs, map "$dir/$_", @$dirs;
2372 }
2373
2374 \@maps
2375}
2376
2334=back 2377=back
2335 2378
2336=head3 cf::object 2379=head3 cf::object
2337 2380
2338=cut 2381=cut
… …
2403 2446
2404our $SAY_CHANNEL = { 2447our $SAY_CHANNEL = {
2405 id => "say", 2448 id => "say",
2406 title => "Map", 2449 title => "Map",
2407 reply => "say ", 2450 reply => "say ",
2408 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2451 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2409}; 2452};
2410 2453
2411our $CHAT_CHANNEL = { 2454our $CHAT_CHANNEL = {
2412 id => "chat", 2455 id => "chat",
2413 title => "Chat", 2456 title => "Chat",
… …
2539 2582
2540 $map->load; 2583 $map->load;
2541 $map->load_neighbours; 2584 $map->load_neighbours;
2542 2585
2543 return unless $self->contr->active; 2586 return unless $self->contr->active;
2544 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2545 $self->activate_recursive;
2546 2587
2547 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2588 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2548 $self->enter_map ($map, $x, $y); 2589 $self->enter_map ($map, $x, $y);
2590
2591 # only activate afterwards, to support waiting in hooks
2592 $self->activate_recursive;
2549} 2593}
2550 2594
2551=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2595=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2552 2596
2553Moves the player to the given map-path and coordinates by first freezing 2597Moves the player to the given map-path and coordinates by first freezing
… …
2752 2796
2753=cut 2797=cut
2754 2798
2755# non-persistent channels (usually the info channel) 2799# non-persistent channels (usually the info channel)
2756our %CHANNEL = ( 2800our %CHANNEL = (
2801 "c/motd" => {
2802 id => "infobox",
2803 title => "MOTD",
2804 reply => undef,
2805 tooltip => "The message of the day",
2806 },
2757 "c/identify" => { 2807 "c/identify" => {
2758 id => "infobox", 2808 id => "infobox",
2759 title => "Identify", 2809 title => "Identify",
2760 reply => undef, 2810 reply => undef,
2761 tooltip => "Items recently identified", 2811 tooltip => "Items recently identified",
… …
2763 "c/examine" => { 2813 "c/examine" => {
2764 id => "infobox", 2814 id => "infobox",
2765 title => "Examine", 2815 title => "Examine",
2766 reply => undef, 2816 reply => undef,
2767 tooltip => "Signs and other items you examined", 2817 tooltip => "Signs and other items you examined",
2818 },
2819 "c/shopinfo" => {
2820 id => "infobox",
2821 title => "Shop Info",
2822 reply => undef,
2823 tooltip => "What your bargaining skill tells you about the shop",
2768 }, 2824 },
2769 "c/book" => { 2825 "c/book" => {
2770 id => "infobox", 2826 id => "infobox",
2771 title => "Book", 2827 title => "Book",
2772 reply => undef, 2828 reply => undef,
… …
2788 id => "infobox", 2844 id => "infobox",
2789 title => "Body Parts", 2845 title => "Body Parts",
2790 reply => undef, 2846 reply => undef,
2791 tooltip => "Shows which body parts you posess and are available", 2847 tooltip => "Shows which body parts you posess and are available",
2792 }, 2848 },
2849 "c/statistics" => {
2850 id => "infobox",
2851 title => "Statistics",
2852 reply => undef,
2853 tooltip => "Shows your primary statistics",
2854 },
2793 "c/skills" => { 2855 "c/skills" => {
2794 id => "infobox", 2856 id => "infobox",
2795 title => "Skills", 2857 title => "Skills",
2796 reply => undef, 2858 reply => undef,
2797 tooltip => "Shows your experience per skill and item power", 2859 tooltip => "Shows your experience per skill and item power",
2860 },
2861 "c/shopitems" => {
2862 id => "infobox",
2863 title => "Shop Items",
2864 reply => undef,
2865 tooltip => "Shows the items currently for sale in this shop",
2866 },
2867 "c/resistances" => {
2868 id => "infobox",
2869 title => "Resistances",
2870 reply => undef,
2871 tooltip => "Shows your resistances",
2872 },
2873 "c/pets" => {
2874 id => "infobox",
2875 title => "Pets",
2876 reply => undef,
2877 tooltip => "Shows information abotu your pets/a specific pet",
2878 },
2879 "c/perceiveself" => {
2880 id => "infobox",
2881 title => "Perceive Self",
2882 reply => undef,
2883 tooltip => "You gained detailed knowledge about yourself",
2798 }, 2884 },
2799 "c/uptime" => { 2885 "c/uptime" => {
2800 id => "infobox", 2886 id => "infobox",
2801 title => "Uptime", 2887 title => "Uptime",
2802 reply => undef, 2888 reply => undef,
… …
2812 id => "party", 2898 id => "party",
2813 title => "Party", 2899 title => "Party",
2814 reply => "gsay ", 2900 reply => "gsay ",
2815 tooltip => "Messages and chat related to your party", 2901 tooltip => "Messages and chat related to your party",
2816 }, 2902 },
2903 "c/death" => {
2904 id => "death",
2905 title => "Death",
2906 reply => undef,
2907 tooltip => "Reason for and more info about your most recent death",
2908 },
2909 "c/say" => $SAY_CHANNEL,
2910 "c/chat" => $CHAT_CHANNEL,
2817); 2911);
2818 2912
2819sub cf::client::send_msg { 2913sub cf::client::send_msg {
2820 my ($self, $channel, $msg, $color, @extra) = @_; 2914 my ($self, $channel, $msg, $color, @extra) = @_;
2821 2915
… …
2826 2920
2827 # check predefined channels, for the benefit of C 2921 # check predefined channels, for the benefit of C
2828 if ($CHANNEL{$channel}) { 2922 if ($CHANNEL{$channel}) {
2829 $channel = $CHANNEL{$channel}; 2923 $channel = $CHANNEL{$channel};
2830 2924
2831 $self->ext_msg (channel_info => $channel) 2925 $self->ext_msg (channel_info => $channel);
2832 if $self->can_msg;
2833
2834 $channel = $channel->{id}; 2926 $channel = $channel->{id};
2835 2927
2836 } elsif (ref $channel) { 2928 } elsif (ref $channel) {
2837 # send meta info to client, if not yet sent 2929 # send meta info to client, if not yet sent
2838 unless (exists $self->{channel}{$channel->{id}}) { 2930 unless (exists $self->{channel}{$channel->{id}}) {
2839 $self->{channel}{$channel->{id}} = $channel; 2931 $self->{channel}{$channel->{id}} = $channel;
2840 $self->ext_msg (channel_info => $channel) 2932 $self->ext_msg (channel_info => $channel);
2841 if $self->can_msg;
2842 } 2933 }
2843 2934
2844 $channel = $channel->{id}; 2935 $channel = $channel->{id};
2845 } 2936 }
2846 2937
2847 return unless @extra || length $msg; 2938 return unless @extra || length $msg;
2848 2939
2849 if ($self->can_msg) {
2850 # default colour, mask it out 2940 # default colour, mask it out
2851 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2941 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2852 if $color & cf::NDI_DEF; 2942 if $color & cf::NDI_DEF;
2853 2943
2854 my $pkt = "msg " 2944 my $pkt = "msg "
2855 . $self->{json_coder}->encode ( 2945 . $self->{json_coder}->encode (
2856 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2946 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2857 ); 2947 );
2858 2948
2859 # try lzf for large packets 2949 # try lzf for large packets
2860 $pkt = "lzf " . Compress::LZF::compress $pkt 2950 $pkt = "lzf " . Compress::LZF::compress $pkt
2861 if 1024 <= length $pkt and $self->{can_lzf}; 2951 if 1024 <= length $pkt and $self->{can_lzf};
2862 2952
2863 # split very large packets 2953 # split very large packets
2864 if (8192 < length $pkt and $self->{can_lzf}) { 2954 if (8192 < length $pkt and $self->{can_lzf}) {
2865 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; 2955 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2866 $pkt = "frag"; 2956 $pkt = "frag";
2867 } 2957 }
2868 2958
2869 $self->send_packet ($pkt); 2959 $self->send_packet ($pkt);
2870 } else {
2871 if ($color >= 0) {
2872 # replace some tags by gcfclient-compatible ones
2873 for ($msg) {
2874 1 while
2875 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2876 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2877 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2878 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2879 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2880 }
2881
2882 $color &= cf::NDI_COLOR_MASK;
2883
2884 utf8::encode $msg;
2885
2886 if (0 && $msg =~ /\[/) {
2887 # COMMAND/INFO
2888 $self->send_packet ("drawextinfo $color 10 8 $msg")
2889 } else {
2890 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2891 $self->send_packet ("drawinfo $color $msg")
2892 }
2893 }
2894 }
2895} 2960}
2896 2961
2897=item $client->ext_msg ($type, @msg) 2962=item $client->ext_msg ($type, @msg)
2898 2963
2899Sends an ext event to the client. 2964Sends an ext event to the client.
… …
3074The following functions and methods are available within a safe environment: 3139The following functions and methods are available within a safe environment:
3075 3140
3076 cf::object 3141 cf::object
3077 contr pay_amount pay_player map x y force_find force_add destroy 3142 contr pay_amount pay_player map x y force_find force_add destroy
3078 insert remove name archname title slaying race decrease split 3143 insert remove name archname title slaying race decrease split
3144 value
3079 3145
3080 cf::object::player 3146 cf::object::player
3081 player 3147 player
3082 3148
3083 cf::player 3149 cf::player
… …
3089=cut 3155=cut
3090 3156
3091for ( 3157for (
3092 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3158 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3093 insert remove inv nrof name archname title slaying race 3159 insert remove inv nrof name archname title slaying race
3094 decrease split destroy change_exp)], 3160 decrease split destroy change_exp value msg lore send_msg)],
3095 ["cf::object::player" => qw(player)], 3161 ["cf::object::player" => qw(player)],
3096 ["cf::player" => qw(peaceful)], 3162 ["cf::player" => qw(peaceful send_msg)],
3097 ["cf::map" => qw(trigger)], 3163 ["cf::map" => qw(trigger)],
3098) { 3164) {
3099 no strict 'refs'; 3165 no strict 'refs';
3100 my ($pkg, @funs) = @$_; 3166 my ($pkg, @funs) = @$_;
3101 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3167 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3118 my ($code, %vars) = @_; 3184 my ($code, %vars) = @_;
3119 3185
3120 my $qcode = $code; 3186 my $qcode = $code;
3121 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3187 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3122 $qcode =~ s/\n/\\n/g; 3188 $qcode =~ s/\n/\\n/g;
3189
3190 %vars = (_dummy => 0) unless %vars;
3123 3191
3124 local $_; 3192 local $_;
3125 local @safe::cf::_safe_eval_args = values %vars; 3193 local @safe::cf::_safe_eval_args = values %vars;
3126 3194
3127 my $eval = 3195 my $eval =
… …
3358 3426
3359 warn "finished reloading resource files\n"; 3427 warn "finished reloading resource files\n";
3360} 3428}
3361 3429
3362sub reload_config { 3430sub reload_config {
3431 warn "reloading config file...\n";
3432
3363 open my $fh, "<:utf8", "$CONFDIR/config" 3433 open my $fh, "<:utf8", "$CONFDIR/config"
3364 or return; 3434 or return;
3365 3435
3366 local $/; 3436 local $/;
3367 *CFG = YAML::Load <$fh>; 3437 *CFG = YAML::XS::Load scalar <$fh>;
3368 3438
3369 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3439 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3370 3440
3371 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3441 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3372 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3442 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3376 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3446 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3377 and die "WARNING: m(un)lockall failed: $!\n"; 3447 and die "WARNING: m(un)lockall failed: $!\n";
3378 }; 3448 };
3379 warn $@ if $@; 3449 warn $@ if $@;
3380 } 3450 }
3451
3452 warn "finished reloading resource files\n";
3381} 3453}
3382 3454
3383sub pidfile() { 3455sub pidfile() {
3384 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3456 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3385 or die "$PIDFILE: $!"; 3457 or die "$PIDFILE: $!";
… …
3397 3469
3398 seek $fh, 0, 0; 3470 seek $fh, 0, 0;
3399 print $fh $$; 3471 print $fh $$;
3400} 3472}
3401 3473
3474sub main_loop {
3475 warn "EV::loop starting\n";
3476 if (1) {
3477 EV::loop;
3478 }
3479 warn "EV::loop returned\n";
3480 goto &main_loop unless $REALLY_UNLOOP;
3481}
3482
3402sub main { 3483sub main {
3403 cf::init_globals; # initialise logging 3484 cf::init_globals; # initialise logging
3404 3485
3405 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3486 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3406 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3487 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
… …
3409 3490
3410 cf::init_experience; 3491 cf::init_experience;
3411 cf::init_anim; 3492 cf::init_anim;
3412 cf::init_attackmess; 3493 cf::init_attackmess;
3413 cf::init_dynamic; 3494 cf::init_dynamic;
3414 cf::init_block;
3415 3495
3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3496 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3417 3497
3418 # we must not ever block the main coroutine 3498 # we must not ever block the main coroutine
3419 local $Coro::idle = sub { 3499 local $Coro::idle = sub {
… …
3445 load_extensions; 3525 load_extensions;
3446 3526
3447 utime time, time, $RUNTIMEFILE; 3527 utime time, time, $RUNTIMEFILE;
3448 3528
3449 # no (long-running) fork's whatsoever before this point(!) 3529 # no (long-running) fork's whatsoever before this point(!)
3530 use POSIX ();
3450 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3531 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3451 3532
3452 (pop @POST_INIT)->(0) while @POST_INIT; 3533 (pop @POST_INIT)->(0) while @POST_INIT;
3453 }; 3534 };
3454 3535
3455 EV::loop; 3536 main_loop;
3456} 3537}
3457 3538
3458############################################################################# 3539#############################################################################
3459# initialisation and cleanup 3540# initialisation and cleanup
3460 3541
… …
3516 my $uuid = "$LOCALDIR/uuid"; 3597 my $uuid = "$LOCALDIR/uuid";
3517 3598
3518 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3599 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3519 or return; 3600 or return;
3520 3601
3521 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3602 my $value = uuid_seq uuid_cur;
3603
3604 unless ($value) {
3605 warn "cowardly refusing to write zero uuid value!\n";
3606 return;
3607 }
3608
3609 my $value = uuid_str $value + $uuid_skip;
3522 $uuid_skip = 0; 3610 $uuid_skip = 0;
3523 3611
3524 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3612 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3525 and return; 3613 and return;
3526 3614
… …
3548} 3636}
3549 3637
3550sub emergency_save() { 3638sub emergency_save() {
3551 my $freeze_guard = cf::freeze_mainloop; 3639 my $freeze_guard = cf::freeze_mainloop;
3552 3640
3553 warn "enter emergency perl save\n"; 3641 warn "emergency_perl_save: enter\n";
3554 3642
3555 cf::sync_job { 3643 cf::sync_job {
3644 # this is a trade-off: we want to be very quick here, so
3645 # save all maps without fsync, and later call a global sync
3646 # (which in turn might be very very slow)
3647 local $USE_FSYNC = 0;
3648
3556 # use a peculiar iteration method to avoid tripping on perl 3649 # use a peculiar iteration method to avoid tripping on perl
3557 # refcount bugs in for. also avoids problems with players 3650 # refcount bugs in for. also avoids problems with players
3558 # and maps saved/destroyed asynchronously. 3651 # and maps saved/destroyed asynchronously.
3559 warn "begin emergency player save\n"; 3652 warn "emergency_perl_save: begin player save\n";
3560 for my $login (keys %cf::PLAYER) { 3653 for my $login (keys %cf::PLAYER) {
3561 my $pl = $cf::PLAYER{$login} or next; 3654 my $pl = $cf::PLAYER{$login} or next;
3562 $pl->valid or next; 3655 $pl->valid or next;
3563 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3656 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3564 $pl->save; 3657 $pl->save;
3565 } 3658 }
3566 warn "end emergency player save\n"; 3659 warn "emergency_perl_save: end player save\n";
3567 3660
3568 warn "begin emergency map save\n"; 3661 warn "emergency_perl_save: begin map save\n";
3569 for my $path (keys %cf::MAP) { 3662 for my $path (keys %cf::MAP) {
3570 my $map = $cf::MAP{$path} or next; 3663 my $map = $cf::MAP{$path} or next;
3571 $map->valid or next; 3664 $map->valid or next;
3572 $map->save; 3665 $map->save;
3573 } 3666 }
3574 warn "end emergency map save\n"; 3667 warn "emergency_perl_save: end map save\n";
3575 3668
3576 warn "begin emergency database checkpoint\n"; 3669 warn "emergency_perl_save: begin database checkpoint\n";
3577 BDB::db_env_txn_checkpoint $DB_ENV; 3670 BDB::db_env_txn_checkpoint $DB_ENV;
3578 warn "end emergency database checkpoint\n"; 3671 warn "emergency_perl_save: end database checkpoint\n";
3579 3672
3580 warn "begin write uuid\n"; 3673 warn "emergency_perl_save: begin write uuid\n";
3581 write_uuid_sync 1; 3674 write_uuid_sync 1;
3582 warn "end write uuid\n"; 3675 warn "emergency_perl_save: end write uuid\n";
3583 }; 3676 };
3584 3677
3678 warn "emergency_perl_save: starting sync()\n";
3679 IO::AIO::aio_sync sub {
3680 warn "emergency_perl_save: finished sync()\n";
3681 };
3682
3585 warn "leave emergency perl save\n"; 3683 warn "emergency_perl_save: leave\n";
3586} 3684}
3587 3685
3588sub post_cleanup { 3686sub post_cleanup {
3589 my ($make_core) = @_; 3687 my ($make_core) = @_;
3590 3688
… …
3627 warn "can only reload from main coroutine"; 3725 warn "can only reload from main coroutine";
3628 return; 3726 return;
3629 } 3727 }
3630 3728
3631 return if $RELOAD++; 3729 return if $RELOAD++;
3730
3731 my $t1 = EV::time;
3632 3732
3633 while ($RELOAD) { 3733 while ($RELOAD) {
3634 warn "reloading..."; 3734 warn "reloading...";
3635 3735
3636 warn "entering sync_job"; 3736 warn "entering sync_job";
… …
3697 clear_package "safe::$_" 3797 clear_package "safe::$_"
3698 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3798 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3699 3799
3700 warn "unloading cf.pm \"a bit\""; 3800 warn "unloading cf.pm \"a bit\"";
3701 delete $INC{"cf.pm"}; 3801 delete $INC{"cf.pm"};
3702 delete $INC{"cf/pod.pm"}; 3802 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3703 3803
3704 # don't, removes xs symbols, too, 3804 # don't, removes xs symbols, too,
3705 # and global variables created in xs 3805 # and global variables created in xs
3706 #clear_package __PACKAGE__; 3806 #clear_package __PACKAGE__;
3707 3807
3708 warn "unload completed, starting to reload now"; 3808 warn "unload completed, starting to reload now";
3709 3809
3710 warn "reloading cf.pm"; 3810 warn "reloading cf.pm";
3711 require cf; 3811 require cf;
3712 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3812 cf::_connect_to_perl_1;
3713 3813
3714 warn "loading config and database again"; 3814 warn "loading config and database again";
3715 cf::reload_config; 3815 cf::reload_config;
3716 3816
3717 warn "loading extensions"; 3817 warn "loading extensions";
3718 cf::load_extensions; 3818 cf::load_extensions;
3719 3819
3820 if ($REATTACH_ON_RELOAD) {
3720 warn "reattaching attachments to objects/players"; 3821 warn "reattaching attachments to objects/players";
3721 _global_reattach; # objects, sockets 3822 _global_reattach; # objects, sockets
3722 warn "reattaching attachments to maps"; 3823 warn "reattaching attachments to maps";
3723 reattach $_ for values %MAP; 3824 reattach $_ for values %MAP;
3724 warn "reattaching attachments to players"; 3825 warn "reattaching attachments to players";
3725 reattach $_ for values %PLAYER; 3826 reattach $_ for values %PLAYER;
3827 }
3726 3828
3727 warn "running post_load"; 3829 warn "running post_init jobs";
3728 (pop @POST_INIT)->(1) while @POST_INIT; 3830 (pop @POST_INIT)->(1) while @POST_INIT;
3729 3831
3730 warn "leaving sync_job"; 3832 warn "leaving sync_job";
3731 3833
3732 1 3834 1
… …
3736 }; 3838 };
3737 3839
3738 warn "reloaded"; 3840 warn "reloaded";
3739 --$RELOAD; 3841 --$RELOAD;
3740 } 3842 }
3843
3844 $t1 = EV::time - $t1;
3845 warn "reload completed in ${t1}s\n";
3741}; 3846};
3742 3847
3743our $RELOAD_WATCHER; # used only during reload 3848our $RELOAD_WATCHER; # used only during reload
3744 3849
3745sub reload_perl() { 3850sub reload_perl() {
3746 # doing reload synchronously and two reloads happen back-to-back, 3851 # doing reload synchronously and two reloads happen back-to-back,
3747 # coro crashes during coro_state_free->destroy here. 3852 # coro crashes during coro_state_free->destroy here.
3748 3853
3854 $RELOAD_WATCHER ||= cf::async {
3855 Coro::AIO::aio_wait cache_extensions;
3856
3749 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 3857 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3750 do_reload_perl; 3858 do_reload_perl;
3751 undef $RELOAD_WATCHER; 3859 undef $RELOAD_WATCHER;
3860 };
3752 }; 3861 };
3753} 3862}
3754 3863
3755register_command "reload" => sub { 3864register_command "reload" => sub {
3756 my ($who, $arg) = @_; 3865 my ($who, $arg) = @_;
… …
3915 LOG llevInfo, "[ABT] [suppressed]\n"; 4024 LOG llevInfo, "[ABT] [suppressed]\n";
3916 } 4025 }
3917} 4026}
3918 4027
3919# load additional modules 4028# load additional modules
3920use cf::pod; 4029require "cf/$_.pm" for @EXTRA_MODULES;
4030cf::_connect_to_perl_2;
3921 4031
3922END { cf::emergency_save } 4032END { cf::emergency_save }
3923 4033
39241 40341
3925 4035

Diff Legend

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