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.128 by root, Wed Jan 3 00:28:47 2007 UTC

… …
8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3; 13use Coro 3.3 ();
14use Coro::Event; 14use Coro::Event;
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
… …
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
250=item cf::async { BLOCK }
251
252Like C<Coro::async>, but runs the given BLOCK in an eval and only logs the
253error instead of exiting the server in case of a problem.
254
255=cut
256
257sub async(&) {
258 my ($cb) = @_;
259
260 Coro::async {
261 eval { $cb->() };
262 warn $@ if $@;
263 }
264}
265
186=item cf::sync_job { BLOCK } 266=item cf::sync_job { BLOCK }
187 267
188The design of crossfire+ requires that the main coro ($Coro::main) is 268The design of crossfire+ requires that the main coro ($Coro::main) is
189always able to handle events or runnable, as crossfire+ is only partly 269always 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. 270reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable.
… …
237=cut 317=cut
238 318
239sub coro(&) { 319sub coro(&) {
240 my $cb = shift; 320 my $cb = shift;
241 321
242 my $coro; $coro = async { 322 my $coro = &cf::async ($cb);
243 eval {
244 $cb->();
245 };
246 warn $@ if $@;
247 };
248 323
249 $coro->on_destroy (sub { 324 $coro->on_destroy (sub {
250 delete $EXT_CORO{$coro+0}; 325 delete $EXT_CORO{$coro+0};
251 }); 326 });
252 $EXT_CORO{$coro+0} = $coro; 327 $EXT_CORO{$coro+0} = $coro;
… …
289 364
290 $path = $path->as_string if ref $path; 365 $path = $path->as_string if ref $path;
291 366
292 my $self = bless { }, $class; 367 my $self = bless { }, $class;
293 368
369 # {... are special paths that are not touched
370 # ?xxx/... are special absolute paths
371 # ?random/... random maps
372 # /! non-realised random map exit
373 # /... normal maps
374 # ~/... per-player maps without a specific player (DO NOT USE)
375 # ~user/... per-player map of a specific user
376
377 if ($path =~ /^{/) {
378 # fine as it is
294 if ($path =~ s{^\?random/}{}) { 379 } elsif ($path =~ s{^\?random/}{}) {
295 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data; 380 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
296 $self->{random} = cf::from_json $data; 381 $self->{random} = cf::from_json $data;
297 } else { 382 } else {
298 if ($path =~ s{^~([^/]+)?}{}) { 383 if ($path =~ s{^~([^/]+)?}{}) {
299 $self->{user_rel} = 1; 384 $self->{user_rel} = 1;
… …
807 (aio_load "$filename.pst", $av) >= 0 892 (aio_load "$filename.pst", $av) >= 0
808 or return; 893 or return;
809 $av = eval { (Storable::thaw $av)->{objs} }; 894 $av = eval { (Storable::thaw $av)->{objs} };
810 } 895 }
811 896
897 warn sprintf "loading %s (%d)\n",
898 $filename, length $data, scalar @{$av || []};#d#
812 return ($data, $av); 899 return ($data, $av);
813} 900}
814 901
815############################################################################# 902#############################################################################
816# command handling &c 903# command handling &c
… …
1077# and all this just because we cannot iterate over 1164# and all this just because we cannot iterate over
1078# all maps in C++... 1165# all maps in C++...
1079sub change_all_map_light { 1166sub change_all_map_light {
1080 my ($change) = @_; 1167 my ($change) = @_;
1081 1168
1082 $_->change_map_light ($change) for values %cf::MAP; 1169 $_->change_map_light ($change)
1170 for grep $_->outdoor, values %cf::MAP;
1083} 1171}
1084 1172
1085sub try_load_header($) { 1173sub try_load_header($) {
1086 my ($path) = @_; 1174 my ($path) = @_;
1087 1175
… …
1098 $map->{load_path} = $path; 1186 $map->{load_path} = $path;
1099 1187
1100 $map 1188 $map
1101} 1189}
1102 1190
1191sub find_map;
1103sub find_map { 1192sub find_map {
1104 my ($path, $origin) = @_; 1193 my ($path, $origin) = @_;
1105 1194
1106 #warn "find_map<$path,$origin>\n";#d# 1195 #warn "find_map<$path,$origin>\n";#d#
1107 1196
1108 $path = new cf::path $path, $origin && $origin->path; 1197 $path = new cf::path $path, $origin && $origin->path;
1109 my $key = $path->as_string; 1198 my $key = $path->as_string;
1110 1199
1200 cf::lock_wait "map_find:$key";
1201
1111 $cf::MAP{$key} || do { 1202 $cf::MAP{$key} || do {
1203 my $guard = cf::lock_acquire "map_find:$key";
1204
1112 # do it the slow way 1205 # do it the slow way
1113 my $map = try_load_header $path->save_path; 1206 my $map = try_load_header $path->save_path;
1114 1207
1115 if ($map) { 1208 if ($map) {
1116 # safety 1209 # safety
… …
1133 $map->per_player (0) if $path->{user_rel}; 1226 $map->per_player (0) if $path->{user_rel};
1134 } 1227 }
1135 1228
1136 $map->path ($key); 1229 $map->path ($key);
1137 $map->{path} = $path; 1230 $map->{path} = $path;
1231 $map->{last_save} = $cf::RUNTIME;
1138 $map->last_access ($cf::RUNTIME); 1232 $map->last_access ($cf::RUNTIME);
1139 1233
1140 if ($map->should_reset) { 1234 if ($map->should_reset) {
1141 $map->reset; 1235 $map->reset;
1236 undef $guard;
1142 $map = find_map $path; 1237 $map = find_map $path
1238 or return;
1143 } 1239 }
1144 1240
1145 $cf::MAP{$key} = $map 1241 $cf::MAP{$key} = $map
1146 } 1242 }
1147} 1243}
1148 1244
1149sub load { 1245sub load {
1150 my ($self) = @_; 1246 my ($self) = @_;
1151 1247
1248 my $path = $self->{path};
1249 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1250
1152 return if $self->in_memory != cf::MAP_SWAPPED; 1251 return if $self->in_memory != cf::MAP_SWAPPED;
1153 1252
1154 $self->in_memory (cf::MAP_LOADING); 1253 $self->in_memory (cf::MAP_LOADING);
1155
1156 my $path = $self->{path};
1157 1254
1158 $self->alloc; 1255 $self->alloc;
1159 $self->load_objects ($self->{load_path}, 1) 1256 $self->load_objects ($self->{load_path}, 1)
1160 or return; 1257 or return;
1161 1258
… …
1203} 1300}
1204 1301
1205sub save { 1302sub save {
1206 my ($self) = @_; 1303 my ($self) = @_;
1207 1304
1305 $self->{last_save} = $cf::RUNTIME;
1306
1307 return unless $self->dirty;
1308
1208 my $save = $self->{path}->save_path; utf8::encode $save; 1309 my $save = $self->{path}->save_path; utf8::encode $save;
1209 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1310 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1210
1211 $self->{last_save} = $cf::RUNTIME;
1212
1213 return unless $self->dirty;
1214 1311
1215 $self->{load_path} = $save; 1312 $self->{load_path} = $save;
1216 1313
1217 return if $self->{deny_save}; 1314 return if $self->{deny_save};
1218 1315
… …
1238 1335
1239sub reset_at { 1336sub reset_at {
1240 my ($self) = @_; 1337 my ($self) = @_;
1241 1338
1242 # TODO: safety, remove and allow resettable per-player maps 1339 # TODO: safety, remove and allow resettable per-player maps
1243 return 1e100 if $self->{path}{user_rel}; 1340 return 1e99 if $self->{path}{user_rel};
1244 return 1e100 if $self->{deny_reset}; 1341 return 1e99 if $self->{deny_reset};
1245 1342
1246 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1343 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1247 my $to = $self->reset_timeout || $DEFAULT_RESET; 1344 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1248 $to = $MAX_RESET if $to > $MAX_RESET;
1249 1345
1250 $time + $to 1346 $time + $to
1251} 1347}
1252 1348
1253sub should_reset { 1349sub should_reset {
… …
1269 1365
1270 $self->unlink_save; 1366 $self->unlink_save;
1271 1367
1272 delete $cf::MAP{$self->path}; 1368 delete $cf::MAP{$self->path};
1273 $self->{path} = new cf::path $new_path; 1369 $self->{path} = new cf::path $new_path;
1274 $self->path ($self->{path}->path); 1370 $self->path ($self->{path}->as_string);
1275 $cf::MAP{$self->path} = $self; 1371 $cf::MAP{$self->path} = $self;
1276 1372
1277 $self->save; 1373 $self->save;
1278} 1374}
1279 1375
… …
1289 1385
1290 $_->clear_links_to ($self) for values %cf::MAP; 1386 $_->clear_links_to ($self) for values %cf::MAP;
1291 1387
1292 $self->unlink_save; 1388 $self->unlink_save;
1293 $self->destroy; 1389 $self->destroy;
1390}
1391
1392my $nuke_counter = "aaaa";
1393
1394sub nuke {
1395 my ($self) = @_;
1396
1397 $self->{deny_save} = 1;
1398 $self->reset_timeout (1);
1399 $self->rename ("{nuke}/" . ($nuke_counter++));
1400 $self->reset; # polite request, might not happen
1294} 1401}
1295 1402
1296sub customise_for { 1403sub customise_for {
1297 my ($map, $ob) = @_; 1404 my ($map, $ob) = @_;
1298 1405
… …
1363 (ref $cf::CFG{"may_$access"} 1470 (ref $cf::CFG{"may_$access"}
1364 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 1471 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
1365 : $cf::CFG{"may_$access"}) 1472 : $cf::CFG{"may_$access"})
1366} 1473}
1367 1474
1475=item $player_object->enter_link
1476
1477Freezes the player and moves him/her to a special map (C<{link}>).
1478
1479The player should be reaosnably safe there for short amounts of time. You
1480I<MUST> call C<leave_link> as soon as possible, though.
1481
1482=item $player_object->leave_link ($map, $x, $y)
1483
1484Moves the player out of the specila link map onto the given map. If the
1485map is not valid (or omitted), the player will be moved back to the
1486location he/she was before the call to C<enter_link>, or, if that fails,
1487to the emergency map position.
1488
1489Might block.
1490
1491=cut
1492
1368sub cf::object::player::enter_link { 1493sub cf::object::player::enter_link {
1369 my ($self) = @_; 1494 my ($self) = @_;
1370 1495
1496 $self->deactivate_recursive;
1497
1371 return if $self->map == $LINK_MAP; 1498 return if $self->map == $LINK_MAP;
1372 1499
1373 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1500 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1374 if $self->map; 1501 if $self->map;
1375 1502
1376 $self->enter_map ($LINK_MAP, 20, 20); 1503 $self->enter_map ($LINK_MAP, 20, 20);
1377 $self->deactivate_recursive;
1378} 1504}
1379 1505
1380sub cf::object::player::leave_link { 1506sub cf::object::player::leave_link {
1381 my ($self, $map, $x, $y) = @_; 1507 my ($self, $map, $x, $y) = @_;
1382 1508
1383 my $link_pos = delete $self->{_link_pos}; 1509 my $link_pos = delete $self->{_link_pos};
1384 1510
1385 unless ($map) { 1511 unless ($map) {
1386 $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1387
1388 # restore original map position 1512 # restore original map position
1389 ($map, $x, $y) = @{ $link_pos || [] }; 1513 ($map, $x, $y) = @{ $link_pos || [] };
1390 $map = cf::map::find_map $map; 1514 $map = cf::map::find_map $map;
1391 1515
1392 unless ($map) { 1516 unless ($map) {
… …
1407 1531
1408 $self->activate_recursive; 1532 $self->activate_recursive;
1409 $self->enter_map ($map, $x, $y); 1533 $self->enter_map ($map, $x, $y);
1410} 1534}
1411 1535
1536cf::player->attach (
1537 on_logout => sub {
1538 my ($pl) = @_;
1539
1540 # abort map switching before logout
1541 if ($pl->ob->{_link_pos}) {
1542 cf::sync_job {
1543 $pl->ob->leave_link
1544 };
1545 }
1546 },
1547 on_login => sub {
1548 my ($pl) = @_;
1549
1550 # try to abort aborted map switching on player login :)
1551 # should happen only on crashes
1552 if ($pl->ob->{_link_pos}) {
1553 $pl->ob->enter_link;
1554 cf::async {
1555 # we need this sleep as the login has a concurrent enter_exit running
1556 # and this sleep increases chances of the player not ending up in scorn
1557 Coro::Timer::sleep 1;
1558 $pl->ob->leave_link;
1559 };
1560 }
1561 },
1562);
1563
1412=item $player_object->goto_map ($map, $x, $y) 1564=item $player_object->goto_map ($path, $x, $y)
1413 1565
1414=cut 1566=cut
1415 1567
1416sub cf::object::player::goto_map { 1568sub cf::object::player::goto_map {
1417 my ($self, $path, $x, $y) = @_; 1569 my ($self, $path, $x, $y) = @_;
1418 1570
1419 $self->enter_link; 1571 $self->enter_link;
1420 1572
1421 (Coro::async { 1573 (cf::async {
1422 $path = new cf::path $path; 1574 $path = new cf::path $path;
1423 1575
1424 my $map = cf::map::find_map $path->as_string; 1576 my $map = cf::map::find_map $path->as_string;
1425 $map = $map->customise_for ($self) if $map; 1577 $map = $map->customise_for ($self) if $map;
1426 1578
1427 warn "entering ", $map->path, " at ($x, $y)\n" 1579# warn "entering ", $map->path, " at ($x, $y)\n"
1428 if $map; 1580# if $map;
1581
1582 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1429 1583
1430 $self->leave_link ($map, $x, $y); 1584 $self->leave_link ($map, $x, $y);
1431 })->prio (1); 1585 })->prio (1);
1432} 1586}
1433 1587
… …
1486 1640
1487 return unless $self->type == cf::PLAYER; 1641 return unless $self->type == cf::PLAYER;
1488 1642
1489 $self->enter_link; 1643 $self->enter_link;
1490 1644
1491 (Coro::async { 1645 (cf::async {
1492 unless (eval { 1646 unless (eval {
1493
1494 prepare_random_map $exit 1647 prepare_random_map $exit
1495 if $exit->slaying eq "/!"; 1648 if $exit->slaying eq "/!";
1496 1649
1497 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1650 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1498 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1651 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp);
… …
1560 on_reply => sub { 1713 on_reply => sub {
1561 my ($ns, $msg) = @_; 1714 my ($ns, $msg) = @_;
1562 1715
1563 # this weird shuffling is so that direct followup queries 1716 # this weird shuffling is so that direct followup queries
1564 # get handled first 1717 # get handled first
1565 my $queue = delete $ns->{query_queue}; 1718 my $queue = delete $ns->{query_queue}
1719 or return; # be conservative, not sure how that cna happen, but we saw a crash here
1566 1720
1567 (shift @$queue)->[1]->($msg); 1721 (shift @$queue)->[1]->($msg);
1568 1722
1569 push @{ $ns->{query_queue} }, @$queue; 1723 push @{ $ns->{query_queue} }, @$queue;
1570 1724
… …
1587=cut 1741=cut
1588 1742
1589sub cf::client::coro { 1743sub cf::client::coro {
1590 my ($self, $cb) = @_; 1744 my ($self, $cb) = @_;
1591 1745
1592 my $coro; $coro = async { 1746 my $coro = &cf::async ($cb);
1593 eval {
1594 $cb->();
1595 };
1596 warn $@ if $@;
1597 };
1598 1747
1599 $coro->on_destroy (sub { 1748 $coro->on_destroy (sub {
1600 delete $self->{_coro}{$coro+0}; 1749 delete $self->{_coro}{$coro+0};
1601 }); 1750 });
1602 1751
… …
1774 1923
1775{ 1924{
1776 my $path = cf::localdir . "/database.pst"; 1925 my $path = cf::localdir . "/database.pst";
1777 1926
1778 sub db_load() { 1927 sub db_load() {
1779 warn "loading database $path\n";#d# remove later
1780 $DB = stat $path ? Storable::retrieve $path : { }; 1928 $DB = stat $path ? Storable::retrieve $path : { };
1781 } 1929 }
1782 1930
1783 my $pid; 1931 my $pid;
1784 1932
1785 sub db_save() { 1933 sub db_save() {
1786 warn "saving database $path\n";#d# remove later
1787 waitpid $pid, 0 if $pid; 1934 waitpid $pid, 0 if $pid;
1788 if (0 == ($pid = fork)) { 1935 if (0 == ($pid = fork)) {
1789 $DB->{_meta}{version} = 1; 1936 $DB->{_meta}{version} = 1;
1790 Storable::nstore $DB, "$path~"; 1937 Storable::nstore $DB, "$path~";
1791 rename "$path~", $path; 1938 rename "$path~", $path;
… …
1844} 1991}
1845 1992
1846sub main { 1993sub main {
1847 # we must not ever block the main coroutine 1994 # we must not ever block the main coroutine
1848 local $Coro::idle = sub { 1995 local $Coro::idle = sub {
1849 Carp::cluck "FATAL: Coro::idle was called, major BUG\n";#d# 1996 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1850 (Coro::unblock_sub { 1997 (Coro::unblock_sub {
1851 Event::one_event; 1998 Event::one_event;
1852 })->(); 1999 })->();
1853 }; 2000 };
1854 2001
… …
2051 or warn "ERROR: unable to write runtime file: $!"; 2198 or warn "ERROR: unable to write runtime file: $!";
2052 })->(); 2199 })->();
2053 }, 2200 },
2054); 2201);
2055 2202
2203END { cf::emergency_save }
2204
20561 22051
2057 2206

Diff Legend

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