ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cf.schmorp.de/server/lib/cf.pm
(Generate patch)

Comparing cf.schmorp.de/server/lib/cf.pm (file contents):
Revision 1.167 by root, Sat Jan 13 23:32:43 2007 UTC vs.
Revision 1.200 by root, Mon Jan 29 17:57:22 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.5 ();
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;
… …
44our @EVENT; 44our @EVENT;
45our $LIBDIR = datadir . "/ext"; 45our $LIBDIR = datadir . "/ext";
46 46
47our $TICK = MAX_TIME * 1e-6; 47our $TICK = MAX_TIME * 1e-6;
48our $TICK_WATCHER; 48our $TICK_WATCHER;
49our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER;
49our $NEXT_TICK; 51our $NEXT_TICK;
50our $NOW; 52our $NOW;
51 53
52our %CFG; 54our %CFG;
53 55
… …
80mkdir cf::localdir . "/" . cf::tmpdir; 82mkdir cf::localdir . "/" . cf::tmpdir;
81mkdir cf::localdir . "/" . cf::uniquedir; 83mkdir cf::localdir . "/" . cf::uniquedir;
82mkdir $RANDOM_MAPS; 84mkdir $RANDOM_MAPS;
83 85
84our $EMERGENCY_POSITION; 86our $EMERGENCY_POSITION;
87
88sub cf::map::normalise;
85 89
86############################################################################# 90#############################################################################
87 91
88=head2 GLOBAL VARIABLES 92=head2 GLOBAL VARIABLES
89 93
… …
257} 261}
258 262
259sub freeze_mainloop { 263sub freeze_mainloop {
260 return unless $TICK_WATCHER->is_active; 264 return unless $TICK_WATCHER->is_active;
261 265
262 my $guard = Coro::guard { $TICK_WATCHER->start }; 266 my $guard = Coro::guard {
267 $TICK_WATCHER->start;
268 $WRITE_RUNTIME_WATCHER->start;
269 };
270 $WRITE_RUNTIME_WATCHER->stop;
263 $TICK_WATCHER->stop; 271 $TICK_WATCHER->stop;
264 $guard 272 $guard
265} 273}
266 274
267=item cf::async { BLOCK } 275=item cf::async { BLOCK }
… …
338 346
339 $coro 347 $coro
340} 348}
341 349
342sub write_runtime { 350sub write_runtime {
343 return unless $TICK_WATCHER->is_active;
344
345 my $runtime = cf::localdir . "/runtime"; 351 my $runtime = cf::localdir . "/runtime";
346 352
347 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 353 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
348 or return; 354 or return;
349 355
356 my $value = $cf::RUNTIME + 90 + 10;
350 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 357 # 10 is the runtime save interval, for a monotonic clock
358 # 60 allows for the watchdog to kill the server.
359
351 (aio_write $fh, 0, (length $value), $value, 0) <= 0 360 (aio_write $fh, 0, (length $value), $value, 0) <= 0
352 and return; 361 and return;
353 362
354 aio_fsync $fh 363 aio_fsync $fh
355 and return; 364 and return;
… …
499our @CB_TYPE = (); # registry for type (cf-object class) based events 508our @CB_TYPE = (); # registry for type (cf-object class) based events
500our @CB_MAP = (); 509our @CB_MAP = ();
501 510
502my %attachment; 511my %attachment;
503 512
513sub cf::attachable::thawer_merge {
514 # simply override everything except _meta
515 local $_[0]{_meta};
516 %{$_[0]} = %{$_[1]};
517}
518
504sub _attach_cb($$$$) { 519sub _attach_cb($$$$) {
505 my ($registry, $event, $prio, $cb) = @_; 520 my ($registry, $event, $prio, $cb) = @_;
506 521
507 use sort 'stable'; 522 use sort 'stable';
508 523
… …
679# object support 694# object support
680 695
681sub reattach { 696sub reattach {
682 # basically do the same as instantiate, without calling instantiate 697 # basically do the same as instantiate, without calling instantiate
683 my ($obj) = @_; 698 my ($obj) = @_;
699
700 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
684 701
685 my $registry = $obj->registry; 702 my $registry = $obj->registry;
686 703
687 @$registry = (); 704 @$registry = ();
688 705
… …
759 } 776 }
760 } else { 777 } else {
761 aio_unlink $filename; 778 aio_unlink $filename;
762 aio_unlink "$filename.pst"; 779 aio_unlink "$filename.pst";
763 } 780 }
781
782 #d##TODO# nuke non .map-files if exist
783 if ($filename =~ s/\.map$//) {
784 aio_unlink $filename;
785 aio_unlink "$filename.pst";
786 }
764 } 787 }
765} 788}
766 789
767sub object_freezer_as_string { 790sub object_freezer_as_string {
768 my ($rdata, $objs) = @_; 791 my ($rdata, $objs) = @_;
… …
774 797
775sub object_thawer_load { 798sub object_thawer_load {
776 my ($filename) = @_; 799 my ($filename) = @_;
777 800
778 my ($data, $av); 801 my ($data, $av);
802
803 #d#TODO remove .map if file does not exist
804 aio_stat $filename and $filename =~ s/\.map$//;
779 805
780 (aio_load $filename, $data) >= 0 806 (aio_load $filename, $data) >= 0
781 or return; 807 or return;
782 808
783 unless (aio_stat "$filename.pst") { 809 unless (aio_stat "$filename.pst") {
… …
945 971
946sub exists($) { 972sub exists($) {
947 my ($login) = @_; 973 my ($login) = @_;
948 974
949 $cf::PLAYER{$login} 975 $cf::PLAYER{$login}
950 or cf::sync_job { !aio_stat $login } 976 or cf::sync_job { !aio_stat path $login }
951} 977}
952 978
953sub find($) { 979sub find($) {
954 return $cf::PLAYER{$_[0]} || do { 980 return $cf::PLAYER{$_[0]} || do {
955 my $login = $_[0]; 981 my $login = $_[0];
… …
1063 for (@$files) { 1089 for (@$files) {
1064 utf8::decode $_; 1090 utf8::decode $_;
1065 next if /\.(?:pl|pst)$/; 1091 next if /\.(?:pl|pst)$/;
1066 next unless /^$PATH_SEP/o; 1092 next unless /^$PATH_SEP/o;
1067 1093
1068 s/\.map$//;
1069 push @paths, "~" . $pl->ob->name . "/" . $_; 1094 push @paths, cf::map::normalise "~" . $pl->ob->name . "/" . $_;
1070 } 1095 }
1071 1096
1072 \@paths 1097 \@paths
1073} 1098}
1074 1099
… …
1101 1126
1102use Fcntl; 1127use Fcntl;
1103use Coro::AIO; 1128use Coro::AIO;
1104 1129
1105use overload 1130use overload
1106 '""' => \&as_string; 1131 '""' => \&as_string,
1132 fallback => 1;
1107 1133
1108our $MAX_RESET = 3600; 1134our $MAX_RESET = 3600;
1109our $DEFAULT_RESET = 3000; 1135our $DEFAULT_RESET = 3000;
1110 1136
1111sub generate_random_map { 1137sub generate_random_map {
1112 my ($self, $rmp) = @_; 1138 my ($self, $rmp) = @_;
1113
1114 # mit "rum" bekleckern, nicht 1139 # mit "rum" bekleckern, nicht
1115 $self->_create_random_map ( 1140 $self->_create_random_map (
1116 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1141 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1117 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1142 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1118 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1143 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1125 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1150 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1126 (cf::region::find $rmp->{region}), $rmp->{custom} 1151 (cf::region::find $rmp->{region}), $rmp->{custom}
1127 ) 1152 )
1128} 1153}
1129 1154
1155=item cf::map->register ($regex, $prio)
1156
1157Register a handler for the map path matching the given regex at the
1158givne priority (higher is better, built-in handlers have priority 0, the
1159default).
1160
1161=cut
1162
1130sub register { 1163sub register {
1131 my (undef, $regex) = @_; 1164 my (undef, $regex, $prio) = @_;
1132 my $pkg = caller; 1165 my $pkg = caller;
1133 1166
1134 no strict; 1167 no strict;
1135 push @{"$pkg\::ISA"}, __PACKAGE__; 1168 push @{"$pkg\::ISA"}, __PACKAGE__;
1136 1169
1137 $EXT_MAP{$pkg} = qr<$regex>; 1170 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1138} 1171}
1139 1172
1140# also paths starting with '/' 1173# also paths starting with '/'
1141$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1174$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1175
1176sub thawer_merge {
1177 my ($self, $merge) = @_;
1178
1179 # we have to keep some variables in memory intact
1180 local $self->{path};
1181 local $self->{load_path};
1182 local $self->{deny_save};
1183 local $self->{deny_reset};
1184
1185 $self->SUPER::thawer_merge ($merge);
1186}
1142 1187
1143sub normalise { 1188sub normalise {
1144 my ($path, $base) = @_; 1189 my ($path, $base) = @_;
1190
1191 $path = "$path"; # make sure its a string
1192
1193 $path =~ s/\.map$//;
1145 1194
1146 # map plan: 1195 # map plan:
1147 # 1196 #
1148 # /! non-realised random map exit (special hack!) 1197 # /! non-realised random map exit (special hack!)
1149 # {... are special paths that are not being touched 1198 # {... are special paths that are not being touched
… …
1177 1226
1178 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1227 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1179 1228
1180 $path = normalise $path, $base; 1229 $path = normalise $path, $base;
1181 1230
1182 for my $pkg (keys %EXT_MAP) { 1231 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1183 if ($path =~ $EXT_MAP{$pkg}) { 1232 if ($path =~ $EXT_MAP{$pkg}[1]) {
1184 my $self = bless cf::map::new, $pkg; 1233 my $self = bless cf::map::new, $pkg;
1185 $self->{path} = $path; $self->path ($path); 1234 $self->{path} = $path; $self->path ($path);
1186 $self->init; # pass $1 etc. 1235 $self->init; # pass $1 etc.
1187 return $self; 1236 return $self;
1188 } 1237 }
1189 } 1238 }
1190 1239
1191 Carp::carp "unable to resolve path '$path'."; 1240 Carp::carp "unable to resolve path '$path' (base '$base').";
1192 () 1241 ()
1193} 1242}
1194 1243
1195sub init { 1244sub init {
1196 my ($self) = @_; 1245 my ($self) = @_;
… …
1211 1260
1212# the original (read-only) location 1261# the original (read-only) location
1213sub load_path { 1262sub load_path {
1214 my ($self) = @_; 1263 my ($self) = @_;
1215 1264
1216 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1265 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1217} 1266}
1218 1267
1219# the temporary/swap location 1268# the temporary/swap location
1220sub save_path { 1269sub save_path {
1221 my ($self) = @_; 1270 my ($self) = @_;
1222 1271
1223 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1272 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1224 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1273 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1225} 1274}
1226 1275
1227# the unique path, undef == no special unique path 1276# the unique path, undef == no special unique path
1228sub uniq_path { 1277sub uniq_path {
1229 my ($self) = @_; 1278 my ($self) = @_;
… …
1243 1292
1244sub unlink_save { 1293sub unlink_save {
1245 my ($self) = @_; 1294 my ($self) = @_;
1246 1295
1247 utf8::encode (my $save = $self->save_path); 1296 utf8::encode (my $save = $self->save_path);
1248 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; 1297 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1249 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst"; 1298 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1299
1300 #d#TODO remove .map and also nuke
1301 $save =~ s/\.map// or return;#d#
1302 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1303 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1250} 1304}
1251 1305
1252sub load_header_from($) { 1306sub load_header_from($) {
1253 my ($self, $path) = @_; 1307 my ($self, $path) = @_;
1254 1308
1255 utf8::encode $path; 1309 utf8::encode $path;
1256 aio_open $path, O_RDONLY, 0 1310 #aio_open $path, O_RDONLY, 0
1257 or return; 1311 # or return;
1258 1312
1259 $self->_load_header ($path) 1313 $self->_load_header ($path)
1260 or return; 1314 or return;
1261 1315
1262 $self->{load_path} = $path; 1316 $self->{load_path} = $path;
1263 1317
1264 1 1318 1
1265} 1319}
1266 1320
1267sub load_orig { 1321sub load_header_orig {
1268 my ($self) = @_; 1322 my ($self) = @_;
1269 1323
1270 $self->load_header_from ($self->load_path) 1324 $self->load_header_from ($self->load_path)
1271} 1325}
1272 1326
1273sub load_temp { 1327sub load_header_temp {
1274 my ($self) = @_; 1328 my ($self) = @_;
1275 1329
1276 $self->load_header_from ($self->save_path) 1330 $self->load_header_from ($self->save_path)
1331}
1332
1333sub prepare_temp {
1334 my ($self) = @_;
1335
1336 $self->last_access ((delete $self->{last_access})
1337 || $cf::RUNTIME); #d#
1338 # safety
1339 $self->{instantiate_time} = $cf::RUNTIME
1340 if $self->{instantiate_time} > $cf::RUNTIME;
1341}
1342
1343sub prepare_orig {
1344 my ($self) = @_;
1345
1346 $self->{load_original} = 1;
1347 $self->{instantiate_time} = $cf::RUNTIME;
1348 $self->last_access ($cf::RUNTIME);
1349 $self->instantiate;
1277} 1350}
1278 1351
1279sub load_header { 1352sub load_header {
1280 my ($self) = @_; 1353 my ($self) = @_;
1281 1354
1282 if ($self->load_temp) { 1355 if ($self->load_header_temp) {
1283 $self->last_access ((delete $self->{last_access}) 1356 $self->prepare_temp;
1284 || $cf::RUNTIME); #d#
1285 # safety
1286 $self->{instantiate_time} = $cf::RUNTIME
1287 if $self->{instantiate_time} > $cf::RUNTIME;
1288 } else { 1357 } else {
1289 $self->load_orig 1358 $self->load_header_orig
1290 or return; 1359 or return;
1291 1360 $self->prepare_orig;
1292 $self->{load_original} = 1;
1293 $self->{instantiate_time} = $cf::RUNTIME;
1294 $self->last_access ($cf::RUNTIME);
1295 $self->instantiate;
1296 } 1361 }
1297 1362
1298 1 1363 1
1299} 1364}
1300 1365
… …
1314 $map->{last_save} = $cf::RUNTIME; 1379 $map->{last_save} = $cf::RUNTIME;
1315 1380
1316 $map->load_header 1381 $map->load_header
1317 or return; 1382 or return;
1318 1383
1319 if ($map->should_reset) { 1384 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1385 # doing this can freeze the server in a sync job, obviously
1386 #$cf::WAIT_FOR_TICK->wait;
1320 $map->reset; 1387 $map->reset;
1321 undef $guard; 1388 undef $guard;
1322 $map = find $path 1389 return find $path;
1323 or return;
1324 } 1390 }
1325 1391
1326 $cf::MAP{$path} = $map 1392 $cf::MAP{$path} = $map
1327 } 1393 }
1328} 1394}
1395
1396sub pre_load { }
1397sub post_load { }
1329 1398
1330sub load { 1399sub load {
1331 my ($self) = @_; 1400 my ($self) = @_;
1332 1401
1402 local $self->{deny_reset} = 1; # loading can take a long time
1403
1333 my $path = $self->{path}; 1404 my $path = $self->{path};
1334 my $guard = cf::lock_acquire "map_load:$path"; 1405 my $guard = cf::lock_acquire "map_load:$path";
1335 1406
1336 return if $self->in_memory != cf::MAP_SWAPPED; 1407 return if $self->in_memory != cf::MAP_SWAPPED;
1337 1408
1338 $self->in_memory (cf::MAP_LOADING); 1409 $self->in_memory (cf::MAP_LOADING);
1339 1410
1340 $self->alloc; 1411 $self->alloc;
1412
1413 $self->pre_load;
1414
1341 $self->_load_objects ($self->{load_path}, 1) 1415 $self->_load_objects ($self->{load_path}, 1)
1342 or return; 1416 or return;
1343 1417
1344 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1418 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1345 if delete $self->{load_original}; 1419 if delete $self->{load_original};
… …
1367 unless $self->difficulty; 1441 unless $self->difficulty;
1368 Coro::cede; 1442 Coro::cede;
1369 $self->activate; 1443 $self->activate;
1370 } 1444 }
1371 1445
1446 $self->post_load;
1447
1372 $self->in_memory (cf::MAP_IN_MEMORY); 1448 $self->in_memory (cf::MAP_IN_MEMORY);
1373} 1449}
1374 1450
1375sub customise_for { 1451sub customise_for {
1376 my ($self, $ob) = @_; 1452 my ($self, $ob) = @_;
… …
1416 1492
1417 cf::sync_job { $map->load }; 1493 cf::sync_job { $map->load };
1418} 1494}
1419 1495
1420our %MAP_PREFETCH; 1496our %MAP_PREFETCH;
1421our $MAP_PREFETCHER = Coro::async { 1497our $MAP_PREFETCHER = undef;
1422 while () {
1423 for my $path (keys %MAP_PREFETCH) {
1424 my $map = find $path
1425 or next;
1426 $map->load;
1427
1428 delete $MAP_PREFETCH{$path};
1429 }
1430 Coro::schedule;
1431 }
1432};
1433 1498
1434sub find_async { 1499sub find_async {
1435 my ($path, $origin) = @_; 1500 my ($path, $origin) = @_;
1436 1501
1437 $path = normalise $path, $origin && $origin->{path}; 1502 $path = normalise $path, $origin && $origin->{path};
1438 1503
1439 if (my $map = $cf::MAP{$path}) { 1504 if (my $map = $cf::MAP{$path}) {
1440 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1505 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1441 } 1506 }
1442 1507
1443 $MAP_PREFETCH{$path} = 0; 1508 undef $MAP_PREFETCH{$path};
1509 $MAP_PREFETCHER ||= cf::async {
1510 while (%MAP_PREFETCH) {
1511 for my $path (keys %MAP_PREFETCH) {
1512 my $map = find $path
1513 or next;
1514 $map->load;
1515
1516 delete $MAP_PREFETCH{$path};
1517 }
1518 }
1519 undef $MAP_PREFETCHER;
1520 };
1444 $MAP_PREFETCHER->ready; 1521 $MAP_PREFETCHER->prio (6);
1445 1522
1446 () 1523 ()
1447} 1524}
1448 1525
1449sub save { 1526sub save {
… …
1494 1571
1495sub reset_at { 1572sub reset_at {
1496 my ($self) = @_; 1573 my ($self) = @_;
1497 1574
1498 # TODO: safety, remove and allow resettable per-player maps 1575 # TODO: safety, remove and allow resettable per-player maps
1499 return 1e99 if $self->isa ("ext::map_per_player"); 1576 return 1e99 if $self->isa ("ext::map_per_player");#d#
1500 return 1e99 if $self->{deny_reset}; 1577 return 1e99 if $self->{deny_reset};
1501 1578
1502 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1579 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1503 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1580 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1504 1581
… …
1509 my ($self) = @_; 1586 my ($self) = @_;
1510 1587
1511 $self->reset_at <= $cf::RUNTIME 1588 $self->reset_at <= $cf::RUNTIME
1512} 1589}
1513 1590
1514sub rename {
1515 my ($self, $new_path) = @_;
1516
1517 normalise $new_path;
1518
1519 $self->unlink_save;
1520
1521 delete $cf::MAP{$self->path};
1522 $self->{path} = $new_path; $self->path ($self->{path});
1523 $cf::MAP{$self->path} = $self;
1524
1525 $self->save;
1526}
1527
1528sub reset { 1591sub reset {
1529 my ($self) = @_; 1592 my ($self) = @_;
1530 1593
1531 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1594 my $lock = cf::lock_acquire "map_data:$self->{path}";
1532 1595
… …
1549my $nuke_counter = "aaaa"; 1612my $nuke_counter = "aaaa";
1550 1613
1551sub nuke { 1614sub nuke {
1552 my ($self) = @_; 1615 my ($self) = @_;
1553 1616
1617 delete $cf::MAP{$self->path};
1618
1619 $self->unlink_save;
1620
1621 bless $self, "cf::map";
1622 delete $self->{deny_reset};
1554 $self->{deny_save} = 1; 1623 $self->{deny_save} = 1;
1555 $self->reset_timeout (1); 1624 $self->reset_timeout (1);
1556 $self->rename ("{nuke}/" . ($nuke_counter++)); 1625 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1626
1627 $cf::MAP{$self->path} = $self;
1628
1557 $self->reset; # polite request, might not happen 1629 $self->reset; # polite request, might not happen
1558} 1630}
1559 1631
1560=item cf::map::unique_maps 1632=item cf::map::unique_maps
1561 1633
… …
1573 for (@$files) { 1645 for (@$files) {
1574 utf8::decode $_; 1646 utf8::decode $_;
1575 next if /\.pst$/; 1647 next if /\.pst$/;
1576 next unless /^$PATH_SEP/o; 1648 next unless /^$PATH_SEP/o;
1577 1649
1578 s/\.map$//; 1650 push @paths, cf::map::normalise $_;
1579 push @paths, $_;
1580 } 1651 }
1581 1652
1582 \@paths 1653 \@paths
1583} 1654}
1584 1655
… …
1678=cut 1749=cut
1679 1750
1680sub link_map { 1751sub link_map {
1681 unless ($LINK_MAP) { 1752 unless ($LINK_MAP) {
1682 $LINK_MAP = cf::map::find "{link}" 1753 $LINK_MAP = cf::map::find "{link}"
1683 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1754 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1684 $LINK_MAP->load; 1755 $LINK_MAP->load;
1685 } 1756 }
1686 1757
1687 $LINK_MAP 1758 $LINK_MAP
1688} 1759}
… …
1695 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1766 return if UNIVERSAL::isa $self->map, "ext::map_link";
1696 1767
1697 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1768 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1698 if $self->map; 1769 if $self->map;
1699 1770
1700 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1771 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1701} 1772}
1702 1773
1703sub cf::object::player::leave_link { 1774sub cf::object::player::leave_link {
1704 my ($self, $map, $x, $y) = @_; 1775 my ($self, $map, $x, $y) = @_;
1705 1776
… …
1772 my ($self, $path, $x, $y) = @_; 1843 my ($self, $path, $x, $y) = @_;
1773 1844
1774 $self->enter_link; 1845 $self->enter_link;
1775 1846
1776 (async { 1847 (async {
1848 my $map = eval {
1777 my $map = cf::map::find $path; 1849 my $map = cf::map::find $path;
1778 $map = $map->customise_for ($self) if $map; 1850 $map = $map->customise_for ($self) if $map;
1779 1851 $map
1780# warn "entering ", $map->path, " at ($x, $y)\n" 1852 } or
1781# if $map;
1782
1783 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1853 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1784 1854
1785 $self->leave_link ($map, $x, $y); 1855 $self->leave_link ($map, $x, $y);
1786 })->prio (1); 1856 })->prio (1);
1787} 1857}
1788 1858
… …
1792 1862
1793sub parse_random_map_params { 1863sub parse_random_map_params {
1794 my ($spec) = @_; 1864 my ($spec) = @_;
1795 1865
1796 my $rmp = { # defaults 1866 my $rmp = { # defaults
1797 xsize => 10, 1867 xsize => (cf::rndm 15, 40),
1798 ysize => 10, 1868 ysize => (cf::rndm 15, 40),
1869 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1870 #layout => string,
1799 }; 1871 };
1800 1872
1801 for (split /\n/, $spec) { 1873 for (split /\n/, $spec) {
1802 my ($k, $v) = split /\s+/, $_, 2; 1874 my ($k, $v) = split /\s+/, $_, 2;
1803 1875
… …
1807 $rmp 1879 $rmp
1808} 1880}
1809 1881
1810sub prepare_random_map { 1882sub prepare_random_map {
1811 my ($exit) = @_; 1883 my ($exit) = @_;
1884
1885 my $guard = cf::lock_acquire "exit_prepare:$exit";
1812 1886
1813 # all this does is basically replace the /! path by 1887 # all this does is basically replace the /! path by
1814 # a new random map path (?random/...) with a seed 1888 # a new random map path (?random/...) with a seed
1815 # that depends on the exit object 1889 # that depends on the exit object
1816 1890
1817 my $rmp = parse_random_map_params $exit->msg; 1891 my $rmp = parse_random_map_params $exit->msg;
1818 1892
1819 if ($exit->map) { 1893 if ($exit->map) {
1820 $rmp->{region} = $exit->map->region_name; 1894 $rmp->{region} = $exit->region->name;
1821 $rmp->{origin_map} = $exit->map->path; 1895 $rmp->{origin_map} = $exit->map->path;
1822 $rmp->{origin_x} = $exit->x; 1896 $rmp->{origin_x} = $exit->x;
1823 $rmp->{origin_y} = $exit->y; 1897 $rmp->{origin_y} = $exit->y;
1824 } 1898 }
1825 1899
1826 $rmp->{random_seed} ||= $exit->random_seed; 1900 $rmp->{random_seed} ||= $exit->random_seed;
1827 1901
1828 my $data = cf::to_json $rmp; 1902 my $data = cf::to_json $rmp;
1829 my $md5 = Digest::MD5::md5_hex $data; 1903 my $md5 = Digest::MD5::md5_hex $data;
1904 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1830 1905
1831 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1906 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1832 aio_write $fh, 0, (length $data), $data, 0; 1907 aio_write $fh, 0, (length $data), $data, 0;
1908 undef $fh;
1909 aio_rename "$meta~", $meta;
1833 1910
1834 $exit->slaying ("?random/$md5"); 1911 $exit->slaying ("?random/$md5");
1835 $exit->msg (undef); 1912 $exit->msg (undef);
1836 } 1913 }
1837} 1914}
1838 1915
1839sub cf::object::player::enter_exit { 1916sub cf::object::player::enter_exit {
1840 my ($self, $exit) = @_; 1917 my ($self, $exit) = @_;
1841 1918
1842 return unless $self->type == cf::PLAYER; 1919 return unless $self->type == cf::PLAYER;
1920
1921 if ($exit->slaying eq "/!") {
1922 #TODO: this should de-fi-ni-te-ly not be a sync-job
1923 cf::sync_job { prepare_random_map $exit };
1924 }
1925
1926 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1927 my $hp = $exit->stats->hp;
1928 my $sp = $exit->stats->sp;
1843 1929
1844 $self->enter_link; 1930 $self->enter_link;
1845 1931
1846 (async { 1932 (async {
1847 $self->deactivate_recursive; # just to be sure 1933 $self->deactivate_recursive; # just to be sure
1848 unless (eval { 1934 unless (eval {
1849 prepare_random_map $exit 1935 $self->goto ($slaying, $hp, $sp);
1850 if $exit->slaying eq "/!";
1851
1852 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1853 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1854 1936
1855 1; 1937 1;
1856 }) { 1938 }) {
1857 $self->message ("Something went wrong deep within the crossfire server. " 1939 $self->message ("Something went wrong deep within the crossfire server. "
1858 . "I'll try to bring you back to the map you were before. " 1940 . "I'll try to bring you back to the map you were before. "
… …
2147 sub db_sync() { 2229 sub db_sync() {
2148 db_save if $dirty; 2230 db_save if $dirty;
2149 undef $dirty; 2231 undef $dirty;
2150 } 2232 }
2151 2233
2152 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2234 my $idle = Event->idle (
2153 db_sync; 2235 reentrant => 0,
2236 min => 10,
2237 max => 20,
2238 repeat => 0,
2239 data => WF_AUTOCANCEL,
2240 cb => \&db_sync,
2154 }); 2241 );
2155 2242
2156 sub db_dirty() { 2243 sub db_dirty() {
2157 $dirty = 1; 2244 $dirty = 1;
2158 $idle->start; 2245 $idle->start;
2159 } 2246 }
… …
2207 2294
2208sub main { 2295sub main {
2209 # we must not ever block the main coroutine 2296 # we must not ever block the main coroutine
2210 local $Coro::idle = sub { 2297 local $Coro::idle = sub {
2211 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2298 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2299 (async {
2212 async { Event::one_event }; 2300 Event::one_event;
2301 })->prio (Coro::PRIO_MAX);
2213 }; 2302 };
2214 2303
2215 cfg_load; 2304 cfg_load;
2216 db_load; 2305 db_load;
2217 load_extensions; 2306 load_extensions;
2307
2308 $TICK_WATCHER->start;
2218 Event::loop; 2309 Event::loop;
2219} 2310}
2220 2311
2221############################################################################# 2312#############################################################################
2222# initialisation and cleanup 2313# initialisation and cleanup
2223 2314
2224# install some emergency cleanup handlers 2315# install some emergency cleanup handlers
2225BEGIN { 2316BEGIN {
2226 for my $signal (qw(INT HUP TERM)) { 2317 for my $signal (qw(INT HUP TERM)) {
2227 Event->signal ( 2318 Event->signal (
2319 reentrant => 0,
2228 data => WF_AUTOCANCEL, 2320 data => WF_AUTOCANCEL,
2229 signal => $signal, 2321 signal => $signal,
2322 prio => 0,
2230 cb => sub { 2323 cb => sub {
2231 cf::cleanup "SIG$signal"; 2324 cf::cleanup "SIG$signal";
2232 }, 2325 },
2233 ); 2326 );
2234 } 2327 }
2235} 2328}
… …
2264} 2357}
2265 2358
2266sub reload() { 2359sub reload() {
2267 # can/must only be called in main 2360 # can/must only be called in main
2268 if ($Coro::current != $Coro::main) { 2361 if ($Coro::current != $Coro::main) {
2269 warn "can only reload from main coroutine\n"; 2362 warn "can only reload from main coroutine";
2270 return; 2363 return;
2271 } 2364 }
2272 2365
2273 warn "reloading..."; 2366 warn "reloading...";
2274 2367
2275 warn "freezing server"; 2368 warn "cancelling server ticker";
2276 my $guard = freeze_mainloop; 2369 $TICK_WATCHER->cancel;
2370
2277 cf::emergency_save; 2371 cf::emergency_save;
2278
2279 warn "sync database to disk";
2280 cf::db_sync;
2281 IO::AIO::flush;
2282 2372
2283 eval { 2373 eval {
2284 # if anything goes wrong in here, we should simply crash as we already saved 2374 # if anything goes wrong in here, we should simply crash as we already saved
2285 2375
2376 warn "syncing database to disk";
2377 cf::db_sync;
2378
2286 warn "cancel all watchers"; 2379 warn "cancelling all WF_AUTOCANCEL watchers";
2287 for (Event::all_watchers) { 2380 for (Event::all_watchers) {
2288 $_->cancel if $_->data & WF_AUTOCANCEL; 2381 $_->cancel if $_->data & WF_AUTOCANCEL;
2289 } 2382 }
2290 2383
2384 warn "flushing outstanding aio requests";
2385 for (;;) {
2386 IO::AIO::flush;
2387 Coro::cede;
2388 last unless IO::AIO::nreqs;
2389 warn "iterate...";
2390 }
2391
2291 warn "cancel all extension coros"; 2392 warn "cancelling all extension coros";
2292 $_->cancel for values %EXT_CORO; 2393 $_->cancel for values %EXT_CORO;
2293 %EXT_CORO = (); 2394 %EXT_CORO = ();
2294 2395
2295 warn "remove commands"; 2396 warn "removing commands";
2296 %COMMAND = (); 2397 %COMMAND = ();
2297 2398
2298 warn "remove ext commands"; 2399 warn "removing ext commands";
2299 %EXTCMD = (); 2400 %EXTCMD = ();
2300 2401
2301 warn "unload/nuke all extensions"; 2402 warn "unloading/nuking all extensions";
2302 for my $pkg (@EXTS) { 2403 for my $pkg (@EXTS) {
2303 warn "... unloading $pkg"; 2404 warn "... unloading $pkg";
2304 2405
2305 if (my $cb = $pkg->can ("unload")) { 2406 if (my $cb = $pkg->can ("unload")) {
2306 eval { 2407 eval {
… …
2311 2412
2312 warn "... nuking $pkg"; 2413 warn "... nuking $pkg";
2313 Symbol::delete_package $pkg; 2414 Symbol::delete_package $pkg;
2314 } 2415 }
2315 2416
2316 warn "unload all perl modules loaded from $LIBDIR"; 2417 warn "unloading all perl modules loaded from $LIBDIR";
2317 while (my ($k, $v) = each %INC) { 2418 while (my ($k, $v) = each %INC) {
2318 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2419 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2319 2420
2320 warn "removing <$k>"; 2421 warn "... unloading $k";
2321 delete $INC{$k}; 2422 delete $INC{$k};
2322 2423
2323 $k =~ s/\.pm$//; 2424 $k =~ s/\.pm$//;
2324 $k =~ s/\//::/g; 2425 $k =~ s/\//::/g;
2325 2426
… …
2328 } 2429 }
2329 2430
2330 Symbol::delete_package $k; 2431 Symbol::delete_package $k;
2331 } 2432 }
2332 2433
2333 warn "get rid of safe::, as good as possible"; 2434 warn "getting rid of safe::, as good as possible";
2334 Symbol::delete_package "safe::$_" 2435 Symbol::delete_package "safe::$_"
2335 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2436 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2336 2437
2337 warn "unload cf.pm \"a bit\""; 2438 warn "unloading cf.pm \"a bit\"";
2338 delete $INC{"cf.pm"}; 2439 delete $INC{"cf.pm"};
2339 2440
2340 # don't, removes xs symbols, too, 2441 # don't, removes xs symbols, too,
2341 # and global variables created in xs 2442 # and global variables created in xs
2342 #Symbol::delete_package __PACKAGE__; 2443 #Symbol::delete_package __PACKAGE__;
2343 2444
2445 warn "unload completed, starting to reload now";
2446
2344 warn "reloading cf.pm"; 2447 warn "reloading cf.pm";
2345 require cf; 2448 require cf;
2346 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2449 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2347 2450
2348 warn "load config and database again"; 2451 warn "loading config and database again";
2349 cf::cfg_load; 2452 cf::cfg_load;
2350 cf::db_load; 2453 cf::db_load;
2351 2454
2352 warn "load extensions"; 2455 warn "loading extensions";
2353 cf::load_extensions; 2456 cf::load_extensions;
2354 2457
2355 warn "reattach attachments to objects/players"; 2458 warn "reattaching attachments to objects/players";
2356 _global_reattach; 2459 _global_reattach;
2357 warn "reattach attachments to maps"; 2460 warn "reattaching attachments to maps";
2358 reattach $_ for values %MAP; 2461 reattach $_ for values %MAP;
2462
2463 warn "restarting server ticker";
2464
2465 $TICK_WATCHER->start;
2359 }; 2466 };
2360 2467
2361 if ($@) { 2468 if ($@) {
2362 warn $@; 2469 warn $@;
2363 warn "error while reloading, exiting."; 2470 warn "error while reloading, exiting.";
… …
2365 } 2472 }
2366 2473
2367 warn "reloaded"; 2474 warn "reloaded";
2368}; 2475};
2369 2476
2477our $RELOAD_WATCHER; # used only during reload
2478
2370register_command "reload" => sub { 2479register_command "reload" => sub {
2371 my ($who, $arg) = @_; 2480 my ($who, $arg) = @_;
2372 2481
2373 if ($who->flag (FLAG_WIZ)) { 2482 if ($who->flag (FLAG_WIZ)) {
2374 $who->message ("start of reload."); 2483 $who->message ("reloading server.");
2484
2485 # doing reload synchronously and two reloads happen back-to-back,
2486 # coro crashes during coro_state_free->destroy here.
2487
2488 $RELOAD_WATCHER ||= Event->timer (
2489 reentrant => 0,
2490 after => 0,
2491 data => WF_AUTOCANCEL,
2492 cb => sub {
2375 reload; 2493 reload;
2376 $who->message ("end of reload."); 2494 undef $RELOAD_WATCHER;
2495 },
2496 );
2377 } 2497 }
2378}; 2498};
2379 2499
2380unshift @INC, $LIBDIR; 2500unshift @INC, $LIBDIR;
2501
2502my $bug_warning = 0;
2381 2503
2382$TICK_WATCHER = Event->timer ( 2504$TICK_WATCHER = Event->timer (
2383 reentrant => 0, 2505 reentrant => 0,
2506 parked => 1,
2384 prio => 0, 2507 prio => 0,
2385 at => $NEXT_TICK || $TICK, 2508 at => $NEXT_TICK || $TICK,
2386 data => WF_AUTOCANCEL, 2509 data => WF_AUTOCANCEL,
2387 cb => sub { 2510 cb => sub {
2511 if ($Coro::current != $Coro::main) {
2512 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2513 unless ++$bug_warning > 10;
2514 return;
2515 }
2516
2388 $NOW = Event::time; 2517 $NOW = Event::time;
2389 2518
2390 cf::server_tick; # one server iteration 2519 cf::server_tick; # one server iteration
2391 $RUNTIME += $TICK; 2520 $RUNTIME += $TICK;
2392 $NEXT_TICK += $TICK; 2521 $NEXT_TICK += $TICK;
2393 2522
2394 $WAIT_FOR_TICK->broadcast; 2523 $WAIT_FOR_TICK->broadcast;
2395 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2524 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2525
2526 Event::sweep;
2527 Coro::cede_notself;
2528
2529# my $AFTER = Event::time;
2530# warn $AFTER - $NOW;#d#
2396 2531
2397 # if we are delayed by four ticks or more, skip them all 2532 # if we are delayed by four ticks or more, skip them all
2398 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2533 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2399 2534
2400 $TICK_WATCHER->at ($NEXT_TICK); 2535 $TICK_WATCHER->at ($NEXT_TICK);
2401 $TICK_WATCHER->start; 2536 $TICK_WATCHER->start;
2402 }, 2537 },
2403); 2538);
2404 2539
2405IO::AIO::max_poll_time $TICK * 0.2; 2540IO::AIO::max_poll_time $TICK * 0.1;
2406 2541
2407Event->io ( 2542undef $Coro::AIO::WATCHER;
2543$AIO_POLL_WATCHER = Event->io (
2544 reentrant => 0,
2408 fd => IO::AIO::poll_fileno, 2545 fd => IO::AIO::poll_fileno,
2409 poll => 'r', 2546 poll => 'r',
2410 prio => 5, 2547 prio => 6,
2411 data => WF_AUTOCANCEL, 2548 data => WF_AUTOCANCEL,
2412 cb => \&IO::AIO::poll_cb, 2549 cb => \&IO::AIO::poll_cb,
2413); 2550);
2414 2551
2415Event->timer ( 2552$WRITE_RUNTIME_WATCHER = Event->timer (
2553 reentrant => 0,
2416 data => WF_AUTOCANCEL, 2554 data => WF_AUTOCANCEL,
2417 after => 0, 2555 after => 1,
2418 interval => 10, 2556 interval => 10,
2419 cb => sub { 2557 prio => 6, # keep it lowest so it acts like a watchdog
2420 (Coro::unblock_sub { 2558 cb => Coro::unblock_sub {
2421 write_runtime 2559 write_runtime
2422 or warn "ERROR: unable to write runtime file: $!"; 2560 or warn "ERROR: unable to write runtime file: $!";
2423 })->();
2424 }, 2561 },
2425); 2562);
2426 2563
2427END { cf::emergency_save } 2564END { cf::emergency_save }
2428 2565

Diff Legend

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