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.176 by root, Sun Jan 14 22:14:35 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.4 (); 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];
… …
1121our $MAX_RESET = 3600; 1124our $MAX_RESET = 3600;
1122our $DEFAULT_RESET = 3000; 1125our $DEFAULT_RESET = 3000;
1123 1126
1124sub generate_random_map { 1127sub generate_random_map {
1125 my ($self, $rmp) = @_; 1128 my ($self, $rmp) = @_;
1126
1127 # mit "rum" bekleckern, nicht 1129 # mit "rum" bekleckern, nicht
1128 $self->_create_random_map ( 1130 $self->_create_random_map (
1129 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1131 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1130 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1132 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1131 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1133 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1138 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1140 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1139 (cf::region::find $rmp->{region}), $rmp->{custom} 1141 (cf::region::find $rmp->{region}), $rmp->{custom}
1140 ) 1142 )
1141} 1143}
1142 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
1143sub register { 1153sub register {
1144 my (undef, $regex) = @_; 1154 my (undef, $regex, $prio) = @_;
1145 my $pkg = caller; 1155 my $pkg = caller;
1146 1156
1147 no strict; 1157 no strict;
1148 push @{"$pkg\::ISA"}, __PACKAGE__; 1158 push @{"$pkg\::ISA"}, __PACKAGE__;
1149 1159
1150 $EXT_MAP{$pkg} = qr<$regex>; 1160 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1151} 1161}
1152 1162
1153# also paths starting with '/' 1163# also paths starting with '/'
1154$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1164$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1155 1165
1156sub thawer_merge { 1166sub thawer_merge {
1157 my ($self, $merge) = @_; 1167 my ($self, $merge) = @_;
1158 1168
1159 # we have to keep some variables in memory intact 1169 # we have to keep some variables in memory intact
… …
1165 $self->SUPER::thawer_merge ($merge); 1175 $self->SUPER::thawer_merge ($merge);
1166} 1176}
1167 1177
1168sub normalise { 1178sub normalise {
1169 my ($path, $base) = @_; 1179 my ($path, $base) = @_;
1180
1181 $path = "$path"; # make sure its a string
1170 1182
1171 # map plan: 1183 # map plan:
1172 # 1184 #
1173 # /! non-realised random map exit (special hack!) 1185 # /! non-realised random map exit (special hack!)
1174 # {... are special paths that are not being touched 1186 # {... are special paths that are not being touched
… …
1202 1214
1203 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
1204 1216
1205 $path = normalise $path, $base; 1217 $path = normalise $path, $base;
1206 1218
1207 for my $pkg (keys %EXT_MAP) { 1219 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1208 if ($path =~ $EXT_MAP{$pkg}) { 1220 if ($path =~ $EXT_MAP{$pkg}[1]) {
1209 my $self = bless cf::map::new, $pkg; 1221 my $self = bless cf::map::new, $pkg;
1210 $self->{path} = $path; $self->path ($path); 1222 $self->{path} = $path; $self->path ($path);
1211 $self->init; # pass $1 etc. 1223 $self->init; # pass $1 etc.
1212 return $self; 1224 return $self;
1213 } 1225 }
1214 } 1226 }
1215 1227
1216 Carp::carp "unable to resolve path '$path'."; 1228 Carp::carp "unable to resolve path '$path' (base '$base').";
1217 () 1229 ()
1218} 1230}
1219 1231
1220sub init { 1232sub init {
1221 my ($self) = @_; 1233 my ($self) = @_;
… …
1287 $self->{load_path} = $path; 1299 $self->{load_path} = $path;
1288 1300
1289 1 1301 1
1290} 1302}
1291 1303
1292sub load_orig { 1304sub load_header_orig {
1293 my ($self) = @_; 1305 my ($self) = @_;
1294 1306
1295 $self->load_header_from ($self->load_path) 1307 $self->load_header_from ($self->load_path)
1296} 1308}
1297 1309
1298sub load_temp { 1310sub load_header_temp {
1299 my ($self) = @_; 1311 my ($self) = @_;
1300 1312
1301 $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;
1302} 1333}
1303 1334
1304sub load_header { 1335sub load_header {
1305 my ($self) = @_; 1336 my ($self) = @_;
1306 1337
1307 if ($self->load_temp) { 1338 if ($self->load_header_temp) {
1308 $self->last_access ((delete $self->{last_access}) 1339 $self->prepare_temp;
1309 || $cf::RUNTIME); #d#
1310 # safety
1311 $self->{instantiate_time} = $cf::RUNTIME
1312 if $self->{instantiate_time} > $cf::RUNTIME;
1313 } else { 1340 } else {
1314 $self->load_orig 1341 $self->load_header_orig
1315 or return; 1342 or return;
1316 1343 $self->prepare_orig;
1317 $self->{load_original} = 1;
1318 $self->{instantiate_time} = $cf::RUNTIME;
1319 $self->last_access ($cf::RUNTIME);
1320 $self->instantiate;
1321 } 1344 }
1322 1345
1323 1 1346 1
1324} 1347}
1325 1348
… …
1339 $map->{last_save} = $cf::RUNTIME; 1362 $map->{last_save} = $cf::RUNTIME;
1340 1363
1341 $map->load_header 1364 $map->load_header
1342 or return; 1365 or return;
1343 1366
1344 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
1345 $cf::WAIT_FOR_TICK->wait; 1369 #$cf::WAIT_FOR_TICK->wait;
1346 $map->reset; 1370 $map->reset;
1347 undef $guard; 1371 undef $guard;
1348 $map = find $path 1372 return find $path;
1349 or return;
1350 } 1373 }
1351 1374
1352 $cf::MAP{$path} = $map 1375 $cf::MAP{$path} = $map
1353 } 1376 }
1354} 1377}
1378
1379sub pre_load { }
1380sub post_load { }
1355 1381
1356sub load { 1382sub load {
1357 my ($self) = @_; 1383 my ($self) = @_;
1358 1384
1359 my $path = $self->{path}; 1385 my $path = $self->{path};
… …
1362 return if $self->in_memory != cf::MAP_SWAPPED; 1388 return if $self->in_memory != cf::MAP_SWAPPED;
1363 1389
1364 $self->in_memory (cf::MAP_LOADING); 1390 $self->in_memory (cf::MAP_LOADING);
1365 1391
1366 $self->alloc; 1392 $self->alloc;
1393
1394 $self->pre_load;
1395
1367 $self->_load_objects ($self->{load_path}, 1) 1396 $self->_load_objects ($self->{load_path}, 1)
1368 or return; 1397 or return;
1369 1398
1370 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1399 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1371 if delete $self->{load_original}; 1400 if delete $self->{load_original};
… …
1393 unless $self->difficulty; 1422 unless $self->difficulty;
1394 Coro::cede; 1423 Coro::cede;
1395 $self->activate; 1424 $self->activate;
1396 } 1425 }
1397 1426
1427 $self->post_load;
1428
1398 $self->in_memory (cf::MAP_IN_MEMORY); 1429 $self->in_memory (cf::MAP_IN_MEMORY);
1399} 1430}
1400 1431
1401sub customise_for { 1432sub customise_for {
1402 my ($self, $ob) = @_; 1433 my ($self, $ob) = @_;
… …
1442 1473
1443 cf::sync_job { $map->load }; 1474 cf::sync_job { $map->load };
1444} 1475}
1445 1476
1446our %MAP_PREFETCH; 1477our %MAP_PREFETCH;
1447our $MAP_PREFETCHER = Coro::async { 1478our $MAP_PREFETCHER = undef;
1448 while () {
1449 for my $path (keys %MAP_PREFETCH) {
1450 my $map = find $path
1451 or next;
1452 $map->load;
1453
1454 delete $MAP_PREFETCH{$path};
1455 }
1456 Coro::schedule;
1457 }
1458};
1459 1479
1460sub find_async { 1480sub find_async {
1461 my ($path, $origin) = @_; 1481 my ($path, $origin) = @_;
1462 1482
1463 $path = normalise $path, $origin && $origin->{path}; 1483 $path = normalise $path, $origin && $origin->{path};
1464 1484
1465 if (my $map = $cf::MAP{$path}) { 1485 if (my $map = $cf::MAP{$path}) {
1466 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1486 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1467 } 1487 }
1468 1488
1469 $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 };
1470 $MAP_PREFETCHER->ready; 1502 $MAP_PREFETCHER->prio (6);
1471 1503
1472 () 1504 ()
1473} 1505}
1474 1506
1475sub save { 1507sub save {
… …
1716 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1748 return if UNIVERSAL::isa $self->map, "ext::map_link";
1717 1749
1718 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1750 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1719 if $self->map; 1751 if $self->map;
1720 1752
1721 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1753 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1722} 1754}
1723 1755
1724sub cf::object::player::leave_link { 1756sub cf::object::player::leave_link {
1725 my ($self, $map, $x, $y) = @_; 1757 my ($self, $map, $x, $y) = @_;
1726 1758
… …
1813 1845
1814sub parse_random_map_params { 1846sub parse_random_map_params {
1815 my ($spec) = @_; 1847 my ($spec) = @_;
1816 1848
1817 my $rmp = { # defaults 1849 my $rmp = { # defaults
1818 xsize => 10, 1850 xsize => (cf::rndm 15, 40),
1819 ysize => 10, 1851 ysize => (cf::rndm 15, 40),
1852 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1853 #layout => string,
1820 }; 1854 };
1821 1855
1822 for (split /\n/, $spec) { 1856 for (split /\n/, $spec) {
1823 my ($k, $v) = split /\s+/, $_, 2; 1857 my ($k, $v) = split /\s+/, $_, 2;
1824 1858
… …
1828 $rmp 1862 $rmp
1829} 1863}
1830 1864
1831sub prepare_random_map { 1865sub prepare_random_map {
1832 my ($exit) = @_; 1866 my ($exit) = @_;
1867
1868 my $guard = cf::lock_acquire "exit_prepare:$exit";
1833 1869
1834 # all this does is basically replace the /! path by 1870 # all this does is basically replace the /! path by
1835 # a new random map path (?random/...) with a seed 1871 # a new random map path (?random/...) with a seed
1836 # that depends on the exit object 1872 # that depends on the exit object
1837 1873
… …
1846 1882
1847 $rmp->{random_seed} ||= $exit->random_seed; 1883 $rmp->{random_seed} ||= $exit->random_seed;
1848 1884
1849 my $data = cf::to_json $rmp; 1885 my $data = cf::to_json $rmp;
1850 my $md5 = Digest::MD5::md5_hex $data; 1886 my $md5 = Digest::MD5::md5_hex $data;
1887 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1851 1888
1852 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) {
1853 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;
1854 1893
1855 $exit->slaying ("?random/$md5"); 1894 $exit->slaying ("?random/$md5");
1856 $exit->msg (undef); 1895 $exit->msg (undef);
1857 } 1896 }
1858} 1897}
1859 1898
1860sub cf::object::player::enter_exit { 1899sub cf::object::player::enter_exit {
1861 my ($self, $exit) = @_; 1900 my ($self, $exit) = @_;
1862 1901
1863 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;
1864 1912
1865 $self->enter_link; 1913 $self->enter_link;
1866 1914
1867 (async { 1915 (async {
1868 $self->deactivate_recursive; # just to be sure 1916 $self->deactivate_recursive; # just to be sure
1869 unless (eval { 1917 unless (eval {
1870 prepare_random_map $exit 1918 $self->goto ($slaying, $hp, $sp);
1871 if $exit->slaying eq "/!";
1872
1873 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1874 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1875 1919
1876 1; 1920 1;
1877 }) { 1921 }) {
1878 $self->message ("Something went wrong deep within the crossfire server. " 1922 $self->message ("Something went wrong deep within the crossfire server. "
1879 . "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. "
… …
2168 sub db_sync() { 2212 sub db_sync() {
2169 db_save if $dirty; 2213 db_save if $dirty;
2170 undef $dirty; 2214 undef $dirty;
2171 } 2215 }
2172 2216
2173 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2217 my $idle = Event->idle (
2174 db_sync; 2218 reentrant => 0,
2219 min => 10,
2220 max => 20,
2221 repeat => 0,
2222 data => WF_AUTOCANCEL,
2223 cb => \&db_sync,
2175 }); 2224 );
2176 2225
2177 sub db_dirty() { 2226 sub db_dirty() {
2178 $dirty = 1; 2227 $dirty = 1;
2179 $idle->start; 2228 $idle->start;
2180 } 2229 }
… …
2236 }; 2285 };
2237 2286
2238 cfg_load; 2287 cfg_load;
2239 db_load; 2288 db_load;
2240 load_extensions; 2289 load_extensions;
2290
2291 $TICK_WATCHER->start;
2241 Event::loop; 2292 Event::loop;
2242} 2293}
2243 2294
2244############################################################################# 2295#############################################################################
2245# initialisation and cleanup 2296# initialisation and cleanup
2246 2297
2247# install some emergency cleanup handlers 2298# install some emergency cleanup handlers
2248BEGIN { 2299BEGIN {
2249 for my $signal (qw(INT HUP TERM)) { 2300 for my $signal (qw(INT HUP TERM)) {
2250 Event->signal ( 2301 Event->signal (
2302 reentrant => 0,
2251 data => WF_AUTOCANCEL, 2303 data => WF_AUTOCANCEL,
2252 signal => $signal, 2304 signal => $signal,
2305 prio => 0,
2253 cb => sub { 2306 cb => sub {
2254 cf::cleanup "SIG$signal"; 2307 cf::cleanup "SIG$signal";
2255 }, 2308 },
2256 ); 2309 );
2257 } 2310 }
2258} 2311}
… …
2287} 2340}
2288 2341
2289sub reload() { 2342sub reload() {
2290 # can/must only be called in main 2343 # can/must only be called in main
2291 if ($Coro::current != $Coro::main) { 2344 if ($Coro::current != $Coro::main) {
2292 warn "can only reload from main coroutine\n"; 2345 warn "can only reload from main coroutine";
2293 return; 2346 return;
2294 } 2347 }
2295 2348
2296 warn "reloading..."; 2349 warn "reloading...";
2297 2350
2298 warn "freezing server"; 2351 warn "cancelling server ticker";
2299 my $guard = freeze_mainloop; 2352 $TICK_WATCHER->cancel;
2353
2300 cf::emergency_save; 2354 cf::emergency_save;
2301
2302 warn "sync database to disk";
2303 cf::db_sync;
2304 IO::AIO::flush;
2305 2355
2306 eval { 2356 eval {
2307 # 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
2308 2358
2359 warn "syncing database to disk";
2360 cf::db_sync;
2361
2309 warn "cancel all watchers"; 2362 warn "cancelling all WF_AUTOCANCEL watchers";
2310 for (Event::all_watchers) { 2363 for (Event::all_watchers) {
2311 $_->cancel if $_->data & WF_AUTOCANCEL; 2364 $_->cancel if $_->data & WF_AUTOCANCEL;
2312 } 2365 }
2313 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
2314 warn "cancel all extension coros"; 2375 warn "cancelling all extension coros";
2315 $_->cancel for values %EXT_CORO; 2376 $_->cancel for values %EXT_CORO;
2316 %EXT_CORO = (); 2377 %EXT_CORO = ();
2317 2378
2318 warn "remove commands"; 2379 warn "removing commands";
2319 %COMMAND = (); 2380 %COMMAND = ();
2320 2381
2321 warn "remove ext commands"; 2382 warn "removing ext commands";
2322 %EXTCMD = (); 2383 %EXTCMD = ();
2323 2384
2324 warn "unload/nuke all extensions"; 2385 warn "unloading/nuking all extensions";
2325 for my $pkg (@EXTS) { 2386 for my $pkg (@EXTS) {
2326 warn "... unloading $pkg"; 2387 warn "... unloading $pkg";
2327 2388
2328 if (my $cb = $pkg->can ("unload")) { 2389 if (my $cb = $pkg->can ("unload")) {
2329 eval { 2390 eval {
… …
2334 2395
2335 warn "... nuking $pkg"; 2396 warn "... nuking $pkg";
2336 Symbol::delete_package $pkg; 2397 Symbol::delete_package $pkg;
2337 } 2398 }
2338 2399
2339 warn "unload all perl modules loaded from $LIBDIR"; 2400 warn "unloading all perl modules loaded from $LIBDIR";
2340 while (my ($k, $v) = each %INC) { 2401 while (my ($k, $v) = each %INC) {
2341 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2402 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2342 2403
2343 warn "removing <$k>"; 2404 warn "... unloading $k";
2344 delete $INC{$k}; 2405 delete $INC{$k};
2345 2406
2346 $k =~ s/\.pm$//; 2407 $k =~ s/\.pm$//;
2347 $k =~ s/\//::/g; 2408 $k =~ s/\//::/g;
2348 2409
… …
2351 } 2412 }
2352 2413
2353 Symbol::delete_package $k; 2414 Symbol::delete_package $k;
2354 } 2415 }
2355 2416
2356 warn "get rid of safe::, as good as possible"; 2417 warn "getting rid of safe::, as good as possible";
2357 Symbol::delete_package "safe::$_" 2418 Symbol::delete_package "safe::$_"
2358 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);
2359 2420
2360 warn "unload cf.pm \"a bit\""; 2421 warn "unloading cf.pm \"a bit\"";
2361 delete $INC{"cf.pm"}; 2422 delete $INC{"cf.pm"};
2362 2423
2363 # don't, removes xs symbols, too, 2424 # don't, removes xs symbols, too,
2364 # and global variables created in xs 2425 # and global variables created in xs
2365 #Symbol::delete_package __PACKAGE__; 2426 #Symbol::delete_package __PACKAGE__;
2366 2427
2428 warn "unload completed, starting to reload now";
2429
2367 warn "reloading cf.pm"; 2430 warn "reloading cf.pm";
2368 require cf; 2431 require cf;
2369 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2432 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2370 2433
2371 warn "load config and database again"; 2434 warn "loading config and database again";
2372 cf::cfg_load; 2435 cf::cfg_load;
2373 cf::db_load; 2436 cf::db_load;
2374 2437
2375 warn "load extensions"; 2438 warn "loading extensions";
2376 cf::load_extensions; 2439 cf::load_extensions;
2377 2440
2378 warn "reattach attachments to objects/players"; 2441 warn "reattaching attachments to objects/players";
2379 _global_reattach; 2442 _global_reattach;
2380 warn "reattach attachments to maps"; 2443 warn "reattaching attachments to maps";
2381 reattach $_ for values %MAP; 2444 reattach $_ for values %MAP;
2445
2446 warn "restarting server ticker";
2447
2448 $TICK_WATCHER->start;
2382 }; 2449 };
2383 2450
2384 if ($@) { 2451 if ($@) {
2385 warn $@; 2452 warn $@;
2386 warn "error while reloading, exiting."; 2453 warn "error while reloading, exiting.";
… …
2399 $who->message ("reloading server."); 2466 $who->message ("reloading server.");
2400 2467
2401 # doing reload synchronously and two reloads happen back-to-back, 2468 # doing reload synchronously and two reloads happen back-to-back,
2402 # coro crashes during coro_state_free->destroy here. 2469 # coro crashes during coro_state_free->destroy here.
2403 2470
2404 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub { 2471 $RELOAD_WATCHER ||= Event->timer (
2472 reentrant => 0,
2473 after => 0,
2474 data => WF_AUTOCANCEL,
2475 cb => sub {
2405 reload; 2476 reload;
2406 undef $RELOAD_WATCHER; 2477 undef $RELOAD_WATCHER;
2478 },
2407 }); 2479 );
2408 } 2480 }
2409}; 2481};
2410 2482
2411unshift @INC, $LIBDIR; 2483unshift @INC, $LIBDIR;
2484
2485my $bug_warning = 0;
2412 2486
2413$TICK_WATCHER = Event->timer ( 2487$TICK_WATCHER = Event->timer (
2414 reentrant => 0, 2488 reentrant => 0,
2489 parked => 1,
2415 prio => 0, 2490 prio => 0,
2416 at => $NEXT_TICK || $TICK, 2491 at => $NEXT_TICK || $TICK,
2417 data => WF_AUTOCANCEL, 2492 data => WF_AUTOCANCEL,
2418 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
2419 $NOW = Event::time; 2500 $NOW = Event::time;
2420 2501
2421 cf::server_tick; # one server iteration 2502 cf::server_tick; # one server iteration
2422 $RUNTIME += $TICK; 2503 $RUNTIME += $TICK;
2423 $NEXT_TICK += $TICK; 2504 $NEXT_TICK += $TICK;
2424 2505
2425 $WAIT_FOR_TICK->broadcast; 2506 $WAIT_FOR_TICK->broadcast;
2426 $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#
2427 2514
2428 # 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
2429 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2516 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2430 2517
2431 $TICK_WATCHER->at ($NEXT_TICK); 2518 $TICK_WATCHER->at ($NEXT_TICK);
2432 $TICK_WATCHER->start; 2519 $TICK_WATCHER->start;
2433 }, 2520 },
2434); 2521);
2435 2522
2436IO::AIO::max_poll_time $TICK * 0.2; 2523IO::AIO::max_poll_time $TICK * 0.1;
2437 2524
2525undef $Coro::AIO::WATCHER;
2438$AIO_POLL_WATCHER = Event->io ( 2526$AIO_POLL_WATCHER = Event->io (
2527 reentrant => 0,
2439 fd => IO::AIO::poll_fileno, 2528 fd => IO::AIO::poll_fileno,
2440 poll => 'r', 2529 poll => 'r',
2441 prio => 5, 2530 prio => 6,
2442 data => WF_AUTOCANCEL, 2531 data => WF_AUTOCANCEL,
2443 cb => \&IO::AIO::poll_cb, 2532 cb => \&IO::AIO::poll_cb,
2444); 2533);
2445 2534
2446$WRITE_RUNTIME_WATCHER = Event->timer ( 2535$WRITE_RUNTIME_WATCHER = Event->timer (
2536 reentrant => 0,
2447 data => WF_AUTOCANCEL, 2537 data => WF_AUTOCANCEL,
2448 after => 0, 2538 after => 1,
2449 interval => 10, 2539 interval => 10,
2450 cb => sub { 2540 prio => 6, # keep it lowest so it acts like a watchdog
2451 (Coro::unblock_sub { 2541 cb => Coro::unblock_sub {
2452 write_runtime 2542 write_runtime
2453 or warn "ERROR: unable to write runtime file: $!"; 2543 or warn "ERROR: unable to write runtime file: $!";
2454 })->();
2455 }, 2544 },
2456); 2545);
2457 2546
2458END { cf::emergency_save } 2547END { cf::emergency_save }
2459 2548

Diff Legend

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