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.112 by root, Mon Jan 1 13:31:47 2007 UTC vs.
Revision 1.120 by root, Tue Jan 2 11:08:36 2007 UTC

… …
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} 184}
185 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 }
248}
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
189always able to handle events or runnable, as crossfire+ is only partly 253always able to handle events or runnable, as crossfire+ is only partly
190reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 254reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable.
… …
289 353
290 $path = $path->as_string if ref $path; 354 $path = $path->as_string if ref $path;
291 355
292 my $self = bless { }, $class; 356 my $self = bless { }, $class;
293 357
358 # {... are special paths that are not touched
359 # ?xxx/... are special absolute paths
360 # ?random/... random maps
361 # /! non-realised random map exit
362 # /... normal maps
363 # ~/... per-player maps without a specific player (DO NOT USE)
364 # ~user/... per-player map of a specific user
365
366 if ($path =~ /^{/) {
367 # fine as it is
294 if ($path =~ s{^\?random/}{}) { 368 } elsif ($path =~ s{^\?random/}{}) {
295 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data; 369 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
296 $self->{random} = cf::from_json $data; 370 $self->{random} = cf::from_json $data;
297 } else { 371 } else {
298 if ($path =~ s{^~([^/]+)?}{}) { 372 if ($path =~ s{^~([^/]+)?}{}) {
299 $self->{user_rel} = 1; 373 $self->{user_rel} = 1;
… …
804 or return; 878 or return;
805 879
806 unless (aio_stat "$filename.pst") { 880 unless (aio_stat "$filename.pst") {
807 (aio_load "$filename.pst", $av) >= 0 881 (aio_load "$filename.pst", $av) >= 0
808 or return; 882 or return;
809 $av = eval { (Storable::thaw <$av>)->{objs} }; 883 $av = eval { (Storable::thaw $av)->{objs} };
810 } 884 }
811 885
886 warn sprintf "loading %s (%d)\n",
887 $filename, length $data, scalar @{$av || []};#d#
812 return ($data, $av); 888 return ($data, $av);
813} 889}
814 890
815############################################################################# 891#############################################################################
816# command handling &c 892# command handling &c
… …
1106 #warn "find_map<$path,$origin>\n";#d# 1182 #warn "find_map<$path,$origin>\n";#d#
1107 1183
1108 $path = new cf::path $path, $origin && $origin->path; 1184 $path = new cf::path $path, $origin && $origin->path;
1109 my $key = $path->as_string; 1185 my $key = $path->as_string;
1110 1186
1187 cf::lock_wait "map_find:$key";
1188
1111 $cf::MAP{$key} || do { 1189 $cf::MAP{$key} || do {
1190 my $guard = cf::lock_acquire "map_find:$key";
1191
1112 # do it the slow way 1192 # do it the slow way
1113 my $map = try_load_header $path->save_path; 1193 my $map = try_load_header $path->save_path;
1114 1194
1115 if ($map) { 1195 if ($map) {
1116 # safety 1196 # safety
… …
1130 $map->instantiate; 1210 $map->instantiate;
1131 1211
1132 # per-player maps become, after loading, normal maps 1212 # per-player maps become, after loading, normal maps
1133 $map->per_player (0) if $path->{user_rel}; 1213 $map->per_player (0) if $path->{user_rel};
1134 } 1214 }
1215 #Coro::Timer::sleep 1;#d#
1135 1216
1136 $map->path ($key); 1217 $map->path ($key);
1137 $map->{path} = $path; 1218 $map->{path} = $path;
1219 $map->{last_save} = $cf::RUNTIME;
1138 $map->last_access ($cf::RUNTIME); 1220 $map->last_access ($cf::RUNTIME);
1139 1221
1140 if ($map->should_reset) { 1222 if ($map->should_reset) {
1141 $map->reset; 1223 $map->reset;
1142 $map = find_map $path; 1224 $map = find_map $path;
… …
1147} 1229}
1148 1230
1149sub load { 1231sub load {
1150 my ($self) = @_; 1232 my ($self) = @_;
1151 1233
1234 my $path = $self->{path};
1235 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1236
1152 return if $self->in_memory != cf::MAP_SWAPPED; 1237 return if $self->in_memory != cf::MAP_SWAPPED;
1153 1238
1154 $self->in_memory (cf::MAP_LOADING); 1239 $self->in_memory (cf::MAP_LOADING);
1155
1156 my $path = $self->{path};
1157 1240
1158 $self->alloc; 1241 $self->alloc;
1159 $self->load_objects ($self->{load_path}, 1) 1242 $self->load_objects ($self->{load_path}, 1)
1160 or return; 1243 or return;
1161 1244
… …
1203} 1286}
1204 1287
1205sub save { 1288sub save {
1206 my ($self) = @_; 1289 my ($self) = @_;
1207 1290
1291 $self->{last_save} = $cf::RUNTIME;
1292
1293 return unless $self->dirty;
1294
1208 my $save = $self->{path}->save_path; utf8::encode $save; 1295 my $save = $self->{path}->save_path; utf8::encode $save;
1209 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1296 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1210
1211 $self->{last_save} = $cf::RUNTIME;
1212
1213 return unless $self->dirty;
1214 1297
1215 $self->{load_path} = $save; 1298 $self->{load_path} = $save;
1216 1299
1217 return if $self->{deny_save}; 1300 return if $self->{deny_save};
1218 1301
… …
1238 1321
1239sub reset_at { 1322sub reset_at {
1240 my ($self) = @_; 1323 my ($self) = @_;
1241 1324
1242 # TODO: safety, remove and allow resettable per-player maps 1325 # TODO: safety, remove and allow resettable per-player maps
1243 return 1e100 if $self->{path}{user_rel}; 1326 return 1e99 if $self->{path}{user_rel};
1244 return 1e100 if $self->{deny_reset}; 1327 return 1e99 if $self->{deny_reset};
1245 1328
1246 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1329 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1247 my $to = $self->reset_timeout || $DEFAULT_RESET; 1330 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1248 $to = $MAX_RESET if $to > $MAX_RESET;
1249 1331
1250 $time + $to 1332 $time + $to
1251} 1333}
1252 1334
1253sub should_reset { 1335sub should_reset {
… …
1262 utf8::encode (my $save = $self->{path}->save_path); 1344 utf8::encode (my $save = $self->{path}->save_path);
1263 aioreq_pri 3; IO::AIO::aio_unlink $save; 1345 aioreq_pri 3; IO::AIO::aio_unlink $save;
1264 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst"; 1346 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1265} 1347}
1266 1348
1349sub rename {
1350 my ($self, $new_path) = @_;
1351
1352 $self->unlink_save;
1353
1354 delete $cf::MAP{$self->path};
1355 $self->{path} = new cf::path $new_path;
1356 $self->path ($self->{path}->as_string);
1357 $cf::MAP{$self->path} = $self;
1358
1359 $self->save;
1360}
1361
1267sub reset { 1362sub reset {
1268 my ($self) = @_; 1363 my ($self) = @_;
1269 1364
1270 return if $self->players; 1365 return if $self->players;
1271 return if $self->{path}{user_rel};#d# 1366 return if $self->{path}{user_rel};#d#
… …
1276 1371
1277 $_->clear_links_to ($self) for values %cf::MAP; 1372 $_->clear_links_to ($self) for values %cf::MAP;
1278 1373
1279 $self->unlink_save; 1374 $self->unlink_save;
1280 $self->destroy; 1375 $self->destroy;
1376}
1377
1378my $nuke_counter = "aaaa";
1379
1380sub nuke {
1381 my ($self) = @_;
1382
1383 $self->{deny_save} = 1;
1384 $self->reset_timeout (1);
1385 $self->rename ("{nuke}/" . ($nuke_counter++));
1386 $self->reset; # polite request, might not happen
1281} 1387}
1282 1388
1283sub customise_for { 1389sub customise_for {
1284 my ($map, $ob) = @_; 1390 my ($map, $ob) = @_;
1285 1391
… …
1350 (ref $cf::CFG{"may_$access"} 1456 (ref $cf::CFG{"may_$access"}
1351 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 1457 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
1352 : $cf::CFG{"may_$access"}) 1458 : $cf::CFG{"may_$access"})
1353} 1459}
1354 1460
1461=item $player_object->enter_link
1462
1463Freezes the player and moves him/her to a special map (C<{link}>).
1464
1465The player should be reaosnably safe there for short amounts of time. You
1466I<MUST> call C<leave_link> as soon as possible, though.
1467
1468=item $player_object->leave_link ($map, $x, $y)
1469
1470Moves the player out of the specila link map onto the given map. If the
1471map is not valid (or omitted), the player will be moved back to the
1472location he/she was before the call to C<enter_link>, or, if that fails,
1473to the emergency map position.
1474
1475Might block.
1476
1477=cut
1478
1355sub cf::object::player::enter_link { 1479sub cf::object::player::enter_link {
1356 my ($self) = @_; 1480 my ($self) = @_;
1357 1481
1482 $self->deactivate_recursive;
1483
1358 return if $self->map == $LINK_MAP; 1484 return if $self->map == $LINK_MAP;
1359 1485
1360 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1486 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1361 if $self->map; 1487 if $self->map;
1362 1488
1363 $self->enter_map ($LINK_MAP, 20, 20); 1489 $self->enter_map ($LINK_MAP, 20, 20);
1364 $self->deactivate_recursive;
1365} 1490}
1366 1491
1367sub cf::object::player::leave_link { 1492sub cf::object::player::leave_link {
1368 my ($self, $map, $x, $y) = @_; 1493 my ($self, $map, $x, $y) = @_;
1369 1494
1370 my $link_pos = delete $self->{_link_pos}; 1495 my $link_pos = delete $self->{_link_pos};
1371 1496
1372 unless ($map) { 1497 unless ($map) {
1373 $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1374
1375 # restore original map position 1498 # restore original map position
1376 ($map, $x, $y) = @{ $link_pos || [] }; 1499 ($map, $x, $y) = @{ $link_pos || [] };
1377 $map = cf::map::find_map $map; 1500 $map = cf::map::find_map $map;
1378 1501
1379 unless ($map) { 1502 unless ($map) {
… …
1394 1517
1395 $self->activate_recursive; 1518 $self->activate_recursive;
1396 $self->enter_map ($map, $x, $y); 1519 $self->enter_map ($map, $x, $y);
1397} 1520}
1398 1521
1522cf::player->attach (
1523 on_logout => sub {
1524 my ($pl) = @_;
1525
1526 # abort map switching before logout
1527 if ($pl->ob->{_link_pos}) {
1528 cf::sync_job {
1529 $pl->ob->leave_link
1530 };
1531 }
1532 },
1533 on_login => sub {
1534 my ($pl) = @_;
1535
1536 # try to abort aborted map switching on player login :)
1537 # should happen only on crashes
1538 if ($pl->ob->{_link_pos}) {
1539 $pl->ob->enter_link;
1540 Coro::async {
1541 # we need this sleep as the login has a concurrent enter_exit running
1542 # and this sleep increases chances of the player not ending up in scorn
1543 Coro::Timer::sleep 1;
1544 $pl->ob->leave_link;
1545 };
1546 }
1547 },
1548);
1549
1399=item $player_object->goto_map ($map, $x, $y) 1550=item $player_object->goto_map ($path, $x, $y)
1400 1551
1401=cut 1552=cut
1402 1553
1403sub cf::object::player::goto_map { 1554sub cf::object::player::goto_map {
1404 my ($self, $path, $x, $y) = @_; 1555 my ($self, $path, $x, $y) = @_;
… …
1409 $path = new cf::path $path; 1560 $path = new cf::path $path;
1410 1561
1411 my $map = cf::map::find_map $path->as_string; 1562 my $map = cf::map::find_map $path->as_string;
1412 $map = $map->customise_for ($self) if $map; 1563 $map = $map->customise_for ($self) if $map;
1413 1564
1414 warn "entering ", $map->path, " at ($x, $y)\n" 1565# warn "entering ", $map->path, " at ($x, $y)\n"
1415 if $map; 1566# if $map;
1567
1568 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1416 1569
1417 $self->leave_link ($map, $x, $y); 1570 $self->leave_link ($map, $x, $y);
1418 })->prio (1); 1571 })->prio (1);
1419} 1572}
1420 1573
… …
1831} 1984}
1832 1985
1833sub main { 1986sub main {
1834 # we must not ever block the main coroutine 1987 # we must not ever block the main coroutine
1835 local $Coro::idle = sub { 1988 local $Coro::idle = sub {
1836 Carp::cluck "FATAL: Coro::idle was called, major BUG\n";#d# 1989 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1837 (Coro::unblock_sub { 1990 (Coro::unblock_sub {
1838 Event::one_event; 1991 Event::one_event;
1839 })->(); 1992 })->();
1840 }; 1993 };
1841 1994

Diff Legend

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