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.250 by root, Wed Apr 18 14:24:10 2007 UTC vs.
Revision 1.278 by root, Mon Jun 11 21:38:14 2007 UTC

… …
54our %EXT_CORO = (); # coroutines bound to extensions 54our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 55our %EXT_MAP = (); # pluggable maps
56 56
57our $RELOAD; # number of reloads so far 57our $RELOAD; # number of reloads so far
58our @EVENT; 58our @EVENT;
59our $LIBDIR = datadir . "/ext"; 59
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";
60 71
61our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
62our $TICK_WATCHER; 73our $TICK_WATCHER;
63our $AIO_POLL_WATCHER; 74our $AIO_POLL_WATCHER;
64our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
… …
75our $RUNTIME; 86our $RUNTIME;
76 87
77our %PLAYER; # all users 88our %PLAYER; # all users
78our %MAP; # all maps 89our %MAP; # all maps
79our $LINK_MAP; # the special {link} map, which is always available 90our $LINK_MAP; # the special {link} map, which is always available
80our $RANDOM_MAPS = cf::localdir . "/random";
81our $BDB_ENV_DIR = cf::localdir . "/db";
82 91
83# 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 ∕
84our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
85 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
86binmode STDOUT; 99binmode STDOUT;
87binmode STDERR; 100binmode STDERR;
88 101
89# read virtual server time, if available 102# read virtual server time, if available
90unless ($RUNTIME || !-e cf::localdir . "/runtime") { 103unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
91 open my $fh, "<", cf::localdir . "/runtime" 104 open my $fh, "<", "$LOCALDIR/runtime"
92 or die "unable to read runtime file: $!"; 105 or die "unable to read runtime file: $!";
93 $RUNTIME = <$fh> + 0.; 106 $RUNTIME = <$fh> + 0.;
94} 107}
95 108
96mkdir cf::localdir; 109mkdir $_
97mkdir cf::localdir . "/" . cf::playerdir; 110 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
98mkdir cf::localdir . "/" . cf::tmpdir;
99mkdir cf::localdir . "/" . cf::uniquedir;
100mkdir $RANDOM_MAPS;
101mkdir $BDB_ENV_DIR;
102 111
103our $EMERGENCY_POSITION; 112our $EMERGENCY_POSITION;
104 113
105sub cf::map::normalise; 114sub cf::map::normalise;
106 115
… …
117=item $cf::RUNTIME 126=item $cf::RUNTIME
118 127
119The 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
120every server tick. 129every server tick.
121 130
122=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
123 134
124The perl library directory, where extensions and cf-specific modules can 135Various directories - "/etc", read-only install directory, perl-library
125be 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.
126 139
127=item $cf::NOW 140=item $cf::NOW
128 141
129The time of the last (current) server tick. 142The time of the last (current) server tick.
130 143
131=item $cf::TICK 144=item $cf::TICK
132 145
133The 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.
134 157
135=item %cf::CFG 158=item %cf::CFG
136 159
137Configuration for the server, loaded from C</etc/crossfire/config>, or 160Configuration for the server, loaded from C</etc/crossfire/config>, or
138from wherever your confdir points to. 161from wherever your confdir points to.
… …
152 my $msg = join "", @_; 175 my $msg = join "", @_;
153 176
154 $msg .= "\n" 177 $msg .= "\n"
155 unless $msg =~ /\n$/; 178 unless $msg =~ /\n$/;
156 179
157 $msg =~ s/([\x00-\x09\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
158 181
159 utf8::encode $msg; 182 utf8::encode $msg;
160 LOG llevError, $msg; 183 LOG llevError, $msg;
161 }; 184 };
162} 185}
… …
164@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
165@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
166@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
167@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
168@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';
169@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)
170 194
171# 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
172# within the Safe compartment. 196# within the Safe compartment.
173for my $pkg (qw( 197for my $pkg (qw(
174 cf::global cf::attachable 198 cf::global cf::attachable
… …
234returned. 258returned.
235 259
236Lock 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
237uses map_find and cf::map::load uses map_load). 261uses map_find and cf::map::load uses map_load).
238 262
263=item $locked = cf::lock_active $string
264
265Return true if the lock is currently active, i.e. somebody has locked it.
266
239=cut 267=cut
240 268
241our %LOCK; 269our %LOCK;
242 270
243sub lock_wait($) { 271sub lock_wait($) {
… …
260 288
261 Coro::guard { 289 Coro::guard {
262 # wake up all waiters, to be on the safe side 290 # wake up all waiters, to be on the safe side
263 $_->ready for @{ delete $LOCK{$key} }; 291 $_->ready for @{ delete $LOCK{$key} };
264 } 292 }
293}
294
295sub lock_active($) {
296 my ($key) = @_;
297
298 ! ! $LOCK{$key}
265} 299}
266 300
267sub freeze_mainloop { 301sub freeze_mainloop {
268 return unless $TICK_WATCHER->is_active; 302 return unless $TICK_WATCHER->is_active;
269 303
… …
299 333
300sub sync_job(&) { 334sub sync_job(&) {
301 my ($job) = @_; 335 my ($job) = @_;
302 336
303 if ($Coro::current == $Coro::main) { 337 if ($Coro::current == $Coro::main) {
338 my $time = Event::time;
339
304 # this is the main coro, too bad, we have to block 340 # this is the main coro, too bad, we have to block
305 # till the operation succeeds, freezing the server :/ 341 # till the operation succeeds, freezing the server :/
306 342
307 # TODO: use suspend/resume instead 343 # TODO: use suspend/resume instead
308 # (but this is cancel-safe) 344 # (but this is cancel-safe)
… …
319 355
320 while ($busy) { 356 while ($busy) {
321 Coro::cede or Event::one_event; 357 Coro::cede or Event::one_event;
322 } 358 }
323 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
324 wantarray ? @res : $res[0] 367 wantarray ? @res : $res[0]
325 } else { 368 } else {
326 # we are in another coroutine, how wonderful, everything just works 369 # we are in another coroutine, how wonderful, everything just works
327 370
328 $job->() 371 $job->()
… …
348 391
349 $coro 392 $coro
350} 393}
351 394
352sub 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
353 my $guard = cf::lock_acquire "write_runtime"; 403 my $guard = cf::lock_acquire "write_runtime";
354
355 my $runtime = cf::localdir . "/runtime";
356 404
357 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
358 or return; 406 or return;
359 407
360 my $value = $cf::RUNTIME + 90 + 10; 408 my $value = $cf::RUNTIME + 90 + 10;
… …
366 414
367 # always fsync - this file is important 415 # always fsync - this file is important
368 aio_fsync $fh 416 aio_fsync $fh
369 and return; 417 and return;
370 418
419 # touch it again to show we are up-to-date
420 aio_utime $fh, undef, undef;
421
371 close $fh 422 close $fh
372 or return; 423 or return;
373 424
374 aio_rename "$runtime~", $runtime 425 aio_rename "$runtime~", $runtime
375 and return; 426 and return;
427
428 warn "runtime file written.\n";
376 429
377 1 430 1
378} 431}
379 432
380=item cf::datalog type => key => value, ... 433=item cf::datalog type => key => value, ...
… …
573 $registry = $CB_TYPE[$object_type] ||= []; 626 $registry = $CB_TYPE[$object_type] ||= [];
574 627
575 } elsif ($type eq "subtype") { 628 } elsif ($type eq "subtype") {
576 defined $object_type or Carp::croak "subtype specified without type"; 629 defined $object_type or Carp::croak "subtype specified without type";
577 my $object_subtype = shift @arg; 630 my $object_subtype = shift @arg;
578 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 631 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
579 632
580 } elsif ($type eq "package") { 633 } elsif ($type eq "package") {
581 my $pkg = shift @arg; 634 my $pkg = shift @arg;
582 635
583 while (my ($name, $id) = each %cb_id) { 636 while (my ($name, $id) = each %cb_id) {
… …
624 if (ref $_[0]) { 677 if (ref $_[0]) {
625 _object_attach @_; 678 _object_attach @_;
626 } else { 679 } else {
627 _attach shift->_attach_registry, @_; 680 _attach shift->_attach_registry, @_;
628 } 681 }
682 _recalc_want;
629}; 683};
630 684
631# all those should be optimised 685# all those should be optimised
632sub cf::attachable::detach { 686sub cf::attachable::detach {
633 my ($obj, $name) = @_; 687 my ($obj, $name) = @_;
… …
636 delete $obj->{_attachment}{$name}; 690 delete $obj->{_attachment}{$name};
637 reattach ($obj); 691 reattach ($obj);
638 } else { 692 } else {
639 Carp::croak "cannot, currently, detach class attachments"; 693 Carp::croak "cannot, currently, detach class attachments";
640 } 694 }
695 _recalc_want;
641}; 696};
642 697
643sub cf::attachable::attached { 698sub cf::attachable::attached {
644 my ($obj, $name) = @_; 699 my ($obj, $name) = @_;
645 700
… …
818 or return; 873 or return;
819 $av = eval { (Storable::thaw $av)->{objs} }; 874 $av = eval { (Storable::thaw $av)->{objs} };
820 } 875 }
821 876
822 warn sprintf "loading %s (%d)\n", 877 warn sprintf "loading %s (%d)\n",
823 $filename, length $data, scalar @{$av || []};#d# 878 $filename, length $data, scalar @{$av || []};
824 return ($data, $av); 879 return ($data, $av);
825} 880}
826 881
827############################################################################# 882#############################################################################
828# command handling &c 883# command handling &c
… …
888 943
889 cf::override; 944 cf::override;
890 }, 945 },
891); 946);
892 947
893sub load_extension {
894 my ($path) = @_;
895
896 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
897 my $base = $1;
898 my $pkg = $1;
899 $pkg =~ s/[^[:word:]]/_/g;
900 $pkg = "ext::$pkg";
901
902 warn "... loading '$path' into '$pkg'\n";
903
904 open my $fh, "<:utf8", $path
905 or die "$path: $!";
906
907 my $source =
908 "package $pkg; use strict; use utf8;\n"
909 . "#line 1 \"$path\"\n{\n"
910 . (do { local $/; <$fh> })
911 . "\n};\n1";
912
913 unless (eval $source) {
914 my $msg = $@ ? "$path: $@\n"
915 : "extension disabled.\n";
916 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
917 warn $@;
918 warn "mandatory extension failed to load, exiting.\n";
919 exit 1;
920 }
921 die $@;
922 }
923
924 push @EXTS, $pkg;
925}
926
927sub load_extensions { 948sub load_extensions {
949 cf::sync_job {
950 my %todo;
951
928 for my $ext (<$LIBDIR/*.ext>) { 952 for my $path (<$LIBDIR/*.ext>) {
929 next unless -r $ext; 953 next unless -r $path;
930 eval { 954
931 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 } split /\s+/, $1 }
973 if $source =~ /^#!.*?perl.*?#\s*(.*)$/;
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*/, $ext{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 : "extension disabled.\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 die $msg;
1007 }
1008
1009 $done{$k} = delete $todo{$k};
1010 push @EXTS, $v->{pkg};
932 1 1011 }
933 } or warn "$ext not loaded: $@"; 1012
1013 skip:
1014 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1015 unless $progress;
1016 }
934 } 1017 };
935} 1018}
936 1019
937############################################################################# 1020#############################################################################
938 1021
939=head2 CORE EXTENSIONS 1022=head2 CORE EXTENSIONS
… …
955Returns the given player object, loading it if necessary (might block). 1038Returns the given player object, loading it if necessary (might block).
956 1039
957=cut 1040=cut
958 1041
959sub playerdir($) { 1042sub playerdir($) {
960 cf::localdir 1043 "$PLAYERDIR/"
961 . "/"
962 . cf::playerdir
963 . "/"
964 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1044 . (ref $_[0] ? $_[0]->ob->name : $_[0])
965} 1045}
966 1046
967sub path($) { 1047sub path($) {
968 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1048 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
… …
1088while and may block, so not sync_job-capable, ever. 1168while and may block, so not sync_job-capable, ever.
1089 1169
1090=cut 1170=cut
1091 1171
1092sub list_logins { 1172sub list_logins {
1093 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1173 my $dirs = aio_readdir $PLAYERDIR
1094 or return []; 1174 or return [];
1095 1175
1096 my @logins; 1176 my @logins;
1097 1177
1098 for my $login (@$dirs) { 1178 for my $login (@$dirs) {
… …
1253 my ($self, $merge) = @_; 1333 my ($self, $merge) = @_;
1254 1334
1255 # we have to keep some variables in memory intact 1335 # we have to keep some variables in memory intact
1256 local $self->{path}; 1336 local $self->{path};
1257 local $self->{load_path}; 1337 local $self->{load_path};
1258 local $self->{deny_save};
1259 local $self->{deny_reset};
1260 1338
1261 $self->SUPER::thawer_merge ($merge); 1339 $self->SUPER::thawer_merge ($merge);
1262} 1340}
1263 1341
1264sub normalise { 1342sub normalise {
… …
1336 1414
1337# the original (read-only) location 1415# the original (read-only) location
1338sub load_path { 1416sub load_path {
1339 my ($self) = @_; 1417 my ($self) = @_;
1340 1418
1341 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1419 "$MAPDIR/$self->{path}.map"
1342} 1420}
1343 1421
1344# the temporary/swap location 1422# the temporary/swap location
1345sub save_path { 1423sub save_path {
1346 my ($self) = @_; 1424 my ($self) = @_;
1347 1425
1348 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1426 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1349 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1427 "$TMPDIR/$path.map"
1350} 1428}
1351 1429
1352# the unique path, undef == no special unique path 1430# the unique path, undef == no special unique path
1353sub uniq_path { 1431sub uniq_path {
1354 my ($self) = @_; 1432 my ($self) = @_;
1355 1433
1356 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1434 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1357 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1435 "$UNIQUEDIR/$path"
1358} 1436}
1359 1437
1360# and all this just because we cannot iterate over 1438# and all this just because we cannot iterate over
1361# all maps in C++... 1439# all maps in C++...
1362sub change_all_map_light { 1440sub change_all_map_light {
1363 my ($change) = @_; 1441 my ($change) = @_;
1364 1442
1365 $_->change_map_light ($change) 1443 $_->change_map_light ($change)
1366 for grep $_->outdoor, values %cf::MAP; 1444 for grep $_->outdoor, values %cf::MAP;
1445}
1446
1447sub decay_objects {
1448 my ($self) = @_;
1449
1450 return if $self->{deny_reset};
1451
1452 $self->do_decay_objects;
1367} 1453}
1368 1454
1369sub unlink_save { 1455sub unlink_save {
1370 my ($self) = @_; 1456 my ($self) = @_;
1371 1457
… …
1429 $self->load_header_orig 1515 $self->load_header_orig
1430 or return; 1516 or return;
1431 $self->prepare_orig; 1517 $self->prepare_orig;
1432 } 1518 }
1433 1519
1520 $self->{deny_reset} = 1
1521 if $self->no_reset;
1522
1434 $self->default_region (cf::region::find_by_path $self->{path}) 1523 $self->default_region (cf::region::find_by_path $self->{path})
1435 unless $self->default_region; 1524 unless $self->default_region;
1436 1525
1437 1 1526 1
1438} 1527}
… …
1453 $map->{last_save} = $cf::RUNTIME; 1542 $map->{last_save} = $cf::RUNTIME;
1454 1543
1455 $map->load_header 1544 $map->load_header
1456 or return; 1545 or return;
1457 1546
1458 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1547 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1459 # doing this can freeze the server in a sync job, obviously 1548 # doing this can freeze the server in a sync job, obviously
1460 #$cf::WAIT_FOR_TICK->wait; 1549 #$cf::WAIT_FOR_TICK->wait;
1461 $map->reset; 1550 $map->reset;
1462 undef $guard; 1551 undef $guard;
1463 return find $path; 1552 return find $path;
… …
1474 my ($self) = @_; 1563 my ($self) = @_;
1475 1564
1476 local $self->{deny_reset} = 1; # loading can take a long time 1565 local $self->{deny_reset} = 1; # loading can take a long time
1477 1566
1478 my $path = $self->{path}; 1567 my $path = $self->{path};
1568
1569 {
1479 my $guard = cf::lock_acquire "map_load:$path"; 1570 my $guard = cf::lock_acquire "map_load:$path";
1480 1571
1481 return if $self->in_memory != cf::MAP_SWAPPED; 1572 return if $self->in_memory != cf::MAP_SWAPPED;
1482 1573
1483 $self->in_memory (cf::MAP_LOADING); 1574 $self->in_memory (cf::MAP_LOADING);
1484 1575
1485 $self->alloc; 1576 $self->alloc;
1486 1577
1487 $self->pre_load; 1578 $self->pre_load;
1488 Coro::cede;
1489
1490 $self->_load_objects ($self->{load_path}, 1)
1491 or return;
1492
1493 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1494 if delete $self->{load_original};
1495
1496 if (my $uniq = $self->uniq_path) {
1497 utf8::encode $uniq;
1498 if (aio_open $uniq, O_RDONLY, 0) {
1499 $self->clear_unique_items;
1500 $self->_load_objects ($uniq, 0);
1501 }
1502 }
1503
1504 Coro::cede;
1505 # now do the right thing for maps
1506 $self->link_multipart_objects;
1507 Coro::cede;
1508
1509 unless ($self->{deny_activate}) {
1510 $self->decay_objects;
1511 $self->fix_auto_apply;
1512 $self->update_buttons;
1513 Coro::cede; 1579 Coro::cede;
1514 $self->set_darkness_map; 1580
1581 $self->_load_objects ($self->{load_path}, 1)
1582 or return;
1583
1584 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1585 if delete $self->{load_original};
1586
1587 if (my $uniq = $self->uniq_path) {
1588 utf8::encode $uniq;
1589 if (aio_open $uniq, O_RDONLY, 0) {
1590 $self->clear_unique_items;
1591 $self->_load_objects ($uniq, 0);
1592 }
1593 }
1594
1595 Coro::cede;
1596 # now do the right thing for maps
1597 $self->link_multipart_objects;
1515 $self->difficulty ($self->estimate_difficulty) 1598 $self->difficulty ($self->estimate_difficulty)
1516 unless $self->difficulty; 1599 unless $self->difficulty;
1517 Coro::cede; 1600 Coro::cede;
1601
1602 unless ($self->{deny_activate}) {
1603 $self->decay_objects;
1604 $self->fix_auto_apply;
1605 $self->update_buttons;
1606 Coro::cede;
1607 $self->set_darkness_map;
1608 Coro::cede;
1518 $self->activate; 1609 $self->activate;
1519 Coro::cede; 1610 }
1611
1612 $self->in_memory (cf::MAP_IN_MEMORY);
1520 } 1613 }
1521 1614
1522 $self->post_load; 1615 $self->post_load;
1523 Coro::cede;
1524
1525 $self->in_memory (cf::MAP_IN_MEMORY);
1526} 1616}
1527 1617
1528sub customise_for { 1618sub customise_for {
1529 my ($self, $ob) = @_; 1619 my ($self, $ob) = @_;
1530 1620
1531 return find "~" . $ob->name . "/" . $self->{path} 1621 return find "~" . $ob->name . "/" . $self->{path}
1532 if $self->per_player; 1622 if $self->per_player;
1623
1624# return find "?party/" . $ob->name . "/" . $self->{path}
1625# if $self->per_party;
1533 1626
1534 $self 1627 $self
1535} 1628}
1536 1629
1537# find and load all maps in the 3x3 area around a map 1630# find and load all maps in the 3x3 area around a map
… …
1648 1741
1649sub reset_at { 1742sub reset_at {
1650 my ($self) = @_; 1743 my ($self) = @_;
1651 1744
1652 # TODO: safety, remove and allow resettable per-player maps 1745 # TODO: safety, remove and allow resettable per-player maps
1653 return 1e99 if $self->isa ("ext::map_per_player");#d#
1654 return 1e99 if $self->{deny_reset}; 1746 return 1e99 if $self->{deny_reset};
1655 1747
1656 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1748 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1657 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1749 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1658 1750
… …
1669 my ($self) = @_; 1761 my ($self) = @_;
1670 1762
1671 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1763 my $lock = cf::lock_acquire "map_data:$self->{path}";
1672 1764
1673 return if $self->players; 1765 return if $self->players;
1674 return if $self->isa ("ext::map_per_player");#d#
1675 1766
1676 warn "resetting map ", $self->path;#d# 1767 warn "resetting map ", $self->path;
1677 1768
1678 $self->in_memory (cf::MAP_SWAPPED); 1769 $self->in_memory (cf::MAP_SWAPPED);
1679 1770
1680 # need to save uniques path 1771 # need to save uniques path
1681 unless ($self->{deny_save}) { 1772 unless ($self->{deny_save}) {
… …
1713 $cf::MAP{$self->path} = $self; 1804 $cf::MAP{$self->path} = $self;
1714 1805
1715 $self->reset; # polite request, might not happen 1806 $self->reset; # polite request, might not happen
1716} 1807}
1717 1808
1809=item $maps = cf::map::tmp_maps
1810
1811Returns an arrayref with all map paths of currently instantiated and saved
1812maps. May block.
1813
1814=cut
1815
1816sub tmp_maps() {
1817 [
1818 map {
1819 utf8::decode $_;
1820 /\.map$/
1821 ? normalise $_
1822 : ()
1823 } @{ aio_readdir $TMPDIR or [] }
1824 ]
1825}
1826
1827=item $maps = cf::map::random_maps
1828
1829Returns an arrayref with all map paths of currently instantiated and saved
1830random maps. May block.
1831
1832=cut
1833
1834sub random_maps() {
1835 [
1836 map {
1837 utf8::decode $_;
1838 /\.map$/
1839 ? normalise "?random/$_"
1840 : ()
1841 } @{ aio_readdir $RANDOMDIR or [] }
1842 ]
1843}
1844
1718=item cf::map::unique_maps 1845=item cf::map::unique_maps
1719 1846
1720Returns an arrayref of paths of all shared maps that have 1847Returns an arrayref of paths of all shared maps that have
1721instantiated unique items. May block. 1848instantiated unique items. May block.
1722 1849
1723=cut 1850=cut
1724 1851
1725sub unique_maps() { 1852sub unique_maps() {
1726 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 1853 [
1727 or return; 1854 map {
1728
1729 my @paths;
1730
1731 for (@$files) {
1732 utf8::decode $_; 1855 utf8::decode $_;
1733 next if /\.pst$/; 1856 /\.map$/
1734 next unless /^$PATH_SEP/o; 1857 ? normalise $_
1735 1858 : ()
1736 push @paths, cf::map::normalise $_; 1859 } @{ aio_readdir $UNIQUEDIR or [] }
1737 } 1860 ]
1738
1739 \@paths
1740} 1861}
1741 1862
1742package cf; 1863package cf;
1743 1864
1744=back 1865=back
… …
1850 $self->deactivate_recursive; 1971 $self->deactivate_recursive;
1851 1972
1852 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1973 return if UNIVERSAL::isa $self->map, "ext::map_link";
1853 1974
1854 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1975 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1855 if $self->map; 1976 if $self->map && $self->map->{path} ne "{link}";
1856 1977
1857 $self->enter_map ($LINK_MAP || link_map, 10, 10); 1978 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1858} 1979}
1859 1980
1860sub cf::object::player::leave_link { 1981sub cf::object::player::leave_link {
1861 my ($self, $map, $x, $y) = @_; 1982 my ($self, $map, $x, $y) = @_;
1983
1984 return unless $self->contr->active;
1862 1985
1863 my $link_pos = delete $self->{_link_pos}; 1986 my $link_pos = delete $self->{_link_pos};
1864 1987
1865 unless ($map) { 1988 unless ($map) {
1866 # restore original map position 1989 # restore original map position
… …
1889 2012
1890 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2013 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1891 $self->enter_map ($map, $x, $y); 2014 $self->enter_map ($map, $x, $y);
1892} 2015}
1893 2016
1894cf::player->attach (
1895 on_logout => sub {
1896 my ($pl) = @_;
1897
1898 # abort map switching before logout
1899 if ($pl->ob->{_link_pos}) {
1900 cf::sync_job {
1901 $pl->ob->leave_link
1902 };
1903 }
1904 },
1905 on_login => sub {
1906 my ($pl) = @_;
1907
1908 # try to abort aborted map switching on player login :)
1909 # should happen only on crashes
1910 if ($pl->ob->{_link_pos}) {
1911 $pl->ob->enter_link;
1912 (async {
1913 $pl->ob->reply (undef,
1914 "There was an internal problem at your last logout, "
1915 . "the server will try to bring you to your intended destination in a second.",
1916 cf::NDI_RED);
1917 # we need this sleep as the login has a concurrent enter_exit running
1918 # and this sleep increases chances of the player not ending up in scorn
1919 Coro::Timer::sleep 1;
1920 $pl->ob->leave_link;
1921 })->prio (2);
1922 }
1923 },
1924);
1925
1926=item $player_object->goto ($path, $x, $y) 2017=item $player_object->goto ($path, $x, $y[, $check->($map)])
1927 2018
2019Moves the player to the given map-path and coordinates by first freezing
2020her, loading and preparing them map, calling the provided $check callback
2021that has to return the map if sucecssful, and then unfreezes the player on
2022the new (success) or old (failed) map position.
2023
1928=cut 2024=cut
2025
2026our $GOTOGEN;
1929 2027
1930sub cf::object::player::goto { 2028sub cf::object::player::goto {
1931 my ($self, $path, $x, $y) = @_; 2029 my ($self, $path, $x, $y, $check) = @_;
2030
2031 # do generation counting so two concurrent goto's will be executed in-order
2032 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1932 2033
1933 $self->enter_link; 2034 $self->enter_link;
1934 2035
1935 (async { 2036 (async {
1936 my $map = eval { 2037 my $map = eval {
1937 my $map = cf::map::find $path; 2038 my $map = cf::map::find $path;
2039
2040 if ($map) {
1938 $map = $map->customise_for ($self) if $map; 2041 $map = $map->customise_for ($self);
2042 $map = $check->($map) if $check && $map;
2043 } else {
2044 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2045 }
2046
1939 $map 2047 $map
2048 };
2049
2050 if ($@) {
2051 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2052 LOG llevError | logBacktrace, Carp::longmess $@;
1940 } or 2053 }
1941 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1942 2054
2055 if ($gen == $self->{_goto_generation}) {
2056 delete $self->{_goto_generation};
1943 $self->leave_link ($map, $x, $y); 2057 $self->leave_link ($map, $x, $y);
2058 }
1944 })->prio (1); 2059 })->prio (1);
1945} 2060}
1946 2061
1947=item $player_object->enter_exit ($exit_object) 2062=item $player_object->enter_exit ($exit_object)
1948 2063
… …
1987 2102
1988 $rmp->{random_seed} ||= $exit->random_seed; 2103 $rmp->{random_seed} ||= $exit->random_seed;
1989 2104
1990 my $data = cf::to_json $rmp; 2105 my $data = cf::to_json $rmp;
1991 my $md5 = Digest::MD5::md5_hex $data; 2106 my $md5 = Digest::MD5::md5_hex $data;
1992 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2107 my $meta = "$RANDOMDIR/$md5.meta";
1993 2108
1994 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2109 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1995 aio_write $fh, 0, (length $data), $data, 0; 2110 aio_write $fh, 0, (length $data), $data, 0;
1996 undef $fh; 2111 undef $fh;
1997 aio_rename "$meta~", $meta; 2112 aio_rename "$meta~", $meta;
… …
2373 2488
2374 return db_get cache => "$id/data"; 2489 return db_get cache => "$id/data";
2375 } 2490 }
2376 } 2491 }
2377 2492
2493 my $t1 = Time::HiRes::time;
2378 my $data = $process->(\@data); 2494 my $data = $process->(\@data);
2495 my $t2 = Time::HiRes::time;
2496
2497 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2379 2498
2380 db_put cache => "$id/data", $data; 2499 db_put cache => "$id/data", $data;
2381 db_put cache => "$id/md5" , $md5; 2500 db_put cache => "$id/md5" , $md5;
2382 db_put cache => "$id/meta", $meta; 2501 db_put cache => "$id/meta", $meta;
2383 2502
… …
2414 2533
2415 die $$res unless "ARRAY" eq ref $res; 2534 die $$res unless "ARRAY" eq ref $res;
2416 2535
2417 return wantarray ? @$res : $res->[-1]; 2536 return wantarray ? @$res : $res->[-1];
2418 } else { 2537 } else {
2538 reset_signals;
2539 local $SIG{__WARN__};
2540 local $SIG{__DIE__};
2419 eval { 2541 eval {
2420 local $SIG{__DIE__};
2421 local $SIG{__WARN__};
2422 close $fh1; 2542 close $fh1;
2423 2543
2424 my @res = eval { $cb->(@args) }; 2544 my @res = eval { $cb->(@args) };
2425 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 2545 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2426 }; 2546 };
2427 2547
2548 warn $@ if $@;
2428 _exit 0; 2549 _exit 0;
2429 } 2550 }
2430} 2551}
2431
2432
2433 2552
2434############################################################################# 2553#############################################################################
2435# the server's init and main functions 2554# the server's init and main functions
2436 2555
2437sub load_facedata($) { 2556sub load_facedata($) {
… …
2484 } 2603 }
2485 2604
2486 1 2605 1
2487} 2606}
2488 2607
2608sub reload_regions {
2609 load_resource_file "$MAPDIR/regions"
2610 or die "unable to load regions file\n";
2611}
2612
2489sub reload_facedata { 2613sub reload_facedata {
2490 load_facedata sprintf "%s/facedata", cf::datadir 2614 load_facedata "$DATADIR/facedata"
2491 or die "unable to load facedata\n"; 2615 or die "unable to load facedata\n";
2492} 2616}
2493 2617
2494sub reload_regions {
2495 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2496 or die "unable to load regions file\n";
2497}
2498
2499sub reload_archetypes { 2618sub reload_archetypes {
2500 load_resource_file sprintf "%s/archetypes", cf::datadir 2619 load_resource_file "$DATADIR/archetypes"
2501 or die "unable to load archetypes\n"; 2620 or die "unable to load archetypes\n";
2502} 2621}
2503 2622
2504sub reload_treasures { 2623sub reload_treasures {
2505 load_resource_file sprintf "%s/treasures", cf::datadir 2624 load_resource_file "$DATADIR/treasures"
2506 or die "unable to load treasurelists\n"; 2625 or die "unable to load treasurelists\n";
2507} 2626}
2508 2627
2509sub reload_resources { 2628sub reload_resources {
2510 warn "reloading resource files...\n"; 2629 warn "reloading resource files...\n";
2511 2630
2512 reload_regions; 2631 reload_regions;
2513 reload_facedata; 2632 reload_facedata;
2633 #reload_archetypes;#d#
2514 reload_archetypes; 2634 reload_archetypes;
2515 reload_treasures; 2635 reload_treasures;
2516 2636
2517 warn "finished reloading resource files\n"; 2637 warn "finished reloading resource files\n";
2518} 2638}
… …
2520sub init { 2640sub init {
2521 reload_resources; 2641 reload_resources;
2522} 2642}
2523 2643
2524sub cfg_load { 2644sub cfg_load {
2525 open my $fh, "<:utf8", cf::confdir . "/config" 2645 open my $fh, "<:utf8", "$CONFDIR/config"
2526 or return; 2646 or return;
2527 2647
2528 local $/; 2648 local $/;
2529 *CFG = YAML::Syck::Load <$fh>; 2649 *CFG = YAML::Syck::Load <$fh>;
2530 2650
… …
2700 Symbol::delete_package "safe::$_" 2820 Symbol::delete_package "safe::$_"
2701 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2821 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2702 2822
2703 warn "unloading cf.pm \"a bit\""; 2823 warn "unloading cf.pm \"a bit\"";
2704 delete $INC{"cf.pm"}; 2824 delete $INC{"cf.pm"};
2825 delete $INC{"cf/pod.pm"};
2705 2826
2706 # don't, removes xs symbols, too, 2827 # don't, removes xs symbols, too,
2707 # and global variables created in xs 2828 # and global variables created in xs
2708 #Symbol::delete_package __PACKAGE__; 2829 #Symbol::delete_package __PACKAGE__;
2709 2830
… …
2787 my $signal = new Coro::Signal; 2908 my $signal = new Coro::Signal;
2788 push @WAIT_FOR_TICK_BEGIN, $signal; 2909 push @WAIT_FOR_TICK_BEGIN, $signal;
2789 $signal->wait; 2910 $signal->wait;
2790} 2911}
2791 2912
2913 my $min = 1e6;#d#
2914 my $avg = 10;
2792$TICK_WATCHER = Event->timer ( 2915$TICK_WATCHER = Event->timer (
2793 reentrant => 0, 2916 reentrant => 0,
2794 parked => 1, 2917 parked => 1,
2795 prio => 0, 2918 prio => 0,
2796 at => $NEXT_TICK || $TICK, 2919 at => $NEXT_TICK || $TICK,
… …
2800 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 2923 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2801 unless ++$bug_warning > 10; 2924 unless ++$bug_warning > 10;
2802 return; 2925 return;
2803 } 2926 }
2804 2927
2805 $NOW = Event::time; 2928 $NOW = $tick_start = Event::time;
2806 2929
2807 cf::server_tick; # one server iteration 2930 cf::server_tick; # one server iteration
2931
2932 0 && sync_job {#d#
2933 for(1..10) {
2934 my $t = Event::time;
2935 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2936 or die;
2937
2938 $map->width (50);
2939 $map->height (50);
2940 $map->alloc;
2941 $map->_load_objects ("/tmp/x.map", 1);
2942 my $t = Event::time - $t;
2943
2944 #next unless $t < 0.0013;#d#
2945 if ($t < $min) {
2946 $min = $t;
2947 }
2948 $avg = $avg * 0.99 + $t * 0.01;
2949 }
2950 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2951 exit 0;
2952 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2953 };
2808 2954
2809 $RUNTIME += $TICK; 2955 $RUNTIME += $TICK;
2810 $NEXT_TICK += $TICK; 2956 $NEXT_TICK += $TICK;
2811 2957
2812 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2958 if ($NOW >= $NEXT_RUNTIME_WRITE) {
… …
2818 } 2964 }
2819 2965
2820# my $AFTER = Event::time; 2966# my $AFTER = Event::time;
2821# warn $AFTER - $NOW;#d# 2967# warn $AFTER - $NOW;#d#
2822 2968
2969 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2970 $sig->send;
2971 }
2972 while (my $sig = shift @WAIT_FOR_TICK) {
2973 $sig->send;
2974 }
2975
2976 $NOW = Event::time;
2977
2823 # if we are delayed by four ticks or more, skip them all 2978 # if we are delayed by four ticks or more, skip them all
2824 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2979 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2825 2980
2826 $TICK_WATCHER->at ($NEXT_TICK); 2981 $TICK_WATCHER->at ($NEXT_TICK);
2827 $TICK_WATCHER->start; 2982 $TICK_WATCHER->start;
2828 2983
2829 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 2984 $LOAD = ($NOW - $tick_start) / $TICK;
2830 $sig->send; 2985 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2831 }
2832 while (my $sig = shift @WAIT_FOR_TICK) {
2833 $sig->send;
2834 }
2835 2986
2836 _post_tick; 2987 _post_tick;
2988
2989
2837 }, 2990 },
2838); 2991);
2839 2992
2840{ 2993{
2841 BDB::max_poll_time $TICK * 0.1; 2994 BDB::max_poll_time $TICK * 0.1;
… …
2869 3022
2870 cf::sync_job { 3023 cf::sync_job {
2871 eval { 3024 eval {
2872 BDB::db_env_open 3025 BDB::db_env_open
2873 $DB_ENV, 3026 $DB_ENV,
2874 $BDB_ENV_DIR, 3027 $BDBDIR,
2875 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3028 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2876 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3029 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2877 0666; 3030 0666;
2878 3031
2879 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3032 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2880 3033
2881 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3034 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2882 $DB_ENV->set_lk_detect; 3035 $DB_ENV->set_lk_detect;
2883 }; 3036 };
2884 3037
… …
2900 prio => 6, 3053 prio => 6,
2901 cb => \&IO::AIO::poll_cb, 3054 cb => \&IO::AIO::poll_cb,
2902 ); 3055 );
2903} 3056}
2904 3057
3058my $_log_backtrace;
3059
3060sub _log_backtrace {
3061 my ($msg, @addr) = @_;
3062
3063 $msg =~ s/\n//;
3064
3065 # limit the # of concurrent backtraces
3066 if ($_log_backtrace < 2) {
3067 ++$_log_backtrace;
3068 async {
3069 my @bt = fork_call {
3070 @addr = map { sprintf "%x", $_ } @addr;
3071 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3072 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3073 or die "addr2line: $!";
3074
3075 my @funcs;
3076 my @res = <$fh>;
3077 chomp for @res;
3078 while (@res) {
3079 my ($func, $line) = splice @res, 0, 2, ();
3080 push @funcs, "[$func] $line";
3081 }
3082
3083 @funcs
3084 };
3085
3086 LOG llevInfo, "[ABT] $msg\n";
3087 LOG llevInfo, "[ABT] $_\n" for @bt;
3088 --$_log_backtrace;
3089 };
3090 } else {
3091 LOG llevInfo, "[ABT] $msg\n";
3092 LOG llevInfo, "[ABT] [suppressed]\n";
3093 }
3094}
3095
2905# load additional modules 3096# load additional modules
2906use cf::pod; 3097use cf::pod;
2907 3098
2908END { cf::emergency_save } 3099END { cf::emergency_save }
2909 3100

Diff Legend

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