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.345 by root, Tue Aug 28 19:30:11 2007 UTC vs.
Revision 1.357 by root, Tue Sep 4 08:42:58 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
… …
272Wait until the given lock is available and then acquires it and returns 272Wait 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, 273a Coro::guard object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
275returned. 275returned.
276 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
277Lock names should begin with a unique identifier (for example, cf::map::find 280Lock names should begin with a unique identifier (for example, cf::map::find
278uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
279 282
280=item $locked = cf::lock_active $string 283=item $locked = cf::lock_active $string
281 284
… …
478sub fork_call(&@) { 481sub fork_call(&@) {
479 my ($cb, @args) = @_; 482 my ($cb, @args) = @_;
480 483
481 # we seemingly have to make a local copy of the whole thing, 484 # we seemingly have to make a local copy of the whole thing,
482 # otherwise perl prematurely frees the stuff :/ 485 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious) 486 # TODO: investigate and fix (likely this will be rather laborious)
484 487
485 my @res = Coro::Util::fork_eval { 488 my @res = Coro::Util::fork_eval {
486 reset_signals; 489 reset_signals;
487 &$cb 490 &$cb
488 }, @args; 491 }, @args;
… …
575 if (1) { 578 if (1) {
576 $md5 = 579 $md5 =
577 join "\x00", 580 join "\x00",
578 $processversion, 581 $processversion,
579 map { 582 map {
580 Coro::cede; 583 cf::cede_to_tick;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 584 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src; 585 } 0.. $#$src;
583 586
584 587
585 my $dbmd5 = db_get cache => "$id/md5"; 588 my $dbmd5 = db_get cache => "$id/md5";
… …
1001 }, 1004 },
1002); 1005);
1003 1006
1004sub object_freezer_save { 1007sub object_freezer_save {
1005 my ($filename, $rdata, $objs) = @_; 1008 my ($filename, $rdata, $objs) = @_;
1009
1010 my $guard = cf::lock_acquire "io";
1006 1011
1007 sync_job { 1012 sync_job {
1008 if (length $$rdata) { 1013 if (length $$rdata) {
1009 warn sprintf "saving %s (%d,%d)\n", 1014 warn sprintf "saving %s (%d,%d)\n",
1010 $filename, length $$rdata, scalar @$objs; 1015 $filename, length $$rdata, scalar @$objs;
… …
1034 } 1039 }
1035 } else { 1040 } else {
1036 aio_unlink $filename; 1041 aio_unlink $filename;
1037 aio_unlink "$filename.pst"; 1042 aio_unlink "$filename.pst";
1038 } 1043 }
1039 } 1044 };
1045
1046 undef $guard;
1040} 1047}
1041 1048
1042sub object_freezer_as_string { 1049sub object_freezer_as_string {
1043 my ($rdata, $objs) = @_; 1050 my ($rdata, $objs) = @_;
1044 1051
… …
1049 1056
1050sub object_thawer_load { 1057sub object_thawer_load {
1051 my ($filename) = @_; 1058 my ($filename) = @_;
1052 1059
1053 my ($data, $av); 1060 my ($data, $av);
1061
1062 my $guard = cf::lock_acquire "io";
1054 1063
1055 (aio_load $filename, $data) >= 0 1064 (aio_load $filename, $data) >= 0
1056 or return; 1065 or return;
1057 1066
1058 unless (aio_stat "$filename.pst") { 1067 unless (aio_stat "$filename.pst") {
1059 (aio_load "$filename.pst", $av) >= 0 1068 (aio_load "$filename.pst", $av) >= 0
1060 or return; 1069 or return;
1070
1071 undef $guard;
1061 $av = eval { (Storable::thaw $av)->{objs} }; 1072 $av = eval { (Storable::thaw $av)->{objs} };
1062 } 1073 }
1063 1074
1064 warn sprintf "loading %s (%d)\n", 1075 warn sprintf "loading %s (%d)\n",
1065 $filename, length $data, scalar @{$av || []}; 1076 $filename, length $data, scalar @{$av || []};
1077
1066 return ($data, $av); 1078 ($data, $av)
1067} 1079}
1068 1080
1069=head2 COMMAND CALLBACKS 1081=head2 COMMAND CALLBACKS
1070 1082
1071=over 4 1083=over 4
… …
1301 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1313 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1302 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1314 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1303 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1315 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1304 aio_unlink +(playerdir $login) . "/$login.pl"; 1316 aio_unlink +(playerdir $login) . "/$login.pl";
1305 1317
1306 my $pl = load_pl path $login 1318 my $f = new_from_file cf::object::thawer path $login
1307 or return; 1319 or return;
1320
1321 $f->next;
1322 my $pl = cf::player::load_pl $f
1323 or return;
1324 local $cf::PLAYER_LOADING{$login} = $pl;
1325 $f->resolve_delayed_derefs;
1308 $cf::PLAYER{$login} = $pl 1326 $cf::PLAYER{$login} = $pl
1309 } 1327 }
1310 } 1328 }
1311} 1329}
1312 1330
… …
1322 1340
1323 aio_mkdir playerdir $pl, 0770; 1341 aio_mkdir playerdir $pl, 0770;
1324 $pl->{last_save} = $cf::RUNTIME; 1342 $pl->{last_save} = $cf::RUNTIME;
1325 1343
1326 $pl->save_pl ($path); 1344 $pl->save_pl ($path);
1327 Coro::cede; 1345 cf::cede_to_tick;
1328} 1346}
1329 1347
1330sub new($) { 1348sub new($) {
1331 my ($login) = @_; 1349 my ($login) = @_;
1332 1350
… …
1410 or return []; 1428 or return [];
1411 1429
1412 my @logins; 1430 my @logins;
1413 1431
1414 for my $login (@$dirs) { 1432 for my $login (@$dirs) {
1433 my $path = path $login;
1434
1435 # a .pst is a dead give-away for a valid player
1436 unless (-e "$path.pst") {
1415 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1437 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1416 aio_read $fh, 0, 512, my $buf, 0 or next; 1438 aio_read $fh, 0, 512, my $buf, 0 or next;
1417 $buf !~ /^password -------------$/m or next; # official not-valid tag 1439 $buf !~ /^password -------------$/m or next; # official not-valid tag
1440 }
1418 1441
1419 utf8::decode $login; 1442 utf8::decode $login;
1420 push @logins, $login; 1443 push @logins, $login;
1421 } 1444 }
1422 1445
… …
1460sub expand_cfpod { 1483sub expand_cfpod {
1461 ((my $self), (local $_)) = @_; 1484 ((my $self), (local $_)) = @_;
1462 1485
1463 # escape & and < 1486 # escape & and <
1464 s/&/&amp;/g; 1487 s/&/&amp;/g;
1465 s/(?<![BIUGH])</&lt;/g; 1488 s/(?<![BIUGHT])</&lt;/g;
1466 1489
1467 # this is buggy, it needs to properly take care of nested <'s 1490 # this is buggy, it needs to properly take care of nested <'s
1468 1491
1469 1 while 1492 1 while
1470 # replace B<>, I<>, U<> etc. 1493 # replace B<>, I<>, U<> etc.
1471 s/B<([^\>]*)>/<b>$1<\/b>/ 1494 s/B<([^\>]*)>/<b>$1<\/b>/
1472 || s/I<([^\>]*)>/<i>$1<\/i>/ 1495 || s/I<([^\>]*)>/<i>$1<\/i>/
1473 || s/U<([^\>]*)>/<u>$1<\/u>/ 1496 || s/U<([^\>]*)>/<u>$1<\/u>/
1497 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1474 # replace G<male|female> tags 1498 # replace G<male|female> tags
1475 || s{G<([^>|]*)\|([^>]*)>}{ 1499 || s{G<([^>|]*)\|([^>]*)>}{
1476 $self->gender ? $2 : $1 1500 $self->gender ? $2 : $1
1477 }ge 1501 }ge
1478 # replace H<hint text> 1502 # replace H<hint text>
… …
1746 1770
1747sub load_header_from($) { 1771sub load_header_from($) {
1748 my ($self, $path) = @_; 1772 my ($self, $path) = @_;
1749 1773
1750 utf8::encode $path; 1774 utf8::encode $path;
1751 #aio_open $path, O_RDONLY, 0 1775 my $f = new_from_file cf::object::thawer $path
1752 # or return;
1753
1754 $self->_load_header ($path)
1755 or return; 1776 or return;
1777
1778 $self->_load_header ($f)
1779 or return;
1780
1781 local $MAP_LOADING{$self->{path}} = $self;
1782 $f->resolve_delayed_derefs;
1756 1783
1757 $self->{load_path} = $path; 1784 $self->{load_path} = $path;
1758 1785
1759 1 1786 1
1760} 1787}
… …
1849 local $self->{deny_reset} = 1; # loading can take a long time 1876 local $self->{deny_reset} = 1; # loading can take a long time
1850 1877
1851 my $path = $self->{path}; 1878 my $path = $self->{path};
1852 1879
1853 { 1880 {
1854 my $guard1 = cf::lock_acquire "map_data:$path"; 1881 my $guard = cf::lock_acquire "map_data:$path";
1855 my $guard2 = cf::lock_acquire "map_load:$path";
1856 1882
1883 return unless $self->valid;
1857 return if $self->in_memory != cf::MAP_SWAPPED; 1884 return if $self->in_memory != cf::MAP_SWAPPED;
1858 1885
1859 $self->in_memory (cf::MAP_LOADING); 1886 $self->in_memory (cf::MAP_LOADING);
1860 1887
1861 $self->alloc; 1888 $self->alloc;
1862 1889
1863 $self->pre_load; 1890 $self->pre_load;
1864 Coro::cede; 1891 cf::cede_to_tick;
1865 1892
1893 my $f = new_from_file cf::object::thawer $self->{load_path};
1894 $f->skip_block;
1866 $self->_load_objects ($self->{load_path}, 1) 1895 $self->_load_objects ($f)
1867 or return; 1896 or return;
1868 1897
1869 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1870 if delete $self->{load_original}; 1899 if delete $self->{load_original};
1871 1900
1872 if (my $uniq = $self->uniq_path) { 1901 if (my $uniq = $self->uniq_path) {
1873 utf8::encode $uniq; 1902 utf8::encode $uniq;
1874 if (aio_open $uniq, O_RDONLY, 0) { 1903 unless (aio_stat $uniq) {
1904 if (my $f = new_from_file cf::object::thawer $uniq) {
1875 $self->clear_unique_items; 1905 $self->clear_unique_items;
1876 $self->_load_objects ($uniq, 0); 1906 $self->_load_objects ($f);
1907 $f->resolve_delayed_derefs;
1908 }
1877 } 1909 }
1878 } 1910 }
1879 1911
1880 Coro::cede; 1912 $f->resolve_delayed_derefs;
1913
1914 cf::cede_to_tick;
1881 # now do the right thing for maps 1915 # now do the right thing for maps
1882 $self->link_multipart_objects; 1916 $self->link_multipart_objects;
1883 $self->difficulty ($self->estimate_difficulty) 1917 $self->difficulty ($self->estimate_difficulty)
1884 unless $self->difficulty; 1918 unless $self->difficulty;
1885 Coro::cede; 1919 cf::cede_to_tick;
1886 1920
1887 unless ($self->{deny_activate}) { 1921 unless ($self->{deny_activate}) {
1888 $self->decay_objects; 1922 $self->decay_objects;
1889 $self->fix_auto_apply; 1923 $self->fix_auto_apply;
1890 $self->update_buttons; 1924 $self->update_buttons;
1891 Coro::cede; 1925 cf::cede_to_tick;
1892 $self->set_darkness_map; 1926 $self->set_darkness_map;
1893 Coro::cede; 1927 cf::cede_to_tick;
1894 $self->activate; 1928 $self->activate;
1895 } 1929 }
1896 1930
1897 $self->{last_save} = $cf::RUNTIME; 1931 $self->{last_save} = $cf::RUNTIME;
1898 $self->last_access ($cf::RUNTIME); 1932 $self->last_access ($cf::RUNTIME);
… …
2083my $nuke_counter = "aaaa"; 2117my $nuke_counter = "aaaa";
2084 2118
2085sub nuke { 2119sub nuke {
2086 my ($self) = @_; 2120 my ($self) = @_;
2087 2121
2122 {
2123 my $lock = cf::lock_acquire "map_data:$self->{path}";
2124
2088 delete $cf::MAP{$self->path}; 2125 delete $cf::MAP{$self->path};
2089 2126
2090 $self->unlink_save; 2127 $self->unlink_save;
2091 2128
2092 bless $self, "cf::map"; 2129 bless $self, "cf::map";
2093 delete $self->{deny_reset}; 2130 delete $self->{deny_reset};
2094 $self->{deny_save} = 1; 2131 $self->{deny_save} = 1;
2095 $self->reset_timeout (1); 2132 $self->reset_timeout (1);
2096 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2133 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2097 2134
2098 $cf::MAP{$self->path} = $self; 2135 $cf::MAP{$self->path} = $self;
2136 }
2099 2137
2100 $self->reset; # polite request, might not happen 2138 $self->reset; # polite request, might not happen
2101} 2139}
2102 2140
2103=item $maps = cf::map::tmp_maps 2141=item $maps = cf::map::tmp_maps
… …
2179 2217
2180sub inv_recursive { 2218sub inv_recursive {
2181 inv_recursive_ inv $_[0] 2219 inv_recursive_ inv $_[0]
2182} 2220}
2183 2221
2222=item $ref = $ob->ref
2223
2224creates and returns a persistent reference to an objetc that can be stored as a string.
2225
2226=item $ob = cf::object::deref ($refstring)
2227
2228returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2229even if the object actually exists. May block.
2230
2231=cut
2232
2233sub deref {
2234 my ($ref) = @_;
2235
2236 # temporary compatibility#TODO#remove
2237 $ref =~ s{^<}{player/<};
2238
2239 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2240 my ($uuid, $name) = ($1, $2);
2241 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2242 or return;
2243 $pl->ob->uuid eq $uuid
2244 or return;
2245
2246 $pl->ob
2247 } else {
2248 warn "$ref: cannot resolve object reference\n";
2249 undef
2250 }
2251}
2252
2184package cf; 2253package cf;
2185 2254
2186=back 2255=back
2187 2256
2188=head3 cf::object::player 2257=head3 cf::object::player
… …
2497the message, with C<log> being the default. If C<$color> is negative, suppress 2566the message, with C<log> being the default. If C<$color> is negative, suppress
2498the message unless the client supports the msg packet. 2567the message unless the client supports the msg packet.
2499 2568
2500=cut 2569=cut
2501 2570
2571our %CHANNEL = (
2572 "c/identify" => {
2573 id => "identify",
2574 title => "Identify",
2575 reply => undef,
2576 tooltip => "Items recently identified",
2577 },
2578 "c/examine" => {
2579 id => "examine",
2580 title => "Examine",
2581 reply => undef,
2582 tooltip => "Signs and other items you examined",
2583 },
2584);
2585
2502sub cf::client::send_msg { 2586sub cf::client::send_msg {
2503 my ($self, $channel, $msg, $color, @extra) = @_; 2587 my ($self, $channel, $msg, $color, @extra) = @_;
2504 2588
2505 $msg = $self->pl->expand_cfpod ($msg); 2589 $msg = $self->pl->expand_cfpod ($msg);
2506 2590
2507 $color &= cf::NDI_CLIENT_MASK; # just in case... 2591 $color &= cf::NDI_CLIENT_MASK; # just in case...
2592
2593 # check predefined channels, for the benefit of C
2594 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2508 2595
2509 if (ref $channel) { 2596 if (ref $channel) {
2510 # send meta info to client, if not yet sent 2597 # send meta info to client, if not yet sent
2511 unless (exists $self->{channel}{$channel->{id}}) { 2598 unless (exists $self->{channel}{$channel->{id}}) {
2512 $self->{channel}{$channel->{id}} = $channel; 2599 $self->{channel}{$channel->{id}} = $channel;
2513 $self->ext_msg (channel_info => $channel); 2600 $self->ext_msg (channel_info => $channel)
2601 if $self->can_msg;
2514 } 2602 }
2515 2603
2516 $channel = $channel->{id}; 2604 $channel = $channel->{id};
2517 } 2605 }
2518 2606
… …
2833# the server's init and main functions 2921# the server's init and main functions
2834 2922
2835sub load_facedata($) { 2923sub load_facedata($) {
2836 my ($path) = @_; 2924 my ($path) = @_;
2837 2925
2926 # HACK to clear player env face cache, we need some signal framework
2927 # for this (global event?)
2928 %ext::player_env::MUSIC_FACE_CACHE = ();
2929
2838 my $enc = JSON::XS->new->utf8->canonical->relaxed; 2930 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2839 2931
2840 warn "loading facedata from $path\n"; 2932 warn "loading facedata from $path\n";
2841 2933
2842 my $facedata; 2934 my $facedata;
… …
2953 $ns->fx_want ($k, $v); 3045 $ns->fx_want ($k, $v);
2954 } 3046 }
2955}; 3047};
2956 3048
2957sub reload_regions { 3049sub reload_regions {
3050 # HACK to clear player env face cache, we need some signal framework
3051 # for this (global event?)
3052 %ext::player_env::MUSIC_FACE_CACHE = ();
3053
2958 load_resource_file "$MAPDIR/regions" 3054 load_resource_file "$MAPDIR/regions"
2959 or die "unable to load regions file\n"; 3055 or die "unable to load regions file\n";
2960 3056
2961 for (cf::region::list) { 3057 for (cf::region::list) {
2962 $_->{match} = qr/$_->{match}/ 3058 $_->{match} = qr/$_->{match}/
… …
3334 or die; 3430 or die;
3335 3431
3336 $map->width (50); 3432 $map->width (50);
3337 $map->height (50); 3433 $map->height (50);
3338 $map->alloc; 3434 $map->alloc;
3339 $map->_load_objects ("/tmp/x.map", 1); 3435 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3340 my $t = Event::time - $t; 3436 my $t = Event::time - $t;
3341 3437
3342 #next unless $t < 0.0013;#d# 3438 #next unless $t < 0.0013;#d#
3343 if ($t < $min) { 3439 if ($t < $min) {
3344 $min = $t; 3440 $min = $t;

Diff Legend

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