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.122 by root, Tue Jan 2 17:32:24 2007 UTC vs.
Revision 1.134 by root, Thu Jan 4 17:28:49 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";
… …
1191 my $guard = cf::lock_acquire "map_find:$key"; 1209 my $guard = cf::lock_acquire "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
1214 Coro::cede;
1215
1196 if ($map) { 1216 if ($map) {
1217 $map->last_access ((delete $map->{last_access})
1218 || $cf::RUNTIME); #d#
1197 # safety 1219 # safety
1198 $map->{instantiate_time} = $cf::RUNTIME 1220 $map->{instantiate_time} = $cf::RUNTIME
1199 if $map->{instantiate_time} > $cf::RUNTIME; 1221 if $map->{instantiate_time} > $cf::RUNTIME;
1200 } else { 1222 } else {
1201 if (my $rmp = $path->random_map_params) { 1223 if (my $rmp = $path->random_map_params) {
… …
1206 1228
1207 $map or return; 1229 $map or return;
1208 1230
1209 $map->{load_original} = 1; 1231 $map->{load_original} = 1;
1210 $map->{instantiate_time} = $cf::RUNTIME; 1232 $map->{instantiate_time} = $cf::RUNTIME;
1233 $map->last_access ($cf::RUNTIME);
1211 $map->instantiate; 1234 $map->instantiate;
1212 1235
1213 # per-player maps become, after loading, normal maps 1236 # per-player maps become, after loading, normal maps
1214 $map->per_player (0) if $path->{user_rel}; 1237 $map->per_player (0) if $path->{user_rel};
1215 } 1238 }
1216 1239
1217 $map->path ($key); 1240 $map->path ($key);
1218 $map->{path} = $path; 1241 $map->{path} = $path;
1219 $map->{last_save} = $cf::RUNTIME; 1242 $map->{last_save} = $cf::RUNTIME;
1220 $map->last_access ($cf::RUNTIME); 1243
1244 Coro::cede;
1221 1245
1222 if ($map->should_reset) { 1246 if ($map->should_reset) {
1223 $map->reset; 1247 $map->reset;
1248 undef $guard;
1224 $map = find_map $path; 1249 $map = find $path
1250 or return;
1225 } 1251 }
1226 1252
1227 $cf::MAP{$key} = $map 1253 $cf::MAP{$key} = $map
1228 } 1254 }
1229} 1255}
… …
1250 if (aio_open $uniq, O_RDONLY, 0) { 1276 if (aio_open $uniq, O_RDONLY, 0) {
1251 $self->clear_unique_items; 1277 $self->clear_unique_items;
1252 $self->load_objects ($uniq, 0); 1278 $self->load_objects ($uniq, 0);
1253 } 1279 }
1254 } 1280 }
1281
1282 Coro::cede;
1255 1283
1256 # now do the right thing for maps 1284 # now do the right thing for maps
1257 $self->link_multipart_objects; 1285 $self->link_multipart_objects;
1258 1286
1259 if ($self->{path}->is_style_map) { 1287 if ($self->{path}->is_style_map) {
… …
1267 $self->difficulty ($self->estimate_difficulty) 1295 $self->difficulty ($self->estimate_difficulty)
1268 unless $self->difficulty; 1296 unless $self->difficulty;
1269 $self->activate; 1297 $self->activate;
1270 } 1298 }
1271 1299
1300 Coro::cede;
1301
1272 $self->in_memory (cf::MAP_IN_MEMORY); 1302 $self->in_memory (cf::MAP_IN_MEMORY);
1273} 1303}
1274 1304
1275sub load_map_sync { 1305sub find_sync {
1276 my ($path, $origin) = @_; 1306 my ($path, $origin) = @_;
1277 1307
1278 #warn "load_map_sync<$path, $origin>\n";#d# 1308 cf::sync_job { cf::map::find $path, $origin }
1309}
1279 1310
1280 cf::sync_job { 1311sub do_load_sync {
1281 my $map = cf::map::find_map $path, $origin 1312 my ($map) = @_;
1282 or return; 1313
1283 $map->load; 1314 cf::sync_job { $map->load };
1284 $map
1285 }
1286} 1315}
1287 1316
1288sub save { 1317sub save {
1289 my ($self) = @_; 1318 my ($self) = @_;
1290 1319
… …
1296 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1325 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1297 1326
1298 $self->{load_path} = $save; 1327 $self->{load_path} = $save;
1299 1328
1300 return if $self->{deny_save}; 1329 return if $self->{deny_save};
1330
1331 local $self->{last_access} = $self->last_access;#d#
1301 1332
1302 if ($uniq) { 1333 if ($uniq) {
1303 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1334 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1304 $self->save_objects ($uniq, cf::IO_UNIQUES); 1335 $self->save_objects ($uniq, cf::IO_UNIQUES);
1305 } else { 1336 } else {
… …
1308} 1339}
1309 1340
1310sub swap_out { 1341sub swap_out {
1311 my ($self) = @_; 1342 my ($self) = @_;
1312 1343
1344 # save first because save cedes
1345 $self->save;
1346
1313 return if $self->players; 1347 return if $self->players;
1314 return if $self->in_memory != cf::MAP_IN_MEMORY; 1348 return if $self->in_memory != cf::MAP_IN_MEMORY;
1315 return if $self->{deny_save}; 1349 return if $self->{deny_save};
1316 1350
1317 $self->save;
1318 $self->clear; 1351 $self->clear;
1319 $self->in_memory (cf::MAP_SWAPPED); 1352 $self->in_memory (cf::MAP_SWAPPED);
1320} 1353}
1321 1354
1322sub reset_at { 1355sub reset_at {
… …
1388 1421
1389sub customise_for { 1422sub customise_for {
1390 my ($map, $ob) = @_; 1423 my ($map, $ob) = @_;
1391 1424
1392 if ($map->per_player) { 1425 if ($map->per_player) {
1393 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1426 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1394 } 1427 }
1395 1428
1396 $map 1429 $map
1397} 1430}
1398 1431
1399sub emergency_save { 1432sub emergency_save {
1400 local $cf::FREEZE = 1; 1433 my $freeze_guard = cf::freeze_mainloop;
1401 1434
1402 warn "enter emergency map save\n"; 1435 warn "enter emergency map save\n";
1403 1436
1404 cf::sync_job { 1437 cf::sync_job {
1405 warn "begin emergency map save\n"; 1438 warn "begin emergency map save\n";
… …
1495 my $link_pos = delete $self->{_link_pos}; 1528 my $link_pos = delete $self->{_link_pos};
1496 1529
1497 unless ($map) { 1530 unless ($map) {
1498 # restore original map position 1531 # restore original map position
1499 ($map, $x, $y) = @{ $link_pos || [] }; 1532 ($map, $x, $y) = @{ $link_pos || [] };
1500 $map = cf::map::find_map $map; 1533 $map = cf::map::find $map;
1501 1534
1502 unless ($map) { 1535 unless ($map) {
1503 ($map, $x, $y) = @$EMERGENCY_POSITION; 1536 ($map, $x, $y) = @$EMERGENCY_POSITION;
1504 $map = cf::map::find_map $map 1537 $map = cf::map::find $map
1505 or die "FATAL: cannot load emergency map\n"; 1538 or die "FATAL: cannot load emergency map\n";
1506 } 1539 }
1507 } 1540 }
1508 1541
1509 ($x, $y) = (-1, -1) 1542 ($x, $y) = (-1, -1)
… …
1535 1568
1536 # try to abort aborted map switching on player login :) 1569 # try to abort aborted map switching on player login :)
1537 # should happen only on crashes 1570 # should happen only on crashes
1538 if ($pl->ob->{_link_pos}) { 1571 if ($pl->ob->{_link_pos}) {
1539 $pl->ob->enter_link; 1572 $pl->ob->enter_link;
1540 Coro::async { 1573 cf::async {
1541 # we need this sleep as the login has a concurrent enter_exit running 1574 # we need this sleep as the login has a concurrent enter_exit running
1542 # and this sleep increases chances of the player not ending up in scorn 1575 # and this sleep increases chances of the player not ending up in scorn
1543 Coro::Timer::sleep 1; 1576 Coro::Timer::sleep 1;
1544 $pl->ob->leave_link; 1577 $pl->ob->leave_link;
1545 }; 1578 };
… …
1554sub cf::object::player::goto_map { 1587sub cf::object::player::goto_map {
1555 my ($self, $path, $x, $y) = @_; 1588 my ($self, $path, $x, $y) = @_;
1556 1589
1557 $self->enter_link; 1590 $self->enter_link;
1558 1591
1559 (Coro::async { 1592 (cf::async {
1560 $path = new cf::path $path; 1593 $path = new cf::path $path;
1561 1594
1562 my $map = cf::map::find_map $path->as_string; 1595 my $map = cf::map::find $path->as_string;
1563 $map = $map->customise_for ($self) if $map; 1596 $map = $map->customise_for ($self) if $map;
1564 1597
1565# warn "entering ", $map->path, " at ($x, $y)\n" 1598# warn "entering ", $map->path, " at ($x, $y)\n"
1566# if $map; 1599# if $map;
1567 1600
… …
1626 1659
1627 return unless $self->type == cf::PLAYER; 1660 return unless $self->type == cf::PLAYER;
1628 1661
1629 $self->enter_link; 1662 $self->enter_link;
1630 1663
1631 (Coro::async { 1664 (cf::async {
1665 $self->deactivate_recursive; # just to be sure
1632 unless (eval { 1666 unless (eval {
1633
1634 prepare_random_map $exit 1667 prepare_random_map $exit
1635 if $exit->slaying eq "/!"; 1668 if $exit->slaying eq "/!";
1636 1669
1637 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1670 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1638 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1671 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp);
… …
1700 on_reply => sub { 1733 on_reply => sub {
1701 my ($ns, $msg) = @_; 1734 my ($ns, $msg) = @_;
1702 1735
1703 # this weird shuffling is so that direct followup queries 1736 # this weird shuffling is so that direct followup queries
1704 # get handled first 1737 # get handled first
1705 my $queue = delete $ns->{query_queue}; 1738 my $queue = delete $ns->{query_queue}
1739 or return; # be conservative, not sure how that can happen, but we saw a crash here
1706 1740
1707 (shift @$queue)->[1]->($msg); 1741 (shift @$queue)->[1]->($msg);
1708 1742
1709 push @{ $ns->{query_queue} }, @$queue; 1743 push @{ $ns->{query_queue} }, @$queue;
1710 1744
… …
1727=cut 1761=cut
1728 1762
1729sub cf::client::coro { 1763sub cf::client::coro {
1730 my ($self, $cb) = @_; 1764 my ($self, $cb) = @_;
1731 1765
1732 my $coro; $coro = async { 1766 my $coro = &cf::async ($cb);
1733 eval {
1734 $cb->();
1735 };
1736 warn $@ if $@;
1737 };
1738 1767
1739 $coro->on_destroy (sub { 1768 $coro->on_destroy (sub {
1740 delete $self->{_coro}{$coro+0}; 1769 delete $self->{_coro}{$coro+0};
1741 }); 1770 });
1742 1771
… …
1977 open my $fh, "<:utf8", cf::confdir . "/config" 2006 open my $fh, "<:utf8", cf::confdir . "/config"
1978 or return; 2007 or return;
1979 2008
1980 local $/; 2009 local $/;
1981 *CFG = YAML::Syck::Load <$fh>; 2010 *CFG = YAML::Syck::Load <$fh>;
2011
2012 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2013
2014 if (exists $CFG{mlockall}) {
2015 eval {
2016 $CFG{mlockall} ? &mlockall : &munlockall
2017 and die "WARNING: m(un)lockall failed: $!\n";
2018 };
2019 warn $@ if $@;
2020 }
1982} 2021}
1983 2022
1984sub main { 2023sub main {
1985 # we must not ever block the main coroutine 2024 # we must not ever block the main coroutine
1986 local $Coro::idle = sub { 2025 local $Coro::idle = sub {
… …
2006 return; 2045 return;
2007 } 2046 }
2008 2047
2009 warn "reloading..."; 2048 warn "reloading...";
2010 2049
2011 local $FREEZE = 1; 2050 my $guard = freeze_mainloop;
2012 cf::emergency_save; 2051 cf::emergency_save;
2013 2052
2014 eval { 2053 eval {
2015 # if anything goes wrong in here, we should simply crash as we already saved 2054 # if anything goes wrong in here, we should simply crash as we already saved
2016 2055
… …
2152 reentrant => 0, 2191 reentrant => 0,
2153 prio => 0, 2192 prio => 0,
2154 at => $NEXT_TICK || $TICK, 2193 at => $NEXT_TICK || $TICK,
2155 data => WF_AUTOCANCEL, 2194 data => WF_AUTOCANCEL,
2156 cb => sub { 2195 cb => sub {
2157 unless ($FREEZE) {
2158 cf::server_tick; # one server iteration 2196 cf::server_tick; # one server iteration
2159 $RUNTIME += $TICK; 2197 $RUNTIME += $TICK;
2160 }
2161
2162 $NEXT_TICK += $TICK; 2198 $NEXT_TICK += $TICK;
2163 2199
2164 # if we are delayed by four ticks or more, skip them all 2200 # if we are delayed by four ticks or more, skip them all
2165 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2201 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2166 2202
… …
2189 or warn "ERROR: unable to write runtime file: $!"; 2225 or warn "ERROR: unable to write runtime file: $!";
2190 })->(); 2226 })->();
2191 }, 2227 },
2192); 2228);
2193 2229
2230END { cf::emergency_save }
2231
21941 22321
2195 2233

Diff Legend

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