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

Diff Legend

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