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.135 by root, Thu Jan 4 20:29:46 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
… …
181sub to_json($) { 179sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 180 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 181 JSON::Syck::Dump $_[0]
184} 182}
185 183
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 184=item cf::lock_wait $string
209 185
210Wait until the given lock is available. See cf::lock_acquire. 186Wait until the given lock is available. See cf::lock_acquire.
211 187
212=item my $lock = cf::lock_acquire $string 188=item my $lock = cf::lock_acquire $string
213 189
214Wait until the given lock is available and then acquires it and returns 190Wait 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, 191a Coro::guard object. If the guard object gets destroyed (goes out of scope,
216for example when the coroutine gets canceled), the lock is automatically 192for example when the coroutine gets canceled), the lock is automatically
217returned. 193returned.
218 194
219Lock names should begin with a unique identifier (for example, find_map 195Lock names should begin with a unique identifier (for example, cf::map::find
220uses map_find and load_map uses map_load). 196uses map_find and cf::map::load uses map_load).
221 197
222=cut 198=cut
223 199
224our %LOCK; 200our %LOCK;
225 201
… …
239 # wait, to be sure we are not locked 215 # wait, to be sure we are not locked
240 lock_wait $key; 216 lock_wait $key;
241 217
242 $LOCK{$key} = []; 218 $LOCK{$key} = [];
243 219
244 cf::guard { 220 Coro::guard {
245 # wake up all waiters, to be on the safe side 221 # wake up all waiters, to be on the safe side
246 $_->ready for @{ delete $LOCK{$key} }; 222 $_->ready for @{ delete $LOCK{$key} };
247 } 223 }
224}
225
226=item cf::async { BLOCK }
227
228Like C<Coro::async>, but runs the given BLOCK in an eval and only logs the
229error instead of exiting the server in case of a problem.
230
231=cut
232
233sub async(&) {
234 my ($cb) = @_;
235
236 Coro::async {
237 eval { $cb->() };
238 warn $@ if $@;
239 }
240}
241
242sub freeze_mainloop {
243 return unless $TICK_WATCHER->is_active;
244
245 my $guard = Coro::guard { $TICK_WATCHER->start };
246 $TICK_WATCHER->stop;
247 $guard
248} 248}
249 249
250=item cf::sync_job { BLOCK } 250=item cf::sync_job { BLOCK }
251 251
252The design of crossfire+ requires that the main coro ($Coro::main) is 252The design of crossfire+ requires that the main coro ($Coro::main) is
… …
267 # this is the main coro, too bad, we have to block 267 # this is the main coro, too bad, we have to block
268 # till the operation succeeds, freezing the server :/ 268 # till the operation succeeds, freezing the server :/
269 269
270 # TODO: use suspend/resume instead 270 # TODO: use suspend/resume instead
271 # (but this is cancel-safe) 271 # (but this is cancel-safe)
272 local $FREEZE = 1; 272 my $freeze_guard = freeze_mainloop;
273 273
274 my $busy = 1; 274 my $busy = 1;
275 my @res; 275 my @res;
276 276
277 (Coro::async { 277 (Coro::async {
… …
301=cut 301=cut
302 302
303sub coro(&) { 303sub coro(&) {
304 my $cb = shift; 304 my $cb = shift;
305 305
306 my $coro; $coro = async { 306 my $coro = &cf::async ($cb);
307 eval {
308 $cb->();
309 };
310 warn $@ if $@;
311 };
312 307
313 $coro->on_destroy (sub { 308 $coro->on_destroy (sub {
314 delete $EXT_CORO{$coro+0}; 309 delete $EXT_CORO{$coro+0};
315 }); 310 });
316 $EXT_CORO{$coro+0} = $coro; 311 $EXT_CORO{$coro+0} = $coro;
… …
1126package cf::map; 1121package cf::map;
1127 1122
1128use Fcntl; 1123use Fcntl;
1129use Coro::AIO; 1124use Coro::AIO;
1130 1125
1131our $MAX_RESET = 7200; 1126our $MAX_RESET = 3600;
1132our $DEFAULT_RESET = 3600; 1127our $DEFAULT_RESET = 3000;
1133 1128
1134sub generate_random_map { 1129sub generate_random_map {
1135 my ($path, $rmp) = @_; 1130 my ($path, $rmp) = @_;
1136 1131
1137 # mit "rum" bekleckern, nicht 1132 # mit "rum" bekleckern, nicht
… …
1167 or return; 1162 or return;
1168 1163
1169 my $map = cf::map::new 1164 my $map = cf::map::new
1170 or return; 1165 or return;
1171 1166
1167 # for better error messages only, will be overwritten
1168 $map->path ($path);
1169
1172 $map->load_header ($path) 1170 $map->load_header ($path)
1173 or return; 1171 or return;
1174 1172
1175 $map->{load_path} = $path; 1173 $map->{load_path} = $path;
1176 1174
1177 $map 1175 $map
1178} 1176}
1179 1177
1178sub find;
1180sub find_map { 1179sub find {
1181 my ($path, $origin) = @_; 1180 my ($path, $origin) = @_;
1182 1181
1183 #warn "find_map<$path,$origin>\n";#d# 1182 #warn "find<$path,$origin>\n";#d#
1184 1183
1185 $path = new cf::path $path, $origin && $origin->path; 1184 $path = new cf::path $path, $origin && $origin->path;
1186 my $key = $path->as_string; 1185 my $key = $path->as_string;
1187 1186
1188 cf::lock_wait "map_find:$key"; 1187 cf::lock_wait "map_find:$key";
… …
1191 my $guard = cf::lock_acquire "map_find:$key"; 1190 my $guard = cf::lock_acquire "map_find:$key";
1192 1191
1193 # do it the slow way 1192 # do it the slow way
1194 my $map = try_load_header $path->save_path; 1193 my $map = try_load_header $path->save_path;
1195 1194
1195 Coro::cede;
1196
1196 if ($map) { 1197 if ($map) {
1198 $map->last_access ((delete $map->{last_access})
1199 || $cf::RUNTIME); #d#
1197 # safety 1200 # safety
1198 $map->{instantiate_time} = $cf::RUNTIME 1201 $map->{instantiate_time} = $cf::RUNTIME
1199 if $map->{instantiate_time} > $cf::RUNTIME; 1202 if $map->{instantiate_time} > $cf::RUNTIME;
1200 } else { 1203 } else {
1201 if (my $rmp = $path->random_map_params) { 1204 if (my $rmp = $path->random_map_params) {
… …
1206 1209
1207 $map or return; 1210 $map or return;
1208 1211
1209 $map->{load_original} = 1; 1212 $map->{load_original} = 1;
1210 $map->{instantiate_time} = $cf::RUNTIME; 1213 $map->{instantiate_time} = $cf::RUNTIME;
1214 $map->last_access ($cf::RUNTIME);
1211 $map->instantiate; 1215 $map->instantiate;
1212 1216
1213 # per-player maps become, after loading, normal maps 1217 # per-player maps become, after loading, normal maps
1214 $map->per_player (0) if $path->{user_rel}; 1218 $map->per_player (0) if $path->{user_rel};
1215 } 1219 }
1216 1220
1217 $map->path ($key); 1221 $map->path ($key);
1218 $map->{path} = $path; 1222 $map->{path} = $path;
1219 $map->{last_save} = $cf::RUNTIME; 1223 $map->{last_save} = $cf::RUNTIME;
1220 $map->last_access ($cf::RUNTIME); 1224
1225 Coro::cede;
1221 1226
1222 if ($map->should_reset) { 1227 if ($map->should_reset) {
1223 $map->reset; 1228 $map->reset;
1229 undef $guard;
1224 $map = find_map $path; 1230 $map = find $path
1231 or return;
1225 } 1232 }
1226 1233
1227 $cf::MAP{$key} = $map 1234 $cf::MAP{$key} = $map
1228 } 1235 }
1229} 1236}
… …
1250 if (aio_open $uniq, O_RDONLY, 0) { 1257 if (aio_open $uniq, O_RDONLY, 0) {
1251 $self->clear_unique_items; 1258 $self->clear_unique_items;
1252 $self->load_objects ($uniq, 0); 1259 $self->load_objects ($uniq, 0);
1253 } 1260 }
1254 } 1261 }
1262
1263 Coro::cede;
1255 1264
1256 # now do the right thing for maps 1265 # now do the right thing for maps
1257 $self->link_multipart_objects; 1266 $self->link_multipart_objects;
1258 1267
1259 if ($self->{path}->is_style_map) { 1268 if ($self->{path}->is_style_map) {
… …
1267 $self->difficulty ($self->estimate_difficulty) 1276 $self->difficulty ($self->estimate_difficulty)
1268 unless $self->difficulty; 1277 unless $self->difficulty;
1269 $self->activate; 1278 $self->activate;
1270 } 1279 }
1271 1280
1281 Coro::cede;
1282
1272 $self->in_memory (cf::MAP_IN_MEMORY); 1283 $self->in_memory (cf::MAP_IN_MEMORY);
1273} 1284}
1274 1285
1275sub load_map_sync { 1286sub find_sync {
1276 my ($path, $origin) = @_; 1287 my ($path, $origin) = @_;
1277 1288
1278 #warn "load_map_sync<$path, $origin>\n";#d# 1289 cf::sync_job { cf::map::find $path, $origin }
1290}
1279 1291
1280 cf::sync_job { 1292sub do_load_sync {
1281 my $map = cf::map::find_map $path, $origin 1293 my ($map) = @_;
1282 or return; 1294
1283 $map->load; 1295 cf::sync_job { $map->load };
1284 $map
1285 }
1286} 1296}
1287 1297
1288sub save { 1298sub save {
1289 my ($self) = @_; 1299 my ($self) = @_;
1290 1300
… …
1296 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1306 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1297 1307
1298 $self->{load_path} = $save; 1308 $self->{load_path} = $save;
1299 1309
1300 return if $self->{deny_save}; 1310 return if $self->{deny_save};
1311
1312 local $self->{last_access} = $self->last_access;#d#
1301 1313
1302 if ($uniq) { 1314 if ($uniq) {
1303 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1315 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1304 $self->save_objects ($uniq, cf::IO_UNIQUES); 1316 $self->save_objects ($uniq, cf::IO_UNIQUES);
1305 } else { 1317 } else {
… …
1308} 1320}
1309 1321
1310sub swap_out { 1322sub swap_out {
1311 my ($self) = @_; 1323 my ($self) = @_;
1312 1324
1325 # save first because save cedes
1326 $self->save;
1327
1313 return if $self->players; 1328 return if $self->players;
1314 return if $self->in_memory != cf::MAP_IN_MEMORY; 1329 return if $self->in_memory != cf::MAP_IN_MEMORY;
1315 return if $self->{deny_save}; 1330 return if $self->{deny_save};
1316 1331
1317 $self->save;
1318 $self->clear; 1332 $self->clear;
1319 $self->in_memory (cf::MAP_SWAPPED); 1333 $self->in_memory (cf::MAP_SWAPPED);
1320} 1334}
1321 1335
1322sub reset_at { 1336sub reset_at {
… …
1388 1402
1389sub customise_for { 1403sub customise_for {
1390 my ($map, $ob) = @_; 1404 my ($map, $ob) = @_;
1391 1405
1392 if ($map->per_player) { 1406 if ($map->per_player) {
1393 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1407 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1394 } 1408 }
1395 1409
1396 $map 1410 $map
1397} 1411}
1398 1412
1399sub emergency_save { 1413sub emergency_save {
1400 local $cf::FREEZE = 1; 1414 my $freeze_guard = cf::freeze_mainloop;
1401 1415
1402 warn "enter emergency map save\n"; 1416 warn "enter emergency map save\n";
1403 1417
1404 cf::sync_job { 1418 cf::sync_job {
1405 warn "begin emergency map save\n"; 1419 warn "begin emergency map save\n";
… …
1495 my $link_pos = delete $self->{_link_pos}; 1509 my $link_pos = delete $self->{_link_pos};
1496 1510
1497 unless ($map) { 1511 unless ($map) {
1498 # restore original map position 1512 # restore original map position
1499 ($map, $x, $y) = @{ $link_pos || [] }; 1513 ($map, $x, $y) = @{ $link_pos || [] };
1500 $map = cf::map::find_map $map; 1514 $map = cf::map::find $map;
1501 1515
1502 unless ($map) { 1516 unless ($map) {
1503 ($map, $x, $y) = @$EMERGENCY_POSITION; 1517 ($map, $x, $y) = @$EMERGENCY_POSITION;
1504 $map = cf::map::find_map $map 1518 $map = cf::map::find $map
1505 or die "FATAL: cannot load emergency map\n"; 1519 or die "FATAL: cannot load emergency map\n";
1506 } 1520 }
1507 } 1521 }
1508 1522
1509 ($x, $y) = (-1, -1) 1523 ($x, $y) = (-1, -1)
… …
1535 1549
1536 # try to abort aborted map switching on player login :) 1550 # try to abort aborted map switching on player login :)
1537 # should happen only on crashes 1551 # should happen only on crashes
1538 if ($pl->ob->{_link_pos}) { 1552 if ($pl->ob->{_link_pos}) {
1539 $pl->ob->enter_link; 1553 $pl->ob->enter_link;
1540 Coro::async { 1554 cf::async {
1541 # we need this sleep as the login has a concurrent enter_exit running 1555 # 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 1556 # and this sleep increases chances of the player not ending up in scorn
1543 Coro::Timer::sleep 1; 1557 Coro::Timer::sleep 1;
1544 $pl->ob->leave_link; 1558 $pl->ob->leave_link;
1545 }; 1559 };
… …
1554sub cf::object::player::goto_map { 1568sub cf::object::player::goto_map {
1555 my ($self, $path, $x, $y) = @_; 1569 my ($self, $path, $x, $y) = @_;
1556 1570
1557 $self->enter_link; 1571 $self->enter_link;
1558 1572
1559 (Coro::async { 1573 (cf::async {
1560 $path = new cf::path $path; 1574 $path = new cf::path $path;
1561 1575
1562 my $map = cf::map::find_map $path->as_string; 1576 my $map = cf::map::find $path->as_string;
1563 $map = $map->customise_for ($self) if $map; 1577 $map = $map->customise_for ($self) if $map;
1564 1578
1565# warn "entering ", $map->path, " at ($x, $y)\n" 1579# warn "entering ", $map->path, " at ($x, $y)\n"
1566# if $map; 1580# if $map;
1567 1581
… …
1626 1640
1627 return unless $self->type == cf::PLAYER; 1641 return unless $self->type == cf::PLAYER;
1628 1642
1629 $self->enter_link; 1643 $self->enter_link;
1630 1644
1631 (Coro::async { 1645 (cf::async {
1646 $self->deactivate_recursive; # just to be sure
1632 unless (eval { 1647 unless (eval {
1633
1634 prepare_random_map $exit 1648 prepare_random_map $exit
1635 if $exit->slaying eq "/!"; 1649 if $exit->slaying eq "/!";
1636 1650
1637 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1651 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1638 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1652 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp);
… …
1700 on_reply => sub { 1714 on_reply => sub {
1701 my ($ns, $msg) = @_; 1715 my ($ns, $msg) = @_;
1702 1716
1703 # this weird shuffling is so that direct followup queries 1717 # this weird shuffling is so that direct followup queries
1704 # get handled first 1718 # get handled first
1705 my $queue = delete $ns->{query_queue}; 1719 my $queue = delete $ns->{query_queue}
1720 or return; # be conservative, not sure how that can happen, but we saw a crash here
1706 1721
1707 (shift @$queue)->[1]->($msg); 1722 (shift @$queue)->[1]->($msg);
1708 1723
1709 push @{ $ns->{query_queue} }, @$queue; 1724 push @{ $ns->{query_queue} }, @$queue;
1710 1725
… …
1727=cut 1742=cut
1728 1743
1729sub cf::client::coro { 1744sub cf::client::coro {
1730 my ($self, $cb) = @_; 1745 my ($self, $cb) = @_;
1731 1746
1732 my $coro; $coro = async { 1747 my $coro = &cf::async ($cb);
1733 eval {
1734 $cb->();
1735 };
1736 warn $@ if $@;
1737 };
1738 1748
1739 $coro->on_destroy (sub { 1749 $coro->on_destroy (sub {
1740 delete $self->{_coro}{$coro+0}; 1750 delete $self->{_coro}{$coro+0};
1741 }); 1751 });
1742 1752
… …
1977 open my $fh, "<:utf8", cf::confdir . "/config" 1987 open my $fh, "<:utf8", cf::confdir . "/config"
1978 or return; 1988 or return;
1979 1989
1980 local $/; 1990 local $/;
1981 *CFG = YAML::Syck::Load <$fh>; 1991 *CFG = YAML::Syck::Load <$fh>;
1992
1993 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
1994
1995 if (exists $CFG{mlockall}) {
1996 eval {
1997 $CFG{mlockall} ? &mlockall : &munlockall
1998 and die "WARNING: m(un)lockall failed: $!\n";
1999 };
2000 warn $@ if $@;
2001 }
1982} 2002}
1983 2003
1984sub main { 2004sub main {
1985 # we must not ever block the main coroutine 2005 # we must not ever block the main coroutine
1986 local $Coro::idle = sub { 2006 local $Coro::idle = sub {
… …
2006 return; 2026 return;
2007 } 2027 }
2008 2028
2009 warn "reloading..."; 2029 warn "reloading...";
2010 2030
2011 local $FREEZE = 1; 2031 my $guard = freeze_mainloop;
2012 cf::emergency_save; 2032 cf::emergency_save;
2013 2033
2014 eval { 2034 eval {
2015 # if anything goes wrong in here, we should simply crash as we already saved 2035 # if anything goes wrong in here, we should simply crash as we already saved
2016 2036
… …
2152 reentrant => 0, 2172 reentrant => 0,
2153 prio => 0, 2173 prio => 0,
2154 at => $NEXT_TICK || $TICK, 2174 at => $NEXT_TICK || $TICK,
2155 data => WF_AUTOCANCEL, 2175 data => WF_AUTOCANCEL,
2156 cb => sub { 2176 cb => sub {
2157 unless ($FREEZE) {
2158 cf::server_tick; # one server iteration 2177 cf::server_tick; # one server iteration
2159 $RUNTIME += $TICK; 2178 $RUNTIME += $TICK;
2160 }
2161
2162 $NEXT_TICK += $TICK; 2179 $NEXT_TICK += $TICK;
2163 2180
2164 # if we are delayed by four ticks or more, skip them all 2181 # if we are delayed by four ticks or more, skip them all
2165 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2182 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2166 2183
… …
2189 or warn "ERROR: unable to write runtime file: $!"; 2206 or warn "ERROR: unable to write runtime file: $!";
2190 })->(); 2207 })->();
2191 }, 2208 },
2192); 2209);
2193 2210
2211END { cf::emergency_save }
2212
21941 22131
2195 2214

Diff Legend

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