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.450 by root, Mon Sep 22 01:33:09 2008 UTC vs.
Revision 1.479 by root, Thu Oct 8 05:04:27 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}
149 173
150############################################################################# 174#############################################################################
151 175
152=head2 GLOBAL VARIABLES 176=head2 GLOBAL VARIABLES
153 177
… …
204 228
205This array contains the results of the last C<invoke ()> call. When 229This 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 230C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
207that call. 231that call.
208 232
233=item %cf::REFLECT
234
235Contains, for each (C++) class name, a hash reference with information
236about object members (methods, scalars and arrays) and other metadata,
237which is useful for introspection.
238
209=back 239=back
210 240
211=cut 241=cut
212 242
213BEGIN { 243$Coro::State::WARNHOOK = sub {
214 *CORE::GLOBAL::warn = sub {
215 my $msg = join "", @_; 244 my $msg = join "", @_;
216 245
217 $msg .= "\n" 246 $msg .= "\n"
218 unless $msg =~ /\n$/; 247 unless $msg =~ /\n$/;
219 248
220 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 249 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
221 250
222 LOG llevError, $msg; 251 LOG llevError, $msg;
223 }; 252};
224}
225 253
226$Coro::State::DIEHOOK = sub { 254$Coro::State::DIEHOOK = sub {
227 return unless $^S eq 0; # "eq", not "==" 255 return unless $^S eq 0; # "eq", not "=="
256
257 warn Carp::longmess $_[0];
228 258
229 if ($Coro::current == $Coro::main) {#d# 259 if ($Coro::current == $Coro::main) {#d#
230 warn "DIEHOOK called in main context, Coro bug?\n";#d# 260 warn "DIEHOOK called in main context, Coro bug?\n";#d#
231 return;#d# 261 return;#d#
232 }#d# 262 }#d#
233 263
234 # kill coroutine otherwise 264 # kill coroutine otherwise
235 warn Carp::longmess $_[0];
236 Coro::terminate 265 Coro::terminate
237}; 266};
238
239$SIG{__DIE__} = sub { }; #d#?
240 267
241@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 268@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
242@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 269@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
243@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 270@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
244@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 271@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
305our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 332our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
306 333
307sub encode_json($) { $json_coder->encode ($_[0]) } 334sub encode_json($) { $json_coder->encode ($_[0]) }
308sub decode_json($) { $json_coder->decode ($_[0]) } 335sub decode_json($) { $json_coder->decode ($_[0]) }
309 336
337=item cf::post_init { BLOCK }
338
339Execute the given codeblock, I<after> all extensions have been (re-)loaded,
340but I<before> the server starts ticking again.
341
342The cdoeblock will have a single boolean argument to indicate whether this
343is a reload or not.
344
345=cut
346
347sub post_init(&) {
348 push @POST_INIT, shift;
349}
350
310=item cf::lock_wait $string 351=item cf::lock_wait $string
311 352
312Wait until the given lock is available. See cf::lock_acquire. 353Wait until the given lock is available. See cf::lock_acquire.
313 354
314=item my $lock = cf::lock_acquire $string 355=item my $lock = cf::lock_acquire $string
315 356
316Wait until the given lock is available and then acquires it and returns 357Wait 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, 358a L<Guard> object. If the guard object gets destroyed (goes out of scope,
318for example when the coroutine gets canceled), the lock is automatically 359for example when the coroutine gets canceled), the lock is automatically
319returned. 360returned.
320 361
321Locks are *not* recursive, locking from the same coro twice results in a 362Locks are *not* recursive, locking from the same coro twice results in a
322deadlocked coro. 363deadlocked coro.
… …
328 369
329Return true if the lock is currently active, i.e. somebody has locked it. 370Return true if the lock is currently active, i.e. somebody has locked it.
330 371
331=cut 372=cut
332 373
333our %LOCK; 374our $LOCKS = new Coro::SemaphoreSet;
334our %LOCKER;#d#
335 375
336sub lock_wait($) { 376sub lock_wait($) {
337 my ($key) = @_; 377 $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} 378}
350 379
351sub lock_acquire($) { 380sub lock_acquire($) {
352 my ($key) = @_; 381 $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} 382}
366 383
367sub lock_active($) { 384sub lock_active($) {
368 my ($key) = @_; 385 $LOCKS->count ($_[0]) < 1
369
370 ! ! $LOCK{$key}
371} 386}
372 387
373sub freeze_mainloop { 388sub freeze_mainloop {
374 tick_inhibit_inc; 389 tick_inhibit_inc;
375 390
376 Coro::guard \&tick_inhibit_dec; 391 &Guard::guard (\&tick_inhibit_dec);
377} 392}
378 393
379=item cf::periodic $interval, $cb 394=item cf::periodic $interval, $cb
380 395
381Like EV::periodic, but randomly selects a starting point so that the actions 396Like EV::periodic, but randomly selects a starting point so that the actions
… …
1153 $decname, length $$rdata, scalar @$objs; 1168 $decname, length $$rdata, scalar @$objs;
1154 1169
1155 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1170 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1156 aio_chmod $fh, SAVE_MODE; 1171 aio_chmod $fh, SAVE_MODE;
1157 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1172 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1158 aio_fsync $fh if $cf::USE_FSYNC; 1173 if ($cf::USE_FSYNC) {
1174 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;
1175 aio_fsync $fh;
1176 }
1159 aio_close $fh; 1177 aio_close $fh;
1160 1178
1161 if (@$objs) { 1179 if (@$objs) {
1162 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1180 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1163 aio_chmod $fh, SAVE_MODE; 1181 aio_chmod $fh, SAVE_MODE;
1164 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1182 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1165 aio_write $fh, 0, (length $data), $data, 0; 1183 aio_write $fh, 0, (length $data), $data, 0;
1166 aio_fsync $fh if $cf::USE_FSYNC; 1184 if ($cf::USE_FSYNC) {
1185 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;
1186 aio_fsync $fh;
1187 }
1167 aio_close $fh; 1188 aio_close $fh;
1168 aio_rename "$filename.pst~", "$filename.pst"; 1189 aio_rename "$filename.pst~", "$filename.pst";
1169 } 1190 }
1170 } else { 1191 } else {
1171 aio_unlink "$filename.pst"; 1192 aio_unlink "$filename.pst";
1172 } 1193 }
1173 1194
1174 aio_rename "$filename~", $filename; 1195 aio_rename "$filename~", $filename;
1196
1197 $filename =~ s%/[^/]+$%%;
1198 aio_pathsync $filename if $cf::USE_FSYNC;
1175 } else { 1199 } else {
1176 warn "FATAL: $filename~: $!\n"; 1200 warn "unable to save objects: $filename~: $!\n";
1177 } 1201 }
1178 } else { 1202 } else {
1179 aio_unlink $filename; 1203 aio_unlink $filename;
1180 aio_unlink "$filename.pst"; 1204 aio_unlink "$filename.pst";
1181 } 1205 }
… …
1272 my ($name, $cb) = @_; 1296 my ($name, $cb) = @_;
1273 1297
1274 $EXTICMD{$name} = $cb; 1298 $EXTICMD{$name} = $cb;
1275} 1299}
1276 1300
1301use File::Glob ();
1302
1277cf::player->attach ( 1303cf::player->attach (
1278 on_command => sub { 1304 on_command => sub {
1279 my ($pl, $name, $params) = @_; 1305 my ($pl, $name, $params) = @_;
1280 1306
1281 my $cb = $COMMAND{$name} 1307 my $cb = $COMMAND{$name}
… …
1312 } 1338 }
1313 1339
1314 cf::override; 1340 cf::override;
1315 }, 1341 },
1316); 1342);
1343
1344# "readahead" all extensions
1345sub cache_extensions {
1346 my $grp = IO::AIO::aio_group;
1347
1348 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1349 for (grep /\.ext$/, @{$_[0]}) {
1350 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1351 }
1352 };
1353
1354 $grp
1355}
1317 1356
1318sub load_extensions { 1357sub load_extensions {
1319 cf::sync_job { 1358 cf::sync_job {
1320 my %todo; 1359 my %todo;
1321 1360
… …
1444 1483
1445sub exists($) { 1484sub exists($) {
1446 my ($login) = @_; 1485 my ($login) = @_;
1447 1486
1448 $cf::PLAYER{$login} 1487 $cf::PLAYER{$login}
1449 or cf::sync_job { !aio_stat path $login } 1488 or !aio_stat path $login
1450} 1489}
1451 1490
1452sub find($) { 1491sub find($) {
1453 return $cf::PLAYER{$_[0]} || do { 1492 return $cf::PLAYER{$_[0]} || do {
1454 my $login = $_[0]; 1493 my $login = $_[0];
… …
1850 1889
1851 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1890 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1852 "$UNIQUEDIR/$path" 1891 "$UNIQUEDIR/$path"
1853} 1892}
1854 1893
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 { 1894sub decay_objects {
1865 my ($self) = @_; 1895 my ($self) = @_;
1866 1896
1867 return if $self->{deny_reset}; 1897 return if $self->{deny_reset};
1868 1898
… …
1950sub find { 1980sub find {
1951 my ($path, $origin) = @_; 1981 my ($path, $origin) = @_;
1952 1982
1953 $path = normalise $path, $origin && $origin->path; 1983 $path = normalise $path, $origin && $origin->path;
1954 1984
1955 cf::lock_wait "map_data:$path";#d#remove 1985 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1956 cf::lock_wait "map_find:$path"; 1986 my $guard2 = cf::lock_acquire "map_find:$path";
1957 1987
1958 $cf::MAP{$path} || do { 1988 $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 1989 my $map = new_from_path cf::map $path
1963 or return; 1990 or return;
1964 1991
1965 $map->{last_save} = $cf::RUNTIME; 1992 $map->{last_save} = $cf::RUNTIME;
1966 1993
… …
2034 unless ($self->{deny_activate}) { 2061 unless ($self->{deny_activate}) {
2035 $self->decay_objects; 2062 $self->decay_objects;
2036 $self->fix_auto_apply; 2063 $self->fix_auto_apply;
2037 $self->update_buttons; 2064 $self->update_buttons;
2038 cf::cede_to_tick; 2065 cf::cede_to_tick;
2039 $self->set_darkness_map;
2040 cf::cede_to_tick;
2041 $self->activate; 2066 $self->activate;
2042 } 2067 }
2043 2068
2044 $self->{last_save} = $cf::RUNTIME; 2069 $self->{last_save} = $cf::RUNTIME;
2045 $self->last_access ($cf::RUNTIME); 2070 $self->last_access ($cf::RUNTIME);
… …
2211 2236
2212 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2237 my $lock = cf::lock_acquire "map_data:$self->{path}";
2213 2238
2214 return if $self->players; 2239 return if $self->players;
2215 2240
2216 warn "resetting map ", $self->path; 2241 warn "resetting map ", $self->path, "\n";
2217 2242
2218 $self->in_memory (cf::MAP_SWAPPED); 2243 $self->in_memory (cf::MAP_SWAPPED);
2219 2244
2220 # need to save uniques path 2245 # need to save uniques path
2221 unless ($self->{deny_save}) { 2246 unless ($self->{deny_save}) {
… …
2386 2411
2387our $SAY_CHANNEL = { 2412our $SAY_CHANNEL = {
2388 id => "say", 2413 id => "say",
2389 title => "Map", 2414 title => "Map",
2390 reply => "say ", 2415 reply => "say ",
2391 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2416 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2392}; 2417};
2393 2418
2394our $CHAT_CHANNEL = { 2419our $CHAT_CHANNEL = {
2395 id => "chat", 2420 id => "chat",
2396 title => "Chat", 2421 title => "Chat",
… …
2522 2547
2523 $map->load; 2548 $map->load;
2524 $map->load_neighbours; 2549 $map->load_neighbours;
2525 2550
2526 return unless $self->contr->active; 2551 return unless $self->contr->active;
2527 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2528 $self->activate_recursive;
2529 2552
2530 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2553 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2531 $self->enter_map ($map, $x, $y); 2554 $self->enter_map ($map, $x, $y);
2555
2556 # only activate afterwards, to support waiting in hooks
2557 $self->activate_recursive;
2532} 2558}
2533 2559
2534=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2560=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2535 2561
2536Moves the player to the given map-path and coordinates by first freezing 2562Moves the player to the given map-path and coordinates by first freezing
… …
2771 id => "infobox", 2797 id => "infobox",
2772 title => "Body Parts", 2798 title => "Body Parts",
2773 reply => undef, 2799 reply => undef,
2774 tooltip => "Shows which body parts you posess and are available", 2800 tooltip => "Shows which body parts you posess and are available",
2775 }, 2801 },
2802 "c/statistics" => {
2803 id => "infobox",
2804 title => "Statistics",
2805 reply => undef,
2806 tooltip => "Shows your primary statistics",
2807 },
2776 "c/skills" => { 2808 "c/skills" => {
2777 id => "infobox", 2809 id => "infobox",
2778 title => "Skills", 2810 title => "Skills",
2779 reply => undef, 2811 reply => undef,
2780 tooltip => "Shows your experience per skill and item power", 2812 tooltip => "Shows your experience per skill and item power",
2813 },
2814 "c/shopitems" => {
2815 id => "infobox",
2816 title => "Shop Items",
2817 reply => undef,
2818 tooltip => "Shows the items currently for sale in this shop",
2819 },
2820 "c/resistances" => {
2821 id => "infobox",
2822 title => "Resistances",
2823 reply => undef,
2824 tooltip => "Shows your resistances",
2825 },
2826 "c/pets" => {
2827 id => "infobox",
2828 title => "Pets",
2829 reply => undef,
2830 tooltip => "Shows information abotu your pets/a specific pet",
2831 },
2832 "c/perceiveself" => {
2833 id => "infobox",
2834 title => "Perceive Self",
2835 reply => undef,
2836 tooltip => "You gained detailed knowledge about yourself",
2781 }, 2837 },
2782 "c/uptime" => { 2838 "c/uptime" => {
2783 id => "infobox", 2839 id => "infobox",
2784 title => "Uptime", 2840 title => "Uptime",
2785 reply => undef, 2841 reply => undef,
… …
2795 id => "party", 2851 id => "party",
2796 title => "Party", 2852 title => "Party",
2797 reply => "gsay ", 2853 reply => "gsay ",
2798 tooltip => "Messages and chat related to your party", 2854 tooltip => "Messages and chat related to your party",
2799 }, 2855 },
2856 "c/death" => {
2857 id => "death",
2858 title => "Death",
2859 reply => undef,
2860 tooltip => "Reason for and more info about your most recent death",
2861 },
2862 "c/say" => $SAY_CHANNEL,
2863 "c/chat" => $CHAT_CHANNEL,
2800); 2864);
2801 2865
2802sub cf::client::send_msg { 2866sub cf::client::send_msg {
2803 my ($self, $channel, $msg, $color, @extra) = @_; 2867 my ($self, $channel, $msg, $color, @extra) = @_;
2804 2868
… …
2809 2873
2810 # check predefined channels, for the benefit of C 2874 # check predefined channels, for the benefit of C
2811 if ($CHANNEL{$channel}) { 2875 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel}; 2876 $channel = $CHANNEL{$channel};
2813 2877
2814 $self->ext_msg (channel_info => $channel) 2878 $self->ext_msg (channel_info => $channel);
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id}; 2879 $channel = $channel->{id};
2818 2880
2819 } elsif (ref $channel) { 2881 } elsif (ref $channel) {
2820 # send meta info to client, if not yet sent 2882 # send meta info to client, if not yet sent
2821 unless (exists $self->{channel}{$channel->{id}}) { 2883 unless (exists $self->{channel}{$channel->{id}}) {
2822 $self->{channel}{$channel->{id}} = $channel; 2884 $self->{channel}{$channel->{id}} = $channel;
2823 $self->ext_msg (channel_info => $channel) 2885 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825 } 2886 }
2826 2887
2827 $channel = $channel->{id}; 2888 $channel = $channel->{id};
2828 } 2889 }
2829 2890
2830 return unless @extra || length $msg; 2891 return unless @extra || length $msg;
2831 2892
2832 if ($self->can_msg) {
2833 # default colour, mask it out 2893 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2894 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF; 2895 if $color & cf::NDI_DEF;
2836 2896
2837 my $pkt = "msg " 2897 my $pkt = "msg "
2838 . $self->{json_coder}->encode ( 2898 . $self->{json_coder}->encode (
2839 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2899 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2840 ); 2900 );
2841 2901
2842 # try lzf for large packets 2902 # try lzf for large packets
2843 $pkt = "lzf " . Compress::LZF::compress $pkt 2903 $pkt = "lzf " . Compress::LZF::compress $pkt
2844 if 1024 <= length $pkt and $self->{can_lzf}; 2904 if 1024 <= length $pkt and $self->{can_lzf};
2845 2905
2846 # split very large packets 2906 # split very large packets
2847 if (8192 < length $pkt and $self->{can_lzf}) { 2907 if (8192 < length $pkt and $self->{can_lzf}) {
2848 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; 2908 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2849 $pkt = "frag"; 2909 $pkt = "frag";
2850 } 2910 }
2851 2911
2852 $self->send_packet ($pkt); 2912 $self->send_packet ($pkt);
2853 } else {
2854 if ($color >= 0) {
2855 # replace some tags by gcfclient-compatible ones
2856 for ($msg) {
2857 1 while
2858 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2859 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2860 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2861 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2862 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2863 }
2864
2865 $color &= cf::NDI_COLOR_MASK;
2866
2867 utf8::encode $msg;
2868
2869 if (0 && $msg =~ /\[/) {
2870 # COMMAND/INFO
2871 $self->send_packet ("drawextinfo $color 10 8 $msg")
2872 } else {
2873 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2874 $self->send_packet ("drawinfo $color $msg")
2875 }
2876 }
2877 }
2878} 2913}
2879 2914
2880=item $client->ext_msg ($type, @msg) 2915=item $client->ext_msg ($type, @msg)
2881 2916
2882Sends an ext event to the client. 2917Sends an ext event to the client.
… …
3057The following functions and methods are available within a safe environment: 3092The following functions and methods are available within a safe environment:
3058 3093
3059 cf::object 3094 cf::object
3060 contr pay_amount pay_player map x y force_find force_add destroy 3095 contr pay_amount pay_player map x y force_find force_add destroy
3061 insert remove name archname title slaying race decrease split 3096 insert remove name archname title slaying race decrease split
3097 value
3062 3098
3063 cf::object::player 3099 cf::object::player
3064 player 3100 player
3065 3101
3066 cf::player 3102 cf::player
… …
3072=cut 3108=cut
3073 3109
3074for ( 3110for (
3075 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3111 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3076 insert remove inv nrof name archname title slaying race 3112 insert remove inv nrof name archname title slaying race
3077 decrease split destroy change_exp)], 3113 decrease split destroy change_exp value msg lore send_msg)],
3078 ["cf::object::player" => qw(player)], 3114 ["cf::object::player" => qw(player)],
3079 ["cf::player" => qw(peaceful)], 3115 ["cf::player" => qw(peaceful send_msg)],
3080 ["cf::map" => qw(trigger)], 3116 ["cf::map" => qw(trigger)],
3081) { 3117) {
3082 no strict 'refs'; 3118 no strict 'refs';
3083 my ($pkg, @funs) = @$_; 3119 my ($pkg, @funs) = @$_;
3084 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3120 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3101 my ($code, %vars) = @_; 3137 my ($code, %vars) = @_;
3102 3138
3103 my $qcode = $code; 3139 my $qcode = $code;
3104 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3140 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3105 $qcode =~ s/\n/\\n/g; 3141 $qcode =~ s/\n/\\n/g;
3142
3143 %vars = (_dummy => 0) unless %vars;
3106 3144
3107 local $_; 3145 local $_;
3108 local @safe::cf::_safe_eval_args = values %vars; 3146 local @safe::cf::_safe_eval_args = values %vars;
3109 3147
3110 my $eval = 3148 my $eval =
… …
3340 reload_treasures; 3378 reload_treasures;
3341 3379
3342 warn "finished reloading resource files\n"; 3380 warn "finished reloading resource files\n";
3343} 3381}
3344 3382
3345sub init {
3346 my $guard = freeze_mainloop;
3347
3348 evthread_start IO::AIO::poll_fileno;
3349
3350 reload_resources;
3351}
3352
3353sub reload_config { 3383sub reload_config {
3354 open my $fh, "<:utf8", "$CONFDIR/config" 3384 open my $fh, "<:utf8", "$CONFDIR/config"
3355 or return; 3385 or return;
3356 3386
3357 local $/; 3387 local $/;
… …
3388 3418
3389 seek $fh, 0, 0; 3419 seek $fh, 0, 0;
3390 print $fh $$; 3420 print $fh $$;
3391} 3421}
3392 3422
3423sub main_loop {
3424 warn "EV::loop starting\n";
3425 if (1) {
3426 EV::loop;
3427 }
3428 warn "EV::loop returned\n";
3429 goto &main_loop unless $REALLY_UNLOOP;
3430}
3431
3393sub main { 3432sub main {
3394 atomic; 3433 cf::init_globals; # initialise logging
3434
3435 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3436 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3437 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3438 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3439
3440 cf::init_experience;
3441 cf::init_anim;
3442 cf::init_attackmess;
3443 cf::init_dynamic;
3444
3445 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3395 3446
3396 # we must not ever block the main coroutine 3447 # we must not ever block the main coroutine
3397 local $Coro::idle = sub { 3448 local $Coro::idle = sub {
3398 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3449 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3399 (async { 3450 (async {
3400 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3451 $Coro::current->{desc} = "IDLE BUG HANDLER";
3401 EV::loop EV::LOOP_ONESHOT; 3452 EV::loop EV::LOOP_ONESHOT;
3402 })->prio (Coro::PRIO_MAX); 3453 })->prio (Coro::PRIO_MAX);
3403 }; 3454 };
3404 3455
3405 { 3456 evthread_start IO::AIO::poll_fileno;
3406 my $guard = freeze_mainloop; 3457
3458 cf::sync_job {
3459 reload_resources;
3407 reload_config; 3460 reload_config;
3408 db_init; 3461 db_init;
3462
3463 cf::load_settings;
3464 cf::load_materials;
3465 cf::init_uuid;
3466 cf::init_signals;
3467 cf::init_commands;
3468 cf::init_skills;
3469
3470 cf::init_beforeplay;
3471
3472 atomic;
3473
3409 load_extensions; 3474 load_extensions;
3410 3475
3411 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3412 }
3413
3414 utime time, time, $RUNTIMEFILE; 3476 utime time, time, $RUNTIMEFILE;
3415 3477
3416 # no (long-running) fork's whatsoever before this point(!) 3478 # no (long-running) fork's whatsoever before this point(!)
3479 use POSIX ();
3417 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3480 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3418 3481
3419 EV::loop; 3482 (pop @POST_INIT)->(0) while @POST_INIT;
3483 };
3484
3485 main_loop;
3420} 3486}
3421 3487
3422############################################################################# 3488#############################################################################
3423# initialisation and cleanup 3489# initialisation and cleanup
3424 3490
… …
3480 my $uuid = "$LOCALDIR/uuid"; 3546 my $uuid = "$LOCALDIR/uuid";
3481 3547
3482 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3548 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3483 or return; 3549 or return;
3484 3550
3485 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3551 my $value = uuid_seq uuid_cur;
3552
3553 unless ($value) {
3554 warn "cowardly refusing to write zero uuid value!\n";
3555 return;
3556 }
3557
3558 my $value = uuid_str $value + $uuid_skip;
3486 $uuid_skip = 0; 3559 $uuid_skip = 0;
3487 3560
3488 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3561 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3489 and return; 3562 and return;
3490 3563
… …
3512} 3585}
3513 3586
3514sub emergency_save() { 3587sub emergency_save() {
3515 my $freeze_guard = cf::freeze_mainloop; 3588 my $freeze_guard = cf::freeze_mainloop;
3516 3589
3517 warn "enter emergency perl save\n"; 3590 warn "emergency_perl_save: enter\n";
3518 3591
3519 cf::sync_job { 3592 cf::sync_job {
3593 # this is a trade-off: we want to be very quick here, so
3594 # save all maps without fsync, and later call a global sync
3595 # (which in turn might be very very slow)
3596 local $USE_FSYNC = 0;
3597
3520 # use a peculiar iteration method to avoid tripping on perl 3598 # use a peculiar iteration method to avoid tripping on perl
3521 # refcount bugs in for. also avoids problems with players 3599 # refcount bugs in for. also avoids problems with players
3522 # and maps saved/destroyed asynchronously. 3600 # and maps saved/destroyed asynchronously.
3523 warn "begin emergency player save\n"; 3601 warn "emergency_perl_save: begin player save\n";
3524 for my $login (keys %cf::PLAYER) { 3602 for my $login (keys %cf::PLAYER) {
3525 my $pl = $cf::PLAYER{$login} or next; 3603 my $pl = $cf::PLAYER{$login} or next;
3526 $pl->valid or next; 3604 $pl->valid or next;
3527 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3605 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3528 $pl->save; 3606 $pl->save;
3529 } 3607 }
3530 warn "end emergency player save\n"; 3608 warn "emergency_perl_save: end player save\n";
3531 3609
3532 warn "begin emergency map save\n"; 3610 warn "emergency_perl_save: begin map save\n";
3533 for my $path (keys %cf::MAP) { 3611 for my $path (keys %cf::MAP) {
3534 my $map = $cf::MAP{$path} or next; 3612 my $map = $cf::MAP{$path} or next;
3535 $map->valid or next; 3613 $map->valid or next;
3536 $map->save; 3614 $map->save;
3537 } 3615 }
3538 warn "end emergency map save\n"; 3616 warn "emergency_perl_save: end map save\n";
3539 3617
3540 warn "begin emergency database checkpoint\n"; 3618 warn "emergency_perl_save: begin database checkpoint\n";
3541 BDB::db_env_txn_checkpoint $DB_ENV; 3619 BDB::db_env_txn_checkpoint $DB_ENV;
3542 warn "end emergency database checkpoint\n"; 3620 warn "emergency_perl_save: end database checkpoint\n";
3543 3621
3544 warn "begin write uuid\n"; 3622 warn "emergency_perl_save: begin write uuid\n";
3545 write_uuid_sync 1; 3623 write_uuid_sync 1;
3546 warn "end write uuid\n"; 3624 warn "emergency_perl_save: end write uuid\n";
3547 }; 3625 };
3548 3626
3627 warn "emergency_perl_save: starting sync()\n";
3628 IO::AIO::aio_sync sub {
3629 warn "emergency_perl_save: finished sync()\n";
3630 };
3631
3549 warn "leave emergency perl save\n"; 3632 warn "emergency_perl_save: leave\n";
3550} 3633}
3551 3634
3552sub post_cleanup { 3635sub post_cleanup {
3553 my ($make_core) = @_; 3636 my ($make_core) = @_;
3554 3637
… …
3580 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3663 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3581 for my $name (keys %$leaf_symtab) { 3664 for my $name (keys %$leaf_symtab) {
3582 _gv_clear *{"$pkg$name"}; 3665 _gv_clear *{"$pkg$name"};
3583# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3666# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3584 } 3667 }
3585 warn "cleared package #$pkg\n";#d# 3668 warn "cleared package $pkg\n";#d#
3586} 3669}
3587
3588our $RELOAD; # how many times to reload
3589 3670
3590sub do_reload_perl() { 3671sub do_reload_perl() {
3591 # can/must only be called in main 3672 # can/must only be called in main
3592 if ($Coro::current != $Coro::main) { 3673 if ($Coro::current != $Coro::main) {
3593 warn "can only reload from main coroutine"; 3674 warn "can only reload from main coroutine";
3594 return; 3675 return;
3595 } 3676 }
3596 3677
3597 return if $RELOAD++; 3678 return if $RELOAD++;
3679
3680 my $t1 = EV::time;
3598 3681
3599 while ($RELOAD) { 3682 while ($RELOAD) {
3600 warn "reloading..."; 3683 warn "reloading...";
3601 3684
3602 warn "entering sync_job"; 3685 warn "entering sync_job";
… …
3663 clear_package "safe::$_" 3746 clear_package "safe::$_"
3664 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3747 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3665 3748
3666 warn "unloading cf.pm \"a bit\""; 3749 warn "unloading cf.pm \"a bit\"";
3667 delete $INC{"cf.pm"}; 3750 delete $INC{"cf.pm"};
3668 delete $INC{"cf/pod.pm"}; 3751 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3669 3752
3670 # don't, removes xs symbols, too, 3753 # don't, removes xs symbols, too,
3671 # and global variables created in xs 3754 # and global variables created in xs
3672 #clear_package __PACKAGE__; 3755 #clear_package __PACKAGE__;
3673 3756
… …
3681 cf::reload_config; 3764 cf::reload_config;
3682 3765
3683 warn "loading extensions"; 3766 warn "loading extensions";
3684 cf::load_extensions; 3767 cf::load_extensions;
3685 3768
3769 if ($REATTACH_ON_RELOAD) {
3686 warn "reattaching attachments to objects/players"; 3770 warn "reattaching attachments to objects/players";
3687 _global_reattach; # objects, sockets 3771 _global_reattach; # objects, sockets
3688 warn "reattaching attachments to maps"; 3772 warn "reattaching attachments to maps";
3689 reattach $_ for values %MAP; 3773 reattach $_ for values %MAP;
3690 warn "reattaching attachments to players"; 3774 warn "reattaching attachments to players";
3691 reattach $_ for values %PLAYER; 3775 reattach $_ for values %PLAYER;
3776 }
3777
3778 warn "running post_init jobs";
3779 (pop @POST_INIT)->(1) while @POST_INIT;
3692 3780
3693 warn "leaving sync_job"; 3781 warn "leaving sync_job";
3694 3782
3695 1 3783 1
3696 } or do { 3784 } or do {
… …
3699 }; 3787 };
3700 3788
3701 warn "reloaded"; 3789 warn "reloaded";
3702 --$RELOAD; 3790 --$RELOAD;
3703 } 3791 }
3792
3793 $t1 = EV::time - $t1;
3794 warn "reload completed in ${t1}s\n";
3704}; 3795};
3705 3796
3706our $RELOAD_WATCHER; # used only during reload 3797our $RELOAD_WATCHER; # used only during reload
3707 3798
3708sub reload_perl() { 3799sub reload_perl() {
3709 # doing reload synchronously and two reloads happen back-to-back, 3800 # doing reload synchronously and two reloads happen back-to-back,
3710 # coro crashes during coro_state_free->destroy here. 3801 # coro crashes during coro_state_free->destroy here.
3711 3802
3803 $RELOAD_WATCHER ||= cf::async {
3804 Coro::AIO::aio_wait cache_extensions;
3805
3712 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3806 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3713 do_reload_perl; 3807 do_reload_perl;
3714 undef $RELOAD_WATCHER; 3808 undef $RELOAD_WATCHER;
3809 };
3715 }; 3810 };
3716} 3811}
3717 3812
3718register_command "reload" => sub { 3813register_command "reload" => sub {
3719 my ($who, $arg) = @_; 3814 my ($who, $arg) = @_;
… …
3878 LOG llevInfo, "[ABT] [suppressed]\n"; 3973 LOG llevInfo, "[ABT] [suppressed]\n";
3879 } 3974 }
3880} 3975}
3881 3976
3882# load additional modules 3977# load additional modules
3883use cf::pod; 3978require "cf/$_.pm" for @EXTRA_MODULES;
3884 3979
3885END { cf::emergency_save } 3980END { cf::emergency_save }
3886 3981
38871 39821
3888 3983

Diff Legend

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