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.187 by root, Sat Jan 20 21:06:52 2007 UTC vs.
Revision 1.190 by root, Mon Jan 22 03:44:41 2007 UTC

… …
1297 $self->{load_path} = $path; 1297 $self->{load_path} = $path;
1298 1298
1299 1 1299 1
1300} 1300}
1301 1301
1302sub load_orig { 1302sub load_header_orig {
1303 my ($self) = @_; 1303 my ($self) = @_;
1304 1304
1305 $self->load_header_from ($self->load_path) 1305 $self->load_header_from ($self->load_path)
1306} 1306}
1307 1307
1308sub load_temp { 1308sub load_header_temp {
1309 my ($self) = @_; 1309 my ($self) = @_;
1310 1310
1311 $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;
1312} 1331}
1313 1332
1314sub load_header { 1333sub load_header {
1315 my ($self) = @_; 1334 my ($self) = @_;
1316 1335
1317 if ($self->load_temp) { 1336 if ($self->load_header_temp) {
1318 $self->last_access ((delete $self->{last_access}) 1337 $self->prepare_temp;
1319 || $cf::RUNTIME); #d#
1320 # safety
1321 $self->{instantiate_time} = $cf::RUNTIME
1322 if $self->{instantiate_time} > $cf::RUNTIME;
1323 } else { 1338 } else {
1324 $self->load_orig 1339 $self->load_header_orig
1325 or return; 1340 or return;
1326 1341 $self->prepare_orig;
1327 $self->{load_original} = 1;
1328 $self->{instantiate_time} = $cf::RUNTIME;
1329 $self->last_access ($cf::RUNTIME);
1330 $self->instantiate;
1331 } 1342 }
1332 1343
1333 1 1344 1
1334} 1345}
1335 1346
… …
1362 1373
1363 $cf::MAP{$path} = $map 1374 $cf::MAP{$path} = $map
1364 } 1375 }
1365} 1376}
1366 1377
1378sub pre_load { }
1379sub post_load { }
1380
1367sub load { 1381sub load {
1368 my ($self) = @_; 1382 my ($self) = @_;
1369 1383
1370 my $path = $self->{path}; 1384 my $path = $self->{path};
1371 my $guard = cf::lock_acquire "map_load:$path"; 1385 my $guard = cf::lock_acquire "map_load:$path";
… …
1373 return if $self->in_memory != cf::MAP_SWAPPED; 1387 return if $self->in_memory != cf::MAP_SWAPPED;
1374 1388
1375 $self->in_memory (cf::MAP_LOADING); 1389 $self->in_memory (cf::MAP_LOADING);
1376 1390
1377 $self->alloc; 1391 $self->alloc;
1392
1393 $self->pre_load;
1394
1378 $self->_load_objects ($self->{load_path}, 1) 1395 $self->_load_objects ($self->{load_path}, 1)
1379 or return; 1396 or return;
1380 1397
1381 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1398 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1382 if delete $self->{load_original}; 1399 if delete $self->{load_original};
… …
1404 unless $self->difficulty; 1421 unless $self->difficulty;
1405 Coro::cede; 1422 Coro::cede;
1406 $self->activate; 1423 $self->activate;
1407 } 1424 }
1408 1425
1426 $self->post_load;
1427
1409 $self->in_memory (cf::MAP_IN_MEMORY); 1428 $self->in_memory (cf::MAP_IN_MEMORY);
1410} 1429}
1411 1430
1412sub customise_for { 1431sub customise_for {
1413 my ($self, $ob) = @_; 1432 my ($self, $ob) = @_;
… …
1477 delete $MAP_PREFETCH{$path}; 1496 delete $MAP_PREFETCH{$path};
1478 } 1497 }
1479 } 1498 }
1480 undef $MAP_PREFETCHER; 1499 undef $MAP_PREFETCHER;
1481 }; 1500 };
1501 $MAP_PREFETCHER->prio (6);
1482 1502
1483 () 1503 ()
1484} 1504}
1485 1505
1486sub save { 1506sub save {
… …
2186 sub db_sync() { 2206 sub db_sync() {
2187 db_save if $dirty; 2207 db_save if $dirty;
2188 undef $dirty; 2208 undef $dirty;
2189 } 2209 }
2190 2210
2191 my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2211 my $idle = Event->idle (
2192 db_sync; 2212 reentrant => 0,
2213 min => 10,
2214 max => 20,
2215 repeat => 0,
2216 data => WF_AUTOCANCEL,
2217 cb => \&db_sync,
2193 }); 2218 );
2194 2219
2195 sub db_dirty() { 2220 sub db_dirty() {
2196 $dirty = 1; 2221 $dirty = 1;
2197 $idle->start; 2222 $idle->start;
2198 } 2223 }
… …
2266 2291
2267# install some emergency cleanup handlers 2292# install some emergency cleanup handlers
2268BEGIN { 2293BEGIN {
2269 for my $signal (qw(INT HUP TERM)) { 2294 for my $signal (qw(INT HUP TERM)) {
2270 Event->signal ( 2295 Event->signal (
2296 reentrant => 0,
2271 data => WF_AUTOCANCEL, 2297 data => WF_AUTOCANCEL,
2272 signal => $signal, 2298 signal => $signal,
2273 cb => sub { 2299 cb => sub {
2274 cf::cleanup "SIG$signal"; 2300 cf::cleanup "SIG$signal";
2275 }, 2301 },
2276 ); 2302 );
2277 } 2303 }
2278} 2304}
… …
2433 $who->message ("reloading server."); 2459 $who->message ("reloading server.");
2434 2460
2435 # doing reload synchronously and two reloads happen back-to-back, 2461 # doing reload synchronously and two reloads happen back-to-back,
2436 # coro crashes during coro_state_free->destroy here. 2462 # coro crashes during coro_state_free->destroy here.
2437 2463
2438 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub { 2464 $RELOAD_WATCHER ||= Event->timer (
2465 reentrant => 0,
2466 after => 0,
2467 data => WF_AUTOCANCEL,
2468 cb => sub {
2439 reload; 2469 reload;
2440 undef $RELOAD_WATCHER; 2470 undef $RELOAD_WATCHER;
2471 },
2441 }); 2472 );
2442 } 2473 }
2443}; 2474};
2444 2475
2445unshift @INC, $LIBDIR; 2476unshift @INC, $LIBDIR;
2446 2477
2447my $bug_warning = 0; 2478my $bug_warning = 0;
2448 2479
2449$TICK_WATCHER = Event->timer ( 2480$TICK_WATCHER = Event->timer (
2450 reentrant => 0, 2481 reentrant => 0,
2451 parked => 1, 2482 parked => 1,
2452 prio => 0, 2483 prio => -1,
2453 at => $NEXT_TICK || $TICK, 2484 at => $NEXT_TICK || $TICK,
2454 data => WF_AUTOCANCEL, 2485 data => WF_AUTOCANCEL,
2455 cb => sub { 2486 cb => sub {
2456 if ($Coro::current != $Coro::main) { 2487 if ($Coro::current != $Coro::main) {
2457 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 2488 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
… …
2466 $NEXT_TICK += $TICK; 2497 $NEXT_TICK += $TICK;
2467 2498
2468 $WAIT_FOR_TICK->broadcast; 2499 $WAIT_FOR_TICK->broadcast;
2469 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2500 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2470 2501
2502 my $AFTER = Event::time;
2503 warn $AFTER - $NOW;#d#
2504
2471 # if we are delayed by four ticks or more, skip them all 2505 # if we are delayed by four ticks or more, skip them all
2472 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2506 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2473 2507
2474 $TICK_WATCHER->at ($NEXT_TICK); 2508 $TICK_WATCHER->at ($NEXT_TICK);
2475 $TICK_WATCHER->start; 2509 $TICK_WATCHER->start;
2476 }, 2510 },
2477); 2511);
2478 2512
2479IO::AIO::max_poll_time $TICK * 0.2; 2513IO::AIO::max_poll_time $TICK * 0.2;
2480 2514
2515undef $Coro::AIO::WATCHER;
2481$AIO_POLL_WATCHER = Event->io ( 2516$AIO_POLL_WATCHER = Event->io (
2517 reentrant => 0,
2482 fd => IO::AIO::poll_fileno, 2518 fd => IO::AIO::poll_fileno,
2483 poll => 'r', 2519 poll => 'r',
2484 prio => 5, 2520 prio => 6,
2485 data => WF_AUTOCANCEL, 2521 data => WF_AUTOCANCEL,
2486 cb => \&IO::AIO::poll_cb, 2522 cb => \&IO::AIO::poll_cb,
2487); 2523);
2488 2524
2489$WRITE_RUNTIME_WATCHER = Event->timer ( 2525$WRITE_RUNTIME_WATCHER = Event->timer (
2526 reentrant => 0,
2490 data => WF_AUTOCANCEL, 2527 data => WF_AUTOCANCEL,
2491 after => 1, 2528 after => 1,
2492 interval => 10, 2529 interval => 10,
2493 prio => 6, # keep it lowest so it acts like a watchdog 2530 prio => 6, # keep it lowest so it acts like a watchdog
2494 cb => Coro::unblock_sub { 2531 cb => Coro::unblock_sub {
2495 write_runtime 2532 write_runtime
2496 or warn "ERROR: unable to write runtime file: $!"; 2533 or warn "ERROR: unable to write runtime file: $!";
2497 }, 2534 },
2498); 2535);
2499 2536

Diff Legend

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