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.449 by root, Sat Sep 20 00:09:27 2008 UTC vs.
Revision 1.480 by root, Thu Oct 8 05:09:43 2009 UTC

… …
21 21
22package cf; 22package cf;
23 23
24use 5.10.0; 24use 5.10.0;
25use utf8; 25use utf8;
26use strict "vars", "subs"; 26use strict qw(vars subs);
27 27
28use Symbol; 28use Symbol;
29use List::Util; 29use List::Util;
30use Socket; 30use Socket;
31use EV; 31use EV;
32use Opcode; 32use Opcode;
33use Safe; 33use Safe;
34use Safe::Hole; 34use Safe::Hole;
35use Storable (); 35use Storable ();
36 36
37use Guard ();
37use Coro (); 38use Coro ();
38use Coro::State; 39use Coro::State;
39use Coro::Handle; 40use Coro::Handle;
40use Coro::EV; 41use Coro::EV;
41use Coro::AnyEvent; 42use Coro::AnyEvent;
42use Coro::Timer; 43use Coro::Timer;
43use Coro::Signal; 44use Coro::Signal;
44use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
45use Coro::AnyEvent; 47use Coro::AnyEvent;
46use Coro::AIO; 48use Coro::AIO;
47use Coro::BDB 1.6; 49use Coro::BDB 1.6;
48use Coro::Storable; 50use Coro::Storable;
49use Coro::Util (); 51use Coro::Util ();
… …
70 72
71# make sure c-lzf reinitialises itself 73# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
73Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
74 76
77# strictly for debugging
78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
79
75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
76 81
77our %COMMAND = (); 82our %COMMAND = ();
78our %COMMAND_TIME = (); 83our %COMMAND_TIME = ();
79 84
… …
81our %EXTCMD = (); 86our %EXTCMD = ();
82our %EXTICMD = (); 87our %EXTICMD = ();
83our %EXT_CORO = (); # coroutines bound to extensions 88our %EXT_CORO = (); # coroutines bound to extensions
84our %EXT_MAP = (); # pluggable maps 89our %EXT_MAP = (); # pluggable maps
85 90
86our $RELOAD; # number of reloads so far 91our $RELOAD; # number of reloads so far, non-zero while in reload
87our @EVENT; 92our @EVENT;
93our @REFLECT; # set by XS
94our %REFLECT; # set by us
88 95
89our $CONFDIR = confdir; 96our $CONFDIR = confdir;
90our $DATADIR = datadir; 97our $DATADIR = datadir;
91our $LIBDIR = "$DATADIR/ext"; 98our $LIBDIR = "$DATADIR/ext";
92our $PODDIR = "$DATADIR/pod"; 99our $PODDIR = "$DATADIR/pod";
… …
103our %RESOURCE; 110our %RESOURCE;
104 111
105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 112our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 113our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107our $NEXT_TICK; 114our $NEXT_TICK;
108our $USE_FSYNC = 1; # use fsync to write maps - default off 115our $USE_FSYNC = 1; # use fsync to write maps - default on
109 116
110our $BDB_DEADLOCK_WATCHER; 117our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER; 118our $BDB_CHECKPOINT_WATCHER;
112our $BDB_TRICKLE_WATCHER; 119our $BDB_TRICKLE_WATCHER;
113our $DB_ENV; 120our $DB_ENV;
114 121
122our @EXTRA_MODULES = qw(pod mapscript);
123
115our %CFG; 124our %CFG;
116 125
117our $UPTIME; $UPTIME ||= time; 126our $UPTIME; $UPTIME ||= time;
118our $RUNTIME; 127our $RUNTIME;
119our $NOW; 128our $NOW;
… …
127 136
128our $LOAD; # a number between 0 (idle) and 1 (too many objects) 137our $LOAD; # a number between 0 (idle) and 1 (too many objects)
129our $LOADAVG; # same thing, but with alpha-smoothing 138our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter 139our $JITTER; # average jitter
131our $TICK_START; # for load detecting purposes 140our $TICK_START; # for load detecting purposes
141
142our @POST_INIT;
143
144our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
145our $REALLY_UNLOOP; # never set to true, please :)
132 146
133binmode STDOUT; 147binmode STDOUT;
134binmode STDERR; 148binmode STDERR;
135 149
136# read virtual server time, if available 150# read virtual server time, if available
… …
138 open my $fh, "<", $RUNTIMEFILE 152 open my $fh, "<", $RUNTIMEFILE
139 or die "unable to read $RUNTIMEFILE file: $!"; 153 or die "unable to read $RUNTIMEFILE file: $!";
140 $RUNTIME = <$fh> + 0.; 154 $RUNTIME = <$fh> + 0.;
141} 155}
142 156
157eval "sub TICK() { $TICK } 1" or die;
158
143mkdir $_ 159mkdir $_
144 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 160 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
145 161
146our $EMERGENCY_POSITION; 162our $EMERGENCY_POSITION;
147 163
148sub cf::map::normalise; 164sub cf::map::normalise;
165
166#############################################################################
167
168%REFLECT = ();
169for (@REFLECT) {
170 my $reflect = JSON::XS::decode_json $_;
171 $REFLECT{$reflect->{class}} = $reflect;
172}
173
174# this is decidedly evil
175$REFLECT{object}{flags} = [grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"}];
149 176
150############################################################################# 177#############################################################################
151 178
152=head2 GLOBAL VARIABLES 179=head2 GLOBAL VARIABLES
153 180
… …
204 231
205This array contains the results of the last C<invoke ()> call. When 232This array contains the results of the last C<invoke ()> call. When
206C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 233C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
207that call. 234that call.
208 235
236=item %cf::REFLECT
237
238Contains, for each (C++) class name, a hash reference with information
239about object members (methods, scalars, arrays and flags) and other
240metadata, which is useful for introspection.
241
209=back 242=back
210 243
211=cut 244=cut
212 245
213BEGIN { 246$Coro::State::WARNHOOK = sub {
214 *CORE::GLOBAL::warn = sub {
215 my $msg = join "", @_; 247 my $msg = join "", @_;
216 248
217 $msg .= "\n" 249 $msg .= "\n"
218 unless $msg =~ /\n$/; 250 unless $msg =~ /\n$/;
219 251
220 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 252 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
221 253
222 LOG llevError, $msg; 254 LOG llevError, $msg;
223 }; 255};
224}
225 256
226$Coro::State::DIEHOOK = sub { 257$Coro::State::DIEHOOK = sub {
227 return unless $^S eq 0; # "eq", not "==" 258 return unless $^S eq 0; # "eq", not "=="
259
260 warn Carp::longmess $_[0];
228 261
229 if ($Coro::current == $Coro::main) {#d# 262 if ($Coro::current == $Coro::main) {#d#
230 warn "DIEHOOK called in main context, Coro bug?\n";#d# 263 warn "DIEHOOK called in main context, Coro bug?\n";#d#
231 return;#d# 264 return;#d#
232 }#d# 265 }#d#
233 266
234 # kill coroutine otherwise 267 # kill coroutine otherwise
235 warn Carp::longmess $_[0];
236 Coro::terminate 268 Coro::terminate
237}; 269};
238
239$SIG{__DIE__} = sub { }; #d#?
240 270
241@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 271@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
242@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 272@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
243@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 273@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
244@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 274@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
305our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 335our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
306 336
307sub encode_json($) { $json_coder->encode ($_[0]) } 337sub encode_json($) { $json_coder->encode ($_[0]) }
308sub decode_json($) { $json_coder->decode ($_[0]) } 338sub decode_json($) { $json_coder->decode ($_[0]) }
309 339
340=item cf::post_init { BLOCK }
341
342Execute the given codeblock, I<after> all extensions have been (re-)loaded,
343but I<before> the server starts ticking again.
344
345The cdoeblock will have a single boolean argument to indicate whether this
346is a reload or not.
347
348=cut
349
350sub post_init(&) {
351 push @POST_INIT, shift;
352}
353
310=item cf::lock_wait $string 354=item cf::lock_wait $string
311 355
312Wait until the given lock is available. See cf::lock_acquire. 356Wait until the given lock is available. See cf::lock_acquire.
313 357
314=item my $lock = cf::lock_acquire $string 358=item my $lock = cf::lock_acquire $string
315 359
316Wait until the given lock is available and then acquires it and returns 360Wait until the given lock is available and then acquires it and returns
317a Coro::guard object. If the guard object gets destroyed (goes out of scope, 361a L<Guard> object. If the guard object gets destroyed (goes out of scope,
318for example when the coroutine gets canceled), the lock is automatically 362for example when the coroutine gets canceled), the lock is automatically
319returned. 363returned.
320 364
321Locks are *not* recursive, locking from the same coro twice results in a 365Locks are *not* recursive, locking from the same coro twice results in a
322deadlocked coro. 366deadlocked coro.
… …
328 372
329Return true if the lock is currently active, i.e. somebody has locked it. 373Return true if the lock is currently active, i.e. somebody has locked it.
330 374
331=cut 375=cut
332 376
333our %LOCK; 377our $LOCKS = new Coro::SemaphoreSet;
334our %LOCKER;#d#
335 378
336sub lock_wait($) { 379sub lock_wait($) {
337 my ($key) = @_; 380 $LOCKS->wait ($_[0]);
338
339 if ($LOCKER{$key} == $Coro::current) {#d#
340 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
341 return;#d#
342 }#d#
343
344 # wait for lock, if any
345 while ($LOCK{$key}) {
346 push @{ $LOCK{$key} }, $Coro::current;
347 Coro::schedule;
348 }
349} 381}
350 382
351sub lock_acquire($) { 383sub lock_acquire($) {
352 my ($key) = @_; 384 $LOCKS->guard ($_[0])
353
354 # wait, to be sure we are not locked
355 lock_wait $key;
356
357 $LOCK{$key} = [];
358 $LOCKER{$key} = $Coro::current;#d#
359
360 Coro::guard {
361 delete $LOCKER{$key};#d#
362 # wake up all waiters, to be on the safe side
363 $_->ready for @{ delete $LOCK{$key} };
364 }
365} 385}
366 386
367sub lock_active($) { 387sub lock_active($) {
368 my ($key) = @_; 388 $LOCKS->count ($_[0]) < 1
369
370 ! ! $LOCK{$key}
371} 389}
372 390
373sub freeze_mainloop { 391sub freeze_mainloop {
374 tick_inhibit_inc; 392 tick_inhibit_inc;
375 393
376 Coro::guard \&tick_inhibit_dec; 394 &Guard::guard (\&tick_inhibit_dec);
377} 395}
378 396
379=item cf::periodic $interval, $cb 397=item cf::periodic $interval, $cb
380 398
381Like EV::periodic, but randomly selects a starting point so that the actions 399Like EV::periodic, but randomly selects a starting point so that the actions
… …
1153 $decname, length $$rdata, scalar @$objs; 1171 $decname, length $$rdata, scalar @$objs;
1154 1172
1155 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1173 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1156 aio_chmod $fh, SAVE_MODE; 1174 aio_chmod $fh, SAVE_MODE;
1157 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1175 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1158 aio_fsync $fh if $cf::USE_FSYNC; 1176 if ($cf::USE_FSYNC) {
1177 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;
1178 aio_fsync $fh;
1179 }
1159 aio_close $fh; 1180 aio_close $fh;
1160 1181
1161 if (@$objs) { 1182 if (@$objs) {
1162 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1183 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1163 aio_chmod $fh, SAVE_MODE; 1184 aio_chmod $fh, SAVE_MODE;
1164 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1185 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1165 aio_write $fh, 0, (length $data), $data, 0; 1186 aio_write $fh, 0, (length $data), $data, 0;
1166 aio_fsync $fh if $cf::USE_FSYNC; 1187 if ($cf::USE_FSYNC) {
1188 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;
1189 aio_fsync $fh;
1190 }
1167 aio_close $fh; 1191 aio_close $fh;
1168 aio_rename "$filename.pst~", "$filename.pst"; 1192 aio_rename "$filename.pst~", "$filename.pst";
1169 } 1193 }
1170 } else { 1194 } else {
1171 aio_unlink "$filename.pst"; 1195 aio_unlink "$filename.pst";
1172 } 1196 }
1173 1197
1174 aio_rename "$filename~", $filename; 1198 aio_rename "$filename~", $filename;
1199
1200 $filename =~ s%/[^/]+$%%;
1201 aio_pathsync $filename if $cf::USE_FSYNC;
1175 } else { 1202 } else {
1176 warn "FATAL: $filename~: $!\n"; 1203 warn "unable to save objects: $filename~: $!\n";
1177 } 1204 }
1178 } else { 1205 } else {
1179 aio_unlink $filename; 1206 aio_unlink $filename;
1180 aio_unlink "$filename.pst"; 1207 aio_unlink "$filename.pst";
1181 } 1208 }
… …
1272 my ($name, $cb) = @_; 1299 my ($name, $cb) = @_;
1273 1300
1274 $EXTICMD{$name} = $cb; 1301 $EXTICMD{$name} = $cb;
1275} 1302}
1276 1303
1304use File::Glob ();
1305
1277cf::player->attach ( 1306cf::player->attach (
1278 on_command => sub { 1307 on_command => sub {
1279 my ($pl, $name, $params) = @_; 1308 my ($pl, $name, $params) = @_;
1280 1309
1281 my $cb = $COMMAND{$name} 1310 my $cb = $COMMAND{$name}
… …
1312 } 1341 }
1313 1342
1314 cf::override; 1343 cf::override;
1315 }, 1344 },
1316); 1345);
1346
1347# "readahead" all extensions
1348sub cache_extensions {
1349 my $grp = IO::AIO::aio_group;
1350
1351 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1352 for (grep /\.ext$/, @{$_[0]}) {
1353 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1354 }
1355 };
1356
1357 $grp
1358}
1317 1359
1318sub load_extensions { 1360sub load_extensions {
1319 cf::sync_job { 1361 cf::sync_job {
1320 my %todo; 1362 my %todo;
1321 1363
… …
1444 1486
1445sub exists($) { 1487sub exists($) {
1446 my ($login) = @_; 1488 my ($login) = @_;
1447 1489
1448 $cf::PLAYER{$login} 1490 $cf::PLAYER{$login}
1449 or cf::sync_job { !aio_stat path $login } 1491 or !aio_stat path $login
1450} 1492}
1451 1493
1452sub find($) { 1494sub find($) {
1453 return $cf::PLAYER{$_[0]} || do { 1495 return $cf::PLAYER{$_[0]} || do {
1454 my $login = $_[0]; 1496 my $login = $_[0];
… …
1850 1892
1851 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1893 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1852 "$UNIQUEDIR/$path" 1894 "$UNIQUEDIR/$path"
1853} 1895}
1854 1896
1855# and all this just because we cannot iterate over
1856# all maps in C++...
1857sub change_all_map_light {
1858 my ($change) = @_;
1859
1860 $_->change_map_light ($change)
1861 for grep $_->outdoor, values %cf::MAP;
1862}
1863
1864sub decay_objects { 1897sub decay_objects {
1865 my ($self) = @_; 1898 my ($self) = @_;
1866 1899
1867 return if $self->{deny_reset}; 1900 return if $self->{deny_reset};
1868 1901
… …
1950sub find { 1983sub find {
1951 my ($path, $origin) = @_; 1984 my ($path, $origin) = @_;
1952 1985
1953 $path = normalise $path, $origin && $origin->path; 1986 $path = normalise $path, $origin && $origin->path;
1954 1987
1955 cf::lock_wait "map_data:$path";#d#remove 1988 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1956 cf::lock_wait "map_find:$path"; 1989 my $guard2 = cf::lock_acquire "map_find:$path";
1957 1990
1958 $cf::MAP{$path} || do { 1991 $cf::MAP{$path} || do {
1959 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1960 my $guard2 = cf::lock_acquire "map_find:$path";
1961
1962 my $map = new_from_path cf::map $path 1992 my $map = new_from_path cf::map $path
1963 or return; 1993 or return;
1964 1994
1965 $map->{last_save} = $cf::RUNTIME; 1995 $map->{last_save} = $cf::RUNTIME;
1966 1996
… …
2034 unless ($self->{deny_activate}) { 2064 unless ($self->{deny_activate}) {
2035 $self->decay_objects; 2065 $self->decay_objects;
2036 $self->fix_auto_apply; 2066 $self->fix_auto_apply;
2037 $self->update_buttons; 2067 $self->update_buttons;
2038 cf::cede_to_tick; 2068 cf::cede_to_tick;
2039 $self->set_darkness_map;
2040 cf::cede_to_tick;
2041 $self->activate; 2069 $self->activate;
2042 } 2070 }
2043 2071
2044 $self->{last_save} = $cf::RUNTIME; 2072 $self->{last_save} = $cf::RUNTIME;
2045 $self->last_access ($cf::RUNTIME); 2073 $self->last_access ($cf::RUNTIME);
… …
2211 2239
2212 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2240 my $lock = cf::lock_acquire "map_data:$self->{path}";
2213 2241
2214 return if $self->players; 2242 return if $self->players;
2215 2243
2216 warn "resetting map ", $self->path; 2244 warn "resetting map ", $self->path, "\n";
2217 2245
2218 $self->in_memory (cf::MAP_SWAPPED); 2246 $self->in_memory (cf::MAP_SWAPPED);
2219 2247
2220 # need to save uniques path 2248 # need to save uniques path
2221 unless ($self->{deny_save}) { 2249 unless ($self->{deny_save}) {
… …
2386 2414
2387our $SAY_CHANNEL = { 2415our $SAY_CHANNEL = {
2388 id => "say", 2416 id => "say",
2389 title => "Map", 2417 title => "Map",
2390 reply => "say ", 2418 reply => "say ",
2391 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2419 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2392}; 2420};
2393 2421
2394our $CHAT_CHANNEL = { 2422our $CHAT_CHANNEL = {
2395 id => "chat", 2423 id => "chat",
2396 title => "Chat", 2424 title => "Chat",
… …
2522 2550
2523 $map->load; 2551 $map->load;
2524 $map->load_neighbours; 2552 $map->load_neighbours;
2525 2553
2526 return unless $self->contr->active; 2554 return unless $self->contr->active;
2527 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2528 $self->activate_recursive;
2529 2555
2530 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2556 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2531 $self->enter_map ($map, $x, $y); 2557 $self->enter_map ($map, $x, $y);
2558
2559 # only activate afterwards, to support waiting in hooks
2560 $self->activate_recursive;
2532} 2561}
2533 2562
2534=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2563=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2535 2564
2536Moves the player to the given map-path and coordinates by first freezing 2565Moves the player to the given map-path and coordinates by first freezing
… …
2771 id => "infobox", 2800 id => "infobox",
2772 title => "Body Parts", 2801 title => "Body Parts",
2773 reply => undef, 2802 reply => undef,
2774 tooltip => "Shows which body parts you posess and are available", 2803 tooltip => "Shows which body parts you posess and are available",
2775 }, 2804 },
2805 "c/statistics" => {
2806 id => "infobox",
2807 title => "Statistics",
2808 reply => undef,
2809 tooltip => "Shows your primary statistics",
2810 },
2811 "c/skills" => {
2812 id => "infobox",
2813 title => "Skills",
2814 reply => undef,
2815 tooltip => "Shows your experience per skill and item power",
2816 },
2817 "c/shopitems" => {
2818 id => "infobox",
2819 title => "Shop Items",
2820 reply => undef,
2821 tooltip => "Shows the items currently for sale in this shop",
2822 },
2823 "c/resistances" => {
2824 id => "infobox",
2825 title => "Resistances",
2826 reply => undef,
2827 tooltip => "Shows your resistances",
2828 },
2829 "c/pets" => {
2830 id => "infobox",
2831 title => "Pets",
2832 reply => undef,
2833 tooltip => "Shows information abotu your pets/a specific pet",
2834 },
2835 "c/perceiveself" => {
2836 id => "infobox",
2837 title => "Perceive Self",
2838 reply => undef,
2839 tooltip => "You gained detailed knowledge about yourself",
2840 },
2776 "c/uptime" => { 2841 "c/uptime" => {
2777 id => "infobox", 2842 id => "infobox",
2778 title => "Uptime", 2843 title => "Uptime",
2779 reply => undef, 2844 reply => undef,
2780 tooltip => "How long the server has been running since last restart", 2845 tooltip => "How long the server has been running since last restart",
… …
2789 id => "party", 2854 id => "party",
2790 title => "Party", 2855 title => "Party",
2791 reply => "gsay ", 2856 reply => "gsay ",
2792 tooltip => "Messages and chat related to your party", 2857 tooltip => "Messages and chat related to your party",
2793 }, 2858 },
2859 "c/death" => {
2860 id => "death",
2861 title => "Death",
2862 reply => undef,
2863 tooltip => "Reason for and more info about your most recent death",
2864 },
2865 "c/say" => $SAY_CHANNEL,
2866 "c/chat" => $CHAT_CHANNEL,
2794); 2867);
2795 2868
2796sub cf::client::send_msg { 2869sub cf::client::send_msg {
2797 my ($self, $channel, $msg, $color, @extra) = @_; 2870 my ($self, $channel, $msg, $color, @extra) = @_;
2798 2871
… …
2803 2876
2804 # check predefined channels, for the benefit of C 2877 # check predefined channels, for the benefit of C
2805 if ($CHANNEL{$channel}) { 2878 if ($CHANNEL{$channel}) {
2806 $channel = $CHANNEL{$channel}; 2879 $channel = $CHANNEL{$channel};
2807 2880
2808 $self->ext_msg (channel_info => $channel) 2881 $self->ext_msg (channel_info => $channel);
2809 if $self->can_msg;
2810
2811 $channel = $channel->{id}; 2882 $channel = $channel->{id};
2812 2883
2813 } elsif (ref $channel) { 2884 } elsif (ref $channel) {
2814 # send meta info to client, if not yet sent 2885 # send meta info to client, if not yet sent
2815 unless (exists $self->{channel}{$channel->{id}}) { 2886 unless (exists $self->{channel}{$channel->{id}}) {
2816 $self->{channel}{$channel->{id}} = $channel; 2887 $self->{channel}{$channel->{id}} = $channel;
2817 $self->ext_msg (channel_info => $channel) 2888 $self->ext_msg (channel_info => $channel);
2818 if $self->can_msg;
2819 } 2889 }
2820 2890
2821 $channel = $channel->{id}; 2891 $channel = $channel->{id};
2822 } 2892 }
2823 2893
2824 return unless @extra || length $msg; 2894 return unless @extra || length $msg;
2825 2895
2826 if ($self->can_msg) {
2827 # default colour, mask it out 2896 # default colour, mask it out
2828 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2897 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2829 if $color & cf::NDI_DEF; 2898 if $color & cf::NDI_DEF;
2830 2899
2831 my $pkt = "msg " 2900 my $pkt = "msg "
2832 . $self->{json_coder}->encode ( 2901 . $self->{json_coder}->encode (
2833 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2902 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2834 ); 2903 );
2835 2904
2836 # try lzf for large packets 2905 # try lzf for large packets
2837 $pkt = "lzf " . Compress::LZF::compress $pkt 2906 $pkt = "lzf " . Compress::LZF::compress $pkt
2838 if 1024 <= length $pkt and $self->{can_lzf}; 2907 if 1024 <= length $pkt and $self->{can_lzf};
2839 2908
2840 # split very large packets 2909 # split very large packets
2841 if (8192 < length $pkt and $self->{can_lzf}) { 2910 if (8192 < length $pkt and $self->{can_lzf}) {
2842 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; 2911 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2843 $pkt = "frag"; 2912 $pkt = "frag";
2844 } 2913 }
2845 2914
2846 $self->send_packet ($pkt); 2915 $self->send_packet ($pkt);
2847 } else {
2848 if ($color >= 0) {
2849 # replace some tags by gcfclient-compatible ones
2850 for ($msg) {
2851 1 while
2852 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2853 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2854 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2855 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2856 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2857 }
2858
2859 $color &= cf::NDI_COLOR_MASK;
2860
2861 utf8::encode $msg;
2862
2863 if (0 && $msg =~ /\[/) {
2864 # COMMAND/INFO
2865 $self->send_packet ("drawextinfo $color 10 8 $msg")
2866 } else {
2867 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2868 $self->send_packet ("drawinfo $color $msg")
2869 }
2870 }
2871 }
2872} 2916}
2873 2917
2874=item $client->ext_msg ($type, @msg) 2918=item $client->ext_msg ($type, @msg)
2875 2919
2876Sends an ext event to the client. 2920Sends an ext event to the client.
… …
3051The following functions and methods are available within a safe environment: 3095The following functions and methods are available within a safe environment:
3052 3096
3053 cf::object 3097 cf::object
3054 contr pay_amount pay_player map x y force_find force_add destroy 3098 contr pay_amount pay_player map x y force_find force_add destroy
3055 insert remove name archname title slaying race decrease split 3099 insert remove name archname title slaying race decrease split
3100 value
3056 3101
3057 cf::object::player 3102 cf::object::player
3058 player 3103 player
3059 3104
3060 cf::player 3105 cf::player
… …
3066=cut 3111=cut
3067 3112
3068for ( 3113for (
3069 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3114 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3070 insert remove inv nrof name archname title slaying race 3115 insert remove inv nrof name archname title slaying race
3071 decrease split destroy change_exp)], 3116 decrease split destroy change_exp value msg lore send_msg)],
3072 ["cf::object::player" => qw(player)], 3117 ["cf::object::player" => qw(player)],
3073 ["cf::player" => qw(peaceful)], 3118 ["cf::player" => qw(peaceful send_msg)],
3074 ["cf::map" => qw(trigger)], 3119 ["cf::map" => qw(trigger)],
3075) { 3120) {
3076 no strict 'refs'; 3121 no strict 'refs';
3077 my ($pkg, @funs) = @$_; 3122 my ($pkg, @funs) = @$_;
3078 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3123 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3095 my ($code, %vars) = @_; 3140 my ($code, %vars) = @_;
3096 3141
3097 my $qcode = $code; 3142 my $qcode = $code;
3098 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3143 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3099 $qcode =~ s/\n/\\n/g; 3144 $qcode =~ s/\n/\\n/g;
3145
3146 %vars = (_dummy => 0) unless %vars;
3100 3147
3101 local $_; 3148 local $_;
3102 local @safe::cf::_safe_eval_args = values %vars; 3149 local @safe::cf::_safe_eval_args = values %vars;
3103 3150
3104 my $eval = 3151 my $eval =
… …
3334 reload_treasures; 3381 reload_treasures;
3335 3382
3336 warn "finished reloading resource files\n"; 3383 warn "finished reloading resource files\n";
3337} 3384}
3338 3385
3339sub init {
3340 my $guard = freeze_mainloop;
3341
3342 evthread_start IO::AIO::poll_fileno;
3343
3344 reload_resources;
3345}
3346
3347sub reload_config { 3386sub reload_config {
3348 open my $fh, "<:utf8", "$CONFDIR/config" 3387 open my $fh, "<:utf8", "$CONFDIR/config"
3349 or return; 3388 or return;
3350 3389
3351 local $/; 3390 local $/;
… …
3382 3421
3383 seek $fh, 0, 0; 3422 seek $fh, 0, 0;
3384 print $fh $$; 3423 print $fh $$;
3385} 3424}
3386 3425
3426sub main_loop {
3427 warn "EV::loop starting\n";
3428 if (1) {
3429 EV::loop;
3430 }
3431 warn "EV::loop returned\n";
3432 goto &main_loop unless $REALLY_UNLOOP;
3433}
3434
3387sub main { 3435sub main {
3388 atomic; 3436 cf::init_globals; # initialise logging
3437
3438 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3439 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3440 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3441 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3442
3443 cf::init_experience;
3444 cf::init_anim;
3445 cf::init_attackmess;
3446 cf::init_dynamic;
3447
3448 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3389 3449
3390 # we must not ever block the main coroutine 3450 # we must not ever block the main coroutine
3391 local $Coro::idle = sub { 3451 local $Coro::idle = sub {
3392 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3452 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3393 (async { 3453 (async {
3394 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3454 $Coro::current->{desc} = "IDLE BUG HANDLER";
3395 EV::loop EV::LOOP_ONESHOT; 3455 EV::loop EV::LOOP_ONESHOT;
3396 })->prio (Coro::PRIO_MAX); 3456 })->prio (Coro::PRIO_MAX);
3397 }; 3457 };
3398 3458
3399 { 3459 evthread_start IO::AIO::poll_fileno;
3400 my $guard = freeze_mainloop; 3460
3461 cf::sync_job {
3462 reload_resources;
3401 reload_config; 3463 reload_config;
3402 db_init; 3464 db_init;
3465
3466 cf::load_settings;
3467 cf::load_materials;
3468 cf::init_uuid;
3469 cf::init_signals;
3470 cf::init_commands;
3471 cf::init_skills;
3472
3473 cf::init_beforeplay;
3474
3475 atomic;
3476
3403 load_extensions; 3477 load_extensions;
3404 3478
3405 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3406 }
3407
3408 utime time, time, $RUNTIMEFILE; 3479 utime time, time, $RUNTIMEFILE;
3409 3480
3410 # no (long-running) fork's whatsoever before this point(!) 3481 # no (long-running) fork's whatsoever before this point(!)
3482 use POSIX ();
3411 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3483 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3412 3484
3413 EV::loop; 3485 (pop @POST_INIT)->(0) while @POST_INIT;
3486 };
3487
3488 main_loop;
3414} 3489}
3415 3490
3416############################################################################# 3491#############################################################################
3417# initialisation and cleanup 3492# initialisation and cleanup
3418 3493
… …
3474 my $uuid = "$LOCALDIR/uuid"; 3549 my $uuid = "$LOCALDIR/uuid";
3475 3550
3476 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3551 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3477 or return; 3552 or return;
3478 3553
3479 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3554 my $value = uuid_seq uuid_cur;
3555
3556 unless ($value) {
3557 warn "cowardly refusing to write zero uuid value!\n";
3558 return;
3559 }
3560
3561 my $value = uuid_str $value + $uuid_skip;
3480 $uuid_skip = 0; 3562 $uuid_skip = 0;
3481 3563
3482 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3564 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3483 and return; 3565 and return;
3484 3566
… …
3506} 3588}
3507 3589
3508sub emergency_save() { 3590sub emergency_save() {
3509 my $freeze_guard = cf::freeze_mainloop; 3591 my $freeze_guard = cf::freeze_mainloop;
3510 3592
3511 warn "enter emergency perl save\n"; 3593 warn "emergency_perl_save: enter\n";
3512 3594
3513 cf::sync_job { 3595 cf::sync_job {
3596 # this is a trade-off: we want to be very quick here, so
3597 # save all maps without fsync, and later call a global sync
3598 # (which in turn might be very very slow)
3599 local $USE_FSYNC = 0;
3600
3514 # use a peculiar iteration method to avoid tripping on perl 3601 # use a peculiar iteration method to avoid tripping on perl
3515 # refcount bugs in for. also avoids problems with players 3602 # refcount bugs in for. also avoids problems with players
3516 # and maps saved/destroyed asynchronously. 3603 # and maps saved/destroyed asynchronously.
3517 warn "begin emergency player save\n"; 3604 warn "emergency_perl_save: begin player save\n";
3518 for my $login (keys %cf::PLAYER) { 3605 for my $login (keys %cf::PLAYER) {
3519 my $pl = $cf::PLAYER{$login} or next; 3606 my $pl = $cf::PLAYER{$login} or next;
3520 $pl->valid or next; 3607 $pl->valid or next;
3521 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3608 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3522 $pl->save; 3609 $pl->save;
3523 } 3610 }
3524 warn "end emergency player save\n"; 3611 warn "emergency_perl_save: end player save\n";
3525 3612
3526 warn "begin emergency map save\n"; 3613 warn "emergency_perl_save: begin map save\n";
3527 for my $path (keys %cf::MAP) { 3614 for my $path (keys %cf::MAP) {
3528 my $map = $cf::MAP{$path} or next; 3615 my $map = $cf::MAP{$path} or next;
3529 $map->valid or next; 3616 $map->valid or next;
3530 $map->save; 3617 $map->save;
3531 } 3618 }
3532 warn "end emergency map save\n"; 3619 warn "emergency_perl_save: end map save\n";
3533 3620
3534 warn "begin emergency database checkpoint\n"; 3621 warn "emergency_perl_save: begin database checkpoint\n";
3535 BDB::db_env_txn_checkpoint $DB_ENV; 3622 BDB::db_env_txn_checkpoint $DB_ENV;
3536 warn "end emergency database checkpoint\n"; 3623 warn "emergency_perl_save: end database checkpoint\n";
3537 3624
3538 warn "begin write uuid\n"; 3625 warn "emergency_perl_save: begin write uuid\n";
3539 write_uuid_sync 1; 3626 write_uuid_sync 1;
3540 warn "end write uuid\n"; 3627 warn "emergency_perl_save: end write uuid\n";
3541 }; 3628 };
3542 3629
3630 warn "emergency_perl_save: starting sync()\n";
3631 IO::AIO::aio_sync sub {
3632 warn "emergency_perl_save: finished sync()\n";
3633 };
3634
3543 warn "leave emergency perl save\n"; 3635 warn "emergency_perl_save: leave\n";
3544} 3636}
3545 3637
3546sub post_cleanup { 3638sub post_cleanup {
3547 my ($make_core) = @_; 3639 my ($make_core) = @_;
3548 3640
… …
3574 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3666 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3575 for my $name (keys %$leaf_symtab) { 3667 for my $name (keys %$leaf_symtab) {
3576 _gv_clear *{"$pkg$name"}; 3668 _gv_clear *{"$pkg$name"};
3577# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3669# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3578 } 3670 }
3579 warn "cleared package #$pkg\n";#d# 3671 warn "cleared package $pkg\n";#d#
3580} 3672}
3581
3582our $RELOAD; # how many times to reload
3583 3673
3584sub do_reload_perl() { 3674sub do_reload_perl() {
3585 # can/must only be called in main 3675 # can/must only be called in main
3586 if ($Coro::current != $Coro::main) { 3676 if ($Coro::current != $Coro::main) {
3587 warn "can only reload from main coroutine"; 3677 warn "can only reload from main coroutine";
3588 return; 3678 return;
3589 } 3679 }
3590 3680
3591 return if $RELOAD++; 3681 return if $RELOAD++;
3682
3683 my $t1 = EV::time;
3592 3684
3593 while ($RELOAD) { 3685 while ($RELOAD) {
3594 warn "reloading..."; 3686 warn "reloading...";
3595 3687
3596 warn "entering sync_job"; 3688 warn "entering sync_job";
… …
3657 clear_package "safe::$_" 3749 clear_package "safe::$_"
3658 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3750 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3659 3751
3660 warn "unloading cf.pm \"a bit\""; 3752 warn "unloading cf.pm \"a bit\"";
3661 delete $INC{"cf.pm"}; 3753 delete $INC{"cf.pm"};
3662 delete $INC{"cf/pod.pm"}; 3754 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3663 3755
3664 # don't, removes xs symbols, too, 3756 # don't, removes xs symbols, too,
3665 # and global variables created in xs 3757 # and global variables created in xs
3666 #clear_package __PACKAGE__; 3758 #clear_package __PACKAGE__;
3667 3759
… …
3675 cf::reload_config; 3767 cf::reload_config;
3676 3768
3677 warn "loading extensions"; 3769 warn "loading extensions";
3678 cf::load_extensions; 3770 cf::load_extensions;
3679 3771
3772 if ($REATTACH_ON_RELOAD) {
3680 warn "reattaching attachments to objects/players"; 3773 warn "reattaching attachments to objects/players";
3681 _global_reattach; # objects, sockets 3774 _global_reattach; # objects, sockets
3682 warn "reattaching attachments to maps"; 3775 warn "reattaching attachments to maps";
3683 reattach $_ for values %MAP; 3776 reattach $_ for values %MAP;
3684 warn "reattaching attachments to players"; 3777 warn "reattaching attachments to players";
3685 reattach $_ for values %PLAYER; 3778 reattach $_ for values %PLAYER;
3779 }
3780
3781 warn "running post_init jobs";
3782 (pop @POST_INIT)->(1) while @POST_INIT;
3686 3783
3687 warn "leaving sync_job"; 3784 warn "leaving sync_job";
3688 3785
3689 1 3786 1
3690 } or do { 3787 } or do {
… …
3693 }; 3790 };
3694 3791
3695 warn "reloaded"; 3792 warn "reloaded";
3696 --$RELOAD; 3793 --$RELOAD;
3697 } 3794 }
3795
3796 $t1 = EV::time - $t1;
3797 warn "reload completed in ${t1}s\n";
3698}; 3798};
3699 3799
3700our $RELOAD_WATCHER; # used only during reload 3800our $RELOAD_WATCHER; # used only during reload
3701 3801
3702sub reload_perl() { 3802sub reload_perl() {
3703 # doing reload synchronously and two reloads happen back-to-back, 3803 # doing reload synchronously and two reloads happen back-to-back,
3704 # coro crashes during coro_state_free->destroy here. 3804 # coro crashes during coro_state_free->destroy here.
3705 3805
3806 $RELOAD_WATCHER ||= cf::async {
3807 Coro::AIO::aio_wait cache_extensions;
3808
3706 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3809 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3707 do_reload_perl; 3810 do_reload_perl;
3708 undef $RELOAD_WATCHER; 3811 undef $RELOAD_WATCHER;
3812 };
3709 }; 3813 };
3710} 3814}
3711 3815
3712register_command "reload" => sub { 3816register_command "reload" => sub {
3713 my ($who, $arg) = @_; 3817 my ($who, $arg) = @_;
… …
3872 LOG llevInfo, "[ABT] [suppressed]\n"; 3976 LOG llevInfo, "[ABT] [suppressed]\n";
3873 } 3977 }
3874} 3978}
3875 3979
3876# load additional modules 3980# load additional modules
3877use cf::pod; 3981require "cf/$_.pm" for @EXTRA_MODULES;
3878 3982
3879END { cf::emergency_save } 3983END { cf::emergency_save }
3880 3984
38811 39851
3882 3986

Diff Legend

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