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.119 by root, Tue Jan 2 08:26:42 2007 UTC vs.
Revision 1.121 by root, Tue Jan 2 11:11:52 2007 UTC

… …
179=cut 179=cut
180 180
181sub to_json($) { 181sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 183 JSON::Syck::Dump $_[0]
184}
185
186=item my $guard = cf::guard { BLOCK }
187
188Run the given callback when the guard object gets destroyed (useful for
189coroutine cancellations).
190
191You can call C<< ->cancel >> on the guard object to stop the block from
192being executed.
193
194=cut
195
196sub guard(&) {
197 bless \(my $cb = $_[0]), cf::guard::;
198}
199
200sub cf::guard::cancel {
201 ${$_[0]} = sub { };
202}
203
204sub cf::guard::DESTROY {
205 ${$_[0]}->();
206}
207
208=item cf::lock_wait $string
209
210Wait until the given lock is available. See cf::lock_acquire.
211
212=item my $lock = cf::lock_acquire $string
213
214Wait until the given lock is available and then acquires it and returns
215a guard object. If the guard object gets destroyed (goes out of scope,
216for example when the coroutine gets canceled), the lock is automatically
217returned.
218
219Lock names should begin with a unique identifier (for example, find_map
220uses map_find and load_map uses map_load).
221
222=cut
223
224our %LOCK;
225
226sub lock_wait($) {
227 my ($key) = @_;
228
229 # wait for lock, if any
230 while ($LOCK{$key}) {
231 push @{ $LOCK{$key} }, $Coro::current;
232 Coro::schedule;
233 }
234}
235
236sub lock_acquire($) {
237 my ($key) = @_;
238
239 # wait, to be sure we are not locked
240 lock_wait $key;
241
242 $LOCK{$key} = [];
243
244 cf::guard {
245 # wake up all waiters, to be on the safe side
246 $_->ready for @{ delete $LOCK{$key} };
247 }
184} 248}
185 249
186=item cf::sync_job { BLOCK } 250=item cf::sync_job { BLOCK }
187 251
188The design of crossfire+ requires that the main coro ($Coro::main) is 252The design of crossfire+ requires that the main coro ($Coro::main) is
… …
1118 #warn "find_map<$path,$origin>\n";#d# 1182 #warn "find_map<$path,$origin>\n";#d#
1119 1183
1120 $path = new cf::path $path, $origin && $origin->path; 1184 $path = new cf::path $path, $origin && $origin->path;
1121 my $key = $path->as_string; 1185 my $key = $path->as_string;
1122 1186
1187 cf::lock_wait "map_find:$key";
1188
1123 $cf::MAP{$key} || do { 1189 $cf::MAP{$key} || do {
1190 my $guard = cf::lock_acquire "map_find:$key";
1191
1124 # do it the slow way 1192 # do it the slow way
1125 my $map = try_load_header $path->save_path; 1193 my $map = try_load_header $path->save_path;
1126 1194
1127 if ($map) { 1195 if ($map) {
1128 # safety 1196 # safety
… …
1142 $map->instantiate; 1210 $map->instantiate;
1143 1211
1144 # per-player maps become, after loading, normal maps 1212 # per-player maps become, after loading, normal maps
1145 $map->per_player (0) if $path->{user_rel}; 1213 $map->per_player (0) if $path->{user_rel};
1146 } 1214 }
1147 #Coro::Timer::sleep 1;#d#
1148 1215
1149 $map->path ($key); 1216 $map->path ($key);
1150 $map->{path} = $path; 1217 $map->{path} = $path;
1151 $map->{last_save} = $cf::RUNTIME; 1218 $map->{last_save} = $cf::RUNTIME;
1152 $map->last_access ($cf::RUNTIME); 1219 $map->last_access ($cf::RUNTIME);
… …
1161} 1228}
1162 1229
1163sub load { 1230sub load {
1164 my ($self) = @_; 1231 my ($self) = @_;
1165 1232
1233 my $path = $self->{path};
1234 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1235
1166 return if $self->in_memory != cf::MAP_SWAPPED; 1236 return if $self->in_memory != cf::MAP_SWAPPED;
1167 1237
1168 $self->in_memory (cf::MAP_LOADING); 1238 $self->in_memory (cf::MAP_LOADING);
1169
1170 my $path = $self->{path};
1171 1239
1172 $self->alloc; 1240 $self->alloc;
1173 $self->load_objects ($self->{load_path}, 1) 1241 $self->load_objects ($self->{load_path}, 1)
1174 or return; 1242 or return;
1175 1243
… …
1408=cut 1476=cut
1409 1477
1410sub cf::object::player::enter_link { 1478sub cf::object::player::enter_link {
1411 my ($self) = @_; 1479 my ($self) = @_;
1412 1480
1481 $self->deactivate_recursive;
1482
1413 return if $self->map == $LINK_MAP; 1483 return if $self->map == $LINK_MAP;
1414 1484
1415 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1485 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1416 if $self->map; 1486 if $self->map;
1417 1487
1418 $self->enter_map ($LINK_MAP, 20, 20); 1488 $self->enter_map ($LINK_MAP, 20, 20);
1419 $self->deactivate_recursive;
1420} 1489}
1421 1490
1422sub cf::object::player::leave_link { 1491sub cf::object::player::leave_link {
1423 my ($self, $map, $x, $y) = @_; 1492 my ($self, $map, $x, $y) = @_;
1424 1493
… …
1446 $map->load; 1515 $map->load;
1447 1516
1448 $self->activate_recursive; 1517 $self->activate_recursive;
1449 $self->enter_map ($map, $x, $y); 1518 $self->enter_map ($map, $x, $y);
1450} 1519}
1520
1521cf::player->attach (
1522 on_logout => sub {
1523 my ($pl) = @_;
1524
1525 # abort map switching before logout
1526 if ($pl->ob->{_link_pos}) {
1527 cf::sync_job {
1528 $pl->ob->leave_link
1529 };
1530 }
1531 },
1532 on_login => sub {
1533 my ($pl) = @_;
1534
1535 # try to abort aborted map switching on player login :)
1536 # should happen only on crashes
1537 if ($pl->ob->{_link_pos}) {
1538 $pl->ob->enter_link;
1539 Coro::async {
1540 # we need this sleep as the login has a concurrent enter_exit running
1541 # and this sleep increases chances of the player not ending up in scorn
1542 Coro::Timer::sleep 1;
1543 $pl->ob->leave_link;
1544 };
1545 }
1546 },
1547);
1451 1548
1452=item $player_object->goto_map ($path, $x, $y) 1549=item $player_object->goto_map ($path, $x, $y)
1453 1550
1454=cut 1551=cut
1455 1552
… …
1816 1913
1817{ 1914{
1818 my $path = cf::localdir . "/database.pst"; 1915 my $path = cf::localdir . "/database.pst";
1819 1916
1820 sub db_load() { 1917 sub db_load() {
1821 warn "loading database $path\n";#d# remove later
1822 $DB = stat $path ? Storable::retrieve $path : { }; 1918 $DB = stat $path ? Storable::retrieve $path : { };
1823 } 1919 }
1824 1920
1825 my $pid; 1921 my $pid;
1826 1922
1827 sub db_save() { 1923 sub db_save() {
1828 warn "saving database $path\n";#d# remove later
1829 waitpid $pid, 0 if $pid; 1924 waitpid $pid, 0 if $pid;
1830 if (0 == ($pid = fork)) { 1925 if (0 == ($pid = fork)) {
1831 $DB->{_meta}{version} = 1; 1926 $DB->{_meta}{version} = 1;
1832 Storable::nstore $DB, "$path~"; 1927 Storable::nstore $DB, "$path~";
1833 rename "$path~", $path; 1928 rename "$path~", $path;

Diff Legend

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