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

Diff Legend

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