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.121 by root, Tue Jan 2 11:11:52 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
… …
1133 $map->per_player (0) if $path->{user_rel}; 1213 $map->per_player (0) if $path->{user_rel};
1134 } 1214 }
1135 1215
1136 $map->path ($key); 1216 $map->path ($key);
1137 $map->{path} = $path; 1217 $map->{path} = $path;
1218 $map->{last_save} = $cf::RUNTIME;
1138 $map->last_access ($cf::RUNTIME); 1219 $map->last_access ($cf::RUNTIME);
1139 1220
1140 if ($map->should_reset) { 1221 if ($map->should_reset) {
1141 $map->reset; 1222 $map->reset;
1142 $map = find_map $path; 1223 $map = find_map $path;
… …
1147} 1228}
1148 1229
1149sub load { 1230sub load {
1150 my ($self) = @_; 1231 my ($self) = @_;
1151 1232
1233 my $path = $self->{path};
1234 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1235
1152 return if $self->in_memory != cf::MAP_SWAPPED; 1236 return if $self->in_memory != cf::MAP_SWAPPED;
1153 1237
1154 $self->in_memory (cf::MAP_LOADING); 1238 $self->in_memory (cf::MAP_LOADING);
1155
1156 my $path = $self->{path};
1157 1239
1158 $self->alloc; 1240 $self->alloc;
1159 $self->load_objects ($self->{load_path}, 1) 1241 $self->load_objects ($self->{load_path}, 1)
1160 or return; 1242 or return;
1161 1243
… …
1203} 1285}
1204 1286
1205sub save { 1287sub save {
1206 my ($self) = @_; 1288 my ($self) = @_;
1207 1289
1290 $self->{last_save} = $cf::RUNTIME;
1291
1292 return unless $self->dirty;
1293
1208 my $save = $self->{path}->save_path; utf8::encode $save; 1294 my $save = $self->{path}->save_path; utf8::encode $save;
1209 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1295 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1210
1211 $self->{last_save} = $cf::RUNTIME;
1212
1213 return unless $self->dirty;
1214 1296
1215 $self->{load_path} = $save; 1297 $self->{load_path} = $save;
1216 1298
1217 return if $self->{deny_save}; 1299 return if $self->{deny_save};
1218 1300
… …
1238 1320
1239sub reset_at { 1321sub reset_at {
1240 my ($self) = @_; 1322 my ($self) = @_;
1241 1323
1242 # TODO: safety, remove and allow resettable per-player maps 1324 # TODO: safety, remove and allow resettable per-player maps
1243 return 1e100 if $self->{path}{user_rel}; 1325 return 1e99 if $self->{path}{user_rel};
1244 return 1e100 if $self->{deny_reset}; 1326 return 1e99 if $self->{deny_reset};
1245 1327
1246 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1328 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1247 my $to = $self->reset_timeout || $DEFAULT_RESET; 1329 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1248 $to = $MAX_RESET if $to > $MAX_RESET;
1249 1330
1250 $time + $to 1331 $time + $to
1251} 1332}
1252 1333
1253sub should_reset { 1334sub should_reset {
… …
1262 utf8::encode (my $save = $self->{path}->save_path); 1343 utf8::encode (my $save = $self->{path}->save_path);
1263 aioreq_pri 3; IO::AIO::aio_unlink $save; 1344 aioreq_pri 3; IO::AIO::aio_unlink $save;
1264 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst"; 1345 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1265} 1346}
1266 1347
1348sub rename {
1349 my ($self, $new_path) = @_;
1350
1351 $self->unlink_save;
1352
1353 delete $cf::MAP{$self->path};
1354 $self->{path} = new cf::path $new_path;
1355 $self->path ($self->{path}->as_string);
1356 $cf::MAP{$self->path} = $self;
1357
1358 $self->save;
1359}
1360
1267sub reset { 1361sub reset {
1268 my ($self) = @_; 1362 my ($self) = @_;
1269 1363
1270 return if $self->players; 1364 return if $self->players;
1271 return if $self->{path}{user_rel};#d# 1365 return if $self->{path}{user_rel};#d#
… …
1276 1370
1277 $_->clear_links_to ($self) for values %cf::MAP; 1371 $_->clear_links_to ($self) for values %cf::MAP;
1278 1372
1279 $self->unlink_save; 1373 $self->unlink_save;
1280 $self->destroy; 1374 $self->destroy;
1375}
1376
1377my $nuke_counter = "aaaa";
1378
1379sub nuke {
1380 my ($self) = @_;
1381
1382 $self->{deny_save} = 1;
1383 $self->reset_timeout (1);
1384 $self->rename ("{nuke}/" . ($nuke_counter++));
1385 $self->reset; # polite request, might not happen
1281} 1386}
1282 1387
1283sub customise_for { 1388sub customise_for {
1284 my ($map, $ob) = @_; 1389 my ($map, $ob) = @_;
1285 1390
… …
1350 (ref $cf::CFG{"may_$access"} 1455 (ref $cf::CFG{"may_$access"}
1351 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 1456 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
1352 : $cf::CFG{"may_$access"}) 1457 : $cf::CFG{"may_$access"})
1353} 1458}
1354 1459
1460=item $player_object->enter_link
1461
1462Freezes the player and moves him/her to a special map (C<{link}>).
1463
1464The player should be reaosnably safe there for short amounts of time. You
1465I<MUST> call C<leave_link> as soon as possible, though.
1466
1467=item $player_object->leave_link ($map, $x, $y)
1468
1469Moves the player out of the specila link map onto the given map. If the
1470map is not valid (or omitted), the player will be moved back to the
1471location he/she was before the call to C<enter_link>, or, if that fails,
1472to the emergency map position.
1473
1474Might block.
1475
1476=cut
1477
1355sub cf::object::player::enter_link { 1478sub cf::object::player::enter_link {
1356 my ($self) = @_; 1479 my ($self) = @_;
1357 1480
1481 $self->deactivate_recursive;
1482
1358 return if $self->map == $LINK_MAP; 1483 return if $self->map == $LINK_MAP;
1359 1484
1360 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1485 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1361 if $self->map; 1486 if $self->map;
1362 1487
1363 $self->enter_map ($LINK_MAP, 20, 20); 1488 $self->enter_map ($LINK_MAP, 20, 20);
1364 $self->deactivate_recursive;
1365} 1489}
1366 1490
1367sub cf::object::player::leave_link { 1491sub cf::object::player::leave_link {
1368 my ($self, $map, $x, $y) = @_; 1492 my ($self, $map, $x, $y) = @_;
1369 1493
1370 my $link_pos = delete $self->{_link_pos}; 1494 my $link_pos = delete $self->{_link_pos};
1371 1495
1372 unless ($map) { 1496 unless ($map) {
1373 $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1374
1375 # restore original map position 1497 # restore original map position
1376 ($map, $x, $y) = @{ $link_pos || [] }; 1498 ($map, $x, $y) = @{ $link_pos || [] };
1377 $map = cf::map::find_map $map; 1499 $map = cf::map::find_map $map;
1378 1500
1379 unless ($map) { 1501 unless ($map) {
… …
1394 1516
1395 $self->activate_recursive; 1517 $self->activate_recursive;
1396 $self->enter_map ($map, $x, $y); 1518 $self->enter_map ($map, $x, $y);
1397} 1519}
1398 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);
1548
1399=item $player_object->goto_map ($map, $x, $y) 1549=item $player_object->goto_map ($path, $x, $y)
1400 1550
1401=cut 1551=cut
1402 1552
1403sub cf::object::player::goto_map { 1553sub cf::object::player::goto_map {
1404 my ($self, $path, $x, $y) = @_; 1554 my ($self, $path, $x, $y) = @_;
… …
1409 $path = new cf::path $path; 1559 $path = new cf::path $path;
1410 1560
1411 my $map = cf::map::find_map $path->as_string; 1561 my $map = cf::map::find_map $path->as_string;
1412 $map = $map->customise_for ($self) if $map; 1562 $map = $map->customise_for ($self) if $map;
1413 1563
1414 warn "entering ", $map->path, " at ($x, $y)\n" 1564# warn "entering ", $map->path, " at ($x, $y)\n"
1415 if $map; 1565# if $map;
1566
1567 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1416 1568
1417 $self->leave_link ($map, $x, $y); 1569 $self->leave_link ($map, $x, $y);
1418 })->prio (1); 1570 })->prio (1);
1419} 1571}
1420 1572
… …
1761 1913
1762{ 1914{
1763 my $path = cf::localdir . "/database.pst"; 1915 my $path = cf::localdir . "/database.pst";
1764 1916
1765 sub db_load() { 1917 sub db_load() {
1766 warn "loading database $path\n";#d# remove later
1767 $DB = stat $path ? Storable::retrieve $path : { }; 1918 $DB = stat $path ? Storable::retrieve $path : { };
1768 } 1919 }
1769 1920
1770 my $pid; 1921 my $pid;
1771 1922
1772 sub db_save() { 1923 sub db_save() {
1773 warn "saving database $path\n";#d# remove later
1774 waitpid $pid, 0 if $pid; 1924 waitpid $pid, 0 if $pid;
1775 if (0 == ($pid = fork)) { 1925 if (0 == ($pid = fork)) {
1776 $DB->{_meta}{version} = 1; 1926 $DB->{_meta}{version} = 1;
1777 Storable::nstore $DB, "$path~"; 1927 Storable::nstore $DB, "$path~";
1778 rename "$path~", $path; 1928 rename "$path~", $path;
… …
1831} 1981}
1832 1982
1833sub main { 1983sub main {
1834 # we must not ever block the main coroutine 1984 # we must not ever block the main coroutine
1835 local $Coro::idle = sub { 1985 local $Coro::idle = sub {
1836 Carp::cluck "FATAL: Coro::idle was called, major BUG\n";#d# 1986 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1837 (Coro::unblock_sub { 1987 (Coro::unblock_sub {
1838 Event::one_event; 1988 Event::one_event;
1839 })->(); 1989 })->();
1840 }; 1990 };
1841 1991

Diff Legend

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