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.127 by root, Wed Jan 3 00:05:26 2007 UTC vs.
Revision 1.136 by root, Fri Jan 5 01:06:28 2007 UTC

… …
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 }
248} 224}
249 225
… …
259 235
260 Coro::async { 236 Coro::async {
261 eval { $cb->() }; 237 eval { $cb->() };
262 warn $@ if $@; 238 warn $@ if $@;
263 } 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
264} 248}
265 249
266=item cf::sync_job { BLOCK } 250=item cf::sync_job { BLOCK }
267 251
268The design of crossfire+ requires that the main coro ($Coro::main) is 252The design of crossfire+ requires that the main coro ($Coro::main) is
… …
283 # this is the main coro, too bad, we have to block 267 # this is the main coro, too bad, we have to block
284 # till the operation succeeds, freezing the server :/ 268 # till the operation succeeds, freezing the server :/
285 269
286 # TODO: use suspend/resume instead 270 # TODO: use suspend/resume instead
287 # (but this is cancel-safe) 271 # (but this is cancel-safe)
288 local $FREEZE = 1; 272 my $freeze_guard = freeze_mainloop;
289 273
290 my $busy = 1; 274 my $busy = 1;
291 my @res; 275 my @res;
292 276
293 (Coro::async { 277 (Coro::async {
… …
1137package cf::map; 1121package cf::map;
1138 1122
1139use Fcntl; 1123use Fcntl;
1140use Coro::AIO; 1124use Coro::AIO;
1141 1125
1142our $MAX_RESET = 7200; 1126our $MAX_RESET = 3600;
1143our $DEFAULT_RESET = 3600; 1127our $DEFAULT_RESET = 3000;
1144 1128
1145sub generate_random_map { 1129sub generate_random_map {
1146 my ($path, $rmp) = @_; 1130 my ($path, $rmp) = @_;
1147 1131
1148 # mit "rum" bekleckern, nicht 1132 # mit "rum" bekleckern, nicht
… …
1178 or return; 1162 or return;
1179 1163
1180 my $map = cf::map::new 1164 my $map = cf::map::new
1181 or return; 1165 or return;
1182 1166
1167 # for better error messages only, will be overwritten
1168 $map->path ($path);
1169
1183 $map->load_header ($path) 1170 $map->load_header ($path)
1184 or return; 1171 or return;
1185 1172
1186 $map->{load_path} = $path; 1173 $map->{load_path} = $path;
1187 1174
1188 $map 1175 $map
1189} 1176}
1190 1177
1191sub find_map; 1178sub find;
1192sub find_map { 1179sub find {
1193 my ($path, $origin) = @_; 1180 my ($path, $origin) = @_;
1194 1181
1195 #warn "find_map<$path,$origin>\n";#d# 1182 #warn "find<$path,$origin>\n";#d#
1196 1183
1197 $path = new cf::path $path, $origin && $origin->path; 1184 $path = new cf::path $path, $origin && $origin->path;
1198 my $key = $path->as_string; 1185 my $key = $path->as_string;
1199 1186
1200 cf::lock_wait "map_find:$key"; 1187 cf::lock_wait "map_find:$key";
… …
1203 my $guard = cf::lock_acquire "map_find:$key"; 1190 my $guard = cf::lock_acquire "map_find:$key";
1204 1191
1205 # do it the slow way 1192 # do it the slow way
1206 my $map = try_load_header $path->save_path; 1193 my $map = try_load_header $path->save_path;
1207 1194
1195 Coro::cede;
1196
1208 if ($map) { 1197 if ($map) {
1198 $map->last_access ((delete $map->{last_access})
1199 || $cf::RUNTIME); #d#
1209 # safety 1200 # safety
1210 $map->{instantiate_time} = $cf::RUNTIME 1201 $map->{instantiate_time} = $cf::RUNTIME
1211 if $map->{instantiate_time} > $cf::RUNTIME; 1202 if $map->{instantiate_time} > $cf::RUNTIME;
1212 } else { 1203 } else {
1213 if (my $rmp = $path->random_map_params) { 1204 if (my $rmp = $path->random_map_params) {
… …
1218 1209
1219 $map or return; 1210 $map or return;
1220 1211
1221 $map->{load_original} = 1; 1212 $map->{load_original} = 1;
1222 $map->{instantiate_time} = $cf::RUNTIME; 1213 $map->{instantiate_time} = $cf::RUNTIME;
1214 $map->last_access ($cf::RUNTIME);
1223 $map->instantiate; 1215 $map->instantiate;
1224 1216
1225 # per-player maps become, after loading, normal maps 1217 # per-player maps become, after loading, normal maps
1226 $map->per_player (0) if $path->{user_rel}; 1218 $map->per_player (0) if $path->{user_rel};
1227 } 1219 }
1228 1220
1229 $map->path ($key); 1221 $map->path ($key);
1230 $map->{path} = $path; 1222 $map->{path} = $path;
1231 $map->{last_save} = $cf::RUNTIME; 1223 $map->{last_save} = $cf::RUNTIME;
1232 $map->last_access ($cf::RUNTIME); 1224
1225 Coro::cede;
1233 1226
1234 if ($map->should_reset) { 1227 if ($map->should_reset) {
1235 $map->reset; 1228 $map->reset;
1236 undef $guard; 1229 undef $guard;
1237 $map = find_map $path 1230 $map = find $path
1238 or return; 1231 or return;
1239 } 1232 }
1240 1233
1241 $cf::MAP{$key} = $map 1234 $cf::MAP{$key} = $map
1242 } 1235 }
… …
1264 if (aio_open $uniq, O_RDONLY, 0) { 1257 if (aio_open $uniq, O_RDONLY, 0) {
1265 $self->clear_unique_items; 1258 $self->clear_unique_items;
1266 $self->load_objects ($uniq, 0); 1259 $self->load_objects ($uniq, 0);
1267 } 1260 }
1268 } 1261 }
1262
1263 Coro::cede;
1269 1264
1270 # now do the right thing for maps 1265 # now do the right thing for maps
1271 $self->link_multipart_objects; 1266 $self->link_multipart_objects;
1272 1267
1273 if ($self->{path}->is_style_map) { 1268 if ($self->{path}->is_style_map) {
… …
1281 $self->difficulty ($self->estimate_difficulty) 1276 $self->difficulty ($self->estimate_difficulty)
1282 unless $self->difficulty; 1277 unless $self->difficulty;
1283 $self->activate; 1278 $self->activate;
1284 } 1279 }
1285 1280
1281 Coro::cede;
1282
1286 $self->in_memory (cf::MAP_IN_MEMORY); 1283 $self->in_memory (cf::MAP_IN_MEMORY);
1287} 1284}
1288 1285
1289sub load_map_sync { 1286sub find_sync {
1290 my ($path, $origin) = @_; 1287 my ($path, $origin) = @_;
1291 1288
1292 #warn "load_map_sync<$path, $origin>\n";#d# 1289 cf::sync_job { cf::map::find $path, $origin }
1290}
1293 1291
1294 cf::sync_job { 1292sub do_load_sync {
1295 my $map = cf::map::find_map $path, $origin 1293 my ($map) = @_;
1296 or return; 1294
1297 $map->load; 1295 cf::sync_job { $map->load };
1298 $map
1299 }
1300} 1296}
1301 1297
1302sub save { 1298sub save {
1303 my ($self) = @_; 1299 my ($self) = @_;
1304 1300
… …
1310 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1306 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1311 1307
1312 $self->{load_path} = $save; 1308 $self->{load_path} = $save;
1313 1309
1314 return if $self->{deny_save}; 1310 return if $self->{deny_save};
1311
1312 local $self->{last_access} = $self->last_access;#d#
1315 1313
1316 if ($uniq) { 1314 if ($uniq) {
1317 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1315 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1318 $self->save_objects ($uniq, cf::IO_UNIQUES); 1316 $self->save_objects ($uniq, cf::IO_UNIQUES);
1319 } else { 1317 } else {
… …
1322} 1320}
1323 1321
1324sub swap_out { 1322sub swap_out {
1325 my ($self) = @_; 1323 my ($self) = @_;
1326 1324
1325 # save first because save cedes
1326 $self->save;
1327
1327 return if $self->players; 1328 return if $self->players;
1328 return if $self->in_memory != cf::MAP_IN_MEMORY; 1329 return if $self->in_memory != cf::MAP_IN_MEMORY;
1329 return if $self->{deny_save}; 1330 return if $self->{deny_save};
1330 1331
1331 $self->save;
1332 $self->clear; 1332 $self->clear;
1333 $self->in_memory (cf::MAP_SWAPPED); 1333 $self->in_memory (cf::MAP_SWAPPED);
1334} 1334}
1335 1335
1336sub reset_at { 1336sub reset_at {
… …
1402 1402
1403sub customise_for { 1403sub customise_for {
1404 my ($map, $ob) = @_; 1404 my ($map, $ob) = @_;
1405 1405
1406 if ($map->per_player) { 1406 if ($map->per_player) {
1407 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1407 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1408 } 1408 }
1409 1409
1410 $map 1410 $map
1411} 1411}
1412 1412
1413sub emergency_save { 1413sub emergency_save {
1414 local $cf::FREEZE = 1; 1414 my $freeze_guard = cf::freeze_mainloop;
1415 1415
1416 warn "enter emergency map save\n"; 1416 warn "enter emergency map save\n";
1417 1417
1418 cf::sync_job { 1418 cf::sync_job {
1419 warn "begin emergency map save\n"; 1419 warn "begin emergency map save\n";
… …
1509 my $link_pos = delete $self->{_link_pos}; 1509 my $link_pos = delete $self->{_link_pos};
1510 1510
1511 unless ($map) { 1511 unless ($map) {
1512 # restore original map position 1512 # restore original map position
1513 ($map, $x, $y) = @{ $link_pos || [] }; 1513 ($map, $x, $y) = @{ $link_pos || [] };
1514 $map = cf::map::find_map $map; 1514 $map = cf::map::find $map;
1515 1515
1516 unless ($map) { 1516 unless ($map) {
1517 ($map, $x, $y) = @$EMERGENCY_POSITION; 1517 ($map, $x, $y) = @$EMERGENCY_POSITION;
1518 $map = cf::map::find_map $map 1518 $map = cf::map::find $map
1519 or die "FATAL: cannot load emergency map\n"; 1519 or die "FATAL: cannot load emergency map\n";
1520 } 1520 }
1521 } 1521 }
1522 1522
1523 ($x, $y) = (-1, -1) 1523 ($x, $y) = (-1, -1)
… …
1559 }; 1559 };
1560 } 1560 }
1561 }, 1561 },
1562); 1562);
1563 1563
1564=item $player_object->goto_map ($path, $x, $y) 1564=item $player_object->goto ($path, $x, $y)
1565 1565
1566=cut 1566=cut
1567 1567
1568sub cf::object::player::goto_map { 1568sub cf::object::player::goto {
1569 my ($self, $path, $x, $y) = @_; 1569 my ($self, $path, $x, $y) = @_;
1570 1570
1571 $self->enter_link; 1571 $self->enter_link;
1572 1572
1573 (cf::async { 1573 (cf::async {
1574 $path = new cf::path $path; 1574 $path = new cf::path $path;
1575 1575
1576 my $map = cf::map::find_map $path->as_string; 1576 my $map = cf::map::find $path->as_string;
1577 $map = $map->customise_for ($self) if $map; 1577 $map = $map->customise_for ($self) if $map;
1578 1578
1579# warn "entering ", $map->path, " at ($x, $y)\n" 1579# warn "entering ", $map->path, " at ($x, $y)\n"
1580# if $map; 1580# if $map;
1581 1581
… …
1641 return unless $self->type == cf::PLAYER; 1641 return unless $self->type == cf::PLAYER;
1642 1642
1643 $self->enter_link; 1643 $self->enter_link;
1644 1644
1645 (cf::async { 1645 (cf::async {
1646 $self->deactivate_recursive; # just to be sure
1646 unless (eval { 1647 unless (eval {
1647 prepare_random_map $exit 1648 prepare_random_map $exit
1648 if $exit->slaying eq "/!"; 1649 if $exit->slaying eq "/!";
1649 1650
1650 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;
1651 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1652 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1652 1653
1653 1; 1654 1;
1654 }) { 1655 }) {
1655 $self->message ("Something went wrong deep within the crossfire server. " 1656 $self->message ("Something went wrong deep within the crossfire server. "
1656 . "I'll try to bring you back to the map you were before. " 1657 . "I'll try to bring you back to the map you were before. "
… …
1713 on_reply => sub { 1714 on_reply => sub {
1714 my ($ns, $msg) = @_; 1715 my ($ns, $msg) = @_;
1715 1716
1716 # this weird shuffling is so that direct followup queries 1717 # this weird shuffling is so that direct followup queries
1717 # get handled first 1718 # get handled first
1718 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
1719 1721
1720 (shift @$queue)->[1]->($msg); 1722 (shift @$queue)->[1]->($msg);
1721 1723
1722 push @{ $ns->{query_queue} }, @$queue; 1724 push @{ $ns->{query_queue} }, @$queue;
1723 1725
… …
1985 open my $fh, "<:utf8", cf::confdir . "/config" 1987 open my $fh, "<:utf8", cf::confdir . "/config"
1986 or return; 1988 or return;
1987 1989
1988 local $/; 1990 local $/;
1989 *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 }
1990} 2002}
1991 2003
1992sub main { 2004sub main {
1993 # we must not ever block the main coroutine 2005 # we must not ever block the main coroutine
1994 local $Coro::idle = sub { 2006 local $Coro::idle = sub {
… …
2014 return; 2026 return;
2015 } 2027 }
2016 2028
2017 warn "reloading..."; 2029 warn "reloading...";
2018 2030
2019 local $FREEZE = 1; 2031 my $guard = freeze_mainloop;
2020 cf::emergency_save; 2032 cf::emergency_save;
2021 2033
2022 eval { 2034 eval {
2023 # 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
2024 2036
… …
2160 reentrant => 0, 2172 reentrant => 0,
2161 prio => 0, 2173 prio => 0,
2162 at => $NEXT_TICK || $TICK, 2174 at => $NEXT_TICK || $TICK,
2163 data => WF_AUTOCANCEL, 2175 data => WF_AUTOCANCEL,
2164 cb => sub { 2176 cb => sub {
2165 unless ($FREEZE) {
2166 cf::server_tick; # one server iteration 2177 cf::server_tick; # one server iteration
2167 $RUNTIME += $TICK; 2178 $RUNTIME += $TICK;
2168 }
2169
2170 $NEXT_TICK += $TICK; 2179 $NEXT_TICK += $TICK;
2171 2180
2172 # 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
2173 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2182 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2174 2183

Diff Legend

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