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.129 by root, Wed Jan 3 00:41:19 2007 UTC vs.
Revision 1.138 by root, Fri Jan 5 17:07:17 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
250=item cf::async { BLOCK } 226sub freeze_mainloop {
227 return unless $TICK_WATCHER->is_active;
251 228
252Like C<Coro::async>, but runs the given BLOCK in an eval and only logs the 229 my $guard = Coro::guard { $TICK_WATCHER->start };
253error instead of exiting the server in case of a problem. 230 $TICK_WATCHER->stop;
254 231 $guard
255=cut
256
257sub async(&) {
258 my ($cb) = @_;
259
260 Coro::async {
261 eval { $cb->() };
262 warn $@ if $@;
263 }
264} 232}
265 233
266=item cf::sync_job { BLOCK } 234=item cf::sync_job { BLOCK }
267 235
268The design of crossfire+ requires that the main coro ($Coro::main) is 236The design of crossfire+ requires that the main coro ($Coro::main) is
… …
283 # this is the main coro, too bad, we have to block 251 # this is the main coro, too bad, we have to block
284 # till the operation succeeds, freezing the server :/ 252 # till the operation succeeds, freezing the server :/
285 253
286 # TODO: use suspend/resume instead 254 # TODO: use suspend/resume instead
287 # (but this is cancel-safe) 255 # (but this is cancel-safe)
288 local $FREEZE = 1; 256 my $freeze_guard = freeze_mainloop;
289 257
290 my $busy = 1; 258 my $busy = 1;
291 my @res; 259 my @res;
292 260
293 (Coro::async { 261 (Coro::async_pool {
294 @res = eval { $job->() }; 262 @res = eval { $job->() };
295 warn $@ if $@; 263 warn $@ if $@;
296 undef $busy; 264 undef $busy;
297 })->prio (Coro::PRIO_MAX); 265 })->prio (Coro::PRIO_MAX);
298 266
… …
309 } 277 }
310} 278}
311 279
312=item $coro = cf::coro { BLOCK } 280=item $coro = cf::coro { BLOCK }
313 281
314Creates and returns a new coro. This coro is automcatially being canceled 282Creates (and readies) and returns a new coro. This coro is automcatially
315when the extension calling this is being unloaded. 283being canceled when the extension calling this is being unloaded.
316 284
317=cut 285=cut
318 286
319sub coro(&) { 287sub coro(&) {
320 my $cb = shift; 288 my $cb = shift;
321 289
322 my $coro = &cf::async ($cb); 290 my $coro = &Coro::async_pool ($cb);
323 291
324 $coro->on_destroy (sub { 292 $coro->on_destroy (sub {
325 delete $EXT_CORO{$coro+0}; 293 delete $EXT_CORO{$coro+0};
326 }); 294 });
327 $EXT_CORO{$coro+0} = $coro; 295 $EXT_CORO{$coro+0} = $coro;
… …
1137package cf::map; 1105package cf::map;
1138 1106
1139use Fcntl; 1107use Fcntl;
1140use Coro::AIO; 1108use Coro::AIO;
1141 1109
1142our $MAX_RESET = 7200; 1110our $MAX_RESET = 3600;
1143our $DEFAULT_RESET = 3600; 1111our $DEFAULT_RESET = 3000;
1144 1112
1145sub generate_random_map { 1113sub generate_random_map {
1146 my ($path, $rmp) = @_; 1114 my ($path, $rmp) = @_;
1147 1115
1148 # mit "rum" bekleckern, nicht 1116 # mit "rum" bekleckern, nicht
… …
1178 or return; 1146 or return;
1179 1147
1180 my $map = cf::map::new 1148 my $map = cf::map::new
1181 or return; 1149 or return;
1182 1150
1151 # for better error messages only, will be overwritten
1152 $map->path ($path);
1153
1183 $map->load_header ($path) 1154 $map->load_header ($path)
1184 or return; 1155 or return;
1185 1156
1186 $map->{load_path} = $path; 1157 $map->{load_path} = $path;
1187 1158
1188 $map 1159 $map
1189} 1160}
1190 1161
1191sub find_map; 1162sub find;
1192sub find_map { 1163sub find {
1193 my ($path, $origin) = @_; 1164 my ($path, $origin) = @_;
1194 1165
1195 #warn "find_map<$path,$origin>\n";#d# 1166 #warn "find<$path,$origin>\n";#d#
1196 1167
1197 $path = new cf::path $path, $origin && $origin->path; 1168 $path = new cf::path $path, $origin && $origin->path;
1198 my $key = $path->as_string; 1169 my $key = $path->as_string;
1199 1170
1200 cf::lock_wait "map_find:$key"; 1171 cf::lock_wait "map_find:$key";
… …
1203 my $guard = cf::lock_acquire "map_find:$key"; 1174 my $guard = cf::lock_acquire "map_find:$key";
1204 1175
1205 # do it the slow way 1176 # do it the slow way
1206 my $map = try_load_header $path->save_path; 1177 my $map = try_load_header $path->save_path;
1207 1178
1179 Coro::cede;
1180
1208 if ($map) { 1181 if ($map) {
1182 $map->last_access ((delete $map->{last_access})
1183 || $cf::RUNTIME); #d#
1209 # safety 1184 # safety
1210 $map->{instantiate_time} = $cf::RUNTIME 1185 $map->{instantiate_time} = $cf::RUNTIME
1211 if $map->{instantiate_time} > $cf::RUNTIME; 1186 if $map->{instantiate_time} > $cf::RUNTIME;
1212 } else { 1187 } else {
1213 if (my $rmp = $path->random_map_params) { 1188 if (my $rmp = $path->random_map_params) {
… …
1218 1193
1219 $map or return; 1194 $map or return;
1220 1195
1221 $map->{load_original} = 1; 1196 $map->{load_original} = 1;
1222 $map->{instantiate_time} = $cf::RUNTIME; 1197 $map->{instantiate_time} = $cf::RUNTIME;
1198 $map->last_access ($cf::RUNTIME);
1223 $map->instantiate; 1199 $map->instantiate;
1224 1200
1225 # per-player maps become, after loading, normal maps 1201 # per-player maps become, after loading, normal maps
1226 $map->per_player (0) if $path->{user_rel}; 1202 $map->per_player (0) if $path->{user_rel};
1227 } 1203 }
1228 1204
1229 $map->path ($key); 1205 $map->path ($key);
1230 $map->{path} = $path; 1206 $map->{path} = $path;
1231 $map->{last_save} = $cf::RUNTIME; 1207 $map->{last_save} = $cf::RUNTIME;
1232 $map->last_access ($cf::RUNTIME); 1208
1209 Coro::cede;
1233 1210
1234 if ($map->should_reset) { 1211 if ($map->should_reset) {
1235 $map->reset; 1212 $map->reset;
1236 undef $guard; 1213 undef $guard;
1237 $map = find_map $path 1214 $map = find $path
1238 or return; 1215 or return;
1239 } 1216 }
1240 1217
1241 $cf::MAP{$key} = $map 1218 $cf::MAP{$key} = $map
1242 } 1219 }
… …
1264 if (aio_open $uniq, O_RDONLY, 0) { 1241 if (aio_open $uniq, O_RDONLY, 0) {
1265 $self->clear_unique_items; 1242 $self->clear_unique_items;
1266 $self->load_objects ($uniq, 0); 1243 $self->load_objects ($uniq, 0);
1267 } 1244 }
1268 } 1245 }
1246
1247 Coro::cede;
1269 1248
1270 # now do the right thing for maps 1249 # now do the right thing for maps
1271 $self->link_multipart_objects; 1250 $self->link_multipart_objects;
1272 1251
1273 if ($self->{path}->is_style_map) { 1252 if ($self->{path}->is_style_map) {
… …
1281 $self->difficulty ($self->estimate_difficulty) 1260 $self->difficulty ($self->estimate_difficulty)
1282 unless $self->difficulty; 1261 unless $self->difficulty;
1283 $self->activate; 1262 $self->activate;
1284 } 1263 }
1285 1264
1265 Coro::cede;
1266
1286 $self->in_memory (cf::MAP_IN_MEMORY); 1267 $self->in_memory (cf::MAP_IN_MEMORY);
1287} 1268}
1288 1269
1289sub load_map_sync { 1270sub find_sync {
1290 my ($path, $origin) = @_; 1271 my ($path, $origin) = @_;
1291 1272
1292 #warn "load_map_sync<$path, $origin>\n";#d# 1273 cf::sync_job { cf::map::find $path, $origin }
1274}
1293 1275
1294 cf::sync_job { 1276sub do_load_sync {
1295 my $map = cf::map::find_map $path, $origin 1277 my ($map) = @_;
1296 or return; 1278
1297 $map->load; 1279 cf::sync_job { $map->load };
1298 $map
1299 }
1300} 1280}
1301 1281
1302sub save { 1282sub save {
1303 my ($self) = @_; 1283 my ($self) = @_;
1304 1284
1285 my $lock = cf::lock_acquire "map_data:" . $self->path;
1286
1305 $self->{last_save} = $cf::RUNTIME; 1287 $self->{last_save} = $cf::RUNTIME;
1306 1288
1307 return unless $self->dirty; 1289 return unless $self->dirty;
1308 1290
1309 my $save = $self->{path}->save_path; utf8::encode $save; 1291 my $save = $self->{path}->save_path; utf8::encode $save;
1310 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1292 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1311 1293
1312 $self->{load_path} = $save; 1294 $self->{load_path} = $save;
1313 1295
1314 return if $self->{deny_save}; 1296 return if $self->{deny_save};
1297
1298 local $self->{last_access} = $self->last_access;#d#
1315 1299
1316 if ($uniq) { 1300 if ($uniq) {
1317 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1301 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1318 $self->save_objects ($uniq, cf::IO_UNIQUES); 1302 $self->save_objects ($uniq, cf::IO_UNIQUES);
1319 } else { 1303 } else {
… …
1322} 1306}
1323 1307
1324sub swap_out { 1308sub swap_out {
1325 my ($self) = @_; 1309 my ($self) = @_;
1326 1310
1311 # save first because save cedes
1312 $self->save;
1313
1314 my $lock = cf::lock_acquire "map_data:" . $self->path;
1315
1327 return if $self->players; 1316 return if $self->players;
1328 return if $self->in_memory != cf::MAP_IN_MEMORY; 1317 return if $self->in_memory != cf::MAP_IN_MEMORY;
1329 return if $self->{deny_save}; 1318 return if $self->{deny_save};
1330 1319
1331 $self->save;
1332 $self->clear; 1320 $self->clear;
1333 $self->in_memory (cf::MAP_SWAPPED); 1321 $self->in_memory (cf::MAP_SWAPPED);
1334} 1322}
1335 1323
1336sub reset_at { 1324sub reset_at {
… …
1374} 1362}
1375 1363
1376sub reset { 1364sub reset {
1377 my ($self) = @_; 1365 my ($self) = @_;
1378 1366
1367 my $lock = cf::lock_acquire "map_data:" . $self->path;
1368
1379 return if $self->players; 1369 return if $self->players;
1380 return if $self->{path}{user_rel};#d# 1370 return if $self->{path}{user_rel};#d#
1381 1371
1382 warn "resetting map ", $self->path;#d# 1372 warn "resetting map ", $self->path;#d#
1383 1373
… …
1402 1392
1403sub customise_for { 1393sub customise_for {
1404 my ($map, $ob) = @_; 1394 my ($map, $ob) = @_;
1405 1395
1406 if ($map->per_player) { 1396 if ($map->per_player) {
1407 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1397 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1408 } 1398 }
1409 1399
1410 $map 1400 $map
1411} 1401}
1412 1402
1413sub emergency_save { 1403sub emergency_save {
1414 local $cf::FREEZE = 1; 1404 my $freeze_guard = cf::freeze_mainloop;
1415 1405
1416 warn "enter emergency map save\n"; 1406 warn "enter emergency map save\n";
1417 1407
1418 cf::sync_job { 1408 cf::sync_job {
1419 warn "begin emergency map save\n"; 1409 warn "begin emergency map save\n";
… …
1509 my $link_pos = delete $self->{_link_pos}; 1499 my $link_pos = delete $self->{_link_pos};
1510 1500
1511 unless ($map) { 1501 unless ($map) {
1512 # restore original map position 1502 # restore original map position
1513 ($map, $x, $y) = @{ $link_pos || [] }; 1503 ($map, $x, $y) = @{ $link_pos || [] };
1514 $map = cf::map::find_map $map; 1504 $map = cf::map::find $map;
1515 1505
1516 unless ($map) { 1506 unless ($map) {
1517 ($map, $x, $y) = @$EMERGENCY_POSITION; 1507 ($map, $x, $y) = @$EMERGENCY_POSITION;
1518 $map = cf::map::find_map $map 1508 $map = cf::map::find $map
1519 or die "FATAL: cannot load emergency map\n"; 1509 or die "FATAL: cannot load emergency map\n";
1520 } 1510 }
1521 } 1511 }
1522 1512
1523 ($x, $y) = (-1, -1) 1513 ($x, $y) = (-1, -1)
… …
1549 1539
1550 # try to abort aborted map switching on player login :) 1540 # try to abort aborted map switching on player login :)
1551 # should happen only on crashes 1541 # should happen only on crashes
1552 if ($pl->ob->{_link_pos}) { 1542 if ($pl->ob->{_link_pos}) {
1553 $pl->ob->enter_link; 1543 $pl->ob->enter_link;
1554 cf::async { 1544 Coro::async_pool {
1555 # we need this sleep as the login has a concurrent enter_exit running 1545 # we need this sleep as the login has a concurrent enter_exit running
1556 # and this sleep increases chances of the player not ending up in scorn 1546 # and this sleep increases chances of the player not ending up in scorn
1557 Coro::Timer::sleep 1; 1547 Coro::Timer::sleep 1;
1558 $pl->ob->leave_link; 1548 $pl->ob->leave_link;
1559 }; 1549 };
1560 } 1550 }
1561 }, 1551 },
1562); 1552);
1563 1553
1564=item $player_object->goto_map ($path, $x, $y) 1554=item $player_object->goto ($path, $x, $y)
1565 1555
1566=cut 1556=cut
1567 1557
1568sub cf::object::player::goto_map { 1558sub cf::object::player::goto {
1569 my ($self, $path, $x, $y) = @_; 1559 my ($self, $path, $x, $y) = @_;
1570 1560
1571 $self->enter_link; 1561 $self->enter_link;
1572 1562
1573 (cf::async { 1563 (Coro::async_pool {
1574 $path = new cf::path $path; 1564 $path = new cf::path $path;
1575 1565
1576 my $map = cf::map::find_map $path->as_string; 1566 my $map = cf::map::find $path->as_string;
1577 $map = $map->customise_for ($self) if $map; 1567 $map = $map->customise_for ($self) if $map;
1578 1568
1579# warn "entering ", $map->path, " at ($x, $y)\n" 1569# warn "entering ", $map->path, " at ($x, $y)\n"
1580# if $map; 1570# if $map;
1581 1571
… …
1640 1630
1641 return unless $self->type == cf::PLAYER; 1631 return unless $self->type == cf::PLAYER;
1642 1632
1643 $self->enter_link; 1633 $self->enter_link;
1644 1634
1645 (cf::async { 1635 (Coro::async_pool {
1636 $self->deactivate_recursive; # just to be sure
1646 unless (eval { 1637 unless (eval {
1647 prepare_random_map $exit 1638 prepare_random_map $exit
1648 if $exit->slaying eq "/!"; 1639 if $exit->slaying eq "/!";
1649 1640
1650 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1641 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1651 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1642 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1652 1643
1653 1; 1644 1;
1654 }) { 1645 }) {
1655 $self->message ("Something went wrong deep within the crossfire server. " 1646 $self->message ("Something went wrong deep within the crossfire server. "
1656 . "I'll try to bring you back to the map you were before. " 1647 . "I'll try to bring you back to the map you were before. "
… …
1741=cut 1732=cut
1742 1733
1743sub cf::client::coro { 1734sub cf::client::coro {
1744 my ($self, $cb) = @_; 1735 my ($self, $cb) = @_;
1745 1736
1746 my $coro = &cf::async ($cb); 1737 my $coro = &Coro::async_pool ($cb);
1747 1738
1748 $coro->on_destroy (sub { 1739 $coro->on_destroy (sub {
1749 delete $self->{_coro}{$coro+0}; 1740 delete $self->{_coro}{$coro+0};
1750 }); 1741 });
1751 1742
… …
1986 open my $fh, "<:utf8", cf::confdir . "/config" 1977 open my $fh, "<:utf8", cf::confdir . "/config"
1987 or return; 1978 or return;
1988 1979
1989 local $/; 1980 local $/;
1990 *CFG = YAML::Syck::Load <$fh>; 1981 *CFG = YAML::Syck::Load <$fh>;
1982
1983 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
1984
1985 if (exists $CFG{mlockall}) {
1986 eval {
1987 $CFG{mlockall} ? &mlockall : &munlockall
1988 and die "WARNING: m(un)lockall failed: $!\n";
1989 };
1990 warn $@ if $@;
1991 }
1991} 1992}
1992 1993
1993sub main { 1994sub main {
1994 # we must not ever block the main coroutine 1995 # we must not ever block the main coroutine
1995 local $Coro::idle = sub { 1996 local $Coro::idle = sub {
… …
2015 return; 2016 return;
2016 } 2017 }
2017 2018
2018 warn "reloading..."; 2019 warn "reloading...";
2019 2020
2020 local $FREEZE = 1; 2021 my $guard = freeze_mainloop;
2021 cf::emergency_save; 2022 cf::emergency_save;
2022 2023
2023 eval { 2024 eval {
2024 # if anything goes wrong in here, we should simply crash as we already saved 2025 # if anything goes wrong in here, we should simply crash as we already saved
2025 2026
… …
2161 reentrant => 0, 2162 reentrant => 0,
2162 prio => 0, 2163 prio => 0,
2163 at => $NEXT_TICK || $TICK, 2164 at => $NEXT_TICK || $TICK,
2164 data => WF_AUTOCANCEL, 2165 data => WF_AUTOCANCEL,
2165 cb => sub { 2166 cb => sub {
2166 unless ($FREEZE) {
2167 cf::server_tick; # one server iteration 2167 cf::server_tick; # one server iteration
2168 $RUNTIME += $TICK; 2168 $RUNTIME += $TICK;
2169 }
2170
2171 $NEXT_TICK += $TICK; 2169 $NEXT_TICK += $TICK;
2172 2170
2173 # if we are delayed by four ticks or more, skip them all 2171 # if we are delayed by four ticks or more, skip them all
2174 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2172 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2175 2173

Diff Legend

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