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.113 by root, Mon Jan 1 15:32:40 2007 UTC vs.
Revision 1.123 by root, Tue Jan 2 19:18:33 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;
… …
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 = find_map $path;
1143 } 1226 }
1144 1227
1145 $cf::MAP{$key} = $map 1228 $cf::MAP{$key} = $map
1146 } 1229 }
1147} 1230}
1148 1231
1149sub load { 1232sub load {
1150 my ($self) = @_; 1233 my ($self) = @_;
1151 1234
1235 my $path = $self->{path};
1236 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1237
1152 return if $self->in_memory != cf::MAP_SWAPPED; 1238 return if $self->in_memory != cf::MAP_SWAPPED;
1153 1239
1154 $self->in_memory (cf::MAP_LOADING); 1240 $self->in_memory (cf::MAP_LOADING);
1155
1156 my $path = $self->{path};
1157 1241
1158 $self->alloc; 1242 $self->alloc;
1159 $self->load_objects ($self->{load_path}, 1) 1243 $self->load_objects ($self->{load_path}, 1)
1160 or return; 1244 or return;
1161 1245
… …
1203} 1287}
1204 1288
1205sub save { 1289sub save {
1206 my ($self) = @_; 1290 my ($self) = @_;
1207 1291
1292 $self->{last_save} = $cf::RUNTIME;
1293
1294 return unless $self->dirty;
1295
1208 my $save = $self->{path}->save_path; utf8::encode $save; 1296 my $save = $self->{path}->save_path; utf8::encode $save;
1209 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1297 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1210
1211 $self->{last_save} = $cf::RUNTIME;
1212
1213 return unless $self->dirty;
1214 1298
1215 $self->{load_path} = $save; 1299 $self->{load_path} = $save;
1216 1300
1217 return if $self->{deny_save}; 1301 return if $self->{deny_save};
1218 1302
… …
1238 1322
1239sub reset_at { 1323sub reset_at {
1240 my ($self) = @_; 1324 my ($self) = @_;
1241 1325
1242 # TODO: safety, remove and allow resettable per-player maps 1326 # TODO: safety, remove and allow resettable per-player maps
1243 return 1e100 if $self->{path}{user_rel}; 1327 return 1e99 if $self->{path}{user_rel};
1244 return 1e100 if $self->{deny_reset}; 1328 return 1e99 if $self->{deny_reset};
1245 1329
1246 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1330 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1247 my $to = $self->reset_timeout || $DEFAULT_RESET; 1331 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1248 $to = $MAX_RESET if $to > $MAX_RESET;
1249 1332
1250 $time + $to 1333 $time + $to
1251} 1334}
1252 1335
1253sub should_reset { 1336sub should_reset {
… …
1269 1352
1270 $self->unlink_save; 1353 $self->unlink_save;
1271 1354
1272 delete $cf::MAP{$self->path}; 1355 delete $cf::MAP{$self->path};
1273 $self->{path} = new cf::path $new_path; 1356 $self->{path} = new cf::path $new_path;
1274 $self->path ($self->{path}->path); 1357 $self->path ($self->{path}->as_string);
1275 $cf::MAP{$self->path} = $self; 1358 $cf::MAP{$self->path} = $self;
1276 1359
1277 $self->save; 1360 $self->save;
1278} 1361}
1279 1362
… …
1289 1372
1290 $_->clear_links_to ($self) for values %cf::MAP; 1373 $_->clear_links_to ($self) for values %cf::MAP;
1291 1374
1292 $self->unlink_save; 1375 $self->unlink_save;
1293 $self->destroy; 1376 $self->destroy;
1377}
1378
1379my $nuke_counter = "aaaa";
1380
1381sub nuke {
1382 my ($self) = @_;
1383
1384 $self->{deny_save} = 1;
1385 $self->reset_timeout (1);
1386 $self->rename ("{nuke}/" . ($nuke_counter++));
1387 $self->reset; # polite request, might not happen
1294} 1388}
1295 1389
1296sub customise_for { 1390sub customise_for {
1297 my ($map, $ob) = @_; 1391 my ($map, $ob) = @_;
1298 1392
… …
1363 (ref $cf::CFG{"may_$access"} 1457 (ref $cf::CFG{"may_$access"}
1364 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 1458 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
1365 : $cf::CFG{"may_$access"}) 1459 : $cf::CFG{"may_$access"})
1366} 1460}
1367 1461
1462=item $player_object->enter_link
1463
1464Freezes the player and moves him/her to a special map (C<{link}>).
1465
1466The player should be reaosnably safe there for short amounts of time. You
1467I<MUST> call C<leave_link> as soon as possible, though.
1468
1469=item $player_object->leave_link ($map, $x, $y)
1470
1471Moves the player out of the specila link map onto the given map. If the
1472map is not valid (or omitted), the player will be moved back to the
1473location he/she was before the call to C<enter_link>, or, if that fails,
1474to the emergency map position.
1475
1476Might block.
1477
1478=cut
1479
1368sub cf::object::player::enter_link { 1480sub cf::object::player::enter_link {
1369 my ($self) = @_; 1481 my ($self) = @_;
1370 1482
1483 $self->deactivate_recursive;
1484
1371 return if $self->map == $LINK_MAP; 1485 return if $self->map == $LINK_MAP;
1372 1486
1373 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1487 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1374 if $self->map; 1488 if $self->map;
1375 1489
1376 $self->enter_map ($LINK_MAP, 20, 20); 1490 $self->enter_map ($LINK_MAP, 20, 20);
1377 $self->deactivate_recursive;
1378} 1491}
1379 1492
1380sub cf::object::player::leave_link { 1493sub cf::object::player::leave_link {
1381 my ($self, $map, $x, $y) = @_; 1494 my ($self, $map, $x, $y) = @_;
1382 1495
1383 my $link_pos = delete $self->{_link_pos}; 1496 my $link_pos = delete $self->{_link_pos};
1384 1497
1385 unless ($map) { 1498 unless ($map) {
1386 $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1387
1388 # restore original map position 1499 # restore original map position
1389 ($map, $x, $y) = @{ $link_pos || [] }; 1500 ($map, $x, $y) = @{ $link_pos || [] };
1390 $map = cf::map::find_map $map; 1501 $map = cf::map::find_map $map;
1391 1502
1392 unless ($map) { 1503 unless ($map) {
… …
1407 1518
1408 $self->activate_recursive; 1519 $self->activate_recursive;
1409 $self->enter_map ($map, $x, $y); 1520 $self->enter_map ($map, $x, $y);
1410} 1521}
1411 1522
1523cf::player->attach (
1524 on_logout => sub {
1525 my ($pl) = @_;
1526
1527 # abort map switching before logout
1528 if ($pl->ob->{_link_pos}) {
1529 cf::sync_job {
1530 $pl->ob->leave_link
1531 };
1532 }
1533 },
1534 on_login => sub {
1535 my ($pl) = @_;
1536
1537 # try to abort aborted map switching on player login :)
1538 # should happen only on crashes
1539 if ($pl->ob->{_link_pos}) {
1540 $pl->ob->enter_link;
1541 Coro::async {
1542 # we need this sleep as the login has a concurrent enter_exit running
1543 # and this sleep increases chances of the player not ending up in scorn
1544 Coro::Timer::sleep 1;
1545 $pl->ob->leave_link;
1546 };
1547 }
1548 },
1549);
1550
1412=item $player_object->goto_map ($map, $x, $y) 1551=item $player_object->goto_map ($path, $x, $y)
1413 1552
1414=cut 1553=cut
1415 1554
1416sub cf::object::player::goto_map { 1555sub cf::object::player::goto_map {
1417 my ($self, $path, $x, $y) = @_; 1556 my ($self, $path, $x, $y) = @_;
… …
1422 $path = new cf::path $path; 1561 $path = new cf::path $path;
1423 1562
1424 my $map = cf::map::find_map $path->as_string; 1563 my $map = cf::map::find_map $path->as_string;
1425 $map = $map->customise_for ($self) if $map; 1564 $map = $map->customise_for ($self) if $map;
1426 1565
1427 warn "entering ", $map->path, " at ($x, $y)\n" 1566# warn "entering ", $map->path, " at ($x, $y)\n"
1428 if $map; 1567# if $map;
1568
1569 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1429 1570
1430 $self->leave_link ($map, $x, $y); 1571 $self->leave_link ($map, $x, $y);
1431 })->prio (1); 1572 })->prio (1);
1432} 1573}
1433 1574
… …
1774 1915
1775{ 1916{
1776 my $path = cf::localdir . "/database.pst"; 1917 my $path = cf::localdir . "/database.pst";
1777 1918
1778 sub db_load() { 1919 sub db_load() {
1779 warn "loading database $path\n";#d# remove later
1780 $DB = stat $path ? Storable::retrieve $path : { }; 1920 $DB = stat $path ? Storable::retrieve $path : { };
1781 } 1921 }
1782 1922
1783 my $pid; 1923 my $pid;
1784 1924
1785 sub db_save() { 1925 sub db_save() {
1786 warn "saving database $path\n";#d# remove later
1787 waitpid $pid, 0 if $pid; 1926 waitpid $pid, 0 if $pid;
1788 if (0 == ($pid = fork)) { 1927 if (0 == ($pid = fork)) {
1789 $DB->{_meta}{version} = 1; 1928 $DB->{_meta}{version} = 1;
1790 Storable::nstore $DB, "$path~"; 1929 Storable::nstore $DB, "$path~";
1791 rename "$path~", $path; 1930 rename "$path~", $path;
… …
1844} 1983}
1845 1984
1846sub main { 1985sub main {
1847 # we must not ever block the main coroutine 1986 # we must not ever block the main coroutine
1848 local $Coro::idle = sub { 1987 local $Coro::idle = sub {
1849 Carp::cluck "FATAL: Coro::idle was called, major BUG\n";#d# 1988 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1850 (Coro::unblock_sub { 1989 (Coro::unblock_sub {
1851 Event::one_event; 1990 Event::one_event;
1852 })->(); 1991 })->();
1853 }; 1992 };
1854 1993

Diff Legend

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