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.169 by root, Sun Jan 14 01:09:46 2007 UTC vs.
Revision 1.188 by root, Sat Jan 20 23:30:16 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.4 ();
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;
… …
502our @CB_CLIENT = (); 505our @CB_CLIENT = ();
503our @CB_TYPE = (); # registry for type (cf-object class) based events 506our @CB_TYPE = (); # registry for type (cf-object class) based events
504our @CB_MAP = (); 507our @CB_MAP = ();
505 508
506my %attachment; 509my %attachment;
510
511sub cf::attachable::thawer_merge {
512 # simply override everything except _meta
513 local $_[0]{_meta};
514 %{$_[0]} = %{$_[1]};
515}
507 516
508sub _attach_cb($$$$) { 517sub _attach_cb($$$$) {
509 my ($registry, $event, $prio, $cb) = @_; 518 my ($registry, $event, $prio, $cb) = @_;
510 519
511 use sort 'stable'; 520 use sort 'stable';
… …
951 960
952sub exists($) { 961sub exists($) {
953 my ($login) = @_; 962 my ($login) = @_;
954 963
955 $cf::PLAYER{$login} 964 $cf::PLAYER{$login}
956 or cf::sync_job { !aio_stat $login } 965 or cf::sync_job { !aio_stat path $login }
957} 966}
958 967
959sub find($) { 968sub find($) {
960 return $cf::PLAYER{$_[0]} || do { 969 return $cf::PLAYER{$_[0]} || do {
961 my $login = $_[0]; 970 my $login = $_[0];
… …
1107 1116
1108use Fcntl; 1117use Fcntl;
1109use Coro::AIO; 1118use Coro::AIO;
1110 1119
1111use overload 1120use overload
1112 '""' => \&as_string; 1121 '""' => \&as_string,
1122 fallback => 1;
1113 1123
1114our $MAX_RESET = 3600; 1124our $MAX_RESET = 3600;
1115our $DEFAULT_RESET = 3000; 1125our $DEFAULT_RESET = 3000;
1116 1126
1117sub generate_random_map { 1127sub generate_random_map {
1118 my ($self, $rmp) = @_; 1128 my ($self, $rmp) = @_;
1119
1120 # mit "rum" bekleckern, nicht 1129 # mit "rum" bekleckern, nicht
1121 $self->_create_random_map ( 1130 $self->_create_random_map (
1122 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1131 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1123 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1132 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1124 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1133 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1131 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1140 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1132 (cf::region::find $rmp->{region}), $rmp->{custom} 1141 (cf::region::find $rmp->{region}), $rmp->{custom}
1133 ) 1142 )
1134} 1143}
1135 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
1136sub register { 1153sub register {
1137 my (undef, $regex) = @_; 1154 my (undef, $regex, $prio) = @_;
1138 my $pkg = caller; 1155 my $pkg = caller;
1139 1156
1140 no strict; 1157 no strict;
1141 push @{"$pkg\::ISA"}, __PACKAGE__; 1158 push @{"$pkg\::ISA"}, __PACKAGE__;
1142 1159
1143 $EXT_MAP{$pkg} = qr<$regex>; 1160 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1144} 1161}
1145 1162
1146# also paths starting with '/' 1163# also paths starting with '/'
1147$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1164$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1165
1166sub thawer_merge {
1167 my ($self, $merge) = @_;
1168
1169 # we have to keep some variables in memory intact
1170 local $self->{path};
1171 local $self->{load_path};
1172 local $self->{deny_save};
1173 local $self->{deny_reset};
1174
1175 $self->SUPER::thawer_merge ($merge);
1176}
1148 1177
1149sub normalise { 1178sub normalise {
1150 my ($path, $base) = @_; 1179 my ($path, $base) = @_;
1151 1180
1152 # map plan: 1181 # map plan:
… …
1183 1212
1184 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1213 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1185 1214
1186 $path = normalise $path, $base; 1215 $path = normalise $path, $base;
1187 1216
1188 for my $pkg (keys %EXT_MAP) { 1217 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1189 if ($path =~ $EXT_MAP{$pkg}) { 1218 if ($path =~ $EXT_MAP{$pkg}[1]) {
1190 my $self = bless cf::map::new, $pkg; 1219 my $self = bless cf::map::new, $pkg;
1191 $self->{path} = $path; $self->path ($path); 1220 $self->{path} = $path; $self->path ($path);
1192 $self->init; # pass $1 etc. 1221 $self->init; # pass $1 etc.
1193 return $self; 1222 return $self;
1194 } 1223 }
… …
1249 1278
1250sub unlink_save { 1279sub unlink_save {
1251 my ($self) = @_; 1280 my ($self) = @_;
1252 1281
1253 utf8::encode (my $save = $self->save_path); 1282 utf8::encode (my $save = $self->save_path);
1254 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; 1283 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1255 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst"; 1284 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1256} 1285}
1257 1286
1258sub load_header_from($) { 1287sub load_header_from($) {
1259 my ($self, $path) = @_; 1288 my ($self, $path) = @_;
1260 1289
… …
1268 $self->{load_path} = $path; 1297 $self->{load_path} = $path;
1269 1298
1270 1 1299 1
1271} 1300}
1272 1301
1273sub load_orig { 1302sub load_header_orig {
1274 my ($self) = @_; 1303 my ($self) = @_;
1275 1304
1276 $self->load_header_from ($self->load_path) 1305 $self->load_header_from ($self->load_path)
1277} 1306}
1278 1307
1279sub load_temp { 1308sub load_header_temp {
1280 my ($self) = @_; 1309 my ($self) = @_;
1281 1310
1282 $self->load_header_from ($self->save_path) 1311 $self->load_header_from ($self->save_path)
1312}
1313
1314sub prepare_temp {
1315 my ($self) = @_;
1316
1317 $self->last_access ((delete $self->{last_access})
1318 || $cf::RUNTIME); #d#
1319 # safety
1320 $self->{instantiate_time} = $cf::RUNTIME
1321 if $self->{instantiate_time} > $cf::RUNTIME;
1322}
1323
1324sub prepare_orig {
1325 my ($self) = @_;
1326
1327 $self->{load_original} = 1;
1328 $self->{instantiate_time} = $cf::RUNTIME;
1329 $self->last_access ($cf::RUNTIME);
1330 $self->instantiate;
1283} 1331}
1284 1332
1285sub load_header { 1333sub load_header {
1286 my ($self) = @_; 1334 my ($self) = @_;
1287 1335
1288 if ($self->load_temp) { 1336 if ($self->load_header_temp) {
1289 $self->last_access ((delete $self->{last_access}) 1337 $self->prepare_temp;
1290 || $cf::RUNTIME); #d#
1291 # safety
1292 $self->{instantiate_time} = $cf::RUNTIME
1293 if $self->{instantiate_time} > $cf::RUNTIME;
1294 } else { 1338 } else {
1295 $self->load_orig 1339 $self->load_header_orig
1296 or return; 1340 or return;
1297 1341 $self->prepare_orig;
1298 $self->{load_original} = 1;
1299 $self->{instantiate_time} = $cf::RUNTIME;
1300 $self->last_access ($cf::RUNTIME);
1301 $self->instantiate;
1302 } 1342 }
1303 1343
1304 1 1344 1
1305} 1345}
1306 1346
… …
1321 1361
1322 $map->load_header 1362 $map->load_header
1323 or return; 1363 or return;
1324 1364
1325 if ($map->should_reset) { 1365 if ($map->should_reset) {
1366 # doing this can freeze the server in a sync job, obviously
1367 #$cf::WAIT_FOR_TICK->wait;
1326 $map->reset; 1368 $map->reset;
1327 undef $guard; 1369 undef $guard;
1328 $map = find $path 1370 $map = find $path
1329 or return; 1371 or return;
1330 } 1372 }
1331 1373
1332 $cf::MAP{$path} = $map 1374 $cf::MAP{$path} = $map
1333 } 1375 }
1334} 1376}
1335 1377
1378sub pre_load { }
1379sub post_load { }
1380
1336sub load { 1381sub load {
1337 my ($self) = @_; 1382 my ($self) = @_;
1338 1383
1339 my $path = $self->{path}; 1384 my $path = $self->{path};
1340 my $guard = cf::lock_acquire "map_load:$path"; 1385 my $guard = cf::lock_acquire "map_load:$path";
… …
1342 return if $self->in_memory != cf::MAP_SWAPPED; 1387 return if $self->in_memory != cf::MAP_SWAPPED;
1343 1388
1344 $self->in_memory (cf::MAP_LOADING); 1389 $self->in_memory (cf::MAP_LOADING);
1345 1390
1346 $self->alloc; 1391 $self->alloc;
1392
1393 $self->pre_load;
1394
1347 $self->_load_objects ($self->{load_path}, 1) 1395 $self->_load_objects ($self->{load_path}, 1)
1348 or return; 1396 or return;
1349 1397
1350 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1398 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1351 if delete $self->{load_original}; 1399 if delete $self->{load_original};
… …
1373 unless $self->difficulty; 1421 unless $self->difficulty;
1374 Coro::cede; 1422 Coro::cede;
1375 $self->activate; 1423 $self->activate;
1376 } 1424 }
1377 1425
1426 $self->post_load;
1427
1378 $self->in_memory (cf::MAP_IN_MEMORY); 1428 $self->in_memory (cf::MAP_IN_MEMORY);
1379} 1429}
1380 1430
1381sub customise_for { 1431sub customise_for {
1382 my ($self, $ob) = @_; 1432 my ($self, $ob) = @_;
… …
1422 1472
1423 cf::sync_job { $map->load }; 1473 cf::sync_job { $map->load };
1424} 1474}
1425 1475
1426our %MAP_PREFETCH; 1476our %MAP_PREFETCH;
1427our $MAP_PREFETCHER = Coro::async { 1477our $MAP_PREFETCHER = undef;
1428 while () {
1429 for my $path (keys %MAP_PREFETCH) {
1430 my $map = find $path
1431 or next;
1432 $map->load;
1433
1434 delete $MAP_PREFETCH{$path};
1435 }
1436 Coro::schedule;
1437 }
1438};
1439 1478
1440sub find_async { 1479sub find_async {
1441 my ($path, $origin) = @_; 1480 my ($path, $origin) = @_;
1442 1481
1443 $path = normalise $path, $origin && $origin->{path}; 1482 $path = normalise $path, $origin && $origin->{path};
1444 1483
1445 if (my $map = $cf::MAP{$path}) { 1484 if (my $map = $cf::MAP{$path}) {
1446 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1485 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1447 } 1486 }
1448 1487
1449 $MAP_PREFETCH{$path} = 0; 1488 undef $MAP_PREFETCH{$path};
1450 $MAP_PREFETCHER->ready; 1489 $MAP_PREFETCHER ||= cf::async {
1490 while (%MAP_PREFETCH) {
1491 for my $path (keys %MAP_PREFETCH) {
1492 my $map = find $path
1493 or next;
1494 $map->load;
1495
1496 delete $MAP_PREFETCH{$path};
1497 }
1498 }
1499 undef $MAP_PREFETCHER;
1500 };
1451 1501
1452 () 1502 ()
1453} 1503}
1454 1504
1455sub save { 1505sub save {
… …
1515 my ($self) = @_; 1565 my ($self) = @_;
1516 1566
1517 $self->reset_at <= $cf::RUNTIME 1567 $self->reset_at <= $cf::RUNTIME
1518} 1568}
1519 1569
1520sub rename {
1521 my ($self, $new_path) = @_;
1522
1523 normalise $new_path;
1524
1525 $self->unlink_save;
1526
1527 delete $cf::MAP{$self->path};
1528 $self->{path} = $new_path; $self->path ($self->{path});
1529 $cf::MAP{$self->path} = $self;
1530
1531 $self->save;
1532}
1533
1534sub reset { 1570sub reset {
1535 my ($self) = @_; 1571 my ($self) = @_;
1536 1572
1537 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1573 my $lock = cf::lock_acquire "map_data:$self->{path}";
1538 1574
… …
1555my $nuke_counter = "aaaa"; 1591my $nuke_counter = "aaaa";
1556 1592
1557sub nuke { 1593sub nuke {
1558 my ($self) = @_; 1594 my ($self) = @_;
1559 1595
1596 delete $cf::MAP{$self->path};
1597
1598 $self->unlink_save;
1599
1600 bless $self, "cf::map";
1601 delete $self->{deny_reset};
1560 $self->{deny_save} = 1; 1602 $self->{deny_save} = 1;
1561 $self->reset_timeout (1); 1603 $self->reset_timeout (1);
1562 $self->rename ("{nuke}/" . ($nuke_counter++)); 1604 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1605
1606 $cf::MAP{$self->path} = $self;
1607
1563 $self->reset; # polite request, might not happen 1608 $self->reset; # polite request, might not happen
1564} 1609}
1565 1610
1566=item cf::map::unique_maps 1611=item cf::map::unique_maps
1567 1612
… …
1798 1843
1799sub parse_random_map_params { 1844sub parse_random_map_params {
1800 my ($spec) = @_; 1845 my ($spec) = @_;
1801 1846
1802 my $rmp = { # defaults 1847 my $rmp = { # defaults
1803 xsize => 10, 1848 xsize => (cf::rndm 15, 40),
1804 ysize => 10, 1849 ysize => (cf::rndm 15, 40),
1850 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1851 #layout => string,
1805 }; 1852 };
1806 1853
1807 for (split /\n/, $spec) { 1854 for (split /\n/, $spec) {
1808 my ($k, $v) = split /\s+/, $_, 2; 1855 my ($k, $v) = split /\s+/, $_, 2;
1809 1856
… …
1813 $rmp 1860 $rmp
1814} 1861}
1815 1862
1816sub prepare_random_map { 1863sub prepare_random_map {
1817 my ($exit) = @_; 1864 my ($exit) = @_;
1865
1866 my $guard = cf::lock_acquire "exit_prepare:$exit";
1818 1867
1819 # all this does is basically replace the /! path by 1868 # all this does is basically replace the /! path by
1820 # a new random map path (?random/...) with a seed 1869 # a new random map path (?random/...) with a seed
1821 # that depends on the exit object 1870 # that depends on the exit object
1822 1871
… …
1831 1880
1832 $rmp->{random_seed} ||= $exit->random_seed; 1881 $rmp->{random_seed} ||= $exit->random_seed;
1833 1882
1834 my $data = cf::to_json $rmp; 1883 my $data = cf::to_json $rmp;
1835 my $md5 = Digest::MD5::md5_hex $data; 1884 my $md5 = Digest::MD5::md5_hex $data;
1885 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1836 1886
1837 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1887 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1838 aio_write $fh, 0, (length $data), $data, 0; 1888 aio_write $fh, 0, (length $data), $data, 0;
1889 undef $fh;
1890 aio_rename "$meta~", $meta;
1839 1891
1840 $exit->slaying ("?random/$md5"); 1892 $exit->slaying ("?random/$md5");
1841 $exit->msg (undef); 1893 $exit->msg (undef);
1842 } 1894 }
1843} 1895}
… …
2153 sub db_sync() { 2205 sub db_sync() {
2154 db_save if $dirty; 2206 db_save if $dirty;
2155 undef $dirty; 2207 undef $dirty;
2156 } 2208 }
2157 2209
2158 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2210 my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2159 db_sync; 2211 db_sync;
2160 }); 2212 });
2161 2213
2162 sub db_dirty() { 2214 sub db_dirty() {
2163 $dirty = 1; 2215 $dirty = 1;
… …
2213 2265
2214sub main { 2266sub main {
2215 # we must not ever block the main coroutine 2267 # we must not ever block the main coroutine
2216 local $Coro::idle = sub { 2268 local $Coro::idle = sub {
2217 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2269 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2270 (async {
2218 async { Event::one_event }; 2271 Event::one_event;
2272 })->prio (Coro::PRIO_MAX);
2219 }; 2273 };
2220 2274
2221 cfg_load; 2275 cfg_load;
2222 db_load; 2276 db_load;
2223 load_extensions; 2277 load_extensions;
2278
2279 $TICK_WATCHER->start;
2224 Event::loop; 2280 Event::loop;
2225} 2281}
2226 2282
2227############################################################################# 2283#############################################################################
2228# initialisation and cleanup 2284# initialisation and cleanup
… …
2270} 2326}
2271 2327
2272sub reload() { 2328sub reload() {
2273 # can/must only be called in main 2329 # can/must only be called in main
2274 if ($Coro::current != $Coro::main) { 2330 if ($Coro::current != $Coro::main) {
2275 warn "can only reload from main coroutine\n"; 2331 warn "can only reload from main coroutine";
2276 return; 2332 return;
2277 } 2333 }
2278 2334
2279 warn "reloading..."; 2335 warn "reloading...";
2280 2336
2281 warn "freezing server"; 2337 warn "cancelling server ticker";
2282 my $guard = freeze_mainloop; 2338 $TICK_WATCHER->cancel;
2339
2283 cf::emergency_save; 2340 cf::emergency_save;
2284
2285 warn "sync database to disk";
2286 cf::db_sync;
2287 IO::AIO::flush;
2288 2341
2289 eval { 2342 eval {
2290 # if anything goes wrong in here, we should simply crash as we already saved 2343 # if anything goes wrong in here, we should simply crash as we already saved
2291 2344
2345 warn "syncing database to disk";
2346 cf::db_sync;
2347
2292 warn "cancel all watchers"; 2348 warn "cancelling all WF_AUTOCANCEL watchers";
2293 for (Event::all_watchers) { 2349 for (Event::all_watchers) {
2294 $_->cancel if $_->data & WF_AUTOCANCEL; 2350 $_->cancel if $_->data & WF_AUTOCANCEL;
2295 } 2351 }
2296 2352
2353 warn "flushing outstanding aio requests";
2354 for (;;) {
2355 IO::AIO::flush;
2356 Coro::cede;
2357 last unless IO::AIO::nreqs;
2358 warn "iterate...";
2359 }
2360
2297 warn "cancel all extension coros"; 2361 warn "cancelling all extension coros";
2298 $_->cancel for values %EXT_CORO; 2362 $_->cancel for values %EXT_CORO;
2299 %EXT_CORO = (); 2363 %EXT_CORO = ();
2300 2364
2301 warn "remove commands"; 2365 warn "removing commands";
2302 %COMMAND = (); 2366 %COMMAND = ();
2303 2367
2304 warn "remove ext commands"; 2368 warn "removing ext commands";
2305 %EXTCMD = (); 2369 %EXTCMD = ();
2306 2370
2307 warn "unload/nuke all extensions"; 2371 warn "unloading/nuking all extensions";
2308 for my $pkg (@EXTS) { 2372 for my $pkg (@EXTS) {
2309 warn "... unloading $pkg"; 2373 warn "... unloading $pkg";
2310 2374
2311 if (my $cb = $pkg->can ("unload")) { 2375 if (my $cb = $pkg->can ("unload")) {
2312 eval { 2376 eval {
… …
2317 2381
2318 warn "... nuking $pkg"; 2382 warn "... nuking $pkg";
2319 Symbol::delete_package $pkg; 2383 Symbol::delete_package $pkg;
2320 } 2384 }
2321 2385
2322 warn "unload all perl modules loaded from $LIBDIR"; 2386 warn "unloading all perl modules loaded from $LIBDIR";
2323 while (my ($k, $v) = each %INC) { 2387 while (my ($k, $v) = each %INC) {
2324 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2388 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2325 2389
2326 warn "removing <$k>"; 2390 warn "... unloading $k";
2327 delete $INC{$k}; 2391 delete $INC{$k};
2328 2392
2329 $k =~ s/\.pm$//; 2393 $k =~ s/\.pm$//;
2330 $k =~ s/\//::/g; 2394 $k =~ s/\//::/g;
2331 2395
… …
2334 } 2398 }
2335 2399
2336 Symbol::delete_package $k; 2400 Symbol::delete_package $k;
2337 } 2401 }
2338 2402
2339 warn "get rid of safe::, as good as possible"; 2403 warn "getting rid of safe::, as good as possible";
2340 Symbol::delete_package "safe::$_" 2404 Symbol::delete_package "safe::$_"
2341 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2405 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2342 2406
2343 warn "unload cf.pm \"a bit\""; 2407 warn "unloading cf.pm \"a bit\"";
2344 delete $INC{"cf.pm"}; 2408 delete $INC{"cf.pm"};
2345 2409
2346 # don't, removes xs symbols, too, 2410 # don't, removes xs symbols, too,
2347 # and global variables created in xs 2411 # and global variables created in xs
2348 #Symbol::delete_package __PACKAGE__; 2412 #Symbol::delete_package __PACKAGE__;
2349 2413
2414 warn "unload completed, starting to reload now";
2415
2350 warn "reloading cf.pm"; 2416 warn "reloading cf.pm";
2351 require cf; 2417 require cf;
2352 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2418 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2353 2419
2354 warn "load config and database again"; 2420 warn "loading config and database again";
2355 cf::cfg_load; 2421 cf::cfg_load;
2356 cf::db_load; 2422 cf::db_load;
2357 2423
2358 warn "load extensions"; 2424 warn "loading extensions";
2359 cf::load_extensions; 2425 cf::load_extensions;
2360 2426
2361 warn "reattach attachments to objects/players"; 2427 warn "reattaching attachments to objects/players";
2362 _global_reattach; 2428 _global_reattach;
2363 warn "reattach attachments to maps"; 2429 warn "reattaching attachments to maps";
2364 reattach $_ for values %MAP; 2430 reattach $_ for values %MAP;
2431
2432 warn "restarting server ticker";
2433
2434 $TICK_WATCHER->start;
2365 }; 2435 };
2366 2436
2367 if ($@) { 2437 if ($@) {
2368 warn $@; 2438 warn $@;
2369 warn "error while reloading, exiting."; 2439 warn "error while reloading, exiting.";
… …
2371 } 2441 }
2372 2442
2373 warn "reloaded"; 2443 warn "reloaded";
2374}; 2444};
2375 2445
2446our $RELOAD_WATCHER; # used only during reload
2447
2376register_command "reload" => sub { 2448register_command "reload" => sub {
2377 my ($who, $arg) = @_; 2449 my ($who, $arg) = @_;
2378 2450
2379 if ($who->flag (FLAG_WIZ)) { 2451 if ($who->flag (FLAG_WIZ)) {
2380 $who->message ("start of reload."); 2452 $who->message ("reloading server.");
2453
2454 # doing reload synchronously and two reloads happen back-to-back,
2455 # coro crashes during coro_state_free->destroy here.
2456
2457 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub {
2381 reload; 2458 reload;
2382 $who->message ("end of reload."); 2459 undef $RELOAD_WATCHER;
2460 });
2383 } 2461 }
2384}; 2462};
2385 2463
2386unshift @INC, $LIBDIR; 2464unshift @INC, $LIBDIR;
2465
2466my $bug_warning = 0;
2387 2467
2388$TICK_WATCHER = Event->timer ( 2468$TICK_WATCHER = Event->timer (
2389 reentrant => 0, 2469 reentrant => 0,
2470 parked => 1,
2390 prio => 0, 2471 prio => 0,
2391 at => $NEXT_TICK || $TICK, 2472 at => $NEXT_TICK || $TICK,
2392 data => WF_AUTOCANCEL, 2473 data => WF_AUTOCANCEL,
2393 cb => sub { 2474 cb => sub {
2475 if ($Coro::current != $Coro::main) {
2476 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2477 unless ++$bug_warning > 10;
2478 return;
2479 }
2480
2394 $NOW = Event::time; 2481 $NOW = Event::time;
2395 2482
2396 cf::server_tick; # one server iteration 2483 cf::server_tick; # one server iteration
2397 $RUNTIME += $TICK; 2484 $RUNTIME += $TICK;
2398 $NEXT_TICK += $TICK; 2485 $NEXT_TICK += $TICK;
… …
2418 cb => \&IO::AIO::poll_cb, 2505 cb => \&IO::AIO::poll_cb,
2419); 2506);
2420 2507
2421$WRITE_RUNTIME_WATCHER = Event->timer ( 2508$WRITE_RUNTIME_WATCHER = Event->timer (
2422 data => WF_AUTOCANCEL, 2509 data => WF_AUTOCANCEL,
2423 after => 0, 2510 after => 1,
2424 interval => 10, 2511 interval => 10,
2425 cb => sub { 2512 prio => 6, # keep it lowest so it acts like a watchdog
2426 (Coro::unblock_sub { 2513 cb => Coro::unblock_sub {
2427 write_runtime 2514 write_runtime
2428 or warn "ERROR: unable to write runtime file: $!"; 2515 or warn "ERROR: unable to write runtime file: $!";
2429 })->();
2430 }, 2516 },
2431); 2517);
2432 2518
2433END { cf::emergency_save } 2519END { cf::emergency_save }
2434 2520

Diff Legend

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