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.124 by root, Tue Jan 2 22:55:05 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
… …
1077# and all this just because we cannot iterate over 1153# and all this just because we cannot iterate over
1078# all maps in C++... 1154# all maps in C++...
1079sub change_all_map_light { 1155sub change_all_map_light {
1080 my ($change) = @_; 1156 my ($change) = @_;
1081 1157
1082 $_->change_map_light ($change) for values %cf::MAP; 1158 $_->change_map_light ($change)
1159 for grep $_->outdoor, values %cf::MAP;
1083} 1160}
1084 1161
1085sub try_load_header($) { 1162sub try_load_header($) {
1086 my ($path) = @_; 1163 my ($path) = @_;
1087 1164
… …
1106 #warn "find_map<$path,$origin>\n";#d# 1183 #warn "find_map<$path,$origin>\n";#d#
1107 1184
1108 $path = new cf::path $path, $origin && $origin->path; 1185 $path = new cf::path $path, $origin && $origin->path;
1109 my $key = $path->as_string; 1186 my $key = $path->as_string;
1110 1187
1188 cf::lock_wait "map_find:$key";
1189
1111 $cf::MAP{$key} || do { 1190 $cf::MAP{$key} || do {
1191 my $guard = cf::lock_acquire "map_find:$key";
1192
1112 # do it the slow way 1193 # do it the slow way
1113 my $map = try_load_header $path->save_path; 1194 my $map = try_load_header $path->save_path;
1114 1195
1115 if ($map) { 1196 if ($map) {
1116 # safety 1197 # safety
… …
1133 $map->per_player (0) if $path->{user_rel}; 1214 $map->per_player (0) if $path->{user_rel};
1134 } 1215 }
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;
1224 undef $guard;
1142 $map = find_map $path; 1225 $map = cf::map::find_map ($path)
1226 or return;
1143 } 1227 }
1144 1228
1145 $cf::MAP{$key} = $map 1229 $cf::MAP{$key} = $map
1146 } 1230 }
1147} 1231}
1148 1232
1149sub load { 1233sub load {
1150 my ($self) = @_; 1234 my ($self) = @_;
1151 1235
1236 my $path = $self->{path};
1237 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1238
1152 return if $self->in_memory != cf::MAP_SWAPPED; 1239 return if $self->in_memory != cf::MAP_SWAPPED;
1153 1240
1154 $self->in_memory (cf::MAP_LOADING); 1241 $self->in_memory (cf::MAP_LOADING);
1155
1156 my $path = $self->{path};
1157 1242
1158 $self->alloc; 1243 $self->alloc;
1159 $self->load_objects ($self->{load_path}, 1) 1244 $self->load_objects ($self->{load_path}, 1)
1160 or return; 1245 or return;
1161 1246
… …
1203} 1288}
1204 1289
1205sub save { 1290sub save {
1206 my ($self) = @_; 1291 my ($self) = @_;
1207 1292
1293 $self->{last_save} = $cf::RUNTIME;
1294
1295 return unless $self->dirty;
1296
1208 my $save = $self->{path}->save_path; utf8::encode $save; 1297 my $save = $self->{path}->save_path; utf8::encode $save;
1209 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1298 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1210
1211 $self->{last_save} = $cf::RUNTIME;
1212
1213 return unless $self->dirty;
1214 1299
1215 $self->{load_path} = $save; 1300 $self->{load_path} = $save;
1216 1301
1217 return if $self->{deny_save}; 1302 return if $self->{deny_save};
1218 1303
… …
1238 1323
1239sub reset_at { 1324sub reset_at {
1240 my ($self) = @_; 1325 my ($self) = @_;
1241 1326
1242 # TODO: safety, remove and allow resettable per-player maps 1327 # TODO: safety, remove and allow resettable per-player maps
1243 return 1e100 if $self->{path}{user_rel}; 1328 return 1e99 if $self->{path}{user_rel};
1244 return 1e100 if $self->{deny_reset}; 1329 return 1e99 if $self->{deny_reset};
1245 1330
1246 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1331 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1247 my $to = $self->reset_timeout || $DEFAULT_RESET; 1332 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1248 $to = $MAX_RESET if $to > $MAX_RESET;
1249 1333
1250 $time + $to 1334 $time + $to
1251} 1335}
1252 1336
1253sub should_reset { 1337sub should_reset {
… …
1262 utf8::encode (my $save = $self->{path}->save_path); 1346 utf8::encode (my $save = $self->{path}->save_path);
1263 aioreq_pri 3; IO::AIO::aio_unlink $save; 1347 aioreq_pri 3; IO::AIO::aio_unlink $save;
1264 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst"; 1348 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1265} 1349}
1266 1350
1351sub rename {
1352 my ($self, $new_path) = @_;
1353
1354 $self->unlink_save;
1355
1356 delete $cf::MAP{$self->path};
1357 $self->{path} = new cf::path $new_path;
1358 $self->path ($self->{path}->as_string);
1359 $cf::MAP{$self->path} = $self;
1360
1361 $self->save;
1362}
1363
1267sub reset { 1364sub reset {
1268 my ($self) = @_; 1365 my ($self) = @_;
1269 1366
1270 return if $self->players; 1367 return if $self->players;
1271 return if $self->{path}{user_rel};#d# 1368 return if $self->{path}{user_rel};#d#
… …
1276 1373
1277 $_->clear_links_to ($self) for values %cf::MAP; 1374 $_->clear_links_to ($self) for values %cf::MAP;
1278 1375
1279 $self->unlink_save; 1376 $self->unlink_save;
1280 $self->destroy; 1377 $self->destroy;
1378}
1379
1380my $nuke_counter = "aaaa";
1381
1382sub nuke {
1383 my ($self) = @_;
1384
1385 $self->{deny_save} = 1;
1386 $self->reset_timeout (1);
1387 $self->rename ("{nuke}/" . ($nuke_counter++));
1388 $self->reset; # polite request, might not happen
1281} 1389}
1282 1390
1283sub customise_for { 1391sub customise_for {
1284 my ($map, $ob) = @_; 1392 my ($map, $ob) = @_;
1285 1393
… …
1350 (ref $cf::CFG{"may_$access"} 1458 (ref $cf::CFG{"may_$access"}
1351 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 1459 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
1352 : $cf::CFG{"may_$access"}) 1460 : $cf::CFG{"may_$access"})
1353} 1461}
1354 1462
1463=item $player_object->enter_link
1464
1465Freezes the player and moves him/her to a special map (C<{link}>).
1466
1467The player should be reaosnably safe there for short amounts of time. You
1468I<MUST> call C<leave_link> as soon as possible, though.
1469
1470=item $player_object->leave_link ($map, $x, $y)
1471
1472Moves the player out of the specila link map onto the given map. If the
1473map is not valid (or omitted), the player will be moved back to the
1474location he/she was before the call to C<enter_link>, or, if that fails,
1475to the emergency map position.
1476
1477Might block.
1478
1479=cut
1480
1355sub cf::object::player::enter_link { 1481sub cf::object::player::enter_link {
1356 my ($self) = @_; 1482 my ($self) = @_;
1357 1483
1484 $self->deactivate_recursive;
1485
1358 return if $self->map == $LINK_MAP; 1486 return if $self->map == $LINK_MAP;
1359 1487
1360 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1488 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1361 if $self->map; 1489 if $self->map;
1362 1490
1363 $self->enter_map ($LINK_MAP, 20, 20); 1491 $self->enter_map ($LINK_MAP, 20, 20);
1364 $self->deactivate_recursive;
1365} 1492}
1366 1493
1367sub cf::object::player::leave_link { 1494sub cf::object::player::leave_link {
1368 my ($self, $map, $x, $y) = @_; 1495 my ($self, $map, $x, $y) = @_;
1369 1496
1370 my $link_pos = delete $self->{_link_pos}; 1497 my $link_pos = delete $self->{_link_pos};
1371 1498
1372 unless ($map) { 1499 unless ($map) {
1373 $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1374
1375 # restore original map position 1500 # restore original map position
1376 ($map, $x, $y) = @{ $link_pos || [] }; 1501 ($map, $x, $y) = @{ $link_pos || [] };
1377 $map = cf::map::find_map $map; 1502 $map = cf::map::find_map $map;
1378 1503
1379 unless ($map) { 1504 unless ($map) {
… …
1394 1519
1395 $self->activate_recursive; 1520 $self->activate_recursive;
1396 $self->enter_map ($map, $x, $y); 1521 $self->enter_map ($map, $x, $y);
1397} 1522}
1398 1523
1524cf::player->attach (
1525 on_logout => sub {
1526 my ($pl) = @_;
1527
1528 # abort map switching before logout
1529 if ($pl->ob->{_link_pos}) {
1530 cf::sync_job {
1531 $pl->ob->leave_link
1532 };
1533 }
1534 },
1535 on_login => sub {
1536 my ($pl) = @_;
1537
1538 # try to abort aborted map switching on player login :)
1539 # should happen only on crashes
1540 if ($pl->ob->{_link_pos}) {
1541 $pl->ob->enter_link;
1542 Coro::async {
1543 # we need this sleep as the login has a concurrent enter_exit running
1544 # and this sleep increases chances of the player not ending up in scorn
1545 Coro::Timer::sleep 1;
1546 $pl->ob->leave_link;
1547 };
1548 }
1549 },
1550);
1551
1399=item $player_object->goto_map ($map, $x, $y) 1552=item $player_object->goto_map ($path, $x, $y)
1400 1553
1401=cut 1554=cut
1402 1555
1403sub cf::object::player::goto_map { 1556sub cf::object::player::goto_map {
1404 my ($self, $path, $x, $y) = @_; 1557 my ($self, $path, $x, $y) = @_;
… …
1409 $path = new cf::path $path; 1562 $path = new cf::path $path;
1410 1563
1411 my $map = cf::map::find_map $path->as_string; 1564 my $map = cf::map::find_map $path->as_string;
1412 $map = $map->customise_for ($self) if $map; 1565 $map = $map->customise_for ($self) if $map;
1413 1566
1414 warn "entering ", $map->path, " at ($x, $y)\n" 1567# warn "entering ", $map->path, " at ($x, $y)\n"
1415 if $map; 1568# if $map;
1569
1570 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1416 1571
1417 $self->leave_link ($map, $x, $y); 1572 $self->leave_link ($map, $x, $y);
1418 })->prio (1); 1573 })->prio (1);
1419} 1574}
1420 1575
… …
1761 1916
1762{ 1917{
1763 my $path = cf::localdir . "/database.pst"; 1918 my $path = cf::localdir . "/database.pst";
1764 1919
1765 sub db_load() { 1920 sub db_load() {
1766 warn "loading database $path\n";#d# remove later
1767 $DB = stat $path ? Storable::retrieve $path : { }; 1921 $DB = stat $path ? Storable::retrieve $path : { };
1768 } 1922 }
1769 1923
1770 my $pid; 1924 my $pid;
1771 1925
1772 sub db_save() { 1926 sub db_save() {
1773 warn "saving database $path\n";#d# remove later
1774 waitpid $pid, 0 if $pid; 1927 waitpid $pid, 0 if $pid;
1775 if (0 == ($pid = fork)) { 1928 if (0 == ($pid = fork)) {
1776 $DB->{_meta}{version} = 1; 1929 $DB->{_meta}{version} = 1;
1777 Storable::nstore $DB, "$path~"; 1930 Storable::nstore $DB, "$path~";
1778 rename "$path~", $path; 1931 rename "$path~", $path;
… …
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