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.192 by root, Wed Jan 24 01:43:01 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) = @_;
1180
1181 $path = "$path"; # make sure its a string
1151 1182
1152 # map plan: 1183 # map plan:
1153 # 1184 #
1154 # /! non-realised random map exit (special hack!) 1185 # /! non-realised random map exit (special hack!)
1155 # {... are special paths that are not being touched 1186 # {... are special paths that are not being touched
… …
1183 1214
1184 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
1185 1216
1186 $path = normalise $path, $base; 1217 $path = normalise $path, $base;
1187 1218
1188 for my $pkg (keys %EXT_MAP) { 1219 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1189 if ($path =~ $EXT_MAP{$pkg}) { 1220 if ($path =~ $EXT_MAP{$pkg}[1]) {
1190 my $self = bless cf::map::new, $pkg; 1221 my $self = bless cf::map::new, $pkg;
1191 $self->{path} = $path; $self->path ($path); 1222 $self->{path} = $path; $self->path ($path);
1192 $self->init; # pass $1 etc. 1223 $self->init; # pass $1 etc.
1193 return $self; 1224 return $self;
1194 } 1225 }
1195 } 1226 }
1196 1227
1197 Carp::carp "unable to resolve path '$path'."; 1228 Carp::carp "unable to resolve path '$path' (base '$base').";
1198 () 1229 ()
1199} 1230}
1200 1231
1201sub init { 1232sub init {
1202 my ($self) = @_; 1233 my ($self) = @_;
… …
1249 1280
1250sub unlink_save { 1281sub unlink_save {
1251 my ($self) = @_; 1282 my ($self) = @_;
1252 1283
1253 utf8::encode (my $save = $self->save_path); 1284 utf8::encode (my $save = $self->save_path);
1254 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; 1285 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1255 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst"; 1286 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1256} 1287}
1257 1288
1258sub load_header_from($) { 1289sub load_header_from($) {
1259 my ($self, $path) = @_; 1290 my ($self, $path) = @_;
1260 1291
… …
1268 $self->{load_path} = $path; 1299 $self->{load_path} = $path;
1269 1300
1270 1 1301 1
1271} 1302}
1272 1303
1273sub load_orig { 1304sub load_header_orig {
1274 my ($self) = @_; 1305 my ($self) = @_;
1275 1306
1276 $self->load_header_from ($self->load_path) 1307 $self->load_header_from ($self->load_path)
1277} 1308}
1278 1309
1279sub load_temp { 1310sub load_header_temp {
1280 my ($self) = @_; 1311 my ($self) = @_;
1281 1312
1282 $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;
1283} 1333}
1284 1334
1285sub load_header { 1335sub load_header {
1286 my ($self) = @_; 1336 my ($self) = @_;
1287 1337
1288 if ($self->load_temp) { 1338 if ($self->load_header_temp) {
1289 $self->last_access ((delete $self->{last_access}) 1339 $self->prepare_temp;
1290 || $cf::RUNTIME); #d#
1291 # safety
1292 $self->{instantiate_time} = $cf::RUNTIME
1293 if $self->{instantiate_time} > $cf::RUNTIME;
1294 } else { 1340 } else {
1295 $self->load_orig 1341 $self->load_header_orig
1296 or return; 1342 or return;
1297 1343 $self->prepare_orig;
1298 $self->{load_original} = 1;
1299 $self->{instantiate_time} = $cf::RUNTIME;
1300 $self->last_access ($cf::RUNTIME);
1301 $self->instantiate;
1302 } 1344 }
1303 1345
1304 1 1346 1
1305} 1347}
1306 1348
… …
1321 1363
1322 $map->load_header 1364 $map->load_header
1323 or return; 1365 or return;
1324 1366
1325 if ($map->should_reset) { 1367 if ($map->should_reset) {
1368 # doing this can freeze the server in a sync job, obviously
1369 #$cf::WAIT_FOR_TICK->wait;
1326 $map->reset; 1370 $map->reset;
1327 undef $guard; 1371 undef $guard;
1328 $map = find $path 1372 return find $path;
1329 or return;
1330 } 1373 }
1331 1374
1332 $cf::MAP{$path} = $map 1375 $cf::MAP{$path} = $map
1333 } 1376 }
1334} 1377}
1378
1379sub pre_load { }
1380sub post_load { }
1335 1381
1336sub load { 1382sub load {
1337 my ($self) = @_; 1383 my ($self) = @_;
1338 1384
1339 my $path = $self->{path}; 1385 my $path = $self->{path};
… …
1342 return if $self->in_memory != cf::MAP_SWAPPED; 1388 return if $self->in_memory != cf::MAP_SWAPPED;
1343 1389
1344 $self->in_memory (cf::MAP_LOADING); 1390 $self->in_memory (cf::MAP_LOADING);
1345 1391
1346 $self->alloc; 1392 $self->alloc;
1393
1394 $self->pre_load;
1395
1347 $self->_load_objects ($self->{load_path}, 1) 1396 $self->_load_objects ($self->{load_path}, 1)
1348 or return; 1397 or return;
1349 1398
1350 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1399 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1351 if delete $self->{load_original}; 1400 if delete $self->{load_original};
… …
1373 unless $self->difficulty; 1422 unless $self->difficulty;
1374 Coro::cede; 1423 Coro::cede;
1375 $self->activate; 1424 $self->activate;
1376 } 1425 }
1377 1426
1427 $self->post_load;
1428
1378 $self->in_memory (cf::MAP_IN_MEMORY); 1429 $self->in_memory (cf::MAP_IN_MEMORY);
1379} 1430}
1380 1431
1381sub customise_for { 1432sub customise_for {
1382 my ($self, $ob) = @_; 1433 my ($self, $ob) = @_;
… …
1422 1473
1423 cf::sync_job { $map->load }; 1474 cf::sync_job { $map->load };
1424} 1475}
1425 1476
1426our %MAP_PREFETCH; 1477our %MAP_PREFETCH;
1427our $MAP_PREFETCHER = Coro::async { 1478our $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 1479
1440sub find_async { 1480sub find_async {
1441 my ($path, $origin) = @_; 1481 my ($path, $origin) = @_;
1442 1482
1443 $path = normalise $path, $origin && $origin->{path}; 1483 $path = normalise $path, $origin && $origin->{path};
1444 1484
1445 if (my $map = $cf::MAP{$path}) { 1485 if (my $map = $cf::MAP{$path}) {
1446 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1486 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1447 } 1487 }
1448 1488
1449 $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 };
1450 $MAP_PREFETCHER->ready; 1502 $MAP_PREFETCHER->prio (6);
1451 1503
1452 () 1504 ()
1453} 1505}
1454 1506
1455sub save { 1507sub save {
… …
1515 my ($self) = @_; 1567 my ($self) = @_;
1516 1568
1517 $self->reset_at <= $cf::RUNTIME 1569 $self->reset_at <= $cf::RUNTIME
1518} 1570}
1519 1571
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 { 1572sub reset {
1535 my ($self) = @_; 1573 my ($self) = @_;
1536 1574
1537 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1575 my $lock = cf::lock_acquire "map_data:$self->{path}";
1538 1576
… …
1555my $nuke_counter = "aaaa"; 1593my $nuke_counter = "aaaa";
1556 1594
1557sub nuke { 1595sub nuke {
1558 my ($self) = @_; 1596 my ($self) = @_;
1559 1597
1598 delete $cf::MAP{$self->path};
1599
1600 $self->unlink_save;
1601
1602 bless $self, "cf::map";
1603 delete $self->{deny_reset};
1560 $self->{deny_save} = 1; 1604 $self->{deny_save} = 1;
1561 $self->reset_timeout (1); 1605 $self->reset_timeout (1);
1562 $self->rename ("{nuke}/" . ($nuke_counter++)); 1606 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1607
1608 $cf::MAP{$self->path} = $self;
1609
1563 $self->reset; # polite request, might not happen 1610 $self->reset; # polite request, might not happen
1564} 1611}
1565 1612
1566=item cf::map::unique_maps 1613=item cf::map::unique_maps
1567 1614
… …
1798 1845
1799sub parse_random_map_params { 1846sub parse_random_map_params {
1800 my ($spec) = @_; 1847 my ($spec) = @_;
1801 1848
1802 my $rmp = { # defaults 1849 my $rmp = { # defaults
1803 xsize => 10, 1850 xsize => (cf::rndm 15, 40),
1804 ysize => 10, 1851 ysize => (cf::rndm 15, 40),
1852 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1853 #layout => string,
1805 }; 1854 };
1806 1855
1807 for (split /\n/, $spec) { 1856 for (split /\n/, $spec) {
1808 my ($k, $v) = split /\s+/, $_, 2; 1857 my ($k, $v) = split /\s+/, $_, 2;
1809 1858
… …
1813 $rmp 1862 $rmp
1814} 1863}
1815 1864
1816sub prepare_random_map { 1865sub prepare_random_map {
1817 my ($exit) = @_; 1866 my ($exit) = @_;
1867
1868 my $guard = cf::lock_acquire "exit_prepare:$exit";
1818 1869
1819 # all this does is basically replace the /! path by 1870 # all this does is basically replace the /! path by
1820 # a new random map path (?random/...) with a seed 1871 # a new random map path (?random/...) with a seed
1821 # that depends on the exit object 1872 # that depends on the exit object
1822 1873
… …
1831 1882
1832 $rmp->{random_seed} ||= $exit->random_seed; 1883 $rmp->{random_seed} ||= $exit->random_seed;
1833 1884
1834 my $data = cf::to_json $rmp; 1885 my $data = cf::to_json $rmp;
1835 my $md5 = Digest::MD5::md5_hex $data; 1886 my $md5 = Digest::MD5::md5_hex $data;
1887 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1836 1888
1837 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) {
1838 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;
1839 1893
1840 $exit->slaying ("?random/$md5"); 1894 $exit->slaying ("?random/$md5");
1841 $exit->msg (undef); 1895 $exit->msg (undef);
1842 } 1896 }
1843} 1897}
… …
2153 sub db_sync() { 2207 sub db_sync() {
2154 db_save if $dirty; 2208 db_save if $dirty;
2155 undef $dirty; 2209 undef $dirty;
2156 } 2210 }
2157 2211
2158 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2212 my $idle = Event->idle (
2159 db_sync; 2213 reentrant => 0,
2214 min => 10,
2215 max => 20,
2216 repeat => 0,
2217 data => WF_AUTOCANCEL,
2218 cb => \&db_sync,
2160 }); 2219 );
2161 2220
2162 sub db_dirty() { 2221 sub db_dirty() {
2163 $dirty = 1; 2222 $dirty = 1;
2164 $idle->start; 2223 $idle->start;
2165 } 2224 }
… …
2213 2272
2214sub main { 2273sub main {
2215 # we must not ever block the main coroutine 2274 # we must not ever block the main coroutine
2216 local $Coro::idle = sub { 2275 local $Coro::idle = sub {
2217 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2276 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2277 (async {
2218 async { Event::one_event }; 2278 Event::one_event;
2279 })->prio (Coro::PRIO_MAX);
2219 }; 2280 };
2220 2281
2221 cfg_load; 2282 cfg_load;
2222 db_load; 2283 db_load;
2223 load_extensions; 2284 load_extensions;
2285
2286 $TICK_WATCHER->start;
2224 Event::loop; 2287 Event::loop;
2225} 2288}
2226 2289
2227############################################################################# 2290#############################################################################
2228# initialisation and cleanup 2291# initialisation and cleanup
2229 2292
2230# install some emergency cleanup handlers 2293# install some emergency cleanup handlers
2231BEGIN { 2294BEGIN {
2232 for my $signal (qw(INT HUP TERM)) { 2295 for my $signal (qw(INT HUP TERM)) {
2233 Event->signal ( 2296 Event->signal (
2297 reentrant => 0,
2234 data => WF_AUTOCANCEL, 2298 data => WF_AUTOCANCEL,
2235 signal => $signal, 2299 signal => $signal,
2300 prio => 0,
2236 cb => sub { 2301 cb => sub {
2237 cf::cleanup "SIG$signal"; 2302 cf::cleanup "SIG$signal";
2238 }, 2303 },
2239 ); 2304 );
2240 } 2305 }
2241} 2306}
… …
2270} 2335}
2271 2336
2272sub reload() { 2337sub reload() {
2273 # can/must only be called in main 2338 # can/must only be called in main
2274 if ($Coro::current != $Coro::main) { 2339 if ($Coro::current != $Coro::main) {
2275 warn "can only reload from main coroutine\n"; 2340 warn "can only reload from main coroutine";
2276 return; 2341 return;
2277 } 2342 }
2278 2343
2279 warn "reloading..."; 2344 warn "reloading...";
2280 2345
2281 warn "freezing server"; 2346 warn "cancelling server ticker";
2282 my $guard = freeze_mainloop; 2347 $TICK_WATCHER->cancel;
2348
2283 cf::emergency_save; 2349 cf::emergency_save;
2284
2285 warn "sync database to disk";
2286 cf::db_sync;
2287 IO::AIO::flush;
2288 2350
2289 eval { 2351 eval {
2290 # if anything goes wrong in here, we should simply crash as we already saved 2352 # if anything goes wrong in here, we should simply crash as we already saved
2291 2353
2354 warn "syncing database to disk";
2355 cf::db_sync;
2356
2292 warn "cancel all watchers"; 2357 warn "cancelling all WF_AUTOCANCEL watchers";
2293 for (Event::all_watchers) { 2358 for (Event::all_watchers) {
2294 $_->cancel if $_->data & WF_AUTOCANCEL; 2359 $_->cancel if $_->data & WF_AUTOCANCEL;
2295 } 2360 }
2296 2361
2362 warn "flushing outstanding aio requests";
2363 for (;;) {
2364 IO::AIO::flush;
2365 Coro::cede;
2366 last unless IO::AIO::nreqs;
2367 warn "iterate...";
2368 }
2369
2297 warn "cancel all extension coros"; 2370 warn "cancelling all extension coros";
2298 $_->cancel for values %EXT_CORO; 2371 $_->cancel for values %EXT_CORO;
2299 %EXT_CORO = (); 2372 %EXT_CORO = ();
2300 2373
2301 warn "remove commands"; 2374 warn "removing commands";
2302 %COMMAND = (); 2375 %COMMAND = ();
2303 2376
2304 warn "remove ext commands"; 2377 warn "removing ext commands";
2305 %EXTCMD = (); 2378 %EXTCMD = ();
2306 2379
2307 warn "unload/nuke all extensions"; 2380 warn "unloading/nuking all extensions";
2308 for my $pkg (@EXTS) { 2381 for my $pkg (@EXTS) {
2309 warn "... unloading $pkg"; 2382 warn "... unloading $pkg";
2310 2383
2311 if (my $cb = $pkg->can ("unload")) { 2384 if (my $cb = $pkg->can ("unload")) {
2312 eval { 2385 eval {
… …
2317 2390
2318 warn "... nuking $pkg"; 2391 warn "... nuking $pkg";
2319 Symbol::delete_package $pkg; 2392 Symbol::delete_package $pkg;
2320 } 2393 }
2321 2394
2322 warn "unload all perl modules loaded from $LIBDIR"; 2395 warn "unloading all perl modules loaded from $LIBDIR";
2323 while (my ($k, $v) = each %INC) { 2396 while (my ($k, $v) = each %INC) {
2324 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2397 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2325 2398
2326 warn "removing <$k>"; 2399 warn "... unloading $k";
2327 delete $INC{$k}; 2400 delete $INC{$k};
2328 2401
2329 $k =~ s/\.pm$//; 2402 $k =~ s/\.pm$//;
2330 $k =~ s/\//::/g; 2403 $k =~ s/\//::/g;
2331 2404
… …
2334 } 2407 }
2335 2408
2336 Symbol::delete_package $k; 2409 Symbol::delete_package $k;
2337 } 2410 }
2338 2411
2339 warn "get rid of safe::, as good as possible"; 2412 warn "getting rid of safe::, as good as possible";
2340 Symbol::delete_package "safe::$_" 2413 Symbol::delete_package "safe::$_"
2341 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2414 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2342 2415
2343 warn "unload cf.pm \"a bit\""; 2416 warn "unloading cf.pm \"a bit\"";
2344 delete $INC{"cf.pm"}; 2417 delete $INC{"cf.pm"};
2345 2418
2346 # don't, removes xs symbols, too, 2419 # don't, removes xs symbols, too,
2347 # and global variables created in xs 2420 # and global variables created in xs
2348 #Symbol::delete_package __PACKAGE__; 2421 #Symbol::delete_package __PACKAGE__;
2349 2422
2423 warn "unload completed, starting to reload now";
2424
2350 warn "reloading cf.pm"; 2425 warn "reloading cf.pm";
2351 require cf; 2426 require cf;
2352 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2427 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2353 2428
2354 warn "load config and database again"; 2429 warn "loading config and database again";
2355 cf::cfg_load; 2430 cf::cfg_load;
2356 cf::db_load; 2431 cf::db_load;
2357 2432
2358 warn "load extensions"; 2433 warn "loading extensions";
2359 cf::load_extensions; 2434 cf::load_extensions;
2360 2435
2361 warn "reattach attachments to objects/players"; 2436 warn "reattaching attachments to objects/players";
2362 _global_reattach; 2437 _global_reattach;
2363 warn "reattach attachments to maps"; 2438 warn "reattaching attachments to maps";
2364 reattach $_ for values %MAP; 2439 reattach $_ for values %MAP;
2440
2441 warn "restarting server ticker";
2442
2443 $TICK_WATCHER->start;
2365 }; 2444 };
2366 2445
2367 if ($@) { 2446 if ($@) {
2368 warn $@; 2447 warn $@;
2369 warn "error while reloading, exiting."; 2448 warn "error while reloading, exiting.";
… …
2371 } 2450 }
2372 2451
2373 warn "reloaded"; 2452 warn "reloaded";
2374}; 2453};
2375 2454
2455our $RELOAD_WATCHER; # used only during reload
2456
2376register_command "reload" => sub { 2457register_command "reload" => sub {
2377 my ($who, $arg) = @_; 2458 my ($who, $arg) = @_;
2378 2459
2379 if ($who->flag (FLAG_WIZ)) { 2460 if ($who->flag (FLAG_WIZ)) {
2380 $who->message ("start of reload."); 2461 $who->message ("reloading server.");
2462
2463 # doing reload synchronously and two reloads happen back-to-back,
2464 # coro crashes during coro_state_free->destroy here.
2465
2466 $RELOAD_WATCHER ||= Event->timer (
2467 reentrant => 0,
2468 after => 0,
2469 data => WF_AUTOCANCEL,
2470 cb => sub {
2381 reload; 2471 reload;
2382 $who->message ("end of reload."); 2472 undef $RELOAD_WATCHER;
2473 },
2474 );
2383 } 2475 }
2384}; 2476};
2385 2477
2386unshift @INC, $LIBDIR; 2478unshift @INC, $LIBDIR;
2479
2480my $bug_warning = 0;
2387 2481
2388$TICK_WATCHER = Event->timer ( 2482$TICK_WATCHER = Event->timer (
2389 reentrant => 0, 2483 reentrant => 0,
2484 parked => 1,
2390 prio => 0, 2485 prio => 0,
2391 at => $NEXT_TICK || $TICK, 2486 at => $NEXT_TICK || $TICK,
2392 data => WF_AUTOCANCEL, 2487 data => WF_AUTOCANCEL,
2393 cb => sub { 2488 cb => sub {
2489 if ($Coro::current != $Coro::main) {
2490 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2491 unless ++$bug_warning > 10;
2492 return;
2493 }
2494
2394 $NOW = Event::time; 2495 $NOW = Event::time;
2395 2496
2396 cf::server_tick; # one server iteration 2497 cf::server_tick; # one server iteration
2397 $RUNTIME += $TICK; 2498 $RUNTIME += $TICK;
2398 $NEXT_TICK += $TICK; 2499 $NEXT_TICK += $TICK;
2399 2500
2400 $WAIT_FOR_TICK->broadcast; 2501 $WAIT_FOR_TICK->broadcast;
2401 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2502 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2503
2504 Event::sweep;
2505 Coro::cede_notself;
2506
2507# my $AFTER = Event::time;
2508# warn $AFTER - $NOW;#d#
2402 2509
2403 # if we are delayed by four ticks or more, skip them all 2510 # if we are delayed by four ticks or more, skip them all
2404 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2511 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2405 2512
2406 $TICK_WATCHER->at ($NEXT_TICK); 2513 $TICK_WATCHER->at ($NEXT_TICK);
2407 $TICK_WATCHER->start; 2514 $TICK_WATCHER->start;
2408 }, 2515 },
2409); 2516);
2410 2517
2411IO::AIO::max_poll_time $TICK * 0.2; 2518IO::AIO::max_poll_time $TICK * 0.1;
2412 2519
2520undef $Coro::AIO::WATCHER;
2413$AIO_POLL_WATCHER = Event->io ( 2521$AIO_POLL_WATCHER = Event->io (
2522 reentrant => 0,
2414 fd => IO::AIO::poll_fileno, 2523 fd => IO::AIO::poll_fileno,
2415 poll => 'r', 2524 poll => 'r',
2416 prio => 5, 2525 prio => 6,
2417 data => WF_AUTOCANCEL, 2526 data => WF_AUTOCANCEL,
2418 cb => \&IO::AIO::poll_cb, 2527 cb => \&IO::AIO::poll_cb,
2419); 2528);
2420 2529
2421$WRITE_RUNTIME_WATCHER = Event->timer ( 2530$WRITE_RUNTIME_WATCHER = Event->timer (
2531 reentrant => 0,
2422 data => WF_AUTOCANCEL, 2532 data => WF_AUTOCANCEL,
2423 after => 0, 2533 after => 1,
2424 interval => 10, 2534 interval => 10,
2425 cb => sub { 2535 prio => 6, # keep it lowest so it acts like a watchdog
2426 (Coro::unblock_sub { 2536 cb => Coro::unblock_sub {
2427 write_runtime 2537 write_runtime
2428 or warn "ERROR: unable to write runtime file: $!"; 2538 or warn "ERROR: unable to write runtime file: $!";
2429 })->();
2430 }, 2539 },
2431); 2540);
2432 2541
2433END { cf::emergency_save } 2542END { cf::emergency_save }
2434 2543

Diff Legend

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