… | |
… | |
80 | our $NEXT_TICK; |
80 | our $NEXT_TICK; |
81 | our $NOW; |
81 | our $NOW; |
82 | our $USE_FSYNC = 1; # use fsync to write maps - default off |
82 | our $USE_FSYNC = 1; # use fsync to write maps - default off |
83 | |
83 | |
84 | our $BDB_POLL_WATCHER; |
84 | our $BDB_POLL_WATCHER; |
|
|
85 | our $BDB_DEADLOCK_WATCHER; |
|
|
86 | our $BDB_CHECKPOINT_WATCHER; |
|
|
87 | our $BDB_TRICKLE_WATCHER; |
85 | our $DB_ENV; |
88 | our $DB_ENV; |
86 | |
89 | |
87 | our %CFG; |
90 | our %CFG; |
88 | |
91 | |
89 | our $UPTIME; $UPTIME ||= time; |
92 | our $UPTIME; $UPTIME ||= time; |
… | |
… | |
187 | $msg .= "\n" |
190 | $msg .= "\n" |
188 | unless $msg =~ /\n$/; |
191 | unless $msg =~ /\n$/; |
189 | |
192 | |
190 | $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; |
193 | $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; |
191 | |
194 | |
192 | utf8::encode $msg; |
|
|
193 | LOG llevError, $msg; |
195 | LOG llevError, $msg; |
194 | }; |
196 | }; |
195 | } |
197 | } |
196 | |
198 | |
197 | @safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; |
199 | @safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; |
… | |
… | |
285 | Return true if the lock is currently active, i.e. somebody has locked it. |
287 | Return true if the lock is currently active, i.e. somebody has locked it. |
286 | |
288 | |
287 | =cut |
289 | =cut |
288 | |
290 | |
289 | our %LOCK; |
291 | our %LOCK; |
|
|
292 | our %LOCKER;#d# |
290 | |
293 | |
291 | sub lock_wait($) { |
294 | sub lock_wait($) { |
292 | my ($key) = @_; |
295 | my ($key) = @_; |
|
|
296 | |
|
|
297 | if ($LOCKER{$key} == $Coro::current) {#d# |
|
|
298 | Carp::cluck "lock_wait($key) for already-acquired lock";#d# |
|
|
299 | return;#d# |
|
|
300 | }#d# |
293 | |
301 | |
294 | # wait for lock, if any |
302 | # wait for lock, if any |
295 | while ($LOCK{$key}) { |
303 | while ($LOCK{$key}) { |
296 | push @{ $LOCK{$key} }, $Coro::current; |
304 | push @{ $LOCK{$key} }, $Coro::current; |
297 | Coro::schedule; |
305 | Coro::schedule; |
… | |
… | |
303 | |
311 | |
304 | # wait, to be sure we are not locked |
312 | # wait, to be sure we are not locked |
305 | lock_wait $key; |
313 | lock_wait $key; |
306 | |
314 | |
307 | $LOCK{$key} = []; |
315 | $LOCK{$key} = []; |
|
|
316 | $LOCKER{$key} = $Coro::current;#d# |
308 | |
317 | |
309 | Coro::guard { |
318 | Coro::guard { |
|
|
319 | delete $LOCKER{$key};#d# |
310 | # wake up all waiters, to be on the safe side |
320 | # wake up all waiters, to be on the safe side |
311 | $_->ready for @{ delete $LOCK{$key} }; |
321 | $_->ready for @{ delete $LOCK{$key} }; |
312 | } |
322 | } |
313 | } |
323 | } |
314 | |
324 | |
… | |
… | |
344 | our @SLOT_QUEUE; |
354 | our @SLOT_QUEUE; |
345 | our $SLOT_QUEUE; |
355 | our $SLOT_QUEUE; |
346 | |
356 | |
347 | $SLOT_QUEUE->cancel if $SLOT_QUEUE; |
357 | $SLOT_QUEUE->cancel if $SLOT_QUEUE; |
348 | $SLOT_QUEUE = Coro::async { |
358 | $SLOT_QUEUE = Coro::async { |
|
|
359 | $Coro::current->desc ("timeslot manager"); |
|
|
360 | |
349 | my $signal = new Coro::Signal; |
361 | my $signal = new Coro::Signal; |
350 | |
362 | |
351 | while () { |
363 | while () { |
352 | next_job: |
364 | next_job: |
353 | my $avail = cf::till_tick; |
365 | my $avail = cf::till_tick; |
… | |
… | |
415 | my $time = Event::time; |
427 | my $time = Event::time; |
416 | |
428 | |
417 | # this is the main coro, too bad, we have to block |
429 | # this is the main coro, too bad, we have to block |
418 | # till the operation succeeds, freezing the server :/ |
430 | # till the operation succeeds, freezing the server :/ |
419 | |
431 | |
|
|
432 | LOG llevError | logBacktrace, Carp::longmess "sync job";#d# |
|
|
433 | |
420 | # TODO: use suspend/resume instead |
434 | # TODO: use suspend/resume instead |
421 | # (but this is cancel-safe) |
435 | # (but this is cancel-safe) |
422 | my $freeze_guard = freeze_mainloop; |
436 | my $freeze_guard = freeze_mainloop; |
423 | |
437 | |
424 | my $busy = 1; |
438 | my $busy = 1; |
425 | my @res; |
439 | my @res; |
426 | |
440 | |
427 | (async { |
441 | (async { |
|
|
442 | $Coro::current->desc ("sync job coro"); |
428 | @res = eval { $job->() }; |
443 | @res = eval { $job->() }; |
429 | warn $@ if $@; |
444 | warn $@ if $@; |
430 | undef $busy; |
445 | undef $busy; |
431 | })->prio (Coro::PRIO_MAX); |
446 | })->prio (Coro::PRIO_MAX); |
432 | |
447 | |
… | |
… | |
500 | =item cf::db_put $family => $key => $value |
515 | =item cf::db_put $family => $key => $value |
501 | |
516 | |
502 | Stores the given C<$value> in the family. It can currently store binary |
517 | Stores the given C<$value> in the family. It can currently store binary |
503 | data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). |
518 | data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). |
504 | |
519 | |
|
|
520 | =item $db = cf::db_table "name" |
|
|
521 | |
|
|
522 | Create and/or open a new database table. The string must not be "db" and must be unique |
|
|
523 | within each server. |
|
|
524 | |
505 | =cut |
525 | =cut |
|
|
526 | |
|
|
527 | sub db_table($) { |
|
|
528 | my ($name) = @_; |
|
|
529 | my $db = BDB::db_create $DB_ENV; |
|
|
530 | |
|
|
531 | eval { |
|
|
532 | $db->set_flags (BDB::CHKSUM); |
|
|
533 | |
|
|
534 | utf8::encode $name; |
|
|
535 | BDB::db_open $db, undef, $name, undef, BDB::BTREE, |
|
|
536 | BDB::CREATE | BDB::AUTO_COMMIT, 0666; |
|
|
537 | cf::cleanup "db_open(db): $!" if $!; |
|
|
538 | }; |
|
|
539 | cf::cleanup "db_open(db): $@" if $@; |
|
|
540 | |
|
|
541 | $db |
|
|
542 | } |
506 | |
543 | |
507 | our $DB; |
544 | our $DB; |
508 | |
545 | |
509 | sub db_init { |
546 | sub db_init { |
510 | unless ($DB) { |
|
|
511 | $DB = BDB::db_create $DB_ENV; |
|
|
512 | |
|
|
513 | cf::sync_job { |
547 | cf::sync_job { |
514 | eval { |
548 | $DB ||= db_table "db"; |
515 | $DB->set_flags (BDB::CHKSUM); |
|
|
516 | |
|
|
517 | BDB::db_open $DB, undef, "db", undef, BDB::BTREE, |
|
|
518 | BDB::CREATE | BDB::AUTO_COMMIT, 0666; |
|
|
519 | cf::cleanup "db_open(db): $!" if $!; |
|
|
520 | }; |
|
|
521 | cf::cleanup "db_open(db): $@" if $@; |
|
|
522 | }; |
|
|
523 | } |
549 | }; |
524 | } |
550 | } |
525 | |
551 | |
526 | sub db_get($$) { |
552 | sub db_get($$) { |
527 | my $key = "$_[0]/$_[1]"; |
553 | my $key = "$_[0]/$_[1]"; |
528 | |
554 | |
… | |
… | |
1005 | ); |
1031 | ); |
1006 | |
1032 | |
1007 | sub object_freezer_save { |
1033 | sub object_freezer_save { |
1008 | my ($filename, $rdata, $objs) = @_; |
1034 | my ($filename, $rdata, $objs) = @_; |
1009 | |
1035 | |
1010 | my $guard = cf::lock_acquire "io"; |
|
|
1011 | |
|
|
1012 | sync_job { |
1036 | sync_job { |
1013 | if (length $$rdata) { |
1037 | if (length $$rdata) { |
|
|
1038 | utf8::decode (my $decname = $filename); |
1014 | warn sprintf "saving %s (%d,%d)\n", |
1039 | warn sprintf "saving %s (%d,%d)\n", |
1015 | $filename, length $$rdata, scalar @$objs; |
1040 | $decname, length $$rdata, scalar @$objs; |
1016 | |
1041 | |
1017 | if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { |
1042 | if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { |
1018 | chmod SAVE_MODE, $fh; |
1043 | chmod SAVE_MODE, $fh; |
1019 | aio_write $fh, 0, (length $$rdata), $$rdata, 0; |
1044 | aio_write $fh, 0, (length $$rdata), $$rdata, 0; |
1020 | aio_fsync $fh if $cf::USE_FSYNC; |
1045 | aio_fsync $fh if $cf::USE_FSYNC; |
… | |
… | |
1040 | } else { |
1065 | } else { |
1041 | aio_unlink $filename; |
1066 | aio_unlink $filename; |
1042 | aio_unlink "$filename.pst"; |
1067 | aio_unlink "$filename.pst"; |
1043 | } |
1068 | } |
1044 | }; |
1069 | }; |
1045 | |
|
|
1046 | undef $guard; |
|
|
1047 | } |
1070 | } |
1048 | |
1071 | |
1049 | sub object_freezer_as_string { |
1072 | sub object_freezer_as_string { |
1050 | my ($rdata, $objs) = @_; |
1073 | my ($rdata, $objs) = @_; |
1051 | |
1074 | |
… | |
… | |
1056 | |
1079 | |
1057 | sub object_thawer_load { |
1080 | sub object_thawer_load { |
1058 | my ($filename) = @_; |
1081 | my ($filename) = @_; |
1059 | |
1082 | |
1060 | my ($data, $av); |
1083 | my ($data, $av); |
1061 | |
|
|
1062 | my $guard = cf::lock_acquire "io"; |
|
|
1063 | |
1084 | |
1064 | (aio_load $filename, $data) >= 0 |
1085 | (aio_load $filename, $data) >= 0 |
1065 | or return; |
1086 | or return; |
1066 | |
1087 | |
1067 | unless (aio_stat "$filename.pst") { |
1088 | unless (aio_stat "$filename.pst") { |
1068 | (aio_load "$filename.pst", $av) >= 0 |
1089 | (aio_load "$filename.pst", $av) >= 0 |
1069 | or return; |
1090 | or return; |
1070 | |
1091 | |
1071 | undef $guard; |
|
|
1072 | $av = eval { (Storable::thaw $av)->{objs} }; |
1092 | $av = eval { (Storable::thaw $av)->{objs} }; |
1073 | } |
1093 | } |
1074 | |
1094 | |
|
|
1095 | utf8::decode (my $decname = $filename); |
1075 | warn sprintf "loading %s (%d)\n", |
1096 | warn sprintf "loading %s (%d,%d)\n", |
1076 | $filename, length $data, scalar @{$av || []}; |
1097 | $decname, length $data, scalar @{$av || []}; |
1077 | |
1098 | |
1078 | ($data, $av) |
1099 | ($data, $av) |
1079 | } |
1100 | } |
1080 | |
1101 | |
1081 | =head2 COMMAND CALLBACKS |
1102 | =head2 COMMAND CALLBACKS |
… | |
… | |
1269 | |
1290 | |
1270 | =head3 cf::player |
1291 | =head3 cf::player |
1271 | |
1292 | |
1272 | =over 4 |
1293 | =over 4 |
1273 | |
1294 | |
|
|
1295 | =item cf::player::num_playing |
|
|
1296 | |
|
|
1297 | Returns the official number of playing players, as per the Crossfire metaserver rules. |
|
|
1298 | |
|
|
1299 | =cut |
|
|
1300 | |
|
|
1301 | sub num_playing { |
|
|
1302 | scalar grep |
|
|
1303 | $_->ob->map |
|
|
1304 | && !$_->hidden |
|
|
1305 | && !$_->ob->flag (cf::FLAG_WIZ), |
|
|
1306 | cf::player::list |
|
|
1307 | } |
|
|
1308 | |
1274 | =item cf::player::find $login |
1309 | =item cf::player::find $login |
1275 | |
1310 | |
1276 | Returns the given player object, loading it if necessary (might block). |
1311 | Returns the given player object, loading it if necessary (might block). |
1277 | |
1312 | |
1278 | =cut |
1313 | =cut |
… | |
… | |
1316 | aio_unlink +(playerdir $login) . "/$login.pl"; |
1351 | aio_unlink +(playerdir $login) . "/$login.pl"; |
1317 | |
1352 | |
1318 | my $f = new_from_file cf::object::thawer path $login |
1353 | my $f = new_from_file cf::object::thawer path $login |
1319 | or return; |
1354 | or return; |
1320 | |
1355 | |
1321 | $f->next; |
|
|
1322 | my $pl = cf::player::load_pl $f |
1356 | my $pl = cf::player::load_pl $f |
1323 | or return; |
1357 | or return; |
1324 | local $cf::PLAYER_LOADING{$login} = $pl; |
1358 | local $cf::PLAYER_LOADING{$login} = $pl; |
1325 | $f->resolve_delayed_derefs; |
1359 | $f->resolve_delayed_derefs; |
1326 | $cf::PLAYER{$login} = $pl |
1360 | $cf::PLAYER{$login} = $pl |
… | |
… | |
1841 | sub find { |
1875 | sub find { |
1842 | my ($path, $origin) = @_; |
1876 | my ($path, $origin) = @_; |
1843 | |
1877 | |
1844 | $path = normalise $path, $origin && $origin->path; |
1878 | $path = normalise $path, $origin && $origin->path; |
1845 | |
1879 | |
|
|
1880 | cf::lock_wait "map_data:$path";#d#remove |
1846 | cf::lock_wait "map_find:$path"; |
1881 | cf::lock_wait "map_find:$path"; |
1847 | |
1882 | |
1848 | $cf::MAP{$path} || do { |
1883 | $cf::MAP{$path} || do { |
1849 | my $guard = cf::lock_acquire "map_find:$path"; |
1884 | my $guard1 = cf::lock_acquire "map_find:$path"; |
|
|
1885 | my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it |
|
|
1886 | |
1850 | my $map = new_from_path cf::map $path |
1887 | my $map = new_from_path cf::map $path |
1851 | or return; |
1888 | or return; |
1852 | |
1889 | |
1853 | $map->{last_save} = $cf::RUNTIME; |
1890 | $map->{last_save} = $cf::RUNTIME; |
1854 | |
1891 | |
… | |
… | |
1856 | or return; |
1893 | or return; |
1857 | |
1894 | |
1858 | if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) |
1895 | if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) |
1859 | # doing this can freeze the server in a sync job, obviously |
1896 | # doing this can freeze the server in a sync job, obviously |
1860 | #$cf::WAIT_FOR_TICK->wait; |
1897 | #$cf::WAIT_FOR_TICK->wait; |
|
|
1898 | undef $guard1; |
|
|
1899 | undef $guard2; |
1861 | $map->reset; |
1900 | $map->reset; |
1862 | undef $guard; |
|
|
1863 | return find $path; |
1901 | return find $path; |
1864 | } |
1902 | } |
1865 | |
1903 | |
1866 | $cf::MAP{$path} = $map |
1904 | $cf::MAP{$path} = $map |
1867 | } |
1905 | } |
… | |
… | |
1876 | local $self->{deny_reset} = 1; # loading can take a long time |
1914 | local $self->{deny_reset} = 1; # loading can take a long time |
1877 | |
1915 | |
1878 | my $path = $self->{path}; |
1916 | my $path = $self->{path}; |
1879 | |
1917 | |
1880 | { |
1918 | { |
1881 | my $guard1 = cf::lock_acquire "map_data:$path"; |
1919 | my $guard = cf::lock_acquire "map_data:$path"; |
1882 | my $guard2 = cf::lock_acquire "map_load:$path"; |
|
|
1883 | |
1920 | |
|
|
1921 | return unless $self->valid; |
1884 | return if $self->in_memory != cf::MAP_SWAPPED; |
1922 | return unless $self->in_memory == cf::MAP_SWAPPED; |
1885 | |
1923 | |
1886 | $self->in_memory (cf::MAP_LOADING); |
1924 | $self->in_memory (cf::MAP_LOADING); |
1887 | |
1925 | |
1888 | $self->alloc; |
1926 | $self->alloc; |
1889 | |
1927 | |
… | |
… | |
2003 | } |
2041 | } |
2004 | |
2042 | |
2005 | $MAP_PREFETCH{$path} |= $load; |
2043 | $MAP_PREFETCH{$path} |= $load; |
2006 | |
2044 | |
2007 | $MAP_PREFETCHER ||= cf::async { |
2045 | $MAP_PREFETCHER ||= cf::async { |
|
|
2046 | $Coro::current->{desc} = "map prefetcher"; |
|
|
2047 | |
2008 | while (%MAP_PREFETCH) { |
2048 | while (%MAP_PREFETCH) { |
2009 | while (my ($k, $v) = each %MAP_PREFETCH) { |
2049 | while (my ($k, $v) = each %MAP_PREFETCH) { |
2010 | if (my $map = find $k) { |
2050 | if (my $map = find $k) { |
2011 | $map->load if $v; |
2051 | $map->load if $v; |
2012 | } |
2052 | } |
… | |
… | |
2038 | return if $self->{deny_save}; |
2078 | return if $self->{deny_save}; |
2039 | |
2079 | |
2040 | local $self->{last_access} = $self->last_access;#d# |
2080 | local $self->{last_access} = $self->last_access;#d# |
2041 | |
2081 | |
2042 | cf::async { |
2082 | cf::async { |
|
|
2083 | $Coro::current->{desc} = "map player save"; |
2043 | $_->contr->save for $self->players; |
2084 | $_->contr->save for $self->players; |
2044 | }; |
2085 | }; |
2045 | |
2086 | |
2046 | if ($uniq) { |
2087 | if ($uniq) { |
2047 | $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); |
2088 | $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); |
… | |
… | |
2061 | |
2102 | |
2062 | return if $self->players; |
2103 | return if $self->players; |
2063 | return if $self->in_memory != cf::MAP_IN_MEMORY; |
2104 | return if $self->in_memory != cf::MAP_IN_MEMORY; |
2064 | return if $self->{deny_save}; |
2105 | return if $self->{deny_save}; |
2065 | |
2106 | |
|
|
2107 | $self->in_memory (cf::MAP_SWAPPED); |
|
|
2108 | |
|
|
2109 | $self->deactivate; |
|
|
2110 | $_->clear_links_to ($self) for values %cf::MAP; |
2066 | $self->clear; |
2111 | $self->clear; |
2067 | $self->in_memory (cf::MAP_SWAPPED); |
|
|
2068 | } |
2112 | } |
2069 | |
2113 | |
2070 | sub reset_at { |
2114 | sub reset_at { |
2071 | my ($self) = @_; |
2115 | my ($self) = @_; |
2072 | |
2116 | |
… | |
… | |
2104 | if $uniq; |
2148 | if $uniq; |
2105 | } |
2149 | } |
2106 | |
2150 | |
2107 | delete $cf::MAP{$self->path}; |
2151 | delete $cf::MAP{$self->path}; |
2108 | |
2152 | |
|
|
2153 | $self->deactivate; |
|
|
2154 | $_->clear_links_to ($self) for values %cf::MAP; |
2109 | $self->clear; |
2155 | $self->clear; |
2110 | |
|
|
2111 | $_->clear_links_to ($self) for values %cf::MAP; |
|
|
2112 | |
2156 | |
2113 | $self->unlink_save; |
2157 | $self->unlink_save; |
2114 | $self->destroy; |
2158 | $self->destroy; |
2115 | } |
2159 | } |
2116 | |
2160 | |
… | |
… | |
2231 | =cut |
2275 | =cut |
2232 | |
2276 | |
2233 | sub deref { |
2277 | sub deref { |
2234 | my ($ref) = @_; |
2278 | my ($ref) = @_; |
2235 | |
2279 | |
2236 | # temporary compatibility#TODO#remove |
|
|
2237 | $ref =~ s{^<}{player/<}; |
|
|
2238 | |
|
|
2239 | if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { |
2280 | if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) { |
2240 | my ($uuid, $name) = ($1, $2); |
2281 | my ($uuid, $name) = ($1, $2); |
2241 | my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name |
2282 | my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name |
2242 | or return; |
2283 | or return; |
2243 | $pl->ob->uuid eq $uuid |
2284 | $pl->ob->uuid eq $uuid |
2244 | or return; |
2285 | or return; |
… | |
… | |
2415 | my $gen = $self->{_goto_generation} = ++$GOTOGEN; |
2456 | my $gen = $self->{_goto_generation} = ++$GOTOGEN; |
2416 | |
2457 | |
2417 | $self->enter_link; |
2458 | $self->enter_link; |
2418 | |
2459 | |
2419 | (async { |
2460 | (async { |
|
|
2461 | $Coro::current->{desc} = "player::goto $path $x $y"; |
|
|
2462 | |
|
|
2463 | # *tag paths override both path and x|y |
|
|
2464 | if ($path =~ /^\*(.*)$/) { |
|
|
2465 | if (my @obs = grep $_->map, ext::map_tags::find $1) { |
|
|
2466 | my $ob = $obs[rand @obs]; |
|
|
2467 | |
|
|
2468 | # see if we actually can go there |
|
|
2469 | if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) { |
|
|
2470 | $ob = $obs[rand @obs]; |
|
|
2471 | } else { |
|
|
2472 | $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED); |
|
|
2473 | } |
|
|
2474 | # else put us there anyways for now #d# |
|
|
2475 | |
|
|
2476 | ($path, $x, $y) = ($ob->map, $ob->x, $ob->y); |
|
|
2477 | } else { |
|
|
2478 | ($path, $x, $y) = (undef, undef, undef); |
|
|
2479 | } |
|
|
2480 | } |
|
|
2481 | |
2420 | my $map = eval { |
2482 | my $map = eval { |
2421 | my $map = cf::map::find $path; |
2483 | my $map = defined $path ? cf::map::find $path : undef; |
2422 | |
2484 | |
2423 | if ($map) { |
2485 | if ($map) { |
2424 | $map = $map->customise_for ($self); |
2486 | $map = $map->customise_for ($self); |
2425 | $map = $check->($map) if $check && $map; |
2487 | $map = $check->($map) if $check && $map; |
2426 | } else { |
2488 | } else { |
2427 | $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); |
2489 | $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); |
2428 | } |
2490 | } |
2429 | |
2491 | |
2430 | $map |
2492 | $map |
2431 | }; |
2493 | }; |
2432 | |
2494 | |
… | |
… | |
2522 | # if exit is damned, update players death & WoR home-position |
2584 | # if exit is damned, update players death & WoR home-position |
2523 | $self->contr->savebed ($slaying, $hp, $sp) |
2585 | $self->contr->savebed ($slaying, $hp, $sp) |
2524 | if $exit->flag (FLAG_DAMNED); |
2586 | if $exit->flag (FLAG_DAMNED); |
2525 | |
2587 | |
2526 | (async { |
2588 | (async { |
|
|
2589 | $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; |
|
|
2590 | |
2527 | $self->deactivate_recursive; # just to be sure |
2591 | $self->deactivate_recursive; # just to be sure |
2528 | unless (eval { |
2592 | unless (eval { |
2529 | $self->goto ($slaying, $hp, $sp); |
2593 | $self->goto ($slaying, $hp, $sp); |
2530 | |
2594 | |
2531 | 1; |
2595 | 1; |
… | |
… | |
2568 | |
2632 | |
2569 | =cut |
2633 | =cut |
2570 | |
2634 | |
2571 | our %CHANNEL = ( |
2635 | our %CHANNEL = ( |
2572 | "c/identify" => { |
2636 | "c/identify" => { |
2573 | id => "identify", |
2637 | id => "infobox", |
2574 | title => "Identify", |
2638 | title => "Identify", |
2575 | reply => undef, |
2639 | reply => undef, |
2576 | tooltip => "Items recently identified", |
2640 | tooltip => "Items recently identified", |
2577 | }, |
2641 | }, |
2578 | "c/examine" => { |
2642 | "c/examine" => { |
2579 | id => "examine", |
2643 | id => "infobox", |
2580 | title => "Examine", |
2644 | title => "Examine", |
2581 | reply => undef, |
2645 | reply => undef, |
2582 | tooltip => "Signs and other items you examined", |
2646 | tooltip => "Signs and other items you examined", |
2583 | }, |
2647 | }, |
|
|
2648 | "c/lookat" => { |
|
|
2649 | id => "infobox", |
|
|
2650 | title => "Look", |
|
|
2651 | reply => undef, |
|
|
2652 | tooltip => "What you saw there", |
|
|
2653 | }, |
2584 | ); |
2654 | ); |
2585 | |
2655 | |
2586 | sub cf::client::send_msg { |
2656 | sub cf::client::send_msg { |
2587 | my ($self, $channel, $msg, $color, @extra) = @_; |
2657 | my ($self, $channel, $msg, $color, @extra) = @_; |
2588 | |
2658 | |
2589 | $msg = $self->pl->expand_cfpod ($msg); |
2659 | $msg = $self->pl->expand_cfpod ($msg); |
2590 | |
2660 | |
2591 | $color &= cf::NDI_CLIENT_MASK; # just in case... |
2661 | $color &= cf::NDI_CLIENT_MASK; # just in case... |
2592 | |
2662 | |
2593 | # check predefined channels, for the benefit of C |
2663 | # check predefined channels, for the benefit of C |
2594 | $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; |
2664 | if ($CHANNEL{$channel}) { |
|
|
2665 | $channel = $CHANNEL{$channel}; |
2595 | |
2666 | |
|
|
2667 | $self->ext_msg (channel_info => $channel) |
|
|
2668 | if $self->can_msg; |
|
|
2669 | |
|
|
2670 | $channel = $channel->{id}; |
|
|
2671 | |
2596 | if (ref $channel) { |
2672 | } elsif (ref $channel) { |
2597 | # send meta info to client, if not yet sent |
2673 | # send meta info to client, if not yet sent |
2598 | unless (exists $self->{channel}{$channel->{id}}) { |
2674 | unless (exists $self->{channel}{$channel->{id}}) { |
2599 | $self->{channel}{$channel->{id}} = $channel; |
2675 | $self->{channel}{$channel->{id}} = $channel; |
2600 | $self->ext_msg (channel_info => $channel) |
2676 | $self->ext_msg (channel_info => $channel) |
2601 | if $self->can_msg; |
2677 | if $self->can_msg; |
… | |
… | |
3120 | sub main { |
3196 | sub main { |
3121 | # we must not ever block the main coroutine |
3197 | # we must not ever block the main coroutine |
3122 | local $Coro::idle = sub { |
3198 | local $Coro::idle = sub { |
3123 | Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# |
3199 | Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# |
3124 | (async { |
3200 | (async { |
|
|
3201 | $Coro::current->{desc} = "IDLE BUG HANDLER"; |
3125 | Event::one_event; |
3202 | Event::one_event; |
3126 | })->prio (Coro::PRIO_MAX); |
3203 | })->prio (Coro::PRIO_MAX); |
3127 | }; |
3204 | }; |
3128 | |
3205 | |
3129 | reload_config; |
3206 | reload_config; |
… | |
… | |
3373 | register_command "reload" => sub { |
3450 | register_command "reload" => sub { |
3374 | my ($who, $arg) = @_; |
3451 | my ($who, $arg) = @_; |
3375 | |
3452 | |
3376 | if ($who->flag (FLAG_WIZ)) { |
3453 | if ($who->flag (FLAG_WIZ)) { |
3377 | $who->message ("reloading server."); |
3454 | $who->message ("reloading server."); |
|
|
3455 | async { |
|
|
3456 | $Coro::current->{desc} = "perl_reload"; |
3378 | async { reload_perl }; |
3457 | reload_perl; |
|
|
3458 | }; |
3379 | } |
3459 | } |
3380 | }; |
3460 | }; |
3381 | |
3461 | |
3382 | unshift @INC, $LIBDIR; |
3462 | unshift @INC, $LIBDIR; |
3383 | |
3463 | |
… | |
… | |
3402 | my $signal = new Coro::Signal; |
3482 | my $signal = new Coro::Signal; |
3403 | push @WAIT_FOR_TICK_BEGIN, $signal; |
3483 | push @WAIT_FOR_TICK_BEGIN, $signal; |
3404 | $signal->wait; |
3484 | $signal->wait; |
3405 | } |
3485 | } |
3406 | |
3486 | |
3407 | my $min = 1e6;#d# |
|
|
3408 | my $avg = 10; |
|
|
3409 | $TICK_WATCHER = Event->timer ( |
3487 | $TICK_WATCHER = Event->timer ( |
3410 | reentrant => 0, |
3488 | reentrant => 0, |
3411 | parked => 1, |
3489 | parked => 1, |
3412 | prio => 0, |
3490 | prio => 0, |
3413 | at => $NEXT_TICK || $TICK, |
3491 | at => $NEXT_TICK || $TICK, |
… | |
… | |
3421 | |
3499 | |
3422 | $NOW = $tick_start = Event::time; |
3500 | $NOW = $tick_start = Event::time; |
3423 | |
3501 | |
3424 | cf::server_tick; # one server iteration |
3502 | cf::server_tick; # one server iteration |
3425 | |
3503 | |
3426 | 0 && sync_job {#d# |
|
|
3427 | for(1..10) { |
|
|
3428 | my $t = Event::time; |
|
|
3429 | my $map = my $map = new_from_path cf::map "/tmp/x.map" |
|
|
3430 | or die; |
|
|
3431 | |
|
|
3432 | $map->width (50); |
|
|
3433 | $map->height (50); |
|
|
3434 | $map->alloc; |
|
|
3435 | $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work |
|
|
3436 | my $t = Event::time - $t; |
|
|
3437 | |
|
|
3438 | #next unless $t < 0.0013;#d# |
|
|
3439 | if ($t < $min) { |
|
|
3440 | $min = $t; |
|
|
3441 | } |
|
|
3442 | $avg = $avg * 0.99 + $t * 0.01; |
|
|
3443 | } |
|
|
3444 | warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d# |
|
|
3445 | exit 0; |
|
|
3446 | # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477 |
|
|
3447 | }; |
|
|
3448 | |
|
|
3449 | $RUNTIME += $TICK; |
3504 | $RUNTIME += $TICK; |
3450 | $NEXT_TICK += $TICK; |
3505 | $NEXT_TICK += $TICK; |
3451 | |
3506 | |
3452 | if ($NOW >= $NEXT_RUNTIME_WRITE) { |
3507 | if ($NOW >= $NEXT_RUNTIME_WRITE) { |
3453 | $NEXT_RUNTIME_WRITE = $NOW + 10; |
3508 | $NEXT_RUNTIME_WRITE = $NOW + 10; |
3454 | Coro::async_pool { |
3509 | Coro::async_pool { |
|
|
3510 | $Coro::current->{desc} = "runtime saver"; |
3455 | write_runtime |
3511 | write_runtime |
3456 | or warn "ERROR: unable to write runtime file: $!"; |
3512 | or warn "ERROR: unable to write runtime file: $!"; |
3457 | }; |
3513 | }; |
3458 | } |
3514 | } |
3459 | |
3515 | |
3460 | # my $AFTER = Event::time; |
|
|
3461 | # warn $AFTER - $NOW;#d# |
|
|
3462 | |
|
|
3463 | if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { |
3516 | if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { |
3464 | $sig->send; |
3517 | $sig->send; |
3465 | } |
3518 | } |
3466 | while (my $sig = shift @WAIT_FOR_TICK) { |
3519 | while (my $sig = shift @WAIT_FOR_TICK) { |
3467 | $sig->send; |
3520 | $sig->send; |
… | |
… | |
3477 | |
3530 | |
3478 | $LOAD = ($NOW - $tick_start) / $TICK; |
3531 | $LOAD = ($NOW - $tick_start) / $TICK; |
3479 | $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; |
3532 | $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; |
3480 | |
3533 | |
3481 | _post_tick; |
3534 | _post_tick; |
3482 | |
|
|
3483 | |
|
|
3484 | }, |
3535 | }, |
3485 | ); |
3536 | ); |
3486 | |
3537 | |
3487 | { |
3538 | { |
|
|
3539 | BDB::min_parallel 8; |
3488 | BDB::max_poll_time $TICK * 0.1; |
3540 | BDB::max_poll_time $TICK * 0.1; |
3489 | $BDB_POLL_WATCHER = Event->io ( |
3541 | $BDB_POLL_WATCHER = Event->io ( |
3490 | reentrant => 0, |
3542 | reentrant => 0, |
3491 | fd => BDB::poll_fileno, |
3543 | fd => BDB::poll_fileno, |
3492 | poll => 'r', |
3544 | poll => 'r', |
3493 | prio => 0, |
3545 | prio => 0, |
3494 | data => WF_AUTOCANCEL, |
3546 | data => WF_AUTOCANCEL, |
3495 | cb => \&BDB::poll_cb, |
3547 | cb => \&BDB::poll_cb, |
3496 | ); |
3548 | ); |
3497 | BDB::min_parallel 8; |
|
|
3498 | |
3549 | |
3499 | BDB::set_sync_prepare { |
3550 | BDB::set_sync_prepare { |
3500 | my $status; |
3551 | my $status; |
3501 | my $current = $Coro::current; |
3552 | my $current = $Coro::current; |
3502 | ( |
3553 | ( |
… | |
… | |
3511 | ) |
3562 | ) |
3512 | }; |
3563 | }; |
3513 | |
3564 | |
3514 | unless ($DB_ENV) { |
3565 | unless ($DB_ENV) { |
3515 | $DB_ENV = BDB::db_env_create; |
3566 | $DB_ENV = BDB::db_env_create; |
|
|
3567 | $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC |
|
|
3568 | | BDB::LOG_AUTOREMOVE, 1); |
|
|
3569 | $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); |
|
|
3570 | $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); |
3516 | |
3571 | |
3517 | cf::sync_job { |
3572 | cf::sync_job { |
3518 | eval { |
3573 | eval { |
3519 | BDB::db_env_open |
3574 | BDB::db_env_open |
3520 | $DB_ENV, |
3575 | $DB_ENV, |
… | |
… | |
3522 | BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN |
3577 | BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN |
3523 | | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, |
3578 | | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, |
3524 | 0666; |
3579 | 0666; |
3525 | |
3580 | |
3526 | cf::cleanup "db_env_open($BDBDIR): $!" if $!; |
3581 | cf::cleanup "db_env_open($BDBDIR): $!" if $!; |
3527 | |
|
|
3528 | $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); |
|
|
3529 | $DB_ENV->set_lk_detect; |
|
|
3530 | }; |
3582 | }; |
3531 | |
3583 | |
3532 | cf::cleanup "db_env_open(db): $@" if $@; |
3584 | cf::cleanup "db_env_open(db): $@" if $@; |
3533 | }; |
3585 | }; |
3534 | } |
3586 | } |
|
|
3587 | |
|
|
3588 | $BDB_DEADLOCK_WATCHER = Event->timer ( |
|
|
3589 | after => 3, |
|
|
3590 | interval => 1, |
|
|
3591 | hard => 1, |
|
|
3592 | prio => 0, |
|
|
3593 | data => WF_AUTOCANCEL, |
|
|
3594 | cb => sub { |
|
|
3595 | BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; |
|
|
3596 | }, |
|
|
3597 | ); |
|
|
3598 | $BDB_CHECKPOINT_WATCHER = Event->timer ( |
|
|
3599 | after => 11, |
|
|
3600 | interval => 60, |
|
|
3601 | hard => 1, |
|
|
3602 | prio => 0, |
|
|
3603 | data => WF_AUTOCANCEL, |
|
|
3604 | cb => sub { |
|
|
3605 | BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; |
|
|
3606 | }, |
|
|
3607 | ); |
|
|
3608 | $BDB_TRICKLE_WATCHER = Event->timer ( |
|
|
3609 | after => 5, |
|
|
3610 | interval => 10, |
|
|
3611 | hard => 1, |
|
|
3612 | prio => 0, |
|
|
3613 | data => WF_AUTOCANCEL, |
|
|
3614 | cb => sub { |
|
|
3615 | BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; |
|
|
3616 | }, |
|
|
3617 | ); |
3535 | } |
3618 | } |
3536 | |
3619 | |
3537 | { |
3620 | { |
3538 | IO::AIO::min_parallel 8; |
3621 | IO::AIO::min_parallel 8; |
3539 | |
3622 | |
… | |
… | |
3542 | $AIO_POLL_WATCHER = Event->io ( |
3625 | $AIO_POLL_WATCHER = Event->io ( |
3543 | reentrant => 0, |
3626 | reentrant => 0, |
3544 | data => WF_AUTOCANCEL, |
3627 | data => WF_AUTOCANCEL, |
3545 | fd => IO::AIO::poll_fileno, |
3628 | fd => IO::AIO::poll_fileno, |
3546 | poll => 'r', |
3629 | poll => 'r', |
3547 | prio => 6, |
3630 | prio => 0, |
3548 | cb => \&IO::AIO::poll_cb, |
3631 | cb => \&IO::AIO::poll_cb, |
3549 | ); |
3632 | ); |
3550 | } |
3633 | } |
3551 | |
3634 | |
3552 | my $_log_backtrace; |
3635 | my $_log_backtrace; |
… | |
… | |
3558 | |
3641 | |
3559 | # limit the # of concurrent backtraces |
3642 | # limit the # of concurrent backtraces |
3560 | if ($_log_backtrace < 2) { |
3643 | if ($_log_backtrace < 2) { |
3561 | ++$_log_backtrace; |
3644 | ++$_log_backtrace; |
3562 | async { |
3645 | async { |
|
|
3646 | $Coro::current->{desc} = "abt $msg"; |
|
|
3647 | |
3563 | my @bt = fork_call { |
3648 | my @bt = fork_call { |
3564 | @addr = map { sprintf "%x", $_ } @addr; |
3649 | @addr = map { sprintf "%x", $_ } @addr; |
3565 | my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; |
3650 | my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; |
3566 | open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" |
3651 | open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" |
3567 | or die "addr2line: $!"; |
3652 | or die "addr2line: $!"; |