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.241 by root, Mon Apr 16 11:09:32 2007 UTC vs.
Revision 1.279 by root, Mon Jun 11 22:16:53 2007 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket;
8use Storable; 9use Storable;
9use Event; 10use Event;
10use Opcode; 11use Opcode;
11use Safe; 12use Safe;
12use Safe::Hole; 13use Safe::Hole;
13 14
14use Coro 3.52 (); 15use Coro 3.61 ();
15use Coro::State; 16use Coro::State;
17use Coro::Handle;
16use Coro::Event; 18use Coro::Event;
17use Coro::Timer; 19use Coro::Timer;
18use Coro::Signal; 20use Coro::Signal;
19use Coro::Semaphore; 21use Coro::Semaphore;
20use Coro::AIO; 22use Coro::AIO;
… …
52our %EXT_CORO = (); # coroutines bound to extensions 54our %EXT_CORO = (); # coroutines bound to extensions
53our %EXT_MAP = (); # pluggable maps 55our %EXT_MAP = (); # pluggable maps
54 56
55our $RELOAD; # number of reloads so far 57our $RELOAD; # number of reloads so far
56our @EVENT; 58our @EVENT;
57our $LIBDIR = datadir . "/ext";
58 59
59our $TICK = MAX_TIME * 1e-6; 60our $CONFDIR = confdir;
61our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db";
71
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
60our $TICK_WATCHER; 73our $TICK_WATCHER;
61our $AIO_POLL_WATCHER; 74our $AIO_POLL_WATCHER;
62our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
63our $NEXT_TICK; 76our $NEXT_TICK;
64our $NOW; 77our $NOW;
… …
73our $RUNTIME; 86our $RUNTIME;
74 87
75our %PLAYER; # all users 88our %PLAYER; # all users
76our %MAP; # all maps 89our %MAP; # all maps
77our $LINK_MAP; # the special {link} map, which is always available 90our $LINK_MAP; # the special {link} map, which is always available
78our $RANDOM_MAPS = cf::localdir . "/random";
79our $BDB_ENV_DIR = cf::localdir . "/db";
80 91
81# used to convert map paths into valid unix filenames by replacing / by ∕ 92# used to convert map paths into valid unix filenames by replacing / by ∕
82our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
83 94
95our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing
97our $tick_start; # for load detecting purposes
98
84binmode STDOUT; 99binmode STDOUT;
85binmode STDERR; 100binmode STDERR;
86 101
87# read virtual server time, if available 102# read virtual server time, if available
88unless ($RUNTIME || !-e cf::localdir . "/runtime") { 103unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
89 open my $fh, "<", cf::localdir . "/runtime" 104 open my $fh, "<", "$LOCALDIR/runtime"
90 or die "unable to read runtime file: $!"; 105 or die "unable to read runtime file: $!";
91 $RUNTIME = <$fh> + 0.; 106 $RUNTIME = <$fh> + 0.;
92} 107}
93 108
94mkdir cf::localdir; 109mkdir $_
95mkdir cf::localdir . "/" . cf::playerdir; 110 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
96mkdir cf::localdir . "/" . cf::tmpdir;
97mkdir cf::localdir . "/" . cf::uniquedir;
98mkdir $RANDOM_MAPS;
99mkdir $BDB_ENV_DIR;
100 111
101our $EMERGENCY_POSITION; 112our $EMERGENCY_POSITION;
102 113
103sub cf::map::normalise; 114sub cf::map::normalise;
104 115
… …
115=item $cf::RUNTIME 126=item $cf::RUNTIME
116 127
117The time this server has run, starts at 0 and is increased by $cf::TICK on 128The time this server has run, starts at 0 and is increased by $cf::TICK on
118every server tick. 129every server tick.
119 130
120=item $cf::LIBDIR 131=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
132$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
133$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
121 134
122The perl library directory, where extensions and cf-specific modules can 135Various directories - "/etc", read-only install directory, perl-library
123be found. It will be added to C<@INC> automatically. 136directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
137unique-items directory, player file directory, random maps directory and
138database environment.
124 139
125=item $cf::NOW 140=item $cf::NOW
126 141
127The time of the last (current) server tick. 142The time of the last (current) server tick.
128 143
129=item $cf::TICK 144=item $cf::TICK
130 145
131The interval between server ticks, in seconds. 146The interval between server ticks, in seconds.
147
148=item $cf::LOADAVG
149
150The current CPU load on the server (alpha-smoothed), as a value between 0
151(none) and 1 (overloaded), indicating how much time is spent on processing
152objects per tick. Healthy values are < 0.5.
153
154=item $cf::LOAD
155
156The raw value load value from the last tick.
132 157
133=item %cf::CFG 158=item %cf::CFG
134 159
135Configuration for the server, loaded from C</etc/crossfire/config>, or 160Configuration for the server, loaded from C</etc/crossfire/config>, or
136from wherever your confdir points to. 161from wherever your confdir points to.
… …
146=cut 171=cut
147 172
148BEGIN { 173BEGIN {
149 *CORE::GLOBAL::warn = sub { 174 *CORE::GLOBAL::warn = sub {
150 my $msg = join "", @_; 175 my $msg = join "", @_;
151 utf8::encode $msg;
152 176
153 $msg .= "\n" 177 $msg .= "\n"
154 unless $msg =~ /\n$/; 178 unless $msg =~ /\n$/;
155 179
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181
182 utf8::encode $msg;
156 LOG llevError, $msg; 183 LOG llevError, $msg;
157 }; 184 };
158} 185}
159 186
160@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
161@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
162@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
163@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
164@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 191@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
192@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
165@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 193@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
166 194
167# we bless all objects into (empty) derived classes to force a method lookup 195# we bless all objects into (empty) derived classes to force a method lookup
168# within the Safe compartment. 196# within the Safe compartment.
169for my $pkg (qw( 197for my $pkg (qw(
170 cf::global cf::attachable 198 cf::global cf::attachable
… …
230returned. 258returned.
231 259
232Lock names should begin with a unique identifier (for example, cf::map::find 260Lock names should begin with a unique identifier (for example, cf::map::find
233uses map_find and cf::map::load uses map_load). 261uses map_find and cf::map::load uses map_load).
234 262
263=item $locked = cf::lock_active $string
264
265Return true if the lock is currently active, i.e. somebody has locked it.
266
235=cut 267=cut
236 268
237our %LOCK; 269our %LOCK;
238 270
239sub lock_wait($) { 271sub lock_wait($) {
… …
256 288
257 Coro::guard { 289 Coro::guard {
258 # wake up all waiters, to be on the safe side 290 # wake up all waiters, to be on the safe side
259 $_->ready for @{ delete $LOCK{$key} }; 291 $_->ready for @{ delete $LOCK{$key} };
260 } 292 }
293}
294
295sub lock_active($) {
296 my ($key) = @_;
297
298 ! ! $LOCK{$key}
261} 299}
262 300
263sub freeze_mainloop { 301sub freeze_mainloop {
264 return unless $TICK_WATCHER->is_active; 302 return unless $TICK_WATCHER->is_active;
265 303
… …
295 333
296sub sync_job(&) { 334sub sync_job(&) {
297 my ($job) = @_; 335 my ($job) = @_;
298 336
299 if ($Coro::current == $Coro::main) { 337 if ($Coro::current == $Coro::main) {
338 my $time = Event::time;
339
300 # this is the main coro, too bad, we have to block 340 # this is the main coro, too bad, we have to block
301 # till the operation succeeds, freezing the server :/ 341 # till the operation succeeds, freezing the server :/
302 342
303 # TODO: use suspend/resume instead 343 # TODO: use suspend/resume instead
304 # (but this is cancel-safe) 344 # (but this is cancel-safe)
… …
315 355
316 while ($busy) { 356 while ($busy) {
317 Coro::cede or Event::one_event; 357 Coro::cede or Event::one_event;
318 } 358 }
319 359
360 $time = Event::time - $time;
361
362 LOG llevError | logBacktrace, Carp::longmess "long sync job"
363 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
364
365 $tick_start += $time; # do not account sync jobs to server load
366
320 wantarray ? @res : $res[0] 367 wantarray ? @res : $res[0]
321 } else { 368 } else {
322 # we are in another coroutine, how wonderful, everything just works 369 # we are in another coroutine, how wonderful, everything just works
323 370
324 $job->() 371 $job->()
… …
344 391
345 $coro 392 $coro
346} 393}
347 394
348sub write_runtime { 395sub write_runtime {
396 my $runtime = "$LOCALDIR/runtime";
397
398 # first touch the runtime file to show we are still running:
399 # the fsync below can take a very very long time.
400
401 IO::AIO::aio_utime $runtime, undef, undef;
402
349 my $guard = cf::lock_acquire "write_runtime"; 403 my $guard = cf::lock_acquire "write_runtime";
350
351 my $runtime = cf::localdir . "/runtime";
352 404
353 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
354 or return; 406 or return;
355 407
356 my $value = $cf::RUNTIME + 90 + 10; 408 my $value = $cf::RUNTIME + 90 + 10;
… …
362 414
363 # always fsync - this file is important 415 # always fsync - this file is important
364 aio_fsync $fh 416 aio_fsync $fh
365 and return; 417 and return;
366 418
419 # touch it again to show we are up-to-date
420 aio_utime $fh, undef, undef;
421
367 close $fh 422 close $fh
368 or return; 423 or return;
369 424
370 aio_rename "$runtime~", $runtime 425 aio_rename "$runtime~", $runtime
371 and return; 426 and return;
427
428 warn "runtime file written.\n";
372 429
373 1 430 1
374} 431}
375 432
376=item cf::datalog type => key => value, ... 433=item cf::datalog type => key => value, ...
… …
569 $registry = $CB_TYPE[$object_type] ||= []; 626 $registry = $CB_TYPE[$object_type] ||= [];
570 627
571 } elsif ($type eq "subtype") { 628 } elsif ($type eq "subtype") {
572 defined $object_type or Carp::croak "subtype specified without type"; 629 defined $object_type or Carp::croak "subtype specified without type";
573 my $object_subtype = shift @arg; 630 my $object_subtype = shift @arg;
574 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 631 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
575 632
576 } elsif ($type eq "package") { 633 } elsif ($type eq "package") {
577 my $pkg = shift @arg; 634 my $pkg = shift @arg;
578 635
579 while (my ($name, $id) = each %cb_id) { 636 while (my ($name, $id) = each %cb_id) {
… …
620 if (ref $_[0]) { 677 if (ref $_[0]) {
621 _object_attach @_; 678 _object_attach @_;
622 } else { 679 } else {
623 _attach shift->_attach_registry, @_; 680 _attach shift->_attach_registry, @_;
624 } 681 }
682 _recalc_want;
625}; 683};
626 684
627# all those should be optimised 685# all those should be optimised
628sub cf::attachable::detach { 686sub cf::attachable::detach {
629 my ($obj, $name) = @_; 687 my ($obj, $name) = @_;
… …
632 delete $obj->{_attachment}{$name}; 690 delete $obj->{_attachment}{$name};
633 reattach ($obj); 691 reattach ($obj);
634 } else { 692 } else {
635 Carp::croak "cannot, currently, detach class attachments"; 693 Carp::croak "cannot, currently, detach class attachments";
636 } 694 }
695 _recalc_want;
637}; 696};
638 697
639sub cf::attachable::attached { 698sub cf::attachable::attached {
640 my ($obj, $name) = @_; 699 my ($obj, $name) = @_;
641 700
… …
814 or return; 873 or return;
815 $av = eval { (Storable::thaw $av)->{objs} }; 874 $av = eval { (Storable::thaw $av)->{objs} };
816 } 875 }
817 876
818 warn sprintf "loading %s (%d)\n", 877 warn sprintf "loading %s (%d)\n",
819 $filename, length $data, scalar @{$av || []};#d# 878 $filename, length $data, scalar @{$av || []};
820 return ($data, $av); 879 return ($data, $av);
821} 880}
822 881
823############################################################################# 882#############################################################################
824# command handling &c 883# command handling &c
… …
884 943
885 cf::override; 944 cf::override;
886 }, 945 },
887); 946);
888 947
889sub load_extension {
890 my ($path) = @_;
891
892 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
893 my $base = $1;
894 my $pkg = $1;
895 $pkg =~ s/[^[:word:]]/_/g;
896 $pkg = "ext::$pkg";
897
898 warn "... loading '$path' into '$pkg'\n";
899
900 open my $fh, "<:utf8", $path
901 or die "$path: $!";
902
903 my $source =
904 "package $pkg; use strict; use utf8;\n"
905 . "#line 1 \"$path\"\n{\n"
906 . (do { local $/; <$fh> })
907 . "\n};\n1";
908
909 unless (eval $source) {
910 my $msg = $@ ? "$path: $@\n"
911 : "extension disabled.\n";
912 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
913 warn $@;
914 warn "mandatory extension failed to load, exiting.\n";
915 exit 1;
916 }
917 die $@;
918 }
919
920 push @EXTS, $pkg;
921}
922
923sub load_extensions { 948sub load_extensions {
949 cf::sync_job {
950 my %todo;
951
924 for my $ext (<$LIBDIR/*.ext>) { 952 for my $path (<$LIBDIR/*.ext>) {
925 next unless -r $ext; 953 next unless -r $path;
926 eval { 954
927 load_extension $ext; 955 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
956 my $base = $1;
957 my $pkg = $1;
958 $pkg =~ s/[^[:word:]]/_/g;
959 $pkg = "ext::$pkg";
960
961 open my $fh, "<:utf8", $path
962 or die "$path: $!";
963
964 my $source = do { local $/; <$fh> };
965
966 my %ext = (
967 path => $path,
968 base => $base,
969 pkg => $pkg,
970 );
971
972 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
973 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
974
975 $ext{source} =
976 "package $pkg; use strict; use utf8;\n"
977 . "#line 1 \"$path\"\n{\n"
978 . $source
979 . "\n};\n1";
980
981 $todo{$base} = \%ext;
982 }
983
984 my %done;
985 while (%todo) {
986 my $progress;
987
988 while (my ($k, $v) = each %todo) {
989 for (split /,\s*/, $v->{meta}{depends}) {
990 goto skip
991 unless exists $done{$_};
992 }
993
994 warn "... loading '$k' into '$v->{pkg}'\n";
995
996 unless (eval $v->{source}) {
997 my $msg = $@ ? "$v->{path}: $@\n"
998 : "$v->{base}: extension inactive.\n";
999
1000 if (exists $v->{meta}{mandatory}) {
1001 warn $msg;
1002 warn "mandatory extension failed to load, exiting.\n";
1003 exit 1;
1004 }
1005
1006 warn $msg;
1007 }
1008
1009 $done{$k} = delete $todo{$k};
1010 push @EXTS, $v->{pkg};
1011 $progress = 1;
928 1 1012 }
929 } or warn "$ext not loaded: $@"; 1013
1014 skip:
1015 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1016 unless $progress;
1017 }
930 } 1018 };
931} 1019}
932 1020
933############################################################################# 1021#############################################################################
934 1022
935=head2 CORE EXTENSIONS 1023=head2 CORE EXTENSIONS
… …
951Returns the given player object, loading it if necessary (might block). 1039Returns the given player object, loading it if necessary (might block).
952 1040
953=cut 1041=cut
954 1042
955sub playerdir($) { 1043sub playerdir($) {
956 cf::localdir 1044 "$PLAYERDIR/"
957 . "/"
958 . cf::playerdir
959 . "/"
960 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1045 . (ref $_[0] ? $_[0]->ob->name : $_[0])
961} 1046}
962 1047
963sub path($) { 1048sub path($) {
964 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1049 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
… …
1084while and may block, so not sync_job-capable, ever. 1169while and may block, so not sync_job-capable, ever.
1085 1170
1086=cut 1171=cut
1087 1172
1088sub list_logins { 1173sub list_logins {
1089 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1174 my $dirs = aio_readdir $PLAYERDIR
1090 or return []; 1175 or return [];
1091 1176
1092 my @logins; 1177 my @logins;
1093 1178
1094 for my $login (@$dirs) { 1179 for my $login (@$dirs) {
… …
1249 my ($self, $merge) = @_; 1334 my ($self, $merge) = @_;
1250 1335
1251 # we have to keep some variables in memory intact 1336 # we have to keep some variables in memory intact
1252 local $self->{path}; 1337 local $self->{path};
1253 local $self->{load_path}; 1338 local $self->{load_path};
1254 local $self->{deny_save};
1255 local $self->{deny_reset};
1256 1339
1257 $self->SUPER::thawer_merge ($merge); 1340 $self->SUPER::thawer_merge ($merge);
1258} 1341}
1259 1342
1260sub normalise { 1343sub normalise {
… …
1332 1415
1333# the original (read-only) location 1416# the original (read-only) location
1334sub load_path { 1417sub load_path {
1335 my ($self) = @_; 1418 my ($self) = @_;
1336 1419
1337 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1420 "$MAPDIR/$self->{path}.map"
1338} 1421}
1339 1422
1340# the temporary/swap location 1423# the temporary/swap location
1341sub save_path { 1424sub save_path {
1342 my ($self) = @_; 1425 my ($self) = @_;
1343 1426
1344 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1427 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1345 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1428 "$TMPDIR/$path.map"
1346} 1429}
1347 1430
1348# the unique path, undef == no special unique path 1431# the unique path, undef == no special unique path
1349sub uniq_path { 1432sub uniq_path {
1350 my ($self) = @_; 1433 my ($self) = @_;
1351 1434
1352 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1435 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1353 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1436 "$UNIQUEDIR/$path"
1354} 1437}
1355 1438
1356# and all this just because we cannot iterate over 1439# and all this just because we cannot iterate over
1357# all maps in C++... 1440# all maps in C++...
1358sub change_all_map_light { 1441sub change_all_map_light {
1359 my ($change) = @_; 1442 my ($change) = @_;
1360 1443
1361 $_->change_map_light ($change) 1444 $_->change_map_light ($change)
1362 for grep $_->outdoor, values %cf::MAP; 1445 for grep $_->outdoor, values %cf::MAP;
1446}
1447
1448sub decay_objects {
1449 my ($self) = @_;
1450
1451 return if $self->{deny_reset};
1452
1453 $self->do_decay_objects;
1363} 1454}
1364 1455
1365sub unlink_save { 1456sub unlink_save {
1366 my ($self) = @_; 1457 my ($self) = @_;
1367 1458
… …
1425 $self->load_header_orig 1516 $self->load_header_orig
1426 or return; 1517 or return;
1427 $self->prepare_orig; 1518 $self->prepare_orig;
1428 } 1519 }
1429 1520
1521 $self->{deny_reset} = 1
1522 if $self->no_reset;
1523
1430 $self->default_region (cf::region::find_by_path $self->{path}) 1524 $self->default_region (cf::region::find_by_path $self->{path})
1431 unless $self->default_region; 1525 unless $self->default_region;
1432 1526
1433 1 1527 1
1434} 1528}
… …
1449 $map->{last_save} = $cf::RUNTIME; 1543 $map->{last_save} = $cf::RUNTIME;
1450 1544
1451 $map->load_header 1545 $map->load_header
1452 or return; 1546 or return;
1453 1547
1454 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1548 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1455 # doing this can freeze the server in a sync job, obviously 1549 # doing this can freeze the server in a sync job, obviously
1456 #$cf::WAIT_FOR_TICK->wait; 1550 #$cf::WAIT_FOR_TICK->wait;
1457 $map->reset; 1551 $map->reset;
1458 undef $guard; 1552 undef $guard;
1459 return find $path; 1553 return find $path;
… …
1470 my ($self) = @_; 1564 my ($self) = @_;
1471 1565
1472 local $self->{deny_reset} = 1; # loading can take a long time 1566 local $self->{deny_reset} = 1; # loading can take a long time
1473 1567
1474 my $path = $self->{path}; 1568 my $path = $self->{path};
1569
1570 {
1475 my $guard = cf::lock_acquire "map_load:$path"; 1571 my $guard = cf::lock_acquire "map_load:$path";
1476 1572
1477 return if $self->in_memory != cf::MAP_SWAPPED; 1573 return if $self->in_memory != cf::MAP_SWAPPED;
1478 1574
1479 $self->in_memory (cf::MAP_LOADING); 1575 $self->in_memory (cf::MAP_LOADING);
1480 1576
1481 $self->alloc; 1577 $self->alloc;
1482 1578
1483 $self->pre_load; 1579 $self->pre_load;
1484 Coro::cede;
1485
1486 $self->_load_objects ($self->{load_path}, 1)
1487 or return;
1488
1489 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1490 if delete $self->{load_original};
1491
1492 if (my $uniq = $self->uniq_path) {
1493 utf8::encode $uniq;
1494 if (aio_open $uniq, O_RDONLY, 0) {
1495 $self->clear_unique_items;
1496 $self->_load_objects ($uniq, 0);
1497 }
1498 }
1499
1500 Coro::cede;
1501 # now do the right thing for maps
1502 $self->link_multipart_objects;
1503 Coro::cede;
1504
1505 unless ($self->{deny_activate}) {
1506 $self->decay_objects;
1507 $self->fix_auto_apply;
1508 $self->update_buttons;
1509 Coro::cede; 1580 Coro::cede;
1510 $self->set_darkness_map; 1581
1582 $self->_load_objects ($self->{load_path}, 1)
1583 or return;
1584
1585 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1586 if delete $self->{load_original};
1587
1588 if (my $uniq = $self->uniq_path) {
1589 utf8::encode $uniq;
1590 if (aio_open $uniq, O_RDONLY, 0) {
1591 $self->clear_unique_items;
1592 $self->_load_objects ($uniq, 0);
1593 }
1594 }
1595
1596 Coro::cede;
1597 # now do the right thing for maps
1598 $self->link_multipart_objects;
1511 $self->difficulty ($self->estimate_difficulty) 1599 $self->difficulty ($self->estimate_difficulty)
1512 unless $self->difficulty; 1600 unless $self->difficulty;
1513 Coro::cede; 1601 Coro::cede;
1602
1603 unless ($self->{deny_activate}) {
1604 $self->decay_objects;
1605 $self->fix_auto_apply;
1606 $self->update_buttons;
1607 Coro::cede;
1608 $self->set_darkness_map;
1609 Coro::cede;
1514 $self->activate; 1610 $self->activate;
1515 Coro::cede; 1611 }
1612
1613 $self->in_memory (cf::MAP_IN_MEMORY);
1516 } 1614 }
1517 1615
1518 $self->post_load; 1616 $self->post_load;
1519 Coro::cede;
1520
1521 $self->in_memory (cf::MAP_IN_MEMORY);
1522} 1617}
1523 1618
1524sub customise_for { 1619sub customise_for {
1525 my ($self, $ob) = @_; 1620 my ($self, $ob) = @_;
1526 1621
1527 return find "~" . $ob->name . "/" . $self->{path} 1622 return find "~" . $ob->name . "/" . $self->{path}
1528 if $self->per_player; 1623 if $self->per_player;
1624
1625# return find "?party/" . $ob->name . "/" . $self->{path}
1626# if $self->per_party;
1529 1627
1530 $self 1628 $self
1531} 1629}
1532 1630
1533# find and load all maps in the 3x3 area around a map 1631# find and load all maps in the 3x3 area around a map
… …
1644 1742
1645sub reset_at { 1743sub reset_at {
1646 my ($self) = @_; 1744 my ($self) = @_;
1647 1745
1648 # TODO: safety, remove and allow resettable per-player maps 1746 # TODO: safety, remove and allow resettable per-player maps
1649 return 1e99 if $self->isa ("ext::map_per_player");#d#
1650 return 1e99 if $self->{deny_reset}; 1747 return 1e99 if $self->{deny_reset};
1651 1748
1652 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1749 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1653 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1750 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1654 1751
… …
1665 my ($self) = @_; 1762 my ($self) = @_;
1666 1763
1667 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1764 my $lock = cf::lock_acquire "map_data:$self->{path}";
1668 1765
1669 return if $self->players; 1766 return if $self->players;
1670 return if $self->isa ("ext::map_per_player");#d#
1671 1767
1672 warn "resetting map ", $self->path;#d# 1768 warn "resetting map ", $self->path;
1673 1769
1674 $self->in_memory (cf::MAP_SWAPPED); 1770 $self->in_memory (cf::MAP_SWAPPED);
1675 1771
1676 # need to save uniques path 1772 # need to save uniques path
1677 unless ($self->{deny_save}) { 1773 unless ($self->{deny_save}) {
… …
1709 $cf::MAP{$self->path} = $self; 1805 $cf::MAP{$self->path} = $self;
1710 1806
1711 $self->reset; # polite request, might not happen 1807 $self->reset; # polite request, might not happen
1712} 1808}
1713 1809
1810=item $maps = cf::map::tmp_maps
1811
1812Returns an arrayref with all map paths of currently instantiated and saved
1813maps. May block.
1814
1815=cut
1816
1817sub tmp_maps() {
1818 [
1819 map {
1820 utf8::decode $_;
1821 /\.map$/
1822 ? normalise $_
1823 : ()
1824 } @{ aio_readdir $TMPDIR or [] }
1825 ]
1826}
1827
1828=item $maps = cf::map::random_maps
1829
1830Returns an arrayref with all map paths of currently instantiated and saved
1831random maps. May block.
1832
1833=cut
1834
1835sub random_maps() {
1836 [
1837 map {
1838 utf8::decode $_;
1839 /\.map$/
1840 ? normalise "?random/$_"
1841 : ()
1842 } @{ aio_readdir $RANDOMDIR or [] }
1843 ]
1844}
1845
1714=item cf::map::unique_maps 1846=item cf::map::unique_maps
1715 1847
1716Returns an arrayref of paths of all shared maps that have 1848Returns an arrayref of paths of all shared maps that have
1717instantiated unique items. May block. 1849instantiated unique items. May block.
1718 1850
1719=cut 1851=cut
1720 1852
1721sub unique_maps() { 1853sub unique_maps() {
1722 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 1854 [
1723 or return; 1855 map {
1724
1725 my @paths;
1726
1727 for (@$files) {
1728 utf8::decode $_; 1856 utf8::decode $_;
1729 next if /\.pst$/; 1857 /\.map$/
1730 next unless /^$PATH_SEP/o; 1858 ? normalise $_
1731 1859 : ()
1732 push @paths, cf::map::normalise $_; 1860 } @{ aio_readdir $UNIQUEDIR or [] }
1733 } 1861 ]
1734
1735 \@paths
1736} 1862}
1737 1863
1738package cf; 1864package cf;
1739 1865
1740=back 1866=back
… …
1846 $self->deactivate_recursive; 1972 $self->deactivate_recursive;
1847 1973
1848 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1974 return if UNIVERSAL::isa $self->map, "ext::map_link";
1849 1975
1850 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1976 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1851 if $self->map; 1977 if $self->map && $self->map->{path} ne "{link}";
1852 1978
1853 $self->enter_map ($LINK_MAP || link_map, 10, 10); 1979 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1854} 1980}
1855 1981
1856sub cf::object::player::leave_link { 1982sub cf::object::player::leave_link {
1857 my ($self, $map, $x, $y) = @_; 1983 my ($self, $map, $x, $y) = @_;
1984
1985 return unless $self->contr->active;
1858 1986
1859 my $link_pos = delete $self->{_link_pos}; 1987 my $link_pos = delete $self->{_link_pos};
1860 1988
1861 unless ($map) { 1989 unless ($map) {
1862 # restore original map position 1990 # restore original map position
… …
1885 2013
1886 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2014 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1887 $self->enter_map ($map, $x, $y); 2015 $self->enter_map ($map, $x, $y);
1888} 2016}
1889 2017
1890cf::player->attach (
1891 on_logout => sub {
1892 my ($pl) = @_;
1893
1894 # abort map switching before logout
1895 if ($pl->ob->{_link_pos}) {
1896 cf::sync_job {
1897 $pl->ob->leave_link
1898 };
1899 }
1900 },
1901 on_login => sub {
1902 my ($pl) = @_;
1903
1904 # try to abort aborted map switching on player login :)
1905 # should happen only on crashes
1906 if ($pl->ob->{_link_pos}) {
1907 $pl->ob->enter_link;
1908 (async {
1909 $pl->ob->reply (undef,
1910 "There was an internal problem at your last logout, "
1911 . "the server will try to bring you to your intended destination in a second.",
1912 cf::NDI_RED);
1913 # we need this sleep as the login has a concurrent enter_exit running
1914 # and this sleep increases chances of the player not ending up in scorn
1915 Coro::Timer::sleep 1;
1916 $pl->ob->leave_link;
1917 })->prio (2);
1918 }
1919 },
1920);
1921
1922=item $player_object->goto ($path, $x, $y) 2018=item $player_object->goto ($path, $x, $y[, $check->($map)])
1923 2019
2020Moves the player to the given map-path and coordinates by first freezing
2021her, loading and preparing them map, calling the provided $check callback
2022that has to return the map if sucecssful, and then unfreezes the player on
2023the new (success) or old (failed) map position.
2024
1924=cut 2025=cut
2026
2027our $GOTOGEN;
1925 2028
1926sub cf::object::player::goto { 2029sub cf::object::player::goto {
1927 my ($self, $path, $x, $y) = @_; 2030 my ($self, $path, $x, $y, $check) = @_;
2031
2032 # do generation counting so two concurrent goto's will be executed in-order
2033 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1928 2034
1929 $self->enter_link; 2035 $self->enter_link;
1930 2036
1931 (async { 2037 (async {
1932 my $map = eval { 2038 my $map = eval {
1933 my $map = cf::map::find $path; 2039 my $map = cf::map::find $path;
2040
2041 if ($map) {
1934 $map = $map->customise_for ($self) if $map; 2042 $map = $map->customise_for ($self);
2043 $map = $check->($map) if $check && $map;
2044 } else {
2045 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2046 }
2047
1935 $map 2048 $map
2049 };
2050
2051 if ($@) {
2052 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2053 LOG llevError | logBacktrace, Carp::longmess $@;
1936 } or 2054 }
1937 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1938 2055
2056 if ($gen == $self->{_goto_generation}) {
2057 delete $self->{_goto_generation};
1939 $self->leave_link ($map, $x, $y); 2058 $self->leave_link ($map, $x, $y);
2059 }
1940 })->prio (1); 2060 })->prio (1);
1941} 2061}
1942 2062
1943=item $player_object->enter_exit ($exit_object) 2063=item $player_object->enter_exit ($exit_object)
1944 2064
… …
1983 2103
1984 $rmp->{random_seed} ||= $exit->random_seed; 2104 $rmp->{random_seed} ||= $exit->random_seed;
1985 2105
1986 my $data = cf::to_json $rmp; 2106 my $data = cf::to_json $rmp;
1987 my $md5 = Digest::MD5::md5_hex $data; 2107 my $md5 = Digest::MD5::md5_hex $data;
1988 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2108 my $meta = "$RANDOMDIR/$md5.meta";
1989 2109
1990 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2110 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1991 aio_write $fh, 0, (length $data), $data, 0; 2111 aio_write $fh, 0, (length $data), $data, 0;
1992 undef $fh; 2112 undef $fh;
1993 aio_rename "$meta~", $meta; 2113 aio_rename "$meta~", $meta;
… …
2262############################################################################# 2382#############################################################################
2263 2383
2264=head2 EXTENSION DATABASE SUPPORT 2384=head2 EXTENSION DATABASE SUPPORT
2265 2385
2266Crossfire maintains a very simple database for extension use. It can 2386Crossfire maintains a very simple database for extension use. It can
2267currently store anything that can be serialised using Storable, which 2387currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2268excludes objects. 2388convert to/from binary).
2269 2389
2270The parameter C<$family> should best start with the name of the extension 2390The parameter C<$family> should best start with the name of the extension
2271using it, it should be unique. 2391using it, it should be unique.
2272 2392
2273=over 4 2393=over 4
… …
2296 BDB::CREATE | BDB::AUTO_COMMIT, 0666; 2416 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2297 cf::cleanup "db_open(db): $!" if $!; 2417 cf::cleanup "db_open(db): $!" if $!;
2298 }; 2418 };
2299 cf::cleanup "db_open(db): $@" if $@; 2419 cf::cleanup "db_open(db): $@" if $@;
2300 }; 2420 };
2301
2302 my $path = cf::localdir . "/database.pst";
2303 if (stat $path) {
2304 cf::sync_job {
2305 my $pst = Storable::retrieve $path;
2306
2307 cf::db_put (board => data => $pst->{board});
2308 cf::db_put (guildrules => data => $pst->{guildrules});
2309 cf::db_put (rent => balance => $pst->{rent}{balance});
2310 BDB::db_env_txn_checkpoint $DB_ENV;
2311
2312 unlink $path;
2313 };
2314 }
2315 } 2421 }
2316} 2422}
2317 2423
2318sub db_get($$) { 2424sub db_get($$) {
2319 my $key = "$_[0]/$_[1]"; 2425 my $key = "$_[0]/$_[1]";
2320 2426
2321 cf::sync_job { 2427 cf::sync_job {
2322 BDB::db_get $DB, undef, $key, my $data; 2428 BDB::db_get $DB, undef, $key, my $data;
2323 2429
2324 $! ? () 2430 $! ? ()
2325 : Compress::LZF::sthaw $data 2431 : $data
2326 } 2432 }
2327} 2433}
2328 2434
2329sub db_put($$$) { 2435sub db_put($$$) {
2330 BDB::dbreq_pri 4; 2436 BDB::dbreq_pri 4;
2331 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { }; 2437 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2438}
2439
2440=item cf::cache $id => [$paths...], $processversion => $process
2441
2442Generic caching function that returns the value of the resource $id,
2443caching and regenerating as required.
2444
2445This function can block.
2446
2447=cut
2448
2449sub cache {
2450 my ($id, $src, $processversion, $process) = @_;
2451
2452 my $meta =
2453 join "\x00",
2454 $processversion,
2455 map {
2456 aio_stat $_
2457 and Carp::croak "$_: $!";
2458
2459 ($_, (stat _)[7,9])
2460 } @$src;
2461
2462 my $dbmeta = db_get cache => "$id/meta";
2463 if ($dbmeta ne $meta) {
2464 # changed, we may need to process
2465
2466 my @data;
2467 my $md5;
2468
2469 for (0 .. $#$src) {
2470 0 <= aio_load $src->[$_], $data[$_]
2471 or Carp::croak "$src->[$_]: $!";
2472 }
2473
2474 # if processing is expensive, check
2475 # checksum first
2476 if (1) {
2477 $md5 =
2478 join "\x00",
2479 $processversion,
2480 map {
2481 Coro::cede;
2482 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2483 } 0.. $#$src;
2484
2485
2486 my $dbmd5 = db_get cache => "$id/md5";
2487 if ($dbmd5 eq $md5) {
2488 db_put cache => "$id/meta", $meta;
2489
2490 return db_get cache => "$id/data";
2491 }
2492 }
2493
2494 my $t1 = Time::HiRes::time;
2495 my $data = $process->(\@data);
2496 my $t2 = Time::HiRes::time;
2497
2498 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2499
2500 db_put cache => "$id/data", $data;
2501 db_put cache => "$id/md5" , $md5;
2502 db_put cache => "$id/meta", $meta;
2503
2504 return $data;
2505 }
2506
2507 db_get cache => "$id/data"
2508}
2509
2510=item fork_call { }, $args
2511
2512Executes the given code block with the given arguments in a seperate
2513process, returning the results. Everything must be serialisable with
2514Coro::Storable. May, of course, block. Note that the executed sub may
2515never block itself or use any form of Event handling.
2516
2517=cut
2518
2519sub fork_call(&@) {
2520 my ($cb, @args) = @_;
2521
2522# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2523# or die "socketpair: $!";
2524 pipe my $fh1, my $fh2
2525 or die "pipe: $!";
2526
2527 if (my $pid = fork) {
2528 close $fh2;
2529
2530 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2531 $res = Coro::Storable::thaw $res;
2532
2533 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2534
2535 die $$res unless "ARRAY" eq ref $res;
2536
2537 return wantarray ? @$res : $res->[-1];
2538 } else {
2539 reset_signals;
2540 local $SIG{__WARN__};
2541 local $SIG{__DIE__};
2542 eval {
2543 close $fh1;
2544
2545 my @res = eval { $cb->(@args) };
2546 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2547 };
2548
2549 warn $@ if $@;
2550 _exit 0;
2551 }
2332} 2552}
2333 2553
2334############################################################################# 2554#############################################################################
2335# the server's init and main functions 2555# the server's init and main functions
2336 2556
2337sub load_facedata { 2557sub load_facedata($) {
2338 my $path = sprintf "%s/facedata", cf::datadir; 2558 my ($path) = @_;
2339 2559
2340 warn "loading facedata from $path\n"; 2560 warn "loading facedata from $path\n";
2341 2561
2342 my $facedata; 2562 my $facedata;
2343 0 < aio_load $path, $facedata 2563 0 < aio_load $path, $facedata
… …
2384 } 2604 }
2385 2605
2386 1 2606 1
2387} 2607}
2388 2608
2389our $archetypes_loaded; 2609sub reload_regions {
2610 load_resource_file "$MAPDIR/regions"
2611 or die "unable to load regions file\n";
2612}
2390 2613
2614sub reload_facedata {
2615 load_facedata "$DATADIR/facedata"
2616 or die "unable to load facedata\n";
2617}
2618
2391sub load_archetypes { 2619sub reload_archetypes {
2392 return 1 if $archetypes_loaded++; # current can only load them once 2620 load_resource_file "$DATADIR/archetypes"
2393 load_archetype_file sprintf "%s/archetypes", cf::datadir 2621 or die "unable to load archetypes\n";
2394} 2622}
2395 2623
2396sub load_treasures { 2624sub reload_treasures {
2397 load_treasure_file sprintf "%s/treasures", cf::datadir 2625 load_resource_file "$DATADIR/treasures"
2626 or die "unable to load treasurelists\n";
2398} 2627}
2399 2628
2400sub reload_resources { 2629sub reload_resources {
2401 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2630 warn "reloading resource files...\n";
2402 or die "unable to load regions file\n"; 2631
2632 reload_regions;
2403 load_facedata 2633 reload_facedata;
2404 or die "unable to load facedata\n"; 2634 #reload_archetypes;#d#
2405 load_archetypes 2635 reload_archetypes;
2406 or die "unable to load archetypes\n";
2407 load_treasures 2636 reload_treasures;
2408 or die "unable to load treasurelists\n"; 2637
2638 warn "finished reloading resource files\n";
2409} 2639}
2410 2640
2411sub init { 2641sub init {
2412 reload_resources; 2642 reload_resources;
2413} 2643}
2414 2644
2415sub cfg_load { 2645sub cfg_load {
2416 open my $fh, "<:utf8", cf::confdir . "/config" 2646 open my $fh, "<:utf8", "$CONFDIR/config"
2417 or return; 2647 or return;
2418 2648
2419 local $/; 2649 local $/;
2420 *CFG = YAML::Syck::Load <$fh>; 2650 *CFG = YAML::Syck::Load <$fh>;
2421 2651
… …
2506 2736
2507 warn Carp::longmess "post_cleanup backtrace" 2737 warn Carp::longmess "post_cleanup backtrace"
2508 if $make_core; 2738 if $make_core;
2509} 2739}
2510 2740
2511sub reload() { 2741sub do_reload_perl() {
2512 # can/must only be called in main 2742 # can/must only be called in main
2513 if ($Coro::current != $Coro::main) { 2743 if ($Coro::current != $Coro::main) {
2514 warn "can only reload from main coroutine"; 2744 warn "can only reload from main coroutine";
2515 return; 2745 return;
2516 } 2746 }
… …
2591 Symbol::delete_package "safe::$_" 2821 Symbol::delete_package "safe::$_"
2592 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2822 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2593 2823
2594 warn "unloading cf.pm \"a bit\""; 2824 warn "unloading cf.pm \"a bit\"";
2595 delete $INC{"cf.pm"}; 2825 delete $INC{"cf.pm"};
2826 delete $INC{"cf/pod.pm"};
2596 2827
2597 # don't, removes xs symbols, too, 2828 # don't, removes xs symbols, too,
2598 # and global variables created in xs 2829 # and global variables created in xs
2599 #Symbol::delete_package __PACKAGE__; 2830 #Symbol::delete_package __PACKAGE__;
2600 2831
… …
2615 warn "reattaching attachments to maps"; 2846 warn "reattaching attachments to maps";
2616 reattach $_ for values %MAP; 2847 reattach $_ for values %MAP;
2617 warn "reattaching attachments to players"; 2848 warn "reattaching attachments to players";
2618 reattach $_ for values %PLAYER; 2849 reattach $_ for values %PLAYER;
2619 2850
2620 warn "loading reloadable resources";
2621 reload_resources;
2622
2623 warn "leaving sync_job"; 2851 warn "leaving sync_job";
2624 2852
2625 1 2853 1
2626 } or do { 2854 } or do {
2627 warn $@; 2855 warn $@;
… …
2632 warn "reloaded"; 2860 warn "reloaded";
2633}; 2861};
2634 2862
2635our $RELOAD_WATCHER; # used only during reload 2863our $RELOAD_WATCHER; # used only during reload
2636 2864
2865sub reload_perl() {
2866 # doing reload synchronously and two reloads happen back-to-back,
2867 # coro crashes during coro_state_free->destroy here.
2868
2869 $RELOAD_WATCHER ||= Event->timer (
2870 reentrant => 0,
2871 after => 0,
2872 data => WF_AUTOCANCEL,
2873 cb => sub {
2874 do_reload_perl;
2875 undef $RELOAD_WATCHER;
2876 },
2877 );
2878}
2879
2637register_command "reload" => sub { 2880register_command "reload" => sub {
2638 my ($who, $arg) = @_; 2881 my ($who, $arg) = @_;
2639 2882
2640 if ($who->flag (FLAG_WIZ)) { 2883 if ($who->flag (FLAG_WIZ)) {
2641 $who->message ("reloading server."); 2884 $who->message ("reloading server.");
2642 2885 async { reload_perl };
2643 # doing reload synchronously and two reloads happen back-to-back,
2644 # coro crashes during coro_state_free->destroy here.
2645
2646 $RELOAD_WATCHER ||= Event->timer (
2647 reentrant => 0,
2648 after => 0,
2649 data => WF_AUTOCANCEL,
2650 cb => sub {
2651 reload;
2652 undef $RELOAD_WATCHER;
2653 },
2654 );
2655 } 2886 }
2656}; 2887};
2657 2888
2658unshift @INC, $LIBDIR; 2889unshift @INC, $LIBDIR;
2659 2890
… …
2678 my $signal = new Coro::Signal; 2909 my $signal = new Coro::Signal;
2679 push @WAIT_FOR_TICK_BEGIN, $signal; 2910 push @WAIT_FOR_TICK_BEGIN, $signal;
2680 $signal->wait; 2911 $signal->wait;
2681} 2912}
2682 2913
2914 my $min = 1e6;#d#
2915 my $avg = 10;
2683$TICK_WATCHER = Event->timer ( 2916$TICK_WATCHER = Event->timer (
2684 reentrant => 0, 2917 reentrant => 0,
2685 parked => 1, 2918 parked => 1,
2686 prio => 0, 2919 prio => 0,
2687 at => $NEXT_TICK || $TICK, 2920 at => $NEXT_TICK || $TICK,
… …
2691 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 2924 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2692 unless ++$bug_warning > 10; 2925 unless ++$bug_warning > 10;
2693 return; 2926 return;
2694 } 2927 }
2695 2928
2696 $NOW = Event::time; 2929 $NOW = $tick_start = Event::time;
2697 2930
2698 cf::server_tick; # one server iteration 2931 cf::server_tick; # one server iteration
2932
2933 0 && sync_job {#d#
2934 for(1..10) {
2935 my $t = Event::time;
2936 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2937 or die;
2938
2939 $map->width (50);
2940 $map->height (50);
2941 $map->alloc;
2942 $map->_load_objects ("/tmp/x.map", 1);
2943 my $t = Event::time - $t;
2944
2945 #next unless $t < 0.0013;#d#
2946 if ($t < $min) {
2947 $min = $t;
2948 }
2949 $avg = $avg * 0.99 + $t * 0.01;
2950 }
2951 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2952 exit 0;
2953 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2954 };
2955
2699 $RUNTIME += $TICK; 2956 $RUNTIME += $TICK;
2700 $NEXT_TICK += $TICK; 2957 $NEXT_TICK += $TICK;
2701 2958
2702 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2959 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2703 $NEXT_RUNTIME_WRITE = $NOW + 10; 2960 $NEXT_RUNTIME_WRITE = $NOW + 10;
… …
2705 write_runtime 2962 write_runtime
2706 or warn "ERROR: unable to write runtime file: $!"; 2963 or warn "ERROR: unable to write runtime file: $!";
2707 }; 2964 };
2708 } 2965 }
2709 2966
2967# my $AFTER = Event::time;
2968# warn $AFTER - $NOW;#d#
2969
2710 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 2970 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2711 $sig->send; 2971 $sig->send;
2712 } 2972 }
2713 while (my $sig = shift @WAIT_FOR_TICK) { 2973 while (my $sig = shift @WAIT_FOR_TICK) {
2714 $sig->send; 2974 $sig->send;
2715 } 2975 }
2716 2976
2717# my $AFTER = Event::time; 2977 $NOW = Event::time;
2718# warn $AFTER - $NOW;#d#
2719 2978
2720 # if we are delayed by four ticks or more, skip them all 2979 # if we are delayed by four ticks or more, skip them all
2721 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2980 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2722 2981
2723 $TICK_WATCHER->at ($NEXT_TICK); 2982 $TICK_WATCHER->at ($NEXT_TICK);
2724 $TICK_WATCHER->start; 2983 $TICK_WATCHER->start;
2984
2985 $LOAD = ($NOW - $tick_start) / $TICK;
2986 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2987
2988 _post_tick;
2989
2990
2725 }, 2991 },
2726); 2992);
2727 2993
2728{ 2994{
2729 BDB::max_poll_time $TICK * 0.1; 2995 BDB::max_poll_time $TICK * 0.1;
… …
2757 3023
2758 cf::sync_job { 3024 cf::sync_job {
2759 eval { 3025 eval {
2760 BDB::db_env_open 3026 BDB::db_env_open
2761 $DB_ENV, 3027 $DB_ENV,
2762 $BDB_ENV_DIR, 3028 $BDBDIR,
2763 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3029 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2764 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3030 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2765 0666; 3031 0666;
2766 3032
2767 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3033 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2768 3034
2769 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3035 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2770 $DB_ENV->set_lk_detect; 3036 $DB_ENV->set_lk_detect;
2771 }; 3037 };
2772 3038
… …
2788 prio => 6, 3054 prio => 6,
2789 cb => \&IO::AIO::poll_cb, 3055 cb => \&IO::AIO::poll_cb,
2790 ); 3056 );
2791} 3057}
2792 3058
3059my $_log_backtrace;
3060
3061sub _log_backtrace {
3062 my ($msg, @addr) = @_;
3063
3064 $msg =~ s/\n//;
3065
3066 # limit the # of concurrent backtraces
3067 if ($_log_backtrace < 2) {
3068 ++$_log_backtrace;
3069 async {
3070 my @bt = fork_call {
3071 @addr = map { sprintf "%x", $_ } @addr;
3072 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3073 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3074 or die "addr2line: $!";
3075
3076 my @funcs;
3077 my @res = <$fh>;
3078 chomp for @res;
3079 while (@res) {
3080 my ($func, $line) = splice @res, 0, 2, ();
3081 push @funcs, "[$func] $line";
3082 }
3083
3084 @funcs
3085 };
3086
3087 LOG llevInfo, "[ABT] $msg\n";
3088 LOG llevInfo, "[ABT] $_\n" for @bt;
3089 --$_log_backtrace;
3090 };
3091 } else {
3092 LOG llevInfo, "[ABT] $msg\n";
3093 LOG llevInfo, "[ABT] [suppressed]\n";
3094 }
3095}
3096
3097# load additional modules
3098use cf::pod;
3099
2793END { cf::emergency_save } 3100END { cf::emergency_save }
2794 3101
27951 31021
2796 3103

Diff Legend

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