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.351 by root, Sun Sep 2 00:57:38 2007 UTC

… …
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
… …
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";
… …
1322 1325
1323 aio_mkdir playerdir $pl, 0770; 1326 aio_mkdir playerdir $pl, 0770;
1324 $pl->{last_save} = $cf::RUNTIME; 1327 $pl->{last_save} = $cf::RUNTIME;
1325 1328
1326 $pl->save_pl ($path); 1329 $pl->save_pl ($path);
1327 Coro::cede; 1330 cf::cede_to_tick;
1328} 1331}
1329 1332
1330sub new($) { 1333sub new($) {
1331 my ($login) = @_; 1334 my ($login) = @_;
1332 1335
… …
1859 $self->in_memory (cf::MAP_LOADING); 1862 $self->in_memory (cf::MAP_LOADING);
1860 1863
1861 $self->alloc; 1864 $self->alloc;
1862 1865
1863 $self->pre_load; 1866 $self->pre_load;
1864 Coro::cede; 1867 cf::cede_to_tick;
1865 1868
1866 $self->_load_objects ($self->{load_path}, 1) 1869 $self->_load_objects ($self->{load_path}, 1)
1867 or return; 1870 or return;
1868 1871
1869 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1872 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1875 $self->clear_unique_items; 1878 $self->clear_unique_items;
1876 $self->_load_objects ($uniq, 0); 1879 $self->_load_objects ($uniq, 0);
1877 } 1880 }
1878 } 1881 }
1879 1882
1880 Coro::cede; 1883 cf::cede_to_tick;
1881 # now do the right thing for maps 1884 # now do the right thing for maps
1882 $self->link_multipart_objects; 1885 $self->link_multipart_objects;
1883 $self->difficulty ($self->estimate_difficulty) 1886 $self->difficulty ($self->estimate_difficulty)
1884 unless $self->difficulty; 1887 unless $self->difficulty;
1885 Coro::cede; 1888 cf::cede_to_tick;
1886 1889
1887 unless ($self->{deny_activate}) { 1890 unless ($self->{deny_activate}) {
1888 $self->decay_objects; 1891 $self->decay_objects;
1889 $self->fix_auto_apply; 1892 $self->fix_auto_apply;
1890 $self->update_buttons; 1893 $self->update_buttons;
1891 Coro::cede; 1894 cf::cede_to_tick;
1892 $self->set_darkness_map; 1895 $self->set_darkness_map;
1893 Coro::cede; 1896 cf::cede_to_tick;
1894 $self->activate; 1897 $self->activate;
1895 } 1898 }
1896 1899
1897 $self->{last_save} = $cf::RUNTIME; 1900 $self->{last_save} = $cf::RUNTIME;
1898 $self->last_access ($cf::RUNTIME); 1901 $self->last_access ($cf::RUNTIME);
… …
2083my $nuke_counter = "aaaa"; 2086my $nuke_counter = "aaaa";
2084 2087
2085sub nuke { 2088sub nuke {
2086 my ($self) = @_; 2089 my ($self) = @_;
2087 2090
2091 {
2092 my $lock = cf::lock_acquire "map_data:$self->{path}";
2093
2088 delete $cf::MAP{$self->path}; 2094 delete $cf::MAP{$self->path};
2089 2095
2090 $self->unlink_save; 2096 $self->unlink_save;
2091 2097
2092 bless $self, "cf::map"; 2098 bless $self, "cf::map";
2093 delete $self->{deny_reset}; 2099 delete $self->{deny_reset};
2094 $self->{deny_save} = 1; 2100 $self->{deny_save} = 1;
2095 $self->reset_timeout (1); 2101 $self->reset_timeout (1);
2096 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2102 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2097 2103
2098 $cf::MAP{$self->path} = $self; 2104 $cf::MAP{$self->path} = $self;
2105 }
2099 2106
2100 $self->reset; # polite request, might not happen 2107 $self->reset; # polite request, might not happen
2101} 2108}
2102 2109
2103=item $maps = cf::map::tmp_maps 2110=item $maps = cf::map::tmp_maps
… …
2497the message, with C<log> being the default. If C<$color> is negative, suppress 2504the message, with C<log> being the default. If C<$color> is negative, suppress
2498the message unless the client supports the msg packet. 2505the message unless the client supports the msg packet.
2499 2506
2500=cut 2507=cut
2501 2508
2509our %CHANNEL = (
2510 "c/identify" => {
2511 id => "identify",
2512 title => "Identify",
2513 reply => undef,
2514 tooltip => "Items recently identified",
2515 },
2516);
2517
2502sub cf::client::send_msg { 2518sub cf::client::send_msg {
2503 my ($self, $channel, $msg, $color, @extra) = @_; 2519 my ($self, $channel, $msg, $color, @extra) = @_;
2504 2520
2505 $msg = $self->pl->expand_cfpod ($msg); 2521 $msg = $self->pl->expand_cfpod ($msg);
2506 2522
2507 $color &= cf::NDI_CLIENT_MASK; # just in case... 2523 $color &= cf::NDI_CLIENT_MASK; # just in case...
2524
2525 # check predefined channels, for the benefit of C
2526 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2508 2527
2509 if (ref $channel) { 2528 if (ref $channel) {
2510 # send meta info to client, if not yet sent 2529 # send meta info to client, if not yet sent
2511 unless (exists $self->{channel}{$channel->{id}}) { 2530 unless (exists $self->{channel}{$channel->{id}}) {
2512 $self->{channel}{$channel->{id}} = $channel; 2531 $self->{channel}{$channel->{id}} = $channel;
… …
2833# the server's init and main functions 2852# the server's init and main functions
2834 2853
2835sub load_facedata($) { 2854sub load_facedata($) {
2836 my ($path) = @_; 2855 my ($path) = @_;
2837 2856
2857 # HACK to clear player env face cache, we need some signal framework
2858 # for this (global event?)
2859 %ext::player_env::MUSIC_FACE_CACHE = ();
2860
2838 my $enc = JSON::XS->new->utf8->canonical->relaxed; 2861 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2839 2862
2840 warn "loading facedata from $path\n"; 2863 warn "loading facedata from $path\n";
2841 2864
2842 my $facedata; 2865 my $facedata;
… …
2953 $ns->fx_want ($k, $v); 2976 $ns->fx_want ($k, $v);
2954 } 2977 }
2955}; 2978};
2956 2979
2957sub reload_regions { 2980sub reload_regions {
2981 # HACK to clear player env face cache, we need some signal framework
2982 # for this (global event?)
2983 %ext::player_env::MUSIC_FACE_CACHE = ();
2984
2958 load_resource_file "$MAPDIR/regions" 2985 load_resource_file "$MAPDIR/regions"
2959 or die "unable to load regions file\n"; 2986 or die "unable to load regions file\n";
2960 2987
2961 for (cf::region::list) { 2988 for (cf::region::list) {
2962 $_->{match} = qr/$_->{match}/ 2989 $_->{match} = qr/$_->{match}/

Diff Legend

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