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.123 by root, Tue Jan 2 19:18:33 2007 UTC vs.
Revision 1.133 by root, Thu Jan 4 16:19:32 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;
… …
49our $UPTIME; $UPTIME ||= time; 49our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 50our $RUNTIME;
51 51
52our %MAP; # all maps 52our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 53our $LINK_MAP; # the special {link} map
54our $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 54our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 55our %EXT_CORO;
57 56
58binmode STDOUT; 57binmode STDOUT;
59binmode STDERR; 58binmode STDERR;
… …
71mkdir cf::localdir . "/" . cf::uniquedir; 70mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 71mkdir $RANDOM_MAPS;
73 72
74# a special map that is always available 73# a special map that is always available
75our $LINK_MAP; 74our $LINK_MAP;
76 75our $EMERGENCY_POSITION;
77our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37];
78 76
79############################################################################# 77#############################################################################
80 78
81=head2 GLOBAL VARIABLES 79=head2 GLOBAL VARIABLES
82 80
… …
214Wait until the given lock is available and then acquires it and returns 212Wait 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, 213a guard object. If the guard object gets destroyed (goes out of scope,
216for example when the coroutine gets canceled), the lock is automatically 214for example when the coroutine gets canceled), the lock is automatically
217returned. 215returned.
218 216
219Lock names should begin with a unique identifier (for example, find_map 217Lock names should begin with a unique identifier (for example, cf::map::find
220uses map_find and load_map uses map_load). 218uses map_find and cf::map::load uses map_load).
221 219
222=cut 220=cut
223 221
224our %LOCK; 222our %LOCK;
225 223
… …
243 241
244 cf::guard { 242 cf::guard {
245 # wake up all waiters, to be on the safe side 243 # wake up all waiters, to be on the safe side
246 $_->ready for @{ delete $LOCK{$key} }; 244 $_->ready for @{ delete $LOCK{$key} };
247 } 245 }
246}
247
248=item cf::async { BLOCK }
249
250Like C<Coro::async>, but runs the given BLOCK in an eval and only logs the
251error instead of exiting the server in case of a problem.
252
253=cut
254
255sub async(&) {
256 my ($cb) = @_;
257
258 Coro::async {
259 eval { $cb->() };
260 warn $@ if $@;
261 }
262}
263
264sub freeze_mainloop {
265 return unless $TICK_WATCHER->is_active;
266
267 my $guard = guard { $TICK_WATCHER->start };
268 $TICK_WATCHER->stop;
269 $guard
248} 270}
249 271
250=item cf::sync_job { BLOCK } 272=item cf::sync_job { BLOCK }
251 273
252The design of crossfire+ requires that the main coro ($Coro::main) is 274The design of crossfire+ requires that the main coro ($Coro::main) is
… …
267 # this is the main coro, too bad, we have to block 289 # this is the main coro, too bad, we have to block
268 # till the operation succeeds, freezing the server :/ 290 # till the operation succeeds, freezing the server :/
269 291
270 # TODO: use suspend/resume instead 292 # TODO: use suspend/resume instead
271 # (but this is cancel-safe) 293 # (but this is cancel-safe)
272 local $FREEZE = 1; 294 my $freeze_guard = freeze_mainloop;
273 295
274 my $busy = 1; 296 my $busy = 1;
275 my @res; 297 my @res;
276 298
277 (Coro::async { 299 (Coro::async {
… …
301=cut 323=cut
302 324
303sub coro(&) { 325sub coro(&) {
304 my $cb = shift; 326 my $cb = shift;
305 327
306 my $coro; $coro = async { 328 my $coro = &cf::async ($cb);
307 eval {
308 $cb->();
309 };
310 warn $@ if $@;
311 };
312 329
313 $coro->on_destroy (sub { 330 $coro->on_destroy (sub {
314 delete $EXT_CORO{$coro+0}; 331 delete $EXT_CORO{$coro+0};
315 }); 332 });
316 $EXT_CORO{$coro+0} = $coro; 333 $EXT_CORO{$coro+0} = $coro;
… …
1126package cf::map; 1143package cf::map;
1127 1144
1128use Fcntl; 1145use Fcntl;
1129use Coro::AIO; 1146use Coro::AIO;
1130 1147
1131our $MAX_RESET = 7200; 1148our $MAX_RESET = 3600;
1132our $DEFAULT_RESET = 3600; 1149our $DEFAULT_RESET = 3000;
1133 1150
1134sub generate_random_map { 1151sub generate_random_map {
1135 my ($path, $rmp) = @_; 1152 my ($path, $rmp) = @_;
1136 1153
1137 # mit "rum" bekleckern, nicht 1154 # mit "rum" bekleckern, nicht
… …
1175 $map->{load_path} = $path; 1192 $map->{load_path} = $path;
1176 1193
1177 $map 1194 $map
1178} 1195}
1179 1196
1197sub find;
1180sub find_map { 1198sub find {
1181 my ($path, $origin) = @_; 1199 my ($path, $origin) = @_;
1182 1200
1183 #warn "find_map<$path,$origin>\n";#d# 1201 #warn "find<$path,$origin>\n";#d#
1184 1202
1185 $path = new cf::path $path, $origin && $origin->path; 1203 $path = new cf::path $path, $origin && $origin->path;
1186 my $key = $path->as_string; 1204 my $key = $path->as_string;
1187 1205
1188 cf::lock_wait "map_find:$key"; 1206 cf::lock_wait "map_find:$key";
… …
1192 1210
1193 # do it the slow way 1211 # do it the slow way
1194 my $map = try_load_header $path->save_path; 1212 my $map = try_load_header $path->save_path;
1195 1213
1196 if ($map) { 1214 if ($map) {
1215 $map->last_access ((delete $map->{last_access})
1216 || $cf::RUNTIME); #d#
1197 # safety 1217 # safety
1198 $map->{instantiate_time} = $cf::RUNTIME 1218 $map->{instantiate_time} = $cf::RUNTIME
1199 if $map->{instantiate_time} > $cf::RUNTIME; 1219 if $map->{instantiate_time} > $cf::RUNTIME;
1200 } else { 1220 } else {
1201 if (my $rmp = $path->random_map_params) { 1221 if (my $rmp = $path->random_map_params) {
… …
1206 1226
1207 $map or return; 1227 $map or return;
1208 1228
1209 $map->{load_original} = 1; 1229 $map->{load_original} = 1;
1210 $map->{instantiate_time} = $cf::RUNTIME; 1230 $map->{instantiate_time} = $cf::RUNTIME;
1231 $map->last_access ($cf::RUNTIME);
1211 $map->instantiate; 1232 $map->instantiate;
1212 1233
1213 # per-player maps become, after loading, normal maps 1234 # per-player maps become, after loading, normal maps
1214 $map->per_player (0) if $path->{user_rel}; 1235 $map->per_player (0) if $path->{user_rel};
1215 } 1236 }
1216 1237
1217 $map->path ($key); 1238 $map->path ($key);
1218 $map->{path} = $path; 1239 $map->{path} = $path;
1219 $map->{last_save} = $cf::RUNTIME; 1240 $map->{last_save} = $cf::RUNTIME;
1220 $map->last_access ($cf::RUNTIME);
1221 1241
1222 if ($map->should_reset) { 1242 if ($map->should_reset) {
1223 $map->reset; 1243 $map->reset;
1224 undef $guard; 1244 undef $guard;
1225 $map = find_map $path; 1245 $map = find $path
1246 or return;
1226 } 1247 }
1227 1248
1228 $cf::MAP{$key} = $map 1249 $cf::MAP{$key} = $map
1229 } 1250 }
1230} 1251}
… …
1271 } 1292 }
1272 1293
1273 $self->in_memory (cf::MAP_IN_MEMORY); 1294 $self->in_memory (cf::MAP_IN_MEMORY);
1274} 1295}
1275 1296
1276sub load_map_sync { 1297sub find_sync {
1277 my ($path, $origin) = @_; 1298 my ($path, $origin) = @_;
1278 1299
1279 #warn "load_map_sync<$path, $origin>\n";#d# 1300 cf::sync_job { cf::map::find $path, $origin }
1301}
1280 1302
1281 cf::sync_job { 1303sub do_load_sync {
1282 my $map = cf::map::find_map $path, $origin 1304 my ($map) = @_;
1283 or return; 1305
1284 $map->load; 1306 cf::sync_job { $map->load };
1285 $map
1286 }
1287} 1307}
1288 1308
1289sub save { 1309sub save {
1290 my ($self) = @_; 1310 my ($self) = @_;
1291 1311
… …
1297 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1317 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1298 1318
1299 $self->{load_path} = $save; 1319 $self->{load_path} = $save;
1300 1320
1301 return if $self->{deny_save}; 1321 return if $self->{deny_save};
1322
1323 local $self->{last_access} = $self->last_access;#d#
1302 1324
1303 if ($uniq) { 1325 if ($uniq) {
1304 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1326 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1305 $self->save_objects ($uniq, cf::IO_UNIQUES); 1327 $self->save_objects ($uniq, cf::IO_UNIQUES);
1306 } else { 1328 } else {
… …
1309} 1331}
1310 1332
1311sub swap_out { 1333sub swap_out {
1312 my ($self) = @_; 1334 my ($self) = @_;
1313 1335
1336 # save first because save cedes
1337 $self->save;
1338
1314 return if $self->players; 1339 return if $self->players;
1315 return if $self->in_memory != cf::MAP_IN_MEMORY; 1340 return if $self->in_memory != cf::MAP_IN_MEMORY;
1316 return if $self->{deny_save}; 1341 return if $self->{deny_save};
1317 1342
1318 $self->save;
1319 $self->clear; 1343 $self->clear;
1320 $self->in_memory (cf::MAP_SWAPPED); 1344 $self->in_memory (cf::MAP_SWAPPED);
1321} 1345}
1322 1346
1323sub reset_at { 1347sub reset_at {
… …
1389 1413
1390sub customise_for { 1414sub customise_for {
1391 my ($map, $ob) = @_; 1415 my ($map, $ob) = @_;
1392 1416
1393 if ($map->per_player) { 1417 if ($map->per_player) {
1394 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1418 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1395 } 1419 }
1396 1420
1397 $map 1421 $map
1398} 1422}
1399 1423
1400sub emergency_save { 1424sub emergency_save {
1401 local $cf::FREEZE = 1; 1425 my $freeze_guard = cf::freeze_mainloop;
1402 1426
1403 warn "enter emergency map save\n"; 1427 warn "enter emergency map save\n";
1404 1428
1405 cf::sync_job { 1429 cf::sync_job {
1406 warn "begin emergency map save\n"; 1430 warn "begin emergency map save\n";
… …
1496 my $link_pos = delete $self->{_link_pos}; 1520 my $link_pos = delete $self->{_link_pos};
1497 1521
1498 unless ($map) { 1522 unless ($map) {
1499 # restore original map position 1523 # restore original map position
1500 ($map, $x, $y) = @{ $link_pos || [] }; 1524 ($map, $x, $y) = @{ $link_pos || [] };
1501 $map = cf::map::find_map $map; 1525 $map = cf::map::find $map;
1502 1526
1503 unless ($map) { 1527 unless ($map) {
1504 ($map, $x, $y) = @$EMERGENCY_POSITION; 1528 ($map, $x, $y) = @$EMERGENCY_POSITION;
1505 $map = cf::map::find_map $map 1529 $map = cf::map::find $map
1506 or die "FATAL: cannot load emergency map\n"; 1530 or die "FATAL: cannot load emergency map\n";
1507 } 1531 }
1508 } 1532 }
1509 1533
1510 ($x, $y) = (-1, -1) 1534 ($x, $y) = (-1, -1)
… …
1536 1560
1537 # try to abort aborted map switching on player login :) 1561 # try to abort aborted map switching on player login :)
1538 # should happen only on crashes 1562 # should happen only on crashes
1539 if ($pl->ob->{_link_pos}) { 1563 if ($pl->ob->{_link_pos}) {
1540 $pl->ob->enter_link; 1564 $pl->ob->enter_link;
1541 Coro::async { 1565 cf::async {
1542 # we need this sleep as the login has a concurrent enter_exit running 1566 # 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 1567 # and this sleep increases chances of the player not ending up in scorn
1544 Coro::Timer::sleep 1; 1568 Coro::Timer::sleep 1;
1545 $pl->ob->leave_link; 1569 $pl->ob->leave_link;
1546 }; 1570 };
… …
1555sub cf::object::player::goto_map { 1579sub cf::object::player::goto_map {
1556 my ($self, $path, $x, $y) = @_; 1580 my ($self, $path, $x, $y) = @_;
1557 1581
1558 $self->enter_link; 1582 $self->enter_link;
1559 1583
1560 (Coro::async { 1584 (cf::async {
1561 $path = new cf::path $path; 1585 $path = new cf::path $path;
1562 1586
1563 my $map = cf::map::find_map $path->as_string; 1587 my $map = cf::map::find $path->as_string;
1564 $map = $map->customise_for ($self) if $map; 1588 $map = $map->customise_for ($self) if $map;
1565 1589
1566# warn "entering ", $map->path, " at ($x, $y)\n" 1590# warn "entering ", $map->path, " at ($x, $y)\n"
1567# if $map; 1591# if $map;
1568 1592
… …
1627 1651
1628 return unless $self->type == cf::PLAYER; 1652 return unless $self->type == cf::PLAYER;
1629 1653
1630 $self->enter_link; 1654 $self->enter_link;
1631 1655
1632 (Coro::async { 1656 (cf::async {
1657 $self->deactivate_recursive; # just to be sure
1633 unless (eval { 1658 unless (eval {
1634
1635 prepare_random_map $exit 1659 prepare_random_map $exit
1636 if $exit->slaying eq "/!"; 1660 if $exit->slaying eq "/!";
1637 1661
1638 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1662 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1639 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1663 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp);
… …
1701 on_reply => sub { 1725 on_reply => sub {
1702 my ($ns, $msg) = @_; 1726 my ($ns, $msg) = @_;
1703 1727
1704 # this weird shuffling is so that direct followup queries 1728 # this weird shuffling is so that direct followup queries
1705 # get handled first 1729 # get handled first
1706 my $queue = delete $ns->{query_queue}; 1730 my $queue = delete $ns->{query_queue}
1731 or return; # be conservative, not sure how that can happen, but we saw a crash here
1707 1732
1708 (shift @$queue)->[1]->($msg); 1733 (shift @$queue)->[1]->($msg);
1709 1734
1710 push @{ $ns->{query_queue} }, @$queue; 1735 push @{ $ns->{query_queue} }, @$queue;
1711 1736
… …
1728=cut 1753=cut
1729 1754
1730sub cf::client::coro { 1755sub cf::client::coro {
1731 my ($self, $cb) = @_; 1756 my ($self, $cb) = @_;
1732 1757
1733 my $coro; $coro = async { 1758 my $coro = &cf::async ($cb);
1734 eval {
1735 $cb->();
1736 };
1737 warn $@ if $@;
1738 };
1739 1759
1740 $coro->on_destroy (sub { 1760 $coro->on_destroy (sub {
1741 delete $self->{_coro}{$coro+0}; 1761 delete $self->{_coro}{$coro+0};
1742 }); 1762 });
1743 1763
… …
1978 open my $fh, "<:utf8", cf::confdir . "/config" 1998 open my $fh, "<:utf8", cf::confdir . "/config"
1979 or return; 1999 or return;
1980 2000
1981 local $/; 2001 local $/;
1982 *CFG = YAML::Syck::Load <$fh>; 2002 *CFG = YAML::Syck::Load <$fh>;
2003
2004 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2005
2006 if (exists $CFG{mlockall}) {
2007 eval {
2008 $CFG{mlockall} ? &mlockall : &munlockall
2009 and die "WARNING: m(un)lockall failed: $!\n";
2010 };
2011 warn $@ if $@;
2012 }
1983} 2013}
1984 2014
1985sub main { 2015sub main {
1986 # we must not ever block the main coroutine 2016 # we must not ever block the main coroutine
1987 local $Coro::idle = sub { 2017 local $Coro::idle = sub {
… …
2007 return; 2037 return;
2008 } 2038 }
2009 2039
2010 warn "reloading..."; 2040 warn "reloading...";
2011 2041
2012 local $FREEZE = 1; 2042 my $guard = freeze_mainloop;
2013 cf::emergency_save; 2043 cf::emergency_save;
2014 2044
2015 eval { 2045 eval {
2016 # if anything goes wrong in here, we should simply crash as we already saved 2046 # if anything goes wrong in here, we should simply crash as we already saved
2017 2047
… …
2153 reentrant => 0, 2183 reentrant => 0,
2154 prio => 0, 2184 prio => 0,
2155 at => $NEXT_TICK || $TICK, 2185 at => $NEXT_TICK || $TICK,
2156 data => WF_AUTOCANCEL, 2186 data => WF_AUTOCANCEL,
2157 cb => sub { 2187 cb => sub {
2158 unless ($FREEZE) {
2159 cf::server_tick; # one server iteration 2188 cf::server_tick; # one server iteration
2160 $RUNTIME += $TICK; 2189 $RUNTIME += $TICK;
2161 }
2162
2163 $NEXT_TICK += $TICK; 2190 $NEXT_TICK += $TICK;
2164 2191
2165 # if we are delayed by four ticks or more, skip them all 2192 # if we are delayed by four ticks or more, skip them all
2166 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2193 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2167 2194
… …
2190 or warn "ERROR: unable to write runtime file: $!"; 2217 or warn "ERROR: unable to write runtime file: $!";
2191 })->(); 2218 })->();
2192 }, 2219 },
2193); 2220);
2194 2221
2222END { cf::emergency_save }
2223
21951 22241
2196 2225

Diff Legend

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