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.112 by root, Mon Jan 1 13:31:47 2007 UTC vs.
Revision 1.147 by root, Mon Jan 8 12:23:33 2007 UTC

8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3; 13use Coro 3.3 ();
14use Coro::Event; 14use Coro::Event;
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 Digest::MD5; 20use Digest::MD5;
21use Fcntl; 21use Fcntl;
22use IO::AIO 2.31 (); 22use IO::AIO 2.32 ();
23use YAML::Syck (); 23use YAML::Syck ();
24use Time::HiRes; 24use Time::HiRes;
25 25
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 26use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 27
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 29$YAML::Syck::ImplicitUnicode = 1;
30 30
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 31$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32 32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 34
35our %COMMAND = (); 35our %COMMAND = ();
36our %COMMAND_TIME = (); 36our %COMMAND_TIME = ();
47our %CFG; 47our %CFG;
48 48
49our $UPTIME; $UPTIME ||= time; 49our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 50our $RUNTIME;
51 51
52our %PLAYER; # all users
52our %MAP; # all maps 53our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 54our $LINK_MAP; # the special {link} map
54our $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 55our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 56our %EXT_CORO; # coroutines bound to extensions
57 57
58binmode STDOUT; 58binmode STDOUT;
59binmode STDERR; 59binmode STDERR;
60 60
61# read virtual server time, if available 61# read virtual server time, if available
71mkdir cf::localdir . "/" . cf::uniquedir; 71mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 72mkdir $RANDOM_MAPS;
73 73
74# a special map that is always available 74# a special map that is always available
75our $LINK_MAP; 75our $LINK_MAP;
76 76our $EMERGENCY_POSITION;
77our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37];
78 77
79############################################################################# 78#############################################################################
80 79
81=head2 GLOBAL VARIABLES 80=head2 GLOBAL VARIABLES
82 81
119 utf8::encode $msg; 118 utf8::encode $msg;
120 119
121 $msg .= "\n" 120 $msg .= "\n"
122 unless $msg =~ /\n$/; 121 unless $msg =~ /\n$/;
123 122
124 LOG llevError, "cfperl: $msg"; 123 LOG llevError, $msg;
125 }; 124 };
126} 125}
127 126
128@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 127@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
129@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 128@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
181sub to_json($) { 180sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 181 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 182 JSON::Syck::Dump $_[0]
184} 183}
185 184
185=item cf::lock_wait $string
186
187Wait until the given lock is available. See cf::lock_acquire.
188
189=item my $lock = cf::lock_acquire $string
190
191Wait until the given lock is available and then acquires it and returns
192a Coro::guard object. If the guard object gets destroyed (goes out of scope,
193for example when the coroutine gets canceled), the lock is automatically
194returned.
195
196Lock names should begin with a unique identifier (for example, cf::map::find
197uses map_find and cf::map::load uses map_load).
198
199=cut
200
201our %LOCK;
202
203sub lock_wait($) {
204 my ($key) = @_;
205
206 # wait for lock, if any
207 while ($LOCK{$key}) {
208 push @{ $LOCK{$key} }, $Coro::current;
209 Coro::schedule;
210 }
211}
212
213sub lock_acquire($) {
214 my ($key) = @_;
215
216 # wait, to be sure we are not locked
217 lock_wait $key;
218
219 $LOCK{$key} = [];
220
221 Coro::guard {
222 # wake up all waiters, to be on the safe side
223 $_->ready for @{ delete $LOCK{$key} };
224 }
225}
226
227sub freeze_mainloop {
228 return unless $TICK_WATCHER->is_active;
229
230 my $guard = Coro::guard { $TICK_WATCHER->start };
231 $TICK_WATCHER->stop;
232 $guard
233}
234
235=item cf::async { BLOCK }
236
237Currently the same as Coro::async_pool, meaning you cannot use
238C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
239thing you are allowed to do is call C<prio> on it.
240
241=cut
242
243BEGIN { *async = \&Coro::async_pool }
244
186=item cf::sync_job { BLOCK } 245=item cf::sync_job { BLOCK }
187 246
188The design of crossfire+ requires that the main coro ($Coro::main) is 247The design of crossfire+ requires that the main coro ($Coro::main) is
189always able to handle events or runnable, as crossfire+ is only partly 248always able to handle events or runnable, as crossfire+ is only partly
190reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 249reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable.
203 # this is the main coro, too bad, we have to block 262 # this is the main coro, too bad, we have to block
204 # till the operation succeeds, freezing the server :/ 263 # till the operation succeeds, freezing the server :/
205 264
206 # TODO: use suspend/resume instead 265 # TODO: use suspend/resume instead
207 # (but this is cancel-safe) 266 # (but this is cancel-safe)
208 local $FREEZE = 1; 267 my $freeze_guard = freeze_mainloop;
209 268
210 my $busy = 1; 269 my $busy = 1;
211 my @res; 270 my @res;
212 271
213 (Coro::async { 272 (async {
214 @res = eval { $job->() }; 273 @res = eval { $job->() };
215 warn $@ if $@; 274 warn $@ if $@;
216 undef $busy; 275 undef $busy;
217 })->prio (Coro::PRIO_MAX); 276 })->prio (Coro::PRIO_MAX);
218 277
219 while ($busy) { 278 while ($busy) {
220 Coro::cede_notself; 279 Coro::cede or Event::one_event;
221 Event::one_event unless Coro::nready;
222 } 280 }
223 281
224 wantarray ? @res : $res[0] 282 wantarray ? @res : $res[0]
225 } else { 283 } else {
226 # we are in another coroutine, how wonderful, everything just works 284 # we are in another coroutine, how wonderful, everything just works
227 285
228 $job->() 286 $job->()
229 } 287 }
230} 288}
231 289
232=item $coro = cf::coro { BLOCK } 290=item $coro = cf::async_ext { BLOCK }
233 291
234Creates and returns a new coro. This coro is automcatially being canceled 292Like async, but this coro is automcatially being canceled when the
235when the extension calling this is being unloaded. 293extension calling this is being unloaded.
236 294
237=cut 295=cut
238 296
239sub coro(&) { 297sub async_ext(&) {
240 my $cb = shift; 298 my $cb = shift;
241 299
242 my $coro; $coro = async { 300 my $coro = &Coro::async ($cb);
243 eval {
244 $cb->();
245 };
246 warn $@ if $@;
247 };
248 301
249 $coro->on_destroy (sub { 302 $coro->on_destroy (sub {
250 delete $EXT_CORO{$coro+0}; 303 delete $EXT_CORO{$coro+0};
251 }); 304 });
252 $EXT_CORO{$coro+0} = $coro; 305 $EXT_CORO{$coro+0} = $coro;
289 342
290 $path = $path->as_string if ref $path; 343 $path = $path->as_string if ref $path;
291 344
292 my $self = bless { }, $class; 345 my $self = bless { }, $class;
293 346
347 # {... are special paths that are not touched
348 # ?xxx/... are special absolute paths
349 # ?random/... random maps
350 # /! non-realised random map exit
351 # /... normal maps
352 # ~/... per-player maps without a specific player (DO NOT USE)
353 # ~user/... per-player map of a specific user
354
355 if ($path =~ /^{/) {
356 # fine as it is
294 if ($path =~ s{^\?random/}{}) { 357 } elsif ($path =~ s{^\?random/}{}) {
295 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data; 358 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
296 $self->{random} = cf::from_json $data; 359 $self->{random} = cf::from_json $data;
297 } else { 360 } else {
298 if ($path =~ s{^~([^/]+)?}{}) { 361 if ($path =~ s{^~([^/]+)?}{}) {
299 $self->{user_rel} = 1; 362 $self->{user_rel} = 1;
804 or return; 867 or return;
805 868
806 unless (aio_stat "$filename.pst") { 869 unless (aio_stat "$filename.pst") {
807 (aio_load "$filename.pst", $av) >= 0 870 (aio_load "$filename.pst", $av) >= 0
808 or return; 871 or return;
809 $av = eval { (Storable::thaw <$av>)->{objs} }; 872 $av = eval { (Storable::thaw $av)->{objs} };
810 } 873 }
811 874
875 warn sprintf "loading %s (%d)\n",
876 $filename, length $data, scalar @{$av || []};#d#
812 return ($data, $av); 877 return ($data, $av);
813} 878}
814 879
815############################################################################# 880#############################################################################
816# command handling &c 881# command handling &c
1007 1072
1008=head2 CORE EXTENSIONS 1073=head2 CORE EXTENSIONS
1009 1074
1010Functions and methods that extend core crossfire objects. 1075Functions and methods that extend core crossfire objects.
1011 1076
1077=cut
1078
1079package cf::player;
1080
1012=head3 cf::player 1081=head3 cf::player
1013 1082
1014=over 4 1083=over 4
1015 1084
1016=item cf::player::exists $login 1085=item cf::player::find $login
1017 1086
1018Returns true when the given account exists. 1087Returns the given player object, loading it if necessary (might block).
1019 1088
1020=cut 1089=cut
1021 1090
1022sub cf::player::exists($) { 1091sub playerdir($) {
1023 cf::player::find $_[0] 1092 cf::localdir
1024 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1093 . "/"
1094 . cf::playerdir
1095 . "/"
1096 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1097}
1098
1099sub path($) {
1100 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1101
1102 (playerdir $login) . "/$login.pl"
1103}
1104
1105sub find_active($) {
1106 $cf::PLAYER{$_[0]}
1107 and $cf::PLAYER{$_[0]}->active
1108 and $cf::PLAYER{$_[0]}
1109}
1110
1111sub exists($) {
1112 my ($login) = @_;
1113
1114 $cf::PLAYER{$login}
1115 or cf::sync_job { !aio_stat $login }
1116}
1117
1118sub find($) {
1119 return $cf::PLAYER{$_[0]} || do {
1120 my $login = $_[0];
1121
1122 my $guard = cf::lock_acquire "user_find:$login";
1123
1124 $cf::PLAYER{$login} ||= (load_pl path $login or return);
1125 };
1126}
1127
1128sub save($) {
1129 my ($pl) = @_;
1130
1131 return if $pl->{deny_save};
1132
1133 my $path = path $pl;
1134 my $guard = cf::lock_acquire "user_save:$path";
1135
1136 return if $pl->{deny_save};
1137
1138 IO::AIO::aio_mkdir playerdir $pl, 0770;
1139 $pl->{last_save} = $cf::RUNTIME;
1140
1141 Coro::cede;
1142 $pl->save_pl ($path);
1143 Coro::cede;
1144}
1145
1146sub new($) {
1147 my ($login) = @_;
1148
1149 my $self = create;
1150
1151 $self->ob->name ($login);
1152 $self->{deny_save} = 1;
1153
1154 $cf::PLAYER{$login} = $self;
1155
1156 $self
1157}
1158
1159sub quit_character {
1160 my ($pl) = @_;
1161
1162 $pl->{deny_save} = 1;
1163 $pl->password ("*"); # this should lock out the player until we nuked the dir
1164
1165 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1166 $pl->deactivate;
1167 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1168 $pl->ns->destroy if $pl->ns;
1169
1170 my $path = playerdir $pl;
1171 my $temp = "$path~$cf::RUNTIME~deleting~";
1172 IO::AIO::aio_rename $path, $temp, sub {
1173 delete $cf::PLAYER{$pl->ob->name};
1174 $pl->destroy;
1175
1176 IO::AIO::aio_rmtree $temp;
1177 };
1025} 1178}
1026 1179
1027=item $player->ext_reply ($msgid, $msgtype, %msg) 1180=item $player->ext_reply ($msgid, $msgtype, %msg)
1028 1181
1029Sends an ext reply to the player. 1182Sends an ext reply to the player.
1030 1183
1031=cut 1184=cut
1032 1185
1033sub cf::player::ext_reply($$$%) { 1186sub ext_reply($$$%) {
1034 my ($self, $id, %msg) = @_; 1187 my ($self, $id, %msg) = @_;
1035 1188
1036 $msg{msgid} = $id; 1189 $msg{msgid} = $id;
1037 1190
1038 $self->send ("ext " . to_json \%msg); 1191 $self->send ("ext " . cf::to_json \%msg);
1039} 1192}
1193
1194package cf;
1040 1195
1041=back 1196=back
1042 1197
1043 1198
1044=head3 cf::map 1199=head3 cf::map
1050package cf::map; 1205package cf::map;
1051 1206
1052use Fcntl; 1207use Fcntl;
1053use Coro::AIO; 1208use Coro::AIO;
1054 1209
1055our $MAX_RESET = 7200; 1210our $MAX_RESET = 3600;
1056our $DEFAULT_RESET = 3600; 1211our $DEFAULT_RESET = 3000;
1057 1212
1058sub generate_random_map { 1213sub generate_random_map {
1059 my ($path, $rmp) = @_; 1214 my ($path, $rmp) = @_;
1060 1215
1061 # mit "rum" bekleckern, nicht 1216 # mit "rum" bekleckern, nicht
1077# and all this just because we cannot iterate over 1232# and all this just because we cannot iterate over
1078# all maps in C++... 1233# all maps in C++...
1079sub change_all_map_light { 1234sub change_all_map_light {
1080 my ($change) = @_; 1235 my ($change) = @_;
1081 1236
1082 $_->change_map_light ($change) for values %cf::MAP; 1237 $_->change_map_light ($change)
1238 for grep $_->outdoor, values %cf::MAP;
1083} 1239}
1084 1240
1085sub try_load_header($) { 1241sub try_load_header($) {
1086 my ($path) = @_; 1242 my ($path) = @_;
1087 1243
1090 or return; 1246 or return;
1091 1247
1092 my $map = cf::map::new 1248 my $map = cf::map::new
1093 or return; 1249 or return;
1094 1250
1251 # for better error messages only, will be overwritten
1252 $map->path ($path);
1253
1095 $map->load_header ($path) 1254 $map->load_header ($path)
1096 or return; 1255 or return;
1097 1256
1098 $map->{load_path} = $path; 1257 $map->{load_path} = $path;
1099 1258
1100 $map 1259 $map
1101} 1260}
1102 1261
1262sub find;
1103sub find_map { 1263sub find {
1104 my ($path, $origin) = @_; 1264 my ($path, $origin) = @_;
1105 1265
1106 #warn "find_map<$path,$origin>\n";#d# 1266 #warn "find<$path,$origin>\n";#d#
1107 1267
1108 $path = new cf::path $path, $origin && $origin->path; 1268 $path = new cf::path $path, $origin && $origin->path;
1109 my $key = $path->as_string; 1269 my $key = $path->as_string;
1110 1270
1271 cf::lock_wait "map_find:$key";
1272
1111 $cf::MAP{$key} || do { 1273 $cf::MAP{$key} || do {
1274 my $guard = cf::lock_acquire "map_find:$key";
1275
1112 # do it the slow way 1276 # do it the slow way
1113 my $map = try_load_header $path->save_path; 1277 my $map = try_load_header $path->save_path;
1114 1278
1279 Coro::cede;
1280
1115 if ($map) { 1281 if ($map) {
1282 $map->last_access ((delete $map->{last_access})
1283 || $cf::RUNTIME); #d#
1116 # safety 1284 # safety
1117 $map->{instantiate_time} = $cf::RUNTIME 1285 $map->{instantiate_time} = $cf::RUNTIME
1118 if $map->{instantiate_time} > $cf::RUNTIME; 1286 if $map->{instantiate_time} > $cf::RUNTIME;
1119 } else { 1287 } else {
1120 if (my $rmp = $path->random_map_params) { 1288 if (my $rmp = $path->random_map_params) {
1125 1293
1126 $map or return; 1294 $map or return;
1127 1295
1128 $map->{load_original} = 1; 1296 $map->{load_original} = 1;
1129 $map->{instantiate_time} = $cf::RUNTIME; 1297 $map->{instantiate_time} = $cf::RUNTIME;
1298 $map->last_access ($cf::RUNTIME);
1130 $map->instantiate; 1299 $map->instantiate;
1131 1300
1132 # per-player maps become, after loading, normal maps 1301 # per-player maps become, after loading, normal maps
1133 $map->per_player (0) if $path->{user_rel}; 1302 $map->per_player (0) if $path->{user_rel};
1134 } 1303 }
1135 1304
1136 $map->path ($key); 1305 $map->path ($key);
1137 $map->{path} = $path; 1306 $map->{path} = $path;
1138 $map->last_access ($cf::RUNTIME); 1307 $map->{last_save} = $cf::RUNTIME;
1308
1309 Coro::cede;
1139 1310
1140 if ($map->should_reset) { 1311 if ($map->should_reset) {
1141 $map->reset; 1312 $map->reset;
1313 undef $guard;
1142 $map = find_map $path; 1314 $map = find $path
1315 or return;
1143 } 1316 }
1144 1317
1145 $cf::MAP{$key} = $map 1318 $cf::MAP{$key} = $map
1146 } 1319 }
1147} 1320}
1148 1321
1149sub load { 1322sub load {
1150 my ($self) = @_; 1323 my ($self) = @_;
1151 1324
1325 my $path = $self->{path};
1326 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1327
1152 return if $self->in_memory != cf::MAP_SWAPPED; 1328 return if $self->in_memory != cf::MAP_SWAPPED;
1153 1329
1154 $self->in_memory (cf::MAP_LOADING); 1330 $self->in_memory (cf::MAP_LOADING);
1155
1156 my $path = $self->{path};
1157 1331
1158 $self->alloc; 1332 $self->alloc;
1159 $self->load_objects ($self->{load_path}, 1) 1333 $self->load_objects ($self->{load_path}, 1)
1160 or return; 1334 or return;
1161 1335
1167 if (aio_open $uniq, O_RDONLY, 0) { 1341 if (aio_open $uniq, O_RDONLY, 0) {
1168 $self->clear_unique_items; 1342 $self->clear_unique_items;
1169 $self->load_objects ($uniq, 0); 1343 $self->load_objects ($uniq, 0);
1170 } 1344 }
1171 } 1345 }
1346
1347 Coro::cede;
1172 1348
1173 # now do the right thing for maps 1349 # now do the right thing for maps
1174 $self->link_multipart_objects; 1350 $self->link_multipart_objects;
1175 1351
1176 if ($self->{path}->is_style_map) { 1352 if ($self->{path}->is_style_map) {
1184 $self->difficulty ($self->estimate_difficulty) 1360 $self->difficulty ($self->estimate_difficulty)
1185 unless $self->difficulty; 1361 unless $self->difficulty;
1186 $self->activate; 1362 $self->activate;
1187 } 1363 }
1188 1364
1365 Coro::cede;
1366
1189 $self->in_memory (cf::MAP_IN_MEMORY); 1367 $self->in_memory (cf::MAP_IN_MEMORY);
1190} 1368}
1191 1369
1192sub load_map_sync { 1370sub find_sync {
1193 my ($path, $origin) = @_; 1371 my ($path, $origin) = @_;
1194 1372
1195 #warn "load_map_sync<$path, $origin>\n";#d# 1373 cf::sync_job { cf::map::find $path, $origin }
1374}
1196 1375
1197 cf::sync_job { 1376sub do_load_sync {
1198 my $map = cf::map::find_map $path, $origin 1377 my ($map) = @_;
1199 or return; 1378
1200 $map->load; 1379 cf::sync_job { $map->load };
1201 $map
1202 }
1203} 1380}
1204 1381
1205sub save { 1382sub save {
1206 my ($self) = @_; 1383 my ($self) = @_;
1207 1384
1385 my $lock = cf::lock_acquire "map_data:" . $self->path;
1386
1387 $self->{last_save} = $cf::RUNTIME;
1388
1389 return unless $self->dirty;
1390
1208 my $save = $self->{path}->save_path; utf8::encode $save; 1391 my $save = $self->{path}->save_path; utf8::encode $save;
1209 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1392 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1210 1393
1211 $self->{last_save} = $cf::RUNTIME;
1212
1213 return unless $self->dirty;
1214
1215 $self->{load_path} = $save; 1394 $self->{load_path} = $save;
1216 1395
1217 return if $self->{deny_save}; 1396 return if $self->{deny_save};
1397
1398 local $self->{last_access} = $self->last_access;#d#
1399
1400 cf::async {
1401 $_->contr->save for $self->players;
1402 };
1218 1403
1219 if ($uniq) { 1404 if ($uniq) {
1220 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1405 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1221 $self->save_objects ($uniq, cf::IO_UNIQUES); 1406 $self->save_objects ($uniq, cf::IO_UNIQUES);
1222 } else { 1407 } else {
1225} 1410}
1226 1411
1227sub swap_out { 1412sub swap_out {
1228 my ($self) = @_; 1413 my ($self) = @_;
1229 1414
1415 # save first because save cedes
1416 $self->save;
1417
1418 my $lock = cf::lock_acquire "map_data:" . $self->path;
1419
1230 return if $self->players; 1420 return if $self->players;
1231 return if $self->in_memory != cf::MAP_IN_MEMORY; 1421 return if $self->in_memory != cf::MAP_IN_MEMORY;
1232 return if $self->{deny_save}; 1422 return if $self->{deny_save};
1233 1423
1234 $self->save;
1235 $self->clear; 1424 $self->clear;
1236 $self->in_memory (cf::MAP_SWAPPED); 1425 $self->in_memory (cf::MAP_SWAPPED);
1237} 1426}
1238 1427
1239sub reset_at { 1428sub reset_at {
1240 my ($self) = @_; 1429 my ($self) = @_;
1241 1430
1242 # TODO: safety, remove and allow resettable per-player maps 1431 # TODO: safety, remove and allow resettable per-player maps
1243 return 1e100 if $self->{path}{user_rel}; 1432 return 1e99 if $self->{path}{user_rel};
1244 return 1e100 if $self->{deny_reset}; 1433 return 1e99 if $self->{deny_reset};
1245 1434
1246 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1435 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1247 my $to = $self->reset_timeout || $DEFAULT_RESET; 1436 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1248 $to = $MAX_RESET if $to > $MAX_RESET;
1249 1437
1250 $time + $to 1438 $time + $to
1251} 1439}
1252 1440
1253sub should_reset { 1441sub should_reset {
1262 utf8::encode (my $save = $self->{path}->save_path); 1450 utf8::encode (my $save = $self->{path}->save_path);
1263 aioreq_pri 3; IO::AIO::aio_unlink $save; 1451 aioreq_pri 3; IO::AIO::aio_unlink $save;
1264 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst"; 1452 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1265} 1453}
1266 1454
1455sub rename {
1456 my ($self, $new_path) = @_;
1457
1458 $self->unlink_save;
1459
1460 delete $cf::MAP{$self->path};
1461 $self->{path} = new cf::path $new_path;
1462 $self->path ($self->{path}->as_string);
1463 $cf::MAP{$self->path} = $self;
1464
1465 $self->save;
1466}
1467
1267sub reset { 1468sub reset {
1268 my ($self) = @_; 1469 my ($self) = @_;
1269 1470
1471 my $lock = cf::lock_acquire "map_data:" . $self->path;
1472
1270 return if $self->players; 1473 return if $self->players;
1271 return if $self->{path}{user_rel};#d# 1474 return if $self->{path}{user_rel};#d#
1272 1475
1273 warn "resetting map ", $self->path;#d# 1476 warn "resetting map ", $self->path;#d#
1274 1477
1278 1481
1279 $self->unlink_save; 1482 $self->unlink_save;
1280 $self->destroy; 1483 $self->destroy;
1281} 1484}
1282 1485
1486my $nuke_counter = "aaaa";
1487
1488sub nuke {
1489 my ($self) = @_;
1490
1491 $self->{deny_save} = 1;
1492 $self->reset_timeout (1);
1493 $self->rename ("{nuke}/" . ($nuke_counter++));
1494 $self->reset; # polite request, might not happen
1495}
1496
1283sub customise_for { 1497sub customise_for {
1284 my ($map, $ob) = @_; 1498 my ($map, $ob) = @_;
1285 1499
1286 if ($map->per_player) { 1500 if ($map->per_player) {
1287 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1501 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1288 } 1502 }
1289 1503
1290 $map 1504 $map
1291} 1505}
1292 1506
1293sub emergency_save { 1507sub emergency_save {
1294 local $cf::FREEZE = 1; 1508 my $freeze_guard = cf::freeze_mainloop;
1295 1509
1296 warn "enter emergency map save\n"; 1510 warn "enter emergency perl save\n";
1297 1511
1298 cf::sync_job { 1512 cf::sync_job {
1513 warn "begin emergency player save\n";
1514 $_->save for values %cf::PLAYER;
1515 warn "end emergency player save\n";
1516
1299 warn "begin emergency map save\n"; 1517 warn "begin emergency map save\n";
1300 $_->save for values %cf::MAP; 1518 $_->save for values %cf::MAP;
1519 warn "end emergency map save\n";
1301 }; 1520 };
1302 1521
1303 warn "end emergency map save\n"; 1522 warn "leave emergency perl save\n";
1304} 1523}
1305 1524
1306package cf; 1525package cf;
1307 1526
1308=back 1527=back
1350 (ref $cf::CFG{"may_$access"} 1569 (ref $cf::CFG{"may_$access"}
1351 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 1570 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
1352 : $cf::CFG{"may_$access"}) 1571 : $cf::CFG{"may_$access"})
1353} 1572}
1354 1573
1574=item $player_object->enter_link
1575
1576Freezes the player and moves him/her to a special map (C<{link}>).
1577
1578The player should be reaosnably safe there for short amounts of time. You
1579I<MUST> call C<leave_link> as soon as possible, though.
1580
1581=item $player_object->leave_link ($map, $x, $y)
1582
1583Moves the player out of the specila link map onto the given map. If the
1584map is not valid (or omitted), the player will be moved back to the
1585location he/she was before the call to C<enter_link>, or, if that fails,
1586to the emergency map position.
1587
1588Might block.
1589
1590=cut
1591
1355sub cf::object::player::enter_link { 1592sub cf::object::player::enter_link {
1356 my ($self) = @_; 1593 my ($self) = @_;
1357 1594
1595 $self->deactivate_recursive;
1596
1358 return if $self->map == $LINK_MAP; 1597 return if $self->map == $LINK_MAP;
1359 1598
1360 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1599 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1361 if $self->map; 1600 if $self->map;
1362 1601
1363 $self->enter_map ($LINK_MAP, 20, 20); 1602 $self->enter_map ($LINK_MAP, 20, 20);
1364 $self->deactivate_recursive;
1365} 1603}
1366 1604
1367sub cf::object::player::leave_link { 1605sub cf::object::player::leave_link {
1368 my ($self, $map, $x, $y) = @_; 1606 my ($self, $map, $x, $y) = @_;
1369 1607
1370 my $link_pos = delete $self->{_link_pos}; 1608 my $link_pos = delete $self->{_link_pos};
1371 1609
1372 unless ($map) { 1610 unless ($map) {
1373 $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1374
1375 # restore original map position 1611 # restore original map position
1376 ($map, $x, $y) = @{ $link_pos || [] }; 1612 ($map, $x, $y) = @{ $link_pos || [] };
1377 $map = cf::map::find_map $map; 1613 $map = cf::map::find $map;
1378 1614
1379 unless ($map) { 1615 unless ($map) {
1380 ($map, $x, $y) = @$EMERGENCY_POSITION; 1616 ($map, $x, $y) = @$EMERGENCY_POSITION;
1381 $map = cf::map::find_map $map 1617 $map = cf::map::find $map
1382 or die "FATAL: cannot load emergency map\n"; 1618 or die "FATAL: cannot load emergency map\n";
1383 } 1619 }
1384 } 1620 }
1385 1621
1386 ($x, $y) = (-1, -1) 1622 ($x, $y) = (-1, -1)
1390 ($x, $y) = ($map->enter_x, $map->enter_y) 1626 ($x, $y) = ($map->enter_x, $map->enter_y)
1391 if $x <=0 && $y <= 0; 1627 if $x <=0 && $y <= 0;
1392 1628
1393 $map->load; 1629 $map->load;
1394 1630
1631 return unless $self->contr->active;
1395 $self->activate_recursive; 1632 $self->activate_recursive;
1396 $self->enter_map ($map, $x, $y); 1633 $self->enter_map ($map, $x, $y);
1397} 1634}
1398 1635
1636cf::player->attach (
1637 on_logout => sub {
1638 my ($pl) = @_;
1639
1640 # abort map switching before logout
1641 if ($pl->ob->{_link_pos}) {
1642 cf::sync_job {
1643 $pl->ob->leave_link
1644 };
1645 }
1646 },
1647 on_login => sub {
1648 my ($pl) = @_;
1649
1650 # try to abort aborted map switching on player login :)
1651 # should happen only on crashes
1652 if ($pl->ob->{_link_pos}) {
1653 $pl->ob->enter_link;
1654 (async {
1655 # we need this sleep as the login has a concurrent enter_exit running
1656 # and this sleep increases chances of the player not ending up in scorn
1657 $pl->ob->reply (undef,
1658 "There was an internal problem at your last logout, "
1659 . "the server will try to bring you to your intended destination in a second.",
1660 cf::NDI_RED);
1661 Coro::Timer::sleep 1;
1662 $pl->ob->leave_link;
1663 })->prio (2);
1664 }
1665 },
1666);
1667
1399=item $player_object->goto_map ($map, $x, $y) 1668=item $player_object->goto ($path, $x, $y)
1400 1669
1401=cut 1670=cut
1402 1671
1403sub cf::object::player::goto_map { 1672sub cf::object::player::goto {
1404 my ($self, $path, $x, $y) = @_; 1673 my ($self, $path, $x, $y) = @_;
1405 1674
1406 $self->enter_link; 1675 $self->enter_link;
1407 1676
1408 (Coro::async { 1677 (async {
1409 $path = new cf::path $path; 1678 $path = new cf::path $path;
1410 1679
1411 my $map = cf::map::find_map $path->as_string; 1680 my $map = cf::map::find $path->as_string;
1412 $map = $map->customise_for ($self) if $map; 1681 $map = $map->customise_for ($self) if $map;
1413 1682
1414 warn "entering ", $map->path, " at ($x, $y)\n" 1683# warn "entering ", $map->path, " at ($x, $y)\n"
1415 if $map; 1684# if $map;
1685
1686 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1416 1687
1417 $self->leave_link ($map, $x, $y); 1688 $self->leave_link ($map, $x, $y);
1418 })->prio (1); 1689 })->prio (1);
1419} 1690}
1420 1691
1473 1744
1474 return unless $self->type == cf::PLAYER; 1745 return unless $self->type == cf::PLAYER;
1475 1746
1476 $self->enter_link; 1747 $self->enter_link;
1477 1748
1478 (Coro::async { 1749 (async {
1750 $self->deactivate_recursive; # just to be sure
1479 unless (eval { 1751 unless (eval {
1480
1481 prepare_random_map $exit 1752 prepare_random_map $exit
1482 if $exit->slaying eq "/!"; 1753 if $exit->slaying eq "/!";
1483 1754
1484 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1755 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1485 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1756 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1486 1757
1487 1; 1758 1;
1488 }) { 1759 }) {
1489 $self->message ("Something went wrong deep within the crossfire server. " 1760 $self->message ("Something went wrong deep within the crossfire server. "
1490 . "I'll try to bring you back to the map you were before. " 1761 . "I'll try to bring you back to the map you were before. "
1547 on_reply => sub { 1818 on_reply => sub {
1548 my ($ns, $msg) = @_; 1819 my ($ns, $msg) = @_;
1549 1820
1550 # this weird shuffling is so that direct followup queries 1821 # this weird shuffling is so that direct followup queries
1551 # get handled first 1822 # get handled first
1552 my $queue = delete $ns->{query_queue}; 1823 my $queue = delete $ns->{query_queue}
1824 or return; # be conservative, not sure how that can happen, but we saw a crash here
1553 1825
1554 (shift @$queue)->[1]->($msg); 1826 (shift @$queue)->[1]->($msg);
1555 1827
1556 push @{ $ns->{query_queue} }, @$queue; 1828 push @{ $ns->{query_queue} }, @$queue;
1557 1829
1563 } 1835 }
1564 } 1836 }
1565 }, 1837 },
1566); 1838);
1567 1839
1568=item $client->coro (\&cb) 1840=item $client->async (\&cb)
1569 1841
1570Create a new coroutine, running the specified callback. The coroutine will 1842Create a new coroutine, running the specified callback. The coroutine will
1571be automatically cancelled when the client gets destroyed (e.g. on logout, 1843be automatically cancelled when the client gets destroyed (e.g. on logout,
1572or loss of connection). 1844or loss of connection).
1573 1845
1574=cut 1846=cut
1575 1847
1576sub cf::client::coro { 1848sub cf::client::async {
1577 my ($self, $cb) = @_; 1849 my ($self, $cb) = @_;
1578 1850
1579 my $coro; $coro = async { 1851 my $coro = &Coro::async ($cb);
1580 eval {
1581 $cb->();
1582 };
1583 warn $@ if $@;
1584 };
1585 1852
1586 $coro->on_destroy (sub { 1853 $coro->on_destroy (sub {
1587 delete $self->{_coro}{$coro+0}; 1854 delete $self->{_coro}{$coro+0};
1588 }); 1855 });
1589 1856
1761 2028
1762{ 2029{
1763 my $path = cf::localdir . "/database.pst"; 2030 my $path = cf::localdir . "/database.pst";
1764 2031
1765 sub db_load() { 2032 sub db_load() {
1766 warn "loading database $path\n";#d# remove later
1767 $DB = stat $path ? Storable::retrieve $path : { }; 2033 $DB = stat $path ? Storable::retrieve $path : { };
1768 } 2034 }
1769 2035
1770 my $pid; 2036 my $pid;
1771 2037
1772 sub db_save() { 2038 sub db_save() {
1773 warn "saving database $path\n";#d# remove later
1774 waitpid $pid, 0 if $pid; 2039 waitpid $pid, 0 if $pid;
1775 if (0 == ($pid = fork)) { 2040 if (0 == ($pid = fork)) {
1776 $DB->{_meta}{version} = 1; 2041 $DB->{_meta}{version} = 1;
1777 Storable::nstore $DB, "$path~"; 2042 Storable::nstore $DB, "$path~";
1778 rename "$path~", $path; 2043 rename "$path~", $path;
1826 open my $fh, "<:utf8", cf::confdir . "/config" 2091 open my $fh, "<:utf8", cf::confdir . "/config"
1827 or return; 2092 or return;
1828 2093
1829 local $/; 2094 local $/;
1830 *CFG = YAML::Syck::Load <$fh>; 2095 *CFG = YAML::Syck::Load <$fh>;
2096
2097 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2098
2099 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2100 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2101
2102 if (exists $CFG{mlockall}) {
2103 eval {
2104 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2105 and die "WARNING: m(un)lockall failed: $!\n";
2106 };
2107 warn $@ if $@;
2108 }
1831} 2109}
1832 2110
1833sub main { 2111sub main {
1834 # we must not ever block the main coroutine 2112 # we must not ever block the main coroutine
1835 local $Coro::idle = sub { 2113 local $Coro::idle = sub {
1836 Carp::cluck "FATAL: Coro::idle was called, major BUG\n";#d# 2114 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1837 (Coro::unblock_sub {
1838 Event::one_event; 2115 async { Event::one_event };
1839 })->();
1840 }; 2116 };
1841 2117
1842 cfg_load; 2118 cfg_load;
1843 db_load; 2119 db_load;
1844 load_extensions; 2120 load_extensions;
1855 return; 2131 return;
1856 } 2132 }
1857 2133
1858 warn "reloading..."; 2134 warn "reloading...";
1859 2135
1860 local $FREEZE = 1; 2136 my $guard = freeze_mainloop;
1861 cf::emergency_save; 2137 cf::emergency_save;
1862 2138
1863 eval { 2139 eval {
1864 # if anything goes wrong in here, we should simply crash as we already saved 2140 # if anything goes wrong in here, we should simply crash as we already saved
1865 2141
1927 cf::load_extensions; 2203 cf::load_extensions;
1928 2204
1929 # reattach attachments to objects 2205 # reattach attachments to objects
1930 warn "reattach"; 2206 warn "reattach";
1931 _global_reattach; 2207 _global_reattach;
2208 reattach $_ for values %MAP;
1932 }; 2209 };
1933 2210
1934 if ($@) { 2211 if ($@) {
1935 warn $@; 2212 warn $@;
1936 warn "error while reloading, exiting."; 2213 warn "error while reloading, exiting.";
1952 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2229 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
1953 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2230 $LINK_MAP->in_memory (MAP_IN_MEMORY);
1954 2231
1955 # dirty hack because... archetypes are not yet loaded 2232 # dirty hack because... archetypes are not yet loaded
1956 Event->timer ( 2233 Event->timer (
1957 after => 2, 2234 after => 10,
1958 cb => sub { 2235 cb => sub {
1959 $_[0]->w->cancel; 2236 $_[0]->w->cancel;
1960 2237
1961 # provide some exits "home" 2238 # provide some exits "home"
1962 my $exit = cf::object::new "exit"; 2239 my $exit = cf::object::new "exit";
2001 reentrant => 0, 2278 reentrant => 0,
2002 prio => 0, 2279 prio => 0,
2003 at => $NEXT_TICK || $TICK, 2280 at => $NEXT_TICK || $TICK,
2004 data => WF_AUTOCANCEL, 2281 data => WF_AUTOCANCEL,
2005 cb => sub { 2282 cb => sub {
2006 unless ($FREEZE) {
2007 cf::server_tick; # one server iteration 2283 cf::server_tick; # one server iteration
2008 $RUNTIME += $TICK; 2284 $RUNTIME += $TICK;
2009 }
2010
2011 $NEXT_TICK += $TICK; 2285 $NEXT_TICK += $TICK;
2012 2286
2013 # if we are delayed by four ticks or more, skip them all 2287 # if we are delayed by four ticks or more, skip them all
2014 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2288 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2015 2289
2038 or warn "ERROR: unable to write runtime file: $!"; 2312 or warn "ERROR: unable to write runtime file: $!";
2039 })->(); 2313 })->();
2040 }, 2314 },
2041); 2315);
2042 2316
2317END { cf::emergency_save }
2318
20431 23191
2044 2320

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines