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.111 by root, Mon Jan 1 12:28: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.
… …
197=cut 261=cut
198 262
199sub sync_job(&) { 263sub sync_job(&) {
200 my ($job) = @_; 264 my ($job) = @_;
201 265
202 my $busy = 1;
203 my @res;
204
205 my $coro = Coro::async {
206 @res = eval { $job->() };
207 warn $@ if $@;
208 undef $busy;
209 };
210
211 if ($Coro::current == $Coro::main) { 266 if ($Coro::current == $Coro::main) {
267 # this is the main coro, too bad, we have to block
268 # till the operation succeeds, freezing the server :/
269
212 # TODO: use suspend/resume instead 270 # TODO: use suspend/resume instead
271 # (but this is cancel-safe)
213 local $FREEZE = 1; 272 local $FREEZE = 1;
273
274 my $busy = 1;
275 my @res;
276
277 (Coro::async {
278 @res = eval { $job->() };
279 warn $@ if $@;
280 undef $busy;
214 $coro->prio (Coro::PRIO_MAX); 281 })->prio (Coro::PRIO_MAX);
282
215 while ($busy) { 283 while ($busy) {
216 Coro::cede_notself; 284 Coro::cede_notself;
217 Event::one_event unless Coro::nready; 285 Event::one_event unless Coro::nready;
218 } 286 }
287
288 wantarray ? @res : $res[0]
219 } else { 289 } else {
220 $coro->join; 290 # we are in another coroutine, how wonderful, everything just works
291
292 $job->()
221 } 293 }
222
223 wantarray ? @res : $res[0]
224} 294}
225 295
226=item $coro = cf::coro { BLOCK } 296=item $coro = cf::coro { BLOCK }
227 297
228Creates and returns a new coro. This coro is automcatially being canceled 298Creates and returns a new coro. This coro is automcatially being canceled
… …
252 my $runtime = cf::localdir . "/runtime"; 322 my $runtime = cf::localdir . "/runtime";
253 323
254 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 324 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
255 or return; 325 or return;
256 326
257 my $value = $cf::RUNTIME; 327 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock
258 (aio_write $fh, 0, (length $value), $value, 0) <= 0 328 (aio_write $fh, 0, (length $value), $value, 0) <= 0
259 and return; 329 and return;
260 330
261 aio_fsync $fh 331 aio_fsync $fh
262 and return; 332 and return;
… …
283 353
284 $path = $path->as_string if ref $path; 354 $path = $path->as_string if ref $path;
285 355
286 my $self = bless { }, $class; 356 my $self = bless { }, $class;
287 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
288 if ($path =~ s{^\?random/}{}) { 368 } elsif ($path =~ s{^\?random/}{}) {
289 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data; 369 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
290 $self->{random} = cf::from_json $data; 370 $self->{random} = cf::from_json $data;
291 } else { 371 } else {
292 if ($path =~ s{^~([^/]+)?}{}) { 372 if ($path =~ s{^~([^/]+)?}{}) {
293 $self->{user_rel} = 1; 373 $self->{user_rel} = 1;
… …
798 or return; 878 or return;
799 879
800 unless (aio_stat "$filename.pst") { 880 unless (aio_stat "$filename.pst") {
801 (aio_load "$filename.pst", $av) >= 0 881 (aio_load "$filename.pst", $av) >= 0
802 or return; 882 or return;
803 $av = eval { (Storable::thaw <$av>)->{objs} }; 883 $av = eval { (Storable::thaw $av)->{objs} };
804 } 884 }
805 885
886 warn sprintf "loading %s (%d)\n",
887 $filename, length $data, scalar @{$av || []};#d#
806 return ($data, $av); 888 return ($data, $av);
807} 889}
808 890
809############################################################################# 891#############################################################################
810# command handling &c 892# command handling &c
… …
1046use Fcntl; 1128use Fcntl;
1047use Coro::AIO; 1129use Coro::AIO;
1048 1130
1049our $MAX_RESET = 7200; 1131our $MAX_RESET = 7200;
1050our $DEFAULT_RESET = 3600; 1132our $DEFAULT_RESET = 3600;
1051$MAX_RESET = 10;#d#
1052$DEFAULT_RESET = 10;#d#
1053 1133
1054sub generate_random_map { 1134sub generate_random_map {
1055 my ($path, $rmp) = @_; 1135 my ($path, $rmp) = @_;
1056 1136
1057 # mit "rum" bekleckern, nicht 1137 # mit "rum" bekleckern, nicht
… …
1090 1170
1091 $map->load_header ($path) 1171 $map->load_header ($path)
1092 or return; 1172 or return;
1093 1173
1094 $map->{load_path} = $path; 1174 $map->{load_path} = $path;
1095 use Data::Dumper; warn Dumper $map;#d#
1096 1175
1097 $map 1176 $map
1098} 1177}
1099 1178
1100sub find_map { 1179sub find_map {
1101 my ($path, $origin) = @_; 1180 my ($path, $origin) = @_;
1102 1181
1103 #warn "find_map<$path,$origin>\n";#d# 1182 #warn "find_map<$path,$origin>\n";#d#
1104 1183
1105 $path = ref $path ? $path : new cf::path $path, $origin && $origin->path; 1184 $path = new cf::path $path, $origin && $origin->path;
1106 my $key = $path->as_string; 1185 my $key = $path->as_string;
1107 1186
1187 cf::lock_wait "map_find:$key";
1188
1108 $cf::MAP{$key} || do { 1189 $cf::MAP{$key} || do {
1190 my $guard = cf::lock_acquire "map_find:$key";
1191
1109 # do it the slow way 1192 # do it the slow way
1110 my $map = try_load_header $path->save_path; 1193 my $map = try_load_header $path->save_path;
1111 1194
1112 if ($map) { 1195 if ($map) {
1113 # safety 1196 # safety
… …
1130 $map->per_player (0) if $path->{user_rel}; 1213 $map->per_player (0) if $path->{user_rel};
1131 } 1214 }
1132 1215
1133 $map->path ($key); 1216 $map->path ($key);
1134 $map->{path} = $path; 1217 $map->{path} = $path;
1218 $map->{last_save} = $cf::RUNTIME;
1135 $map->last_access ($cf::RUNTIME); 1219 $map->last_access ($cf::RUNTIME);
1136 1220
1137 $map->reset if $map->should_reset; 1221 if ($map->should_reset) {
1222 $map->reset;
1223 $map = find_map $path;
1224 }
1138 1225
1139 $cf::MAP{$key} = $map 1226 $cf::MAP{$key} = $map
1140 } 1227 }
1141} 1228}
1142 1229
1143sub load { 1230sub load {
1144 my ($self) = @_; 1231 my ($self) = @_;
1145 1232
1233 my $path = $self->{path};
1234 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1235
1146 return if $self->in_memory != cf::MAP_SWAPPED; 1236 return if $self->in_memory != cf::MAP_SWAPPED;
1147 1237
1148 $self->in_memory (cf::MAP_LOADING); 1238 $self->in_memory (cf::MAP_LOADING);
1149
1150 my $path = $self->{path};
1151 1239
1152 $self->alloc; 1240 $self->alloc;
1153 $self->load_objects ($self->{load_path}, 1) 1241 $self->load_objects ($self->{load_path}, 1)
1154 or return; 1242 or return;
1155 1243
1156 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) if delete $self->{load_original}; 1244 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1245 if delete $self->{load_original};
1157 1246
1158 if (my $uniq = $path->uniq_path) { 1247 if (my $uniq = $path->uniq_path) {
1159 utf8::encode $uniq; 1248 utf8::encode $uniq;
1160 if (aio_open $uniq, O_RDONLY, 0) { 1249 if (aio_open $uniq, O_RDONLY, 0) {
1161 $self->clear_unique_items; 1250 $self->clear_unique_items;
… …
1196} 1285}
1197 1286
1198sub save { 1287sub save {
1199 my ($self) = @_; 1288 my ($self) = @_;
1200 1289
1290 $self->{last_save} = $cf::RUNTIME;
1291
1292 return unless $self->dirty;
1293
1201 my $save = $self->{path}->save_path; utf8::encode $save; 1294 my $save = $self->{path}->save_path; utf8::encode $save;
1202 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1295 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1203 1296
1204 $self->{last_save} = $cf::RUNTIME;
1205
1206 return unless $self->dirty;
1207
1208 $self->{load_path} = $save; 1297 $self->{load_path} = $save;
1209 1298
1210 return if $self->{deny_save}; 1299 return if $self->{deny_save};
1211
1212 warn "saving map ", $self->path;
1213 1300
1214 if ($uniq) { 1301 if ($uniq) {
1215 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1302 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1216 $self->save_objects ($uniq, cf::IO_UNIQUES); 1303 $self->save_objects ($uniq, cf::IO_UNIQUES);
1217 } else { 1304 } else {
… …
1229 $self->save; 1316 $self->save;
1230 $self->clear; 1317 $self->clear;
1231 $self->in_memory (cf::MAP_SWAPPED); 1318 $self->in_memory (cf::MAP_SWAPPED);
1232} 1319}
1233 1320
1321sub reset_at {
1322 my ($self) = @_;
1323
1324 # TODO: safety, remove and allow resettable per-player maps
1325 return 1e99 if $self->{path}{user_rel};
1326 return 1e99 if $self->{deny_reset};
1327
1328 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1329 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1330
1331 $time + $to
1332}
1333
1234sub should_reset { 1334sub should_reset {
1235 my ($map) = @_; 1335 my ($self) = @_;
1236 1336
1237 # TODO: safety, remove and allow resettable per-player maps 1337 $self->reset_at <= $cf::RUNTIME
1238 return if $map->{path}{user_rel};#d#
1239 return if $map->{deny_reset};
1240 #return unless $map->reset_timeout;
1241
1242 my $time = $map->fixed_resettime ? $map->{instantiate_time} : $map->last_access;
1243 my $to = $map->reset_timeout || $DEFAULT_RESET;
1244 $to = $MAX_RESET if $to > $MAX_RESET;
1245
1246 $time + $to < $cf::RUNTIME
1247} 1338}
1248 1339
1249sub unlink_save { 1340sub unlink_save {
1250 my ($self) = @_; 1341 my ($self) = @_;
1251 1342
1252 utf8::encode (my $save = $self->{path}->save_path); 1343 utf8::encode (my $save = $self->{path}->save_path);
1253 aioreq_pri 3; IO::AIO::aio_unlink $save; 1344 aioreq_pri 3; IO::AIO::aio_unlink $save;
1254 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst"; 1345 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1255} 1346}
1256 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
1257sub reset { 1361sub reset {
1258 my ($self) = @_; 1362 my ($self) = @_;
1259 1363
1260 return if $self->players; 1364 return if $self->players;
1261 return if $self->{path}{user_rel};#d# 1365 return if $self->{path}{user_rel};#d#
… …
1266 1370
1267 $_->clear_links_to ($self) for values %cf::MAP; 1371 $_->clear_links_to ($self) for values %cf::MAP;
1268 1372
1269 $self->unlink_save; 1373 $self->unlink_save;
1270 $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
1271} 1386}
1272 1387
1273sub customise_for { 1388sub customise_for {
1274 my ($map, $ob) = @_; 1389 my ($map, $ob) = @_;
1275 1390
… …
1340 (ref $cf::CFG{"may_$access"} 1455 (ref $cf::CFG{"may_$access"}
1341 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 1456 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
1342 : $cf::CFG{"may_$access"}) 1457 : $cf::CFG{"may_$access"})
1343} 1458}
1344 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
1345sub cf::object::player::enter_link { 1478sub cf::object::player::enter_link {
1346 my ($self) = @_; 1479 my ($self) = @_;
1347 1480
1481 $self->deactivate_recursive;
1482
1348 return if $self->map == $LINK_MAP; 1483 return if $self->map == $LINK_MAP;
1349 1484
1350 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1485 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1351 if $self->map; 1486 if $self->map;
1352 1487
1353 $self->enter_map ($LINK_MAP, 20, 20); 1488 $self->enter_map ($LINK_MAP, 20, 20);
1354 $self->deactivate_recursive;
1355} 1489}
1356 1490
1357sub cf::object::player::leave_link { 1491sub cf::object::player::leave_link {
1358 my ($self, $map, $x, $y) = @_; 1492 my ($self, $map, $x, $y) = @_;
1359 1493
1360 my $link_pos = delete $self->{_link_pos}; 1494 my $link_pos = delete $self->{_link_pos};
1361 1495
1362 unless ($map) { 1496 unless ($map) {
1363 $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1364
1365 # restore original map position 1497 # restore original map position
1366 ($map, $x, $y) = @{ $link_pos || [] }; 1498 ($map, $x, $y) = @{ $link_pos || [] };
1367 $map = cf::map::find_map $map; 1499 $map = cf::map::find_map $map;
1368 1500
1369 unless ($map) { 1501 unless ($map) {
… …
1384 1516
1385 $self->activate_recursive; 1517 $self->activate_recursive;
1386 $self->enter_map ($map, $x, $y); 1518 $self->enter_map ($map, $x, $y);
1387} 1519}
1388 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
1389=item $player_object->goto_map ($map, $x, $y) 1549=item $player_object->goto_map ($path, $x, $y)
1390 1550
1391=cut 1551=cut
1392 1552
1393sub cf::object::player::goto_map { 1553sub cf::object::player::goto_map {
1394 my ($self, $path, $x, $y) = @_; 1554 my ($self, $path, $x, $y) = @_;
… …
1399 $path = new cf::path $path; 1559 $path = new cf::path $path;
1400 1560
1401 my $map = cf::map::find_map $path->as_string; 1561 my $map = cf::map::find_map $path->as_string;
1402 $map = $map->customise_for ($self) if $map; 1562 $map = $map->customise_for ($self) if $map;
1403 1563
1404 warn "entering ", $map->path, " at ($x, $y)\n" 1564# warn "entering ", $map->path, " at ($x, $y)\n"
1405 if $map; 1565# if $map;
1566
1567 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1406 1568
1407 $self->leave_link ($map, $x, $y); 1569 $self->leave_link ($map, $x, $y);
1408 })->prio (1); 1570 })->prio (1);
1409} 1571}
1410 1572
… …
1751 1913
1752{ 1914{
1753 my $path = cf::localdir . "/database.pst"; 1915 my $path = cf::localdir . "/database.pst";
1754 1916
1755 sub db_load() { 1917 sub db_load() {
1756 warn "loading database $path\n";#d# remove later
1757 $DB = stat $path ? Storable::retrieve $path : { }; 1918 $DB = stat $path ? Storable::retrieve $path : { };
1758 } 1919 }
1759 1920
1760 my $pid; 1921 my $pid;
1761 1922
1762 sub db_save() { 1923 sub db_save() {
1763 warn "saving database $path\n";#d# remove later
1764 waitpid $pid, 0 if $pid; 1924 waitpid $pid, 0 if $pid;
1765 if (0 == ($pid = fork)) { 1925 if (0 == ($pid = fork)) {
1766 $DB->{_meta}{version} = 1; 1926 $DB->{_meta}{version} = 1;
1767 Storable::nstore $DB, "$path~"; 1927 Storable::nstore $DB, "$path~";
1768 rename "$path~", $path; 1928 rename "$path~", $path;
… …
1821} 1981}
1822 1982
1823sub main { 1983sub main {
1824 # we must not ever block the main coroutine 1984 # we must not ever block the main coroutine
1825 local $Coro::idle = sub { 1985 local $Coro::idle = sub {
1826 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#
1827 (Coro::unblock_sub { 1987 (Coro::unblock_sub {
1828 Event::one_event; 1988 Event::one_event;
1829 })->(); 1989 })->();
1830 }; 1990 };
1831 1991

Diff Legend

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