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.451 by root, Mon Sep 22 05:42:41 2008 UTC vs.
Revision 1.482 by root, Sun Oct 11 05:31:54 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
… …
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, non-zero while in reload 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 match 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} = { map +($_ => undef), 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 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
347 push @{ $LOCK{$key} }, $Coro::current;
348 Coro::schedule;
349 }
350} 381}
351 382
352sub lock_acquire($) { 383sub lock_acquire($) {
353 my ($key) = @_; 384 $LOCKS->guard ($_[0])
354
355 # wait, to be sure we are not locked
356 lock_wait $key;
357
358 $LOCK{$key} = [];
359 $LOCKER{$key} = $Coro::current;#d#
360
361 Coro::guard {
362 delete $LOCKER{$key};#d#
363 # wake up all waiters, to be on the safe side
364 $_->ready for @{ delete $LOCK{$key} };
365 }
366} 385}
367 386
368sub lock_active($) { 387sub lock_active($) {
369 my ($key) = @_; 388 $LOCKS->count ($_[0]) < 1
370
371 ! ! $LOCK{$key}
372} 389}
373 390
374sub freeze_mainloop { 391sub freeze_mainloop {
375 tick_inhibit_inc; 392 tick_inhibit_inc;
376 393
377 Coro::guard \&tick_inhibit_dec; 394 &Guard::guard (\&tick_inhibit_dec);
378} 395}
379 396
380=item cf::periodic $interval, $cb 397=item cf::periodic $interval, $cb
381 398
382Like 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
… …
1154 $decname, length $$rdata, scalar @$objs; 1171 $decname, length $$rdata, scalar @$objs;
1155 1172
1156 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1173 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1174 aio_chmod $fh, SAVE_MODE;
1158 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1175 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1159 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 }
1160 aio_close $fh; 1180 aio_close $fh;
1161 1181
1162 if (@$objs) { 1182 if (@$objs) {
1163 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) {
1164 aio_chmod $fh, SAVE_MODE; 1184 aio_chmod $fh, SAVE_MODE;
1165 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1185 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1166 aio_write $fh, 0, (length $data), $data, 0; 1186 aio_write $fh, 0, (length $data), $data, 0;
1167 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 }
1168 aio_close $fh; 1191 aio_close $fh;
1169 aio_rename "$filename.pst~", "$filename.pst"; 1192 aio_rename "$filename.pst~", "$filename.pst";
1170 } 1193 }
1171 } else { 1194 } else {
1172 aio_unlink "$filename.pst"; 1195 aio_unlink "$filename.pst";
1173 } 1196 }
1174 1197
1175 aio_rename "$filename~", $filename; 1198 aio_rename "$filename~", $filename;
1199
1200 $filename =~ s%/[^/]+$%%;
1201 aio_pathsync $filename if $cf::USE_FSYNC;
1176 } else { 1202 } else {
1177 warn "FATAL: $filename~: $!\n"; 1203 warn "unable to save objects: $filename~: $!\n";
1178 } 1204 }
1179 } else { 1205 } else {
1180 aio_unlink $filename; 1206 aio_unlink $filename;
1181 aio_unlink "$filename.pst"; 1207 aio_unlink "$filename.pst";
1182 } 1208 }
… …
1273 my ($name, $cb) = @_; 1299 my ($name, $cb) = @_;
1274 1300
1275 $EXTICMD{$name} = $cb; 1301 $EXTICMD{$name} = $cb;
1276} 1302}
1277 1303
1304use File::Glob ();
1305
1278cf::player->attach ( 1306cf::player->attach (
1279 on_command => sub { 1307 on_command => sub {
1280 my ($pl, $name, $params) = @_; 1308 my ($pl, $name, $params) = @_;
1281 1309
1282 my $cb = $COMMAND{$name} 1310 my $cb = $COMMAND{$name}
… …
1313 } 1341 }
1314 1342
1315 cf::override; 1343 cf::override;
1316 }, 1344 },
1317); 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}
1318 1359
1319sub load_extensions { 1360sub load_extensions {
1320 cf::sync_job { 1361 cf::sync_job {
1321 my %todo; 1362 my %todo;
1322 1363
… …
1445 1486
1446sub exists($) { 1487sub exists($) {
1447 my ($login) = @_; 1488 my ($login) = @_;
1448 1489
1449 $cf::PLAYER{$login} 1490 $cf::PLAYER{$login}
1450 or cf::sync_job { !aio_stat path $login } 1491 or !aio_stat path $login
1451} 1492}
1452 1493
1453sub find($) { 1494sub find($) {
1454 return $cf::PLAYER{$_[0]} || do { 1495 return $cf::PLAYER{$_[0]} || do {
1455 my $login = $_[0]; 1496 my $login = $_[0];
… …
1851 1892
1852 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1893 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1853 "$UNIQUEDIR/$path" 1894 "$UNIQUEDIR/$path"
1854} 1895}
1855 1896
1856# and all this just because we cannot iterate over
1857# all maps in C++...
1858sub change_all_map_light {
1859 my ($change) = @_;
1860
1861 $_->change_map_light ($change)
1862 for grep $_->outdoor, values %cf::MAP;
1863}
1864
1865sub decay_objects { 1897sub decay_objects {
1866 my ($self) = @_; 1898 my ($self) = @_;
1867 1899
1868 return if $self->{deny_reset}; 1900 return if $self->{deny_reset};
1869 1901
… …
1951sub find { 1983sub find {
1952 my ($path, $origin) = @_; 1984 my ($path, $origin) = @_;
1953 1985
1954 $path = normalise $path, $origin && $origin->path; 1986 $path = normalise $path, $origin && $origin->path;
1955 1987
1956 cf::lock_wait "map_data:$path";#d#remove 1988 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1957 cf::lock_wait "map_find:$path"; 1989 my $guard2 = cf::lock_acquire "map_find:$path";
1958 1990
1959 $cf::MAP{$path} || do { 1991 $cf::MAP{$path} || do {
1960 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1961 my $guard2 = cf::lock_acquire "map_find:$path";
1962
1963 my $map = new_from_path cf::map $path 1992 my $map = new_from_path cf::map $path
1964 or return; 1993 or return;
1965 1994
1966 $map->{last_save} = $cf::RUNTIME; 1995 $map->{last_save} = $cf::RUNTIME;
1967 1996
… …
2035 unless ($self->{deny_activate}) { 2064 unless ($self->{deny_activate}) {
2036 $self->decay_objects; 2065 $self->decay_objects;
2037 $self->fix_auto_apply; 2066 $self->fix_auto_apply;
2038 $self->update_buttons; 2067 $self->update_buttons;
2039 cf::cede_to_tick; 2068 cf::cede_to_tick;
2040 $self->set_darkness_map;
2041 cf::cede_to_tick;
2042 $self->activate; 2069 $self->activate;
2043 } 2070 }
2044 2071
2045 $self->{last_save} = $cf::RUNTIME; 2072 $self->{last_save} = $cf::RUNTIME;
2046 $self->last_access ($cf::RUNTIME); 2073 $self->last_access ($cf::RUNTIME);
… …
2212 2239
2213 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2240 my $lock = cf::lock_acquire "map_data:$self->{path}";
2214 2241
2215 return if $self->players; 2242 return if $self->players;
2216 2243
2217 warn "resetting map ", $self->path; 2244 warn "resetting map ", $self->path, "\n";
2218 2245
2219 $self->in_memory (cf::MAP_SWAPPED); 2246 $self->in_memory (cf::MAP_SWAPPED);
2220 2247
2221 # need to save uniques path 2248 # need to save uniques path
2222 unless ($self->{deny_save}) { 2249 unless ($self->{deny_save}) {
… …
2387 2414
2388our $SAY_CHANNEL = { 2415our $SAY_CHANNEL = {
2389 id => "say", 2416 id => "say",
2390 title => "Map", 2417 title => "Map",
2391 reply => "say ", 2418 reply => "say ",
2392 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.",
2393}; 2420};
2394 2421
2395our $CHAT_CHANNEL = { 2422our $CHAT_CHANNEL = {
2396 id => "chat", 2423 id => "chat",
2397 title => "Chat", 2424 title => "Chat",
… …
2523 2550
2524 $map->load; 2551 $map->load;
2525 $map->load_neighbours; 2552 $map->load_neighbours;
2526 2553
2527 return unless $self->contr->active; 2554 return unless $self->contr->active;
2528 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2529 $self->activate_recursive;
2530 2555
2531 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2556 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2532 $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;
2533} 2561}
2534 2562
2535=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2563=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2536 2564
2537Moves 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
… …
2772 id => "infobox", 2800 id => "infobox",
2773 title => "Body Parts", 2801 title => "Body Parts",
2774 reply => undef, 2802 reply => undef,
2775 tooltip => "Shows which body parts you posess and are available", 2803 tooltip => "Shows which body parts you posess and are available",
2776 }, 2804 },
2805 "c/statistics" => {
2806 id => "infobox",
2807 title => "Statistics",
2808 reply => undef,
2809 tooltip => "Shows your primary statistics",
2810 },
2777 "c/skills" => { 2811 "c/skills" => {
2778 id => "infobox", 2812 id => "infobox",
2779 title => "Skills", 2813 title => "Skills",
2780 reply => undef, 2814 reply => undef,
2781 tooltip => "Shows your experience per skill and item power", 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",
2782 }, 2840 },
2783 "c/uptime" => { 2841 "c/uptime" => {
2784 id => "infobox", 2842 id => "infobox",
2785 title => "Uptime", 2843 title => "Uptime",
2786 reply => undef, 2844 reply => undef,
… …
2796 id => "party", 2854 id => "party",
2797 title => "Party", 2855 title => "Party",
2798 reply => "gsay ", 2856 reply => "gsay ",
2799 tooltip => "Messages and chat related to your party", 2857 tooltip => "Messages and chat related to your party",
2800 }, 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,
2801); 2867);
2802 2868
2803sub cf::client::send_msg { 2869sub cf::client::send_msg {
2804 my ($self, $channel, $msg, $color, @extra) = @_; 2870 my ($self, $channel, $msg, $color, @extra) = @_;
2805 2871
… …
2810 2876
2811 # check predefined channels, for the benefit of C 2877 # check predefined channels, for the benefit of C
2812 if ($CHANNEL{$channel}) { 2878 if ($CHANNEL{$channel}) {
2813 $channel = $CHANNEL{$channel}; 2879 $channel = $CHANNEL{$channel};
2814 2880
2815 $self->ext_msg (channel_info => $channel) 2881 $self->ext_msg (channel_info => $channel);
2816 if $self->can_msg;
2817
2818 $channel = $channel->{id}; 2882 $channel = $channel->{id};
2819 2883
2820 } elsif (ref $channel) { 2884 } elsif (ref $channel) {
2821 # send meta info to client, if not yet sent 2885 # send meta info to client, if not yet sent
2822 unless (exists $self->{channel}{$channel->{id}}) { 2886 unless (exists $self->{channel}{$channel->{id}}) {
2823 $self->{channel}{$channel->{id}} = $channel; 2887 $self->{channel}{$channel->{id}} = $channel;
2824 $self->ext_msg (channel_info => $channel) 2888 $self->ext_msg (channel_info => $channel);
2825 if $self->can_msg;
2826 } 2889 }
2827 2890
2828 $channel = $channel->{id}; 2891 $channel = $channel->{id};
2829 } 2892 }
2830 2893
2831 return unless @extra || length $msg; 2894 return unless @extra || length $msg;
2832 2895
2833 if ($self->can_msg) {
2834 # default colour, mask it out 2896 # default colour, mask it out
2835 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2897 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2836 if $color & cf::NDI_DEF; 2898 if $color & cf::NDI_DEF;
2837 2899
2838 my $pkt = "msg " 2900 my $pkt = "msg "
2839 . $self->{json_coder}->encode ( 2901 . $self->{json_coder}->encode (
2840 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2902 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2841 ); 2903 );
2842 2904
2843 # try lzf for large packets 2905 # try lzf for large packets
2844 $pkt = "lzf " . Compress::LZF::compress $pkt 2906 $pkt = "lzf " . Compress::LZF::compress $pkt
2845 if 1024 <= length $pkt and $self->{can_lzf}; 2907 if 1024 <= length $pkt and $self->{can_lzf};
2846 2908
2847 # split very large packets 2909 # split very large packets
2848 if (8192 < length $pkt and $self->{can_lzf}) { 2910 if (8192 < length $pkt and $self->{can_lzf}) {
2849 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; 2911 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2850 $pkt = "frag"; 2912 $pkt = "frag";
2851 } 2913 }
2852 2914
2853 $self->send_packet ($pkt); 2915 $self->send_packet ($pkt);
2854 } else {
2855 if ($color >= 0) {
2856 # replace some tags by gcfclient-compatible ones
2857 for ($msg) {
2858 1 while
2859 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2860 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2861 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2862 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2863 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2864 }
2865
2866 $color &= cf::NDI_COLOR_MASK;
2867
2868 utf8::encode $msg;
2869
2870 if (0 && $msg =~ /\[/) {
2871 # COMMAND/INFO
2872 $self->send_packet ("drawextinfo $color 10 8 $msg")
2873 } else {
2874 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2875 $self->send_packet ("drawinfo $color $msg")
2876 }
2877 }
2878 }
2879} 2916}
2880 2917
2881=item $client->ext_msg ($type, @msg) 2918=item $client->ext_msg ($type, @msg)
2882 2919
2883Sends an ext event to the client. 2920Sends an ext event to the client.
… …
3058The following functions and methods are available within a safe environment: 3095The following functions and methods are available within a safe environment:
3059 3096
3060 cf::object 3097 cf::object
3061 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
3062 insert remove name archname title slaying race decrease split 3099 insert remove name archname title slaying race decrease split
3100 value
3063 3101
3064 cf::object::player 3102 cf::object::player
3065 player 3103 player
3066 3104
3067 cf::player 3105 cf::player
… …
3073=cut 3111=cut
3074 3112
3075for ( 3113for (
3076 ["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
3077 insert remove inv nrof name archname title slaying race 3115 insert remove inv nrof name archname title slaying race
3078 decrease split destroy change_exp)], 3116 decrease split destroy change_exp value msg lore send_msg)],
3079 ["cf::object::player" => qw(player)], 3117 ["cf::object::player" => qw(player)],
3080 ["cf::player" => qw(peaceful)], 3118 ["cf::player" => qw(peaceful send_msg)],
3081 ["cf::map" => qw(trigger)], 3119 ["cf::map" => qw(trigger)],
3082) { 3120) {
3083 no strict 'refs'; 3121 no strict 'refs';
3084 my ($pkg, @funs) = @$_; 3122 my ($pkg, @funs) = @$_;
3085 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3123 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3102 my ($code, %vars) = @_; 3140 my ($code, %vars) = @_;
3103 3141
3104 my $qcode = $code; 3142 my $qcode = $code;
3105 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3143 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3106 $qcode =~ s/\n/\\n/g; 3144 $qcode =~ s/\n/\\n/g;
3145
3146 %vars = (_dummy => 0) unless %vars;
3107 3147
3108 local $_; 3148 local $_;
3109 local @safe::cf::_safe_eval_args = values %vars; 3149 local @safe::cf::_safe_eval_args = values %vars;
3110 3150
3111 my $eval = 3151 my $eval =
… …
3341 reload_treasures; 3381 reload_treasures;
3342 3382
3343 warn "finished reloading resource files\n"; 3383 warn "finished reloading resource files\n";
3344} 3384}
3345 3385
3346sub init {
3347 my $guard = freeze_mainloop;
3348
3349 evthread_start IO::AIO::poll_fileno;
3350
3351 reload_resources;
3352}
3353
3354sub reload_config { 3386sub reload_config {
3355 open my $fh, "<:utf8", "$CONFDIR/config" 3387 open my $fh, "<:utf8", "$CONFDIR/config"
3356 or return; 3388 or return;
3357 3389
3358 local $/; 3390 local $/;
… …
3389 3421
3390 seek $fh, 0, 0; 3422 seek $fh, 0, 0;
3391 print $fh $$; 3423 print $fh $$;
3392} 3424}
3393 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
3394sub main { 3435sub main {
3395 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
3396 3449
3397 # we must not ever block the main coroutine 3450 # we must not ever block the main coroutine
3398 local $Coro::idle = sub { 3451 local $Coro::idle = sub {
3399 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#
3400 (async { 3453 (async {
3401 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3454 $Coro::current->{desc} = "IDLE BUG HANDLER";
3402 EV::loop EV::LOOP_ONESHOT; 3455 EV::loop EV::LOOP_ONESHOT;
3403 })->prio (Coro::PRIO_MAX); 3456 })->prio (Coro::PRIO_MAX);
3404 }; 3457 };
3405 3458
3406 { 3459 evthread_start IO::AIO::poll_fileno;
3407 my $guard = freeze_mainloop; 3460
3461 cf::sync_job {
3462 reload_resources;
3408 reload_config; 3463 reload_config;
3409 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
3410 load_extensions; 3477 load_extensions;
3411 3478
3412 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3413 }
3414
3415 utime time, time, $RUNTIMEFILE; 3479 utime time, time, $RUNTIMEFILE;
3416 3480
3417 # no (long-running) fork's whatsoever before this point(!) 3481 # no (long-running) fork's whatsoever before this point(!)
3482 use POSIX ();
3418 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};
3419 3484
3420 EV::loop; 3485 (pop @POST_INIT)->(0) while @POST_INIT;
3486 };
3487
3488 main_loop;
3421} 3489}
3422 3490
3423############################################################################# 3491#############################################################################
3424# initialisation and cleanup 3492# initialisation and cleanup
3425 3493
… …
3481 my $uuid = "$LOCALDIR/uuid"; 3549 my $uuid = "$LOCALDIR/uuid";
3482 3550
3483 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3551 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3484 or return; 3552 or return;
3485 3553
3486 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;
3487 $uuid_skip = 0; 3562 $uuid_skip = 0;
3488 3563
3489 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3564 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3490 and return; 3565 and return;
3491 3566
… …
3513} 3588}
3514 3589
3515sub emergency_save() { 3590sub emergency_save() {
3516 my $freeze_guard = cf::freeze_mainloop; 3591 my $freeze_guard = cf::freeze_mainloop;
3517 3592
3518 warn "enter emergency perl save\n"; 3593 warn "emergency_perl_save: enter\n";
3519 3594
3520 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
3521 # use a peculiar iteration method to avoid tripping on perl 3601 # use a peculiar iteration method to avoid tripping on perl
3522 # refcount bugs in for. also avoids problems with players 3602 # refcount bugs in for. also avoids problems with players
3523 # and maps saved/destroyed asynchronously. 3603 # and maps saved/destroyed asynchronously.
3524 warn "begin emergency player save\n"; 3604 warn "emergency_perl_save: begin player save\n";
3525 for my $login (keys %cf::PLAYER) { 3605 for my $login (keys %cf::PLAYER) {
3526 my $pl = $cf::PLAYER{$login} or next; 3606 my $pl = $cf::PLAYER{$login} or next;
3527 $pl->valid or next; 3607 $pl->valid or next;
3528 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3608 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3529 $pl->save; 3609 $pl->save;
3530 } 3610 }
3531 warn "end emergency player save\n"; 3611 warn "emergency_perl_save: end player save\n";
3532 3612
3533 warn "begin emergency map save\n"; 3613 warn "emergency_perl_save: begin map save\n";
3534 for my $path (keys %cf::MAP) { 3614 for my $path (keys %cf::MAP) {
3535 my $map = $cf::MAP{$path} or next; 3615 my $map = $cf::MAP{$path} or next;
3536 $map->valid or next; 3616 $map->valid or next;
3537 $map->save; 3617 $map->save;
3538 } 3618 }
3539 warn "end emergency map save\n"; 3619 warn "emergency_perl_save: end map save\n";
3540 3620
3541 warn "begin emergency database checkpoint\n"; 3621 warn "emergency_perl_save: begin database checkpoint\n";
3542 BDB::db_env_txn_checkpoint $DB_ENV; 3622 BDB::db_env_txn_checkpoint $DB_ENV;
3543 warn "end emergency database checkpoint\n"; 3623 warn "emergency_perl_save: end database checkpoint\n";
3544 3624
3545 warn "begin write uuid\n"; 3625 warn "emergency_perl_save: begin write uuid\n";
3546 write_uuid_sync 1; 3626 write_uuid_sync 1;
3547 warn "end write uuid\n"; 3627 warn "emergency_perl_save: end write uuid\n";
3548 }; 3628 };
3549 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
3550 warn "leave emergency perl save\n"; 3635 warn "emergency_perl_save: leave\n";
3551} 3636}
3552 3637
3553sub post_cleanup { 3638sub post_cleanup {
3554 my ($make_core) = @_; 3639 my ($make_core) = @_;
3555 3640
… …
3592 warn "can only reload from main coroutine"; 3677 warn "can only reload from main coroutine";
3593 return; 3678 return;
3594 } 3679 }
3595 3680
3596 return if $RELOAD++; 3681 return if $RELOAD++;
3682
3683 my $t1 = EV::time;
3597 3684
3598 while ($RELOAD) { 3685 while ($RELOAD) {
3599 warn "reloading..."; 3686 warn "reloading...";
3600 3687
3601 warn "entering sync_job"; 3688 warn "entering sync_job";
… …
3662 clear_package "safe::$_" 3749 clear_package "safe::$_"
3663 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);
3664 3751
3665 warn "unloading cf.pm \"a bit\""; 3752 warn "unloading cf.pm \"a bit\"";
3666 delete $INC{"cf.pm"}; 3753 delete $INC{"cf.pm"};
3667 delete $INC{"cf/pod.pm"}; 3754 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3668 3755
3669 # don't, removes xs symbols, too, 3756 # don't, removes xs symbols, too,
3670 # and global variables created in xs 3757 # and global variables created in xs
3671 #clear_package __PACKAGE__; 3758 #clear_package __PACKAGE__;
3672 3759
… …
3680 cf::reload_config; 3767 cf::reload_config;
3681 3768
3682 warn "loading extensions"; 3769 warn "loading extensions";
3683 cf::load_extensions; 3770 cf::load_extensions;
3684 3771
3772 if ($REATTACH_ON_RELOAD) {
3685 warn "reattaching attachments to objects/players"; 3773 warn "reattaching attachments to objects/players";
3686 _global_reattach; # objects, sockets 3774 _global_reattach; # objects, sockets
3687 warn "reattaching attachments to maps"; 3775 warn "reattaching attachments to maps";
3688 reattach $_ for values %MAP; 3776 reattach $_ for values %MAP;
3689 warn "reattaching attachments to players"; 3777 warn "reattaching attachments to players";
3690 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;
3691 3783
3692 warn "leaving sync_job"; 3784 warn "leaving sync_job";
3693 3785
3694 1 3786 1
3695 } or do { 3787 } or do {
… …
3698 }; 3790 };
3699 3791
3700 warn "reloaded"; 3792 warn "reloaded";
3701 --$RELOAD; 3793 --$RELOAD;
3702 } 3794 }
3795
3796 $t1 = EV::time - $t1;
3797 warn "reload completed in ${t1}s\n";
3703}; 3798};
3704 3799
3705our $RELOAD_WATCHER; # used only during reload 3800our $RELOAD_WATCHER; # used only during reload
3706 3801
3707sub reload_perl() { 3802sub reload_perl() {
3708 # doing reload synchronously and two reloads happen back-to-back, 3803 # doing reload synchronously and two reloads happen back-to-back,
3709 # coro crashes during coro_state_free->destroy here. 3804 # coro crashes during coro_state_free->destroy here.
3710 3805
3806 $RELOAD_WATCHER ||= cf::async {
3807 Coro::AIO::aio_wait cache_extensions;
3808
3711 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 3809 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3712 do_reload_perl; 3810 do_reload_perl;
3713 undef $RELOAD_WATCHER; 3811 undef $RELOAD_WATCHER;
3812 };
3714 }; 3813 };
3715} 3814}
3716 3815
3717register_command "reload" => sub { 3816register_command "reload" => sub {
3718 my ($who, $arg) = @_; 3817 my ($who, $arg) = @_;
… …
3877 LOG llevInfo, "[ABT] [suppressed]\n"; 3976 LOG llevInfo, "[ABT] [suppressed]\n";
3878 } 3977 }
3879} 3978}
3880 3979
3881# load additional modules 3980# load additional modules
3882use cf::pod; 3981require "cf/$_.pm" for @EXTRA_MODULES;
3883 3982
3884END { cf::emergency_save } 3983END { cf::emergency_save }
3885 3984
38861 39851
3887 3986

Diff Legend

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