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.353 by root, Sun Sep 2 08:43:46 2007 UTC vs.
Revision 1.375 by root, Sun Sep 30 20:22:21 2007 UTC

… …
80our $NEXT_TICK; 80our $NEXT_TICK;
81our $NOW; 81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
83 83
84our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 88our $DB_ENV;
86 89
87our %CFG; 90our %CFG;
88 91
89our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 93our $RUNTIME;
91 94
92our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
95 98
96# used to convert map paths into valid unix filenames by replacing / by ∕ 99# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 101
… …
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';
… …
285Return true if the lock is currently active, i.e. somebody has locked it. 287Return true if the lock is currently active, i.e. somebody has locked it.
286 288
287=cut 289=cut
288 290
289our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
290 293
291sub lock_wait($) { 294sub 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
… …
344our @SLOT_QUEUE; 354our @SLOT_QUEUE;
345our $SLOT_QUEUE; 355our $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;
… …
423 435
424 my $busy = 1; 436 my $busy = 1;
425 my @res; 437 my @res;
426 438
427 (async { 439 (async {
440 $Coro::current->desc ("sync job coro");
428 @res = eval { $job->() }; 441 @res = eval { $job->() };
429 warn $@ if $@; 442 warn $@ if $@;
430 undef $busy; 443 undef $busy;
431 })->prio (Coro::PRIO_MAX); 444 })->prio (Coro::PRIO_MAX);
432 445
… …
481sub fork_call(&@) { 494sub fork_call(&@) {
482 my ($cb, @args) = @_; 495 my ($cb, @args) = @_;
483 496
484 # we seemingly have to make a local copy of the whole thing, 497 # we seemingly have to make a local copy of the whole thing,
485 # otherwise perl prematurely frees the stuff :/ 498 # otherwise perl prematurely frees the stuff :/
486 # TODO: investigate and fix (liekly this will be rather laborious) 499 # TODO: investigate and fix (likely this will be rather laborious)
487 500
488 my @res = Coro::Util::fork_eval { 501 my @res = Coro::Util::fork_eval {
489 reset_signals; 502 reset_signals;
490 &$cb 503 &$cb
491 }, @args; 504 }, @args;
… …
500=item cf::db_put $family => $key => $value 513=item cf::db_put $family => $key => $value
501 514
502Stores the given C<$value> in the family. It can currently store binary 515Stores the given C<$value> in the family. It can currently store binary
503data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 516data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
504 517
518=item $db = cf::db_table "name"
519
520Create and/or open a new database table. The string must not be "db" and must be unique
521within each server.
522
505=cut 523=cut
524
525sub db_table($) {
526 my ($name) = @_;
527 my $db = BDB::db_create $DB_ENV;
528
529 eval {
530 $db->set_flags (BDB::CHKSUM);
531
532 utf8::encode $name;
533 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
534 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
535 cf::cleanup "db_open(db): $!" if $!;
536 };
537 cf::cleanup "db_open(db): $@" if $@;
538
539 $db
540}
506 541
507our $DB; 542our $DB;
508 543
509sub db_init { 544sub db_init {
510 unless ($DB) {
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job { 545 cf::sync_job {
514 eval { 546 $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 } 547 };
524} 548}
525 549
526sub db_get($$) { 550sub db_get($$) {
527 my $key = "$_[0]/$_[1]"; 551 my $key = "$_[0]/$_[1]";
528 552
… …
1007sub object_freezer_save { 1031sub object_freezer_save {
1008 my ($filename, $rdata, $objs) = @_; 1032 my ($filename, $rdata, $objs) = @_;
1009 1033
1010 sync_job { 1034 sync_job {
1011 if (length $$rdata) { 1035 if (length $$rdata) {
1036 utf8::decode (my $decname = $filename);
1012 warn sprintf "saving %s (%d,%d)\n", 1037 warn sprintf "saving %s (%d,%d)\n",
1013 $filename, length $$rdata, scalar @$objs; 1038 $decname, length $$rdata, scalar @$objs;
1014 1039
1015 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1040 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1016 chmod SAVE_MODE, $fh; 1041 chmod SAVE_MODE, $fh;
1017 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1042 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1018 aio_fsync $fh if $cf::USE_FSYNC; 1043 aio_fsync $fh if $cf::USE_FSYNC;
… …
1037 } 1062 }
1038 } else { 1063 } else {
1039 aio_unlink $filename; 1064 aio_unlink $filename;
1040 aio_unlink "$filename.pst"; 1065 aio_unlink "$filename.pst";
1041 } 1066 }
1042 } 1067 };
1043} 1068}
1044 1069
1045sub object_freezer_as_string { 1070sub object_freezer_as_string {
1046 my ($rdata, $objs) = @_; 1071 my ($rdata, $objs) = @_;
1047 1072
… …
1059 or return; 1084 or return;
1060 1085
1061 unless (aio_stat "$filename.pst") { 1086 unless (aio_stat "$filename.pst") {
1062 (aio_load "$filename.pst", $av) >= 0 1087 (aio_load "$filename.pst", $av) >= 0
1063 or return; 1088 or return;
1089
1064 $av = eval { (Storable::thaw $av)->{objs} }; 1090 $av = eval { (Storable::thaw $av)->{objs} };
1065 } 1091 }
1066 1092
1093 utf8::decode (my $decname = $filename);
1067 warn sprintf "loading %s (%d)\n", 1094 warn sprintf "loading %s (%d,%d)\n",
1068 $filename, length $data, scalar @{$av || []}; 1095 $decname, length $data, scalar @{$av || []};
1096
1069 return ($data, $av); 1097 ($data, $av)
1070} 1098}
1071 1099
1072=head2 COMMAND CALLBACKS 1100=head2 COMMAND CALLBACKS
1073 1101
1074=over 4 1102=over 4
… …
1260 1288
1261=head3 cf::player 1289=head3 cf::player
1262 1290
1263=over 4 1291=over 4
1264 1292
1293=item cf::player::num_playing
1294
1295Returns the official number of playing players, as per the Crossfire metaserver rules.
1296
1297=cut
1298
1299sub num_playing {
1300 scalar grep
1301 $_->ob->map
1302 && !$_->hidden
1303 && !$_->ob->flag (cf::FLAG_WIZ),
1304 cf::player::list
1305}
1306
1265=item cf::player::find $login 1307=item cf::player::find $login
1266 1308
1267Returns the given player object, loading it if necessary (might block). 1309Returns the given player object, loading it if necessary (might block).
1268 1310
1269=cut 1311=cut
… …
1304 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1346 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1305 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1347 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1306 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1348 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1307 aio_unlink +(playerdir $login) . "/$login.pl"; 1349 aio_unlink +(playerdir $login) . "/$login.pl";
1308 1350
1309 my $pl = load_pl path $login 1351 my $f = new_from_file cf::object::thawer path $login
1310 or return; 1352 or return;
1353
1354 my $pl = cf::player::load_pl $f
1355 or return;
1356 local $cf::PLAYER_LOADING{$login} = $pl;
1357 $f->resolve_delayed_derefs;
1311 $cf::PLAYER{$login} = $pl 1358 $cf::PLAYER{$login} = $pl
1312 } 1359 }
1313 } 1360 }
1314} 1361}
1315 1362
… …
1413 or return []; 1460 or return [];
1414 1461
1415 my @logins; 1462 my @logins;
1416 1463
1417 for my $login (@$dirs) { 1464 for my $login (@$dirs) {
1465 my $path = path $login;
1466
1467 # a .pst is a dead give-away for a valid player
1468 unless (-e "$path.pst") {
1418 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1469 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1419 aio_read $fh, 0, 512, my $buf, 0 or next; 1470 aio_read $fh, 0, 512, my $buf, 0 or next;
1420 $buf !~ /^password -------------$/m or next; # official not-valid tag 1471 $buf !~ /^password -------------$/m or next; # official not-valid tag
1472 }
1421 1473
1422 utf8::decode $login; 1474 utf8::decode $login;
1423 push @logins, $login; 1475 push @logins, $login;
1424 } 1476 }
1425 1477
… …
1750 1802
1751sub load_header_from($) { 1803sub load_header_from($) {
1752 my ($self, $path) = @_; 1804 my ($self, $path) = @_;
1753 1805
1754 utf8::encode $path; 1806 utf8::encode $path;
1755 #aio_open $path, O_RDONLY, 0 1807 my $f = new_from_file cf::object::thawer $path
1756 # or return;
1757
1758 $self->_load_header ($path)
1759 or return; 1808 or return;
1809
1810 $self->_load_header ($f)
1811 or return;
1812
1813 local $MAP_LOADING{$self->{path}} = $self;
1814 $f->resolve_delayed_derefs;
1760 1815
1761 $self->{load_path} = $path; 1816 $self->{load_path} = $path;
1762 1817
1763 1 1818 1
1764} 1819}
… …
1818sub find { 1873sub find {
1819 my ($path, $origin) = @_; 1874 my ($path, $origin) = @_;
1820 1875
1821 $path = normalise $path, $origin && $origin->path; 1876 $path = normalise $path, $origin && $origin->path;
1822 1877
1878 cf::lock_wait "map_data:$path";#d#remove
1823 cf::lock_wait "map_find:$path"; 1879 cf::lock_wait "map_find:$path";
1824 1880
1825 $cf::MAP{$path} || do { 1881 $cf::MAP{$path} || do {
1826 my $guard = cf::lock_acquire "map_find:$path"; 1882 my $guard1 = cf::lock_acquire "map_find:$path";
1883 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1884
1827 my $map = new_from_path cf::map $path 1885 my $map = new_from_path cf::map $path
1828 or return; 1886 or return;
1829 1887
1830 $map->{last_save} = $cf::RUNTIME; 1888 $map->{last_save} = $cf::RUNTIME;
1831 1889
… …
1833 or return; 1891 or return;
1834 1892
1835 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1893 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1836 # doing this can freeze the server in a sync job, obviously 1894 # doing this can freeze the server in a sync job, obviously
1837 #$cf::WAIT_FOR_TICK->wait; 1895 #$cf::WAIT_FOR_TICK->wait;
1896 undef $guard1;
1897 undef $guard2;
1838 $map->reset; 1898 $map->reset;
1839 undef $guard;
1840 return find $path; 1899 return find $path;
1841 } 1900 }
1842 1901
1843 $cf::MAP{$path} = $map 1902 $cf::MAP{$path} = $map
1844 } 1903 }
… …
1853 local $self->{deny_reset} = 1; # loading can take a long time 1912 local $self->{deny_reset} = 1; # loading can take a long time
1854 1913
1855 my $path = $self->{path}; 1914 my $path = $self->{path};
1856 1915
1857 { 1916 {
1858 my $guard1 = cf::lock_acquire "map_data:$path"; 1917 my $guard = cf::lock_acquire "map_data:$path";
1859 my $guard2 = cf::lock_acquire "map_load:$path";
1860 1918
1919 return unless $self->valid;
1861 return if $self->in_memory != cf::MAP_SWAPPED; 1920 return unless $self->in_memory == cf::MAP_SWAPPED;
1862 1921
1863 $self->in_memory (cf::MAP_LOADING); 1922 $self->in_memory (cf::MAP_LOADING);
1864 1923
1865 $self->alloc; 1924 $self->alloc;
1866 1925
1867 $self->pre_load; 1926 $self->pre_load;
1868 cf::cede_to_tick; 1927 cf::cede_to_tick;
1869 1928
1929 my $f = new_from_file cf::object::thawer $self->{load_path};
1930 $f->skip_block;
1870 $self->_load_objects ($self->{load_path}, 1) 1931 $self->_load_objects ($f)
1871 or return; 1932 or return;
1872 1933
1873 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1934 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1874 if delete $self->{load_original}; 1935 if delete $self->{load_original};
1875 1936
1876 if (my $uniq = $self->uniq_path) { 1937 if (my $uniq = $self->uniq_path) {
1877 utf8::encode $uniq; 1938 utf8::encode $uniq;
1878 if (aio_open $uniq, O_RDONLY, 0) { 1939 unless (aio_stat $uniq) {
1940 if (my $f = new_from_file cf::object::thawer $uniq) {
1879 $self->clear_unique_items; 1941 $self->clear_unique_items;
1880 $self->_load_objects ($uniq, 0); 1942 $self->_load_objects ($f);
1943 $f->resolve_delayed_derefs;
1944 }
1881 } 1945 }
1882 } 1946 }
1947
1948 $f->resolve_delayed_derefs;
1883 1949
1884 cf::cede_to_tick; 1950 cf::cede_to_tick;
1885 # now do the right thing for maps 1951 # now do the right thing for maps
1886 $self->link_multipart_objects; 1952 $self->link_multipart_objects;
1887 $self->difficulty ($self->estimate_difficulty) 1953 $self->difficulty ($self->estimate_difficulty)
… …
1973 } 2039 }
1974 2040
1975 $MAP_PREFETCH{$path} |= $load; 2041 $MAP_PREFETCH{$path} |= $load;
1976 2042
1977 $MAP_PREFETCHER ||= cf::async { 2043 $MAP_PREFETCHER ||= cf::async {
2044 $Coro::current->{desc} = "map prefetcher";
2045
1978 while (%MAP_PREFETCH) { 2046 while (%MAP_PREFETCH) {
1979 while (my ($k, $v) = each %MAP_PREFETCH) { 2047 while (my ($k, $v) = each %MAP_PREFETCH) {
1980 if (my $map = find $k) { 2048 if (my $map = find $k) {
1981 $map->load if $v; 2049 $map->load if $v;
1982 } 2050 }
… …
2008 return if $self->{deny_save}; 2076 return if $self->{deny_save};
2009 2077
2010 local $self->{last_access} = $self->last_access;#d# 2078 local $self->{last_access} = $self->last_access;#d#
2011 2079
2012 cf::async { 2080 cf::async {
2081 $Coro::current->{desc} = "map player save";
2013 $_->contr->save for $self->players; 2082 $_->contr->save for $self->players;
2014 }; 2083 };
2015 2084
2016 if ($uniq) { 2085 if ($uniq) {
2017 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2086 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2031 2100
2032 return if $self->players; 2101 return if $self->players;
2033 return if $self->in_memory != cf::MAP_IN_MEMORY; 2102 return if $self->in_memory != cf::MAP_IN_MEMORY;
2034 return if $self->{deny_save}; 2103 return if $self->{deny_save};
2035 2104
2105 $self->in_memory (cf::MAP_SWAPPED);
2106
2107 $self->deactivate;
2108 $_->clear_links_to ($self) for values %cf::MAP;
2036 $self->clear; 2109 $self->clear;
2037 $self->in_memory (cf::MAP_SWAPPED);
2038} 2110}
2039 2111
2040sub reset_at { 2112sub reset_at {
2041 my ($self) = @_; 2113 my ($self) = @_;
2042 2114
… …
2074 if $uniq; 2146 if $uniq;
2075 } 2147 }
2076 2148
2077 delete $cf::MAP{$self->path}; 2149 delete $cf::MAP{$self->path};
2078 2150
2151 $self->deactivate;
2152 $_->clear_links_to ($self) for values %cf::MAP;
2079 $self->clear; 2153 $self->clear;
2080
2081 $_->clear_links_to ($self) for values %cf::MAP;
2082 2154
2083 $self->unlink_save; 2155 $self->unlink_save;
2084 $self->destroy; 2156 $self->destroy;
2085} 2157}
2086 2158
… …
2187 2259
2188sub inv_recursive { 2260sub inv_recursive {
2189 inv_recursive_ inv $_[0] 2261 inv_recursive_ inv $_[0]
2190} 2262}
2191 2263
2264=item $ref = $ob->ref
2265
2266creates and returns a persistent reference to an objetc that can be stored as a string.
2267
2268=item $ob = cf::object::deref ($refstring)
2269
2270returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2271even if the object actually exists. May block.
2272
2273=cut
2274
2275sub deref {
2276 my ($ref) = @_;
2277
2278 # temporary compatibility#TODO#remove
2279 $ref =~ s{^<}{player/<};
2280
2281 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2282 my ($uuid, $name) = ($1, $2);
2283 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2284 or return;
2285 $pl->ob->uuid eq $uuid
2286 or return;
2287
2288 $pl->ob
2289 } else {
2290 warn "$ref: cannot resolve object reference\n";
2291 undef
2292 }
2293}
2294
2192package cf; 2295package cf;
2193 2296
2194=back 2297=back
2195 2298
2196=head3 cf::object::player 2299=head3 cf::object::player
… …
2354 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2457 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2355 2458
2356 $self->enter_link; 2459 $self->enter_link;
2357 2460
2358 (async { 2461 (async {
2462 $Coro::current->{desc} = "player::goto $path $x $y";
2463
2464 # *tag paths override both path and x|y
2465 if ($path =~ /^\*(.*)$/) {
2466 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2467 my $ob = $obs[rand @obs];
2468
2469 # see if we actually can go there
2470 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2471 $ob = $obs[rand @obs];
2472 } else {
2473 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2474 }
2475 # else put us there anyways for now #d#
2476
2477 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2478 } else {
2479 ($path, $x, $y) = (undef, undef, undef);
2480 }
2481 }
2482
2359 my $map = eval { 2483 my $map = eval {
2360 my $map = cf::map::find $path; 2484 my $map = defined $path ? cf::map::find $path : undef;
2361 2485
2362 if ($map) { 2486 if ($map) {
2363 $map = $map->customise_for ($self); 2487 $map = $map->customise_for ($self);
2364 $map = $check->($map) if $check && $map; 2488 $map = $check->($map) if $check && $map;
2365 } else { 2489 } else {
2366 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2490 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2367 } 2491 }
2368 2492
2369 $map 2493 $map
2370 }; 2494 };
2371 2495
… …
2461 # if exit is damned, update players death & WoR home-position 2585 # if exit is damned, update players death & WoR home-position
2462 $self->contr->savebed ($slaying, $hp, $sp) 2586 $self->contr->savebed ($slaying, $hp, $sp)
2463 if $exit->flag (FLAG_DAMNED); 2587 if $exit->flag (FLAG_DAMNED);
2464 2588
2465 (async { 2589 (async {
2590 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2591
2466 $self->deactivate_recursive; # just to be sure 2592 $self->deactivate_recursive; # just to be sure
2467 unless (eval { 2593 unless (eval {
2468 $self->goto ($slaying, $hp, $sp); 2594 $self->goto ($slaying, $hp, $sp);
2469 2595
2470 1; 2596 1;
… …
2507 2633
2508=cut 2634=cut
2509 2635
2510our %CHANNEL = ( 2636our %CHANNEL = (
2511 "c/identify" => { 2637 "c/identify" => {
2512 id => "identify", 2638 id => "infobox",
2513 title => "Identify", 2639 title => "Identify",
2514 reply => undef, 2640 reply => undef,
2515 tooltip => "Items recently identified", 2641 tooltip => "Items recently identified",
2516 }, 2642 },
2517 "c/examine" => { 2643 "c/examine" => {
2518 id => "examine", 2644 id => "infobox",
2519 title => "Examine", 2645 title => "Examine",
2520 reply => undef, 2646 reply => undef,
2521 tooltip => "Signs and other items you examined", 2647 tooltip => "Signs and other items you examined",
2522 }, 2648 },
2649 "c/lookat" => {
2650 id => "infobox",
2651 title => "Look",
2652 reply => undef,
2653 tooltip => "What you saw there",
2654 },
2523); 2655);
2524 2656
2525sub cf::client::send_msg { 2657sub cf::client::send_msg {
2526 my ($self, $channel, $msg, $color, @extra) = @_; 2658 my ($self, $channel, $msg, $color, @extra) = @_;
2527 2659
2528 $msg = $self->pl->expand_cfpod ($msg); 2660 $msg = $self->pl->expand_cfpod ($msg);
2529 2661
2530 $color &= cf::NDI_CLIENT_MASK; # just in case... 2662 $color &= cf::NDI_CLIENT_MASK; # just in case...
2531 2663
2532 # check predefined channels, for the benefit of C 2664 # check predefined channels, for the benefit of C
2533 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2665 if ($CHANNEL{$channel}) {
2666 $channel = $CHANNEL{$channel};
2534 2667
2668 $self->ext_msg (channel_info => $channel)
2669 if $self->can_msg;
2670
2671 $channel = $channel->{id};
2672
2535 if (ref $channel) { 2673 } elsif (ref $channel) {
2536 # send meta info to client, if not yet sent 2674 # send meta info to client, if not yet sent
2537 unless (exists $self->{channel}{$channel->{id}}) { 2675 unless (exists $self->{channel}{$channel->{id}}) {
2538 $self->{channel}{$channel->{id}} = $channel; 2676 $self->{channel}{$channel->{id}} = $channel;
2539 $self->ext_msg (channel_info => $channel) 2677 $self->ext_msg (channel_info => $channel)
2540 if $self->can_msg; 2678 if $self->can_msg;
… …
3059sub main { 3197sub main {
3060 # we must not ever block the main coroutine 3198 # we must not ever block the main coroutine
3061 local $Coro::idle = sub { 3199 local $Coro::idle = sub {
3062 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3200 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3063 (async { 3201 (async {
3202 $Coro::current->{desc} = "IDLE BUG HANDLER";
3064 Event::one_event; 3203 Event::one_event;
3065 })->prio (Coro::PRIO_MAX); 3204 })->prio (Coro::PRIO_MAX);
3066 }; 3205 };
3067 3206
3068 reload_config; 3207 reload_config;
… …
3312register_command "reload" => sub { 3451register_command "reload" => sub {
3313 my ($who, $arg) = @_; 3452 my ($who, $arg) = @_;
3314 3453
3315 if ($who->flag (FLAG_WIZ)) { 3454 if ($who->flag (FLAG_WIZ)) {
3316 $who->message ("reloading server."); 3455 $who->message ("reloading server.");
3456 async {
3457 $Coro::current->{desc} = "perl_reload";
3317 async { reload_perl }; 3458 reload_perl;
3459 };
3318 } 3460 }
3319}; 3461};
3320 3462
3321unshift @INC, $LIBDIR; 3463unshift @INC, $LIBDIR;
3322 3464
… …
3341 my $signal = new Coro::Signal; 3483 my $signal = new Coro::Signal;
3342 push @WAIT_FOR_TICK_BEGIN, $signal; 3484 push @WAIT_FOR_TICK_BEGIN, $signal;
3343 $signal->wait; 3485 $signal->wait;
3344} 3486}
3345 3487
3346 my $min = 1e6;#d#
3347 my $avg = 10;
3348$TICK_WATCHER = Event->timer ( 3488$TICK_WATCHER = Event->timer (
3349 reentrant => 0, 3489 reentrant => 0,
3350 parked => 1, 3490 parked => 1,
3351 prio => 0, 3491 prio => 0,
3352 at => $NEXT_TICK || $TICK, 3492 at => $NEXT_TICK || $TICK,
… …
3360 3500
3361 $NOW = $tick_start = Event::time; 3501 $NOW = $tick_start = Event::time;
3362 3502
3363 cf::server_tick; # one server iteration 3503 cf::server_tick; # one server iteration
3364 3504
3365 0 && sync_job {#d#
3366 for(1..10) {
3367 my $t = Event::time;
3368 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3369 or die;
3370
3371 $map->width (50);
3372 $map->height (50);
3373 $map->alloc;
3374 $map->_load_objects ("/tmp/x.map", 1);
3375 my $t = Event::time - $t;
3376
3377 #next unless $t < 0.0013;#d#
3378 if ($t < $min) {
3379 $min = $t;
3380 }
3381 $avg = $avg * 0.99 + $t * 0.01;
3382 }
3383 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3384 exit 0;
3385 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3386 };
3387
3388 $RUNTIME += $TICK; 3505 $RUNTIME += $TICK;
3389 $NEXT_TICK += $TICK; 3506 $NEXT_TICK += $TICK;
3390 3507
3391 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3508 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3392 $NEXT_RUNTIME_WRITE = $NOW + 10; 3509 $NEXT_RUNTIME_WRITE = $NOW + 10;
3393 Coro::async_pool { 3510 Coro::async_pool {
3511 $Coro::current->{desc} = "runtime saver";
3394 write_runtime 3512 write_runtime
3395 or warn "ERROR: unable to write runtime file: $!"; 3513 or warn "ERROR: unable to write runtime file: $!";
3396 }; 3514 };
3397 } 3515 }
3398 3516
3399# my $AFTER = Event::time;
3400# warn $AFTER - $NOW;#d#
3401
3402 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3517 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3403 $sig->send; 3518 $sig->send;
3404 } 3519 }
3405 while (my $sig = shift @WAIT_FOR_TICK) { 3520 while (my $sig = shift @WAIT_FOR_TICK) {
3406 $sig->send; 3521 $sig->send;
… …
3416 3531
3417 $LOAD = ($NOW - $tick_start) / $TICK; 3532 $LOAD = ($NOW - $tick_start) / $TICK;
3418 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3533 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3419 3534
3420 _post_tick; 3535 _post_tick;
3421
3422
3423 }, 3536 },
3424); 3537);
3425 3538
3426{ 3539{
3540 BDB::min_parallel 8;
3427 BDB::max_poll_time $TICK * 0.1; 3541 BDB::max_poll_time $TICK * 0.1;
3428 $BDB_POLL_WATCHER = Event->io ( 3542 $BDB_POLL_WATCHER = Event->io (
3429 reentrant => 0, 3543 reentrant => 0,
3430 fd => BDB::poll_fileno, 3544 fd => BDB::poll_fileno,
3431 poll => 'r', 3545 poll => 'r',
3432 prio => 0, 3546 prio => 0,
3433 data => WF_AUTOCANCEL, 3547 data => WF_AUTOCANCEL,
3434 cb => \&BDB::poll_cb, 3548 cb => \&BDB::poll_cb,
3435 ); 3549 );
3436 BDB::min_parallel 8;
3437 3550
3438 BDB::set_sync_prepare { 3551 BDB::set_sync_prepare {
3439 my $status; 3552 my $status;
3440 my $current = $Coro::current; 3553 my $current = $Coro::current;
3441 ( 3554 (
… …
3450 ) 3563 )
3451 }; 3564 };
3452 3565
3453 unless ($DB_ENV) { 3566 unless ($DB_ENV) {
3454 $DB_ENV = BDB::db_env_create; 3567 $DB_ENV = BDB::db_env_create;
3568 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3569 | BDB::LOG_AUTOREMOVE, 1);
3570 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3571 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3455 3572
3456 cf::sync_job { 3573 cf::sync_job {
3457 eval { 3574 eval {
3458 BDB::db_env_open 3575 BDB::db_env_open
3459 $DB_ENV, 3576 $DB_ENV,
… …
3461 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3578 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3462 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3579 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3463 0666; 3580 0666;
3464 3581
3465 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3582 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3466
3467 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3468 $DB_ENV->set_lk_detect;
3469 }; 3583 };
3470 3584
3471 cf::cleanup "db_env_open(db): $@" if $@; 3585 cf::cleanup "db_env_open(db): $@" if $@;
3472 }; 3586 };
3473 } 3587 }
3588
3589 $BDB_DEADLOCK_WATCHER = Event->timer (
3590 after => 3,
3591 interval => 1,
3592 hard => 1,
3593 prio => 0,
3594 data => WF_AUTOCANCEL,
3595 cb => sub {
3596 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3597 },
3598 );
3599 $BDB_CHECKPOINT_WATCHER = Event->timer (
3600 after => 11,
3601 interval => 60,
3602 hard => 1,
3603 prio => 0,
3604 data => WF_AUTOCANCEL,
3605 cb => sub {
3606 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3607 },
3608 );
3609 $BDB_TRICKLE_WATCHER = Event->timer (
3610 after => 5,
3611 interval => 10,
3612 hard => 1,
3613 prio => 0,
3614 data => WF_AUTOCANCEL,
3615 cb => sub {
3616 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3617 },
3618 );
3474} 3619}
3475 3620
3476{ 3621{
3477 IO::AIO::min_parallel 8; 3622 IO::AIO::min_parallel 8;
3478 3623
… …
3497 3642
3498 # limit the # of concurrent backtraces 3643 # limit the # of concurrent backtraces
3499 if ($_log_backtrace < 2) { 3644 if ($_log_backtrace < 2) {
3500 ++$_log_backtrace; 3645 ++$_log_backtrace;
3501 async { 3646 async {
3647 $Coro::current->{desc} = "abt $msg";
3648
3502 my @bt = fork_call { 3649 my @bt = fork_call {
3503 @addr = map { sprintf "%x", $_ } @addr; 3650 @addr = map { sprintf "%x", $_ } @addr;
3504 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3651 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3505 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3652 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3506 or die "addr2line: $!"; 3653 or die "addr2line: $!";

Diff Legend

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