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.488 by root, Wed Oct 21 00:44:39 2009 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use 5.10.0;
25use utf8; 26use utf8;
26use strict "vars", "subs"; 27use strict qw(vars subs);
27 28
28use Symbol; 29use Symbol;
29use List::Util; 30use List::Util;
30use Socket; 31use Socket;
31use EV; 32use EV;
32use Opcode; 33use Opcode;
33use Safe; 34use Safe;
34use Safe::Hole; 35use Safe::Hole;
35use Storable (); 36use Storable ();
36 37
38use Guard ();
37use Coro (); 39use Coro ();
38use Coro::State; 40use Coro::State;
39use Coro::Handle; 41use Coro::Handle;
40use Coro::EV; 42use Coro::EV;
41use Coro::AnyEvent; 43use Coro::AnyEvent;
42use Coro::Timer; 44use Coro::Timer;
43use Coro::Signal; 45use Coro::Signal;
44use Coro::Semaphore; 46use Coro::Semaphore;
47use Coro::SemaphoreSet;
45use Coro::AnyEvent; 48use Coro::AnyEvent;
46use Coro::AIO; 49use Coro::AIO;
47use Coro::BDB 1.6; 50use Coro::BDB 1.6;
48use Coro::Storable; 51use Coro::Storable;
49use Coro::Util (); 52use Coro::Util ();
… …
51use JSON::XS 2.01 (); 54use JSON::XS 2.01 ();
52use BDB (); 55use BDB ();
53use Data::Dumper; 56use Data::Dumper;
54use Digest::MD5; 57use Digest::MD5;
55use Fcntl; 58use Fcntl;
56use YAML (); 59use YAML::XS ();
57use IO::AIO (); 60use IO::AIO ();
58use Time::HiRes; 61use Time::HiRes;
59use Compress::LZF; 62use Compress::LZF;
60use Digest::MD5 (); 63use Digest::MD5 ();
61 64
… …
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70 73
71# make sure c-lzf reinitialises itself 74# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
73Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
77
78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
74 80
75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
76 82
77our %COMMAND = (); 83our %COMMAND = ();
78our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
… …
83our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
84our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
85 91
86our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
87our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
88 96
89our $CONFDIR = confdir; 97our $CONFDIR = confdir;
90our $DATADIR = datadir; 98our $DATADIR = datadir;
91our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
92our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
… …
103our %RESOURCE; 111our %RESOURCE;
104 112
105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107our $NEXT_TICK; 115our $NEXT_TICK;
108our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
109 117
110our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
112our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
113our $DB_ENV; 121our $DB_ENV;
114 122
123our @EXTRA_MODULES = qw(pod match mapscript);
124
115our %CFG; 125our %CFG;
116 126
117our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
118our $RUNTIME; 128our $RUNTIME;
119our $NOW; 129our $NOW;
… …
129our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter 140our $JITTER; # average jitter
131our $TICK_START; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
132 142
133our @POST_INIT; 143our @POST_INIT;
144
145our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146our $REALLY_UNLOOP; # never set to true, please :)
134 147
135binmode STDOUT; 148binmode STDOUT;
136binmode STDERR; 149binmode STDERR;
137 150
138# read virtual server time, if available 151# read virtual server time, if available
… …
140 open my $fh, "<", $RUNTIMEFILE 153 open my $fh, "<", $RUNTIMEFILE
141 or die "unable to read $RUNTIMEFILE file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
142 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
143} 156}
144 157
158eval "sub TICK() { $TICK } 1" or die;
159
145mkdir $_ 160mkdir $_
146 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
147 162
148our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
149 164
150sub cf::map::normalise; 165sub cf::map::normalise;
166
167#############################################################################
168
169%REFLECT = ();
170for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_;
172 $REFLECT{$reflect->{class}} = $reflect;
173}
174
175# this is decidedly evil
176$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
151 177
152############################################################################# 178#############################################################################
153 179
154=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
155 181
… …
202returns directly I<after> the tick processing (and consequently, can only wake one process 228returns directly I<after> the tick processing (and consequently, can only wake one process
203per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 229per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
204 230
205=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
206 232
207This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
208C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
209that call. 235that call.
210 236
237=item %cf::REFLECT
238
239Contains, for each (C++) class name, a hash reference with information
240about object members (methods, scalars, arrays and flags) and other
241metadata, which is useful for introspection.
242
211=back 243=back
212 244
213=cut 245=cut
214 246
215BEGIN { 247$Coro::State::WARNHOOK = sub {
216 *CORE::GLOBAL::warn = sub {
217 my $msg = join "", @_; 248 my $msg = join "", @_;
218 249
219 $msg .= "\n" 250 $msg .= "\n"
220 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
221 252
222 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
223 254
224 LOG llevError, $msg; 255 LOG llevError, $msg;
225 }; 256};
226}
227 257
228$Coro::State::DIEHOOK = sub { 258$Coro::State::DIEHOOK = sub {
229 return unless $^S eq 0; # "eq", not "==" 259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
230 262
231 if ($Coro::current == $Coro::main) {#d# 263 if ($Coro::current == $Coro::main) {#d#
232 warn "DIEHOOK called in main context, Coro bug?\n";#d# 264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
233 return;#d# 265 return;#d#
234 }#d# 266 }#d#
235 267
236 # kill coroutine otherwise 268 # kill coroutine otherwise
237 warn Carp::longmess $_[0];
238 Coro::terminate 269 Coro::terminate
239}; 270};
240
241$SIG{__DIE__} = sub { }; #d#?
242 271
243@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
244@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
245@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
246@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
328Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
329 358
330=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
331 360
332Wait until the given lock is available and then acquires it and returns 361Wait until the given lock is available and then acquires it and returns
333a Coro::guard object. If the guard object gets destroyed (goes out of scope, 362a L<Guard> object. If the guard object gets destroyed (goes out of scope,
334for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
335returned. 364returned.
336 365
337Locks are *not* recursive, locking from the same coro twice results in a 366Locks are *not* recursive, locking from the same coro twice results in a
338deadlocked coro. 367deadlocked coro.
… …
344 373
345Return true if the lock is currently active, i.e. somebody has locked it. 374Return true if the lock is currently active, i.e. somebody has locked it.
346 375
347=cut 376=cut
348 377
349our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
350our %LOCKER;#d#
351 379
352sub lock_wait($) { 380sub lock_wait($) {
353 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
354
355 if ($LOCKER{$key} == $Coro::current) {#d#
356 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
357 return;#d#
358 }#d#
359
360 # wait for lock, if any
361 while ($LOCK{$key}) {
362 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
363 push @{ $LOCK{$key} }, $Coro::current;
364 Coro::schedule;
365 }
366} 382}
367 383
368sub lock_acquire($) { 384sub lock_acquire($) {
369 my ($key) = @_; 385 $LOCKS->guard ($_[0])
370
371 # wait, to be sure we are not locked
372 lock_wait $key;
373
374 $LOCK{$key} = [];
375 $LOCKER{$key} = $Coro::current;#d#
376
377 Coro::guard {
378 delete $LOCKER{$key};#d#
379 # wake up all waiters, to be on the safe side
380 $_->ready for @{ delete $LOCK{$key} };
381 }
382} 386}
383 387
384sub lock_active($) { 388sub lock_active($) {
385 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
386
387 ! ! $LOCK{$key}
388} 390}
389 391
390sub freeze_mainloop { 392sub freeze_mainloop {
391 tick_inhibit_inc; 393 tick_inhibit_inc;
392 394
393 Coro::guard \&tick_inhibit_dec; 395 &Guard::guard (\&tick_inhibit_dec);
394} 396}
395 397
396=item cf::periodic $interval, $cb 398=item cf::periodic $interval, $cb
397 399
398Like EV::periodic, but randomly selects a starting point so that the actions 400Like EV::periodic, but randomly selects a starting point so that the actions
… …
1170 $decname, length $$rdata, scalar @$objs; 1172 $decname, length $$rdata, scalar @$objs;
1171 1173
1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1173 aio_chmod $fh, SAVE_MODE; 1175 aio_chmod $fh, SAVE_MODE;
1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1175 aio_fsync $fh if $cf::USE_FSYNC; 1177 if ($cf::USE_FSYNC) {
1178 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1179 aio_fsync $fh;
1180 }
1176 aio_close $fh; 1181 aio_close $fh;
1177 1182
1178 if (@$objs) { 1183 if (@$objs) {
1179 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1184 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1180 aio_chmod $fh, SAVE_MODE; 1185 aio_chmod $fh, SAVE_MODE;
1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1186 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1182 aio_write $fh, 0, (length $data), $data, 0; 1187 aio_write $fh, 0, (length $data), $data, 0;
1183 aio_fsync $fh if $cf::USE_FSYNC; 1188 if ($cf::USE_FSYNC) {
1189 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1190 aio_fsync $fh;
1191 }
1184 aio_close $fh; 1192 aio_close $fh;
1185 aio_rename "$filename.pst~", "$filename.pst"; 1193 aio_rename "$filename.pst~", "$filename.pst";
1186 } 1194 }
1187 } else { 1195 } else {
1188 aio_unlink "$filename.pst"; 1196 aio_unlink "$filename.pst";
1189 } 1197 }
1190 1198
1191 aio_rename "$filename~", $filename; 1199 aio_rename "$filename~", $filename;
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}) {
… …
2406 2415
2407our $SAY_CHANNEL = { 2416our $SAY_CHANNEL = {
2408 id => "say", 2417 id => "say",
2409 title => "Map", 2418 title => "Map",
2410 reply => "say ", 2419 reply => "say ",
2411 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2420 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2412}; 2421};
2413 2422
2414our $CHAT_CHANNEL = { 2423our $CHAT_CHANNEL = {
2415 id => "chat", 2424 id => "chat",
2416 title => "Chat", 2425 title => "Chat",
… …
2542 2551
2543 $map->load; 2552 $map->load;
2544 $map->load_neighbours; 2553 $map->load_neighbours;
2545 2554
2546 return unless $self->contr->active; 2555 return unless $self->contr->active;
2547 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2548 $self->activate_recursive;
2549 2556
2550 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2557 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2551 $self->enter_map ($map, $x, $y); 2558 $self->enter_map ($map, $x, $y);
2559
2560 # only activate afterwards, to support waiting in hooks
2561 $self->activate_recursive;
2552} 2562}
2553 2563
2554=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2564=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2555 2565
2556Moves the player to the given map-path and coordinates by first freezing 2566Moves the player to the given map-path and coordinates by first freezing
… …
2755 2765
2756=cut 2766=cut
2757 2767
2758# non-persistent channels (usually the info channel) 2768# non-persistent channels (usually the info channel)
2759our %CHANNEL = ( 2769our %CHANNEL = (
2770 "c/motd" => {
2771 id => "infobox",
2772 title => "MOTD",
2773 reply => undef,
2774 tooltip => "The message of the day",
2775 },
2760 "c/identify" => { 2776 "c/identify" => {
2761 id => "infobox", 2777 id => "infobox",
2762 title => "Identify", 2778 title => "Identify",
2763 reply => undef, 2779 reply => undef,
2764 tooltip => "Items recently identified", 2780 tooltip => "Items recently identified",
… …
2766 "c/examine" => { 2782 "c/examine" => {
2767 id => "infobox", 2783 id => "infobox",
2768 title => "Examine", 2784 title => "Examine",
2769 reply => undef, 2785 reply => undef,
2770 tooltip => "Signs and other items you examined", 2786 tooltip => "Signs and other items you examined",
2787 },
2788 "c/shopinfo" => {
2789 id => "infobox",
2790 title => "Shop Info",
2791 reply => undef,
2792 tooltip => "What your bargaining skill tells you about the shop",
2771 }, 2793 },
2772 "c/book" => { 2794 "c/book" => {
2773 id => "infobox", 2795 id => "infobox",
2774 title => "Book", 2796 title => "Book",
2775 reply => undef, 2797 reply => undef,
… …
2791 id => "infobox", 2813 id => "infobox",
2792 title => "Body Parts", 2814 title => "Body Parts",
2793 reply => undef, 2815 reply => undef,
2794 tooltip => "Shows which body parts you posess and are available", 2816 tooltip => "Shows which body parts you posess and are available",
2795 }, 2817 },
2818 "c/statistics" => {
2819 id => "infobox",
2820 title => "Statistics",
2821 reply => undef,
2822 tooltip => "Shows your primary statistics",
2823 },
2796 "c/skills" => { 2824 "c/skills" => {
2797 id => "infobox", 2825 id => "infobox",
2798 title => "Skills", 2826 title => "Skills",
2799 reply => undef, 2827 reply => undef,
2800 tooltip => "Shows your experience per skill and item power", 2828 tooltip => "Shows your experience per skill and item power",
2829 },
2830 "c/shopitems" => {
2831 id => "infobox",
2832 title => "Shop Items",
2833 reply => undef,
2834 tooltip => "Shows the items currently for sale in this shop",
2835 },
2836 "c/resistances" => {
2837 id => "infobox",
2838 title => "Resistances",
2839 reply => undef,
2840 tooltip => "Shows your resistances",
2841 },
2842 "c/pets" => {
2843 id => "infobox",
2844 title => "Pets",
2845 reply => undef,
2846 tooltip => "Shows information abotu your pets/a specific pet",
2847 },
2848 "c/perceiveself" => {
2849 id => "infobox",
2850 title => "Perceive Self",
2851 reply => undef,
2852 tooltip => "You gained detailed knowledge about yourself",
2801 }, 2853 },
2802 "c/uptime" => { 2854 "c/uptime" => {
2803 id => "infobox", 2855 id => "infobox",
2804 title => "Uptime", 2856 title => "Uptime",
2805 reply => undef, 2857 reply => undef,
… …
2815 id => "party", 2867 id => "party",
2816 title => "Party", 2868 title => "Party",
2817 reply => "gsay ", 2869 reply => "gsay ",
2818 tooltip => "Messages and chat related to your party", 2870 tooltip => "Messages and chat related to your party",
2819 }, 2871 },
2872 "c/death" => {
2873 id => "death",
2874 title => "Death",
2875 reply => undef,
2876 tooltip => "Reason for and more info about your most recent death",
2877 },
2878 "c/say" => $SAY_CHANNEL,
2879 "c/chat" => $CHAT_CHANNEL,
2820); 2880);
2821 2881
2822sub cf::client::send_msg { 2882sub cf::client::send_msg {
2823 my ($self, $channel, $msg, $color, @extra) = @_; 2883 my ($self, $channel, $msg, $color, @extra) = @_;
2824 2884
… …
2829 2889
2830 # check predefined channels, for the benefit of C 2890 # check predefined channels, for the benefit of C
2831 if ($CHANNEL{$channel}) { 2891 if ($CHANNEL{$channel}) {
2832 $channel = $CHANNEL{$channel}; 2892 $channel = $CHANNEL{$channel};
2833 2893
2834 $self->ext_msg (channel_info => $channel) 2894 $self->ext_msg (channel_info => $channel);
2835 if $self->can_msg;
2836
2837 $channel = $channel->{id}; 2895 $channel = $channel->{id};
2838 2896
2839 } elsif (ref $channel) { 2897 } elsif (ref $channel) {
2840 # send meta info to client, if not yet sent 2898 # send meta info to client, if not yet sent
2841 unless (exists $self->{channel}{$channel->{id}}) { 2899 unless (exists $self->{channel}{$channel->{id}}) {
2842 $self->{channel}{$channel->{id}} = $channel; 2900 $self->{channel}{$channel->{id}} = $channel;
2843 $self->ext_msg (channel_info => $channel) 2901 $self->ext_msg (channel_info => $channel);
2844 if $self->can_msg;
2845 } 2902 }
2846 2903
2847 $channel = $channel->{id}; 2904 $channel = $channel->{id};
2848 } 2905 }
2849 2906
2850 return unless @extra || length $msg; 2907 return unless @extra || length $msg;
2851 2908
2852 if ($self->can_msg) {
2853 # default colour, mask it out 2909 # default colour, mask it out
2854 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2910 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2855 if $color & cf::NDI_DEF; 2911 if $color & cf::NDI_DEF;
2856 2912
2857 my $pkt = "msg " 2913 my $pkt = "msg "
2858 . $self->{json_coder}->encode ( 2914 . $self->{json_coder}->encode (
2859 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2915 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2860 ); 2916 );
2861 2917
2862 # try lzf for large packets 2918 # try lzf for large packets
2863 $pkt = "lzf " . Compress::LZF::compress $pkt 2919 $pkt = "lzf " . Compress::LZF::compress $pkt
2864 if 1024 <= length $pkt and $self->{can_lzf}; 2920 if 1024 <= length $pkt and $self->{can_lzf};
2865 2921
2866 # split very large packets 2922 # split very large packets
2867 if (8192 < length $pkt and $self->{can_lzf}) { 2923 if (8192 < length $pkt and $self->{can_lzf}) {
2868 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; 2924 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2869 $pkt = "frag"; 2925 $pkt = "frag";
2870 } 2926 }
2871 2927
2872 $self->send_packet ($pkt); 2928 $self->send_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} 2929}
2899 2930
2900=item $client->ext_msg ($type, @msg) 2931=item $client->ext_msg ($type, @msg)
2901 2932
2902Sends an ext event to the client. 2933Sends an ext event to the client.
… …
3077The following functions and methods are available within a safe environment: 3108The following functions and methods are available within a safe environment:
3078 3109
3079 cf::object 3110 cf::object
3080 contr pay_amount pay_player map x y force_find force_add destroy 3111 contr pay_amount pay_player map x y force_find force_add destroy
3081 insert remove name archname title slaying race decrease split 3112 insert remove name archname title slaying race decrease split
3113 value
3082 3114
3083 cf::object::player 3115 cf::object::player
3084 player 3116 player
3085 3117
3086 cf::player 3118 cf::player
… …
3092=cut 3124=cut
3093 3125
3094for ( 3126for (
3095 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3127 ["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 3128 insert remove inv nrof name archname title slaying race
3097 decrease split destroy change_exp)], 3129 decrease split destroy change_exp value msg lore send_msg)],
3098 ["cf::object::player" => qw(player)], 3130 ["cf::object::player" => qw(player)],
3099 ["cf::player" => qw(peaceful)], 3131 ["cf::player" => qw(peaceful send_msg)],
3100 ["cf::map" => qw(trigger)], 3132 ["cf::map" => qw(trigger)],
3101) { 3133) {
3102 no strict 'refs'; 3134 no strict 'refs';
3103 my ($pkg, @funs) = @$_; 3135 my ($pkg, @funs) = @$_;
3104 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3136 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3121 my ($code, %vars) = @_; 3153 my ($code, %vars) = @_;
3122 3154
3123 my $qcode = $code; 3155 my $qcode = $code;
3124 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3156 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3125 $qcode =~ s/\n/\\n/g; 3157 $qcode =~ s/\n/\\n/g;
3158
3159 %vars = (_dummy => 0) unless %vars;
3126 3160
3127 local $_; 3161 local $_;
3128 local @safe::cf::_safe_eval_args = values %vars; 3162 local @safe::cf::_safe_eval_args = values %vars;
3129 3163
3130 my $eval = 3164 my $eval =
… …
3361 3395
3362 warn "finished reloading resource files\n"; 3396 warn "finished reloading resource files\n";
3363} 3397}
3364 3398
3365sub reload_config { 3399sub reload_config {
3400 warn "reloading config file...\n";
3401
3366 open my $fh, "<:utf8", "$CONFDIR/config" 3402 open my $fh, "<:utf8", "$CONFDIR/config"
3367 or return; 3403 or return;
3368 3404
3369 local $/; 3405 local $/;
3370 *CFG = YAML::Load <$fh>; 3406 *CFG = YAML::XS::Load scalar <$fh>;
3371 3407
3372 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3408 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3373 3409
3374 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3410 $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}; 3411 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3379 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3415 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3380 and die "WARNING: m(un)lockall failed: $!\n"; 3416 and die "WARNING: m(un)lockall failed: $!\n";
3381 }; 3417 };
3382 warn $@ if $@; 3418 warn $@ if $@;
3383 } 3419 }
3420
3421 warn "finished reloading resource files\n";
3384} 3422}
3385 3423
3386sub pidfile() { 3424sub pidfile() {
3387 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3425 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3388 or die "$PIDFILE: $!"; 3426 or die "$PIDFILE: $!";
… …
3400 3438
3401 seek $fh, 0, 0; 3439 seek $fh, 0, 0;
3402 print $fh $$; 3440 print $fh $$;
3403} 3441}
3404 3442
3443sub main_loop {
3444 warn "EV::loop starting\n";
3445 if (1) {
3446 EV::loop;
3447 }
3448 warn "EV::loop returned\n";
3449 goto &main_loop unless $REALLY_UNLOOP;
3450}
3451
3405sub main { 3452sub main {
3406 cf::init_globals; # initialise logging 3453 cf::init_globals; # initialise logging
3407 3454
3408 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3455 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3409 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3456 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
… …
3412 3459
3413 cf::init_experience; 3460 cf::init_experience;
3414 cf::init_anim; 3461 cf::init_anim;
3415 cf::init_attackmess; 3462 cf::init_attackmess;
3416 cf::init_dynamic; 3463 cf::init_dynamic;
3417 cf::init_block;
3418 3464
3419 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3465 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3420 3466
3421 # we must not ever block the main coroutine 3467 # we must not ever block the main coroutine
3422 local $Coro::idle = sub { 3468 local $Coro::idle = sub {
… …
3448 load_extensions; 3494 load_extensions;
3449 3495
3450 utime time, time, $RUNTIMEFILE; 3496 utime time, time, $RUNTIMEFILE;
3451 3497
3452 # no (long-running) fork's whatsoever before this point(!) 3498 # no (long-running) fork's whatsoever before this point(!)
3499 use POSIX ();
3453 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3500 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3454 3501
3455 (pop @POST_INIT)->(0) while @POST_INIT; 3502 (pop @POST_INIT)->(0) while @POST_INIT;
3456 }; 3503 };
3457 3504
3458 EV::loop; 3505 main_loop;
3459} 3506}
3460 3507
3461############################################################################# 3508#############################################################################
3462# initialisation and cleanup 3509# initialisation and cleanup
3463 3510
… …
3558} 3605}
3559 3606
3560sub emergency_save() { 3607sub emergency_save() {
3561 my $freeze_guard = cf::freeze_mainloop; 3608 my $freeze_guard = cf::freeze_mainloop;
3562 3609
3563 warn "enter emergency perl save\n"; 3610 warn "emergency_perl_save: enter\n";
3564 3611
3565 cf::sync_job { 3612 cf::sync_job {
3613 # this is a trade-off: we want to be very quick here, so
3614 # save all maps without fsync, and later call a global sync
3615 # (which in turn might be very very slow)
3616 local $USE_FSYNC = 0;
3617
3566 # use a peculiar iteration method to avoid tripping on perl 3618 # use a peculiar iteration method to avoid tripping on perl
3567 # refcount bugs in for. also avoids problems with players 3619 # refcount bugs in for. also avoids problems with players
3568 # and maps saved/destroyed asynchronously. 3620 # and maps saved/destroyed asynchronously.
3569 warn "begin emergency player save\n"; 3621 warn "emergency_perl_save: begin player save\n";
3570 for my $login (keys %cf::PLAYER) { 3622 for my $login (keys %cf::PLAYER) {
3571 my $pl = $cf::PLAYER{$login} or next; 3623 my $pl = $cf::PLAYER{$login} or next;
3572 $pl->valid or next; 3624 $pl->valid or next;
3573 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3625 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3574 $pl->save; 3626 $pl->save;
3575 } 3627 }
3576 warn "end emergency player save\n"; 3628 warn "emergency_perl_save: end player save\n";
3577 3629
3578 warn "begin emergency map save\n"; 3630 warn "emergency_perl_save: begin map save\n";
3579 for my $path (keys %cf::MAP) { 3631 for my $path (keys %cf::MAP) {
3580 my $map = $cf::MAP{$path} or next; 3632 my $map = $cf::MAP{$path} or next;
3581 $map->valid or next; 3633 $map->valid or next;
3582 $map->save; 3634 $map->save;
3583 } 3635 }
3584 warn "end emergency map save\n"; 3636 warn "emergency_perl_save: end map save\n";
3585 3637
3586 warn "begin emergency database checkpoint\n"; 3638 warn "emergency_perl_save: begin database checkpoint\n";
3587 BDB::db_env_txn_checkpoint $DB_ENV; 3639 BDB::db_env_txn_checkpoint $DB_ENV;
3588 warn "end emergency database checkpoint\n"; 3640 warn "emergency_perl_save: end database checkpoint\n";
3589 3641
3590 warn "begin write uuid\n"; 3642 warn "emergency_perl_save: begin write uuid\n";
3591 write_uuid_sync 1; 3643 write_uuid_sync 1;
3592 warn "end write uuid\n"; 3644 warn "emergency_perl_save: end write uuid\n";
3593 }; 3645 };
3594 3646
3647 warn "emergency_perl_save: starting sync()\n";
3648 IO::AIO::aio_sync sub {
3649 warn "emergency_perl_save: finished sync()\n";
3650 };
3651
3595 warn "leave emergency perl save\n"; 3652 warn "emergency_perl_save: leave\n";
3596} 3653}
3597 3654
3598sub post_cleanup { 3655sub post_cleanup {
3599 my ($make_core) = @_; 3656 my ($make_core) = @_;
3600 3657
… …
3637 warn "can only reload from main coroutine"; 3694 warn "can only reload from main coroutine";
3638 return; 3695 return;
3639 } 3696 }
3640 3697
3641 return if $RELOAD++; 3698 return if $RELOAD++;
3699
3700 my $t1 = EV::time;
3642 3701
3643 while ($RELOAD) { 3702 while ($RELOAD) {
3644 warn "reloading..."; 3703 warn "reloading...";
3645 3704
3646 warn "entering sync_job"; 3705 warn "entering sync_job";
… …
3707 clear_package "safe::$_" 3766 clear_package "safe::$_"
3708 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3767 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3709 3768
3710 warn "unloading cf.pm \"a bit\""; 3769 warn "unloading cf.pm \"a bit\"";
3711 delete $INC{"cf.pm"}; 3770 delete $INC{"cf.pm"};
3712 delete $INC{"cf/pod.pm"}; 3771 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3713 3772
3714 # don't, removes xs symbols, too, 3773 # don't, removes xs symbols, too,
3715 # and global variables created in xs 3774 # and global variables created in xs
3716 #clear_package __PACKAGE__; 3775 #clear_package __PACKAGE__;
3717 3776
3718 warn "unload completed, starting to reload now"; 3777 warn "unload completed, starting to reload now";
3719 3778
3720 warn "reloading cf.pm"; 3779 warn "reloading cf.pm";
3721 require cf; 3780 require cf;
3722 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3781 cf::_connect_to_perl_1;
3723 3782
3724 warn "loading config and database again"; 3783 warn "loading config and database again";
3725 cf::reload_config; 3784 cf::reload_config;
3726 3785
3727 warn "loading extensions"; 3786 warn "loading extensions";
3728 cf::load_extensions; 3787 cf::load_extensions;
3729 3788
3789 if ($REATTACH_ON_RELOAD) {
3730 warn "reattaching attachments to objects/players"; 3790 warn "reattaching attachments to objects/players";
3731 _global_reattach; # objects, sockets 3791 _global_reattach; # objects, sockets
3732 warn "reattaching attachments to maps"; 3792 warn "reattaching attachments to maps";
3733 reattach $_ for values %MAP; 3793 reattach $_ for values %MAP;
3734 warn "reattaching attachments to players"; 3794 warn "reattaching attachments to players";
3735 reattach $_ for values %PLAYER; 3795 reattach $_ for values %PLAYER;
3796 }
3736 3797
3737 warn "running post_load"; 3798 warn "running post_init jobs";
3738 (pop @POST_INIT)->(1) while @POST_INIT; 3799 (pop @POST_INIT)->(1) while @POST_INIT;
3739 3800
3740 warn "leaving sync_job"; 3801 warn "leaving sync_job";
3741 3802
3742 1 3803 1
… …
3746 }; 3807 };
3747 3808
3748 warn "reloaded"; 3809 warn "reloaded";
3749 --$RELOAD; 3810 --$RELOAD;
3750 } 3811 }
3812
3813 $t1 = EV::time - $t1;
3814 warn "reload completed in ${t1}s\n";
3751}; 3815};
3752 3816
3753our $RELOAD_WATCHER; # used only during reload 3817our $RELOAD_WATCHER; # used only during reload
3754 3818
3755sub reload_perl() { 3819sub reload_perl() {
3756 # doing reload synchronously and two reloads happen back-to-back, 3820 # doing reload synchronously and two reloads happen back-to-back,
3757 # coro crashes during coro_state_free->destroy here. 3821 # coro crashes during coro_state_free->destroy here.
3758 3822
3823 $RELOAD_WATCHER ||= cf::async {
3824 Coro::AIO::aio_wait cache_extensions;
3825
3759 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 3826 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3760 do_reload_perl; 3827 do_reload_perl;
3761 undef $RELOAD_WATCHER; 3828 undef $RELOAD_WATCHER;
3829 };
3762 }; 3830 };
3763} 3831}
3764 3832
3765register_command "reload" => sub { 3833register_command "reload" => sub {
3766 my ($who, $arg) = @_; 3834 my ($who, $arg) = @_;
… …
3925 LOG llevInfo, "[ABT] [suppressed]\n"; 3993 LOG llevInfo, "[ABT] [suppressed]\n";
3926 } 3994 }
3927} 3995}
3928 3996
3929# load additional modules 3997# load additional modules
3930use cf::pod; 3998require "cf/$_.pm" for @EXTRA_MODULES;
3999cf::_connect_to_perl_2;
3931 4000
3932END { cf::emergency_save } 4001END { cf::emergency_save }
3933 4002
39341 40031
3935 4004

Diff Legend

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