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.219 by root, Sat Feb 17 03:19:44 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;
10use Event;
9use Opcode; 11use Opcode;
10use Safe; 12use Safe;
11use Safe::Hole; 13use Safe::Hole;
12 14
13use Coro 3.5 (); 15use Coro 3.61 ();
16use Coro::State;
17use Coro::Handle;
14use Coro::Event; 18use Coro::Event;
15use Coro::Timer; 19use Coro::Timer;
16use Coro::Signal; 20use Coro::Signal;
17use Coro::Semaphore; 21use Coro::Semaphore;
18use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable;
19 24
20use BDB (); 25use BDB ();
21use Data::Dumper; 26use Data::Dumper;
22use Digest::MD5; 27use Digest::MD5;
23use Fcntl; 28use Fcntl;
29use YAML::Syck ();
24use IO::AIO 2.32 (); 30use IO::AIO 2.32 ();
25use YAML::Syck ();
26use Time::HiRes; 31use Time::HiRes;
27use Compress::LZF; 32use Compress::LZF;
28 33
34# configure various modules to our taste
35#
36$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
29Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
30 39
31use Event; $Event::Eval = 1; # no idea why this is required, but it is 40$Event::Eval = 1; # no idea why this is required, but it is
32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 41
35# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
36$YAML::Syck::ImplicitUnicode = 1; 43$YAML::Syck::ImplicitUnicode = 1;
37 44
38$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
39 48
40our %COMMAND = (); 49our %COMMAND = ();
41our %COMMAND_TIME = (); 50our %COMMAND_TIME = ();
42 51
43our @EXTS = (); # list of extension package names 52our @EXTS = (); # list of extension package names
44our %EXTCMD = (); 53our %EXTCMD = ();
45our %EXT_CORO = (); # coroutines bound to extensions 54our %EXT_CORO = (); # coroutines bound to extensions
46our %EXT_MAP = (); # pluggable maps 55our %EXT_MAP = (); # pluggable maps
47 56
57our $RELOAD; # number of reloads so far
48our @EVENT; 58our @EVENT;
49our $LIBDIR = datadir . "/ext";
50 59
51our $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(!)
52our $TICK_WATCHER; 73our $TICK_WATCHER;
53our $AIO_POLL_WATCHER; 74our $AIO_POLL_WATCHER;
54our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
55our $NEXT_TICK; 76our $NEXT_TICK;
56our $NOW; 77our $NOW;
65our $RUNTIME; 86our $RUNTIME;
66 87
67our %PLAYER; # all users 88our %PLAYER; # all users
68our %MAP; # all maps 89our %MAP; # all maps
69our $LINK_MAP; # the special {link} map, which is always available 90our $LINK_MAP; # the special {link} map, which is always available
70our $RANDOM_MAPS = cf::localdir . "/random";
71our $BDB_ENV_DIR = cf::localdir . "/db";
72
73our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
74our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
75 91
76# 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 ∕
77our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
78 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
79binmode STDOUT; 99binmode STDOUT;
80binmode STDERR; 100binmode STDERR;
81 101
82# read virtual server time, if available 102# read virtual server time, if available
83unless ($RUNTIME || !-e cf::localdir . "/runtime") { 103unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
84 open my $fh, "<", cf::localdir . "/runtime" 104 open my $fh, "<", "$LOCALDIR/runtime"
85 or die "unable to read runtime file: $!"; 105 or die "unable to read runtime file: $!";
86 $RUNTIME = <$fh> + 0.; 106 $RUNTIME = <$fh> + 0.;
87} 107}
88 108
89mkdir cf::localdir; 109mkdir $_
90mkdir cf::localdir . "/" . cf::playerdir; 110 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
91mkdir cf::localdir . "/" . cf::tmpdir;
92mkdir cf::localdir . "/" . cf::uniquedir;
93mkdir $RANDOM_MAPS;
94mkdir $BDB_ENV_DIR;
95 111
96our $EMERGENCY_POSITION; 112our $EMERGENCY_POSITION;
97 113
98sub cf::map::normalise; 114sub cf::map::normalise;
99 115
110=item $cf::RUNTIME 126=item $cf::RUNTIME
111 127
112The 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
113every server tick. 129every server tick.
114 130
115=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
116 134
117The perl library directory, where extensions and cf-specific modules can 135Various directories - "/etc", read-only install directory, perl-library
118be 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.
119 139
120=item $cf::NOW 140=item $cf::NOW
121 141
122The time of the last (current) server tick. 142The time of the last (current) server tick.
123 143
124=item $cf::TICK 144=item $cf::TICK
125 145
126The 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.
127 157
128=item %cf::CFG 158=item %cf::CFG
129 159
130Configuration for the server, loaded from C</etc/crossfire/config>, or 160Configuration for the server, loaded from C</etc/crossfire/config>, or
131from wherever your confdir points to. 161from wherever your confdir points to.
132 162
133=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 163=item cf::wait_for_tick, cf::wait_for_tick_begin
134 164
135These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
136or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 166returns directly I<after> the tick processing (and consequently, can only wake one process
137processing has been done. Call C<< ->wait >> on them to maximise the 167per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
138window of cpu time available, or simply to synchronise to the server tick.
139 168
140=back 169=back
141 170
142=cut 171=cut
143 172
144BEGIN { 173BEGIN {
145 *CORE::GLOBAL::warn = sub { 174 *CORE::GLOBAL::warn = sub {
146 my $msg = join "", @_; 175 my $msg = join "", @_;
147 utf8::encode $msg;
148 176
149 $msg .= "\n" 177 $msg .= "\n"
150 unless $msg =~ /\n$/; 178 unless $msg =~ /\n$/;
151 179
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181
182 utf8::encode $msg;
152 LOG llevError, $msg; 183 LOG llevError, $msg;
153 }; 184 };
154} 185}
155 186
156@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
157@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
158@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
159@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
160@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';
161@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)
162 194
163# 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
164# within the Safe compartment. 196# within the Safe compartment.
165for my $pkg (qw( 197for my $pkg (qw(
166 cf::global cf::attachable 198 cf::global cf::attachable
202 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 234 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
203 $d 235 $d
204 } || "[unable to dump $_[0]: '$@']"; 236 } || "[unable to dump $_[0]: '$@']";
205} 237}
206 238
207use JSON::Syck (); # TODO# replace by JSON::PC once working 239use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
208 240
209=item $ref = cf::from_json $json 241=item $ref = cf::from_json $json
210 242
211Converts a JSON string into the corresponding perl data structure. 243Converts a JSON string into the corresponding perl data structure.
212 244
213=cut
214
215sub from_json($) {
216 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
217 JSON::Syck::Load $_[0]
218}
219
220=item $json = cf::to_json $ref 245=item $json = cf::to_json $ref
221 246
222Converts a perl data structure into its JSON representation. 247Converts a perl data structure into its JSON representation.
223
224=cut
225
226sub to_json($) {
227 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
228 JSON::Syck::Dump $_[0]
229}
230 248
231=item cf::lock_wait $string 249=item cf::lock_wait $string
232 250
233Wait until the given lock is available. See cf::lock_acquire. 251Wait until the given lock is available. See cf::lock_acquire.
234 252
240returned. 258returned.
241 259
242Lock 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
243uses map_find and cf::map::load uses map_load). 261uses map_find and cf::map::load uses map_load).
244 262
263=item $locked = cf::lock_active $string
264
265Return true if the lock is currently active, i.e. somebody has locked it.
266
245=cut 267=cut
246 268
247our %LOCK; 269our %LOCK;
248 270
249sub lock_wait($) { 271sub lock_wait($) {
266 288
267 Coro::guard { 289 Coro::guard {
268 # wake up all waiters, to be on the safe side 290 # wake up all waiters, to be on the safe side
269 $_->ready for @{ delete $LOCK{$key} }; 291 $_->ready for @{ delete $LOCK{$key} };
270 } 292 }
293}
294
295sub lock_active($) {
296 my ($key) = @_;
297
298 ! ! $LOCK{$key}
271} 299}
272 300
273sub freeze_mainloop { 301sub freeze_mainloop {
274 return unless $TICK_WATCHER->is_active; 302 return unless $TICK_WATCHER->is_active;
275 303
305 333
306sub sync_job(&) { 334sub sync_job(&) {
307 my ($job) = @_; 335 my ($job) = @_;
308 336
309 if ($Coro::current == $Coro::main) { 337 if ($Coro::current == $Coro::main) {
338 my $time = Event::time;
339
310 # this is the main coro, too bad, we have to block 340 # this is the main coro, too bad, we have to block
311 # till the operation succeeds, freezing the server :/ 341 # till the operation succeeds, freezing the server :/
312 342
313 # TODO: use suspend/resume instead 343 # TODO: use suspend/resume instead
314 # (but this is cancel-safe) 344 # (but this is cancel-safe)
325 355
326 while ($busy) { 356 while ($busy) {
327 Coro::cede or Event::one_event; 357 Coro::cede or Event::one_event;
328 } 358 }
329 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
330 wantarray ? @res : $res[0] 367 wantarray ? @res : $res[0]
331 } else { 368 } else {
332 # we are in another coroutine, how wonderful, everything just works 369 # we are in another coroutine, how wonderful, everything just works
333 370
334 $job->() 371 $job->()
354 391
355 $coro 392 $coro
356} 393}
357 394
358sub 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
359 my $guard = cf::lock_acquire "write_runtime"; 403 my $guard = cf::lock_acquire "write_runtime";
360
361 my $runtime = cf::localdir . "/runtime";
362 404
363 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
364 or return; 406 or return;
365 407
366 my $value = $cf::RUNTIME + 90 + 10; 408 my $value = $cf::RUNTIME + 90 + 10;
372 414
373 # always fsync - this file is important 415 # always fsync - this file is important
374 aio_fsync $fh 416 aio_fsync $fh
375 and return; 417 and return;
376 418
419 # touch it again to show we are up-to-date
420 aio_utime $fh, undef, undef;
421
377 close $fh 422 close $fh
378 or return; 423 or return;
379 424
380 aio_rename "$runtime~", $runtime 425 aio_rename "$runtime~", $runtime
381 and return; 426 and return;
382 427
428 warn "runtime file written.\n";
429
383 1 430 1
431}
432
433=item cf::datalog type => key => value, ...
434
435Log a datalog packet of the given type with the given key-value pairs.
436
437=cut
438
439sub datalog($@) {
440 my ($type, %kv) = @_;
441 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
384} 442}
385 443
386=back 444=back
387 445
388=cut 446=cut
568 $registry = $CB_TYPE[$object_type] ||= []; 626 $registry = $CB_TYPE[$object_type] ||= [];
569 627
570 } elsif ($type eq "subtype") { 628 } elsif ($type eq "subtype") {
571 defined $object_type or Carp::croak "subtype specified without type"; 629 defined $object_type or Carp::croak "subtype specified without type";
572 my $object_subtype = shift @arg; 630 my $object_subtype = shift @arg;
573 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 631 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
574 632
575 } elsif ($type eq "package") { 633 } elsif ($type eq "package") {
576 my $pkg = shift @arg; 634 my $pkg = shift @arg;
577 635
578 while (my ($name, $id) = each %cb_id) { 636 while (my ($name, $id) = each %cb_id) {
619 if (ref $_[0]) { 677 if (ref $_[0]) {
620 _object_attach @_; 678 _object_attach @_;
621 } else { 679 } else {
622 _attach shift->_attach_registry, @_; 680 _attach shift->_attach_registry, @_;
623 } 681 }
682 _recalc_want;
624}; 683};
625 684
626# all those should be optimised 685# all those should be optimised
627sub cf::attachable::detach { 686sub cf::attachable::detach {
628 my ($obj, $name) = @_; 687 my ($obj, $name) = @_;
631 delete $obj->{_attachment}{$name}; 690 delete $obj->{_attachment}{$name};
632 reattach ($obj); 691 reattach ($obj);
633 } else { 692 } else {
634 Carp::croak "cannot, currently, detach class attachments"; 693 Carp::croak "cannot, currently, detach class attachments";
635 } 694 }
695 _recalc_want;
636}; 696};
637 697
638sub cf::attachable::attached { 698sub cf::attachable::attached {
639 my ($obj, $name) = @_; 699 my ($obj, $name) = @_;
640 700
813 or return; 873 or return;
814 $av = eval { (Storable::thaw $av)->{objs} }; 874 $av = eval { (Storable::thaw $av)->{objs} };
815 } 875 }
816 876
817 warn sprintf "loading %s (%d)\n", 877 warn sprintf "loading %s (%d)\n",
818 $filename, length $data, scalar @{$av || []};#d# 878 $filename, length $data, scalar @{$av || []};
819 return ($data, $av); 879 return ($data, $av);
820} 880}
821 881
822############################################################################# 882#############################################################################
823# command handling &c 883# command handling &c
883 943
884 cf::override; 944 cf::override;
885 }, 945 },
886); 946);
887 947
888sub load_extension {
889 my ($path) = @_;
890
891 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
892 my $base = $1;
893 my $pkg = $1;
894 $pkg =~ s/[^[:word:]]/_/g;
895 $pkg = "ext::$pkg";
896
897 warn "... loading '$path' into '$pkg'\n";
898
899 open my $fh, "<:utf8", $path
900 or die "$path: $!";
901
902 my $source =
903 "package $pkg; use strict; use utf8;\n"
904 . "#line 1 \"$path\"\n{\n"
905 . (do { local $/; <$fh> })
906 . "\n};\n1";
907
908 unless (eval $source) {
909 my $msg = $@ ? "$path: $@\n"
910 : "extension disabled.\n";
911 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
912 warn $@;
913 warn "mandatory extension failed to load, exiting.\n";
914 exit 1;
915 }
916 die $@;
917 }
918
919 push @EXTS, $pkg;
920}
921
922sub load_extensions { 948sub load_extensions {
949 cf::sync_job {
950 my %todo;
951
923 for my $ext (<$LIBDIR/*.ext>) { 952 for my $path (<$LIBDIR/*.ext>) {
924 next unless -r $ext; 953 next unless -r $path;
925 eval { 954
926 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;
927 1 1012 }
928 } or warn "$ext not loaded: $@"; 1013
1014 skip:
1015 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1016 unless $progress;
1017 }
929 } 1018 };
930} 1019}
931 1020
932############################################################################# 1021#############################################################################
933 1022
934=head2 CORE EXTENSIONS 1023=head2 CORE EXTENSIONS
950Returns the given player object, loading it if necessary (might block). 1039Returns the given player object, loading it if necessary (might block).
951 1040
952=cut 1041=cut
953 1042
954sub playerdir($) { 1043sub playerdir($) {
955 cf::localdir 1044 "$PLAYERDIR/"
956 . "/"
957 . cf::playerdir
958 . "/"
959 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1045 . (ref $_[0] ? $_[0]->ob->name : $_[0])
960} 1046}
961 1047
962sub path($) { 1048sub path($) {
963 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1049 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
964 1050
965 (playerdir $login) . "/$login.pl" 1051 (playerdir $login) . "/playerdata"
966} 1052}
967 1053
968sub find_active($) { 1054sub find_active($) {
969 $cf::PLAYER{$_[0]} 1055 $cf::PLAYER{$_[0]}
970 and $cf::PLAYER{$_[0]}->active 1056 and $cf::PLAYER{$_[0]}->active
983 my $login = $_[0]; 1069 my $login = $_[0];
984 1070
985 my $guard = cf::lock_acquire "user_find:$login"; 1071 my $guard = cf::lock_acquire "user_find:$login";
986 1072
987 $cf::PLAYER{$_[0]} || do { 1073 $cf::PLAYER{$_[0]} || do {
1074 # rename old playerfiles to new ones
1075 #TODO: remove when no longer required
1076 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1077 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1078 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1079 aio_unlink +(playerdir $login) . "/$login.pl";
1080
988 my $pl = load_pl path $login 1081 my $pl = load_pl path $login
989 or return; 1082 or return;
990 $cf::PLAYER{$login} = $pl 1083 $cf::PLAYER{$login} = $pl
991 } 1084 }
992 } 1085 }
1029 1122
1030=cut 1123=cut
1031 1124
1032sub quit_character { 1125sub quit_character {
1033 my ($pl) = @_; 1126 my ($pl) = @_;
1127
1128 my $name = $pl->ob->name;
1034 1129
1035 $pl->{deny_save} = 1; 1130 $pl->{deny_save} = 1;
1036 $pl->password ("*"); # this should lock out the player until we nuked the dir 1131 $pl->password ("*"); # this should lock out the player until we nuked the dir
1037 1132
1038 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1133 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1043 my $path = playerdir $pl; 1138 my $path = playerdir $pl;
1044 my $temp = "$path~$cf::RUNTIME~deleting~"; 1139 my $temp = "$path~$cf::RUNTIME~deleting~";
1045 aio_rename $path, $temp; 1140 aio_rename $path, $temp;
1046 delete $cf::PLAYER{$pl->ob->name}; 1141 delete $cf::PLAYER{$pl->ob->name};
1047 $pl->destroy; 1142 $pl->destroy;
1143
1144 my $prefix = qr<^~\Q$name\E/>;
1145
1146 # nuke player maps
1147 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1148
1048 IO::AIO::aio_rmtree $temp; 1149 IO::AIO::aio_rmtree $temp;
1150}
1151
1152=item $pl->kick
1153
1154Kicks a player out of the game. This destroys the connection.
1155
1156=cut
1157
1158sub kick {
1159 my ($pl, $kicker) = @_;
1160
1161 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1162 $pl->killer ("kicked");
1163 $pl->ns->destroy;
1049} 1164}
1050 1165
1051=item cf::player::list_logins 1166=item cf::player::list_logins
1052 1167
1053Returns am arrayref of all valid playernames in the system, can take a 1168Returns am arrayref of all valid playernames in the system, can take a
1054while and may block, so not sync_job-capable, ever. 1169while and may block, so not sync_job-capable, ever.
1055 1170
1056=cut 1171=cut
1057 1172
1058sub list_logins { 1173sub list_logins {
1059 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1174 my $dirs = aio_readdir $PLAYERDIR
1060 or return []; 1175 or return [];
1061 1176
1062 my @logins; 1177 my @logins;
1063 1178
1064 for my $login (@$dirs) { 1179 for my $login (@$dirs) {
1099 } 1214 }
1100 1215
1101 \@paths 1216 \@paths
1102} 1217}
1103 1218
1104=item $player->ext_reply ($msgid, $msgtype, %msg) 1219=item $player->ext_reply ($msgid, %msg)
1105 1220
1106Sends an ext reply to the player. 1221Sends an ext reply to the player.
1107 1222
1108=cut 1223=cut
1109 1224
1110sub ext_reply($$$%) { 1225sub ext_reply($$%) {
1111 my ($self, $id, %msg) = @_; 1226 my ($self, $id, %msg) = @_;
1112 1227
1113 $msg{msgid} = $id; 1228 $msg{msgid} = $id;
1114 1229
1115 $self->send ("ext " . cf::to_json \%msg); 1230 $self->send ("ext " . cf::to_json \%msg);
1116} 1231}
1117 1232
1118package cf; 1233=item $player->ext_event ($type, %msg)
1234
1235Sends an ext event to the client.
1236
1237=cut
1238
1239sub ext_event($$%) {
1240 my ($self, $type, %msg) = @_;
1241
1242 $self->ns->ext_event ($type, %msg);
1243}
1244
1245=head3 cf::region
1246
1247=over 4
1248
1249=cut
1250
1251package cf::region;
1252
1253=item cf::region::find_by_path $path
1254
1255Tries to decuce the probable region for a map knowing only its path.
1256
1257=cut
1258
1259sub find_by_path($) {
1260 my ($path) = @_;
1261
1262 my ($match, $specificity);
1263
1264 for my $region (list) {
1265 if ($region->match && $path =~ $region->match) {
1266 ($match, $specificity) = ($region, $region->specificity)
1267 if $region->specificity > $specificity;
1268 }
1269 }
1270
1271 $match
1272}
1119 1273
1120=back 1274=back
1121
1122 1275
1123=head3 cf::map 1276=head3 cf::map
1124 1277
1125=over 4 1278=over 4
1126 1279
1181 my ($self, $merge) = @_; 1334 my ($self, $merge) = @_;
1182 1335
1183 # we have to keep some variables in memory intact 1336 # we have to keep some variables in memory intact
1184 local $self->{path}; 1337 local $self->{path};
1185 local $self->{load_path}; 1338 local $self->{load_path};
1186 local $self->{deny_save};
1187 local $self->{deny_reset};
1188 1339
1189 $self->SUPER::thawer_merge ($merge); 1340 $self->SUPER::thawer_merge ($merge);
1190} 1341}
1191 1342
1192sub normalise { 1343sub normalise {
1264 1415
1265# the original (read-only) location 1416# the original (read-only) location
1266sub load_path { 1417sub load_path {
1267 my ($self) = @_; 1418 my ($self) = @_;
1268 1419
1269 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1420 "$MAPDIR/$self->{path}.map"
1270} 1421}
1271 1422
1272# the temporary/swap location 1423# the temporary/swap location
1273sub save_path { 1424sub save_path {
1274 my ($self) = @_; 1425 my ($self) = @_;
1275 1426
1276 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1427 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1277 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1428 "$TMPDIR/$path.map"
1278} 1429}
1279 1430
1280# the unique path, undef == no special unique path 1431# the unique path, undef == no special unique path
1281sub uniq_path { 1432sub uniq_path {
1282 my ($self) = @_; 1433 my ($self) = @_;
1283 1434
1284 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1435 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1285 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1436 "$UNIQUEDIR/$path"
1286} 1437}
1287 1438
1288# and all this just because we cannot iterate over 1439# and all this just because we cannot iterate over
1289# all maps in C++... 1440# all maps in C++...
1290sub change_all_map_light { 1441sub change_all_map_light {
1291 my ($change) = @_; 1442 my ($change) = @_;
1292 1443
1293 $_->change_map_light ($change) 1444 $_->change_map_light ($change)
1294 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;
1295} 1454}
1296 1455
1297sub unlink_save { 1456sub unlink_save {
1298 my ($self) = @_; 1457 my ($self) = @_;
1299 1458
1357 $self->load_header_orig 1516 $self->load_header_orig
1358 or return; 1517 or return;
1359 $self->prepare_orig; 1518 $self->prepare_orig;
1360 } 1519 }
1361 1520
1521 $self->{deny_reset} = 1
1522 if $self->no_reset;
1523
1524 $self->default_region (cf::region::find_by_path $self->{path})
1525 unless $self->default_region;
1526
1362 1 1527 1
1363} 1528}
1364 1529
1365sub find; 1530sub find;
1366sub find { 1531sub find {
1378 $map->{last_save} = $cf::RUNTIME; 1543 $map->{last_save} = $cf::RUNTIME;
1379 1544
1380 $map->load_header 1545 $map->load_header
1381 or return; 1546 or return;
1382 1547
1383 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1548 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1384 # doing this can freeze the server in a sync job, obviously 1549 # doing this can freeze the server in a sync job, obviously
1385 #$cf::WAIT_FOR_TICK->wait; 1550 #$cf::WAIT_FOR_TICK->wait;
1386 $map->reset; 1551 $map->reset;
1387 undef $guard; 1552 undef $guard;
1388 return find $path; 1553 return find $path;
1399 my ($self) = @_; 1564 my ($self) = @_;
1400 1565
1401 local $self->{deny_reset} = 1; # loading can take a long time 1566 local $self->{deny_reset} = 1; # loading can take a long time
1402 1567
1403 my $path = $self->{path}; 1568 my $path = $self->{path};
1569
1570 {
1404 my $guard = cf::lock_acquire "map_load:$path"; 1571 my $guard = cf::lock_acquire "map_load:$path";
1405 1572
1406 return if $self->in_memory != cf::MAP_SWAPPED; 1573 return if $self->in_memory != cf::MAP_SWAPPED;
1407 1574
1408 $self->in_memory (cf::MAP_LOADING); 1575 $self->in_memory (cf::MAP_LOADING);
1409 1576
1410 $self->alloc; 1577 $self->alloc;
1411 1578
1412 $self->pre_load; 1579 $self->pre_load;
1413
1414 $self->_load_objects ($self->{load_path}, 1)
1415 or return;
1416
1417 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1418 if delete $self->{load_original};
1419
1420 if (my $uniq = $self->uniq_path) {
1421 utf8::encode $uniq;
1422 if (aio_open $uniq, O_RDONLY, 0) {
1423 $self->clear_unique_items;
1424 $self->_load_objects ($uniq, 0);
1425 }
1426 }
1427
1428 Coro::cede;
1429
1430 # now do the right thing for maps
1431 $self->link_multipart_objects;
1432
1433 unless ($self->{deny_activate}) {
1434 $self->decay_objects;
1435 $self->fix_auto_apply;
1436 $self->update_buttons;
1437 Coro::cede; 1580 Coro::cede;
1438 $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;
1439 $self->difficulty ($self->estimate_difficulty) 1599 $self->difficulty ($self->estimate_difficulty)
1440 unless $self->difficulty; 1600 unless $self->difficulty;
1441 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;
1442 $self->activate; 1610 $self->activate;
1611 }
1612
1613 $self->in_memory (cf::MAP_IN_MEMORY);
1443 } 1614 }
1444 1615
1445 $self->post_load; 1616 $self->post_load;
1446
1447 $self->in_memory (cf::MAP_IN_MEMORY);
1448} 1617}
1449 1618
1450sub customise_for { 1619sub customise_for {
1451 my ($self, $ob) = @_; 1620 my ($self, $ob) = @_;
1452 1621
1453 return find "~" . $ob->name . "/" . $self->{path} 1622 return find "~" . $ob->name . "/" . $self->{path}
1454 if $self->per_player; 1623 if $self->per_player;
1624
1625# return find "?party/" . $ob->name . "/" . $self->{path}
1626# if $self->per_party;
1455 1627
1456 $self 1628 $self
1457} 1629}
1458 1630
1459# 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
1570 1742
1571sub reset_at { 1743sub reset_at {
1572 my ($self) = @_; 1744 my ($self) = @_;
1573 1745
1574 # TODO: safety, remove and allow resettable per-player maps 1746 # TODO: safety, remove and allow resettable per-player maps
1575 return 1e99 if $self->isa ("ext::map_per_player");#d#
1576 return 1e99 if $self->{deny_reset}; 1747 return 1e99 if $self->{deny_reset};
1577 1748
1578 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1749 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1579 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;
1580 1751
1591 my ($self) = @_; 1762 my ($self) = @_;
1592 1763
1593 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1764 my $lock = cf::lock_acquire "map_data:$self->{path}";
1594 1765
1595 return if $self->players; 1766 return if $self->players;
1596 return if $self->isa ("ext::map_per_player");#d#
1597 1767
1598 warn "resetting map ", $self->path;#d# 1768 warn "resetting map ", $self->path;
1599 1769
1600 $self->in_memory (cf::MAP_SWAPPED); 1770 $self->in_memory (cf::MAP_SWAPPED);
1601 1771
1602 # need to save uniques path 1772 # need to save uniques path
1603 unless ($self->{deny_save}) { 1773 unless ($self->{deny_save}) {
1635 $cf::MAP{$self->path} = $self; 1805 $cf::MAP{$self->path} = $self;
1636 1806
1637 $self->reset; # polite request, might not happen 1807 $self->reset; # polite request, might not happen
1638} 1808}
1639 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
1640=item cf::map::unique_maps 1846=item cf::map::unique_maps
1641 1847
1642Returns an arrayref of paths of all shared maps that have 1848Returns an arrayref of paths of all shared maps that have
1643instantiated unique items. May block. 1849instantiated unique items. May block.
1644 1850
1645=cut 1851=cut
1646 1852
1647sub unique_maps() { 1853sub unique_maps() {
1648 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 1854 [
1649 or return; 1855 map {
1650
1651 my @paths;
1652
1653 for (@$files) {
1654 utf8::decode $_; 1856 utf8::decode $_;
1655 next if /\.pst$/; 1857 /\.map$/
1656 next unless /^$PATH_SEP/o; 1858 ? normalise $_
1657 1859 : ()
1658 push @paths, cf::map::normalise $_; 1860 } @{ aio_readdir $UNIQUEDIR or [] }
1659 } 1861 ]
1660
1661 \@paths
1662} 1862}
1663 1863
1664package cf; 1864package cf;
1665 1865
1666=back 1866=back
1772 $self->deactivate_recursive; 1972 $self->deactivate_recursive;
1773 1973
1774 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1974 return if UNIVERSAL::isa $self->map, "ext::map_link";
1775 1975
1776 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1976 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1777 if $self->map; 1977 if $self->map && $self->map->{path} ne "{link}";
1778 1978
1779 $self->enter_map ($LINK_MAP || link_map, 10, 10); 1979 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1780} 1980}
1781 1981
1782sub cf::object::player::leave_link { 1982sub cf::object::player::leave_link {
1783 my ($self, $map, $x, $y) = @_; 1983 my ($self, $map, $x, $y) = @_;
1984
1985 return unless $self->contr->active;
1784 1986
1785 my $link_pos = delete $self->{_link_pos}; 1987 my $link_pos = delete $self->{_link_pos};
1786 1988
1787 unless ($map) { 1989 unless ($map) {
1788 # restore original map position 1990 # restore original map position
1811 2013
1812 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2014 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1813 $self->enter_map ($map, $x, $y); 2015 $self->enter_map ($map, $x, $y);
1814} 2016}
1815 2017
1816cf::player->attach (
1817 on_logout => sub {
1818 my ($pl) = @_;
1819
1820 # abort map switching before logout
1821 if ($pl->ob->{_link_pos}) {
1822 cf::sync_job {
1823 $pl->ob->leave_link
1824 };
1825 }
1826 },
1827 on_login => sub {
1828 my ($pl) = @_;
1829
1830 # try to abort aborted map switching on player login :)
1831 # should happen only on crashes
1832 if ($pl->ob->{_link_pos}) {
1833 $pl->ob->enter_link;
1834 (async {
1835 $pl->ob->reply (undef,
1836 "There was an internal problem at your last logout, "
1837 . "the server will try to bring you to your intended destination in a second.",
1838 cf::NDI_RED);
1839 # we need this sleep as the login has a concurrent enter_exit running
1840 # and this sleep increases chances of the player not ending up in scorn
1841 Coro::Timer::sleep 1;
1842 $pl->ob->leave_link;
1843 })->prio (2);
1844 }
1845 },
1846);
1847
1848=item $player_object->goto ($path, $x, $y) 2018=item $player_object->goto ($path, $x, $y[, $check->($map)])
1849 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
1850=cut 2025=cut
2026
2027our $GOTOGEN;
1851 2028
1852sub cf::object::player::goto { 2029sub cf::object::player::goto {
1853 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;
1854 2034
1855 $self->enter_link; 2035 $self->enter_link;
1856 2036
1857 (async { 2037 (async {
1858 my $map = eval { 2038 my $map = eval {
1859 my $map = cf::map::find $path; 2039 my $map = cf::map::find $path;
2040
2041 if ($map) {
1860 $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
1861 $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 $@;
1862 } or 2054 }
1863 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1864 2055
2056 if ($gen == $self->{_goto_generation}) {
2057 delete $self->{_goto_generation};
1865 $self->leave_link ($map, $x, $y); 2058 $self->leave_link ($map, $x, $y);
2059 }
1866 })->prio (1); 2060 })->prio (1);
1867} 2061}
1868 2062
1869=item $player_object->enter_exit ($exit_object) 2063=item $player_object->enter_exit ($exit_object)
1870 2064
1909 2103
1910 $rmp->{random_seed} ||= $exit->random_seed; 2104 $rmp->{random_seed} ||= $exit->random_seed;
1911 2105
1912 my $data = cf::to_json $rmp; 2106 my $data = cf::to_json $rmp;
1913 my $md5 = Digest::MD5::md5_hex $data; 2107 my $md5 = Digest::MD5::md5_hex $data;
1914 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2108 my $meta = "$RANDOMDIR/$md5.meta";
1915 2109
1916 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2110 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1917 aio_write $fh, 0, (length $data), $data, 0; 2111 aio_write $fh, 0, (length $data), $data, 0;
1918 undef $fh; 2112 undef $fh;
1919 aio_rename "$meta~", $meta; 2113 aio_rename "$meta~", $meta;
1928 2122
1929 return unless $self->type == cf::PLAYER; 2123 return unless $self->type == cf::PLAYER;
1930 2124
1931 if ($exit->slaying eq "/!") { 2125 if ($exit->slaying eq "/!") {
1932 #TODO: this should de-fi-ni-te-ly not be a sync-job 2126 #TODO: this should de-fi-ni-te-ly not be a sync-job
2127 # the problem is that $exit might not survive long enough
2128 # so it needs to be done right now, right here
1933 cf::sync_job { prepare_random_map $exit }; 2129 cf::sync_job { prepare_random_map $exit };
1934 } 2130 }
1935 2131
1936 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2132 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1937 my $hp = $exit->stats->hp; 2133 my $hp = $exit->stats->hp;
1945 $self->goto ($slaying, $hp, $sp); 2141 $self->goto ($slaying, $hp, $sp);
1946 2142
1947 1; 2143 1;
1948 }) { 2144 }) {
1949 $self->message ("Something went wrong deep within the crossfire server. " 2145 $self->message ("Something went wrong deep within the crossfire server. "
1950 . "I'll try to bring you back to the map you were before. " 2146 . "I'll try to bring you back to the map you were before. "
1951 . "Please report this to the dungeon master!", 2147 . "Please report this to the dungeon master!",
1952 cf::NDI_UNIQUE | cf::NDI_RED); 2148 cf::NDI_UNIQUE | cf::NDI_RED);
1953 2149
1954 warn "ERROR in enter_exit: $@"; 2150 warn "ERROR in enter_exit: $@";
1955 $self->leave_link; 2151 $self->leave_link;
1956 } 2152 }
1957 })->prio (1); 2153 })->prio (1);
1970 2166
1971sub cf::client::send_drawinfo { 2167sub cf::client::send_drawinfo {
1972 my ($self, $text, $flags) = @_; 2168 my ($self, $text, $flags) = @_;
1973 2169
1974 utf8::encode $text; 2170 utf8::encode $text;
1975 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2171 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1976} 2172}
1977 2173
2174=item $client->ext_event ($type, %msg)
2175
2176Sends an exti event to the client.
2177
2178=cut
2179
2180sub cf::client::ext_event($$%) {
2181 my ($self, $type, %msg) = @_;
2182
2183 $msg{msgtype} = "event_$type";
2184 $self->send_packet ("ext " . cf::to_json \%msg);
2185}
1978 2186
1979=item $success = $client->query ($flags, "text", \&cb) 2187=item $success = $client->query ($flags, "text", \&cb)
1980 2188
1981Queues a query to the client, calling the given callback with 2189Queues a query to the client, calling the given callback with
1982the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2190the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2079 2287
2080# here we export the classes and methods available to script code 2288# here we export the classes and methods available to script code
2081 2289
2082=pod 2290=pod
2083 2291
2084The following fucntions and emthods are available within a safe environment: 2292The following functions and methods are available within a safe environment:
2085 2293
2086 cf::object contr pay_amount pay_player map 2294 cf::object contr pay_amount pay_player map
2087 cf::object::player player 2295 cf::object::player player
2088 cf::player peaceful 2296 cf::player peaceful
2089 cf::map trigger 2297 cf::map trigger
2174############################################################################# 2382#############################################################################
2175 2383
2176=head2 EXTENSION DATABASE SUPPORT 2384=head2 EXTENSION DATABASE SUPPORT
2177 2385
2178Crossfire maintains a very simple database for extension use. It can 2386Crossfire maintains a very simple database for extension use. It can
2179currently store anything that can be serialised using Storable, which 2387currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2180excludes objects. 2388convert to/from binary).
2181 2389
2182The 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
2183using it, it should be unique. 2391using it, it should be unique.
2184 2392
2185=over 4 2393=over 4
2208 BDB::CREATE | BDB::AUTO_COMMIT, 0666; 2416 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2209 cf::cleanup "db_open(db): $!" if $!; 2417 cf::cleanup "db_open(db): $!" if $!;
2210 }; 2418 };
2211 cf::cleanup "db_open(db): $@" if $@; 2419 cf::cleanup "db_open(db): $@" if $@;
2212 }; 2420 };
2213
2214 my $path = cf::localdir . "/database.pst";
2215 if (stat $path) {
2216 cf::sync_job {
2217 my $pst = Storable::retrieve $path;
2218
2219 cf::db_put (board => data => $pst->{board});
2220 cf::db_put (guildrules => data => $pst->{guildrules});
2221 cf::db_put (rent => balance => $pst->{rent}{balance});
2222 BDB::db_env_txn_checkpoint $DB_ENV;
2223
2224 unlink $path;
2225 };
2226 }
2227 } 2421 }
2228} 2422}
2229 2423
2230sub db_get($$) { 2424sub db_get($$) {
2231 my $key = "$_[0]/$_[1]"; 2425 my $key = "$_[0]/$_[1]";
2232 2426
2233 cf::sync_job { 2427 cf::sync_job {
2234 BDB::db_get $DB, undef, $key, my $data; 2428 BDB::db_get $DB, undef, $key, my $data;
2235 2429
2236 $! ? () 2430 $! ? ()
2237 : Compress::LZF::sthaw $data 2431 : $data
2238 } 2432 }
2239} 2433}
2240 2434
2241sub db_put($$$) { 2435sub db_put($$$) {
2242 BDB::dbreq_pri 4; 2436 BDB::dbreq_pri 4;
2243 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 }
2244} 2552}
2245 2553
2246############################################################################# 2554#############################################################################
2247# the server's init and main functions 2555# the server's init and main functions
2248 2556
2249sub init_resources { 2557sub load_facedata($) {
2250 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2558 my ($path) = @_;
2559
2560 warn "loading facedata from $path\n";
2561
2562 my $facedata;
2563 0 < aio_load $path, $facedata
2564 or die "$path: $!";
2565
2566 $facedata = Coro::Storable::thaw $facedata;
2567
2568 $facedata->{version} == 2
2569 or cf::cleanup "$path: version mismatch, cannot proceed.";
2570
2571 {
2572 my $faces = $facedata->{faceinfo};
2573
2574 while (my ($face, $info) = each %$faces) {
2575 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2576 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2577 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2578 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2579 Coro::cede;
2580 }
2581
2582 while (my ($face, $info) = each %$faces) {
2583 next unless $info->{smooth};
2584 my $idx = cf::face::find $face
2585 or next;
2586 if (my $smooth = cf::face::find $info->{smooth}) {
2587 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2588 } else {
2589 warn "smooth face '$info->{smooth}' not found for face '$face'";
2590 }
2591 Coro::cede;
2592 }
2593 }
2594
2595 {
2596 my $anims = $facedata->{animinfo};
2597
2598 while (my ($anim, $info) = each %$anims) {
2599 cf::anim::set $anim, $info->{frames}, $info->{facings};
2600 Coro::cede;
2601 }
2602
2603 cf::anim::invalidate_all; # d'oh
2604 }
2605
2606 1
2607}
2608
2609sub reload_regions {
2610 load_resource_file "$MAPDIR/regions"
2251 or die "unable to load regions file\n";#d# 2611 or die "unable to load regions file\n";
2612}
2613
2614sub reload_facedata {
2615 load_facedata "$DATADIR/facedata"
2616 or die "unable to load facedata\n";
2617}
2618
2619sub reload_archetypes {
2620 load_resource_file "$DATADIR/archetypes"
2621 or die "unable to load archetypes\n";
2622}
2623
2624sub reload_treasures {
2625 load_resource_file "$DATADIR/treasures"
2626 or die "unable to load treasurelists\n";
2627}
2628
2629sub reload_resources {
2630 warn "reloading resource files...\n";
2631
2632 reload_regions;
2633 reload_facedata;
2634 #reload_archetypes;#d#
2635 reload_archetypes;
2636 reload_treasures;
2637
2638 warn "finished reloading resource files\n";
2639}
2640
2641sub init {
2642 reload_resources;
2252} 2643}
2253 2644
2254sub cfg_load { 2645sub cfg_load {
2255 open my $fh, "<:utf8", cf::confdir . "/config" 2646 open my $fh, "<:utf8", "$CONFDIR/config"
2256 or return; 2647 or return;
2257 2648
2258 local $/; 2649 local $/;
2259 *CFG = YAML::Syck::Load <$fh>; 2650 *CFG = YAML::Syck::Load <$fh>;
2260 2651
2268 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2659 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2269 and die "WARNING: m(un)lockall failed: $!\n"; 2660 and die "WARNING: m(un)lockall failed: $!\n";
2270 }; 2661 };
2271 warn $@ if $@; 2662 warn $@ if $@;
2272 } 2663 }
2273}
2274
2275sub init {
2276 init_resources;
2277} 2664}
2278 2665
2279sub main { 2666sub main {
2280 # we must not ever block the main coroutine 2667 # we must not ever block the main coroutine
2281 local $Coro::idle = sub { 2668 local $Coro::idle = sub {
2349 2736
2350 warn Carp::longmess "post_cleanup backtrace" 2737 warn Carp::longmess "post_cleanup backtrace"
2351 if $make_core; 2738 if $make_core;
2352} 2739}
2353 2740
2354sub reload() { 2741sub do_reload_perl() {
2355 # can/must only be called in main 2742 # can/must only be called in main
2356 if ($Coro::current != $Coro::main) { 2743 if ($Coro::current != $Coro::main) {
2357 warn "can only reload from main coroutine"; 2744 warn "can only reload from main coroutine";
2358 return; 2745 return;
2359 } 2746 }
2384 Coro::cede; 2771 Coro::cede;
2385 last unless IO::AIO::nreqs || BDB::nreqs; 2772 last unless IO::AIO::nreqs || BDB::nreqs;
2386 warn "iterate..."; 2773 warn "iterate...";
2387 } 2774 }
2388 2775
2776 ++$RELOAD;
2777
2389 warn "cancelling all extension coros"; 2778 warn "cancelling all extension coros";
2390 $_->cancel for values %EXT_CORO; 2779 $_->cancel for values %EXT_CORO;
2391 %EXT_CORO = (); 2780 %EXT_CORO = ();
2392 2781
2393 warn "removing commands"; 2782 warn "removing commands";
2432 Symbol::delete_package "safe::$_" 2821 Symbol::delete_package "safe::$_"
2433 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);
2434 2823
2435 warn "unloading cf.pm \"a bit\""; 2824 warn "unloading cf.pm \"a bit\"";
2436 delete $INC{"cf.pm"}; 2825 delete $INC{"cf.pm"};
2826 delete $INC{"cf/pod.pm"};
2437 2827
2438 # don't, removes xs symbols, too, 2828 # don't, removes xs symbols, too,
2439 # and global variables created in xs 2829 # and global variables created in xs
2440 #Symbol::delete_package __PACKAGE__; 2830 #Symbol::delete_package __PACKAGE__;
2441 2831
2450 2840
2451 warn "loading extensions"; 2841 warn "loading extensions";
2452 cf::load_extensions; 2842 cf::load_extensions;
2453 2843
2454 warn "reattaching attachments to objects/players"; 2844 warn "reattaching attachments to objects/players";
2455 _global_reattach; 2845 _global_reattach; # objects, sockets
2456 warn "reattaching attachments to maps"; 2846 warn "reattaching attachments to maps";
2457 reattach $_ for values %MAP; 2847 reattach $_ for values %MAP;
2458 2848 warn "reattaching attachments to players";
2459 warn "loading reloadable resources"; 2849 reattach $_ for values %PLAYER;
2460 init_resources;
2461 2850
2462 warn "leaving sync_job"; 2851 warn "leaving sync_job";
2463 2852
2464 1 2853 1
2465 } or do { 2854 } or do {
2471 warn "reloaded"; 2860 warn "reloaded";
2472}; 2861};
2473 2862
2474our $RELOAD_WATCHER; # used only during reload 2863our $RELOAD_WATCHER; # used only during reload
2475 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
2476register_command "reload" => sub { 2880register_command "reload" => sub {
2477 my ($who, $arg) = @_; 2881 my ($who, $arg) = @_;
2478 2882
2479 if ($who->flag (FLAG_WIZ)) { 2883 if ($who->flag (FLAG_WIZ)) {
2480 $who->message ("reloading server."); 2884 $who->message ("reloading server.");
2481 2885 async { reload_perl };
2482 # doing reload synchronously and two reloads happen back-to-back,
2483 # coro crashes during coro_state_free->destroy here.
2484
2485 $RELOAD_WATCHER ||= Event->timer (
2486 reentrant => 0,
2487 after => 0,
2488 data => WF_AUTOCANCEL,
2489 cb => sub {
2490 reload;
2491 undef $RELOAD_WATCHER;
2492 },
2493 );
2494 } 2886 }
2495}; 2887};
2496 2888
2497unshift @INC, $LIBDIR; 2889unshift @INC, $LIBDIR;
2498 2890
2499my $bug_warning = 0; 2891my $bug_warning = 0;
2500 2892
2893our @WAIT_FOR_TICK;
2894our @WAIT_FOR_TICK_BEGIN;
2895
2896sub wait_for_tick {
2897 return unless $TICK_WATCHER->is_active;
2898 return if $Coro::current == $Coro::main;
2899
2900 my $signal = new Coro::Signal;
2901 push @WAIT_FOR_TICK, $signal;
2902 $signal->wait;
2903}
2904
2905sub wait_for_tick_begin {
2906 return unless $TICK_WATCHER->is_active;
2907 return if $Coro::current == $Coro::main;
2908
2909 my $signal = new Coro::Signal;
2910 push @WAIT_FOR_TICK_BEGIN, $signal;
2911 $signal->wait;
2912}
2913
2914 my $min = 1e6;#d#
2915 my $avg = 10;
2501$TICK_WATCHER = Event->timer ( 2916$TICK_WATCHER = Event->timer (
2502 reentrant => 0, 2917 reentrant => 0,
2503 parked => 1, 2918 parked => 1,
2504 prio => 0, 2919 prio => 0,
2505 at => $NEXT_TICK || $TICK, 2920 at => $NEXT_TICK || $TICK,
2509 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"
2510 unless ++$bug_warning > 10; 2925 unless ++$bug_warning > 10;
2511 return; 2926 return;
2512 } 2927 }
2513 2928
2514 $NOW = Event::time; 2929 $NOW = $tick_start = Event::time;
2515 2930
2516 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
2517 $RUNTIME += $TICK; 2956 $RUNTIME += $TICK;
2518 $NEXT_TICK += $TICK; 2957 $NEXT_TICK += $TICK;
2519 2958
2520 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2959 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2521 $NEXT_RUNTIME_WRITE = $NOW + 10; 2960 $NEXT_RUNTIME_WRITE = $NOW + 10;
2523 write_runtime 2962 write_runtime
2524 or warn "ERROR: unable to write runtime file: $!"; 2963 or warn "ERROR: unable to write runtime file: $!";
2525 }; 2964 };
2526 } 2965 }
2527 2966
2528 $WAIT_FOR_TICK->broadcast;
2529 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2530
2531# my $AFTER = Event::time; 2967# my $AFTER = Event::time;
2532# warn $AFTER - $NOW;#d# 2968# warn $AFTER - $NOW;#d#
2533 2969
2970 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2971 $sig->send;
2972 }
2973 while (my $sig = shift @WAIT_FOR_TICK) {
2974 $sig->send;
2975 }
2976
2977 $NOW = Event::time;
2978
2534 # 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
2535 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2980 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2536 2981
2537 $TICK_WATCHER->at ($NEXT_TICK); 2982 $TICK_WATCHER->at ($NEXT_TICK);
2538 $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
2539 }, 2991 },
2540); 2992);
2541 2993
2542{ 2994{
2543 BDB::max_poll_time $TICK * 0.1; 2995 BDB::max_poll_time $TICK * 0.1;
2571 3023
2572 cf::sync_job { 3024 cf::sync_job {
2573 eval { 3025 eval {
2574 BDB::db_env_open 3026 BDB::db_env_open
2575 $DB_ENV, 3027 $DB_ENV,
2576 $BDB_ENV_DIR, 3028 $BDBDIR,
2577 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
2578 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3030 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2579 0666; 3031 0666;
2580 3032
2581 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3033 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2582 3034
2583 $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);
2584 $DB_ENV->set_lk_detect; 3036 $DB_ENV->set_lk_detect;
2585 }; 3037 };
2586 3038
2602 prio => 6, 3054 prio => 6,
2603 cb => \&IO::AIO::poll_cb, 3055 cb => \&IO::AIO::poll_cb,
2604 ); 3056 );
2605} 3057}
2606 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
2607END { cf::emergency_save } 3100END { cf::emergency_save }
2608 3101
26091 31021
2610 3103

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines