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.456 by root, Tue Sep 30 04:00:35 2008 UTC vs.
Revision 1.496 by root, Sun Nov 15 18:03:59 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 ();
50 54
51use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
52use BDB (); 56use BDB ();
53use Data::Dumper; 57use Data::Dumper;
54use 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';
… …
260)) { 289)) {
261 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
262} 291}
263 292
264$EV::DIED = sub { 293$EV::DIED = sub {
265 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
266}; 295};
267 296
268############################################################################# 297#############################################################################
269 298
270=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
… …
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;
1192 1200
1193 $filename =~ s%/[^/]+$%%; 1201 $filename =~ s%/[^/]+$%%;
1194 aio_pathsync $filename; 1202 aio_pathsync $filename if $cf::USE_FSYNC;
1195 } else { 1203 } else {
1196 warn "FATAL: $filename~: $!\n"; 1204 warn "unable to save objects: $filename~: $!\n";
1197 } 1205 }
1198 } else { 1206 } else {
1199 aio_unlink $filename; 1207 aio_unlink $filename;
1200 aio_unlink "$filename.pst"; 1208 aio_unlink "$filename.pst";
1201 } 1209 }
… …
1292 my ($name, $cb) = @_; 1300 my ($name, $cb) = @_;
1293 1301
1294 $EXTICMD{$name} = $cb; 1302 $EXTICMD{$name} = $cb;
1295} 1303}
1296 1304
1305use File::Glob ();
1306
1297cf::player->attach ( 1307cf::player->attach (
1298 on_command => sub { 1308 on_command => sub {
1299 my ($pl, $name, $params) = @_; 1309 my ($pl, $name, $params) = @_;
1300 1310
1301 my $cb = $COMMAND{$name} 1311 my $cb = $COMMAND{$name}
… …
1332 } 1342 }
1333 1343
1334 cf::override; 1344 cf::override;
1335 }, 1345 },
1336); 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}
1337 1360
1338sub load_extensions { 1361sub load_extensions {
1339 cf::sync_job { 1362 cf::sync_job {
1340 my %todo; 1363 my %todo;
1341 1364
… …
1870 1893
1871 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1894 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1872 "$UNIQUEDIR/$path" 1895 "$UNIQUEDIR/$path"
1873} 1896}
1874 1897
1875# and all this just because we cannot iterate over
1876# all maps in C++...
1877sub change_all_map_light {
1878 my ($change) = @_;
1879
1880 $_->change_map_light ($change)
1881 for grep $_->outdoor, values %cf::MAP;
1882}
1883
1884sub decay_objects { 1898sub decay_objects {
1885 my ($self) = @_; 1899 my ($self) = @_;
1886 1900
1887 return if $self->{deny_reset}; 1901 return if $self->{deny_reset};
1888 1902
… …
1970sub find { 1984sub find {
1971 my ($path, $origin) = @_; 1985 my ($path, $origin) = @_;
1972 1986
1973 $path = normalise $path, $origin && $origin->path; 1987 $path = normalise $path, $origin && $origin->path;
1974 1988
1975 cf::lock_wait "map_data:$path";#d#remove 1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1976 cf::lock_wait "map_find:$path"; 1990 my $guard2 = cf::lock_acquire "map_find:$path";
1977 1991
1978 $cf::MAP{$path} || do { 1992 $cf::MAP{$path} || do {
1979 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1980 my $guard2 = cf::lock_acquire "map_find:$path";
1981
1982 my $map = new_from_path cf::map $path 1993 my $map = new_from_path cf::map $path
1983 or return; 1994 or return;
1984 1995
1985 $map->{last_save} = $cf::RUNTIME; 1996 $map->{last_save} = $cf::RUNTIME;
1986 1997
… …
2054 unless ($self->{deny_activate}) { 2065 unless ($self->{deny_activate}) {
2055 $self->decay_objects; 2066 $self->decay_objects;
2056 $self->fix_auto_apply; 2067 $self->fix_auto_apply;
2057 $self->update_buttons; 2068 $self->update_buttons;
2058 cf::cede_to_tick; 2069 cf::cede_to_tick;
2059 $self->set_darkness_map;
2060 cf::cede_to_tick;
2061 $self->activate; 2070 $self->activate;
2062 } 2071 }
2063 2072
2064 $self->{last_save} = $cf::RUNTIME; 2073 $self->{last_save} = $cf::RUNTIME;
2065 $self->last_access ($cf::RUNTIME); 2074 $self->last_access ($cf::RUNTIME);
… …
2231 2240
2232 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2233 2242
2234 return if $self->players; 2243 return if $self->players;
2235 2244
2236 warn "resetting map ", $self->path; 2245 warn "resetting map ", $self->path, "\n";
2237 2246
2238 $self->in_memory (cf::MAP_SWAPPED); 2247 $self->in_memory (cf::MAP_SWAPPED);
2239 2248
2240 # need to save uniques path 2249 # need to save uniques path
2241 unless ($self->{deny_save}) { 2250 unless ($self->{deny_save}) {
… …
2332 : normalise $_ 2341 : normalise $_
2333 } @{ aio_readdir $UNIQUEDIR or [] } 2342 } @{ aio_readdir $UNIQUEDIR or [] }
2334 ] 2343 ]
2335} 2344}
2336 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> and F</editor>). May
2350block.
2351
2352=cut
2353
2354sub static_maps() {
2355 my @dirs = "";
2356 my @maps;
2357
2358 while (@dirs) {
2359 my $dir = shift @dirs;
2360
2361 next if $dir eq "/styles" || $dir eq "/editor";
2362
2363 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2364 or return;
2365
2366 for (@$files) {
2367 s/\.map$// or next;
2368 utf8::decode $_;
2369 push @maps, "$dir/$_";
2370 }
2371
2372 push @dirs, map "$dir/$_", @$dirs;
2373 }
2374
2375 \@maps
2376}
2377
2337=back 2378=back
2338 2379
2339=head3 cf::object 2380=head3 cf::object
2340 2381
2341=cut 2382=cut
… …
2406 2447
2407our $SAY_CHANNEL = { 2448our $SAY_CHANNEL = {
2408 id => "say", 2449 id => "say",
2409 title => "Map", 2450 title => "Map",
2410 reply => "say ", 2451 reply => "say ",
2411 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2452 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2412}; 2453};
2413 2454
2414our $CHAT_CHANNEL = { 2455our $CHAT_CHANNEL = {
2415 id => "chat", 2456 id => "chat",
2416 title => "Chat", 2457 title => "Chat",
… …
2536 ($x, $y) = (-1, -1) 2577 ($x, $y) = (-1, -1)
2537 unless (defined $x) && (defined $y); 2578 unless (defined $x) && (defined $y);
2538 2579
2539 # use -1 or undef as default coordinates, not 0, 0 2580 # use -1 or undef as default coordinates, not 0, 0
2540 ($x, $y) = ($map->enter_x, $map->enter_y) 2581 ($x, $y) = ($map->enter_x, $map->enter_y)
2541 if $x <=0 && $y <= 0; 2582 if $x <= 0 && $y <= 0;
2542 2583
2543 $map->load; 2584 $map->load;
2544 $map->load_neighbours; 2585 $map->load_neighbours;
2545 2586
2546 return unless $self->contr->active; 2587 return unless $self->contr->active;
2547 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2548 $self->activate_recursive;
2549 2588
2550 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2589 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2551 $self->enter_map ($map, $x, $y); 2590 $self->enter_map ($map, $x, $y);
2591
2592 # only activate afterwards, to support waiting in hooks
2593 $self->activate_recursive;
2552} 2594}
2553 2595
2554=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2596=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2555 2597
2556Moves the player to the given map-path and coordinates by first freezing 2598Moves the player to the given map-path and coordinates by first freezing
… …
2744 2786
2745 utf8::encode $text; 2787 utf8::encode $text;
2746 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2788 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2747} 2789}
2748 2790
2791=item $client->send_big_packet ($pkt)
2792
2793Like C<send_packet>, but tries to compress large packets, and fragments
2794them as required.
2795
2796=cut
2797
2798our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2799
2800sub cf::client::send_big_packet {
2801 my ($self, $pkt) = @_;
2802
2803 # try lzf for large packets
2804 $pkt = "lzf " . Compress::LZF::compress $pkt
2805 if 1024 <= length $pkt and $self->{can_lzf};
2806
2807 # split very large packets
2808 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2809 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2810 $pkt = "frag";
2811 }
2812
2813 $self->send_packet ($pkt);
2814}
2815
2749=item $client->send_msg ($channel, $msg, $color, [extra...]) 2816=item $client->send_msg ($channel, $msg, $color, [extra...])
2750 2817
2751Send a drawinfo or msg packet to the client, formatting the msg for the 2818Send a drawinfo or msg packet to the client, formatting the msg for the
2752client if neccessary. C<$type> should be a string identifying the type of 2819client if neccessary. C<$type> should be a string identifying the type of
2753the message, with C<log> being the default. If C<$color> is negative, suppress 2820the message, with C<log> being the default. If C<$color> is negative, suppress
… …
2755 2822
2756=cut 2823=cut
2757 2824
2758# non-persistent channels (usually the info channel) 2825# non-persistent channels (usually the info channel)
2759our %CHANNEL = ( 2826our %CHANNEL = (
2827 "c/motd" => {
2828 id => "infobox",
2829 title => "MOTD",
2830 reply => undef,
2831 tooltip => "The message of the day",
2832 },
2760 "c/identify" => { 2833 "c/identify" => {
2761 id => "infobox", 2834 id => "infobox",
2762 title => "Identify", 2835 title => "Identify",
2763 reply => undef, 2836 reply => undef,
2764 tooltip => "Items recently identified", 2837 tooltip => "Items recently identified",
… …
2766 "c/examine" => { 2839 "c/examine" => {
2767 id => "infobox", 2840 id => "infobox",
2768 title => "Examine", 2841 title => "Examine",
2769 reply => undef, 2842 reply => undef,
2770 tooltip => "Signs and other items you examined", 2843 tooltip => "Signs and other items you examined",
2844 },
2845 "c/shopinfo" => {
2846 id => "infobox",
2847 title => "Shop Info",
2848 reply => undef,
2849 tooltip => "What your bargaining skill tells you about the shop",
2771 }, 2850 },
2772 "c/book" => { 2851 "c/book" => {
2773 id => "infobox", 2852 id => "infobox",
2774 title => "Book", 2853 title => "Book",
2775 reply => undef, 2854 reply => undef,
… …
2791 id => "infobox", 2870 id => "infobox",
2792 title => "Body Parts", 2871 title => "Body Parts",
2793 reply => undef, 2872 reply => undef,
2794 tooltip => "Shows which body parts you posess and are available", 2873 tooltip => "Shows which body parts you posess and are available",
2795 }, 2874 },
2875 "c/statistics" => {
2876 id => "infobox",
2877 title => "Statistics",
2878 reply => undef,
2879 tooltip => "Shows your primary statistics",
2880 },
2796 "c/skills" => { 2881 "c/skills" => {
2797 id => "infobox", 2882 id => "infobox",
2798 title => "Skills", 2883 title => "Skills",
2799 reply => undef, 2884 reply => undef,
2800 tooltip => "Shows your experience per skill and item power", 2885 tooltip => "Shows your experience per skill and item power",
2886 },
2887 "c/shopitems" => {
2888 id => "infobox",
2889 title => "Shop Items",
2890 reply => undef,
2891 tooltip => "Shows the items currently for sale in this shop",
2892 },
2893 "c/resistances" => {
2894 id => "infobox",
2895 title => "Resistances",
2896 reply => undef,
2897 tooltip => "Shows your resistances",
2898 },
2899 "c/pets" => {
2900 id => "infobox",
2901 title => "Pets",
2902 reply => undef,
2903 tooltip => "Shows information abotu your pets/a specific pet",
2904 },
2905 "c/perceiveself" => {
2906 id => "infobox",
2907 title => "Perceive Self",
2908 reply => undef,
2909 tooltip => "You gained detailed knowledge about yourself",
2801 }, 2910 },
2802 "c/uptime" => { 2911 "c/uptime" => {
2803 id => "infobox", 2912 id => "infobox",
2804 title => "Uptime", 2913 title => "Uptime",
2805 reply => undef, 2914 reply => undef,
… …
2815 id => "party", 2924 id => "party",
2816 title => "Party", 2925 title => "Party",
2817 reply => "gsay ", 2926 reply => "gsay ",
2818 tooltip => "Messages and chat related to your party", 2927 tooltip => "Messages and chat related to your party",
2819 }, 2928 },
2929 "c/death" => {
2930 id => "death",
2931 title => "Death",
2932 reply => undef,
2933 tooltip => "Reason for and more info about your most recent death",
2934 },
2935 "c/say" => $SAY_CHANNEL,
2936 "c/chat" => $CHAT_CHANNEL,
2820); 2937);
2821 2938
2822sub cf::client::send_msg { 2939sub cf::client::send_msg {
2823 my ($self, $channel, $msg, $color, @extra) = @_; 2940 my ($self, $channel, $msg, $color, @extra) = @_;
2824 2941
… …
2829 2946
2830 # check predefined channels, for the benefit of C 2947 # check predefined channels, for the benefit of C
2831 if ($CHANNEL{$channel}) { 2948 if ($CHANNEL{$channel}) {
2832 $channel = $CHANNEL{$channel}; 2949 $channel = $CHANNEL{$channel};
2833 2950
2834 $self->ext_msg (channel_info => $channel) 2951 $self->ext_msg (channel_info => $channel);
2835 if $self->can_msg;
2836
2837 $channel = $channel->{id}; 2952 $channel = $channel->{id};
2838 2953
2839 } elsif (ref $channel) { 2954 } elsif (ref $channel) {
2840 # send meta info to client, if not yet sent 2955 # send meta info to client, if not yet sent
2841 unless (exists $self->{channel}{$channel->{id}}) { 2956 unless (exists $self->{channel}{$channel->{id}}) {
2842 $self->{channel}{$channel->{id}} = $channel; 2957 $self->{channel}{$channel->{id}} = $channel;
2843 $self->ext_msg (channel_info => $channel) 2958 $self->ext_msg (channel_info => $channel);
2844 if $self->can_msg;
2845 } 2959 }
2846 2960
2847 $channel = $channel->{id}; 2961 $channel = $channel->{id};
2848 } 2962 }
2849 2963
2850 return unless @extra || length $msg; 2964 return unless @extra || length $msg;
2851 2965
2852 if ($self->can_msg) {
2853 # default colour, mask it out 2966 # default colour, mask it out
2854 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2967 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2855 if $color & cf::NDI_DEF; 2968 if $color & cf::NDI_DEF;
2856 2969
2857 my $pkt = "msg " 2970 my $pkt = "msg "
2858 . $self->{json_coder}->encode ( 2971 . $self->{json_coder}->encode (
2859 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2972 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2860 ); 2973 );
2861 2974
2862 # try lzf for large packets
2863 $pkt = "lzf " . Compress::LZF::compress $pkt
2864 if 1024 <= length $pkt and $self->{can_lzf};
2865
2866 # split very large packets
2867 if (8192 < length $pkt and $self->{can_lzf}) {
2868 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2869 $pkt = "frag";
2870 }
2871
2872 $self->send_packet ($pkt); 2975 $self->send_big_packet ($pkt);
2873 } else {
2874 if ($color >= 0) {
2875 # replace some tags by gcfclient-compatible ones
2876 for ($msg) {
2877 1 while
2878 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2879 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2880 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2881 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2882 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2883 }
2884
2885 $color &= cf::NDI_COLOR_MASK;
2886
2887 utf8::encode $msg;
2888
2889 if (0 && $msg =~ /\[/) {
2890 # COMMAND/INFO
2891 $self->send_packet ("drawextinfo $color 10 8 $msg")
2892 } else {
2893 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2894 $self->send_packet ("drawinfo $color $msg")
2895 }
2896 }
2897 }
2898} 2976}
2899 2977
2900=item $client->ext_msg ($type, @msg) 2978=item $client->ext_msg ($type, @msg)
2901 2979
2902Sends an ext event to the client. 2980Sends an ext event to the client.
… …
2905 2983
2906sub cf::client::ext_msg($$@) { 2984sub cf::client::ext_msg($$@) {
2907 my ($self, $type, @msg) = @_; 2985 my ($self, $type, @msg) = @_;
2908 2986
2909 if ($self->extcmd == 2) { 2987 if ($self->extcmd == 2) {
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2988 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2911 } elsif ($self->extcmd == 1) { # TODO: remove 2989 } elsif ($self->extcmd == 1) { # TODO: remove
2912 push @msg, msgtype => "event_$type"; 2990 push @msg, msgtype => "event_$type";
2913 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2991 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2914 } 2992 }
2915} 2993}
2916 2994
2917=item $client->ext_reply ($msgid, @msg) 2995=item $client->ext_reply ($msgid, @msg)
2918 2996
… …
2922 3000
2923sub cf::client::ext_reply($$@) { 3001sub cf::client::ext_reply($$@) {
2924 my ($self, $id, @msg) = @_; 3002 my ($self, $id, @msg) = @_;
2925 3003
2926 if ($self->extcmd == 2) { 3004 if ($self->extcmd == 2) {
2927 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3005 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2928 } elsif ($self->extcmd == 1) { 3006 } elsif ($self->extcmd == 1) {
2929 #TODO: version 1, remove 3007 #TODO: version 1, remove
2930 unshift @msg, msgtype => "reply", msgid => $id; 3008 unshift @msg, msgtype => "reply", msgid => $id;
2931 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3009 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2932 } 3010 }
2933} 3011}
2934 3012
2935=item $success = $client->query ($flags, "text", \&cb) 3013=item $success = $client->query ($flags, "text", \&cb)
2936 3014
… …
3077The following functions and methods are available within a safe environment: 3155The following functions and methods are available within a safe environment:
3078 3156
3079 cf::object 3157 cf::object
3080 contr pay_amount pay_player map x y force_find force_add destroy 3158 contr pay_amount pay_player map x y force_find force_add destroy
3081 insert remove name archname title slaying race decrease split 3159 insert remove name archname title slaying race decrease split
3160 value
3082 3161
3083 cf::object::player 3162 cf::object::player
3084 player 3163 player
3085 3164
3086 cf::player 3165 cf::player
… …
3092=cut 3171=cut
3093 3172
3094for ( 3173for (
3095 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3174 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3096 insert remove inv nrof name archname title slaying race 3175 insert remove inv nrof name archname title slaying race
3097 decrease split destroy change_exp)], 3176 decrease split destroy change_exp value msg lore send_msg)],
3098 ["cf::object::player" => qw(player)], 3177 ["cf::object::player" => qw(player)],
3099 ["cf::player" => qw(peaceful)], 3178 ["cf::player" => qw(peaceful send_msg)],
3100 ["cf::map" => qw(trigger)], 3179 ["cf::map" => qw(trigger)],
3101) { 3180) {
3102 no strict 'refs'; 3181 no strict 'refs';
3103 my ($pkg, @funs) = @$_; 3182 my ($pkg, @funs) = @$_;
3104 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3183 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3121 my ($code, %vars) = @_; 3200 my ($code, %vars) = @_;
3122 3201
3123 my $qcode = $code; 3202 my $qcode = $code;
3124 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3203 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3125 $qcode =~ s/\n/\\n/g; 3204 $qcode =~ s/\n/\\n/g;
3205
3206 %vars = (_dummy => 0) unless %vars;
3126 3207
3127 local $_; 3208 local $_;
3128 local @safe::cf::_safe_eval_args = values %vars; 3209 local @safe::cf::_safe_eval_args = values %vars;
3129 3210
3130 my $eval = 3211 my $eval =
… …
3210 while (my ($face, $info) = each %$faces) { 3291 while (my ($face, $info) = each %$faces) {
3211 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3292 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3212 3293
3213 cf::face::set_visibility $idx, $info->{visibility}; 3294 cf::face::set_visibility $idx, $info->{visibility};
3214 cf::face::set_magicmap $idx, $info->{magicmap}; 3295 cf::face::set_magicmap $idx, $info->{magicmap};
3215 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3296 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3216 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3297 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3217 3298
3218 cf::cede_to_tick; 3299 cf::cede_to_tick;
3219 } 3300 }
3220 3301
3221 while (my ($face, $info) = each %$faces) { 3302 while (my ($face, $info) = each %$faces) {
… …
3245 3326
3246 cf::anim::invalidate_all; # d'oh 3327 cf::anim::invalidate_all; # d'oh
3247 } 3328 }
3248 3329
3249 { 3330 {
3250 # TODO: for gcfclient pleasure, we should give resources
3251 # that gcfclient doesn't grok a >10000 face index.
3252 my $res = $facedata->{resource}; 3331 my $res = $facedata->{resource};
3253 3332
3254 while (my ($name, $info) = each %$res) { 3333 while (my ($name, $info) = each %$res) {
3255 if (defined $info->{type}) { 3334 if (defined $info->{type}) {
3256 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3335 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3257 my $data;
3258 3336
3259 if ($info->{type} & 1) { 3337 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3260 # prepend meta info
3261
3262 my $meta = $enc->encode ({
3263 name => $name,
3264 %{ $info->{meta} || {} },
3265 });
3266
3267 $data = pack "(w/a*)*", $meta, $info->{data};
3268 } else {
3269 $data = $info->{data};
3270 }
3271
3272 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3273 cf::face::set_type $idx, $info->{type}; 3338 cf::face::set_type $idx, $info->{type};
3274 } else { 3339 } else {
3275 $RESOURCE{$name} = $info; 3340 $RESOURCE{$name} = $info;
3276 } 3341 }
3277 3342
… …
3361 3426
3362 warn "finished reloading resource files\n"; 3427 warn "finished reloading resource files\n";
3363} 3428}
3364 3429
3365sub reload_config { 3430sub reload_config {
3431 warn "reloading config file...\n";
3432
3366 open my $fh, "<:utf8", "$CONFDIR/config" 3433 open my $fh, "<:utf8", "$CONFDIR/config"
3367 or return; 3434 or return;
3368 3435
3369 local $/; 3436 local $/;
3370 *CFG = YAML::Load <$fh>; 3437 *CFG = YAML::XS::Load scalar <$fh>;
3371 3438
3372 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3439 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3373 3440
3374 $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};
3375 $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};
… …
3379 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3446 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3380 and die "WARNING: m(un)lockall failed: $!\n"; 3447 and die "WARNING: m(un)lockall failed: $!\n";
3381 }; 3448 };
3382 warn $@ if $@; 3449 warn $@ if $@;
3383 } 3450 }
3451
3452 warn "finished reloading resource files\n";
3384} 3453}
3385 3454
3386sub pidfile() { 3455sub pidfile() {
3387 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3456 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3388 or die "$PIDFILE: $!"; 3457 or die "$PIDFILE: $!";
… …
3400 3469
3401 seek $fh, 0, 0; 3470 seek $fh, 0, 0;
3402 print $fh $$; 3471 print $fh $$;
3403} 3472}
3404 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
3405sub main { 3483sub main {
3406 cf::init_globals; # initialise logging 3484 cf::init_globals; # initialise logging
3407 3485
3408 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3486 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3409 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.";
… …
3412 3490
3413 cf::init_experience; 3491 cf::init_experience;
3414 cf::init_anim; 3492 cf::init_anim;
3415 cf::init_attackmess; 3493 cf::init_attackmess;
3416 cf::init_dynamic; 3494 cf::init_dynamic;
3417 cf::init_block;
3418 3495
3419 $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
3420 3497
3421 # we must not ever block the main coroutine 3498 # we must not ever block the main coroutine
3422 local $Coro::idle = sub { 3499 local $Coro::idle = sub {
… …
3428 }; 3505 };
3429 3506
3430 evthread_start IO::AIO::poll_fileno; 3507 evthread_start IO::AIO::poll_fileno;
3431 3508
3432 cf::sync_job { 3509 cf::sync_job {
3510 cf::load_settings;
3511 cf::load_materials;
3512
3433 reload_resources; 3513 reload_resources;
3434 reload_config; 3514 reload_config;
3435 db_init; 3515 db_init;
3436 3516
3437 cf::load_settings;
3438 cf::load_materials;
3439 cf::init_uuid; 3517 cf::init_uuid;
3440 cf::init_signals; 3518 cf::init_signals;
3441 cf::init_commands; 3519 cf::init_commands;
3442 cf::init_skills; 3520 cf::init_skills;
3443 3521
… …
3448 load_extensions; 3526 load_extensions;
3449 3527
3450 utime time, time, $RUNTIMEFILE; 3528 utime time, time, $RUNTIMEFILE;
3451 3529
3452 # no (long-running) fork's whatsoever before this point(!) 3530 # no (long-running) fork's whatsoever before this point(!)
3531 use POSIX ();
3453 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3532 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3454 3533
3455 (pop @POST_INIT)->(0) while @POST_INIT; 3534 (pop @POST_INIT)->(0) while @POST_INIT;
3456 }; 3535 };
3457 3536
3458 EV::loop; 3537 main_loop;
3459} 3538}
3460 3539
3461############################################################################# 3540#############################################################################
3462# initialisation and cleanup 3541# initialisation and cleanup
3463 3542
… …
3558} 3637}
3559 3638
3560sub emergency_save() { 3639sub emergency_save() {
3561 my $freeze_guard = cf::freeze_mainloop; 3640 my $freeze_guard = cf::freeze_mainloop;
3562 3641
3563 warn "enter emergency perl save\n"; 3642 warn "emergency_perl_save: enter\n";
3564 3643
3565 cf::sync_job { 3644 cf::sync_job {
3645 # this is a trade-off: we want to be very quick here, so
3646 # save all maps without fsync, and later call a global sync
3647 # (which in turn might be very very slow)
3648 local $USE_FSYNC = 0;
3649
3566 # use a peculiar iteration method to avoid tripping on perl 3650 # use a peculiar iteration method to avoid tripping on perl
3567 # refcount bugs in for. also avoids problems with players 3651 # refcount bugs in for. also avoids problems with players
3568 # and maps saved/destroyed asynchronously. 3652 # and maps saved/destroyed asynchronously.
3569 warn "begin emergency player save\n"; 3653 warn "emergency_perl_save: begin player save\n";
3570 for my $login (keys %cf::PLAYER) { 3654 for my $login (keys %cf::PLAYER) {
3571 my $pl = $cf::PLAYER{$login} or next; 3655 my $pl = $cf::PLAYER{$login} or next;
3572 $pl->valid or next; 3656 $pl->valid or next;
3573 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3657 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3574 $pl->save; 3658 $pl->save;
3575 } 3659 }
3576 warn "end emergency player save\n"; 3660 warn "emergency_perl_save: end player save\n";
3577 3661
3578 warn "begin emergency map save\n"; 3662 warn "emergency_perl_save: begin map save\n";
3579 for my $path (keys %cf::MAP) { 3663 for my $path (keys %cf::MAP) {
3580 my $map = $cf::MAP{$path} or next; 3664 my $map = $cf::MAP{$path} or next;
3581 $map->valid or next; 3665 $map->valid or next;
3582 $map->save; 3666 $map->save;
3583 } 3667 }
3584 warn "end emergency map save\n"; 3668 warn "emergency_perl_save: end map save\n";
3585 3669
3586 warn "begin emergency database checkpoint\n"; 3670 warn "emergency_perl_save: begin database checkpoint\n";
3587 BDB::db_env_txn_checkpoint $DB_ENV; 3671 BDB::db_env_txn_checkpoint $DB_ENV;
3588 warn "end emergency database checkpoint\n"; 3672 warn "emergency_perl_save: end database checkpoint\n";
3589 3673
3590 warn "begin write uuid\n"; 3674 warn "emergency_perl_save: begin write uuid\n";
3591 write_uuid_sync 1; 3675 write_uuid_sync 1;
3592 warn "end write uuid\n"; 3676 warn "emergency_perl_save: end write uuid\n";
3593 }; 3677 };
3594 3678
3679 warn "emergency_perl_save: starting sync()\n";
3680 IO::AIO::aio_sync sub {
3681 warn "emergency_perl_save: finished sync()\n";
3682 };
3683
3595 warn "leave emergency perl save\n"; 3684 warn "emergency_perl_save: leave\n";
3596} 3685}
3597 3686
3598sub post_cleanup { 3687sub post_cleanup {
3599 my ($make_core) = @_; 3688 my ($make_core) = @_;
3600 3689
… …
3637 warn "can only reload from main coroutine"; 3726 warn "can only reload from main coroutine";
3638 return; 3727 return;
3639 } 3728 }
3640 3729
3641 return if $RELOAD++; 3730 return if $RELOAD++;
3731
3732 my $t1 = EV::time;
3642 3733
3643 while ($RELOAD) { 3734 while ($RELOAD) {
3644 warn "reloading..."; 3735 warn "reloading...";
3645 3736
3646 warn "entering sync_job"; 3737 warn "entering sync_job";
… …
3707 clear_package "safe::$_" 3798 clear_package "safe::$_"
3708 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3799 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3709 3800
3710 warn "unloading cf.pm \"a bit\""; 3801 warn "unloading cf.pm \"a bit\"";
3711 delete $INC{"cf.pm"}; 3802 delete $INC{"cf.pm"};
3712 delete $INC{"cf/pod.pm"}; 3803 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3713 3804
3714 # don't, removes xs symbols, too, 3805 # don't, removes xs symbols, too,
3715 # and global variables created in xs 3806 # and global variables created in xs
3716 #clear_package __PACKAGE__; 3807 #clear_package __PACKAGE__;
3717 3808
3718 warn "unload completed, starting to reload now"; 3809 warn "unload completed, starting to reload now";
3719 3810
3720 warn "reloading cf.pm"; 3811 warn "reloading cf.pm";
3721 require cf; 3812 require cf;
3722 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3813 cf::_connect_to_perl_1;
3723 3814
3724 warn "loading config and database again"; 3815 warn "loading config and database again";
3725 cf::reload_config; 3816 cf::reload_config;
3726 3817
3727 warn "loading extensions"; 3818 warn "loading extensions";
3728 cf::load_extensions; 3819 cf::load_extensions;
3729 3820
3821 if ($REATTACH_ON_RELOAD) {
3730 warn "reattaching attachments to objects/players"; 3822 warn "reattaching attachments to objects/players";
3731 _global_reattach; # objects, sockets 3823 _global_reattach; # objects, sockets
3732 warn "reattaching attachments to maps"; 3824 warn "reattaching attachments to maps";
3733 reattach $_ for values %MAP; 3825 reattach $_ for values %MAP;
3734 warn "reattaching attachments to players"; 3826 warn "reattaching attachments to players";
3735 reattach $_ for values %PLAYER; 3827 reattach $_ for values %PLAYER;
3828 }
3736 3829
3737 warn "running post_load"; 3830 warn "running post_init jobs";
3738 (pop @POST_INIT)->(1) while @POST_INIT; 3831 (pop @POST_INIT)->(1) while @POST_INIT;
3739 3832
3740 warn "leaving sync_job"; 3833 warn "leaving sync_job";
3741 3834
3742 1 3835 1
… …
3746 }; 3839 };
3747 3840
3748 warn "reloaded"; 3841 warn "reloaded";
3749 --$RELOAD; 3842 --$RELOAD;
3750 } 3843 }
3844
3845 $t1 = EV::time - $t1;
3846 warn "reload completed in ${t1}s\n";
3751}; 3847};
3752 3848
3753our $RELOAD_WATCHER; # used only during reload 3849our $RELOAD_WATCHER; # used only during reload
3754 3850
3755sub reload_perl() { 3851sub reload_perl() {
3756 # doing reload synchronously and two reloads happen back-to-back, 3852 # doing reload synchronously and two reloads happen back-to-back,
3757 # coro crashes during coro_state_free->destroy here. 3853 # coro crashes during coro_state_free->destroy here.
3758 3854
3855 $RELOAD_WATCHER ||= cf::async {
3856 Coro::AIO::aio_wait cache_extensions;
3857
3759 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 3858 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3760 do_reload_perl; 3859 do_reload_perl;
3761 undef $RELOAD_WATCHER; 3860 undef $RELOAD_WATCHER;
3861 };
3762 }; 3862 };
3763} 3863}
3764 3864
3765register_command "reload" => sub { 3865register_command "reload" => sub {
3766 my ($who, $arg) = @_; 3866 my ($who, $arg) = @_;
… …
3925 LOG llevInfo, "[ABT] [suppressed]\n"; 4025 LOG llevInfo, "[ABT] [suppressed]\n";
3926 } 4026 }
3927} 4027}
3928 4028
3929# load additional modules 4029# load additional modules
3930use cf::pod; 4030require "cf/$_.pm" for @EXTRA_MODULES;
4031cf::_connect_to_perl_2;
3931 4032
3932END { cf::emergency_save } 4033END { cf::emergency_save }
3933 4034
39341 40351
3935 4036

Diff Legend

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