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.349 by root, Fri Aug 31 04:10:43 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;
2091
2092 bless $self, "cf::map"; 2096 bless $self, "cf::map";
2093 delete $self->{deny_reset}; 2097 delete $self->{deny_reset};
2094 $self->{deny_save} = 1; 2098 $self->{deny_save} = 1;
2095 $self->reset_timeout (1); 2099 $self->reset_timeout (1);
2096 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2100 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2097 2101
2102 $self->unlink_save;
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
… …
2833# the server's init and main functions 2840# the server's init and main functions
2834 2841
2835sub load_facedata($) { 2842sub load_facedata($) {
2836 my ($path) = @_; 2843 my ($path) = @_;
2837 2844
2845 # HACK to clear player env face cache, we need some signal framework
2846 # for this (global event?)
2847 %ext::player_env::MUSIC_FACE_CACHE = ();
2848
2838 my $enc = JSON::XS->new->utf8->canonical->relaxed; 2849 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2839 2850
2840 warn "loading facedata from $path\n"; 2851 warn "loading facedata from $path\n";
2841 2852
2842 my $facedata; 2853 my $facedata;
… …
2953 $ns->fx_want ($k, $v); 2964 $ns->fx_want ($k, $v);
2954 } 2965 }
2955}; 2966};
2956 2967
2957sub reload_regions { 2968sub reload_regions {
2969 # HACK to clear player env face cache, we need some signal framework
2970 # for this (global event?)
2971 %ext::player_env::MUSIC_FACE_CACHE = ();
2972
2958 load_resource_file "$MAPDIR/regions" 2973 load_resource_file "$MAPDIR/regions"
2959 or die "unable to load regions file\n"; 2974 or die "unable to load regions file\n";
2960 2975
2961 for (cf::region::list) { 2976 for (cf::region::list) {
2962 $_->{match} = qr/$_->{match}/ 2977 $_->{match} = qr/$_->{match}/

Diff Legend

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