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.351 by root, Sun Sep 2 00:57:38 2007 UTC vs.
Revision 1.362 by root, Mon Sep 10 12:44:06 2007 UTC

… …
87our %CFG; 87our %CFG;
88 88
89our $UPTIME; $UPTIME ||= time; 89our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 90our $RUNTIME;
91 91
92our %PLAYER; # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # all maps 93our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
95 95
96# used to convert map paths into valid unix filenames by replacing / by ∕ 96# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 98
… …
187 $msg .= "\n" 187 $msg .= "\n"
188 unless $msg =~ /\n$/; 188 unless $msg =~ /\n$/;
189 189
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 191
192 utf8::encode $msg;
193 LOG llevError, $msg; 192 LOG llevError, $msg;
194 }; 193 };
195} 194}
196 195
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
… …
285Return true if the lock is currently active, i.e. somebody has locked it. 284Return true if the lock is currently active, i.e. somebody has locked it.
286 285
287=cut 286=cut
288 287
289our %LOCK; 288our %LOCK;
289our %LOCKER;#d#
290 290
291sub lock_wait($) { 291sub lock_wait($) {
292 my ($key) = @_; 292 my ($key) = @_;
293
294 if ($LOCKER{$key} == $Coro::current) {#d#
295 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
296 return;#d#
297 }#d#
293 298
294 # wait for lock, if any 299 # wait for lock, if any
295 while ($LOCK{$key}) { 300 while ($LOCK{$key}) {
296 push @{ $LOCK{$key} }, $Coro::current; 301 push @{ $LOCK{$key} }, $Coro::current;
297 Coro::schedule; 302 Coro::schedule;
… …
303 308
304 # wait, to be sure we are not locked 309 # wait, to be sure we are not locked
305 lock_wait $key; 310 lock_wait $key;
306 311
307 $LOCK{$key} = []; 312 $LOCK{$key} = [];
313 $LOCKER{$key} = $Coro::current;#d#
308 314
309 Coro::guard { 315 Coro::guard {
316 delete $LOCKER{$key};#d#
310 # wake up all waiters, to be on the safe side 317 # wake up all waiters, to be on the safe side
311 $_->ready for @{ delete $LOCK{$key} }; 318 $_->ready for @{ delete $LOCK{$key} };
312 } 319 }
313} 320}
314 321
… …
481sub fork_call(&@) { 488sub fork_call(&@) {
482 my ($cb, @args) = @_; 489 my ($cb, @args) = @_;
483 490
484 # we seemingly have to make a local copy of the whole thing, 491 # we seemingly have to make a local copy of the whole thing,
485 # otherwise perl prematurely frees the stuff :/ 492 # otherwise perl prematurely frees the stuff :/
486 # TODO: investigate and fix (liekly this will be rather laborious) 493 # TODO: investigate and fix (likely this will be rather laborious)
487 494
488 my @res = Coro::Util::fork_eval { 495 my @res = Coro::Util::fork_eval {
489 reset_signals; 496 reset_signals;
490 &$cb 497 &$cb
491 }, @args; 498 }, @args;
… …
1005); 1012);
1006 1013
1007sub object_freezer_save { 1014sub object_freezer_save {
1008 my ($filename, $rdata, $objs) = @_; 1015 my ($filename, $rdata, $objs) = @_;
1009 1016
1017 my $guard = cf::lock_acquire "io";
1018
1010 sync_job { 1019 sync_job {
1011 if (length $$rdata) { 1020 if (length $$rdata) {
1021 utf8::decode (my $decname = $filename);
1012 warn sprintf "saving %s (%d,%d)\n", 1022 warn sprintf "saving %s (%d,%d)\n",
1013 $filename, length $$rdata, scalar @$objs; 1023 $decname, length $$rdata, scalar @$objs;
1014 1024
1015 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1025 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1016 chmod SAVE_MODE, $fh; 1026 chmod SAVE_MODE, $fh;
1017 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1027 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1018 aio_fsync $fh if $cf::USE_FSYNC; 1028 aio_fsync $fh if $cf::USE_FSYNC;
… …
1037 } 1047 }
1038 } else { 1048 } else {
1039 aio_unlink $filename; 1049 aio_unlink $filename;
1040 aio_unlink "$filename.pst"; 1050 aio_unlink "$filename.pst";
1041 } 1051 }
1042 } 1052 };
1053
1054 undef $guard;
1043} 1055}
1044 1056
1045sub object_freezer_as_string { 1057sub object_freezer_as_string {
1046 my ($rdata, $objs) = @_; 1058 my ($rdata, $objs) = @_;
1047 1059
… …
1052 1064
1053sub object_thawer_load { 1065sub object_thawer_load {
1054 my ($filename) = @_; 1066 my ($filename) = @_;
1055 1067
1056 my ($data, $av); 1068 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1057 1071
1058 (aio_load $filename, $data) >= 0 1072 (aio_load $filename, $data) >= 0
1059 or return; 1073 or return;
1060 1074
1061 unless (aio_stat "$filename.pst") { 1075 unless (aio_stat "$filename.pst") {
1062 (aio_load "$filename.pst", $av) >= 0 1076 (aio_load "$filename.pst", $av) >= 0
1063 or return; 1077 or return;
1078
1079 undef $guard;
1064 $av = eval { (Storable::thaw $av)->{objs} }; 1080 $av = eval { (Storable::thaw $av)->{objs} };
1065 } 1081 }
1066 1082
1083 utf8::decode (my $decname = $filename);
1067 warn sprintf "loading %s (%d)\n", 1084 warn sprintf "loading %s (%d,%d)\n",
1068 $filename, length $data, scalar @{$av || []}; 1085 $decname, length $data, scalar @{$av || []};
1086
1069 return ($data, $av); 1087 ($data, $av)
1070} 1088}
1071 1089
1072=head2 COMMAND CALLBACKS 1090=head2 COMMAND CALLBACKS
1073 1091
1074=over 4 1092=over 4
… …
1260 1278
1261=head3 cf::player 1279=head3 cf::player
1262 1280
1263=over 4 1281=over 4
1264 1282
1283=item cf::player::num_playing
1284
1285Returns the official number of playing players, as per the Crossfire metaserver rules.
1286
1287=cut
1288
1289sub num_playing {
1290 scalar grep
1291 $_->ob->map
1292 && !$_->hidden
1293 && !$_->ob->flag (cf::FLAG_WIZ),
1294 cf::player::list
1295}
1296
1265=item cf::player::find $login 1297=item cf::player::find $login
1266 1298
1267Returns the given player object, loading it if necessary (might block). 1299Returns the given player object, loading it if necessary (might block).
1268 1300
1269=cut 1301=cut
… …
1304 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1336 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1305 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1337 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1306 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1338 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1307 aio_unlink +(playerdir $login) . "/$login.pl"; 1339 aio_unlink +(playerdir $login) . "/$login.pl";
1308 1340
1309 my $pl = load_pl path $login 1341 my $f = new_from_file cf::object::thawer path $login
1310 or return; 1342 or return;
1343
1344 $f->next;
1345 my $pl = cf::player::load_pl $f
1346 or return;
1347 local $cf::PLAYER_LOADING{$login} = $pl;
1348 $f->resolve_delayed_derefs;
1311 $cf::PLAYER{$login} = $pl 1349 $cf::PLAYER{$login} = $pl
1312 } 1350 }
1313 } 1351 }
1314} 1352}
1315 1353
… …
1413 or return []; 1451 or return [];
1414 1452
1415 my @logins; 1453 my @logins;
1416 1454
1417 for my $login (@$dirs) { 1455 for my $login (@$dirs) {
1456 my $path = path $login;
1457
1458 # a .pst is a dead give-away for a valid player
1459 unless (-e "$path.pst") {
1418 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1460 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1419 aio_read $fh, 0, 512, my $buf, 0 or next; 1461 aio_read $fh, 0, 512, my $buf, 0 or next;
1420 $buf !~ /^password -------------$/m or next; # official not-valid tag 1462 $buf !~ /^password -------------$/m or next; # official not-valid tag
1463 }
1421 1464
1422 utf8::decode $login; 1465 utf8::decode $login;
1423 push @logins, $login; 1466 push @logins, $login;
1424 } 1467 }
1425 1468
… …
1463sub expand_cfpod { 1506sub expand_cfpod {
1464 ((my $self), (local $_)) = @_; 1507 ((my $self), (local $_)) = @_;
1465 1508
1466 # escape & and < 1509 # escape & and <
1467 s/&/&amp;/g; 1510 s/&/&amp;/g;
1468 s/(?<![BIUGH])</&lt;/g; 1511 s/(?<![BIUGHT])</&lt;/g;
1469 1512
1470 # this is buggy, it needs to properly take care of nested <'s 1513 # this is buggy, it needs to properly take care of nested <'s
1471 1514
1472 1 while 1515 1 while
1473 # replace B<>, I<>, U<> etc. 1516 # replace B<>, I<>, U<> etc.
1474 s/B<([^\>]*)>/<b>$1<\/b>/ 1517 s/B<([^\>]*)>/<b>$1<\/b>/
1475 || s/I<([^\>]*)>/<i>$1<\/i>/ 1518 || s/I<([^\>]*)>/<i>$1<\/i>/
1476 || s/U<([^\>]*)>/<u>$1<\/u>/ 1519 || s/U<([^\>]*)>/<u>$1<\/u>/
1520 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1477 # replace G<male|female> tags 1521 # replace G<male|female> tags
1478 || s{G<([^>|]*)\|([^>]*)>}{ 1522 || s{G<([^>|]*)\|([^>]*)>}{
1479 $self->gender ? $2 : $1 1523 $self->gender ? $2 : $1
1480 }ge 1524 }ge
1481 # replace H<hint text> 1525 # replace H<hint text>
… …
1749 1793
1750sub load_header_from($) { 1794sub load_header_from($) {
1751 my ($self, $path) = @_; 1795 my ($self, $path) = @_;
1752 1796
1753 utf8::encode $path; 1797 utf8::encode $path;
1754 #aio_open $path, O_RDONLY, 0 1798 my $f = new_from_file cf::object::thawer $path
1755 # or return;
1756
1757 $self->_load_header ($path)
1758 or return; 1799 or return;
1800
1801 $self->_load_header ($f)
1802 or return;
1803
1804 local $MAP_LOADING{$self->{path}} = $self;
1805 $f->resolve_delayed_derefs;
1759 1806
1760 $self->{load_path} = $path; 1807 $self->{load_path} = $path;
1761 1808
1762 1 1809 1
1763} 1810}
… …
1817sub find { 1864sub find {
1818 my ($path, $origin) = @_; 1865 my ($path, $origin) = @_;
1819 1866
1820 $path = normalise $path, $origin && $origin->path; 1867 $path = normalise $path, $origin && $origin->path;
1821 1868
1869 cf::lock_wait "map_data:$path";#d#remove
1822 cf::lock_wait "map_find:$path"; 1870 cf::lock_wait "map_find:$path";
1823 1871
1824 $cf::MAP{$path} || do { 1872 $cf::MAP{$path} || do {
1825 my $guard = cf::lock_acquire "map_find:$path"; 1873 my $guard1 = cf::lock_acquire "map_find:$path";
1874 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1875
1826 my $map = new_from_path cf::map $path 1876 my $map = new_from_path cf::map $path
1827 or return; 1877 or return;
1828 1878
1829 $map->{last_save} = $cf::RUNTIME; 1879 $map->{last_save} = $cf::RUNTIME;
1830 1880
… …
1832 or return; 1882 or return;
1833 1883
1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1884 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835 # doing this can freeze the server in a sync job, obviously 1885 # doing this can freeze the server in a sync job, obviously
1836 #$cf::WAIT_FOR_TICK->wait; 1886 #$cf::WAIT_FOR_TICK->wait;
1887 undef $guard1;
1888 undef $guard2;
1837 $map->reset; 1889 $map->reset;
1838 undef $guard;
1839 return find $path; 1890 return find $path;
1840 } 1891 }
1841 1892
1842 $cf::MAP{$path} = $map 1893 $cf::MAP{$path} = $map
1843 } 1894 }
… …
1852 local $self->{deny_reset} = 1; # loading can take a long time 1903 local $self->{deny_reset} = 1; # loading can take a long time
1853 1904
1854 my $path = $self->{path}; 1905 my $path = $self->{path};
1855 1906
1856 { 1907 {
1857 my $guard1 = cf::lock_acquire "map_data:$path"; 1908 my $guard = cf::lock_acquire "map_data:$path";
1858 my $guard2 = cf::lock_acquire "map_load:$path";
1859 1909
1910 return unless $self->valid;
1860 return if $self->in_memory != cf::MAP_SWAPPED; 1911 return unless $self->in_memory == cf::MAP_SWAPPED;
1861 1912
1862 $self->in_memory (cf::MAP_LOADING); 1913 $self->in_memory (cf::MAP_LOADING);
1863 1914
1864 $self->alloc; 1915 $self->alloc;
1865 1916
1866 $self->pre_load; 1917 $self->pre_load;
1867 cf::cede_to_tick; 1918 cf::cede_to_tick;
1868 1919
1920 my $f = new_from_file cf::object::thawer $self->{load_path};
1921 $f->skip_block;
1869 $self->_load_objects ($self->{load_path}, 1) 1922 $self->_load_objects ($f)
1870 or return; 1923 or return;
1871 1924
1872 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1925 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1873 if delete $self->{load_original}; 1926 if delete $self->{load_original};
1874 1927
1875 if (my $uniq = $self->uniq_path) { 1928 if (my $uniq = $self->uniq_path) {
1876 utf8::encode $uniq; 1929 utf8::encode $uniq;
1877 if (aio_open $uniq, O_RDONLY, 0) { 1930 unless (aio_stat $uniq) {
1931 if (my $f = new_from_file cf::object::thawer $uniq) {
1878 $self->clear_unique_items; 1932 $self->clear_unique_items;
1879 $self->_load_objects ($uniq, 0); 1933 $self->_load_objects ($f);
1934 $f->resolve_delayed_derefs;
1935 }
1880 } 1936 }
1881 } 1937 }
1938
1939 $f->resolve_delayed_derefs;
1882 1940
1883 cf::cede_to_tick; 1941 cf::cede_to_tick;
1884 # now do the right thing for maps 1942 # now do the right thing for maps
1885 $self->link_multipart_objects; 1943 $self->link_multipart_objects;
1886 $self->difficulty ($self->estimate_difficulty) 1944 $self->difficulty ($self->estimate_difficulty)
… …
2030 2088
2031 return if $self->players; 2089 return if $self->players;
2032 return if $self->in_memory != cf::MAP_IN_MEMORY; 2090 return if $self->in_memory != cf::MAP_IN_MEMORY;
2033 return if $self->{deny_save}; 2091 return if $self->{deny_save};
2034 2092
2093 $self->in_memory (cf::MAP_SWAPPED);
2094
2095 $self->deactivate;
2096 $_->clear_links_to ($self) for values %cf::MAP;
2035 $self->clear; 2097 $self->clear;
2036 $self->in_memory (cf::MAP_SWAPPED);
2037} 2098}
2038 2099
2039sub reset_at { 2100sub reset_at {
2040 my ($self) = @_; 2101 my ($self) = @_;
2041 2102
… …
2073 if $uniq; 2134 if $uniq;
2074 } 2135 }
2075 2136
2076 delete $cf::MAP{$self->path}; 2137 delete $cf::MAP{$self->path};
2077 2138
2139 $self->deactivate;
2140 $_->clear_links_to ($self) for values %cf::MAP;
2078 $self->clear; 2141 $self->clear;
2079
2080 $_->clear_links_to ($self) for values %cf::MAP;
2081 2142
2082 $self->unlink_save; 2143 $self->unlink_save;
2083 $self->destroy; 2144 $self->destroy;
2084} 2145}
2085 2146
… …
2186 2247
2187sub inv_recursive { 2248sub inv_recursive {
2188 inv_recursive_ inv $_[0] 2249 inv_recursive_ inv $_[0]
2189} 2250}
2190 2251
2252=item $ref = $ob->ref
2253
2254creates and returns a persistent reference to an objetc that can be stored as a string.
2255
2256=item $ob = cf::object::deref ($refstring)
2257
2258returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2259even if the object actually exists. May block.
2260
2261=cut
2262
2263sub deref {
2264 my ($ref) = @_;
2265
2266 # temporary compatibility#TODO#remove
2267 $ref =~ s{^<}{player/<};
2268
2269 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2270 my ($uuid, $name) = ($1, $2);
2271 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2272 or return;
2273 $pl->ob->uuid eq $uuid
2274 or return;
2275
2276 $pl->ob
2277 } else {
2278 warn "$ref: cannot resolve object reference\n";
2279 undef
2280 }
2281}
2282
2191package cf; 2283package cf;
2192 2284
2193=back 2285=back
2194 2286
2195=head3 cf::object::player 2287=head3 cf::object::player
… …
2511 id => "identify", 2603 id => "identify",
2512 title => "Identify", 2604 title => "Identify",
2513 reply => undef, 2605 reply => undef,
2514 tooltip => "Items recently identified", 2606 tooltip => "Items recently identified",
2515 }, 2607 },
2608 "c/examine" => {
2609 id => "examine",
2610 title => "Examine",
2611 reply => undef,
2612 tooltip => "Signs and other items you examined",
2613 },
2516); 2614);
2517 2615
2518sub cf::client::send_msg { 2616sub cf::client::send_msg {
2519 my ($self, $channel, $msg, $color, @extra) = @_; 2617 my ($self, $channel, $msg, $color, @extra) = @_;
2520 2618
… …
2527 2625
2528 if (ref $channel) { 2626 if (ref $channel) {
2529 # send meta info to client, if not yet sent 2627 # send meta info to client, if not yet sent
2530 unless (exists $self->{channel}{$channel->{id}}) { 2628 unless (exists $self->{channel}{$channel->{id}}) {
2531 $self->{channel}{$channel->{id}} = $channel; 2629 $self->{channel}{$channel->{id}} = $channel;
2532 $self->ext_msg (channel_info => $channel); 2630 $self->ext_msg (channel_info => $channel)
2631 if $self->can_msg;
2533 } 2632 }
2534 2633
2535 $channel = $channel->{id}; 2634 $channel = $channel->{id};
2536 } 2635 }
2537 2636
… …
3361 or die; 3460 or die;
3362 3461
3363 $map->width (50); 3462 $map->width (50);
3364 $map->height (50); 3463 $map->height (50);
3365 $map->alloc; 3464 $map->alloc;
3366 $map->_load_objects ("/tmp/x.map", 1); 3465 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3367 my $t = Event::time - $t; 3466 my $t = Event::time - $t;
3368 3467
3369 #next unless $t < 0.0013;#d# 3468 #next unless $t < 0.0013;#d#
3370 if ($t < $min) { 3469 if ($t < $min) {
3371 $min = $t; 3470 $min = $t;

Diff Legend

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