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.455 by root, Sat Sep 27 08:17:40 2008 UTC vs.
Revision 1.498 by elmex, Tue Jan 5 16:16:37 2010 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;
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> 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
2334=back 2378=back
2335 2379
2336=head3 cf::object 2380=head3 cf::object
2337 2381
2338=cut 2382=cut
… …
2403 2447
2404our $SAY_CHANNEL = { 2448our $SAY_CHANNEL = {
2405 id => "say", 2449 id => "say",
2406 title => "Map", 2450 title => "Map",
2407 reply => "say ", 2451 reply => "say ",
2408 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.",
2409}; 2453};
2410 2454
2411our $CHAT_CHANNEL = { 2455our $CHAT_CHANNEL = {
2412 id => "chat", 2456 id => "chat",
2413 title => "Chat", 2457 title => "Chat",
… …
2533 ($x, $y) = (-1, -1) 2577 ($x, $y) = (-1, -1)
2534 unless (defined $x) && (defined $y); 2578 unless (defined $x) && (defined $y);
2535 2579
2536 # use -1 or undef as default coordinates, not 0, 0 2580 # use -1 or undef as default coordinates, not 0, 0
2537 ($x, $y) = ($map->enter_x, $map->enter_y) 2581 ($x, $y) = ($map->enter_x, $map->enter_y)
2538 if $x <=0 && $y <= 0; 2582 if $x <= 0 && $y <= 0;
2539 2583
2540 $map->load; 2584 $map->load;
2541 $map->load_neighbours; 2585 $map->load_neighbours;
2542 2586
2543 return unless $self->contr->active; 2587 return unless $self->contr->active;
2544 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2545 $self->activate_recursive;
2546 2588
2547 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2589 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2548 $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;
2549} 2594}
2550 2595
2551=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2596=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2552 2597
2553Moves 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
… …
2741 2786
2742 utf8::encode $text; 2787 utf8::encode $text;
2743 $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);
2744} 2789}
2745 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
2746=item $client->send_msg ($channel, $msg, $color, [extra...]) 2816=item $client->send_msg ($channel, $msg, $color, [extra...])
2747 2817
2748Send 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
2749client 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
2750the 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
… …
2752 2822
2753=cut 2823=cut
2754 2824
2755# non-persistent channels (usually the info channel) 2825# non-persistent channels (usually the info channel)
2756our %CHANNEL = ( 2826our %CHANNEL = (
2827 "c/motd" => {
2828 id => "infobox",
2829 title => "MOTD",
2830 reply => undef,
2831 tooltip => "The message of the day",
2832 },
2757 "c/identify" => { 2833 "c/identify" => {
2758 id => "infobox", 2834 id => "infobox",
2759 title => "Identify", 2835 title => "Identify",
2760 reply => undef, 2836 reply => undef,
2761 tooltip => "Items recently identified", 2837 tooltip => "Items recently identified",
… …
2763 "c/examine" => { 2839 "c/examine" => {
2764 id => "infobox", 2840 id => "infobox",
2765 title => "Examine", 2841 title => "Examine",
2766 reply => undef, 2842 reply => undef,
2767 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",
2768 }, 2850 },
2769 "c/book" => { 2851 "c/book" => {
2770 id => "infobox", 2852 id => "infobox",
2771 title => "Book", 2853 title => "Book",
2772 reply => undef, 2854 reply => undef,
… …
2788 id => "infobox", 2870 id => "infobox",
2789 title => "Body Parts", 2871 title => "Body Parts",
2790 reply => undef, 2872 reply => undef,
2791 tooltip => "Shows which body parts you posess and are available", 2873 tooltip => "Shows which body parts you posess and are available",
2792 }, 2874 },
2875 "c/statistics" => {
2876 id => "infobox",
2877 title => "Statistics",
2878 reply => undef,
2879 tooltip => "Shows your primary statistics",
2880 },
2793 "c/skills" => { 2881 "c/skills" => {
2794 id => "infobox", 2882 id => "infobox",
2795 title => "Skills", 2883 title => "Skills",
2796 reply => undef, 2884 reply => undef,
2797 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",
2798 }, 2910 },
2799 "c/uptime" => { 2911 "c/uptime" => {
2800 id => "infobox", 2912 id => "infobox",
2801 title => "Uptime", 2913 title => "Uptime",
2802 reply => undef, 2914 reply => undef,
… …
2812 id => "party", 2924 id => "party",
2813 title => "Party", 2925 title => "Party",
2814 reply => "gsay ", 2926 reply => "gsay ",
2815 tooltip => "Messages and chat related to your party", 2927 tooltip => "Messages and chat related to your party",
2816 }, 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,
2817); 2937);
2818 2938
2819sub cf::client::send_msg { 2939sub cf::client::send_msg {
2820 my ($self, $channel, $msg, $color, @extra) = @_; 2940 my ($self, $channel, $msg, $color, @extra) = @_;
2821 2941
… …
2826 2946
2827 # check predefined channels, for the benefit of C 2947 # check predefined channels, for the benefit of C
2828 if ($CHANNEL{$channel}) { 2948 if ($CHANNEL{$channel}) {
2829 $channel = $CHANNEL{$channel}; 2949 $channel = $CHANNEL{$channel};
2830 2950
2831 $self->ext_msg (channel_info => $channel) 2951 $self->ext_msg (channel_info => $channel);
2832 if $self->can_msg;
2833
2834 $channel = $channel->{id}; 2952 $channel = $channel->{id};
2835 2953
2836 } elsif (ref $channel) { 2954 } elsif (ref $channel) {
2837 # send meta info to client, if not yet sent 2955 # send meta info to client, if not yet sent
2838 unless (exists $self->{channel}{$channel->{id}}) { 2956 unless (exists $self->{channel}{$channel->{id}}) {
2839 $self->{channel}{$channel->{id}} = $channel; 2957 $self->{channel}{$channel->{id}} = $channel;
2840 $self->ext_msg (channel_info => $channel) 2958 $self->ext_msg (channel_info => $channel);
2841 if $self->can_msg;
2842 } 2959 }
2843 2960
2844 $channel = $channel->{id}; 2961 $channel = $channel->{id};
2845 } 2962 }
2846 2963
2847 return unless @extra || length $msg; 2964 return unless @extra || length $msg;
2848 2965
2849 if ($self->can_msg) {
2850 # default colour, mask it out 2966 # default colour, mask it out
2851 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2967 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2852 if $color & cf::NDI_DEF; 2968 if $color & cf::NDI_DEF;
2853 2969
2854 my $pkt = "msg " 2970 my $pkt = "msg "
2855 . $self->{json_coder}->encode ( 2971 . $self->{json_coder}->encode (
2856 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2972 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2857 ); 2973 );
2858 2974
2859 # try lzf for large packets
2860 $pkt = "lzf " . Compress::LZF::compress $pkt
2861 if 1024 <= length $pkt and $self->{can_lzf};
2862
2863 # split very large packets
2864 if (8192 < length $pkt and $self->{can_lzf}) {
2865 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2866 $pkt = "frag";
2867 }
2868
2869 $self->send_packet ($pkt); 2975 $self->send_big_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} 2976}
2896 2977
2897=item $client->ext_msg ($type, @msg) 2978=item $client->ext_msg ($type, @msg)
2898 2979
2899Sends an ext event to the client. 2980Sends an ext event to the client.
… …
2902 2983
2903sub cf::client::ext_msg($$@) { 2984sub cf::client::ext_msg($$@) {
2904 my ($self, $type, @msg) = @_; 2985 my ($self, $type, @msg) = @_;
2905 2986
2906 if ($self->extcmd == 2) { 2987 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2988 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2908 } elsif ($self->extcmd == 1) { # TODO: remove 2989 } elsif ($self->extcmd == 1) { # TODO: remove
2909 push @msg, msgtype => "event_$type"; 2990 push @msg, msgtype => "event_$type";
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2991 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 } 2992 }
2912} 2993}
2913 2994
2914=item $client->ext_reply ($msgid, @msg) 2995=item $client->ext_reply ($msgid, @msg)
2915 2996
… …
2919 3000
2920sub cf::client::ext_reply($$@) { 3001sub cf::client::ext_reply($$@) {
2921 my ($self, $id, @msg) = @_; 3002 my ($self, $id, @msg) = @_;
2922 3003
2923 if ($self->extcmd == 2) { 3004 if ($self->extcmd == 2) {
2924 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3005 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2925 } elsif ($self->extcmd == 1) { 3006 } elsif ($self->extcmd == 1) {
2926 #TODO: version 1, remove 3007 #TODO: version 1, remove
2927 unshift @msg, msgtype => "reply", msgid => $id; 3008 unshift @msg, msgtype => "reply", msgid => $id;
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3009 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2929 } 3010 }
2930} 3011}
2931 3012
2932=item $success = $client->query ($flags, "text", \&cb) 3013=item $success = $client->query ($flags, "text", \&cb)
2933 3014
… …
3060our $safe_hole = new Safe::Hole; 3141our $safe_hole = new Safe::Hole;
3061 3142
3062$SIG{FPE} = 'IGNORE'; 3143$SIG{FPE} = 'IGNORE';
3063 3144
3064$safe->permit_only (Opcode::opset qw( 3145$safe->permit_only (Opcode::opset qw(
3065 :base_core :base_mem :base_orig :base_math 3146 :base_core :base_mem :base_orig :base_math :base_loop
3066 grepstart grepwhile mapstart mapwhile 3147 grepstart grepwhile mapstart mapwhile
3067 sort time 3148 sort time
3068)); 3149));
3069 3150
3070# here we export the classes and methods available to script code 3151# here we export the classes and methods available to script code
… …
3074The following functions and methods are available within a safe environment: 3155The following functions and methods are available within a safe environment:
3075 3156
3076 cf::object 3157 cf::object
3077 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
3078 insert remove name archname title slaying race decrease split 3159 insert remove name archname title slaying race decrease split
3160 value
3079 3161
3080 cf::object::player 3162 cf::object::player
3081 player 3163 player
3082 3164
3083 cf::player 3165 cf::player
… …
3089=cut 3171=cut
3090 3172
3091for ( 3173for (
3092 ["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
3093 insert remove inv nrof name archname title slaying race 3175 insert remove inv nrof name archname title slaying race
3094 decrease split destroy change_exp)], 3176 decrease split destroy change_exp value msg lore send_msg)],
3095 ["cf::object::player" => qw(player)], 3177 ["cf::object::player" => qw(player)],
3096 ["cf::player" => qw(peaceful)], 3178 ["cf::player" => qw(peaceful send_msg)],
3097 ["cf::map" => qw(trigger)], 3179 ["cf::map" => qw(trigger)],
3098) { 3180) {
3099 no strict 'refs'; 3181 no strict 'refs';
3100 my ($pkg, @funs) = @$_; 3182 my ($pkg, @funs) = @$_;
3101 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3183 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3118 my ($code, %vars) = @_; 3200 my ($code, %vars) = @_;
3119 3201
3120 my $qcode = $code; 3202 my $qcode = $code;
3121 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3203 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3122 $qcode =~ s/\n/\\n/g; 3204 $qcode =~ s/\n/\\n/g;
3205
3206 %vars = (_dummy => 0) unless %vars;
3123 3207
3124 local $_; 3208 local $_;
3125 local @safe::cf::_safe_eval_args = values %vars; 3209 local @safe::cf::_safe_eval_args = values %vars;
3126 3210
3127 my $eval = 3211 my $eval =
… …
3207 while (my ($face, $info) = each %$faces) { 3291 while (my ($face, $info) = each %$faces) {
3208 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3292 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3209 3293
3210 cf::face::set_visibility $idx, $info->{visibility}; 3294 cf::face::set_visibility $idx, $info->{visibility};
3211 cf::face::set_magicmap $idx, $info->{magicmap}; 3295 cf::face::set_magicmap $idx, $info->{magicmap};
3212 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3296 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3213 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3297 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3214 3298
3215 cf::cede_to_tick; 3299 cf::cede_to_tick;
3216 } 3300 }
3217 3301
3218 while (my ($face, $info) = each %$faces) { 3302 while (my ($face, $info) = each %$faces) {
… …
3242 3326
3243 cf::anim::invalidate_all; # d'oh 3327 cf::anim::invalidate_all; # d'oh
3244 } 3328 }
3245 3329
3246 { 3330 {
3247 # TODO: for gcfclient pleasure, we should give resources
3248 # that gcfclient doesn't grok a >10000 face index.
3249 my $res = $facedata->{resource}; 3331 my $res = $facedata->{resource};
3250 3332
3251 while (my ($name, $info) = each %$res) { 3333 while (my ($name, $info) = each %$res) {
3252 if (defined $info->{type}) { 3334 if (defined $info->{type}) {
3253 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3335 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3254 my $data;
3255 3336
3256 if ($info->{type} & 1) { 3337 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3257 # prepend meta info
3258
3259 my $meta = $enc->encode ({
3260 name => $name,
3261 %{ $info->{meta} || {} },
3262 });
3263
3264 $data = pack "(w/a*)*", $meta, $info->{data};
3265 } else {
3266 $data = $info->{data};
3267 }
3268
3269 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3270 cf::face::set_type $idx, $info->{type}; 3338 cf::face::set_type $idx, $info->{type};
3271 } else { 3339 } else {
3272 $RESOURCE{$name} = $info; 3340 $RESOURCE{$name} = $info;
3273 } 3341 }
3274 3342
… …
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 {
… …
3425 }; 3505 };
3426 3506
3427 evthread_start IO::AIO::poll_fileno; 3507 evthread_start IO::AIO::poll_fileno;
3428 3508
3429 cf::sync_job { 3509 cf::sync_job {
3510 cf::load_settings;
3511 cf::load_materials;
3512
3430 reload_resources; 3513 reload_resources;
3431 reload_config; 3514 reload_config;
3432 db_init; 3515 db_init;
3433 3516
3434 cf::load_settings;
3435 cf::load_materials;
3436 cf::init_uuid; 3517 cf::init_uuid;
3437 cf::init_signals; 3518 cf::init_signals;
3438 cf::init_commands; 3519 cf::init_commands;
3439 cf::init_skills; 3520 cf::init_skills;
3440 3521
… …
3445 load_extensions; 3526 load_extensions;
3446 3527
3447 utime time, time, $RUNTIMEFILE; 3528 utime time, time, $RUNTIMEFILE;
3448 3529
3449 # no (long-running) fork's whatsoever before this point(!) 3530 # no (long-running) fork's whatsoever before this point(!)
3531 use POSIX ();
3450 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};
3451 3533
3452 (pop @POST_INIT)->(0) while @POST_INIT; 3534 (pop @POST_INIT)->(0) while @POST_INIT;
3453 }; 3535 };
3454 3536
3455 EV::loop; 3537 main_loop;
3456} 3538}
3457 3539
3458############################################################################# 3540#############################################################################
3459# initialisation and cleanup 3541# initialisation and cleanup
3460 3542
… …
3555} 3637}
3556 3638
3557sub emergency_save() { 3639sub emergency_save() {
3558 my $freeze_guard = cf::freeze_mainloop; 3640 my $freeze_guard = cf::freeze_mainloop;
3559 3641
3560 warn "enter emergency perl save\n"; 3642 warn "emergency_perl_save: enter\n";
3561 3643
3562 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
3563 # use a peculiar iteration method to avoid tripping on perl 3650 # use a peculiar iteration method to avoid tripping on perl
3564 # refcount bugs in for. also avoids problems with players 3651 # refcount bugs in for. also avoids problems with players
3565 # and maps saved/destroyed asynchronously. 3652 # and maps saved/destroyed asynchronously.
3566 warn "begin emergency player save\n"; 3653 warn "emergency_perl_save: begin player save\n";
3567 for my $login (keys %cf::PLAYER) { 3654 for my $login (keys %cf::PLAYER) {
3568 my $pl = $cf::PLAYER{$login} or next; 3655 my $pl = $cf::PLAYER{$login} or next;
3569 $pl->valid or next; 3656 $pl->valid or next;
3570 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3657 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3571 $pl->save; 3658 $pl->save;
3572 } 3659 }
3573 warn "end emergency player save\n"; 3660 warn "emergency_perl_save: end player save\n";
3574 3661
3575 warn "begin emergency map save\n"; 3662 warn "emergency_perl_save: begin map save\n";
3576 for my $path (keys %cf::MAP) { 3663 for my $path (keys %cf::MAP) {
3577 my $map = $cf::MAP{$path} or next; 3664 my $map = $cf::MAP{$path} or next;
3578 $map->valid or next; 3665 $map->valid or next;
3579 $map->save; 3666 $map->save;
3580 } 3667 }
3581 warn "end emergency map save\n"; 3668 warn "emergency_perl_save: end map save\n";
3582 3669
3583 warn "begin emergency database checkpoint\n"; 3670 warn "emergency_perl_save: begin database checkpoint\n";
3584 BDB::db_env_txn_checkpoint $DB_ENV; 3671 BDB::db_env_txn_checkpoint $DB_ENV;
3585 warn "end emergency database checkpoint\n"; 3672 warn "emergency_perl_save: end database checkpoint\n";
3586 3673
3587 warn "begin write uuid\n"; 3674 warn "emergency_perl_save: begin write uuid\n";
3588 write_uuid_sync 1; 3675 write_uuid_sync 1;
3589 warn "end write uuid\n"; 3676 warn "emergency_perl_save: end write uuid\n";
3590 }; 3677 };
3591 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
3592 warn "leave emergency perl save\n"; 3684 warn "emergency_perl_save: leave\n";
3593} 3685}
3594 3686
3595sub post_cleanup { 3687sub post_cleanup {
3596 my ($make_core) = @_; 3688 my ($make_core) = @_;
3597 3689
… …
3634 warn "can only reload from main coroutine"; 3726 warn "can only reload from main coroutine";
3635 return; 3727 return;
3636 } 3728 }
3637 3729
3638 return if $RELOAD++; 3730 return if $RELOAD++;
3731
3732 my $t1 = EV::time;
3639 3733
3640 while ($RELOAD) { 3734 while ($RELOAD) {
3641 warn "reloading..."; 3735 warn "reloading...";
3642 3736
3643 warn "entering sync_job"; 3737 warn "entering sync_job";
… …
3704 clear_package "safe::$_" 3798 clear_package "safe::$_"
3705 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);
3706 3800
3707 warn "unloading cf.pm \"a bit\""; 3801 warn "unloading cf.pm \"a bit\"";
3708 delete $INC{"cf.pm"}; 3802 delete $INC{"cf.pm"};
3709 delete $INC{"cf/pod.pm"}; 3803 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3710 3804
3711 # don't, removes xs symbols, too, 3805 # don't, removes xs symbols, too,
3712 # and global variables created in xs 3806 # and global variables created in xs
3713 #clear_package __PACKAGE__; 3807 #clear_package __PACKAGE__;
3714 3808
3715 warn "unload completed, starting to reload now"; 3809 warn "unload completed, starting to reload now";
3716 3810
3717 warn "reloading cf.pm"; 3811 warn "reloading cf.pm";
3718 require cf; 3812 require cf;
3719 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3813 cf::_connect_to_perl_1;
3720 3814
3721 warn "loading config and database again"; 3815 warn "loading config and database again";
3722 cf::reload_config; 3816 cf::reload_config;
3723 3817
3724 warn "loading extensions"; 3818 warn "loading extensions";
3725 cf::load_extensions; 3819 cf::load_extensions;
3726 3820
3821 if ($REATTACH_ON_RELOAD) {
3727 warn "reattaching attachments to objects/players"; 3822 warn "reattaching attachments to objects/players";
3728 _global_reattach; # objects, sockets 3823 _global_reattach; # objects, sockets
3729 warn "reattaching attachments to maps"; 3824 warn "reattaching attachments to maps";
3730 reattach $_ for values %MAP; 3825 reattach $_ for values %MAP;
3731 warn "reattaching attachments to players"; 3826 warn "reattaching attachments to players";
3732 reattach $_ for values %PLAYER; 3827 reattach $_ for values %PLAYER;
3828 }
3733 3829
3734 warn "running post_load"; 3830 warn "running post_init jobs";
3735 (pop @POST_INIT)->(1) while @POST_INIT; 3831 (pop @POST_INIT)->(1) while @POST_INIT;
3736 3832
3737 warn "leaving sync_job"; 3833 warn "leaving sync_job";
3738 3834
3739 1 3835 1
… …
3743 }; 3839 };
3744 3840
3745 warn "reloaded"; 3841 warn "reloaded";
3746 --$RELOAD; 3842 --$RELOAD;
3747 } 3843 }
3844
3845 $t1 = EV::time - $t1;
3846 warn "reload completed in ${t1}s\n";
3748}; 3847};
3749 3848
3750our $RELOAD_WATCHER; # used only during reload 3849our $RELOAD_WATCHER; # used only during reload
3751 3850
3752sub reload_perl() { 3851sub reload_perl() {
3753 # doing reload synchronously and two reloads happen back-to-back, 3852 # doing reload synchronously and two reloads happen back-to-back,
3754 # coro crashes during coro_state_free->destroy here. 3853 # coro crashes during coro_state_free->destroy here.
3755 3854
3855 $RELOAD_WATCHER ||= cf::async {
3856 Coro::AIO::aio_wait cache_extensions;
3857
3756 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 3858 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3757 do_reload_perl; 3859 do_reload_perl;
3758 undef $RELOAD_WATCHER; 3860 undef $RELOAD_WATCHER;
3861 };
3759 }; 3862 };
3760} 3863}
3761 3864
3762register_command "reload" => sub { 3865register_command "reload" => sub {
3763 my ($who, $arg) = @_; 3866 my ($who, $arg) = @_;
… …
3777 3880
3778our @WAIT_FOR_TICK; 3881our @WAIT_FOR_TICK;
3779our @WAIT_FOR_TICK_BEGIN; 3882our @WAIT_FOR_TICK_BEGIN;
3780 3883
3781sub wait_for_tick { 3884sub wait_for_tick {
3782 return if tick_inhibit || $Coro::current == $Coro::main; 3885 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3783 3886
3784 my $signal = new Coro::Signal; 3887 my $signal = new Coro::Signal;
3785 push @WAIT_FOR_TICK, $signal; 3888 push @WAIT_FOR_TICK, $signal;
3786 $signal->wait; 3889 $signal->wait;
3787} 3890}
3788 3891
3789sub wait_for_tick_begin { 3892sub wait_for_tick_begin {
3790 return if tick_inhibit || $Coro::current == $Coro::main; 3893 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3791 3894
3792 my $signal = new Coro::Signal; 3895 my $signal = new Coro::Signal;
3793 push @WAIT_FOR_TICK_BEGIN, $signal; 3896 push @WAIT_FOR_TICK_BEGIN, $signal;
3794 $signal->wait; 3897 $signal->wait;
3795} 3898}
… …
3922 LOG llevInfo, "[ABT] [suppressed]\n"; 4025 LOG llevInfo, "[ABT] [suppressed]\n";
3923 } 4026 }
3924} 4027}
3925 4028
3926# load additional modules 4029# load additional modules
3927use cf::pod; 4030require "cf/$_.pm" for @EXTRA_MODULES;
4031cf::_connect_to_perl_2;
3928 4032
3929END { cf::emergency_save } 4033END { cf::emergency_save }
3930 4034
39311 40351
3932 4036

Diff Legend

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