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.167 by root, Sat Jan 13 23:32:43 2007 UTC vs.
Revision 1.176 by root, Sun Jan 14 22:14:35 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;
… …
44our @EVENT; 44our @EVENT;
45our $LIBDIR = datadir . "/ext"; 45our $LIBDIR = datadir . "/ext";
46 46
47our $TICK = MAX_TIME * 1e-6; 47our $TICK = MAX_TIME * 1e-6;
48our $TICK_WATCHER; 48our $TICK_WATCHER;
49our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER;
49our $NEXT_TICK; 51our $NEXT_TICK;
50our $NOW; 52our $NOW;
51 53
52our %CFG; 54our %CFG;
53 55
… …
257} 259}
258 260
259sub freeze_mainloop { 261sub freeze_mainloop {
260 return unless $TICK_WATCHER->is_active; 262 return unless $TICK_WATCHER->is_active;
261 263
262 my $guard = Coro::guard { $TICK_WATCHER->start }; 264 my $guard = Coro::guard {
265 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 };
268 $WRITE_RUNTIME_WATCHER->stop;
263 $TICK_WATCHER->stop; 269 $TICK_WATCHER->stop;
264 $guard 270 $guard
265} 271}
266 272
267=item cf::async { BLOCK } 273=item cf::async { BLOCK }
… …
338 344
339 $coro 345 $coro
340} 346}
341 347
342sub write_runtime { 348sub write_runtime {
343 return unless $TICK_WATCHER->is_active;
344
345 my $runtime = cf::localdir . "/runtime"; 349 my $runtime = cf::localdir . "/runtime";
346 350
347 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
348 or return; 352 or return;
349 353
… …
499our @CB_TYPE = (); # registry for type (cf-object class) based events 503our @CB_TYPE = (); # registry for type (cf-object class) based events
500our @CB_MAP = (); 504our @CB_MAP = ();
501 505
502my %attachment; 506my %attachment;
503 507
508sub cf::attachable::thawer_merge {
509 # simply override everything except _meta
510 local $_[0]{_meta};
511 %{$_[0]} = %{$_[1]};
512}
513
504sub _attach_cb($$$$) { 514sub _attach_cb($$$$) {
505 my ($registry, $event, $prio, $cb) = @_; 515 my ($registry, $event, $prio, $cb) = @_;
506 516
507 use sort 'stable'; 517 use sort 'stable';
508 518
… …
679# object support 689# object support
680 690
681sub reattach { 691sub reattach {
682 # basically do the same as instantiate, without calling instantiate 692 # basically do the same as instantiate, without calling instantiate
683 my ($obj) = @_; 693 my ($obj) = @_;
694
695 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
684 696
685 my $registry = $obj->registry; 697 my $registry = $obj->registry;
686 698
687 @$registry = (); 699 @$registry = ();
688 700
… …
1101 1113
1102use Fcntl; 1114use Fcntl;
1103use Coro::AIO; 1115use Coro::AIO;
1104 1116
1105use overload 1117use overload
1106 '""' => \&as_string; 1118 '""' => \&as_string,
1119 fallback => 1;
1107 1120
1108our $MAX_RESET = 3600; 1121our $MAX_RESET = 3600;
1109our $DEFAULT_RESET = 3000; 1122our $DEFAULT_RESET = 3000;
1110 1123
1111sub generate_random_map { 1124sub generate_random_map {
… …
1138} 1151}
1139 1152
1140# also paths starting with '/' 1153# also paths starting with '/'
1141$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1154$EXT_MAP{"cf::map"} = qr{^(?=/)};
1142 1155
1156sub thawer_merge {
1157 my ($self, $merge) = @_;
1158
1159 # we have to keep some variables in memory intact
1160 local $self->{path};
1161 local $self->{load_path};
1162 local $self->{deny_save};
1163 local $self->{deny_reset};
1164
1165 $self->SUPER::thawer_merge ($merge);
1166}
1167
1143sub normalise { 1168sub normalise {
1144 my ($path, $base) = @_; 1169 my ($path, $base) = @_;
1145 1170
1146 # map plan: 1171 # map plan:
1147 # 1172 #
… …
1243 1268
1244sub unlink_save { 1269sub unlink_save {
1245 my ($self) = @_; 1270 my ($self) = @_;
1246 1271
1247 utf8::encode (my $save = $self->save_path); 1272 utf8::encode (my $save = $self->save_path);
1248 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; 1273 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1249 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst"; 1274 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1250} 1275}
1251 1276
1252sub load_header_from($) { 1277sub load_header_from($) {
1253 my ($self, $path) = @_; 1278 my ($self, $path) = @_;
1254 1279
… …
1315 1340
1316 $map->load_header 1341 $map->load_header
1317 or return; 1342 or return;
1318 1343
1319 if ($map->should_reset) { 1344 if ($map->should_reset) {
1345 $cf::WAIT_FOR_TICK->wait;
1320 $map->reset; 1346 $map->reset;
1321 undef $guard; 1347 undef $guard;
1322 $map = find $path 1348 $map = find $path
1323 or return; 1349 or return;
1324 } 1350 }
… …
1494 1520
1495sub reset_at { 1521sub reset_at {
1496 my ($self) = @_; 1522 my ($self) = @_;
1497 1523
1498 # TODO: safety, remove and allow resettable per-player maps 1524 # TODO: safety, remove and allow resettable per-player maps
1499 return 1e99 if $self->isa ("ext::map_per_player"); 1525 return 1e99 if $self->isa ("ext::map_per_player");#d#
1500 return 1e99 if $self->{deny_reset}; 1526 return 1e99 if $self->{deny_reset};
1501 1527
1502 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1528 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1503 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1529 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1504 1530
… …
1509 my ($self) = @_; 1535 my ($self) = @_;
1510 1536
1511 $self->reset_at <= $cf::RUNTIME 1537 $self->reset_at <= $cf::RUNTIME
1512} 1538}
1513 1539
1514sub rename {
1515 my ($self, $new_path) = @_;
1516
1517 normalise $new_path;
1518
1519 $self->unlink_save;
1520
1521 delete $cf::MAP{$self->path};
1522 $self->{path} = $new_path; $self->path ($self->{path});
1523 $cf::MAP{$self->path} = $self;
1524
1525 $self->save;
1526}
1527
1528sub reset { 1540sub reset {
1529 my ($self) = @_; 1541 my ($self) = @_;
1530 1542
1531 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1543 my $lock = cf::lock_acquire "map_data:$self->{path}";
1532 1544
… …
1549my $nuke_counter = "aaaa"; 1561my $nuke_counter = "aaaa";
1550 1562
1551sub nuke { 1563sub nuke {
1552 my ($self) = @_; 1564 my ($self) = @_;
1553 1565
1566 delete $cf::MAP{$self->path};
1567
1568 $self->unlink_save;
1569
1570 bless $self, "cf::map";
1571 delete $self->{deny_reset};
1554 $self->{deny_save} = 1; 1572 $self->{deny_save} = 1;
1555 $self->reset_timeout (1); 1573 $self->reset_timeout (1);
1556 $self->rename ("{nuke}/" . ($nuke_counter++)); 1574 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1575
1576 $cf::MAP{$self->path} = $self;
1577
1557 $self->reset; # polite request, might not happen 1578 $self->reset; # polite request, might not happen
1558} 1579}
1559 1580
1560=item cf::map::unique_maps 1581=item cf::map::unique_maps
1561 1582
… …
2207 2228
2208sub main { 2229sub main {
2209 # we must not ever block the main coroutine 2230 # we must not ever block the main coroutine
2210 local $Coro::idle = sub { 2231 local $Coro::idle = sub {
2211 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2232 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2233 (async {
2212 async { Event::one_event }; 2234 Event::one_event;
2235 })->prio (Coro::PRIO_MAX);
2213 }; 2236 };
2214 2237
2215 cfg_load; 2238 cfg_load;
2216 db_load; 2239 db_load;
2217 load_extensions; 2240 load_extensions;
… …
2365 } 2388 }
2366 2389
2367 warn "reloaded"; 2390 warn "reloaded";
2368}; 2391};
2369 2392
2393our $RELOAD_WATCHER; # used only during reload
2394
2370register_command "reload" => sub { 2395register_command "reload" => sub {
2371 my ($who, $arg) = @_; 2396 my ($who, $arg) = @_;
2372 2397
2373 if ($who->flag (FLAG_WIZ)) { 2398 if ($who->flag (FLAG_WIZ)) {
2374 $who->message ("start of reload."); 2399 $who->message ("reloading server.");
2400
2401 # doing reload synchronously and two reloads happen back-to-back,
2402 # coro crashes during coro_state_free->destroy here.
2403
2404 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub {
2375 reload; 2405 reload;
2376 $who->message ("end of reload."); 2406 undef $RELOAD_WATCHER;
2407 });
2377 } 2408 }
2378}; 2409};
2379 2410
2380unshift @INC, $LIBDIR; 2411unshift @INC, $LIBDIR;
2381 2412
… …
2402 }, 2433 },
2403); 2434);
2404 2435
2405IO::AIO::max_poll_time $TICK * 0.2; 2436IO::AIO::max_poll_time $TICK * 0.2;
2406 2437
2407Event->io ( 2438$AIO_POLL_WATCHER = Event->io (
2408 fd => IO::AIO::poll_fileno, 2439 fd => IO::AIO::poll_fileno,
2409 poll => 'r', 2440 poll => 'r',
2410 prio => 5, 2441 prio => 5,
2411 data => WF_AUTOCANCEL, 2442 data => WF_AUTOCANCEL,
2412 cb => \&IO::AIO::poll_cb, 2443 cb => \&IO::AIO::poll_cb,
2413); 2444);
2414 2445
2415Event->timer ( 2446$WRITE_RUNTIME_WATCHER = Event->timer (
2416 data => WF_AUTOCANCEL, 2447 data => WF_AUTOCANCEL,
2417 after => 0, 2448 after => 0,
2418 interval => 10, 2449 interval => 10,
2419 cb => sub { 2450 cb => sub {
2420 (Coro::unblock_sub { 2451 (Coro::unblock_sub {

Diff Legend

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