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.344 by root, Mon Aug 27 02:43:38 2007 UTC vs.
Revision 1.378 by root, Thu Oct 4 11:36:54 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';
… …
272Wait until the given lock is available and then acquires it and returns 274Wait until the given lock is available and then acquires it and returns
273a Coro::guard object. If the guard object gets destroyed (goes out of scope, 275a Coro::guard object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
275returned. 277returned.
276 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
277Lock names should begin with a unique identifier (for example, cf::map::find 282Lock names should begin with a unique identifier (for example, cf::map::find
278uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
279 284
280=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
281 286
282Return 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.
283 288
284=cut 289=cut
285 290
286our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
287 293
288sub lock_wait($) { 294sub lock_wait($) {
289 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#
290 301
291 # wait for lock, if any 302 # wait for lock, if any
292 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
293 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
294 Coro::schedule; 305 Coro::schedule;
… …
300 311
301 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
302 lock_wait $key; 313 lock_wait $key;
303 314
304 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
305 317
306 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
307 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
308 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
309 } 322 }
310} 323}
311 324
… …
341our @SLOT_QUEUE; 354our @SLOT_QUEUE;
342our $SLOT_QUEUE; 355our $SLOT_QUEUE;
343 356
344$SLOT_QUEUE->cancel if $SLOT_QUEUE; 357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
345$SLOT_QUEUE = Coro::async { 358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
346 my $signal = new Coro::Signal; 361 my $signal = new Coro::Signal;
347 362
348 while () { 363 while () {
349 next_job: 364 next_job:
350 my $avail = cf::till_tick; 365 my $avail = cf::till_tick;
… …
420 435
421 my $busy = 1; 436 my $busy = 1;
422 my @res; 437 my @res;
423 438
424 (async { 439 (async {
440 $Coro::current->desc ("sync job coro");
425 @res = eval { $job->() }; 441 @res = eval { $job->() };
426 warn $@ if $@; 442 warn $@ if $@;
427 undef $busy; 443 undef $busy;
428 })->prio (Coro::PRIO_MAX); 444 })->prio (Coro::PRIO_MAX);
429 445
… …
478sub fork_call(&@) { 494sub fork_call(&@) {
479 my ($cb, @args) = @_; 495 my ($cb, @args) = @_;
480 496
481 # 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,
482 # otherwise perl prematurely frees the stuff :/ 498 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious) 499 # TODO: investigate and fix (likely this will be rather laborious)
484 500
485 my @res = Coro::Util::fork_eval { 501 my @res = Coro::Util::fork_eval {
486 reset_signals; 502 reset_signals;
487 &$cb 503 &$cb
488 }, @args; 504 }, @args;
… …
497=item cf::db_put $family => $key => $value 513=item cf::db_put $family => $key => $value
498 514
499Stores 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
500data 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).
501 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
502=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}
503 541
504our $DB; 542our $DB;
505 543
506sub db_init { 544sub db_init {
507 unless ($DB) {
508 $DB = BDB::db_create $DB_ENV;
509
510 cf::sync_job { 545 cf::sync_job {
511 eval { 546 $DB ||= db_table "db";
512 $DB->set_flags (BDB::CHKSUM);
513
514 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
515 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
516 cf::cleanup "db_open(db): $!" if $!;
517 };
518 cf::cleanup "db_open(db): $@" if $@;
519 };
520 } 547 };
521} 548}
522 549
523sub db_get($$) { 550sub db_get($$) {
524 my $key = "$_[0]/$_[1]"; 551 my $key = "$_[0]/$_[1]";
525 552
… …
575 if (1) { 602 if (1) {
576 $md5 = 603 $md5 =
577 join "\x00", 604 join "\x00",
578 $processversion, 605 $processversion,
579 map { 606 map {
580 Coro::cede; 607 cf::cede_to_tick;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 608 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src; 609 } 0.. $#$src;
583 610
584 611
585 my $dbmd5 = db_get cache => "$id/md5"; 612 my $dbmd5 = db_get cache => "$id/md5";
… …
1004sub object_freezer_save { 1031sub object_freezer_save {
1005 my ($filename, $rdata, $objs) = @_; 1032 my ($filename, $rdata, $objs) = @_;
1006 1033
1007 sync_job { 1034 sync_job {
1008 if (length $$rdata) { 1035 if (length $$rdata) {
1036 utf8::decode (my $decname = $filename);
1009 warn sprintf "saving %s (%d,%d)\n", 1037 warn sprintf "saving %s (%d,%d)\n",
1010 $filename, length $$rdata, scalar @$objs; 1038 $decname, length $$rdata, scalar @$objs;
1011 1039
1012 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1040 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1013 chmod SAVE_MODE, $fh; 1041 chmod SAVE_MODE, $fh;
1014 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1042 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1015 aio_fsync $fh if $cf::USE_FSYNC; 1043 aio_fsync $fh if $cf::USE_FSYNC;
… …
1034 } 1062 }
1035 } else { 1063 } else {
1036 aio_unlink $filename; 1064 aio_unlink $filename;
1037 aio_unlink "$filename.pst"; 1065 aio_unlink "$filename.pst";
1038 } 1066 }
1039 } 1067 };
1040} 1068}
1041 1069
1042sub object_freezer_as_string { 1070sub object_freezer_as_string {
1043 my ($rdata, $objs) = @_; 1071 my ($rdata, $objs) = @_;
1044 1072
… …
1056 or return; 1084 or return;
1057 1085
1058 unless (aio_stat "$filename.pst") { 1086 unless (aio_stat "$filename.pst") {
1059 (aio_load "$filename.pst", $av) >= 0 1087 (aio_load "$filename.pst", $av) >= 0
1060 or return; 1088 or return;
1089
1061 $av = eval { (Storable::thaw $av)->{objs} }; 1090 $av = eval { (Storable::thaw $av)->{objs} };
1062 } 1091 }
1063 1092
1093 utf8::decode (my $decname = $filename);
1064 warn sprintf "loading %s (%d)\n", 1094 warn sprintf "loading %s (%d,%d)\n",
1065 $filename, length $data, scalar @{$av || []}; 1095 $decname, length $data, scalar @{$av || []};
1096
1066 return ($data, $av); 1097 ($data, $av)
1067} 1098}
1068 1099
1069=head2 COMMAND CALLBACKS 1100=head2 COMMAND CALLBACKS
1070 1101
1071=over 4 1102=over 4
… …
1257 1288
1258=head3 cf::player 1289=head3 cf::player
1259 1290
1260=over 4 1291=over 4
1261 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
1262=item cf::player::find $login 1307=item cf::player::find $login
1263 1308
1264Returns the given player object, loading it if necessary (might block). 1309Returns the given player object, loading it if necessary (might block).
1265 1310
1266=cut 1311=cut
… …
1301 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1346 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1302 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1347 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1303 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1348 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1304 aio_unlink +(playerdir $login) . "/$login.pl"; 1349 aio_unlink +(playerdir $login) . "/$login.pl";
1305 1350
1306 my $pl = load_pl path $login 1351 my $f = new_from_file cf::object::thawer path $login
1307 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;
1308 $cf::PLAYER{$login} = $pl 1358 $cf::PLAYER{$login} = $pl
1309 } 1359 }
1310 } 1360 }
1311} 1361}
1312 1362
… …
1322 1372
1323 aio_mkdir playerdir $pl, 0770; 1373 aio_mkdir playerdir $pl, 0770;
1324 $pl->{last_save} = $cf::RUNTIME; 1374 $pl->{last_save} = $cf::RUNTIME;
1325 1375
1326 $pl->save_pl ($path); 1376 $pl->save_pl ($path);
1327 Coro::cede; 1377 cf::cede_to_tick;
1328} 1378}
1329 1379
1330sub new($) { 1380sub new($) {
1331 my ($login) = @_; 1381 my ($login) = @_;
1332 1382
… …
1410 or return []; 1460 or return [];
1411 1461
1412 my @logins; 1462 my @logins;
1413 1463
1414 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") {
1415 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1469 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1416 aio_read $fh, 0, 512, my $buf, 0 or next; 1470 aio_read $fh, 0, 512, my $buf, 0 or next;
1417 $buf !~ /^password -------------$/m or next; # official not-valid tag 1471 $buf !~ /^password -------------$/m or next; # official not-valid tag
1472 }
1418 1473
1419 utf8::decode $login; 1474 utf8::decode $login;
1420 push @logins, $login; 1475 push @logins, $login;
1421 } 1476 }
1422 1477
… …
1460sub expand_cfpod { 1515sub expand_cfpod {
1461 ((my $self), (local $_)) = @_; 1516 ((my $self), (local $_)) = @_;
1462 1517
1463 # escape & and < 1518 # escape & and <
1464 s/&/&amp;/g; 1519 s/&/&amp;/g;
1465 s/(?<![BIUGH])</&lt;/g; 1520 s/(?<![BIUGHT])</&lt;/g;
1466 1521
1467 # this is buggy, it needs to properly take care of nested <'s 1522 # this is buggy, it needs to properly take care of nested <'s
1468 1523
1469 1 while 1524 1 while
1470 # replace B<>, I<>, U<> etc. 1525 # replace B<>, I<>, U<> etc.
1471 s/B<([^\>]*)>/<b>$1<\/b>/ 1526 s/B<([^\>]*)>/<b>$1<\/b>/
1472 || s/I<([^\>]*)>/<i>$1<\/i>/ 1527 || s/I<([^\>]*)>/<i>$1<\/i>/
1473 || s/U<([^\>]*)>/<u>$1<\/u>/ 1528 || s/U<([^\>]*)>/<u>$1<\/u>/
1529 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1474 # replace G<male|female> tags 1530 # replace G<male|female> tags
1475 || s{G<([^>|]*)\|([^>]*)>}{ 1531 || s{G<([^>|]*)\|([^>]*)>}{
1476 $self->gender ? $2 : $1 1532 $self->gender ? $2 : $1
1477 }ge 1533 }ge
1478 # replace H<hint text> 1534 # replace H<hint text>
… …
1746 1802
1747sub load_header_from($) { 1803sub load_header_from($) {
1748 my ($self, $path) = @_; 1804 my ($self, $path) = @_;
1749 1805
1750 utf8::encode $path; 1806 utf8::encode $path;
1751 #aio_open $path, O_RDONLY, 0 1807 my $f = new_from_file cf::object::thawer $path
1752 # or return;
1753
1754 $self->_load_header ($path)
1755 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;
1756 1815
1757 $self->{load_path} = $path; 1816 $self->{load_path} = $path;
1758 1817
1759 1 1818 1
1760} 1819}
… …
1814sub find { 1873sub find {
1815 my ($path, $origin) = @_; 1874 my ($path, $origin) = @_;
1816 1875
1817 $path = normalise $path, $origin && $origin->path; 1876 $path = normalise $path, $origin && $origin->path;
1818 1877
1878 cf::lock_wait "map_data:$path";#d#remove
1819 cf::lock_wait "map_find:$path"; 1879 cf::lock_wait "map_find:$path";
1820 1880
1821 $cf::MAP{$path} || do { 1881 $cf::MAP{$path} || do {
1822 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
1823 my $map = new_from_path cf::map $path 1885 my $map = new_from_path cf::map $path
1824 or return; 1886 or return;
1825 1887
1826 $map->{last_save} = $cf::RUNTIME; 1888 $map->{last_save} = $cf::RUNTIME;
1827 1889
… …
1829 or return; 1891 or return;
1830 1892
1831 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1893 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1832 # doing this can freeze the server in a sync job, obviously 1894 # doing this can freeze the server in a sync job, obviously
1833 #$cf::WAIT_FOR_TICK->wait; 1895 #$cf::WAIT_FOR_TICK->wait;
1896 undef $guard1;
1897 undef $guard2;
1834 $map->reset; 1898 $map->reset;
1835 undef $guard;
1836 return find $path; 1899 return find $path;
1837 } 1900 }
1838 1901
1839 $cf::MAP{$path} = $map 1902 $cf::MAP{$path} = $map
1840 } 1903 }
… …
1849 local $self->{deny_reset} = 1; # loading can take a long time 1912 local $self->{deny_reset} = 1; # loading can take a long time
1850 1913
1851 my $path = $self->{path}; 1914 my $path = $self->{path};
1852 1915
1853 { 1916 {
1854 my $guard = cf::lock_acquire "map_load:$path"; 1917 my $guard = cf::lock_acquire "map_data:$path";
1855 1918
1919 return unless $self->valid;
1856 return if $self->in_memory != cf::MAP_SWAPPED; 1920 return unless $self->in_memory == cf::MAP_SWAPPED;
1857 1921
1858 $self->in_memory (cf::MAP_LOADING); 1922 $self->in_memory (cf::MAP_LOADING);
1859 1923
1860 $self->alloc; 1924 $self->alloc;
1861 1925
1862 $self->pre_load; 1926 $self->pre_load;
1863 Coro::cede; 1927 cf::cede_to_tick;
1864 1928
1929 my $f = new_from_file cf::object::thawer $self->{load_path};
1930 $f->skip_block;
1865 $self->_load_objects ($self->{load_path}, 1) 1931 $self->_load_objects ($f)
1866 or return; 1932 or return;
1867 1933
1868 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1934 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1869 if delete $self->{load_original}; 1935 if delete $self->{load_original};
1870 1936
1871 if (my $uniq = $self->uniq_path) { 1937 if (my $uniq = $self->uniq_path) {
1872 utf8::encode $uniq; 1938 utf8::encode $uniq;
1873 if (aio_open $uniq, O_RDONLY, 0) { 1939 unless (aio_stat $uniq) {
1940 if (my $f = new_from_file cf::object::thawer $uniq) {
1874 $self->clear_unique_items; 1941 $self->clear_unique_items;
1875 $self->_load_objects ($uniq, 0); 1942 $self->_load_objects ($f);
1943 $f->resolve_delayed_derefs;
1944 }
1876 } 1945 }
1877 } 1946 }
1878 1947
1879 Coro::cede; 1948 $f->resolve_delayed_derefs;
1949
1950 cf::cede_to_tick;
1880 # now do the right thing for maps 1951 # now do the right thing for maps
1881 $self->link_multipart_objects; 1952 $self->link_multipart_objects;
1882 $self->difficulty ($self->estimate_difficulty) 1953 $self->difficulty ($self->estimate_difficulty)
1883 unless $self->difficulty; 1954 unless $self->difficulty;
1884 Coro::cede; 1955 cf::cede_to_tick;
1885 1956
1886 unless ($self->{deny_activate}) { 1957 unless ($self->{deny_activate}) {
1887 $self->decay_objects; 1958 $self->decay_objects;
1888 $self->fix_auto_apply; 1959 $self->fix_auto_apply;
1889 $self->update_buttons; 1960 $self->update_buttons;
1890 Coro::cede; 1961 cf::cede_to_tick;
1891 $self->set_darkness_map; 1962 $self->set_darkness_map;
1892 Coro::cede; 1963 cf::cede_to_tick;
1893 $self->activate; 1964 $self->activate;
1894 } 1965 }
1895 1966
1896 $self->{last_save} = $cf::RUNTIME; 1967 $self->{last_save} = $cf::RUNTIME;
1897 $self->last_access ($cf::RUNTIME); 1968 $self->last_access ($cf::RUNTIME);
… …
1968 } 2039 }
1969 2040
1970 $MAP_PREFETCH{$path} |= $load; 2041 $MAP_PREFETCH{$path} |= $load;
1971 2042
1972 $MAP_PREFETCHER ||= cf::async { 2043 $MAP_PREFETCHER ||= cf::async {
2044 $Coro::current->{desc} = "map prefetcher";
2045
1973 while (%MAP_PREFETCH) { 2046 while (%MAP_PREFETCH) {
1974 while (my ($k, $v) = each %MAP_PREFETCH) { 2047 while (my ($k, $v) = each %MAP_PREFETCH) {
1975 if (my $map = find $k) { 2048 if (my $map = find $k) {
1976 $map->load if $v; 2049 $map->load if $v;
1977 } 2050 }
… …
1987} 2060}
1988 2061
1989sub save { 2062sub save {
1990 my ($self) = @_; 2063 my ($self) = @_;
1991 2064
1992 my $lock = cf::lock_acquire "map_data:" . $self->path; 2065 my $lock = cf::lock_acquire "map_data:$self->{path}";
1993 2066
1994 $self->{last_save} = $cf::RUNTIME; 2067 $self->{last_save} = $cf::RUNTIME;
1995 2068
1996 return unless $self->dirty; 2069 return unless $self->dirty;
1997 2070
… …
2003 return if $self->{deny_save}; 2076 return if $self->{deny_save};
2004 2077
2005 local $self->{last_access} = $self->last_access;#d# 2078 local $self->{last_access} = $self->last_access;#d#
2006 2079
2007 cf::async { 2080 cf::async {
2081 $Coro::current->{desc} = "map player save";
2008 $_->contr->save for $self->players; 2082 $_->contr->save for $self->players;
2009 }; 2083 };
2010 2084
2011 if ($uniq) { 2085 if ($uniq) {
2012 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2086 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2020 my ($self) = @_; 2094 my ($self) = @_;
2021 2095
2022 # save first because save cedes 2096 # save first because save cedes
2023 $self->save; 2097 $self->save;
2024 2098
2025 my $lock = cf::lock_acquire "map_data:" . $self->path; 2099 my $lock = cf::lock_acquire "map_data:$self->{path}";
2026 2100
2027 return if $self->players; 2101 return if $self->players;
2028 return if $self->in_memory != cf::MAP_IN_MEMORY; 2102 return if $self->in_memory != cf::MAP_IN_MEMORY;
2029 return if $self->{deny_save}; 2103 return if $self->{deny_save};
2030 2104
2105 $self->in_memory (cf::MAP_SWAPPED);
2106
2107 $self->deactivate;
2108 $_->clear_links_to ($self) for values %cf::MAP;
2031 $self->clear; 2109 $self->clear;
2032 $self->in_memory (cf::MAP_SWAPPED);
2033} 2110}
2034 2111
2035sub reset_at { 2112sub reset_at {
2036 my ($self) = @_; 2113 my ($self) = @_;
2037 2114
… …
2069 if $uniq; 2146 if $uniq;
2070 } 2147 }
2071 2148
2072 delete $cf::MAP{$self->path}; 2149 delete $cf::MAP{$self->path};
2073 2150
2151 $self->deactivate;
2152 $_->clear_links_to ($self) for values %cf::MAP;
2074 $self->clear; 2153 $self->clear;
2075
2076 $_->clear_links_to ($self) for values %cf::MAP;
2077 2154
2078 $self->unlink_save; 2155 $self->unlink_save;
2079 $self->destroy; 2156 $self->destroy;
2080} 2157}
2081 2158
2082my $nuke_counter = "aaaa"; 2159my $nuke_counter = "aaaa";
2083 2160
2084sub nuke { 2161sub nuke {
2085 my ($self) = @_; 2162 my ($self) = @_;
2086 2163
2164 {
2165 my $lock = cf::lock_acquire "map_data:$self->{path}";
2166
2087 delete $cf::MAP{$self->path}; 2167 delete $cf::MAP{$self->path};
2088 2168
2089 $self->unlink_save; 2169 $self->unlink_save;
2090 2170
2091 bless $self, "cf::map"; 2171 bless $self, "cf::map";
2092 delete $self->{deny_reset}; 2172 delete $self->{deny_reset};
2093 $self->{deny_save} = 1; 2173 $self->{deny_save} = 1;
2094 $self->reset_timeout (1); 2174 $self->reset_timeout (1);
2095 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2175 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2096 2176
2097 $cf::MAP{$self->path} = $self; 2177 $cf::MAP{$self->path} = $self;
2178 }
2098 2179
2099 $self->reset; # polite request, might not happen 2180 $self->reset; # polite request, might not happen
2100} 2181}
2101 2182
2102=item $maps = cf::map::tmp_maps 2183=item $maps = cf::map::tmp_maps
… …
2178 2259
2179sub inv_recursive { 2260sub inv_recursive {
2180 inv_recursive_ inv $_[0] 2261 inv_recursive_ inv $_[0]
2181} 2262}
2182 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 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2279 my ($uuid, $name) = ($1, $2);
2280 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2281 or return;
2282 $pl->ob->uuid eq $uuid
2283 or return;
2284
2285 $pl->ob
2286 } else {
2287 warn "$ref: cannot resolve object reference\n";
2288 undef
2289 }
2290}
2291
2183package cf; 2292package cf;
2184 2293
2185=back 2294=back
2186 2295
2187=head3 cf::object::player 2296=head3 cf::object::player
… …
2345 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2454 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2346 2455
2347 $self->enter_link; 2456 $self->enter_link;
2348 2457
2349 (async { 2458 (async {
2459 $Coro::current->{desc} = "player::goto $path $x $y";
2460
2461 # *tag paths override both path and x|y
2462 if ($path =~ /^\*(.*)$/) {
2463 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2464 my $ob = $obs[rand @obs];
2465
2466 # see if we actually can go there
2467 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2468 $ob = $obs[rand @obs];
2469 } else {
2470 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2471 }
2472 # else put us there anyways for now #d#
2473
2474 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2475 } else {
2476 ($path, $x, $y) = (undef, undef, undef);
2477 }
2478 }
2479
2350 my $map = eval { 2480 my $map = eval {
2351 my $map = cf::map::find $path; 2481 my $map = defined $path ? cf::map::find $path : undef;
2352 2482
2353 if ($map) { 2483 if ($map) {
2354 $map = $map->customise_for ($self); 2484 $map = $map->customise_for ($self);
2355 $map = $check->($map) if $check && $map; 2485 $map = $check->($map) if $check && $map;
2356 } else { 2486 } else {
2357 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2487 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2358 } 2488 }
2359 2489
2360 $map 2490 $map
2361 }; 2491 };
2362 2492
… …
2452 # if exit is damned, update players death & WoR home-position 2582 # if exit is damned, update players death & WoR home-position
2453 $self->contr->savebed ($slaying, $hp, $sp) 2583 $self->contr->savebed ($slaying, $hp, $sp)
2454 if $exit->flag (FLAG_DAMNED); 2584 if $exit->flag (FLAG_DAMNED);
2455 2585
2456 (async { 2586 (async {
2587 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2588
2457 $self->deactivate_recursive; # just to be sure 2589 $self->deactivate_recursive; # just to be sure
2458 unless (eval { 2590 unless (eval {
2459 $self->goto ($slaying, $hp, $sp); 2591 $self->goto ($slaying, $hp, $sp);
2460 2592
2461 1; 2593 1;
… …
2496the message, with C<log> being the default. If C<$color> is negative, suppress 2628the message, with C<log> being the default. If C<$color> is negative, suppress
2497the message unless the client supports the msg packet. 2629the message unless the client supports the msg packet.
2498 2630
2499=cut 2631=cut
2500 2632
2633our %CHANNEL = (
2634 "c/identify" => {
2635 id => "infobox",
2636 title => "Identify",
2637 reply => undef,
2638 tooltip => "Items recently identified",
2639 },
2640 "c/examine" => {
2641 id => "infobox",
2642 title => "Examine",
2643 reply => undef,
2644 tooltip => "Signs and other items you examined",
2645 },
2646 "c/lookat" => {
2647 id => "infobox",
2648 title => "Look",
2649 reply => undef,
2650 tooltip => "What you saw there",
2651 },
2652);
2653
2501sub cf::client::send_msg { 2654sub cf::client::send_msg {
2502 my ($self, $channel, $msg, $color, @extra) = @_; 2655 my ($self, $channel, $msg, $color, @extra) = @_;
2503 2656
2504 $msg = $self->pl->expand_cfpod ($msg); 2657 $msg = $self->pl->expand_cfpod ($msg);
2505 2658
2506 $color &= cf::NDI_CLIENT_MASK; # just in case... 2659 $color &= cf::NDI_CLIENT_MASK; # just in case...
2507 2660
2661 # check predefined channels, for the benefit of C
2662 if ($CHANNEL{$channel}) {
2663 $channel = $CHANNEL{$channel};
2664
2665 $self->ext_msg (channel_info => $channel)
2666 if $self->can_msg;
2667
2668 $channel = $channel->{id};
2669
2508 if (ref $channel) { 2670 } elsif (ref $channel) {
2509 # send meta info to client, if not yet sent 2671 # send meta info to client, if not yet sent
2510 unless (exists $self->{channel}{$channel->{id}}) { 2672 unless (exists $self->{channel}{$channel->{id}}) {
2511 $self->{channel}{$channel->{id}} = $channel; 2673 $self->{channel}{$channel->{id}} = $channel;
2512 $self->ext_msg (channel_info => $channel); 2674 $self->ext_msg (channel_info => $channel)
2675 if $self->can_msg;
2513 } 2676 }
2514 2677
2515 $channel = $channel->{id}; 2678 $channel = $channel->{id};
2516 } 2679 }
2517 2680
… …
2832# the server's init and main functions 2995# the server's init and main functions
2833 2996
2834sub load_facedata($) { 2997sub load_facedata($) {
2835 my ($path) = @_; 2998 my ($path) = @_;
2836 2999
3000 # HACK to clear player env face cache, we need some signal framework
3001 # for this (global event?)
3002 %ext::player_env::MUSIC_FACE_CACHE = ();
3003
2837 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3004 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2838 3005
2839 warn "loading facedata from $path\n"; 3006 warn "loading facedata from $path\n";
2840 3007
2841 my $facedata; 3008 my $facedata;
… …
2952 $ns->fx_want ($k, $v); 3119 $ns->fx_want ($k, $v);
2953 } 3120 }
2954}; 3121};
2955 3122
2956sub reload_regions { 3123sub reload_regions {
3124 # HACK to clear player env face cache, we need some signal framework
3125 # for this (global event?)
3126 %ext::player_env::MUSIC_FACE_CACHE = ();
3127
2957 load_resource_file "$MAPDIR/regions" 3128 load_resource_file "$MAPDIR/regions"
2958 or die "unable to load regions file\n"; 3129 or die "unable to load regions file\n";
2959 3130
2960 for (cf::region::list) { 3131 for (cf::region::list) {
2961 $_->{match} = qr/$_->{match}/ 3132 $_->{match} = qr/$_->{match}/
… …
2997 3168
2998sub init { 3169sub init {
2999 reload_resources; 3170 reload_resources;
3000} 3171}
3001 3172
3002sub cfg_load { 3173sub reload_config {
3003 open my $fh, "<:utf8", "$CONFDIR/config" 3174 open my $fh, "<:utf8", "$CONFDIR/config"
3004 or return; 3175 or return;
3005 3176
3006 local $/; 3177 local $/;
3007 *CFG = YAML::Syck::Load <$fh>; 3178 *CFG = YAML::Syck::Load <$fh>;
… …
3023sub main { 3194sub main {
3024 # we must not ever block the main coroutine 3195 # we must not ever block the main coroutine
3025 local $Coro::idle = sub { 3196 local $Coro::idle = sub {
3026 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3197 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3027 (async { 3198 (async {
3199 $Coro::current->{desc} = "IDLE BUG HANDLER";
3028 Event::one_event; 3200 Event::one_event;
3029 })->prio (Coro::PRIO_MAX); 3201 })->prio (Coro::PRIO_MAX);
3030 }; 3202 };
3031 3203
3032 cfg_load; 3204 reload_config;
3033 db_init; 3205 db_init;
3034 load_extensions; 3206 load_extensions;
3035 3207
3036 $TICK_WATCHER->start; 3208 $TICK_WATCHER->start;
3037 Event::loop; 3209 Event::loop;
… …
3230 warn "reloading cf.pm"; 3402 warn "reloading cf.pm";
3231 require cf; 3403 require cf;
3232 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3404 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3233 3405
3234 warn "loading config and database again"; 3406 warn "loading config and database again";
3235 cf::cfg_load; 3407 cf::reload_config;
3236 3408
3237 warn "loading extensions"; 3409 warn "loading extensions";
3238 cf::load_extensions; 3410 cf::load_extensions;
3239 3411
3240 warn "reattaching attachments to objects/players"; 3412 warn "reattaching attachments to objects/players";
… …
3276register_command "reload" => sub { 3448register_command "reload" => sub {
3277 my ($who, $arg) = @_; 3449 my ($who, $arg) = @_;
3278 3450
3279 if ($who->flag (FLAG_WIZ)) { 3451 if ($who->flag (FLAG_WIZ)) {
3280 $who->message ("reloading server."); 3452 $who->message ("reloading server.");
3453 async {
3454 $Coro::current->{desc} = "perl_reload";
3281 async { reload_perl }; 3455 reload_perl;
3456 };
3282 } 3457 }
3283}; 3458};
3284 3459
3285unshift @INC, $LIBDIR; 3460unshift @INC, $LIBDIR;
3286 3461
… …
3305 my $signal = new Coro::Signal; 3480 my $signal = new Coro::Signal;
3306 push @WAIT_FOR_TICK_BEGIN, $signal; 3481 push @WAIT_FOR_TICK_BEGIN, $signal;
3307 $signal->wait; 3482 $signal->wait;
3308} 3483}
3309 3484
3310 my $min = 1e6;#d#
3311 my $avg = 10;
3312$TICK_WATCHER = Event->timer ( 3485$TICK_WATCHER = Event->timer (
3313 reentrant => 0, 3486 reentrant => 0,
3314 parked => 1, 3487 parked => 1,
3315 prio => 0, 3488 prio => 0,
3316 at => $NEXT_TICK || $TICK, 3489 at => $NEXT_TICK || $TICK,
… …
3324 3497
3325 $NOW = $tick_start = Event::time; 3498 $NOW = $tick_start = Event::time;
3326 3499
3327 cf::server_tick; # one server iteration 3500 cf::server_tick; # one server iteration
3328 3501
3329 0 && sync_job {#d#
3330 for(1..10) {
3331 my $t = Event::time;
3332 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3333 or die;
3334
3335 $map->width (50);
3336 $map->height (50);
3337 $map->alloc;
3338 $map->_load_objects ("/tmp/x.map", 1);
3339 my $t = Event::time - $t;
3340
3341 #next unless $t < 0.0013;#d#
3342 if ($t < $min) {
3343 $min = $t;
3344 }
3345 $avg = $avg * 0.99 + $t * 0.01;
3346 }
3347 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3348 exit 0;
3349 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3350 };
3351
3352 $RUNTIME += $TICK; 3502 $RUNTIME += $TICK;
3353 $NEXT_TICK += $TICK; 3503 $NEXT_TICK += $TICK;
3354 3504
3355 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3505 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3356 $NEXT_RUNTIME_WRITE = $NOW + 10; 3506 $NEXT_RUNTIME_WRITE = $NOW + 10;
3357 Coro::async_pool { 3507 Coro::async_pool {
3508 $Coro::current->{desc} = "runtime saver";
3358 write_runtime 3509 write_runtime
3359 or warn "ERROR: unable to write runtime file: $!"; 3510 or warn "ERROR: unable to write runtime file: $!";
3360 }; 3511 };
3361 } 3512 }
3362 3513
3363# my $AFTER = Event::time;
3364# warn $AFTER - $NOW;#d#
3365
3366 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3514 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3367 $sig->send; 3515 $sig->send;
3368 } 3516 }
3369 while (my $sig = shift @WAIT_FOR_TICK) { 3517 while (my $sig = shift @WAIT_FOR_TICK) {
3370 $sig->send; 3518 $sig->send;
… …
3380 3528
3381 $LOAD = ($NOW - $tick_start) / $TICK; 3529 $LOAD = ($NOW - $tick_start) / $TICK;
3382 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3530 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3383 3531
3384 _post_tick; 3532 _post_tick;
3385
3386
3387 }, 3533 },
3388); 3534);
3389 3535
3390{ 3536{
3537 BDB::min_parallel 8;
3391 BDB::max_poll_time $TICK * 0.1; 3538 BDB::max_poll_time $TICK * 0.1;
3392 $BDB_POLL_WATCHER = Event->io ( 3539 $BDB_POLL_WATCHER = Event->io (
3393 reentrant => 0, 3540 reentrant => 0,
3394 fd => BDB::poll_fileno, 3541 fd => BDB::poll_fileno,
3395 poll => 'r', 3542 poll => 'r',
3396 prio => 0, 3543 prio => 0,
3397 data => WF_AUTOCANCEL, 3544 data => WF_AUTOCANCEL,
3398 cb => \&BDB::poll_cb, 3545 cb => \&BDB::poll_cb,
3399 ); 3546 );
3400 BDB::min_parallel 8;
3401 3547
3402 BDB::set_sync_prepare { 3548 BDB::set_sync_prepare {
3403 my $status; 3549 my $status;
3404 my $current = $Coro::current; 3550 my $current = $Coro::current;
3405 ( 3551 (
… …
3414 ) 3560 )
3415 }; 3561 };
3416 3562
3417 unless ($DB_ENV) { 3563 unless ($DB_ENV) {
3418 $DB_ENV = BDB::db_env_create; 3564 $DB_ENV = BDB::db_env_create;
3565 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3566 | BDB::LOG_AUTOREMOVE, 1);
3567 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3568 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3419 3569
3420 cf::sync_job { 3570 cf::sync_job {
3421 eval { 3571 eval {
3422 BDB::db_env_open 3572 BDB::db_env_open
3423 $DB_ENV, 3573 $DB_ENV,
… …
3425 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3575 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3426 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3576 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3427 0666; 3577 0666;
3428 3578
3429 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3579 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3430
3431 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3432 $DB_ENV->set_lk_detect;
3433 }; 3580 };
3434 3581
3435 cf::cleanup "db_env_open(db): $@" if $@; 3582 cf::cleanup "db_env_open(db): $@" if $@;
3436 }; 3583 };
3437 } 3584 }
3585
3586 $BDB_DEADLOCK_WATCHER = Event->timer (
3587 after => 3,
3588 interval => 1,
3589 hard => 1,
3590 prio => 0,
3591 data => WF_AUTOCANCEL,
3592 cb => sub {
3593 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3594 },
3595 );
3596 $BDB_CHECKPOINT_WATCHER = Event->timer (
3597 after => 11,
3598 interval => 60,
3599 hard => 1,
3600 prio => 0,
3601 data => WF_AUTOCANCEL,
3602 cb => sub {
3603 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3604 },
3605 );
3606 $BDB_TRICKLE_WATCHER = Event->timer (
3607 after => 5,
3608 interval => 10,
3609 hard => 1,
3610 prio => 0,
3611 data => WF_AUTOCANCEL,
3612 cb => sub {
3613 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3614 },
3615 );
3438} 3616}
3439 3617
3440{ 3618{
3441 IO::AIO::min_parallel 8; 3619 IO::AIO::min_parallel 8;
3442 3620
… …
3445 $AIO_POLL_WATCHER = Event->io ( 3623 $AIO_POLL_WATCHER = Event->io (
3446 reentrant => 0, 3624 reentrant => 0,
3447 data => WF_AUTOCANCEL, 3625 data => WF_AUTOCANCEL,
3448 fd => IO::AIO::poll_fileno, 3626 fd => IO::AIO::poll_fileno,
3449 poll => 'r', 3627 poll => 'r',
3450 prio => 6, 3628 prio => 0,
3451 cb => \&IO::AIO::poll_cb, 3629 cb => \&IO::AIO::poll_cb,
3452 ); 3630 );
3453} 3631}
3454 3632
3455my $_log_backtrace; 3633my $_log_backtrace;
… …
3461 3639
3462 # limit the # of concurrent backtraces 3640 # limit the # of concurrent backtraces
3463 if ($_log_backtrace < 2) { 3641 if ($_log_backtrace < 2) {
3464 ++$_log_backtrace; 3642 ++$_log_backtrace;
3465 async { 3643 async {
3644 $Coro::current->{desc} = "abt $msg";
3645
3466 my @bt = fork_call { 3646 my @bt = fork_call {
3467 @addr = map { sprintf "%x", $_ } @addr; 3647 @addr = map { sprintf "%x", $_ } @addr;
3468 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3648 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3469 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3649 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3470 or die "addr2line: $!"; 3650 or die "addr2line: $!";

Diff Legend

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