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.136 by root, Fri Jan 5 01:06:28 2007 UTC vs.
Revision 1.159 by root, Wed Jan 10 22:50:12 2007 UTC

15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
19 19
20use Data::Dumper;
20use Digest::MD5; 21use Digest::MD5;
21use Fcntl; 22use Fcntl;
22use IO::AIO 2.31 (); 23use IO::AIO 2.32 ();
23use YAML::Syck (); 24use YAML::Syck ();
24use Time::HiRes; 25use Time::HiRes;
25 26
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 27use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 32$YAML::Syck::ImplicitUnicode = 1;
30 33
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 35
35our %COMMAND = (); 36our %COMMAND = ();
36our %COMMAND_TIME = (); 37our %COMMAND_TIME = ();
38
39our @EXTS = (); # list of extension package names
37our %EXTCMD = (); 40our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions
38 42
39our @EVENT; 43our @EVENT;
40our $LIBDIR = datadir . "/ext"; 44our $LIBDIR = datadir . "/ext";
41 45
42our $TICK = MAX_TIME * 1e-6; 46our $TICK = MAX_TIME * 1e-6;
47our %CFG; 51our %CFG;
48 52
49our $UPTIME; $UPTIME ||= time; 53our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 54our $RUNTIME;
51 55
56our %PLAYER; # all users
52our %MAP; # all maps 57our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 58our $LINK_MAP; # the special {link} map
54our $RANDOM_MAPS = cf::localdir . "/random"; 59our $RANDOM_MAPS = cf::localdir . "/random";
55our %EXT_CORO; 60
61our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
62our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
56 63
57binmode STDOUT; 64binmode STDOUT;
58binmode STDERR; 65binmode STDERR;
59 66
60# read virtual server time, if available 67# read virtual server time, if available
105=item %cf::CFG 112=item %cf::CFG
106 113
107Configuration for the server, loaded from C</etc/crossfire/config>, or 114Configuration for the server, loaded from C</etc/crossfire/config>, or
108from wherever your confdir points to. 115from wherever your confdir points to.
109 116
117=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE
118
119These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)
120or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick
121processing has been done. Call C<< ->wait >> on them to maximise the
122window of cpu time available, or simply to synchronise to the server tick.
123
110=back 124=back
111 125
112=cut 126=cut
113 127
114BEGIN { 128BEGIN {
117 utf8::encode $msg; 131 utf8::encode $msg;
118 132
119 $msg .= "\n" 133 $msg .= "\n"
120 unless $msg =~ /\n$/; 134 unless $msg =~ /\n$/;
121 135
122 LOG llevError, "cfperl: $msg"; 136 LOG llevError, $msg;
123 }; 137 };
124} 138}
125 139
126@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 140@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
127@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 141@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
145 159
146$Event::DIED = sub { 160$Event::DIED = sub {
147 warn "error in event callback: @_"; 161 warn "error in event callback: @_";
148}; 162};
149 163
150my %ext_pkg;
151my @exts;
152my @hook;
153
154=head2 UTILITY FUNCTIONS 164=head2 UTILITY FUNCTIONS
155 165
156=over 4 166=over 4
157 167
168=item dumpval $ref
169
158=cut 170=cut
171
172sub dumpval {
173 eval {
174 local $SIG{__DIE__};
175 my $d;
176 if (1) {
177 $d = new Data::Dumper([$_[0]], ["*var"]);
178 $d->Terse(1);
179 $d->Indent(2);
180 $d->Quotekeys(0);
181 $d->Useqq(1);
182 #$d->Bless(...);
183 $d->Seen($_[1]) if @_ > 1;
184 $d = $d->Dump();
185 }
186 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
187 $d
188 } || "[unable to dump $_[0]: '$@']";
189}
159 190
160use JSON::Syck (); # TODO# replace by JSON::PC once working 191use JSON::Syck (); # TODO# replace by JSON::PC once working
161 192
162=item $ref = cf::from_json $json 193=item $ref = cf::from_json $json
163 194
221 # wake up all waiters, to be on the safe side 252 # wake up all waiters, to be on the safe side
222 $_->ready for @{ delete $LOCK{$key} }; 253 $_->ready for @{ delete $LOCK{$key} };
223 } 254 }
224} 255}
225 256
226=item cf::async { BLOCK }
227
228Like C<Coro::async>, but runs the given BLOCK in an eval and only logs the
229error instead of exiting the server in case of a problem.
230
231=cut
232
233sub async(&) {
234 my ($cb) = @_;
235
236 Coro::async {
237 eval { $cb->() };
238 warn $@ if $@;
239 }
240}
241
242sub freeze_mainloop { 257sub freeze_mainloop {
243 return unless $TICK_WATCHER->is_active; 258 return unless $TICK_WATCHER->is_active;
244 259
245 my $guard = Coro::guard { $TICK_WATCHER->start }; 260 my $guard = Coro::guard { $TICK_WATCHER->start };
246 $TICK_WATCHER->stop; 261 $TICK_WATCHER->stop;
247 $guard 262 $guard
248} 263}
264
265=item cf::async { BLOCK }
266
267Currently the same as Coro::async_pool, meaning you cannot use
268C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
269thing you are allowed to do is call C<prio> on it.
270
271=cut
272
273BEGIN { *async = \&Coro::async_pool }
249 274
250=item cf::sync_job { BLOCK } 275=item cf::sync_job { BLOCK }
251 276
252The design of crossfire+ requires that the main coro ($Coro::main) is 277The design of crossfire+ requires that the main coro ($Coro::main) is
253always able to handle events or runnable, as crossfire+ is only partly 278always able to handle events or runnable, as crossfire+ is only partly
272 my $freeze_guard = freeze_mainloop; 297 my $freeze_guard = freeze_mainloop;
273 298
274 my $busy = 1; 299 my $busy = 1;
275 my @res; 300 my @res;
276 301
277 (Coro::async { 302 (async {
278 @res = eval { $job->() }; 303 @res = eval { $job->() };
279 warn $@ if $@; 304 warn $@ if $@;
280 undef $busy; 305 undef $busy;
281 })->prio (Coro::PRIO_MAX); 306 })->prio (Coro::PRIO_MAX);
282 307
283 while ($busy) { 308 while ($busy) {
284 Coro::cede_notself; 309 Coro::cede or Event::one_event;
285 Event::one_event unless Coro::nready;
286 } 310 }
287 311
288 wantarray ? @res : $res[0] 312 wantarray ? @res : $res[0]
289 } else { 313 } else {
290 # we are in another coroutine, how wonderful, everything just works 314 # we are in another coroutine, how wonderful, everything just works
291 315
292 $job->() 316 $job->()
293 } 317 }
294} 318}
295 319
296=item $coro = cf::coro { BLOCK } 320=item $coro = cf::async_ext { BLOCK }
297 321
298Creates and returns a new coro. This coro is automcatially being canceled 322Like async, but this coro is automatically being canceled when the
299when the extension calling this is being unloaded. 323extension calling this is being unloaded.
300 324
301=cut 325=cut
302 326
303sub coro(&) { 327sub async_ext(&) {
304 my $cb = shift; 328 my $cb = shift;
305 329
306 my $coro = &cf::async ($cb); 330 my $coro = &Coro::async ($cb);
307 331
308 $coro->on_destroy (sub { 332 $coro->on_destroy (sub {
309 delete $EXT_CORO{$coro+0}; 333 delete $EXT_CORO{$coro+0};
310 }); 334 });
311 $EXT_CORO{$coro+0} = $coro; 335 $EXT_CORO{$coro+0} = $coro;
340=cut 364=cut
341 365
342############################################################################# 366#############################################################################
343 367
344package cf::path; 368package cf::path;
369
370use overload
371 '""' => \&as_string;
372
373# used to convert map paths into valid unix filenames by repalcing / by ∕
374our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
345 375
346sub new { 376sub new {
347 my ($class, $path, $base) = @_; 377 my ($class, $path, $base) = @_;
348 378
349 $path = $path->as_string if ref $path; 379 $path = $path->as_string if ref $path;
355 # ?random/... random maps 385 # ?random/... random maps
356 # /! non-realised random map exit 386 # /! non-realised random map exit
357 # /... normal maps 387 # /... normal maps
358 # ~/... per-player maps without a specific player (DO NOT USE) 388 # ~/... per-player maps without a specific player (DO NOT USE)
359 # ~user/... per-player map of a specific user 389 # ~user/... per-player map of a specific user
390
391 $path =~ s/$PATH_SEP/\//go;
360 392
361 if ($path =~ /^{/) { 393 if ($path =~ /^{/) {
362 # fine as it is 394 # fine as it is
363 } elsif ($path =~ s{^\?random/}{}) { 395 } elsif ($path =~ s{^\?random/}{}) {
364 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data; 396 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
413# } 445# }
414} 446}
415 447
416# escape the /'s in the path 448# escape the /'s in the path
417sub _escaped_path { 449sub _escaped_path {
418 # ∕ is U+2215
419 (my $path = $_[0]{path}) =~ s/\///g; 450 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
420 $path 451 $path
421} 452}
422 453
423# the original (read-only) location 454# the original (read-only) location
424sub load_path { 455sub load_path {
912=cut 943=cut
913 944
914sub register_extcmd { 945sub register_extcmd {
915 my ($name, $cb) = @_; 946 my ($name, $cb) = @_;
916 947
917 my $caller = caller;
918 #warn "registering extcmd '$name' to '$caller'";
919
920 $EXTCMD{$name} = [$cb, $caller]; 948 $EXTCMD{$name} = $cb;
921} 949}
922 950
923cf::player->attach ( 951cf::player->attach (
924 on_command => sub { 952 on_command => sub {
925 my ($pl, $name, $params) = @_; 953 my ($pl, $name, $params) = @_;
938 966
939 my $msg = eval { from_json $buf }; 967 my $msg = eval { from_json $buf };
940 968
941 if (ref $msg) { 969 if (ref $msg) {
942 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 970 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
943 if (my %reply = $cb->[0]->($pl, $msg)) { 971 if (my %reply = $cb->($pl, $msg)) {
944 $pl->ext_reply ($msg->{msgid}, %reply); 972 $pl->ext_reply ($msg->{msgid}, %reply);
945 } 973 }
946 } 974 }
947 } else { 975 } else {
948 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 976 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
950 978
951 cf::override; 979 cf::override;
952 }, 980 },
953); 981);
954 982
955sub register {
956 my ($base, $pkg) = @_;
957
958 #TODO
959}
960
961sub load_extension { 983sub load_extension {
962 my ($path) = @_; 984 my ($path) = @_;
963 985
964 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 986 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
965 my $base = $1; 987 my $base = $1;
980 1002
981 eval $source 1003 eval $source
982 or die $@ ? "$path: $@\n" 1004 or die $@ ? "$path: $@\n"
983 : "extension disabled.\n"; 1005 : "extension disabled.\n";
984 1006
985 push @exts, $pkg; 1007 push @EXTS, $pkg;
986 $ext_pkg{$base} = $pkg;
987
988# no strict 'refs';
989# @{"$pkg\::ISA"} = ext::;
990
991 register $base, $pkg;
992}
993
994sub unload_extension {
995 my ($pkg) = @_;
996
997 warn "removing extension $pkg\n";
998
999 # remove hooks
1000 #TODO
1001# for my $idx (0 .. $#PLUGIN_EVENT) {
1002# delete $hook[$idx]{$pkg};
1003# }
1004
1005 # remove commands
1006 for my $name (keys %COMMAND) {
1007 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
1008
1009 if (@cb) {
1010 $COMMAND{$name} = \@cb;
1011 } else {
1012 delete $COMMAND{$name};
1013 }
1014 }
1015
1016 # remove extcmds
1017 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1018 delete $EXTCMD{$name};
1019 }
1020
1021 if (my $cb = $pkg->can ("unload")) {
1022 eval {
1023 $cb->($pkg);
1024 1
1025 } or warn "$pkg unloaded, but with errors: $@";
1026 }
1027
1028 Symbol::delete_package $pkg;
1029} 1008}
1030 1009
1031sub load_extensions { 1010sub load_extensions {
1032 for my $ext (<$LIBDIR/*.ext>) { 1011 for my $ext (<$LIBDIR/*.ext>) {
1033 next unless -r $ext; 1012 next unless -r $ext;
1051}; 1030};
1052 1031
1053cf::map->attach (prio => -10000, package => cf::mapsupport::); 1032cf::map->attach (prio => -10000, package => cf::mapsupport::);
1054 1033
1055############################################################################# 1034#############################################################################
1056# load/save perl data associated with player->ob objects
1057
1058sub all_objects(@) {
1059 @_, map all_objects ($_->inv), @_
1060}
1061
1062# TODO: compatibility cruft, remove when no longer needed
1063cf::player->attach (
1064 on_load => sub {
1065 my ($pl, $path) = @_;
1066
1067 for my $o (all_objects $pl->ob) {
1068 if (my $value = $o->get_ob_key_value ("_perl_data")) {
1069 $o->set_ob_key_value ("_perl_data");
1070
1071 %$o = %{ Storable::thaw pack "H*", $value };
1072 }
1073 }
1074 },
1075);
1076
1077#############################################################################
1078 1035
1079=head2 CORE EXTENSIONS 1036=head2 CORE EXTENSIONS
1080 1037
1081Functions and methods that extend core crossfire objects. 1038Functions and methods that extend core crossfire objects.
1082 1039
1040=cut
1041
1042package cf::player;
1043
1044use Coro::AIO;
1045
1083=head3 cf::player 1046=head3 cf::player
1084 1047
1085=over 4 1048=over 4
1086 1049
1087=item cf::player::exists $login 1050=item cf::player::find $login
1088 1051
1089Returns true when the given account exists. 1052Returns the given player object, loading it if necessary (might block).
1090 1053
1091=cut 1054=cut
1092 1055
1093sub cf::player::exists($) { 1056sub playerdir($) {
1094 cf::player::find $_[0] 1057 cf::localdir
1095 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1058 . "/"
1059 . cf::playerdir
1060 . "/"
1061 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1062}
1063
1064sub path($) {
1065 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1066
1067 (playerdir $login) . "/$login.pl"
1068}
1069
1070sub find_active($) {
1071 $cf::PLAYER{$_[0]}
1072 and $cf::PLAYER{$_[0]}->active
1073 and $cf::PLAYER{$_[0]}
1074}
1075
1076sub exists($) {
1077 my ($login) = @_;
1078
1079 $cf::PLAYER{$login}
1080 or cf::sync_job { !aio_stat $login }
1081}
1082
1083sub find($) {
1084 return $cf::PLAYER{$_[0]} || do {
1085 my $login = $_[0];
1086
1087 my $guard = cf::lock_acquire "user_find:$login";
1088
1089 $cf::PLAYER{$_[0]} || do {
1090 my $pl = load_pl path $login
1091 or return;
1092 $cf::PLAYER{$login} = $pl
1093 }
1094 }
1095}
1096
1097sub save($) {
1098 my ($pl) = @_;
1099
1100 return if $pl->{deny_save};
1101
1102 my $path = path $pl;
1103 my $guard = cf::lock_acquire "user_save:$path";
1104
1105 return if $pl->{deny_save};
1106
1107 aio_mkdir playerdir $pl, 0770;
1108 $pl->{last_save} = $cf::RUNTIME;
1109
1110 $pl->save_pl ($path);
1111 Coro::cede;
1112}
1113
1114sub new($) {
1115 my ($login) = @_;
1116
1117 my $self = create;
1118
1119 $self->ob->name ($login);
1120 $self->{deny_save} = 1;
1121
1122 $cf::PLAYER{$login} = $self;
1123
1124 $self
1125}
1126
1127=item $pl->quit_character
1128
1129Nukes the player without looking back. If logged in, the connection will
1130be destroyed. May block for a long time.
1131
1132=cut
1133
1134sub quit_character {
1135 my ($pl) = @_;
1136
1137 $pl->{deny_save} = 1;
1138 $pl->password ("*"); # this should lock out the player until we nuked the dir
1139
1140 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1141 $pl->deactivate;
1142 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1143 $pl->ns->destroy if $pl->ns;
1144
1145 my $path = playerdir $pl;
1146 my $temp = "$path~$cf::RUNTIME~deleting~";
1147 aio_rename $path, $temp;
1148 delete $cf::PLAYER{$pl->ob->name};
1149 $pl->destroy;
1150 IO::AIO::aio_rmtree $temp;
1151}
1152
1153=item cf::player::list_logins
1154
1155Returns am arrayref of all valid playernames in the system, can take a
1156while and may block, so not sync_job-capable, ever.
1157
1158=cut
1159
1160sub list_logins {
1161 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
1162 or return [];
1163
1164 my @logins;
1165
1166 for my $login (@$dirs) {
1167 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1168 aio_read $fh, 0, 512, my $buf, 0 or next;
1169 $buf !~ /^password -------------$/m or next; # official not-valid tag
1170
1171 utf8::decode $login;
1172 push @logins, $login;
1173 }
1174
1175 \@logins
1176}
1177
1178=item $player->maps
1179
1180Returns an arrayref of cf::path's of all maps that are private for this
1181player. May block.
1182
1183=cut
1184
1185sub maps($) {
1186 my ($pl) = @_;
1187
1188 my $files = aio_readdir playerdir $pl
1189 or return;
1190
1191 my @paths;
1192
1193 for (@$files) {
1194 utf8::decode $_;
1195 next if /\.(?:pl|pst)$/;
1196 next unless /^$PATH_SEP/o;
1197
1198 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_;
1199 }
1200
1201 \@paths
1096} 1202}
1097 1203
1098=item $player->ext_reply ($msgid, $msgtype, %msg) 1204=item $player->ext_reply ($msgid, $msgtype, %msg)
1099 1205
1100Sends an ext reply to the player. 1206Sends an ext reply to the player.
1101 1207
1102=cut 1208=cut
1103 1209
1104sub cf::player::ext_reply($$$%) { 1210sub ext_reply($$$%) {
1105 my ($self, $id, %msg) = @_; 1211 my ($self, $id, %msg) = @_;
1106 1212
1107 $msg{msgid} = $id; 1213 $msg{msgid} = $id;
1108 1214
1109 $self->send ("ext " . to_json \%msg); 1215 $self->send ("ext " . cf::to_json \%msg);
1110} 1216}
1217
1218package cf;
1111 1219
1112=back 1220=back
1113 1221
1114 1222
1115=head3 cf::map 1223=head3 cf::map
1281 Coro::cede; 1389 Coro::cede;
1282 1390
1283 $self->in_memory (cf::MAP_IN_MEMORY); 1391 $self->in_memory (cf::MAP_IN_MEMORY);
1284} 1392}
1285 1393
1394# find and load all maps in the 3x3 area around a map
1395sub load_diag {
1396 my ($map) = @_;
1397
1398 my @diag; # diagonal neighbours
1399
1400 for (0 .. 3) {
1401 my $neigh = $map->tile_path ($_)
1402 or next;
1403 $neigh = find $neigh, $map
1404 or next;
1405 $neigh->load;
1406
1407 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1408 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1409 }
1410
1411 for (@diag) {
1412 my $neigh = find @$_
1413 or next;
1414 $neigh->load;
1415 }
1416}
1417
1286sub find_sync { 1418sub find_sync {
1287 my ($path, $origin) = @_; 1419 my ($path, $origin) = @_;
1288 1420
1289 cf::sync_job { cf::map::find $path, $origin } 1421 cf::sync_job { find $path, $origin }
1290} 1422}
1291 1423
1292sub do_load_sync { 1424sub do_load_sync {
1293 my ($map) = @_; 1425 my ($map) = @_;
1294 1426
1295 cf::sync_job { $map->load }; 1427 cf::sync_job { $map->load };
1296} 1428}
1297 1429
1430our %MAP_PREFETCH;
1431our $MAP_PREFETCHER = Coro::async {
1432 while () {
1433 while (%MAP_PREFETCH) {
1434 my $key = each %MAP_PREFETCH
1435 or next;
1436 my $path = delete $MAP_PREFETCH{$key};
1437
1438 my $map = find $path
1439 or next;
1440 $map->load;
1441 }
1442 Coro::schedule;
1443 }
1444};
1445
1446sub find_async {
1447 my ($path, $origin) = @_;
1448
1449 $path = new cf::path $path, $origin && $origin->path;
1450 my $key = $path->as_string;
1451
1452 if (my $map = $cf::MAP{$key}) {
1453 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1454 }
1455
1456 $MAP_PREFETCH{$key} = $path;
1457 $MAP_PREFETCHER->ready;
1458
1459 ()
1460}
1461
1298sub save { 1462sub save {
1299 my ($self) = @_; 1463 my ($self) = @_;
1300 1464
1465 my $lock = cf::lock_acquire "map_data:" . $self->path;
1466
1301 $self->{last_save} = $cf::RUNTIME; 1467 $self->{last_save} = $cf::RUNTIME;
1302 1468
1303 return unless $self->dirty; 1469 return unless $self->dirty;
1304 1470
1305 my $save = $self->{path}->save_path; utf8::encode $save; 1471 my $save = $self->{path}->save_path; utf8::encode $save;
1308 $self->{load_path} = $save; 1474 $self->{load_path} = $save;
1309 1475
1310 return if $self->{deny_save}; 1476 return if $self->{deny_save};
1311 1477
1312 local $self->{last_access} = $self->last_access;#d# 1478 local $self->{last_access} = $self->last_access;#d#
1479
1480 cf::async {
1481 $_->contr->save for $self->players;
1482 };
1313 1483
1314 if ($uniq) { 1484 if ($uniq) {
1315 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1485 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1316 $self->save_objects ($uniq, cf::IO_UNIQUES); 1486 $self->save_objects ($uniq, cf::IO_UNIQUES);
1317 } else { 1487 } else {
1323 my ($self) = @_; 1493 my ($self) = @_;
1324 1494
1325 # save first because save cedes 1495 # save first because save cedes
1326 $self->save; 1496 $self->save;
1327 1497
1498 my $lock = cf::lock_acquire "map_data:" . $self->path;
1499
1328 return if $self->players; 1500 return if $self->players;
1329 return if $self->in_memory != cf::MAP_IN_MEMORY; 1501 return if $self->in_memory != cf::MAP_IN_MEMORY;
1330 return if $self->{deny_save}; 1502 return if $self->{deny_save};
1331 1503
1332 $self->clear; 1504 $self->clear;
1374} 1546}
1375 1547
1376sub reset { 1548sub reset {
1377 my ($self) = @_; 1549 my ($self) = @_;
1378 1550
1551 my $lock = cf::lock_acquire "map_data:" . $self->path;
1552
1379 return if $self->players; 1553 return if $self->players;
1380 return if $self->{path}{user_rel};#d# 1554 return if $self->{path}{user_rel};#d#
1381 1555
1382 warn "resetting map ", $self->path;#d# 1556 warn "resetting map ", $self->path;#d#
1383 1557
1408 } 1582 }
1409 1583
1410 $map 1584 $map
1411} 1585}
1412 1586
1413sub emergency_save { 1587=item cf::map::unique_maps
1414 my $freeze_guard = cf::freeze_mainloop;
1415 1588
1416 warn "enter emergency map save\n"; 1589Returns an arrayref of cf::path's of all shared maps that have
1590instantiated unique items. May block.
1417 1591
1418 cf::sync_job { 1592=cut
1419 warn "begin emergency map save\n"; 1593
1420 $_->save for values %cf::MAP; 1594sub unique_maps() {
1595 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1596 or return;
1597
1598 my @paths;
1599
1600 for (@$files) {
1601 utf8::decode $_;
1602 next if /\.pst$/;
1603 next unless /^$PATH_SEP/o;
1604
1605 push @paths, new cf::path $_;
1421 }; 1606 }
1422 1607
1423 warn "end emergency map save\n"; 1608 \@paths
1424} 1609}
1425 1610
1426package cf; 1611package cf;
1427 1612
1428=back 1613=back
1429 1614
1615=head3 cf::object
1616
1617=cut
1618
1619package cf::object;
1620
1621=over 4
1622
1623=item $ob->inv_recursive
1624
1625Returns the inventory of the object _and_ their inventories, recursively.
1626
1627=cut
1628
1629sub inv_recursive_;
1630sub inv_recursive_ {
1631 map { $_, inv_recursive_ $_->inv } @_
1632}
1633
1634sub inv_recursive {
1635 inv_recursive_ inv $_[0]
1636}
1637
1638package cf;
1639
1640=back
1430 1641
1431=head3 cf::object::player 1642=head3 cf::object::player
1432 1643
1433=over 4 1644=over 4
1434 1645
1526 # use -1 or undef as default coordinates, not 0, 0 1737 # use -1 or undef as default coordinates, not 0, 0
1527 ($x, $y) = ($map->enter_x, $map->enter_y) 1738 ($x, $y) = ($map->enter_x, $map->enter_y)
1528 if $x <=0 && $y <= 0; 1739 if $x <=0 && $y <= 0;
1529 1740
1530 $map->load; 1741 $map->load;
1742 $map->load_diag;
1531 1743
1744 return unless $self->contr->active;
1532 $self->activate_recursive; 1745 $self->activate_recursive;
1533 $self->enter_map ($map, $x, $y); 1746 $self->enter_map ($map, $x, $y);
1534} 1747}
1535 1748
1536cf::player->attach ( 1749cf::player->attach (
1549 1762
1550 # try to abort aborted map switching on player login :) 1763 # try to abort aborted map switching on player login :)
1551 # should happen only on crashes 1764 # should happen only on crashes
1552 if ($pl->ob->{_link_pos}) { 1765 if ($pl->ob->{_link_pos}) {
1553 $pl->ob->enter_link; 1766 $pl->ob->enter_link;
1554 cf::async { 1767 (async {
1555 # we need this sleep as the login has a concurrent enter_exit running 1768 # we need this sleep as the login has a concurrent enter_exit running
1556 # and this sleep increases chances of the player not ending up in scorn 1769 # and this sleep increases chances of the player not ending up in scorn
1770 $pl->ob->reply (undef,
1771 "There was an internal problem at your last logout, "
1772 . "the server will try to bring you to your intended destination in a second.",
1773 cf::NDI_RED);
1557 Coro::Timer::sleep 1; 1774 Coro::Timer::sleep 1;
1558 $pl->ob->leave_link; 1775 $pl->ob->leave_link;
1559 }; 1776 })->prio (2);
1560 } 1777 }
1561 }, 1778 },
1562); 1779);
1563 1780
1564=item $player_object->goto ($path, $x, $y) 1781=item $player_object->goto ($path, $x, $y)
1566=cut 1783=cut
1567 1784
1568sub cf::object::player::goto { 1785sub cf::object::player::goto {
1569 my ($self, $path, $x, $y) = @_; 1786 my ($self, $path, $x, $y) = @_;
1570 1787
1788 $path = new cf::path $path;
1789
1571 $self->enter_link; 1790 $self->enter_link;
1572 1791
1573 (cf::async { 1792 (async {
1574 $path = new cf::path $path;
1575
1576 my $map = cf::map::find $path->as_string; 1793 my $map = cf::map::find $path->as_string;
1577 $map = $map->customise_for ($self) if $map; 1794 $map = $map->customise_for ($self) if $map;
1578 1795
1579# warn "entering ", $map->path, " at ($x, $y)\n" 1796# warn "entering ", $map->path, " at ($x, $y)\n"
1580# if $map; 1797# if $map;
1581 1798
1582 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1799 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1583 1800
1584 $self->leave_link ($map, $x, $y); 1801 $self->leave_link ($map, $x, $y);
1585 })->prio (1); 1802 })->prio (1);
1586} 1803}
1587 1804
1640 1857
1641 return unless $self->type == cf::PLAYER; 1858 return unless $self->type == cf::PLAYER;
1642 1859
1643 $self->enter_link; 1860 $self->enter_link;
1644 1861
1645 (cf::async { 1862 (async {
1646 $self->deactivate_recursive; # just to be sure 1863 $self->deactivate_recursive; # just to be sure
1647 unless (eval { 1864 unless (eval {
1648 prepare_random_map $exit 1865 prepare_random_map $exit
1649 if $exit->slaying eq "/!"; 1866 if $exit->slaying eq "/!";
1650 1867
1653 1870
1654 1; 1871 1;
1655 }) { 1872 }) {
1656 $self->message ("Something went wrong deep within the crossfire server. " 1873 $self->message ("Something went wrong deep within the crossfire server. "
1657 . "I'll try to bring you back to the map you were before. " 1874 . "I'll try to bring you back to the map you were before. "
1658 . "Please report this to the dungeon master", 1875 . "Please report this to the dungeon master!",
1659 cf::NDI_UNIQUE | cf::NDI_RED); 1876 cf::NDI_UNIQUE | cf::NDI_RED);
1660 1877
1661 warn "ERROR in enter_exit: $@"; 1878 warn "ERROR in enter_exit: $@";
1662 $self->leave_link; 1879 $self->leave_link;
1663 } 1880 }
1731 } 1948 }
1732 } 1949 }
1733 }, 1950 },
1734); 1951);
1735 1952
1736=item $client->coro (\&cb) 1953=item $client->async (\&cb)
1737 1954
1738Create a new coroutine, running the specified callback. The coroutine will 1955Create a new coroutine, running the specified callback. The coroutine will
1739be automatically cancelled when the client gets destroyed (e.g. on logout, 1956be automatically cancelled when the client gets destroyed (e.g. on logout,
1740or loss of connection). 1957or loss of connection).
1741 1958
1742=cut 1959=cut
1743 1960
1744sub cf::client::coro { 1961sub cf::client::async {
1745 my ($self, $cb) = @_; 1962 my ($self, $cb) = @_;
1746 1963
1747 my $coro = &cf::async ($cb); 1964 my $coro = &Coro::async ($cb);
1748 1965
1749 $coro->on_destroy (sub { 1966 $coro->on_destroy (sub {
1750 delete $self->{_coro}{$coro+0}; 1967 delete $self->{_coro}{$coro+0};
1751 }); 1968 });
1752 1969
1990 local $/; 2207 local $/;
1991 *CFG = YAML::Syck::Load <$fh>; 2208 *CFG = YAML::Syck::Load <$fh>;
1992 2209
1993 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 2210 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
1994 2211
2212 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2213 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2214
1995 if (exists $CFG{mlockall}) { 2215 if (exists $CFG{mlockall}) {
1996 eval { 2216 eval {
1997 $CFG{mlockall} ? &mlockall : &munlockall 2217 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
1998 and die "WARNING: m(un)lockall failed: $!\n"; 2218 and die "WARNING: m(un)lockall failed: $!\n";
1999 }; 2219 };
2000 warn $@ if $@; 2220 warn $@ if $@;
2001 } 2221 }
2002} 2222}
2003 2223
2004sub main { 2224sub main {
2005 # we must not ever block the main coroutine 2225 # we must not ever block the main coroutine
2006 local $Coro::idle = sub { 2226 local $Coro::idle = sub {
2007 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2227 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2008 (Coro::unblock_sub {
2009 Event::one_event; 2228 async { Event::one_event };
2010 })->();
2011 }; 2229 };
2012 2230
2013 cfg_load; 2231 cfg_load;
2014 db_load; 2232 db_load;
2015 load_extensions; 2233 load_extensions;
2016 Event::loop; 2234 Event::loop;
2017} 2235}
2018 2236
2019############################################################################# 2237#############################################################################
2020# initialisation 2238# initialisation and cleanup
2239
2240# install some emergency cleanup handlers
2241BEGIN {
2242 for my $signal (qw(INT HUP TERM)) {
2243 Event->signal (
2244 data => WF_AUTOCANCEL,
2245 signal => $signal,
2246 cb => sub {
2247 cf::cleanup "SIG$signal";
2248 },
2249 );
2250 }
2251}
2252
2253sub emergency_save() {
2254 my $freeze_guard = cf::freeze_mainloop;
2255
2256 warn "enter emergency perl save\n";
2257
2258 cf::sync_job {
2259 # use a peculiar iteration method to avoid tripping on perl
2260 # refcount bugs in for. also avoids problems with players
2261 # and maps saved/Destroyed asynchronously.
2262 warn "begin emergency player save\n";
2263 for my $login (keys %cf::PLAYER) {
2264 my $pl = $cf::PLAYER{$login} or next;
2265 $pl->valid or next;
2266 $pl->save;
2267 }
2268 warn "end emergency player save\n";
2269
2270 warn "begin emergency map save\n";
2271 for my $path (keys %cf::MAP) {
2272 my $map = $cf::MAP{$path} or next;
2273 $map->valid or next;
2274 $map->save;
2275 }
2276 warn "end emergency map save\n";
2277 };
2278
2279 warn "leave emergency perl save\n";
2280}
2021 2281
2022sub reload() { 2282sub reload() {
2023 # can/must only be called in main 2283 # can/must only be called in main
2024 if ($Coro::current != $Coro::main) { 2284 if ($Coro::current != $Coro::main) {
2025 warn "can only reload from main coroutine\n"; 2285 warn "can only reload from main coroutine\n";
2026 return; 2286 return;
2027 } 2287 }
2028 2288
2029 warn "reloading..."; 2289 warn "reloading...";
2030 2290
2291 warn "freezing server";
2031 my $guard = freeze_mainloop; 2292 my $guard = freeze_mainloop;
2032 cf::emergency_save; 2293 cf::emergency_save;
2033 2294
2295 warn "sync database to disk";
2296 cf::db_sync;
2297 IO::AIO::flush;
2298
2034 eval { 2299 eval {
2035 # if anything goes wrong in here, we should simply crash as we already saved 2300 # if anything goes wrong in here, we should simply crash as we already saved
2036 2301
2037 # cancel all watchers 2302 warn "cancel all watchers";
2038 for (Event::all_watchers) { 2303 for (Event::all_watchers) {
2039 $_->cancel if $_->data & WF_AUTOCANCEL; 2304 $_->cancel if $_->data & WF_AUTOCANCEL;
2040 } 2305 }
2041 2306
2042 # cancel all extension coros 2307 warn "cancel all extension coros";
2043 $_->cancel for values %EXT_CORO; 2308 $_->cancel for values %EXT_CORO;
2044 %EXT_CORO = (); 2309 %EXT_CORO = ();
2045 2310
2311 warn "remove commands";
2312 %COMMAND = ();
2313
2314 warn "remove ext commands";
2315 %EXTCMD = ();
2316
2046 # unload all extensions 2317 warn "unload/nuke all extensions";
2047 for (@exts) { 2318 for my $pkg (@EXTS) {
2048 warn "unloading <$_>"; 2319 warn "unloading <$pkg>";
2049 unload_extension $_; 2320
2321 if (my $cb = $pkg->can ("unload")) {
2322 eval {
2323 $cb->($pkg);
2324 1
2325 } or warn "$pkg unloaded, but with errors: $@";
2050 } 2326 }
2051 2327
2328 Symbol::delete_package $pkg;
2329 }
2330
2052 # unload all modules loaded from $LIBDIR 2331 warn "unload all perl modules loaded from $LIBDIR";
2053 while (my ($k, $v) = each %INC) { 2332 while (my ($k, $v) = each %INC) {
2054 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2333 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2055 2334
2056 warn "removing <$k>"; 2335 warn "removing <$k>";
2057 delete $INC{$k}; 2336 delete $INC{$k};
2064 } 2343 }
2065 2344
2066 Symbol::delete_package $k; 2345 Symbol::delete_package $k;
2067 } 2346 }
2068 2347
2069 # sync database to disk
2070 cf::db_sync;
2071 IO::AIO::flush;
2072
2073 # get rid of safe::, as good as possible 2348 warn "get rid of safe::, as good as possible";
2074 Symbol::delete_package "safe::$_" 2349 Symbol::delete_package "safe::$_"
2075 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2350 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2076 2351
2077 # remove register_script_function callbacks
2078 # TODO
2079
2080 # unload cf.pm "a bit" 2352 warn "unload cf.pm \"a bit\"";
2081 delete $INC{"cf.pm"}; 2353 delete $INC{"cf.pm"};
2082 2354
2083 # don't, removes xs symbols, too, 2355 # don't, removes xs symbols, too,
2084 # and global variables created in xs 2356 # and global variables created in xs
2085 #Symbol::delete_package __PACKAGE__; 2357 #Symbol::delete_package __PACKAGE__;
2086 2358
2087 # reload cf.pm
2088 warn "reloading cf.pm"; 2359 warn "reloading cf.pm";
2089 require cf; 2360 require cf;
2090 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2361 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2091 2362
2092 # load config and database again 2363 warn "load config and database again";
2093 cf::cfg_load; 2364 cf::cfg_load;
2094 cf::db_load; 2365 cf::db_load;
2095 2366
2096 # load extensions
2097 warn "load extensions"; 2367 warn "load extensions";
2098 cf::load_extensions; 2368 cf::load_extensions;
2099 2369
2100 # reattach attachments to objects 2370 warn "reattach attachments to objects/players";
2101 warn "reattach";
2102 _global_reattach; 2371 _global_reattach;
2372 warn "reattach attachments to maps";
2373 reattach $_ for values %MAP;
2103 }; 2374 };
2104 2375
2105 if ($@) { 2376 if ($@) {
2106 warn $@; 2377 warn $@;
2107 warn "error while reloading, exiting."; 2378 warn "error while reloading, exiting.";
2108 exit 1; 2379 exit 1;
2109 } 2380 }
2110 2381
2111 warn "reloaded successfully"; 2382 warn "reloaded";
2112}; 2383};
2113 2384
2114############################################################################# 2385#############################################################################
2115 2386
2116unless ($LINK_MAP) { 2387unless ($LINK_MAP) {
2123 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2394 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2124 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2395 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2125 2396
2126 # dirty hack because... archetypes are not yet loaded 2397 # dirty hack because... archetypes are not yet loaded
2127 Event->timer ( 2398 Event->timer (
2128 after => 2, 2399 after => 10,
2129 cb => sub { 2400 cb => sub {
2130 $_[0]->w->cancel; 2401 $_[0]->w->cancel;
2131 2402
2132 # provide some exits "home" 2403 # provide some exits "home"
2133 my $exit = cf::object::new "exit"; 2404 my $exit = cf::object::new "exit";
2151 $LINK_MAP->{deny_save} = 1; 2422 $LINK_MAP->{deny_save} = 1;
2152 $LINK_MAP->{deny_reset} = 1; 2423 $LINK_MAP->{deny_reset} = 1;
2153 2424
2154 $cf::MAP{$LINK_MAP->path} = $LINK_MAP; 2425 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2155} 2426}
2156
2157register "<global>", __PACKAGE__;
2158 2427
2159register_command "reload" => sub { 2428register_command "reload" => sub {
2160 my ($who, $arg) = @_; 2429 my ($who, $arg) = @_;
2161 2430
2162 if ($who->flag (FLAG_WIZ)) { 2431 if ($who->flag (FLAG_WIZ)) {
2175 data => WF_AUTOCANCEL, 2444 data => WF_AUTOCANCEL,
2176 cb => sub { 2445 cb => sub {
2177 cf::server_tick; # one server iteration 2446 cf::server_tick; # one server iteration
2178 $RUNTIME += $TICK; 2447 $RUNTIME += $TICK;
2179 $NEXT_TICK += $TICK; 2448 $NEXT_TICK += $TICK;
2449
2450 $WAIT_FOR_TICK->broadcast;
2451 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2180 2452
2181 # if we are delayed by four ticks or more, skip them all 2453 # if we are delayed by four ticks or more, skip them all
2182 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2454 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2183 2455
2184 $TICK_WATCHER->at ($NEXT_TICK); 2456 $TICK_WATCHER->at ($NEXT_TICK);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines