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.454 by root, Thu Sep 25 12:14:32 2008 UTC vs.
Revision 1.484 by root, Mon Oct 12 14:00:58 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
… …
206 232
207This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
208C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
209that call. 235that call.
210 236
237=item %cf::REFLECT
238
239Contains, for each (C++) class name, a hash reference with information
240about object members (methods, scalars, arrays and flags) and other
241metadata, which is useful for introspection.
242
211=back 243=back
212 244
213=cut 245=cut
214 246
215BEGIN { 247$Coro::State::WARNHOOK = sub {
216 *CORE::GLOBAL::warn = sub {
217 my $msg = join "", @_; 248 my $msg = join "", @_;
218 249
219 $msg .= "\n" 250 $msg .= "\n"
220 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
221 252
222 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
223 254
224 LOG llevError, $msg; 255 LOG llevError, $msg;
225 }; 256};
226}
227 257
228$Coro::State::DIEHOOK = sub { 258$Coro::State::DIEHOOK = sub {
229 return unless $^S eq 0; # "eq", not "==" 259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
230 262
231 if ($Coro::current == $Coro::main) {#d# 263 if ($Coro::current == $Coro::main) {#d#
232 warn "DIEHOOK called in main context, Coro bug?\n";#d# 264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
233 return;#d# 265 return;#d#
234 }#d# 266 }#d#
235 267
236 # kill coroutine otherwise 268 # kill coroutine otherwise
237 warn Carp::longmess $_[0];
238 Coro::terminate 269 Coro::terminate
239}; 270};
240
241$SIG{__DIE__} = sub { }; #d#?
242 271
243@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
244@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
245@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
246@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
328Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
329 358
330=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
331 360
332Wait until the given lock is available and then acquires it and returns 361Wait until the given lock is available and then acquires it and returns
333a Coro::guard object. If the guard object gets destroyed (goes out of scope, 362a L<Guard> object. If the guard object gets destroyed (goes out of scope,
334for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
335returned. 364returned.
336 365
337Locks are *not* recursive, locking from the same coro twice results in a 366Locks are *not* recursive, locking from the same coro twice results in a
338deadlocked coro. 367deadlocked coro.
… …
344 373
345Return true if the lock is currently active, i.e. somebody has locked it. 374Return true if the lock is currently active, i.e. somebody has locked it.
346 375
347=cut 376=cut
348 377
349our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
350our %LOCKER;#d#
351 379
352sub lock_wait($) { 380sub lock_wait($) {
353 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
354
355 if ($LOCKER{$key} == $Coro::current) {#d#
356 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
357 return;#d#
358 }#d#
359
360 # wait for lock, if any
361 while ($LOCK{$key}) {
362 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
363 push @{ $LOCK{$key} }, $Coro::current;
364 Coro::schedule;
365 }
366} 382}
367 383
368sub lock_acquire($) { 384sub lock_acquire($) {
369 my ($key) = @_; 385 $LOCKS->guard ($_[0])
370
371 # wait, to be sure we are not locked
372 lock_wait $key;
373
374 $LOCK{$key} = [];
375 $LOCKER{$key} = $Coro::current;#d#
376
377 Coro::guard {
378 delete $LOCKER{$key};#d#
379 # wake up all waiters, to be on the safe side
380 $_->ready for @{ delete $LOCK{$key} };
381 }
382} 386}
383 387
384sub lock_active($) { 388sub lock_active($) {
385 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
386
387 ! ! $LOCK{$key}
388} 390}
389 391
390sub freeze_mainloop { 392sub freeze_mainloop {
391 tick_inhibit_inc; 393 tick_inhibit_inc;
392 394
393 Coro::guard \&tick_inhibit_dec; 395 &Guard::guard (\&tick_inhibit_dec);
394} 396}
395 397
396=item cf::periodic $interval, $cb 398=item cf::periodic $interval, $cb
397 399
398Like EV::periodic, but randomly selects a starting point so that the actions 400Like EV::periodic, but randomly selects a starting point so that the actions
… …
1170 $decname, length $$rdata, scalar @$objs; 1172 $decname, length $$rdata, scalar @$objs;
1171 1173
1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1173 aio_chmod $fh, SAVE_MODE; 1175 aio_chmod $fh, SAVE_MODE;
1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1175 aio_fsync $fh if $cf::USE_FSYNC; 1177 if ($cf::USE_FSYNC) {
1178 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1179 aio_fsync $fh;
1180 }
1176 aio_close $fh; 1181 aio_close $fh;
1177 1182
1178 if (@$objs) { 1183 if (@$objs) {
1179 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1184 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1180 aio_chmod $fh, SAVE_MODE; 1185 aio_chmod $fh, SAVE_MODE;
1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1186 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1182 aio_write $fh, 0, (length $data), $data, 0; 1187 aio_write $fh, 0, (length $data), $data, 0;
1183 aio_fsync $fh if $cf::USE_FSYNC; 1188 if ($cf::USE_FSYNC) {
1189 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1190 aio_fsync $fh;
1191 }
1184 aio_close $fh; 1192 aio_close $fh;
1185 aio_rename "$filename.pst~", "$filename.pst"; 1193 aio_rename "$filename.pst~", "$filename.pst";
1186 } 1194 }
1187 } else { 1195 } else {
1188 aio_unlink "$filename.pst"; 1196 aio_unlink "$filename.pst";
1189 } 1197 }
1190 1198
1191 aio_rename "$filename~", $filename; 1199 aio_rename "$filename~", $filename;
1200
1201 $filename =~ s%/[^/]+$%%;
1202 aio_pathsync $filename if $cf::USE_FSYNC;
1192 } else { 1203 } else {
1193 warn "FATAL: $filename~: $!\n"; 1204 warn "unable to save objects: $filename~: $!\n";
1194 } 1205 }
1195 } else { 1206 } else {
1196 aio_unlink $filename; 1207 aio_unlink $filename;
1197 aio_unlink "$filename.pst"; 1208 aio_unlink "$filename.pst";
1198 } 1209 }
… …
1289 my ($name, $cb) = @_; 1300 my ($name, $cb) = @_;
1290 1301
1291 $EXTICMD{$name} = $cb; 1302 $EXTICMD{$name} = $cb;
1292} 1303}
1293 1304
1305use File::Glob ();
1306
1294cf::player->attach ( 1307cf::player->attach (
1295 on_command => sub { 1308 on_command => sub {
1296 my ($pl, $name, $params) = @_; 1309 my ($pl, $name, $params) = @_;
1297 1310
1298 my $cb = $COMMAND{$name} 1311 my $cb = $COMMAND{$name}
… …
1329 } 1342 }
1330 1343
1331 cf::override; 1344 cf::override;
1332 }, 1345 },
1333); 1346);
1347
1348# "readahead" all extensions
1349sub cache_extensions {
1350 my $grp = IO::AIO::aio_group;
1351
1352 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1353 for (grep /\.ext$/, @{$_[0]}) {
1354 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1355 }
1356 };
1357
1358 $grp
1359}
1334 1360
1335sub load_extensions { 1361sub load_extensions {
1336 cf::sync_job { 1362 cf::sync_job {
1337 my %todo; 1363 my %todo;
1338 1364
… …
1867 1893
1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1894 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1869 "$UNIQUEDIR/$path" 1895 "$UNIQUEDIR/$path"
1870} 1896}
1871 1897
1872# and all this just because we cannot iterate over
1873# all maps in C++...
1874sub change_all_map_light {
1875 my ($change) = @_;
1876
1877 $_->change_map_light ($change)
1878 for grep $_->outdoor, values %cf::MAP;
1879}
1880
1881sub decay_objects { 1898sub decay_objects {
1882 my ($self) = @_; 1899 my ($self) = @_;
1883 1900
1884 return if $self->{deny_reset}; 1901 return if $self->{deny_reset};
1885 1902
… …
1967sub find { 1984sub find {
1968 my ($path, $origin) = @_; 1985 my ($path, $origin) = @_;
1969 1986
1970 $path = normalise $path, $origin && $origin->path; 1987 $path = normalise $path, $origin && $origin->path;
1971 1988
1972 cf::lock_wait "map_data:$path";#d#remove 1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 cf::lock_wait "map_find:$path"; 1990 my $guard2 = cf::lock_acquire "map_find:$path";
1974 1991
1975 $cf::MAP{$path} || do { 1992 $cf::MAP{$path} || do {
1976 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1977 my $guard2 = cf::lock_acquire "map_find:$path";
1978
1979 my $map = new_from_path cf::map $path 1993 my $map = new_from_path cf::map $path
1980 or return; 1994 or return;
1981 1995
1982 $map->{last_save} = $cf::RUNTIME; 1996 $map->{last_save} = $cf::RUNTIME;
1983 1997
… …
2051 unless ($self->{deny_activate}) { 2065 unless ($self->{deny_activate}) {
2052 $self->decay_objects; 2066 $self->decay_objects;
2053 $self->fix_auto_apply; 2067 $self->fix_auto_apply;
2054 $self->update_buttons; 2068 $self->update_buttons;
2055 cf::cede_to_tick; 2069 cf::cede_to_tick;
2056 $self->set_darkness_map;
2057 cf::cede_to_tick;
2058 $self->activate; 2070 $self->activate;
2059 } 2071 }
2060 2072
2061 $self->{last_save} = $cf::RUNTIME; 2073 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME); 2074 $self->last_access ($cf::RUNTIME);
… …
2228 2240
2229 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2230 2242
2231 return if $self->players; 2243 return if $self->players;
2232 2244
2233 warn "resetting map ", $self->path; 2245 warn "resetting map ", $self->path, "\n";
2234 2246
2235 $self->in_memory (cf::MAP_SWAPPED); 2247 $self->in_memory (cf::MAP_SWAPPED);
2236 2248
2237 # need to save uniques path 2249 # need to save uniques path
2238 unless ($self->{deny_save}) { 2250 unless ($self->{deny_save}) {
… …
2403 2415
2404our $SAY_CHANNEL = { 2416our $SAY_CHANNEL = {
2405 id => "say", 2417 id => "say",
2406 title => "Map", 2418 title => "Map",
2407 reply => "say ", 2419 reply => "say ",
2408 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.",
2409}; 2421};
2410 2422
2411our $CHAT_CHANNEL = { 2423our $CHAT_CHANNEL = {
2412 id => "chat", 2424 id => "chat",
2413 title => "Chat", 2425 title => "Chat",
… …
2539 2551
2540 $map->load; 2552 $map->load;
2541 $map->load_neighbours; 2553 $map->load_neighbours;
2542 2554
2543 return unless $self->contr->active; 2555 return unless $self->contr->active;
2544 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2545 $self->activate_recursive;
2546 2556
2547 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2557 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2548 $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;
2549} 2562}
2550 2563
2551=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2564=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2552 2565
2553Moves 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
… …
2788 id => "infobox", 2801 id => "infobox",
2789 title => "Body Parts", 2802 title => "Body Parts",
2790 reply => undef, 2803 reply => undef,
2791 tooltip => "Shows which body parts you posess and are available", 2804 tooltip => "Shows which body parts you posess and are available",
2792 }, 2805 },
2806 "c/statistics" => {
2807 id => "infobox",
2808 title => "Statistics",
2809 reply => undef,
2810 tooltip => "Shows your primary statistics",
2811 },
2793 "c/skills" => { 2812 "c/skills" => {
2794 id => "infobox", 2813 id => "infobox",
2795 title => "Skills", 2814 title => "Skills",
2796 reply => undef, 2815 reply => undef,
2797 tooltip => "Shows your experience per skill and item power", 2816 tooltip => "Shows your experience per skill and item power",
2817 },
2818 "c/shopitems" => {
2819 id => "infobox",
2820 title => "Shop Items",
2821 reply => undef,
2822 tooltip => "Shows the items currently for sale in this shop",
2823 },
2824 "c/resistances" => {
2825 id => "infobox",
2826 title => "Resistances",
2827 reply => undef,
2828 tooltip => "Shows your resistances",
2829 },
2830 "c/pets" => {
2831 id => "infobox",
2832 title => "Pets",
2833 reply => undef,
2834 tooltip => "Shows information abotu your pets/a specific pet",
2835 },
2836 "c/perceiveself" => {
2837 id => "infobox",
2838 title => "Perceive Self",
2839 reply => undef,
2840 tooltip => "You gained detailed knowledge about yourself",
2798 }, 2841 },
2799 "c/uptime" => { 2842 "c/uptime" => {
2800 id => "infobox", 2843 id => "infobox",
2801 title => "Uptime", 2844 title => "Uptime",
2802 reply => undef, 2845 reply => undef,
… …
2812 id => "party", 2855 id => "party",
2813 title => "Party", 2856 title => "Party",
2814 reply => "gsay ", 2857 reply => "gsay ",
2815 tooltip => "Messages and chat related to your party", 2858 tooltip => "Messages and chat related to your party",
2816 }, 2859 },
2860 "c/death" => {
2861 id => "death",
2862 title => "Death",
2863 reply => undef,
2864 tooltip => "Reason for and more info about your most recent death",
2865 },
2866 "c/say" => $SAY_CHANNEL,
2867 "c/chat" => $CHAT_CHANNEL,
2817); 2868);
2818 2869
2819sub cf::client::send_msg { 2870sub cf::client::send_msg {
2820 my ($self, $channel, $msg, $color, @extra) = @_; 2871 my ($self, $channel, $msg, $color, @extra) = @_;
2821 2872
… …
2826 2877
2827 # check predefined channels, for the benefit of C 2878 # check predefined channels, for the benefit of C
2828 if ($CHANNEL{$channel}) { 2879 if ($CHANNEL{$channel}) {
2829 $channel = $CHANNEL{$channel}; 2880 $channel = $CHANNEL{$channel};
2830 2881
2831 $self->ext_msg (channel_info => $channel) 2882 $self->ext_msg (channel_info => $channel);
2832 if $self->can_msg;
2833
2834 $channel = $channel->{id}; 2883 $channel = $channel->{id};
2835 2884
2836 } elsif (ref $channel) { 2885 } elsif (ref $channel) {
2837 # send meta info to client, if not yet sent 2886 # send meta info to client, if not yet sent
2838 unless (exists $self->{channel}{$channel->{id}}) { 2887 unless (exists $self->{channel}{$channel->{id}}) {
2839 $self->{channel}{$channel->{id}} = $channel; 2888 $self->{channel}{$channel->{id}} = $channel;
2840 $self->ext_msg (channel_info => $channel) 2889 $self->ext_msg (channel_info => $channel);
2841 if $self->can_msg;
2842 } 2890 }
2843 2891
2844 $channel = $channel->{id}; 2892 $channel = $channel->{id};
2845 } 2893 }
2846 2894
2847 return unless @extra || length $msg; 2895 return unless @extra || length $msg;
2848 2896
2849 if ($self->can_msg) {
2850 # default colour, mask it out 2897 # default colour, mask it out
2851 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2898 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2852 if $color & cf::NDI_DEF; 2899 if $color & cf::NDI_DEF;
2853 2900
2854 my $pkt = "msg " 2901 my $pkt = "msg "
2855 . $self->{json_coder}->encode ( 2902 . $self->{json_coder}->encode (
2856 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2903 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2857 ); 2904 );
2858 2905
2859 # try lzf for large packets 2906 # try lzf for large packets
2860 $pkt = "lzf " . Compress::LZF::compress $pkt 2907 $pkt = "lzf " . Compress::LZF::compress $pkt
2861 if 1024 <= length $pkt and $self->{can_lzf}; 2908 if 1024 <= length $pkt and $self->{can_lzf};
2862 2909
2863 # split very large packets 2910 # split very large packets
2864 if (8192 < length $pkt and $self->{can_lzf}) { 2911 if (8192 < length $pkt and $self->{can_lzf}) {
2865 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; 2912 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2866 $pkt = "frag"; 2913 $pkt = "frag";
2867 } 2914 }
2868 2915
2869 $self->send_packet ($pkt); 2916 $self->send_packet ($pkt);
2870 } else {
2871 if ($color >= 0) {
2872 # replace some tags by gcfclient-compatible ones
2873 for ($msg) {
2874 1 while
2875 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2876 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2877 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2878 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2879 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2880 }
2881
2882 $color &= cf::NDI_COLOR_MASK;
2883
2884 utf8::encode $msg;
2885
2886 if (0 && $msg =~ /\[/) {
2887 # COMMAND/INFO
2888 $self->send_packet ("drawextinfo $color 10 8 $msg")
2889 } else {
2890 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2891 $self->send_packet ("drawinfo $color $msg")
2892 }
2893 }
2894 }
2895} 2917}
2896 2918
2897=item $client->ext_msg ($type, @msg) 2919=item $client->ext_msg ($type, @msg)
2898 2920
2899Sends an ext event to the client. 2921Sends an ext event to the client.
… …
3074The following functions and methods are available within a safe environment: 3096The following functions and methods are available within a safe environment:
3075 3097
3076 cf::object 3098 cf::object
3077 contr pay_amount pay_player map x y force_find force_add destroy 3099 contr pay_amount pay_player map x y force_find force_add destroy
3078 insert remove name archname title slaying race decrease split 3100 insert remove name archname title slaying race decrease split
3101 value
3079 3102
3080 cf::object::player 3103 cf::object::player
3081 player 3104 player
3082 3105
3083 cf::player 3106 cf::player
… …
3089=cut 3112=cut
3090 3113
3091for ( 3114for (
3092 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3115 ["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 3116 insert remove inv nrof name archname title slaying race
3094 decrease split destroy change_exp)], 3117 decrease split destroy change_exp value msg lore send_msg)],
3095 ["cf::object::player" => qw(player)], 3118 ["cf::object::player" => qw(player)],
3096 ["cf::player" => qw(peaceful)], 3119 ["cf::player" => qw(peaceful send_msg)],
3097 ["cf::map" => qw(trigger)], 3120 ["cf::map" => qw(trigger)],
3098) { 3121) {
3099 no strict 'refs'; 3122 no strict 'refs';
3100 my ($pkg, @funs) = @$_; 3123 my ($pkg, @funs) = @$_;
3101 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3124 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3118 my ($code, %vars) = @_; 3141 my ($code, %vars) = @_;
3119 3142
3120 my $qcode = $code; 3143 my $qcode = $code;
3121 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3144 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3122 $qcode =~ s/\n/\\n/g; 3145 $qcode =~ s/\n/\\n/g;
3146
3147 %vars = (_dummy => 0) unless %vars;
3123 3148
3124 local $_; 3149 local $_;
3125 local @safe::cf::_safe_eval_args = values %vars; 3150 local @safe::cf::_safe_eval_args = values %vars;
3126 3151
3127 my $eval = 3152 my $eval =
… …
3362sub reload_config { 3387sub reload_config {
3363 open my $fh, "<:utf8", "$CONFDIR/config" 3388 open my $fh, "<:utf8", "$CONFDIR/config"
3364 or return; 3389 or return;
3365 3390
3366 local $/; 3391 local $/;
3367 *CFG = YAML::Load <$fh>; 3392 *CFG = YAML::XS::Load <$fh>;
3368 3393
3369 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3394 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3370 3395
3371 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3396 $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}; 3397 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3397 3422
3398 seek $fh, 0, 0; 3423 seek $fh, 0, 0;
3399 print $fh $$; 3424 print $fh $$;
3400} 3425}
3401 3426
3427sub main_loop {
3428 warn "EV::loop starting\n";
3429 if (1) {
3430 EV::loop;
3431 }
3432 warn "EV::loop returned\n";
3433 goto &main_loop unless $REALLY_UNLOOP;
3434}
3435
3402sub main { 3436sub main {
3403 cf::init_globals; # initialise logging 3437 cf::init_globals; # initialise logging
3404 3438
3405 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3439 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3406 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3440 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
… …
3409 3443
3410 cf::init_experience; 3444 cf::init_experience;
3411 cf::init_anim; 3445 cf::init_anim;
3412 cf::init_attackmess; 3446 cf::init_attackmess;
3413 cf::init_dynamic; 3447 cf::init_dynamic;
3414 cf::init_block;
3415 3448
3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3449 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3417 3450
3418 # we must not ever block the main coroutine 3451 # we must not ever block the main coroutine
3419 local $Coro::idle = sub { 3452 local $Coro::idle = sub {
… …
3445 load_extensions; 3478 load_extensions;
3446 3479
3447 utime time, time, $RUNTIMEFILE; 3480 utime time, time, $RUNTIMEFILE;
3448 3481
3449 # no (long-running) fork's whatsoever before this point(!) 3482 # no (long-running) fork's whatsoever before this point(!)
3483 use POSIX ();
3450 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3484 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3451 3485
3452 (pop @POST_INIT)->(0) while @POST_INIT; 3486 (pop @POST_INIT)->(0) while @POST_INIT;
3453 }; 3487 };
3454 3488
3455 EV::loop; 3489 main_loop;
3456} 3490}
3457 3491
3458############################################################################# 3492#############################################################################
3459# initialisation and cleanup 3493# initialisation and cleanup
3460 3494
… …
3518 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3552 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3519 or return; 3553 or return;
3520 3554
3521 my $value = uuid_seq uuid_cur; 3555 my $value = uuid_seq uuid_cur;
3522 3556
3523 if ($value < 1024) { 3557 unless ($value) {
3524 warn "cowardly refusing to write low uuid value ($value)!\n"; 3558 warn "cowardly refusing to write zero uuid value!\n";
3525 return; 3559 return;
3526 } 3560 }
3527 3561
3528 my $value = uuid_str $value + $uuid_skip; 3562 my $value = uuid_str $value + $uuid_skip;
3529 $uuid_skip = 0; 3563 $uuid_skip = 0;
… …
3555} 3589}
3556 3590
3557sub emergency_save() { 3591sub emergency_save() {
3558 my $freeze_guard = cf::freeze_mainloop; 3592 my $freeze_guard = cf::freeze_mainloop;
3559 3593
3560 warn "enter emergency perl save\n"; 3594 warn "emergency_perl_save: enter\n";
3561 3595
3562 cf::sync_job { 3596 cf::sync_job {
3597 # this is a trade-off: we want to be very quick here, so
3598 # save all maps without fsync, and later call a global sync
3599 # (which in turn might be very very slow)
3600 local $USE_FSYNC = 0;
3601
3563 # use a peculiar iteration method to avoid tripping on perl 3602 # use a peculiar iteration method to avoid tripping on perl
3564 # refcount bugs in for. also avoids problems with players 3603 # refcount bugs in for. also avoids problems with players
3565 # and maps saved/destroyed asynchronously. 3604 # and maps saved/destroyed asynchronously.
3566 warn "begin emergency player save\n"; 3605 warn "emergency_perl_save: begin player save\n";
3567 for my $login (keys %cf::PLAYER) { 3606 for my $login (keys %cf::PLAYER) {
3568 my $pl = $cf::PLAYER{$login} or next; 3607 my $pl = $cf::PLAYER{$login} or next;
3569 $pl->valid or next; 3608 $pl->valid or next;
3570 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3609 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3571 $pl->save; 3610 $pl->save;
3572 } 3611 }
3573 warn "end emergency player save\n"; 3612 warn "emergency_perl_save: end player save\n";
3574 3613
3575 warn "begin emergency map save\n"; 3614 warn "emergency_perl_save: begin map save\n";
3576 for my $path (keys %cf::MAP) { 3615 for my $path (keys %cf::MAP) {
3577 my $map = $cf::MAP{$path} or next; 3616 my $map = $cf::MAP{$path} or next;
3578 $map->valid or next; 3617 $map->valid or next;
3579 $map->save; 3618 $map->save;
3580 } 3619 }
3581 warn "end emergency map save\n"; 3620 warn "emergency_perl_save: end map save\n";
3582 3621
3583 warn "begin emergency database checkpoint\n"; 3622 warn "emergency_perl_save: begin database checkpoint\n";
3584 BDB::db_env_txn_checkpoint $DB_ENV; 3623 BDB::db_env_txn_checkpoint $DB_ENV;
3585 warn "end emergency database checkpoint\n"; 3624 warn "emergency_perl_save: end database checkpoint\n";
3586 3625
3587 warn "begin write uuid\n"; 3626 warn "emergency_perl_save: begin write uuid\n";
3588 write_uuid_sync 1; 3627 write_uuid_sync 1;
3589 warn "end write uuid\n"; 3628 warn "emergency_perl_save: end write uuid\n";
3590 }; 3629 };
3591 3630
3631 warn "emergency_perl_save: starting sync()\n";
3632 IO::AIO::aio_sync sub {
3633 warn "emergency_perl_save: finished sync()\n";
3634 };
3635
3592 warn "leave emergency perl save\n"; 3636 warn "emergency_perl_save: leave\n";
3593} 3637}
3594 3638
3595sub post_cleanup { 3639sub post_cleanup {
3596 my ($make_core) = @_; 3640 my ($make_core) = @_;
3597 3641
… …
3634 warn "can only reload from main coroutine"; 3678 warn "can only reload from main coroutine";
3635 return; 3679 return;
3636 } 3680 }
3637 3681
3638 return if $RELOAD++; 3682 return if $RELOAD++;
3683
3684 my $t1 = EV::time;
3639 3685
3640 while ($RELOAD) { 3686 while ($RELOAD) {
3641 warn "reloading..."; 3687 warn "reloading...";
3642 3688
3643 warn "entering sync_job"; 3689 warn "entering sync_job";
… …
3704 clear_package "safe::$_" 3750 clear_package "safe::$_"
3705 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3751 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3706 3752
3707 warn "unloading cf.pm \"a bit\""; 3753 warn "unloading cf.pm \"a bit\"";
3708 delete $INC{"cf.pm"}; 3754 delete $INC{"cf.pm"};
3709 delete $INC{"cf/pod.pm"}; 3755 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3710 3756
3711 # don't, removes xs symbols, too, 3757 # don't, removes xs symbols, too,
3712 # and global variables created in xs 3758 # and global variables created in xs
3713 #clear_package __PACKAGE__; 3759 #clear_package __PACKAGE__;
3714 3760
3715 warn "unload completed, starting to reload now"; 3761 warn "unload completed, starting to reload now";
3716 3762
3717 warn "reloading cf.pm"; 3763 warn "reloading cf.pm";
3718 require cf; 3764 require cf;
3719 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3765 cf::_connect_to_perl_1;
3720 3766
3721 warn "loading config and database again"; 3767 warn "loading config and database again";
3722 cf::reload_config; 3768 cf::reload_config;
3723 3769
3724 warn "loading extensions"; 3770 warn "loading extensions";
3725 cf::load_extensions; 3771 cf::load_extensions;
3726 3772
3773 if ($REATTACH_ON_RELOAD) {
3727 warn "reattaching attachments to objects/players"; 3774 warn "reattaching attachments to objects/players";
3728 _global_reattach; # objects, sockets 3775 _global_reattach; # objects, sockets
3729 warn "reattaching attachments to maps"; 3776 warn "reattaching attachments to maps";
3730 reattach $_ for values %MAP; 3777 reattach $_ for values %MAP;
3731 warn "reattaching attachments to players"; 3778 warn "reattaching attachments to players";
3732 reattach $_ for values %PLAYER; 3779 reattach $_ for values %PLAYER;
3780 }
3733 3781
3734 warn "running post_load"; 3782 warn "running post_init jobs";
3735 (pop @POST_INIT)->(1) while @POST_INIT; 3783 (pop @POST_INIT)->(1) while @POST_INIT;
3736 3784
3737 warn "leaving sync_job"; 3785 warn "leaving sync_job";
3738 3786
3739 1 3787 1
… …
3743 }; 3791 };
3744 3792
3745 warn "reloaded"; 3793 warn "reloaded";
3746 --$RELOAD; 3794 --$RELOAD;
3747 } 3795 }
3796
3797 $t1 = EV::time - $t1;
3798 warn "reload completed in ${t1}s\n";
3748}; 3799};
3749 3800
3750our $RELOAD_WATCHER; # used only during reload 3801our $RELOAD_WATCHER; # used only during reload
3751 3802
3752sub reload_perl() { 3803sub reload_perl() {
3753 # doing reload synchronously and two reloads happen back-to-back, 3804 # doing reload synchronously and two reloads happen back-to-back,
3754 # coro crashes during coro_state_free->destroy here. 3805 # coro crashes during coro_state_free->destroy here.
3755 3806
3807 $RELOAD_WATCHER ||= cf::async {
3808 Coro::AIO::aio_wait cache_extensions;
3809
3756 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 3810 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3757 do_reload_perl; 3811 do_reload_perl;
3758 undef $RELOAD_WATCHER; 3812 undef $RELOAD_WATCHER;
3813 };
3759 }; 3814 };
3760} 3815}
3761 3816
3762register_command "reload" => sub { 3817register_command "reload" => sub {
3763 my ($who, $arg) = @_; 3818 my ($who, $arg) = @_;
… …
3922 LOG llevInfo, "[ABT] [suppressed]\n"; 3977 LOG llevInfo, "[ABT] [suppressed]\n";
3923 } 3978 }
3924} 3979}
3925 3980
3926# load additional modules 3981# load additional modules
3927use cf::pod; 3982require "cf/$_.pm" for @EXTRA_MODULES;
3983cf::_connect_to_perl_2;
3928 3984
3929END { cf::emergency_save } 3985END { cf::emergency_save }
3930 3986
39311 39871
3932 3988

Diff Legend

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