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.229 by root, Sun Apr 1 00:36:34 2007 UTC vs.
Revision 1.276 by root, Sun Jun 10 04:05:47 2007 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket;
8use Storable; 9use Storable;
9use Event; 10use Event;
10use Opcode; 11use Opcode;
11use Safe; 12use Safe;
12use Safe::Hole; 13use Safe::Hole;
13 14
14use Coro 3.52 (); 15use Coro 3.61 ();
15use Coro::State; 16use Coro::State;
17use Coro::Handle;
16use Coro::Event; 18use Coro::Event;
17use Coro::Timer; 19use Coro::Timer;
18use Coro::Signal; 20use Coro::Signal;
19use Coro::Semaphore; 21use Coro::Semaphore;
20use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable;
21 24
22use BDB (); 25use BDB ();
23use Data::Dumper; 26use Data::Dumper;
24use Digest::MD5; 27use Digest::MD5;
25use Fcntl; 28use Fcntl;
… …
28use Time::HiRes; 31use Time::HiRes;
29use Compress::LZF; 32use Compress::LZF;
30 33
31# configure various modules to our taste 34# configure various modules to our taste
32# 35#
36$Storable::canonical = 1; # reduce rsync transfers
33Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
34Compress::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
35 39
36$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
37 41
… …
50our %EXT_CORO = (); # coroutines bound to extensions 54our %EXT_CORO = (); # coroutines bound to extensions
51our %EXT_MAP = (); # pluggable maps 55our %EXT_MAP = (); # pluggable maps
52 56
53our $RELOAD; # number of reloads so far 57our $RELOAD; # number of reloads so far
54our @EVENT; 58our @EVENT;
55our $LIBDIR = datadir . "/ext";
56 59
57our $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(!)
58our $TICK_WATCHER; 73our $TICK_WATCHER;
59our $AIO_POLL_WATCHER; 74our $AIO_POLL_WATCHER;
60our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
61our $NEXT_TICK; 76our $NEXT_TICK;
62our $NOW; 77our $NOW;
… …
71our $RUNTIME; 86our $RUNTIME;
72 87
73our %PLAYER; # all users 88our %PLAYER; # all users
74our %MAP; # all maps 89our %MAP; # all maps
75our $LINK_MAP; # the special {link} map, which is always available 90our $LINK_MAP; # the special {link} map, which is always available
76our $RANDOM_MAPS = cf::localdir . "/random";
77our $BDB_ENV_DIR = cf::localdir . "/db";
78
79our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
80our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
81 91
82# 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 ∕
83our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
84 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
85binmode STDOUT; 99binmode STDOUT;
86binmode STDERR; 100binmode STDERR;
87 101
88# read virtual server time, if available 102# read virtual server time, if available
89unless ($RUNTIME || !-e cf::localdir . "/runtime") { 103unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
90 open my $fh, "<", cf::localdir . "/runtime" 104 open my $fh, "<", "$LOCALDIR/runtime"
91 or die "unable to read runtime file: $!"; 105 or die "unable to read runtime file: $!";
92 $RUNTIME = <$fh> + 0.; 106 $RUNTIME = <$fh> + 0.;
93} 107}
94 108
95mkdir cf::localdir; 109mkdir $_
96mkdir cf::localdir . "/" . cf::playerdir; 110 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
97mkdir cf::localdir . "/" . cf::tmpdir;
98mkdir cf::localdir . "/" . cf::uniquedir;
99mkdir $RANDOM_MAPS;
100mkdir $BDB_ENV_DIR;
101 111
102our $EMERGENCY_POSITION; 112our $EMERGENCY_POSITION;
103 113
104sub cf::map::normalise; 114sub cf::map::normalise;
105 115
… …
116=item $cf::RUNTIME 126=item $cf::RUNTIME
117 127
118The 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
119every server tick. 129every server tick.
120 130
121=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
122 134
123The perl library directory, where extensions and cf-specific modules can 135Various directories - "/etc", read-only install directory, perl-library
124be 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.
125 139
126=item $cf::NOW 140=item $cf::NOW
127 141
128The time of the last (current) server tick. 142The time of the last (current) server tick.
129 143
130=item $cf::TICK 144=item $cf::TICK
131 145
132The 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.
133 157
134=item %cf::CFG 158=item %cf::CFG
135 159
136Configuration for the server, loaded from C</etc/crossfire/config>, or 160Configuration for the server, loaded from C</etc/crossfire/config>, or
137from wherever your confdir points to. 161from wherever your confdir points to.
138 162
139=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 163=item cf::wait_for_tick, cf::wait_for_tick_begin
140 164
141These 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
142or 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
143processing 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.
144window of cpu time available, or simply to synchronise to the server tick.
145 168
146=back 169=back
147 170
148=cut 171=cut
149 172
150BEGIN { 173BEGIN {
151 *CORE::GLOBAL::warn = sub { 174 *CORE::GLOBAL::warn = sub {
152 my $msg = join "", @_; 175 my $msg = join "", @_;
153 utf8::encode $msg;
154 176
155 $msg .= "\n" 177 $msg .= "\n"
156 unless $msg =~ /\n$/; 178 unless $msg =~ /\n$/;
157 179
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181
182 utf8::encode $msg;
158 LOG llevError, $msg; 183 LOG llevError, $msg;
159 }; 184 };
160} 185}
161 186
162@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
163@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
164@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
165@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
166@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';
167@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)
168 194
169# 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
170# within the Safe compartment. 196# within the Safe compartment.
171for my $pkg (qw( 197for my $pkg (qw(
172 cf::global cf::attachable 198 cf::global cf::attachable
… …
232returned. 258returned.
233 259
234Lock 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
235uses map_find and cf::map::load uses map_load). 261uses map_find and cf::map::load uses map_load).
236 262
263=item $locked = cf::lock_active $string
264
265Return true if the lock is currently active, i.e. somebody has locked it.
266
237=cut 267=cut
238 268
239our %LOCK; 269our %LOCK;
240 270
241sub lock_wait($) { 271sub lock_wait($) {
… …
258 288
259 Coro::guard { 289 Coro::guard {
260 # wake up all waiters, to be on the safe side 290 # wake up all waiters, to be on the safe side
261 $_->ready for @{ delete $LOCK{$key} }; 291 $_->ready for @{ delete $LOCK{$key} };
262 } 292 }
293}
294
295sub lock_active($) {
296 my ($key) = @_;
297
298 ! ! $LOCK{$key}
263} 299}
264 300
265sub freeze_mainloop { 301sub freeze_mainloop {
266 return unless $TICK_WATCHER->is_active; 302 return unless $TICK_WATCHER->is_active;
267 303
… …
297 333
298sub sync_job(&) { 334sub sync_job(&) {
299 my ($job) = @_; 335 my ($job) = @_;
300 336
301 if ($Coro::current == $Coro::main) { 337 if ($Coro::current == $Coro::main) {
338 my $time = Event::time;
339
302 # this is the main coro, too bad, we have to block 340 # this is the main coro, too bad, we have to block
303 # till the operation succeeds, freezing the server :/ 341 # till the operation succeeds, freezing the server :/
304 342
305 # TODO: use suspend/resume instead 343 # TODO: use suspend/resume instead
306 # (but this is cancel-safe) 344 # (but this is cancel-safe)
… …
317 355
318 while ($busy) { 356 while ($busy) {
319 Coro::cede or Event::one_event; 357 Coro::cede or Event::one_event;
320 } 358 }
321 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
322 wantarray ? @res : $res[0] 367 wantarray ? @res : $res[0]
323 } else { 368 } else {
324 # we are in another coroutine, how wonderful, everything just works 369 # we are in another coroutine, how wonderful, everything just works
325 370
326 $job->() 371 $job->()
… …
346 391
347 $coro 392 $coro
348} 393}
349 394
350sub 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
351 my $guard = cf::lock_acquire "write_runtime"; 403 my $guard = cf::lock_acquire "write_runtime";
352
353 my $runtime = cf::localdir . "/runtime";
354 404
355 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
356 or return; 406 or return;
357 407
358 my $value = $cf::RUNTIME + 90 + 10; 408 my $value = $cf::RUNTIME + 90 + 10;
… …
364 414
365 # always fsync - this file is important 415 # always fsync - this file is important
366 aio_fsync $fh 416 aio_fsync $fh
367 and return; 417 and return;
368 418
419 # touch it again to show we are up-to-date
420 aio_utime $fh, undef, undef;
421
369 close $fh 422 close $fh
370 or return; 423 or return;
371 424
372 aio_rename "$runtime~", $runtime 425 aio_rename "$runtime~", $runtime
373 and return; 426 and return;
374 427
428 warn "runtime file written.\n";
429
375 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 });
376} 442}
377 443
378=back 444=back
379 445
380=cut 446=cut
… …
560 $registry = $CB_TYPE[$object_type] ||= []; 626 $registry = $CB_TYPE[$object_type] ||= [];
561 627
562 } elsif ($type eq "subtype") { 628 } elsif ($type eq "subtype") {
563 defined $object_type or Carp::croak "subtype specified without type"; 629 defined $object_type or Carp::croak "subtype specified without type";
564 my $object_subtype = shift @arg; 630 my $object_subtype = shift @arg;
565 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 631 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
566 632
567 } elsif ($type eq "package") { 633 } elsif ($type eq "package") {
568 my $pkg = shift @arg; 634 my $pkg = shift @arg;
569 635
570 while (my ($name, $id) = each %cb_id) { 636 while (my ($name, $id) = each %cb_id) {
… …
611 if (ref $_[0]) { 677 if (ref $_[0]) {
612 _object_attach @_; 678 _object_attach @_;
613 } else { 679 } else {
614 _attach shift->_attach_registry, @_; 680 _attach shift->_attach_registry, @_;
615 } 681 }
682 _recalc_want;
616}; 683};
617 684
618# all those should be optimised 685# all those should be optimised
619sub cf::attachable::detach { 686sub cf::attachable::detach {
620 my ($obj, $name) = @_; 687 my ($obj, $name) = @_;
… …
623 delete $obj->{_attachment}{$name}; 690 delete $obj->{_attachment}{$name};
624 reattach ($obj); 691 reattach ($obj);
625 } else { 692 } else {
626 Carp::croak "cannot, currently, detach class attachments"; 693 Carp::croak "cannot, currently, detach class attachments";
627 } 694 }
695 _recalc_want;
628}; 696};
629 697
630sub cf::attachable::attached { 698sub cf::attachable::attached {
631 my ($obj, $name) = @_; 699 my ($obj, $name) = @_;
632 700
… …
805 or return; 873 or return;
806 $av = eval { (Storable::thaw $av)->{objs} }; 874 $av = eval { (Storable::thaw $av)->{objs} };
807 } 875 }
808 876
809 warn sprintf "loading %s (%d)\n", 877 warn sprintf "loading %s (%d)\n",
810 $filename, length $data, scalar @{$av || []};#d# 878 $filename, length $data, scalar @{$av || []};
811 return ($data, $av); 879 return ($data, $av);
812} 880}
813 881
814############################################################################# 882#############################################################################
815# command handling &c 883# command handling &c
… …
942Returns the given player object, loading it if necessary (might block). 1010Returns the given player object, loading it if necessary (might block).
943 1011
944=cut 1012=cut
945 1013
946sub playerdir($) { 1014sub playerdir($) {
947 cf::localdir 1015 "$PLAYERDIR/"
948 . "/"
949 . cf::playerdir
950 . "/"
951 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1016 . (ref $_[0] ? $_[0]->ob->name : $_[0])
952} 1017}
953 1018
954sub path($) { 1019sub path($) {
955 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1020 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
956 1021
957 (playerdir $login) . "/$login.pl" 1022 (playerdir $login) . "/playerdata"
958} 1023}
959 1024
960sub find_active($) { 1025sub find_active($) {
961 $cf::PLAYER{$_[0]} 1026 $cf::PLAYER{$_[0]}
962 and $cf::PLAYER{$_[0]}->active 1027 and $cf::PLAYER{$_[0]}->active
… …
975 my $login = $_[0]; 1040 my $login = $_[0];
976 1041
977 my $guard = cf::lock_acquire "user_find:$login"; 1042 my $guard = cf::lock_acquire "user_find:$login";
978 1043
979 $cf::PLAYER{$_[0]} || do { 1044 $cf::PLAYER{$_[0]} || do {
1045 # rename old playerfiles to new ones
1046 #TODO: remove when no longer required
1047 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1048 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1049 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1050 aio_unlink +(playerdir $login) . "/$login.pl";
1051
980 my $pl = load_pl path $login 1052 my $pl = load_pl path $login
981 or return; 1053 or return;
982 $cf::PLAYER{$login} = $pl 1054 $cf::PLAYER{$login} = $pl
983 } 1055 }
984 } 1056 }
… …
1068while and may block, so not sync_job-capable, ever. 1140while and may block, so not sync_job-capable, ever.
1069 1141
1070=cut 1142=cut
1071 1143
1072sub list_logins { 1144sub list_logins {
1073 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1145 my $dirs = aio_readdir $PLAYERDIR
1074 or return []; 1146 or return [];
1075 1147
1076 my @logins; 1148 my @logins;
1077 1149
1078 for my $login (@$dirs) { 1150 for my $login (@$dirs) {
… …
1113 } 1185 }
1114 1186
1115 \@paths 1187 \@paths
1116} 1188}
1117 1189
1118=item $player->ext_reply ($msgid, $msgtype, %msg) 1190=item $player->ext_reply ($msgid, %msg)
1119 1191
1120Sends an ext reply to the player. 1192Sends an ext reply to the player.
1121 1193
1122=cut 1194=cut
1123 1195
1124sub ext_reply($$$%) { 1196sub ext_reply($$%) {
1125 my ($self, $id, %msg) = @_; 1197 my ($self, $id, %msg) = @_;
1126 1198
1127 $msg{msgid} = $id; 1199 $msg{msgid} = $id;
1128 1200
1129 $self->send ("ext " . cf::to_json \%msg); 1201 $self->send ("ext " . cf::to_json \%msg);
1130} 1202}
1131 1203
1132package cf; 1204=item $player->ext_event ($type, %msg)
1205
1206Sends an ext event to the client.
1207
1208=cut
1209
1210sub ext_event($$%) {
1211 my ($self, $type, %msg) = @_;
1212
1213 $self->ns->ext_event ($type, %msg);
1214}
1215
1216=head3 cf::region
1217
1218=over 4
1219
1220=cut
1221
1222package cf::region;
1223
1224=item cf::region::find_by_path $path
1225
1226Tries to decuce the probable region for a map knowing only its path.
1227
1228=cut
1229
1230sub find_by_path($) {
1231 my ($path) = @_;
1232
1233 my ($match, $specificity);
1234
1235 for my $region (list) {
1236 if ($region->match && $path =~ $region->match) {
1237 ($match, $specificity) = ($region, $region->specificity)
1238 if $region->specificity > $specificity;
1239 }
1240 }
1241
1242 $match
1243}
1133 1244
1134=back 1245=back
1135
1136 1246
1137=head3 cf::map 1247=head3 cf::map
1138 1248
1139=over 4 1249=over 4
1140 1250
… …
1195 my ($self, $merge) = @_; 1305 my ($self, $merge) = @_;
1196 1306
1197 # we have to keep some variables in memory intact 1307 # we have to keep some variables in memory intact
1198 local $self->{path}; 1308 local $self->{path};
1199 local $self->{load_path}; 1309 local $self->{load_path};
1200 local $self->{deny_save};
1201 local $self->{deny_reset};
1202 1310
1203 $self->SUPER::thawer_merge ($merge); 1311 $self->SUPER::thawer_merge ($merge);
1204} 1312}
1205 1313
1206sub normalise { 1314sub normalise {
… …
1278 1386
1279# the original (read-only) location 1387# the original (read-only) location
1280sub load_path { 1388sub load_path {
1281 my ($self) = @_; 1389 my ($self) = @_;
1282 1390
1283 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1391 "$MAPDIR/$self->{path}.map"
1284} 1392}
1285 1393
1286# the temporary/swap location 1394# the temporary/swap location
1287sub save_path { 1395sub save_path {
1288 my ($self) = @_; 1396 my ($self) = @_;
1289 1397
1290 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1398 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1291 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1399 "$TMPDIR/$path.map"
1292} 1400}
1293 1401
1294# the unique path, undef == no special unique path 1402# the unique path, undef == no special unique path
1295sub uniq_path { 1403sub uniq_path {
1296 my ($self) = @_; 1404 my ($self) = @_;
1297 1405
1298 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1406 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1299 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1407 "$UNIQUEDIR/$path"
1300} 1408}
1301 1409
1302# and all this just because we cannot iterate over 1410# and all this just because we cannot iterate over
1303# all maps in C++... 1411# all maps in C++...
1304sub change_all_map_light { 1412sub change_all_map_light {
1305 my ($change) = @_; 1413 my ($change) = @_;
1306 1414
1307 $_->change_map_light ($change) 1415 $_->change_map_light ($change)
1308 for grep $_->outdoor, values %cf::MAP; 1416 for grep $_->outdoor, values %cf::MAP;
1417}
1418
1419sub decay_objects {
1420 my ($self) = @_;
1421
1422 return if $self->{deny_reset};
1423
1424 $self->do_decay_objects;
1309} 1425}
1310 1426
1311sub unlink_save { 1427sub unlink_save {
1312 my ($self) = @_; 1428 my ($self) = @_;
1313 1429
… …
1371 $self->load_header_orig 1487 $self->load_header_orig
1372 or return; 1488 or return;
1373 $self->prepare_orig; 1489 $self->prepare_orig;
1374 } 1490 }
1375 1491
1492 $self->{deny_reset} = 1
1493 if $self->no_reset;
1494
1495 $self->default_region (cf::region::find_by_path $self->{path})
1496 unless $self->default_region;
1497
1376 1 1498 1
1377} 1499}
1378 1500
1379sub find; 1501sub find;
1380sub find { 1502sub find {
… …
1392 $map->{last_save} = $cf::RUNTIME; 1514 $map->{last_save} = $cf::RUNTIME;
1393 1515
1394 $map->load_header 1516 $map->load_header
1395 or return; 1517 or return;
1396 1518
1397 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1519 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1398 # doing this can freeze the server in a sync job, obviously 1520 # doing this can freeze the server in a sync job, obviously
1399 #$cf::WAIT_FOR_TICK->wait; 1521 #$cf::WAIT_FOR_TICK->wait;
1400 $map->reset; 1522 $map->reset;
1401 undef $guard; 1523 undef $guard;
1402 return find $path; 1524 return find $path;
… …
1413 my ($self) = @_; 1535 my ($self) = @_;
1414 1536
1415 local $self->{deny_reset} = 1; # loading can take a long time 1537 local $self->{deny_reset} = 1; # loading can take a long time
1416 1538
1417 my $path = $self->{path}; 1539 my $path = $self->{path};
1540
1541 {
1418 my $guard = cf::lock_acquire "map_load:$path"; 1542 my $guard = cf::lock_acquire "map_load:$path";
1419 1543
1420 return if $self->in_memory != cf::MAP_SWAPPED; 1544 return if $self->in_memory != cf::MAP_SWAPPED;
1421 1545
1422 $self->in_memory (cf::MAP_LOADING); 1546 $self->in_memory (cf::MAP_LOADING);
1423 1547
1424 $self->alloc; 1548 $self->alloc;
1425 1549
1426 $self->pre_load; 1550 $self->pre_load;
1427
1428 $self->_load_objects ($self->{load_path}, 1)
1429 or return;
1430
1431 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1432 if delete $self->{load_original};
1433
1434 if (my $uniq = $self->uniq_path) {
1435 utf8::encode $uniq;
1436 if (aio_open $uniq, O_RDONLY, 0) {
1437 $self->clear_unique_items;
1438 $self->_load_objects ($uniq, 0);
1439 }
1440 }
1441
1442 Coro::cede;
1443
1444 # now do the right thing for maps
1445 $self->link_multipart_objects;
1446
1447 unless ($self->{deny_activate}) {
1448 $self->decay_objects;
1449 $self->fix_auto_apply;
1450 $self->update_buttons;
1451 Coro::cede; 1551 Coro::cede;
1452 $self->set_darkness_map; 1552
1553 $self->_load_objects ($self->{load_path}, 1)
1554 or return;
1555
1556 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1557 if delete $self->{load_original};
1558
1559 if (my $uniq = $self->uniq_path) {
1560 utf8::encode $uniq;
1561 if (aio_open $uniq, O_RDONLY, 0) {
1562 $self->clear_unique_items;
1563 $self->_load_objects ($uniq, 0);
1564 }
1565 }
1566
1567 Coro::cede;
1568 # now do the right thing for maps
1569 $self->link_multipart_objects;
1453 $self->difficulty ($self->estimate_difficulty) 1570 $self->difficulty ($self->estimate_difficulty)
1454 unless $self->difficulty; 1571 unless $self->difficulty;
1455 Coro::cede; 1572 Coro::cede;
1573
1574 unless ($self->{deny_activate}) {
1575 $self->decay_objects;
1576 $self->fix_auto_apply;
1577 $self->update_buttons;
1578 Coro::cede;
1579 $self->set_darkness_map;
1580 Coro::cede;
1456 $self->activate; 1581 $self->activate;
1582 }
1583
1584 $self->in_memory (cf::MAP_IN_MEMORY);
1457 } 1585 }
1458 1586
1459 $self->post_load; 1587 $self->post_load;
1460
1461 $self->in_memory (cf::MAP_IN_MEMORY);
1462} 1588}
1463 1589
1464sub customise_for { 1590sub customise_for {
1465 my ($self, $ob) = @_; 1591 my ($self, $ob) = @_;
1466 1592
1467 return find "~" . $ob->name . "/" . $self->{path} 1593 return find "~" . $ob->name . "/" . $self->{path}
1468 if $self->per_player; 1594 if $self->per_player;
1595
1596# return find "?party/" . $ob->name . "/" . $self->{path}
1597# if $self->per_party;
1469 1598
1470 $self 1599 $self
1471} 1600}
1472 1601
1473# find and load all maps in the 3x3 area around a map 1602# find and load all maps in the 3x3 area around a map
… …
1584 1713
1585sub reset_at { 1714sub reset_at {
1586 my ($self) = @_; 1715 my ($self) = @_;
1587 1716
1588 # TODO: safety, remove and allow resettable per-player maps 1717 # TODO: safety, remove and allow resettable per-player maps
1589 return 1e99 if $self->isa ("ext::map_per_player");#d#
1590 return 1e99 if $self->{deny_reset}; 1718 return 1e99 if $self->{deny_reset};
1591 1719
1592 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1720 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1593 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1721 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1594 1722
… …
1605 my ($self) = @_; 1733 my ($self) = @_;
1606 1734
1607 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1735 my $lock = cf::lock_acquire "map_data:$self->{path}";
1608 1736
1609 return if $self->players; 1737 return if $self->players;
1610 return if $self->isa ("ext::map_per_player");#d#
1611 1738
1612 warn "resetting map ", $self->path;#d# 1739 warn "resetting map ", $self->path;
1613 1740
1614 $self->in_memory (cf::MAP_SWAPPED); 1741 $self->in_memory (cf::MAP_SWAPPED);
1615 1742
1616 # need to save uniques path 1743 # need to save uniques path
1617 unless ($self->{deny_save}) { 1744 unless ($self->{deny_save}) {
… …
1649 $cf::MAP{$self->path} = $self; 1776 $cf::MAP{$self->path} = $self;
1650 1777
1651 $self->reset; # polite request, might not happen 1778 $self->reset; # polite request, might not happen
1652} 1779}
1653 1780
1781=item $maps = cf::map::tmp_maps
1782
1783Returns an arrayref with all map paths of currently instantiated and saved
1784maps.
1785
1786=cut
1787
1788sub tmp_maps() {
1789 [
1790 map {
1791 utf8::decode $_;
1792 !/\.(?:pst|meta)$/ && /^$PATH_SEP/o
1793 ? normalise $_
1794 : ()
1795 } @{ aio_readdir $TMPDIR or [] }
1796 ]
1797}
1798
1654=item cf::map::unique_maps 1799=item cf::map::unique_maps
1655 1800
1656Returns an arrayref of paths of all shared maps that have 1801Returns an arrayref of paths of all shared maps that have
1657instantiated unique items. May block. 1802instantiated unique items. May block.
1658 1803
1659=cut 1804=cut
1660 1805
1661sub unique_maps() { 1806sub unique_maps() {
1662 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 1807 [
1663 or return; 1808 map {
1664
1665 my @paths;
1666
1667 for (@$files) {
1668 utf8::decode $_; 1809 utf8::decode $_;
1669 next if /\.pst$/; 1810 !/\.(?:pst|meta)$/ && /^$PATH_SEP/o
1670 next unless /^$PATH_SEP/o; 1811 ? normalise $_
1671 1812 : ()
1672 push @paths, cf::map::normalise $_; 1813 } @{ aio_readdir $UNIQUEDIR or [] }
1673 } 1814 ]
1674
1675 \@paths
1676} 1815}
1677 1816
1678package cf; 1817package cf;
1679 1818
1680=back 1819=back
… …
1786 $self->deactivate_recursive; 1925 $self->deactivate_recursive;
1787 1926
1788 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1927 return if UNIVERSAL::isa $self->map, "ext::map_link";
1789 1928
1790 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1929 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1791 if $self->map; 1930 if $self->map && $self->map->{path} ne "{link}";
1792 1931
1793 $self->enter_map ($LINK_MAP || link_map, 10, 10); 1932 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1794} 1933}
1795 1934
1796sub cf::object::player::leave_link { 1935sub cf::object::player::leave_link {
1797 my ($self, $map, $x, $y) = @_; 1936 my ($self, $map, $x, $y) = @_;
1937
1938 return unless $self->contr->active;
1798 1939
1799 my $link_pos = delete $self->{_link_pos}; 1940 my $link_pos = delete $self->{_link_pos};
1800 1941
1801 unless ($map) { 1942 unless ($map) {
1802 # restore original map position 1943 # restore original map position
… …
1825 1966
1826 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 1967 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1827 $self->enter_map ($map, $x, $y); 1968 $self->enter_map ($map, $x, $y);
1828} 1969}
1829 1970
1830cf::player->attach (
1831 on_logout => sub {
1832 my ($pl) = @_;
1833
1834 # abort map switching before logout
1835 if ($pl->ob->{_link_pos}) {
1836 cf::sync_job {
1837 $pl->ob->leave_link
1838 };
1839 }
1840 },
1841 on_login => sub {
1842 my ($pl) = @_;
1843
1844 # try to abort aborted map switching on player login :)
1845 # should happen only on crashes
1846 if ($pl->ob->{_link_pos}) {
1847 $pl->ob->enter_link;
1848 (async {
1849 $pl->ob->reply (undef,
1850 "There was an internal problem at your last logout, "
1851 . "the server will try to bring you to your intended destination in a second.",
1852 cf::NDI_RED);
1853 # we need this sleep as the login has a concurrent enter_exit running
1854 # and this sleep increases chances of the player not ending up in scorn
1855 Coro::Timer::sleep 1;
1856 $pl->ob->leave_link;
1857 })->prio (2);
1858 }
1859 },
1860);
1861
1862=item $player_object->goto ($path, $x, $y) 1971=item $player_object->goto ($path, $x, $y[, $check->($map)])
1863 1972
1973Moves the player to the given map-path and coordinates by first freezing
1974her, loading and preparing them map, calling the provided $check callback
1975that has to return the map if sucecssful, and then unfreezes the player on
1976the new (success) or old (failed) map position.
1977
1864=cut 1978=cut
1979
1980our $GOTOGEN;
1865 1981
1866sub cf::object::player::goto { 1982sub cf::object::player::goto {
1867 my ($self, $path, $x, $y) = @_; 1983 my ($self, $path, $x, $y, $check) = @_;
1984
1985 # do generation counting so two concurrent goto's will be executed in-order
1986 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1868 1987
1869 $self->enter_link; 1988 $self->enter_link;
1870 1989
1871 (async { 1990 (async {
1872 my $map = eval { 1991 my $map = eval {
1873 my $map = cf::map::find $path; 1992 my $map = cf::map::find $path;
1993
1994 if ($map) {
1874 $map = $map->customise_for ($self) if $map; 1995 $map = $map->customise_for ($self);
1996 $map = $check->($map) if $check && $map;
1997 } else {
1998 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1999 }
2000
1875 $map 2001 $map
2002 };
2003
2004 if ($@) {
2005 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2006 LOG llevError | logBacktrace, Carp::longmess $@;
1876 } or 2007 }
1877 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1878 2008
2009 if ($gen == $self->{_goto_generation}) {
2010 delete $self->{_goto_generation};
1879 $self->leave_link ($map, $x, $y); 2011 $self->leave_link ($map, $x, $y);
2012 }
1880 })->prio (1); 2013 })->prio (1);
1881} 2014}
1882 2015
1883=item $player_object->enter_exit ($exit_object) 2016=item $player_object->enter_exit ($exit_object)
1884 2017
… …
1923 2056
1924 $rmp->{random_seed} ||= $exit->random_seed; 2057 $rmp->{random_seed} ||= $exit->random_seed;
1925 2058
1926 my $data = cf::to_json $rmp; 2059 my $data = cf::to_json $rmp;
1927 my $md5 = Digest::MD5::md5_hex $data; 2060 my $md5 = Digest::MD5::md5_hex $data;
1928 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2061 my $meta = "$RANDOMDIR/$md5.meta";
1929 2062
1930 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2063 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1931 aio_write $fh, 0, (length $data), $data, 0; 2064 aio_write $fh, 0, (length $data), $data, 0;
1932 undef $fh; 2065 undef $fh;
1933 aio_rename "$meta~", $meta; 2066 aio_rename "$meta~", $meta;
… …
1942 2075
1943 return unless $self->type == cf::PLAYER; 2076 return unless $self->type == cf::PLAYER;
1944 2077
1945 if ($exit->slaying eq "/!") { 2078 if ($exit->slaying eq "/!") {
1946 #TODO: this should de-fi-ni-te-ly not be a sync-job 2079 #TODO: this should de-fi-ni-te-ly not be a sync-job
2080 # the problem is that $exit might not survive long enough
2081 # so it needs to be done right now, right here
1947 cf::sync_job { prepare_random_map $exit }; 2082 cf::sync_job { prepare_random_map $exit };
1948 } 2083 }
1949 2084
1950 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2085 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1951 my $hp = $exit->stats->hp; 2086 my $hp = $exit->stats->hp;
… …
1959 $self->goto ($slaying, $hp, $sp); 2094 $self->goto ($slaying, $hp, $sp);
1960 2095
1961 1; 2096 1;
1962 }) { 2097 }) {
1963 $self->message ("Something went wrong deep within the crossfire server. " 2098 $self->message ("Something went wrong deep within the crossfire server. "
1964 . "I'll try to bring you back to the map you were before. " 2099 . "I'll try to bring you back to the map you were before. "
1965 . "Please report this to the dungeon master!", 2100 . "Please report this to the dungeon master!",
1966 cf::NDI_UNIQUE | cf::NDI_RED); 2101 cf::NDI_UNIQUE | cf::NDI_RED);
1967 2102
1968 warn "ERROR in enter_exit: $@"; 2103 warn "ERROR in enter_exit: $@";
1969 $self->leave_link; 2104 $self->leave_link;
1970 } 2105 }
1971 })->prio (1); 2106 })->prio (1);
… …
1987 2122
1988 utf8::encode $text; 2123 utf8::encode $text;
1989 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2124 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1990} 2125}
1991 2126
2127=item $client->ext_event ($type, %msg)
2128
2129Sends an exti event to the client.
2130
2131=cut
2132
2133sub cf::client::ext_event($$%) {
2134 my ($self, $type, %msg) = @_;
2135
2136 $msg{msgtype} = "event_$type";
2137 $self->send_packet ("ext " . cf::to_json \%msg);
2138}
1992 2139
1993=item $success = $client->query ($flags, "text", \&cb) 2140=item $success = $client->query ($flags, "text", \&cb)
1994 2141
1995Queues a query to the client, calling the given callback with 2142Queues a query to the client, calling the given callback with
1996the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2143the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
… …
2188############################################################################# 2335#############################################################################
2189 2336
2190=head2 EXTENSION DATABASE SUPPORT 2337=head2 EXTENSION DATABASE SUPPORT
2191 2338
2192Crossfire maintains a very simple database for extension use. It can 2339Crossfire maintains a very simple database for extension use. It can
2193currently store anything that can be serialised using Storable, which 2340currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2194excludes objects. 2341convert to/from binary).
2195 2342
2196The parameter C<$family> should best start with the name of the extension 2343The parameter C<$family> should best start with the name of the extension
2197using it, it should be unique. 2344using it, it should be unique.
2198 2345
2199=over 4 2346=over 4
… …
2222 BDB::CREATE | BDB::AUTO_COMMIT, 0666; 2369 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2223 cf::cleanup "db_open(db): $!" if $!; 2370 cf::cleanup "db_open(db): $!" if $!;
2224 }; 2371 };
2225 cf::cleanup "db_open(db): $@" if $@; 2372 cf::cleanup "db_open(db): $@" if $@;
2226 }; 2373 };
2227
2228 my $path = cf::localdir . "/database.pst";
2229 if (stat $path) {
2230 cf::sync_job {
2231 my $pst = Storable::retrieve $path;
2232
2233 cf::db_put (board => data => $pst->{board});
2234 cf::db_put (guildrules => data => $pst->{guildrules});
2235 cf::db_put (rent => balance => $pst->{rent}{balance});
2236 BDB::db_env_txn_checkpoint $DB_ENV;
2237
2238 unlink $path;
2239 };
2240 }
2241 } 2374 }
2242} 2375}
2243 2376
2244sub db_get($$) { 2377sub db_get($$) {
2245 my $key = "$_[0]/$_[1]"; 2378 my $key = "$_[0]/$_[1]";
2246 2379
2247 cf::sync_job { 2380 cf::sync_job {
2248 BDB::db_get $DB, undef, $key, my $data; 2381 BDB::db_get $DB, undef, $key, my $data;
2249 2382
2250 $! ? () 2383 $! ? ()
2251 : Compress::LZF::sthaw $data 2384 : $data
2252 } 2385 }
2253} 2386}
2254 2387
2255sub db_put($$$) { 2388sub db_put($$$) {
2256 BDB::dbreq_pri 4; 2389 BDB::dbreq_pri 4;
2257 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { }; 2390 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2391}
2392
2393=item cf::cache $id => [$paths...], $processversion => $process
2394
2395Generic caching function that returns the value of the resource $id,
2396caching and regenerating as required.
2397
2398This function can block.
2399
2400=cut
2401
2402sub cache {
2403 my ($id, $src, $processversion, $process) = @_;
2404
2405 my $meta =
2406 join "\x00",
2407 $processversion,
2408 map {
2409 aio_stat $_
2410 and Carp::croak "$_: $!";
2411
2412 ($_, (stat _)[7,9])
2413 } @$src;
2414
2415 my $dbmeta = db_get cache => "$id/meta";
2416 if ($dbmeta ne $meta) {
2417 # changed, we may need to process
2418
2419 my @data;
2420 my $md5;
2421
2422 for (0 .. $#$src) {
2423 0 <= aio_load $src->[$_], $data[$_]
2424 or Carp::croak "$src->[$_]: $!";
2425 }
2426
2427 # if processing is expensive, check
2428 # checksum first
2429 if (1) {
2430 $md5 =
2431 join "\x00",
2432 $processversion,
2433 map {
2434 Coro::cede;
2435 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2436 } 0.. $#$src;
2437
2438
2439 my $dbmd5 = db_get cache => "$id/md5";
2440 if ($dbmd5 eq $md5) {
2441 db_put cache => "$id/meta", $meta;
2442
2443 return db_get cache => "$id/data";
2444 }
2445 }
2446
2447 my $t1 = Time::HiRes::time;
2448 my $data = $process->(\@data);
2449 my $t2 = Time::HiRes::time;
2450
2451 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2452
2453 db_put cache => "$id/data", $data;
2454 db_put cache => "$id/md5" , $md5;
2455 db_put cache => "$id/meta", $meta;
2456
2457 return $data;
2458 }
2459
2460 db_get cache => "$id/data"
2461}
2462
2463=item fork_call { }, $args
2464
2465Executes the given code block with the given arguments in a seperate
2466process, returning the results. Everything must be serialisable with
2467Coro::Storable. May, of course, block. Note that the executed sub may
2468never block itself or use any form of Event handling.
2469
2470=cut
2471
2472sub fork_call(&@) {
2473 my ($cb, @args) = @_;
2474
2475# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2476# or die "socketpair: $!";
2477 pipe my $fh1, my $fh2
2478 or die "pipe: $!";
2479
2480 if (my $pid = fork) {
2481 close $fh2;
2482
2483 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2484 $res = Coro::Storable::thaw $res;
2485
2486 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2487
2488 die $$res unless "ARRAY" eq ref $res;
2489
2490 return wantarray ? @$res : $res->[-1];
2491 } else {
2492 reset_signals;
2493 local $SIG{__WARN__};
2494 local $SIG{__DIE__};
2495 eval {
2496 close $fh1;
2497
2498 my @res = eval { $cb->(@args) };
2499 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2500 };
2501
2502 warn $@ if $@;
2503 _exit 0;
2504 }
2258} 2505}
2259 2506
2260############################################################################# 2507#############################################################################
2261# the server's init and main functions 2508# the server's init and main functions
2262 2509
2263sub load_facedata { 2510sub load_facedata($) {
2264 my $path = sprintf "%s/facedata", cf::datadir; 2511 my ($path) = @_;
2265 2512
2266 warn "loading facedata from $path\n"; 2513 warn "loading facedata from $path\n";
2267 2514
2268 my $faces; 2515 my $facedata;
2269 0 < aio_load $path, $faces 2516 0 < aio_load $path, $facedata
2270 or die "$path: $!"; 2517 or die "$path: $!";
2271 2518
2272 Coro::cede;
2273 $faces = Storable::thaw $faces; 2519 $facedata = Coro::Storable::thaw $facedata;
2274 Coro::cede;
2275 2520
2276 my $meta = delete $faces->{""};
2277 $meta->{version} == 1 2521 $facedata->{version} == 2
2278 or cf::cleanup "$path: version mismatch, cannot proceed."; 2522 or cf::cleanup "$path: version mismatch, cannot proceed.";
2279 2523
2524 {
2525 my $faces = $facedata->{faceinfo};
2526
2280 while (my ($face, $info) = each %$faces) { 2527 while (my ($face, $info) = each %$faces) {
2281 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2528 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2282 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2529 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2283 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2530 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2284 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2531 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2285 Coro::cede; 2532 Coro::cede;
2286 } 2533 }
2287 2534
2288 while (my ($face, $info) = each %$faces) { 2535 while (my ($face, $info) = each %$faces) {
2289 next unless $info->{smooth}; 2536 next unless $info->{smooth};
2290 my $idx = cf::face::find $face 2537 my $idx = cf::face::find $face
2291 or next; 2538 or next;
2292 if (my $smooth = cf::face::find $info->{smooth}) { 2539 if (my $smooth = cf::face::find $info->{smooth}) {
2293 cf::face::set_smooth $idx, $smooth; 2540 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2294 } else { 2541 } else {
2295 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2542 warn "smooth face '$info->{smooth}' not found for face '$face'";
2296 } 2543 }
2297 Coro::cede; 2544 Coro::cede;
2545 }
2546 }
2547
2548 {
2549 my $anims = $facedata->{animinfo};
2550
2551 while (my ($anim, $info) = each %$anims) {
2552 cf::anim::set $anim, $info->{frames}, $info->{facings};
2553 Coro::cede;
2554 }
2555
2556 cf::anim::invalidate_all; # d'oh
2298 } 2557 }
2299 2558
2300 1 2559 1
2301} 2560}
2302 2561
2562sub reload_regions {
2563 load_resource_file "$MAPDIR/regions"
2564 or die "unable to load regions file\n";
2565}
2566
2567sub reload_facedata {
2568 load_facedata "$DATADIR/facedata"
2569 or die "unable to load facedata\n";
2570}
2571
2572sub reload_archetypes {
2573 load_resource_file "$DATADIR/archetypes"
2574 or die "unable to load archetypes\n";
2575}
2576
2577sub reload_treasures {
2578 load_resource_file "$DATADIR/treasures"
2579 or die "unable to load treasurelists\n";
2580}
2581
2303sub reload_resources { 2582sub reload_resources {
2304 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2583 warn "reloading resource files...\n";
2305 or die "unable to load regions file\n";#d# 2584
2585 reload_regions;
2306 load_facedata 2586 reload_facedata;
2307 or die "unable to load facedata\n";#d# 2587 #reload_archetypes;#d#
2588 reload_archetypes;
2589 reload_treasures;
2590
2591 warn "finished reloading resource files\n";
2308} 2592}
2309 2593
2310sub init { 2594sub init {
2311 reload_resources; 2595 reload_resources;
2312} 2596}
2313 2597
2314sub cfg_load { 2598sub cfg_load {
2315 open my $fh, "<:utf8", cf::confdir . "/config" 2599 open my $fh, "<:utf8", "$CONFDIR/config"
2316 or return; 2600 or return;
2317 2601
2318 local $/; 2602 local $/;
2319 *CFG = YAML::Syck::Load <$fh>; 2603 *CFG = YAML::Syck::Load <$fh>;
2320 2604
… …
2405 2689
2406 warn Carp::longmess "post_cleanup backtrace" 2690 warn Carp::longmess "post_cleanup backtrace"
2407 if $make_core; 2691 if $make_core;
2408} 2692}
2409 2693
2410sub reload() { 2694sub do_reload_perl() {
2411 # can/must only be called in main 2695 # can/must only be called in main
2412 if ($Coro::current != $Coro::main) { 2696 if ($Coro::current != $Coro::main) {
2413 warn "can only reload from main coroutine"; 2697 warn "can only reload from main coroutine";
2414 return; 2698 return;
2415 } 2699 }
… …
2490 Symbol::delete_package "safe::$_" 2774 Symbol::delete_package "safe::$_"
2491 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2775 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2492 2776
2493 warn "unloading cf.pm \"a bit\""; 2777 warn "unloading cf.pm \"a bit\"";
2494 delete $INC{"cf.pm"}; 2778 delete $INC{"cf.pm"};
2779 delete $INC{"cf/pod.pm"};
2495 2780
2496 # don't, removes xs symbols, too, 2781 # don't, removes xs symbols, too,
2497 # and global variables created in xs 2782 # and global variables created in xs
2498 #Symbol::delete_package __PACKAGE__; 2783 #Symbol::delete_package __PACKAGE__;
2499 2784
… …
2514 warn "reattaching attachments to maps"; 2799 warn "reattaching attachments to maps";
2515 reattach $_ for values %MAP; 2800 reattach $_ for values %MAP;
2516 warn "reattaching attachments to players"; 2801 warn "reattaching attachments to players";
2517 reattach $_ for values %PLAYER; 2802 reattach $_ for values %PLAYER;
2518 2803
2519 warn "loading reloadable resources";
2520 reload_resources;
2521
2522 warn "leaving sync_job"; 2804 warn "leaving sync_job";
2523 2805
2524 1 2806 1
2525 } or do { 2807 } or do {
2526 warn $@; 2808 warn $@;
… …
2531 warn "reloaded"; 2813 warn "reloaded";
2532}; 2814};
2533 2815
2534our $RELOAD_WATCHER; # used only during reload 2816our $RELOAD_WATCHER; # used only during reload
2535 2817
2818sub reload_perl() {
2819 # doing reload synchronously and two reloads happen back-to-back,
2820 # coro crashes during coro_state_free->destroy here.
2821
2822 $RELOAD_WATCHER ||= Event->timer (
2823 reentrant => 0,
2824 after => 0,
2825 data => WF_AUTOCANCEL,
2826 cb => sub {
2827 do_reload_perl;
2828 undef $RELOAD_WATCHER;
2829 },
2830 );
2831}
2832
2536register_command "reload" => sub { 2833register_command "reload" => sub {
2537 my ($who, $arg) = @_; 2834 my ($who, $arg) = @_;
2538 2835
2539 if ($who->flag (FLAG_WIZ)) { 2836 if ($who->flag (FLAG_WIZ)) {
2540 $who->message ("reloading server."); 2837 $who->message ("reloading server.");
2541 2838 async { reload_perl };
2542 # doing reload synchronously and two reloads happen back-to-back,
2543 # coro crashes during coro_state_free->destroy here.
2544
2545 $RELOAD_WATCHER ||= Event->timer (
2546 reentrant => 0,
2547 after => 0,
2548 data => WF_AUTOCANCEL,
2549 cb => sub {
2550 reload;
2551 undef $RELOAD_WATCHER;
2552 },
2553 );
2554 } 2839 }
2555}; 2840};
2556 2841
2557unshift @INC, $LIBDIR; 2842unshift @INC, $LIBDIR;
2558 2843
2559my $bug_warning = 0; 2844my $bug_warning = 0;
2560 2845
2846our @WAIT_FOR_TICK;
2847our @WAIT_FOR_TICK_BEGIN;
2848
2849sub wait_for_tick {
2850 return unless $TICK_WATCHER->is_active;
2851 return if $Coro::current == $Coro::main;
2852
2853 my $signal = new Coro::Signal;
2854 push @WAIT_FOR_TICK, $signal;
2855 $signal->wait;
2856}
2857
2858sub wait_for_tick_begin {
2859 return unless $TICK_WATCHER->is_active;
2860 return if $Coro::current == $Coro::main;
2861
2862 my $signal = new Coro::Signal;
2863 push @WAIT_FOR_TICK_BEGIN, $signal;
2864 $signal->wait;
2865}
2866
2867 my $min = 1e6;#d#
2868 my $avg = 10;
2561$TICK_WATCHER = Event->timer ( 2869$TICK_WATCHER = Event->timer (
2562 reentrant => 0, 2870 reentrant => 0,
2563 parked => 1, 2871 parked => 1,
2564 prio => 0, 2872 prio => 0,
2565 at => $NEXT_TICK || $TICK, 2873 at => $NEXT_TICK || $TICK,
… …
2569 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 2877 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2570 unless ++$bug_warning > 10; 2878 unless ++$bug_warning > 10;
2571 return; 2879 return;
2572 } 2880 }
2573 2881
2574 $NOW = Event::time; 2882 $NOW = $tick_start = Event::time;
2575 2883
2576 cf::server_tick; # one server iteration 2884 cf::server_tick; # one server iteration
2885
2886 0 && sync_job {#d#
2887 for(1..10) {
2888 my $t = Event::time;
2889 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2890 or die;
2891
2892 $map->width (50);
2893 $map->height (50);
2894 $map->alloc;
2895 $map->_load_objects ("/tmp/x.map", 1);
2896 my $t = Event::time - $t;
2897
2898 #next unless $t < 0.0013;#d#
2899 if ($t < $min) {
2900 $min = $t;
2901 }
2902 $avg = $avg * 0.99 + $t * 0.01;
2903 }
2904 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2905 exit 0;
2906 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2907 };
2908
2577 $RUNTIME += $TICK; 2909 $RUNTIME += $TICK;
2578 $NEXT_TICK += $TICK; 2910 $NEXT_TICK += $TICK;
2579 2911
2580 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2912 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2581 $NEXT_RUNTIME_WRITE = $NOW + 10; 2913 $NEXT_RUNTIME_WRITE = $NOW + 10;
… …
2583 write_runtime 2915 write_runtime
2584 or warn "ERROR: unable to write runtime file: $!"; 2916 or warn "ERROR: unable to write runtime file: $!";
2585 }; 2917 };
2586 } 2918 }
2587 2919
2588 $WAIT_FOR_TICK->broadcast;
2589 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2590
2591# my $AFTER = Event::time; 2920# my $AFTER = Event::time;
2592# warn $AFTER - $NOW;#d# 2921# warn $AFTER - $NOW;#d#
2593 2922
2923 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2924 $sig->send;
2925 }
2926 while (my $sig = shift @WAIT_FOR_TICK) {
2927 $sig->send;
2928 }
2929
2930 $NOW = Event::time;
2931
2594 # if we are delayed by four ticks or more, skip them all 2932 # if we are delayed by four ticks or more, skip them all
2595 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2933 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2596 2934
2597 $TICK_WATCHER->at ($NEXT_TICK); 2935 $TICK_WATCHER->at ($NEXT_TICK);
2598 $TICK_WATCHER->start; 2936 $TICK_WATCHER->start;
2937
2938 $LOAD = ($NOW - $tick_start) / $TICK;
2939 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2940
2941 _post_tick;
2942
2943
2599 }, 2944 },
2600); 2945);
2601 2946
2602{ 2947{
2603 BDB::max_poll_time $TICK * 0.1; 2948 BDB::max_poll_time $TICK * 0.1;
… …
2631 2976
2632 cf::sync_job { 2977 cf::sync_job {
2633 eval { 2978 eval {
2634 BDB::db_env_open 2979 BDB::db_env_open
2635 $DB_ENV, 2980 $DB_ENV,
2636 $BDB_ENV_DIR, 2981 $BDBDIR,
2637 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 2982 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2638 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 2983 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2639 0666; 2984 0666;
2640 2985
2641 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 2986 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2642 2987
2643 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 2988 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2644 $DB_ENV->set_lk_detect; 2989 $DB_ENV->set_lk_detect;
2645 }; 2990 };
2646 2991
… …
2662 prio => 6, 3007 prio => 6,
2663 cb => \&IO::AIO::poll_cb, 3008 cb => \&IO::AIO::poll_cb,
2664 ); 3009 );
2665} 3010}
2666 3011
3012my $_log_backtrace;
3013
3014sub _log_backtrace {
3015 my ($msg, @addr) = @_;
3016
3017 $msg =~ s/\n//;
3018
3019 # limit the # of concurrent backtraces
3020 if ($_log_backtrace < 2) {
3021 ++$_log_backtrace;
3022 async {
3023 my @bt = fork_call {
3024 @addr = map { sprintf "%x", $_ } @addr;
3025 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3026 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3027 or die "addr2line: $!";
3028
3029 my @funcs;
3030 my @res = <$fh>;
3031 chomp for @res;
3032 while (@res) {
3033 my ($func, $line) = splice @res, 0, 2, ();
3034 push @funcs, "[$func] $line";
3035 }
3036
3037 @funcs
3038 };
3039
3040 LOG llevInfo, "[ABT] $msg\n";
3041 LOG llevInfo, "[ABT] $_\n" for @bt;
3042 --$_log_backtrace;
3043 };
3044 } else {
3045 LOG llevInfo, "[ABT] $msg\n";
3046 LOG llevInfo, "[ABT] [suppressed]\n";
3047 }
3048}
3049
3050# load additional modules
3051use cf::pod;
3052
2667END { cf::emergency_save } 3053END { cf::emergency_save }
2668 3054
26691 30551
2670 3056

Diff Legend

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