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.355 by root, Sun Sep 2 12:45:44 2007 UTC vs.
Revision 1.382 by root, Thu Oct 11 00:34:31 2007 UTC

… …
10use Event; 10use Event;
11use Opcode; 11use Opcode;
12use Safe; 12use Safe;
13use Safe::Hole; 13use Safe::Hole;
14 14
15use Coro 3.64 (); 15use Coro 4.1 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
… …
27use BDB (); 27use BDB ();
28use Data::Dumper; 28use Data::Dumper;
29use Digest::MD5; 29use Digest::MD5;
30use Fcntl; 30use Fcntl;
31use YAML::Syck (); 31use YAML::Syck ();
32use IO::AIO 2.32 (); 32use IO::AIO 2.51 ();
33use Time::HiRes; 33use Time::HiRes;
34use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 (); 35use Digest::MD5 ();
36 36
37# configure various modules to our taste 37# configure various modules to our taste
… …
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;
… …
361 } 373 }
362 } 374 }
363 } 375 }
364 376
365 if (@SLOT_QUEUE) { 377 if (@SLOT_QUEUE) {
366 # we do not use wait_For_tick() as it returns immediately when tick is inactive 378 # we do not use wait_for_tick() as it returns immediately when tick is inactive
367 push @cf::WAIT_FOR_TICK, $signal; 379 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait; 380 $signal->wait;
369 } else { 381 } else {
370 Coro::schedule; 382 Coro::schedule;
371 } 383 }
… …
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
502Stores the given C<$value> in the family. It can currently store binary 517Stores 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). 518data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
504 519
520=item $db = cf::db_table "name"
521
522Create and/or open a new database table. The string must not be "db" and must be unique
523within each server.
524
505=cut 525=cut
526
527sub 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
507our $DB; 544our $DB;
508 545
509sub db_init { 546sub 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
526sub db_get($$) { 552sub db_get($$) {
527 my $key = "$_[0]/$_[1]"; 553 my $key = "$_[0]/$_[1]";
528 554
… …
1007sub object_freezer_save { 1033sub object_freezer_save {
1008 my ($filename, $rdata, $objs) = @_; 1034 my ($filename, $rdata, $objs) = @_;
1009 1035
1010 sync_job { 1036 sync_job {
1011 if (length $$rdata) { 1037 if (length $$rdata) {
1038 utf8::decode (my $decname = $filename);
1012 warn sprintf "saving %s (%d,%d)\n", 1039 warn sprintf "saving %s (%d,%d)\n",
1013 $filename, length $$rdata, scalar @$objs; 1040 $decname, length $$rdata, scalar @$objs;
1014 1041
1015 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1042 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1016 chmod SAVE_MODE, $fh; 1043 chmod SAVE_MODE, $fh;
1017 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1044 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1018 aio_fsync $fh if $cf::USE_FSYNC; 1045 aio_fsync $fh if $cf::USE_FSYNC;
1019 close $fh; 1046 close $fh;
1020 1047
1021 if (@$objs) { 1048 if (@$objs) {
1022 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1049 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1023 chmod SAVE_MODE, $fh; 1050 chmod SAVE_MODE, $fh;
1024 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1051 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1025 aio_write $fh, 0, (length $data), $data, 0; 1052 aio_write $fh, 0, (length $data), $data, 0;
1026 aio_fsync $fh if $cf::USE_FSYNC; 1053 aio_fsync $fh if $cf::USE_FSYNC;
1027 close $fh; 1054 close $fh;
1028 aio_rename "$filename.pst~", "$filename.pst"; 1055 aio_rename "$filename.pst~", "$filename.pst";
1029 } 1056 }
… …
1037 } 1064 }
1038 } else { 1065 } else {
1039 aio_unlink $filename; 1066 aio_unlink $filename;
1040 aio_unlink "$filename.pst"; 1067 aio_unlink "$filename.pst";
1041 } 1068 }
1042 } 1069 };
1043} 1070}
1044 1071
1045sub object_freezer_as_string { 1072sub object_freezer_as_string {
1046 my ($rdata, $objs) = @_; 1073 my ($rdata, $objs) = @_;
1047 1074
… …
1059 or return; 1086 or return;
1060 1087
1061 unless (aio_stat "$filename.pst") { 1088 unless (aio_stat "$filename.pst") {
1062 (aio_load "$filename.pst", $av) >= 0 1089 (aio_load "$filename.pst", $av) >= 0
1063 or return; 1090 or return;
1064 $av = eval { (Storable::thaw $av)->{objs} };
1065 }
1066 1091
1092 my $st = eval { Coro::Storable::thaw $av }
1093 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1094 $av = $st->{objs};
1095 }
1096
1097 utf8::decode (my $decname = $filename);
1067 warn sprintf "loading %s (%d)\n", 1098 warn sprintf "loading %s (%d,%d)\n",
1068 $filename, length $data, scalar @{$av || []}; 1099 $decname, length $data, scalar @{$av || []};
1100
1069 return ($data, $av); 1101 ($data, $av)
1070} 1102}
1071 1103
1072=head2 COMMAND CALLBACKS 1104=head2 COMMAND CALLBACKS
1073 1105
1074=over 4 1106=over 4
… …
1260 1292
1261=head3 cf::player 1293=head3 cf::player
1262 1294
1263=over 4 1295=over 4
1264 1296
1297=item cf::player::num_playing
1298
1299Returns the official number of playing players, as per the Crossfire metaserver rules.
1300
1301=cut
1302
1303sub num_playing {
1304 scalar grep
1305 $_->ob->map
1306 && !$_->hidden
1307 && !$_->ob->flag (cf::FLAG_WIZ),
1308 cf::player::list
1309}
1310
1265=item cf::player::find $login 1311=item cf::player::find $login
1266 1312
1267Returns the given player object, loading it if necessary (might block). 1313Returns the given player object, loading it if necessary (might block).
1268 1314
1269=cut 1315=cut
… …
1304 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1350 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1305 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1351 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1306 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1352 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1307 aio_unlink +(playerdir $login) . "/$login.pl"; 1353 aio_unlink +(playerdir $login) . "/$login.pl";
1308 1354
1309 my $pl = load_pl path $login 1355 my $f = new_from_file cf::object::thawer path $login
1310 or return; 1356 or return;
1357
1358 my $pl = cf::player::load_pl $f
1359 or return;
1360 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs;
1311 $cf::PLAYER{$login} = $pl 1362 $cf::PLAYER{$login} = $pl
1312 } 1363 }
1313 } 1364 }
1314} 1365}
1315 1366
… …
1755 1806
1756sub load_header_from($) { 1807sub load_header_from($) {
1757 my ($self, $path) = @_; 1808 my ($self, $path) = @_;
1758 1809
1759 utf8::encode $path; 1810 utf8::encode $path;
1760 #aio_open $path, O_RDONLY, 0 1811 my $f = new_from_file cf::object::thawer $path
1761 # or return;
1762
1763 $self->_load_header ($path)
1764 or return; 1812 or return;
1813
1814 $self->_load_header ($f)
1815 or return;
1816
1817 local $MAP_LOADING{$self->{path}} = $self;
1818 $f->resolve_delayed_derefs;
1765 1819
1766 $self->{load_path} = $path; 1820 $self->{load_path} = $path;
1767 1821
1768 1 1822 1
1769} 1823}
… …
1823sub find { 1877sub find {
1824 my ($path, $origin) = @_; 1878 my ($path, $origin) = @_;
1825 1879
1826 $path = normalise $path, $origin && $origin->path; 1880 $path = normalise $path, $origin && $origin->path;
1827 1881
1882 cf::lock_wait "map_data:$path";#d#remove
1828 cf::lock_wait "map_find:$path"; 1883 cf::lock_wait "map_find:$path";
1829 1884
1830 $cf::MAP{$path} || do { 1885 $cf::MAP{$path} || do {
1831 my $guard = cf::lock_acquire "map_find:$path"; 1886 my $guard1 = cf::lock_acquire "map_find:$path";
1887 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1888
1832 my $map = new_from_path cf::map $path 1889 my $map = new_from_path cf::map $path
1833 or return; 1890 or return;
1834 1891
1835 $map->{last_save} = $cf::RUNTIME; 1892 $map->{last_save} = $cf::RUNTIME;
1836 1893
… …
1838 or return; 1895 or return;
1839 1896
1840 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1841 # doing this can freeze the server in a sync job, obviously 1898 # doing this can freeze the server in a sync job, obviously
1842 #$cf::WAIT_FOR_TICK->wait; 1899 #$cf::WAIT_FOR_TICK->wait;
1900 undef $guard1;
1901 undef $guard2;
1843 $map->reset; 1902 $map->reset;
1844 undef $guard;
1845 return find $path; 1903 return find $path;
1846 } 1904 }
1847 1905
1848 $cf::MAP{$path} = $map 1906 $cf::MAP{$path} = $map
1849 } 1907 }
… …
1858 local $self->{deny_reset} = 1; # loading can take a long time 1916 local $self->{deny_reset} = 1; # loading can take a long time
1859 1917
1860 my $path = $self->{path}; 1918 my $path = $self->{path};
1861 1919
1862 { 1920 {
1863 my $guard1 = cf::lock_acquire "map_data:$path"; 1921 my $guard = cf::lock_acquire "map_data:$path";
1864 my $guard2 = cf::lock_acquire "map_load:$path";
1865 1922
1923 return unless $self->valid;
1866 return if $self->in_memory != cf::MAP_SWAPPED; 1924 return unless $self->in_memory == cf::MAP_SWAPPED;
1867 1925
1868 $self->in_memory (cf::MAP_LOADING); 1926 $self->in_memory (cf::MAP_LOADING);
1869 1927
1870 $self->alloc; 1928 $self->alloc;
1871 1929
1872 $self->pre_load; 1930 $self->pre_load;
1873 cf::cede_to_tick; 1931 cf::cede_to_tick;
1874 1932
1933 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block;
1875 $self->_load_objects ($self->{load_path}, 1) 1935 $self->_load_objects ($f)
1876 or return; 1936 or return;
1877 1937
1878 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1879 if delete $self->{load_original}; 1939 if delete $self->{load_original};
1880 1940
1881 if (my $uniq = $self->uniq_path) { 1941 if (my $uniq = $self->uniq_path) {
1882 utf8::encode $uniq; 1942 utf8::encode $uniq;
1883 if (aio_open $uniq, O_RDONLY, 0) { 1943 unless (aio_stat $uniq) {
1944 if (my $f = new_from_file cf::object::thawer $uniq) {
1884 $self->clear_unique_items; 1945 $self->clear_unique_items;
1885 $self->_load_objects ($uniq, 0); 1946 $self->_load_objects ($f);
1947 $f->resolve_delayed_derefs;
1948 }
1886 } 1949 }
1887 } 1950 }
1951
1952 $f->resolve_delayed_derefs;
1888 1953
1889 cf::cede_to_tick; 1954 cf::cede_to_tick;
1890 # now do the right thing for maps 1955 # now do the right thing for maps
1891 $self->link_multipart_objects; 1956 $self->link_multipart_objects;
1892 $self->difficulty ($self->estimate_difficulty) 1957 $self->difficulty ($self->estimate_difficulty)
… …
1978 } 2043 }
1979 2044
1980 $MAP_PREFETCH{$path} |= $load; 2045 $MAP_PREFETCH{$path} |= $load;
1981 2046
1982 $MAP_PREFETCHER ||= cf::async { 2047 $MAP_PREFETCHER ||= cf::async {
2048 $Coro::current->{desc} = "map prefetcher";
2049
1983 while (%MAP_PREFETCH) { 2050 while (%MAP_PREFETCH) {
1984 while (my ($k, $v) = each %MAP_PREFETCH) { 2051 while (my ($k, $v) = each %MAP_PREFETCH) {
1985 if (my $map = find $k) { 2052 if (my $map = find $k) {
1986 $map->load if $v; 2053 $map->load if $v;
1987 } 2054 }
… …
2013 return if $self->{deny_save}; 2080 return if $self->{deny_save};
2014 2081
2015 local $self->{last_access} = $self->last_access;#d# 2082 local $self->{last_access} = $self->last_access;#d#
2016 2083
2017 cf::async { 2084 cf::async {
2085 $Coro::current->{desc} = "map player save";
2018 $_->contr->save for $self->players; 2086 $_->contr->save for $self->players;
2019 }; 2087 };
2020 2088
2021 if ($uniq) { 2089 if ($uniq) {
2022 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2090 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2036 2104
2037 return if $self->players; 2105 return if $self->players;
2038 return if $self->in_memory != cf::MAP_IN_MEMORY; 2106 return if $self->in_memory != cf::MAP_IN_MEMORY;
2039 return if $self->{deny_save}; 2107 return if $self->{deny_save};
2040 2108
2109 $self->in_memory (cf::MAP_SWAPPED);
2110
2111 $self->deactivate;
2112 $_->clear_links_to ($self) for values %cf::MAP;
2041 $self->clear; 2113 $self->clear;
2042 $self->in_memory (cf::MAP_SWAPPED);
2043} 2114}
2044 2115
2045sub reset_at { 2116sub reset_at {
2046 my ($self) = @_; 2117 my ($self) = @_;
2047 2118
… …
2079 if $uniq; 2150 if $uniq;
2080 } 2151 }
2081 2152
2082 delete $cf::MAP{$self->path}; 2153 delete $cf::MAP{$self->path};
2083 2154
2155 $self->deactivate;
2156 $_->clear_links_to ($self) for values %cf::MAP;
2084 $self->clear; 2157 $self->clear;
2085
2086 $_->clear_links_to ($self) for values %cf::MAP;
2087 2158
2088 $self->unlink_save; 2159 $self->unlink_save;
2089 $self->destroy; 2160 $self->destroy;
2090} 2161}
2091 2162
… …
2192 2263
2193sub inv_recursive { 2264sub inv_recursive {
2194 inv_recursive_ inv $_[0] 2265 inv_recursive_ inv $_[0]
2195} 2266}
2196 2267
2268=item $ref = $ob->ref
2269
2270creates and returns a persistent reference to an objetc that can be stored as a string.
2271
2272=item $ob = cf::object::deref ($refstring)
2273
2274returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2275even if the object actually exists. May block.
2276
2277=cut
2278
2279sub deref {
2280 my ($ref) = @_;
2281
2282 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return;
2286 $pl->ob->uuid eq $uuid
2287 or return;
2288
2289 $pl->ob
2290 } else {
2291 warn "$ref: cannot resolve object reference\n";
2292 undef
2293 }
2294}
2295
2197package cf; 2296package cf;
2198 2297
2199=back 2298=back
2200 2299
2201=head3 cf::object::player 2300=head3 cf::object::player
… …
2359 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2360 2459
2361 $self->enter_link; 2460 $self->enter_link;
2362 2461
2363 (async { 2462 (async {
2463 $Coro::current->{desc} = "player::goto $path $x $y";
2464
2465 # *tag paths override both path and x|y
2466 if ($path =~ /^\*(.*)$/) {
2467 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2468 my $ob = $obs[rand @obs];
2469
2470 # see if we actually can go there
2471 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2472 $ob = $obs[rand @obs];
2473 } else {
2474 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2475 }
2476 # else put us there anyways for now #d#
2477
2478 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2479 } else {
2480 ($path, $x, $y) = (undef, undef, undef);
2481 }
2482 }
2483
2364 my $map = eval { 2484 my $map = eval {
2365 my $map = cf::map::find $path; 2485 my $map = defined $path ? cf::map::find $path : undef;
2366 2486
2367 if ($map) { 2487 if ($map) {
2368 $map = $map->customise_for ($self); 2488 $map = $map->customise_for ($self);
2369 $map = $check->($map) if $check && $map; 2489 $map = $check->($map) if $check && $map;
2370 } else { 2490 } else {
2371 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2491 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2372 } 2492 }
2373 2493
2374 $map 2494 $map
2375 }; 2495 };
2376 2496
… …
2466 # if exit is damned, update players death & WoR home-position 2586 # if exit is damned, update players death & WoR home-position
2467 $self->contr->savebed ($slaying, $hp, $sp) 2587 $self->contr->savebed ($slaying, $hp, $sp)
2468 if $exit->flag (FLAG_DAMNED); 2588 if $exit->flag (FLAG_DAMNED);
2469 2589
2470 (async { 2590 (async {
2591 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2592
2471 $self->deactivate_recursive; # just to be sure 2593 $self->deactivate_recursive; # just to be sure
2472 unless (eval { 2594 unless (eval {
2473 $self->goto ($slaying, $hp, $sp); 2595 $self->goto ($slaying, $hp, $sp);
2474 2596
2475 1; 2597 1;
… …
2512 2634
2513=cut 2635=cut
2514 2636
2515our %CHANNEL = ( 2637our %CHANNEL = (
2516 "c/identify" => { 2638 "c/identify" => {
2517 id => "identify", 2639 id => "infobox",
2518 title => "Identify", 2640 title => "Identify",
2519 reply => undef, 2641 reply => undef,
2520 tooltip => "Items recently identified", 2642 tooltip => "Items recently identified",
2521 }, 2643 },
2522 "c/examine" => { 2644 "c/examine" => {
2523 id => "examine", 2645 id => "infobox",
2524 title => "Examine", 2646 title => "Examine",
2525 reply => undef, 2647 reply => undef,
2526 tooltip => "Signs and other items you examined", 2648 tooltip => "Signs and other items you examined",
2527 }, 2649 },
2650 "c/lookat" => {
2651 id => "infobox",
2652 title => "Look",
2653 reply => undef,
2654 tooltip => "What you saw there",
2655 },
2528); 2656);
2529 2657
2530sub cf::client::send_msg { 2658sub cf::client::send_msg {
2531 my ($self, $channel, $msg, $color, @extra) = @_; 2659 my ($self, $channel, $msg, $color, @extra) = @_;
2532 2660
2533 $msg = $self->pl->expand_cfpod ($msg); 2661 $msg = $self->pl->expand_cfpod ($msg);
2534 2662
2535 $color &= cf::NDI_CLIENT_MASK; # just in case... 2663 $color &= cf::NDI_CLIENT_MASK; # just in case...
2536 2664
2537 # check predefined channels, for the benefit of C 2665 # check predefined channels, for the benefit of C
2538 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2666 if ($CHANNEL{$channel}) {
2667 $channel = $CHANNEL{$channel};
2539 2668
2669 $self->ext_msg (channel_info => $channel)
2670 if $self->can_msg;
2671
2672 $channel = $channel->{id};
2673
2540 if (ref $channel) { 2674 } elsif (ref $channel) {
2541 # send meta info to client, if not yet sent 2675 # send meta info to client, if not yet sent
2542 unless (exists $self->{channel}{$channel->{id}}) { 2676 unless (exists $self->{channel}{$channel->{id}}) {
2543 $self->{channel}{$channel->{id}} = $channel; 2677 $self->{channel}{$channel->{id}} = $channel;
2544 $self->ext_msg (channel_info => $channel) 2678 $self->ext_msg (channel_info => $channel)
2545 if $self->can_msg; 2679 if $self->can_msg;
… …
3064sub main { 3198sub main {
3065 # we must not ever block the main coroutine 3199 # we must not ever block the main coroutine
3066 local $Coro::idle = sub { 3200 local $Coro::idle = sub {
3067 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3201 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3068 (async { 3202 (async {
3203 $Coro::current->{desc} = "IDLE BUG HANDLER";
3069 Event::one_event; 3204 Event::one_event;
3070 })->prio (Coro::PRIO_MAX); 3205 })->prio (Coro::PRIO_MAX);
3071 }; 3206 };
3072 3207
3073 reload_config; 3208 reload_config;
… …
3145 # and maps saved/destroyed asynchronously. 3280 # and maps saved/destroyed asynchronously.
3146 warn "begin emergency player save\n"; 3281 warn "begin emergency player save\n";
3147 for my $login (keys %cf::PLAYER) { 3282 for my $login (keys %cf::PLAYER) {
3148 my $pl = $cf::PLAYER{$login} or next; 3283 my $pl = $cf::PLAYER{$login} or next;
3149 $pl->valid or next; 3284 $pl->valid or next;
3285 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3150 $pl->save; 3286 $pl->save;
3151 } 3287 }
3152 warn "end emergency player save\n"; 3288 warn "end emergency player save\n";
3153 3289
3154 warn "begin emergency map save\n"; 3290 warn "begin emergency map save\n";
… …
3317register_command "reload" => sub { 3453register_command "reload" => sub {
3318 my ($who, $arg) = @_; 3454 my ($who, $arg) = @_;
3319 3455
3320 if ($who->flag (FLAG_WIZ)) { 3456 if ($who->flag (FLAG_WIZ)) {
3321 $who->message ("reloading server."); 3457 $who->message ("reloading server.");
3458 async {
3459 $Coro::current->{desc} = "perl_reload";
3322 async { reload_perl }; 3460 reload_perl;
3461 };
3323 } 3462 }
3324}; 3463};
3325 3464
3326unshift @INC, $LIBDIR; 3465unshift @INC, $LIBDIR;
3327 3466
… …
3346 my $signal = new Coro::Signal; 3485 my $signal = new Coro::Signal;
3347 push @WAIT_FOR_TICK_BEGIN, $signal; 3486 push @WAIT_FOR_TICK_BEGIN, $signal;
3348 $signal->wait; 3487 $signal->wait;
3349} 3488}
3350 3489
3351 my $min = 1e6;#d#
3352 my $avg = 10;
3353$TICK_WATCHER = Event->timer ( 3490$TICK_WATCHER = Event->timer (
3354 reentrant => 0, 3491 reentrant => 0,
3355 parked => 1, 3492 parked => 1,
3356 prio => 0, 3493 prio => 0,
3357 at => $NEXT_TICK || $TICK, 3494 at => $NEXT_TICK || $TICK,
… …
3365 3502
3366 $NOW = $tick_start = Event::time; 3503 $NOW = $tick_start = Event::time;
3367 3504
3368 cf::server_tick; # one server iteration 3505 cf::server_tick; # one server iteration
3369 3506
3370 0 && sync_job {#d#
3371 for(1..10) {
3372 my $t = Event::time;
3373 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3374 or die;
3375
3376 $map->width (50);
3377 $map->height (50);
3378 $map->alloc;
3379 $map->_load_objects ("/tmp/x.map", 1);
3380 my $t = Event::time - $t;
3381
3382 #next unless $t < 0.0013;#d#
3383 if ($t < $min) {
3384 $min = $t;
3385 }
3386 $avg = $avg * 0.99 + $t * 0.01;
3387 }
3388 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3389 exit 0;
3390 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3391 };
3392
3393 $RUNTIME += $TICK; 3507 $RUNTIME += $TICK;
3394 $NEXT_TICK += $TICK; 3508 $NEXT_TICK += $TICK;
3395 3509
3396 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3510 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3397 $NEXT_RUNTIME_WRITE = $NOW + 10; 3511 $NEXT_RUNTIME_WRITE = $NOW + 10;
3398 Coro::async_pool { 3512 Coro::async_pool {
3513 $Coro::current->{desc} = "runtime saver";
3399 write_runtime 3514 write_runtime
3400 or warn "ERROR: unable to write runtime file: $!"; 3515 or warn "ERROR: unable to write runtime file: $!";
3401 }; 3516 };
3402 } 3517 }
3403 3518
3404# my $AFTER = Event::time;
3405# warn $AFTER - $NOW;#d#
3406
3407 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3519 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3408 $sig->send; 3520 $sig->send;
3409 } 3521 }
3410 while (my $sig = shift @WAIT_FOR_TICK) { 3522 while (my $sig = shift @WAIT_FOR_TICK) {
3411 $sig->send; 3523 $sig->send;
… …
3421 3533
3422 $LOAD = ($NOW - $tick_start) / $TICK; 3534 $LOAD = ($NOW - $tick_start) / $TICK;
3423 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3535 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3424 3536
3425 _post_tick; 3537 _post_tick;
3426
3427
3428 }, 3538 },
3429); 3539);
3430 3540
3431{ 3541{
3542 BDB::min_parallel 8;
3432 BDB::max_poll_time $TICK * 0.1; 3543 BDB::max_poll_time $TICK * 0.1;
3433 $BDB_POLL_WATCHER = Event->io ( 3544 $BDB_POLL_WATCHER = Event->io (
3434 reentrant => 0, 3545 reentrant => 0,
3435 fd => BDB::poll_fileno, 3546 fd => BDB::poll_fileno,
3436 poll => 'r', 3547 poll => 'r',
3437 prio => 0, 3548 prio => 0,
3438 data => WF_AUTOCANCEL, 3549 data => WF_AUTOCANCEL,
3439 cb => \&BDB::poll_cb, 3550 cb => \&BDB::poll_cb,
3440 ); 3551 );
3441 BDB::min_parallel 8;
3442 3552
3443 BDB::set_sync_prepare { 3553 BDB::set_sync_prepare {
3444 my $status; 3554 my $status;
3445 my $current = $Coro::current; 3555 my $current = $Coro::current;
3446 ( 3556 (
… …
3455 ) 3565 )
3456 }; 3566 };
3457 3567
3458 unless ($DB_ENV) { 3568 unless ($DB_ENV) {
3459 $DB_ENV = BDB::db_env_create; 3569 $DB_ENV = BDB::db_env_create;
3570 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3571 | BDB::LOG_AUTOREMOVE, 1);
3572 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3573 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3460 3574
3461 cf::sync_job { 3575 cf::sync_job {
3462 eval { 3576 eval {
3463 BDB::db_env_open 3577 BDB::db_env_open
3464 $DB_ENV, 3578 $DB_ENV,
… …
3466 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3580 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3467 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3581 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3468 0666; 3582 0666;
3469 3583
3470 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3584 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3471
3472 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3473 $DB_ENV->set_lk_detect;
3474 }; 3585 };
3475 3586
3476 cf::cleanup "db_env_open(db): $@" if $@; 3587 cf::cleanup "db_env_open(db): $@" if $@;
3477 }; 3588 };
3478 } 3589 }
3590
3591 $BDB_DEADLOCK_WATCHER = Event->timer (
3592 after => 3,
3593 interval => 1,
3594 hard => 1,
3595 prio => 0,
3596 data => WF_AUTOCANCEL,
3597 cb => sub {
3598 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3599 },
3600 );
3601 $BDB_CHECKPOINT_WATCHER = Event->timer (
3602 after => 11,
3603 interval => 60,
3604 hard => 1,
3605 prio => 0,
3606 data => WF_AUTOCANCEL,
3607 cb => sub {
3608 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3609 },
3610 );
3611 $BDB_TRICKLE_WATCHER = Event->timer (
3612 after => 5,
3613 interval => 10,
3614 hard => 1,
3615 prio => 0,
3616 data => WF_AUTOCANCEL,
3617 cb => sub {
3618 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3619 },
3620 );
3479} 3621}
3480 3622
3481{ 3623{
3482 IO::AIO::min_parallel 8; 3624 IO::AIO::min_parallel 8;
3483 3625
… …
3486 $AIO_POLL_WATCHER = Event->io ( 3628 $AIO_POLL_WATCHER = Event->io (
3487 reentrant => 0, 3629 reentrant => 0,
3488 data => WF_AUTOCANCEL, 3630 data => WF_AUTOCANCEL,
3489 fd => IO::AIO::poll_fileno, 3631 fd => IO::AIO::poll_fileno,
3490 poll => 'r', 3632 poll => 'r',
3491 prio => 6, 3633 prio => 0,
3492 cb => \&IO::AIO::poll_cb, 3634 cb => \&IO::AIO::poll_cb,
3493 ); 3635 );
3494} 3636}
3495 3637
3496my $_log_backtrace; 3638my $_log_backtrace;
… …
3502 3644
3503 # limit the # of concurrent backtraces 3645 # limit the # of concurrent backtraces
3504 if ($_log_backtrace < 2) { 3646 if ($_log_backtrace < 2) {
3505 ++$_log_backtrace; 3647 ++$_log_backtrace;
3506 async { 3648 async {
3649 $Coro::current->{desc} = "abt $msg";
3650
3507 my @bt = fork_call { 3651 my @bt = fork_call {
3508 @addr = map { sprintf "%x", $_ } @addr; 3652 @addr = map { sprintf "%x", $_ } @addr;
3509 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3653 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3510 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3654 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3511 or die "addr2line: $!"; 3655 or die "addr2line: $!";

Diff Legend

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