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.171 by root, Sun Jan 14 12:24:48 2007 UTC vs.
Revision 1.195 by root, Fri Jan 26 20:59:57 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;
… …
349 my $runtime = cf::localdir . "/runtime"; 349 my $runtime = cf::localdir . "/runtime";
350 350
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
352 or return; 352 or return;
353 353
354 my $value = $cf::RUNTIME + 90 + 10;
354 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 355 # 10 is the runtime save interval, for a monotonic clock
356 # 60 allows for the watchdog to kill the server.
357
355 (aio_write $fh, 0, (length $value), $value, 0) <= 0 358 (aio_write $fh, 0, (length $value), $value, 0) <= 0
356 and return; 359 and return;
357 360
358 aio_fsync $fh 361 aio_fsync $fh
359 and return; 362 and return;
… …
957 960
958sub exists($) { 961sub exists($) {
959 my ($login) = @_; 962 my ($login) = @_;
960 963
961 $cf::PLAYER{$login} 964 $cf::PLAYER{$login}
962 or cf::sync_job { !aio_stat $login } 965 or cf::sync_job { !aio_stat path $login }
963} 966}
964 967
965sub find($) { 968sub find($) {
966 return $cf::PLAYER{$_[0]} || do { 969 return $cf::PLAYER{$_[0]} || do {
967 my $login = $_[0]; 970 my $login = $_[0];
… …
1113 1116
1114use Fcntl; 1117use Fcntl;
1115use Coro::AIO; 1118use Coro::AIO;
1116 1119
1117use overload 1120use overload
1118 '""' => \&as_string; 1121 '""' => \&as_string,
1122 fallback => 1;
1119 1123
1120our $MAX_RESET = 3600; 1124our $MAX_RESET = 3600;
1121our $DEFAULT_RESET = 3000; 1125our $DEFAULT_RESET = 3000;
1122 1126
1123sub generate_random_map { 1127sub generate_random_map {
1124 my ($self, $rmp) = @_; 1128 my ($self, $rmp) = @_;
1125
1126 # mit "rum" bekleckern, nicht 1129 # mit "rum" bekleckern, nicht
1127 $self->_create_random_map ( 1130 $self->_create_random_map (
1128 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1131 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1129 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1132 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1130 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1133 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1140 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1138 (cf::region::find $rmp->{region}), $rmp->{custom} 1141 (cf::region::find $rmp->{region}), $rmp->{custom}
1139 ) 1142 )
1140} 1143}
1141 1144
1145=item cf::map->register ($regex, $prio)
1146
1147Register a handler for the map path matching the given regex at the
1148givne priority (higher is better, built-in handlers have priority 0, the
1149default).
1150
1151=cut
1152
1142sub register { 1153sub register {
1143 my (undef, $regex) = @_; 1154 my (undef, $regex, $prio) = @_;
1144 my $pkg = caller; 1155 my $pkg = caller;
1145 1156
1146 no strict; 1157 no strict;
1147 push @{"$pkg\::ISA"}, __PACKAGE__; 1158 push @{"$pkg\::ISA"}, __PACKAGE__;
1148 1159
1149 $EXT_MAP{$pkg} = qr<$regex>; 1160 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1150} 1161}
1151 1162
1152# also paths starting with '/' 1163# also paths starting with '/'
1153$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1164$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1154 1165
1155sub thawer_merge { 1166sub thawer_merge {
1167 my ($self, $merge) = @_;
1168
1156 # we have to keep some variables in memory intact 1169 # we have to keep some variables in memory intact
1157 local $_[0]{path}; 1170 local $self->{path};
1171 local $self->{load_path};
1158 local $_[0]{deny_save}; 1172 local $self->{deny_save};
1159 local $_[0]{deny_reset}; 1173 local $self->{deny_reset};
1160 1174
1161 $_[0]->SUPER::thawer_merge ($_[1]); 1175 $self->SUPER::thawer_merge ($merge);
1162} 1176}
1163 1177
1164sub normalise { 1178sub normalise {
1165 my ($path, $base) = @_; 1179 my ($path, $base) = @_;
1180
1181 $path = "$path"; # make sure its a string
1166 1182
1167 # map plan: 1183 # map plan:
1168 # 1184 #
1169 # /! non-realised random map exit (special hack!) 1185 # /! non-realised random map exit (special hack!)
1170 # {... are special paths that are not being touched 1186 # {... are special paths that are not being touched
… …
1198 1214
1199 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1215 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1200 1216
1201 $path = normalise $path, $base; 1217 $path = normalise $path, $base;
1202 1218
1203 for my $pkg (keys %EXT_MAP) { 1219 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1204 if ($path =~ $EXT_MAP{$pkg}) { 1220 if ($path =~ $EXT_MAP{$pkg}[1]) {
1205 my $self = bless cf::map::new, $pkg; 1221 my $self = bless cf::map::new, $pkg;
1206 $self->{path} = $path; $self->path ($path); 1222 $self->{path} = $path; $self->path ($path);
1207 $self->init; # pass $1 etc. 1223 $self->init; # pass $1 etc.
1208 return $self; 1224 return $self;
1209 } 1225 }
1210 } 1226 }
1211 1227
1212 Carp::carp "unable to resolve path '$path'."; 1228 Carp::carp "unable to resolve path '$path' (base '$base').";
1213 () 1229 ()
1214} 1230}
1215 1231
1216sub init { 1232sub init {
1217 my ($self) = @_; 1233 my ($self) = @_;
… …
1283 $self->{load_path} = $path; 1299 $self->{load_path} = $path;
1284 1300
1285 1 1301 1
1286} 1302}
1287 1303
1288sub load_orig { 1304sub load_header_orig {
1289 my ($self) = @_; 1305 my ($self) = @_;
1290 1306
1291 $self->load_header_from ($self->load_path) 1307 $self->load_header_from ($self->load_path)
1292} 1308}
1293 1309
1294sub load_temp { 1310sub load_header_temp {
1295 my ($self) = @_; 1311 my ($self) = @_;
1296 1312
1297 $self->load_header_from ($self->save_path) 1313 $self->load_header_from ($self->save_path)
1314}
1315
1316sub prepare_temp {
1317 my ($self) = @_;
1318
1319 $self->last_access ((delete $self->{last_access})
1320 || $cf::RUNTIME); #d#
1321 # safety
1322 $self->{instantiate_time} = $cf::RUNTIME
1323 if $self->{instantiate_time} > $cf::RUNTIME;
1324}
1325
1326sub prepare_orig {
1327 my ($self) = @_;
1328
1329 $self->{load_original} = 1;
1330 $self->{instantiate_time} = $cf::RUNTIME;
1331 $self->last_access ($cf::RUNTIME);
1332 $self->instantiate;
1298} 1333}
1299 1334
1300sub load_header { 1335sub load_header {
1301 my ($self) = @_; 1336 my ($self) = @_;
1302 1337
1303 if ($self->load_temp) { 1338 if ($self->load_header_temp) {
1304 $self->last_access ((delete $self->{last_access}) 1339 $self->prepare_temp;
1305 || $cf::RUNTIME); #d#
1306 # safety
1307 $self->{instantiate_time} = $cf::RUNTIME
1308 if $self->{instantiate_time} > $cf::RUNTIME;
1309 } else { 1340 } else {
1310 $self->load_orig 1341 $self->load_header_orig
1311 or return; 1342 or return;
1312 1343 $self->prepare_orig;
1313 $self->{load_original} = 1;
1314 $self->{instantiate_time} = $cf::RUNTIME;
1315 $self->last_access ($cf::RUNTIME);
1316 $self->instantiate;
1317 } 1344 }
1318 1345
1319 1 1346 1
1320} 1347}
1321 1348
… …
1335 $map->{last_save} = $cf::RUNTIME; 1362 $map->{last_save} = $cf::RUNTIME;
1336 1363
1337 $map->load_header 1364 $map->load_header
1338 or return; 1365 or return;
1339 1366
1340 if ($map->should_reset) { 1367 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1368 # doing this can freeze the server in a sync job, obviously
1341 $cf::WAIT_FOR_TICK->wait; 1369 #$cf::WAIT_FOR_TICK->wait;
1342 $map->reset; 1370 $map->reset;
1343 undef $guard; 1371 undef $guard;
1344 $map = find $path 1372 return find $path;
1345 or return;
1346 } 1373 }
1347 1374
1348 $cf::MAP{$path} = $map 1375 $cf::MAP{$path} = $map
1349 } 1376 }
1350} 1377}
1378
1379sub pre_load { }
1380sub post_load { }
1351 1381
1352sub load { 1382sub load {
1353 my ($self) = @_; 1383 my ($self) = @_;
1354 1384
1355 my $path = $self->{path}; 1385 my $path = $self->{path};
… …
1358 return if $self->in_memory != cf::MAP_SWAPPED; 1388 return if $self->in_memory != cf::MAP_SWAPPED;
1359 1389
1360 $self->in_memory (cf::MAP_LOADING); 1390 $self->in_memory (cf::MAP_LOADING);
1361 1391
1362 $self->alloc; 1392 $self->alloc;
1393
1394 $self->pre_load;
1395
1363 $self->_load_objects ($self->{load_path}, 1) 1396 $self->_load_objects ($self->{load_path}, 1)
1364 or return; 1397 or return;
1365 1398
1366 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1399 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1367 if delete $self->{load_original}; 1400 if delete $self->{load_original};
… …
1389 unless $self->difficulty; 1422 unless $self->difficulty;
1390 Coro::cede; 1423 Coro::cede;
1391 $self->activate; 1424 $self->activate;
1392 } 1425 }
1393 1426
1427 $self->post_load;
1428
1394 $self->in_memory (cf::MAP_IN_MEMORY); 1429 $self->in_memory (cf::MAP_IN_MEMORY);
1395} 1430}
1396 1431
1397sub customise_for { 1432sub customise_for {
1398 my ($self, $ob) = @_; 1433 my ($self, $ob) = @_;
… …
1438 1473
1439 cf::sync_job { $map->load }; 1474 cf::sync_job { $map->load };
1440} 1475}
1441 1476
1442our %MAP_PREFETCH; 1477our %MAP_PREFETCH;
1443our $MAP_PREFETCHER = Coro::async { 1478our $MAP_PREFETCHER = undef;
1444 while () {
1445 for my $path (keys %MAP_PREFETCH) {
1446 my $map = find $path
1447 or next;
1448 $map->load;
1449
1450 delete $MAP_PREFETCH{$path};
1451 }
1452 Coro::schedule;
1453 }
1454};
1455 1479
1456sub find_async { 1480sub find_async {
1457 my ($path, $origin) = @_; 1481 my ($path, $origin) = @_;
1458 1482
1459 $path = normalise $path, $origin && $origin->{path}; 1483 $path = normalise $path, $origin && $origin->{path};
1460 1484
1461 if (my $map = $cf::MAP{$path}) { 1485 if (my $map = $cf::MAP{$path}) {
1462 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1486 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1463 } 1487 }
1464 1488
1465 $MAP_PREFETCH{$path} = 0; 1489 undef $MAP_PREFETCH{$path};
1490 $MAP_PREFETCHER ||= cf::async {
1491 while (%MAP_PREFETCH) {
1492 for my $path (keys %MAP_PREFETCH) {
1493 my $map = find $path
1494 or next;
1495 $map->load;
1496
1497 delete $MAP_PREFETCH{$path};
1498 }
1499 }
1500 undef $MAP_PREFETCHER;
1501 };
1466 $MAP_PREFETCHER->ready; 1502 $MAP_PREFETCHER->prio (6);
1467 1503
1468 () 1504 ()
1469} 1505}
1470 1506
1471sub save { 1507sub save {
… …
1531 my ($self) = @_; 1567 my ($self) = @_;
1532 1568
1533 $self->reset_at <= $cf::RUNTIME 1569 $self->reset_at <= $cf::RUNTIME
1534} 1570}
1535 1571
1536sub rename {
1537 my ($self, $new_path) = @_;
1538
1539 normalise $new_path;
1540
1541 $self->unlink_save;
1542
1543 delete $cf::MAP{$self->path};
1544 $self->{path} = $new_path; $self->path ($self->{path});
1545 $cf::MAP{$self->path} = $self;
1546
1547 $self->save;
1548}
1549
1550sub reset { 1572sub reset {
1551 my ($self) = @_; 1573 my ($self) = @_;
1552 1574
1553 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1575 my $lock = cf::lock_acquire "map_data:$self->{path}";
1554 1576
… …
1571my $nuke_counter = "aaaa"; 1593my $nuke_counter = "aaaa";
1572 1594
1573sub nuke { 1595sub nuke {
1574 my ($self) = @_; 1596 my ($self) = @_;
1575 1597
1598 delete $cf::MAP{$self->path};
1599
1600 $self->unlink_save;
1601
1602 bless $self, "cf::map";
1603 delete $self->{deny_reset};
1576 $self->{deny_save} = 1; 1604 $self->{deny_save} = 1;
1577 $self->reset_timeout (1); 1605 $self->reset_timeout (1);
1578 $self->rename ("{nuke}/" . ($nuke_counter++)); 1606 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1607
1608 $cf::MAP{$self->path} = $self;
1609
1579 $self->reset; # polite request, might not happen 1610 $self->reset; # polite request, might not happen
1580} 1611}
1581 1612
1582=item cf::map::unique_maps 1613=item cf::map::unique_maps
1583 1614
… …
1717 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1748 return if UNIVERSAL::isa $self->map, "ext::map_link";
1718 1749
1719 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1750 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1720 if $self->map; 1751 if $self->map;
1721 1752
1722 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1753 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1723} 1754}
1724 1755
1725sub cf::object::player::leave_link { 1756sub cf::object::player::leave_link {
1726 my ($self, $map, $x, $y) = @_; 1757 my ($self, $map, $x, $y) = @_;
1727 1758
… …
1814 1845
1815sub parse_random_map_params { 1846sub parse_random_map_params {
1816 my ($spec) = @_; 1847 my ($spec) = @_;
1817 1848
1818 my $rmp = { # defaults 1849 my $rmp = { # defaults
1819 xsize => 10, 1850 xsize => (cf::rndm 15, 40),
1820 ysize => 10, 1851 ysize => (cf::rndm 15, 40),
1852 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1853 #layout => string,
1821 }; 1854 };
1822 1855
1823 for (split /\n/, $spec) { 1856 for (split /\n/, $spec) {
1824 my ($k, $v) = split /\s+/, $_, 2; 1857 my ($k, $v) = split /\s+/, $_, 2;
1825 1858
… …
1829 $rmp 1862 $rmp
1830} 1863}
1831 1864
1832sub prepare_random_map { 1865sub prepare_random_map {
1833 my ($exit) = @_; 1866 my ($exit) = @_;
1867
1868 my $guard = cf::lock_acquire "exit_prepare:$exit";
1834 1869
1835 # all this does is basically replace the /! path by 1870 # all this does is basically replace the /! path by
1836 # a new random map path (?random/...) with a seed 1871 # a new random map path (?random/...) with a seed
1837 # that depends on the exit object 1872 # that depends on the exit object
1838 1873
… …
1847 1882
1848 $rmp->{random_seed} ||= $exit->random_seed; 1883 $rmp->{random_seed} ||= $exit->random_seed;
1849 1884
1850 my $data = cf::to_json $rmp; 1885 my $data = cf::to_json $rmp;
1851 my $md5 = Digest::MD5::md5_hex $data; 1886 my $md5 = Digest::MD5::md5_hex $data;
1887 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1852 1888
1853 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1889 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1854 aio_write $fh, 0, (length $data), $data, 0; 1890 aio_write $fh, 0, (length $data), $data, 0;
1891 undef $fh;
1892 aio_rename "$meta~", $meta;
1855 1893
1856 $exit->slaying ("?random/$md5"); 1894 $exit->slaying ("?random/$md5");
1857 $exit->msg (undef); 1895 $exit->msg (undef);
1858 } 1896 }
1859} 1897}
1860 1898
1861sub cf::object::player::enter_exit { 1899sub cf::object::player::enter_exit {
1862 my ($self, $exit) = @_; 1900 my ($self, $exit) = @_;
1863 1901
1864 return unless $self->type == cf::PLAYER; 1902 return unless $self->type == cf::PLAYER;
1903
1904 if ($exit->slaying eq "/!") {
1905 #TODO: this should de-fi-ni-te-ly not be a sync-job
1906 cf::sync_job { prepare_random_map $exit };
1907 }
1908
1909 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1910 my $hp = $exit->stats->hp;
1911 my $sp = $exit->stats->sp;
1865 1912
1866 $self->enter_link; 1913 $self->enter_link;
1867 1914
1868 (async { 1915 (async {
1869 $self->deactivate_recursive; # just to be sure 1916 $self->deactivate_recursive; # just to be sure
1870 unless (eval { 1917 unless (eval {
1871 prepare_random_map $exit 1918 $self->goto ($slaying, $hp, $sp);
1872 if $exit->slaying eq "/!";
1873
1874 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1875 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1876 1919
1877 1; 1920 1;
1878 }) { 1921 }) {
1879 $self->message ("Something went wrong deep within the crossfire server. " 1922 $self->message ("Something went wrong deep within the crossfire server. "
1880 . "I'll try to bring you back to the map you were before. " 1923 . "I'll try to bring you back to the map you were before. "
… …
2169 sub db_sync() { 2212 sub db_sync() {
2170 db_save if $dirty; 2213 db_save if $dirty;
2171 undef $dirty; 2214 undef $dirty;
2172 } 2215 }
2173 2216
2174 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2217 my $idle = Event->idle (
2175 db_sync; 2218 reentrant => 0,
2219 min => 10,
2220 max => 20,
2221 repeat => 0,
2222 data => WF_AUTOCANCEL,
2223 cb => \&db_sync,
2176 }); 2224 );
2177 2225
2178 sub db_dirty() { 2226 sub db_dirty() {
2179 $dirty = 1; 2227 $dirty = 1;
2180 $idle->start; 2228 $idle->start;
2181 } 2229 }
… …
2229 2277
2230sub main { 2278sub main {
2231 # we must not ever block the main coroutine 2279 # we must not ever block the main coroutine
2232 local $Coro::idle = sub { 2280 local $Coro::idle = sub {
2233 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2281 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2282 (async {
2234 async { Event::one_event }; 2283 Event::one_event;
2284 })->prio (Coro::PRIO_MAX);
2235 }; 2285 };
2236 2286
2237 cfg_load; 2287 cfg_load;
2238 db_load; 2288 db_load;
2239 load_extensions; 2289 load_extensions;
2290
2291 $TICK_WATCHER->start;
2240 Event::loop; 2292 Event::loop;
2241} 2293}
2242 2294
2243############################################################################# 2295#############################################################################
2244# initialisation and cleanup 2296# initialisation and cleanup
2245 2297
2246# install some emergency cleanup handlers 2298# install some emergency cleanup handlers
2247BEGIN { 2299BEGIN {
2248 for my $signal (qw(INT HUP TERM)) { 2300 for my $signal (qw(INT HUP TERM)) {
2249 Event->signal ( 2301 Event->signal (
2302 reentrant => 0,
2250 data => WF_AUTOCANCEL, 2303 data => WF_AUTOCANCEL,
2251 signal => $signal, 2304 signal => $signal,
2305 prio => 0,
2252 cb => sub { 2306 cb => sub {
2253 cf::cleanup "SIG$signal"; 2307 cf::cleanup "SIG$signal";
2254 }, 2308 },
2255 ); 2309 );
2256 } 2310 }
2257} 2311}
… …
2286} 2340}
2287 2341
2288sub reload() { 2342sub reload() {
2289 # can/must only be called in main 2343 # can/must only be called in main
2290 if ($Coro::current != $Coro::main) { 2344 if ($Coro::current != $Coro::main) {
2291 warn "can only reload from main coroutine\n"; 2345 warn "can only reload from main coroutine";
2292 return; 2346 return;
2293 } 2347 }
2294 2348
2295 warn "reloading..."; 2349 warn "reloading...";
2296 2350
2297 warn "freezing server"; 2351 warn "cancelling server ticker";
2298 my $guard = freeze_mainloop; 2352 $TICK_WATCHER->cancel;
2353
2299 cf::emergency_save; 2354 cf::emergency_save;
2300
2301 warn "sync database to disk";
2302 cf::db_sync;
2303 IO::AIO::flush;
2304 2355
2305 eval { 2356 eval {
2306 # if anything goes wrong in here, we should simply crash as we already saved 2357 # if anything goes wrong in here, we should simply crash as we already saved
2307 2358
2359 warn "syncing database to disk";
2360 cf::db_sync;
2361
2308 warn "cancel all watchers"; 2362 warn "cancelling all WF_AUTOCANCEL watchers";
2309 for (Event::all_watchers) { 2363 for (Event::all_watchers) {
2310 $_->cancel if $_->data & WF_AUTOCANCEL; 2364 $_->cancel if $_->data & WF_AUTOCANCEL;
2311 } 2365 }
2312 2366
2367 warn "flushing outstanding aio requests";
2368 for (;;) {
2369 IO::AIO::flush;
2370 Coro::cede;
2371 last unless IO::AIO::nreqs;
2372 warn "iterate...";
2373 }
2374
2313 warn "cancel all extension coros"; 2375 warn "cancelling all extension coros";
2314 $_->cancel for values %EXT_CORO; 2376 $_->cancel for values %EXT_CORO;
2315 %EXT_CORO = (); 2377 %EXT_CORO = ();
2316 2378
2317 warn "remove commands"; 2379 warn "removing commands";
2318 %COMMAND = (); 2380 %COMMAND = ();
2319 2381
2320 warn "remove ext commands"; 2382 warn "removing ext commands";
2321 %EXTCMD = (); 2383 %EXTCMD = ();
2322 2384
2323 warn "unload/nuke all extensions"; 2385 warn "unloading/nuking all extensions";
2324 for my $pkg (@EXTS) { 2386 for my $pkg (@EXTS) {
2325 warn "... unloading $pkg"; 2387 warn "... unloading $pkg";
2326 2388
2327 if (my $cb = $pkg->can ("unload")) { 2389 if (my $cb = $pkg->can ("unload")) {
2328 eval { 2390 eval {
… …
2333 2395
2334 warn "... nuking $pkg"; 2396 warn "... nuking $pkg";
2335 Symbol::delete_package $pkg; 2397 Symbol::delete_package $pkg;
2336 } 2398 }
2337 2399
2338 warn "unload all perl modules loaded from $LIBDIR"; 2400 warn "unloading all perl modules loaded from $LIBDIR";
2339 while (my ($k, $v) = each %INC) { 2401 while (my ($k, $v) = each %INC) {
2340 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2402 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2341 2403
2342 warn "removing <$k>"; 2404 warn "... unloading $k";
2343 delete $INC{$k}; 2405 delete $INC{$k};
2344 2406
2345 $k =~ s/\.pm$//; 2407 $k =~ s/\.pm$//;
2346 $k =~ s/\//::/g; 2408 $k =~ s/\//::/g;
2347 2409
… …
2350 } 2412 }
2351 2413
2352 Symbol::delete_package $k; 2414 Symbol::delete_package $k;
2353 } 2415 }
2354 2416
2355 warn "get rid of safe::, as good as possible"; 2417 warn "getting rid of safe::, as good as possible";
2356 Symbol::delete_package "safe::$_" 2418 Symbol::delete_package "safe::$_"
2357 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2419 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2358 2420
2359 warn "unload cf.pm \"a bit\""; 2421 warn "unloading cf.pm \"a bit\"";
2360 delete $INC{"cf.pm"}; 2422 delete $INC{"cf.pm"};
2361 2423
2362 # don't, removes xs symbols, too, 2424 # don't, removes xs symbols, too,
2363 # and global variables created in xs 2425 # and global variables created in xs
2364 #Symbol::delete_package __PACKAGE__; 2426 #Symbol::delete_package __PACKAGE__;
2365 2427
2428 warn "unload completed, starting to reload now";
2429
2366 warn "reloading cf.pm"; 2430 warn "reloading cf.pm";
2367 require cf; 2431 require cf;
2368 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2432 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2369 2433
2370 warn "load config and database again"; 2434 warn "loading config and database again";
2371 cf::cfg_load; 2435 cf::cfg_load;
2372 cf::db_load; 2436 cf::db_load;
2373 2437
2374 warn "load extensions"; 2438 warn "loading extensions";
2375 cf::load_extensions; 2439 cf::load_extensions;
2376 2440
2377 warn "reattach attachments to objects/players"; 2441 warn "reattaching attachments to objects/players";
2378 _global_reattach; 2442 _global_reattach;
2379 warn "reattach attachments to maps"; 2443 warn "reattaching attachments to maps";
2380 reattach $_ for values %MAP; 2444 reattach $_ for values %MAP;
2445
2446 warn "restarting server ticker";
2447
2448 $TICK_WATCHER->start;
2381 }; 2449 };
2382 2450
2383 if ($@) { 2451 if ($@) {
2384 warn $@; 2452 warn $@;
2385 warn "error while reloading, exiting."; 2453 warn "error while reloading, exiting.";
… …
2387 } 2455 }
2388 2456
2389 warn "reloaded"; 2457 warn "reloaded";
2390}; 2458};
2391 2459
2460our $RELOAD_WATCHER; # used only during reload
2461
2392register_command "reload" => sub { 2462register_command "reload" => sub {
2393 my ($who, $arg) = @_; 2463 my ($who, $arg) = @_;
2394 2464
2395 if ($who->flag (FLAG_WIZ)) { 2465 if ($who->flag (FLAG_WIZ)) {
2396 $who->message ("start of reload."); 2466 $who->message ("reloading server.");
2467
2468 # doing reload synchronously and two reloads happen back-to-back,
2469 # coro crashes during coro_state_free->destroy here.
2470
2471 $RELOAD_WATCHER ||= Event->timer (
2472 reentrant => 0,
2473 after => 0,
2474 data => WF_AUTOCANCEL,
2475 cb => sub {
2397 reload; 2476 reload;
2398 $who->message ("end of reload."); 2477 undef $RELOAD_WATCHER;
2478 },
2479 );
2399 } 2480 }
2400}; 2481};
2401 2482
2402unshift @INC, $LIBDIR; 2483unshift @INC, $LIBDIR;
2484
2485my $bug_warning = 0;
2403 2486
2404$TICK_WATCHER = Event->timer ( 2487$TICK_WATCHER = Event->timer (
2405 reentrant => 0, 2488 reentrant => 0,
2489 parked => 1,
2406 prio => 0, 2490 prio => 0,
2407 at => $NEXT_TICK || $TICK, 2491 at => $NEXT_TICK || $TICK,
2408 data => WF_AUTOCANCEL, 2492 data => WF_AUTOCANCEL,
2409 cb => sub { 2493 cb => sub {
2494 if ($Coro::current != $Coro::main) {
2495 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2496 unless ++$bug_warning > 10;
2497 return;
2498 }
2499
2410 $NOW = Event::time; 2500 $NOW = Event::time;
2411 2501
2412 cf::server_tick; # one server iteration 2502 cf::server_tick; # one server iteration
2413 $RUNTIME += $TICK; 2503 $RUNTIME += $TICK;
2414 $NEXT_TICK += $TICK; 2504 $NEXT_TICK += $TICK;
2415 2505
2416 $WAIT_FOR_TICK->broadcast; 2506 $WAIT_FOR_TICK->broadcast;
2417 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2507 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2508
2509 Event::sweep;
2510 Coro::cede_notself;
2511
2512# my $AFTER = Event::time;
2513# warn $AFTER - $NOW;#d#
2418 2514
2419 # if we are delayed by four ticks or more, skip them all 2515 # if we are delayed by four ticks or more, skip them all
2420 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2516 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2421 2517
2422 $TICK_WATCHER->at ($NEXT_TICK); 2518 $TICK_WATCHER->at ($NEXT_TICK);
2423 $TICK_WATCHER->start; 2519 $TICK_WATCHER->start;
2424 }, 2520 },
2425); 2521);
2426 2522
2427IO::AIO::max_poll_time $TICK * 0.2; 2523IO::AIO::max_poll_time $TICK * 0.1;
2428 2524
2525undef $Coro::AIO::WATCHER;
2429$AIO_POLL_WATCHER = Event->io ( 2526$AIO_POLL_WATCHER = Event->io (
2527 reentrant => 0,
2430 fd => IO::AIO::poll_fileno, 2528 fd => IO::AIO::poll_fileno,
2431 poll => 'r', 2529 poll => 'r',
2432 prio => 5, 2530 prio => 6,
2433 data => WF_AUTOCANCEL, 2531 data => WF_AUTOCANCEL,
2434 cb => \&IO::AIO::poll_cb, 2532 cb => \&IO::AIO::poll_cb,
2435); 2533);
2436 2534
2437$WRITE_RUNTIME_WATCHER = Event->timer ( 2535$WRITE_RUNTIME_WATCHER = Event->timer (
2536 reentrant => 0,
2438 data => WF_AUTOCANCEL, 2537 data => WF_AUTOCANCEL,
2439 after => 0, 2538 after => 1,
2440 interval => 10, 2539 interval => 10,
2441 cb => sub { 2540 prio => 6, # keep it lowest so it acts like a watchdog
2442 (Coro::unblock_sub { 2541 cb => Coro::unblock_sub {
2443 write_runtime 2542 write_runtime
2444 or warn "ERROR: unable to write runtime file: $!"; 2543 or warn "ERROR: unable to write runtime file: $!";
2445 })->();
2446 }, 2544 },
2447); 2545);
2448 2546
2449END { cf::emergency_save } 2547END { cf::emergency_save }
2450 2548

Diff Legend

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