Skip to contentSkip to conversation

statinfo.h: move DTYPE defines from dir.h

PATCH In review Aleajndro R Sedeño 4 participants 12 messages Jun 2, 2023 – Jun 12, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 statinfo.h: move DTYPE defines from dir.h

From: Alejandro R. Sedeño <[email protected]>

These definitions are used in cache.h, which can't include dir.h without causing name-info.cc to have two definitions of struct dir_entry.

Both dir.h and cache.h include statinfo.h, and this seems a reasonable place for these definitions.

This change fixes a broken build issue on old SunOS.

---
 dir.h      | 14 --------------
 statinfo.h | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 14 deletions(-)
dir.h +0 -14
index 79b85a01ee..d65a40126c 100644
@@ -641,18 +641,4 @@ static inline int starts_with_dot_dot_slash_native(const char *const path)
 	return path_match_flags(path, what | PATH_MATCH_NATIVE);
 }
 
-#if defined(DT_UNKNOWN) && !defined(NO_D_TYPE_IN_DIRENT)
-#define DTYPE(de)	((de)->d_type)
-#else
-#undef DT_UNKNOWN
-#undef DT_DIR
-#undef DT_REG
-#undef DT_LNK
-#define DT_UNKNOWN	0
-#define DT_DIR		1
-#define DT_REG		2
-#define DT_LNK		3
-#define DTYPE(de)	DT_UNKNOWN
-#endif
-
 #endif
statinfo.h +14 -0
index e49e3054ea..fe8df633a4 100644
@@ -21,4 +21,18 @@ struct stat_data {
 	unsigned int sd_size;
 };
 
+#if defined(DT_UNKNOWN) && !defined(NO_D_TYPE_IN_DIRENT)
+#define DTYPE(de)	((de)->d_type)
+#else
+#undef DT_UNKNOWN
+#undef DT_DIR
+#undef DT_REG
+#undef DT_LNK
+#define DT_UNKNOWN	0
+#define DT_DIR		1
+#define DT_REG		2
+#define DT_LNK		3
+#define DTYPE(de)	DT_UNKNOWN
+#endif
+
 #endif
Signature · 1 line
2.41.0.rc2.161.g9c6817b8e7-goog
#1 lore raw

And today is the day I notice I misspelled my name in my git sendmail config at work. Cool. (Fixed.)

-Alejandro

Quoted 68 lines · Aleajndro R Sedeño

From: Alejandro R. Sedeño <[email protected]>

These definitions are used in cache.h, which can't include dir.h without causing name-info.cc to have two definitions of struct dir_entry.

Both dir.h and cache.h include statinfo.h, and this seems a reasonable place for these definitions.

This change fixes a broken build issue on old SunOS.

---
 dir.h      | 14 --------------
 statinfo.h | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 14 deletions(-)
dir.h +0 -14
index 79b85a01ee..d65a40126c 100644
@@ -641,18 +641,4 @@ static inline int starts_with_dot_dot_slash_native(const char *const path)
        return path_match_flags(path, what | PATH_MATCH_NATIVE);
 }
 
-#if defined(DT_UNKNOWN) && !defined(NO_D_TYPE_IN_DIRENT)
-#define DTYPE(de)      ((de)->d_type)
-#else
-#undef DT_UNKNOWN
-#undef DT_DIR
-#undef DT_REG
-#undef DT_LNK
-#define DT_UNKNOWN     0
-#define DT_DIR         1
-#define DT_REG         2
-#define DT_LNK         3
-#define DTYPE(de)      DT_UNKNOWN
-#endif
-
 #endif
statinfo.h +14 -1
index e49e3054ea..fe8df633a4 100644
@@ -21,4 +21,18 @@ struct stat_data {
        unsigned int sd_size;
 };
 
+#if defined(DT_UNKNOWN) && !defined(NO_D_TYPE_IN_DIRENT)
+#define DTYPE(de)      ((de)->d_type)
+#else
+#undef DT_UNKNOWN
+#undef DT_DIR
+#undef DT_REG
+#undef DT_LNK
+#define DT_UNKNOWN     0
+#define DT_DIR         1
+#define DT_REG         2
+#define DT_LNK         3
+#define DTYPE(de)      DT_UNKNOWN
+#endif
+
 #endif
--

2.41.0.rc2.161.g9c6817b8e7-goog

#2 lore raw
In reply to Aleajndro R Sedeño
Quoted 3 lines · Aleajndro R Sedeño

These definitions are used in cache.h, which can't include dir.h without causing name-info.cc to have two definitions of struct dir_entry.

What is name-info.cc?

Quoted 7 lines

Both dir.h and cache.h include statinfo.h, and this seems a reasonable place for these definitions.

This change fixes a broken build issue on old SunOS.

#3 lore raw

That is a valid question, and it's another typo. I meant name-hash.c.

-Alejandro

Quoted 15 lines · Eric Sunshine
Quoted 3 lines · Aleajndro R Sedeño

These definitions are used in cache.h, which can't include dir.h without causing name-info.cc to have two definitions of struct dir_entry.

What is name-info.cc?

Quoted 7 lines

Both dir.h and cache.h include statinfo.h, and this seems a reasonable place for these definitions.

This change fixes a broken build issue on old SunOS.

#4 lore raw

PATCH 1/1 statinfo.h: move DTYPE defines from dir.h

From: Alejandro R. Sedeño <[email protected]>

These definitions are used in cache.h, which can't include dir.h without causing name-hash.c to have two definitions of struct dir_entry.

Both dir.h and cache.h include statinfo.h, and this seems a reasonable place for these definitions.

This change fixes a broken build issue on old SunOS.

---
 dir.h      | 14 --------------
 statinfo.h | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 14 deletions(-)
dir.h +0 -14
index 79b85a01ee..d65a40126c 100644
@@ -641,18 +641,4 @@ static inline int starts_with_dot_dot_slash_native(const char *const path)
 	return path_match_flags(path, what | PATH_MATCH_NATIVE);
 }
 
-#if defined(DT_UNKNOWN) && !defined(NO_D_TYPE_IN_DIRENT)
-#define DTYPE(de)	((de)->d_type)
-#else
-#undef DT_UNKNOWN
-#undef DT_DIR
-#undef DT_REG
-#undef DT_LNK
-#define DT_UNKNOWN	0
-#define DT_DIR		1
-#define DT_REG		2
-#define DT_LNK		3
-#define DTYPE(de)	DT_UNKNOWN
-#endif
-
 #endif
statinfo.h +14 -0
index e49e3054ea..fe8df633a4 100644
@@ -21,4 +21,18 @@ struct stat_data {
 	unsigned int sd_size;
 };
 
+#if defined(DT_UNKNOWN) && !defined(NO_D_TYPE_IN_DIRENT)
+#define DTYPE(de)	((de)->d_type)
+#else
+#undef DT_UNKNOWN
+#undef DT_DIR
+#undef DT_REG
+#undef DT_LNK
+#define DT_UNKNOWN	0
+#define DT_DIR		1
+#define DT_REG		2
+#define DT_LNK		3
+#define DTYPE(de)	DT_UNKNOWN
+#endif
+
 #endif
Signature · 1 line
2.41.0.rc2.161.g9c6817b8e7-goog
Reviewed-by on v1 1/1
#5 lore raw
Quoted 6 lines · Alejandro R Sedeño

From: Alejandro R. Sedeño <[email protected]>

These definitions are used in cache.h, which can't include dir.h without causing name-hash.c to have two definitions of struct dir_entry.

...are _currently_ used in cache.h (your commit message is fine, just pointing it out for below...)

Quoted 4 lines

Both dir.h and cache.h include statinfo.h, and this seems a reasonable place for these definitions.

This change fixes a broken build issue on old SunOS.

Maintainer note for Junio: en/header-split-cache-h-part-3 moves the inline functions in cache.h that use the DT_* defines, but that series should both textually and semantically merge cleanly with this change. (Just noting this for your peace of mind.)

After en/header-split-cache-h-part-3 merges down, I might opt for a different fix (I'm still mulling it over), but that other fix isn't possible until cache.h is split up more. Alejandro's fix is the cleanest interim solution I can think of.

#6 lore raw
In reply to Alejandro R Sedeño
Quoted 6 lines · Alejandro R Sedeño

From: Alejandro R. Sedeño <[email protected]>

These definitions are used in cache.h, which can't include dir.h without causing name-hash.c to have two definitions of struct dir_entry.

Quoted 7 lines

Both dir.h and cache.h include statinfo.h, and this seems a reasonable place for these definitions.

This change fixes a broken build issue on old SunOS.

This is a bit unusual; do you want to publish both names (I am assuming that they are the same single person)?

I thought somebody in the earlier discussion identified the topic that was problematic by bisecting. It is a shame to lose that. Perhaps it is a good idea to rephrase the beginning of the proposed commit log message to mention that, like

592fc5b3 (dir.h: move DTYPE defines from cache.h, 2023-04-22) moved DTYPE macros from cache.h to dir.h, but are still used by cache.h to implement ce_to_dtype(); but cache.h cannot include dir.h because ...

or something?

Why does name-hash.c end up with two definitions? Aren't we properly guarding against multiple inclusions with

    #ifndef __DIR_H__
    #define __DIR_H__
	...
    struct dir_entry {
	...
    };
    #endif

or is there something funny going on?

Thanks.

#7 lore raw
Quoted 12 lines · Junio C Hamano

Why does name-hash.c end up with two definitions? Aren't we properly guarding against multiple inclusions with

    #ifndef __DIR_H__
    #define __DIR_H__
        ...
    struct dir_entry {
        ...
    };
    #endif
Quoted 1 line

or is there something funny going on?

There are two _different_ things named "struct dir_entry" in the codebase:

dir.h:struct dir_entry {
dir.h- unsigned int len;
dir.h- char name[FLEX_ARRAY]; /* more */
dir.h-};
--
name-hash.c:struct dir_entry {

name-hash.c-    struct hashmap_entry ent;
name-hash.c-    struct dir_entry *parent;
name-hash.c-    int nr;
name-hash.c-    unsigned int namelen;
name-hash.c-    char name[FLEX_ARRAY];

name-hash.c-};

So, name-hash.c cannot include anything that includes dir.h.

#8 lore raw
Quoted 1 line · Elijah Newren

There are two _different_ things named "struct dir_entry" in the codebase:

In the longer term, we should rename such a local type to avoid name clashes with the global one. But I of course am OK to leave it outside the topic to clean it up.

In any case, it is worth saying in the proposed log message why name-hash cannot use cache.h if we make it include dir.h; it is easy to do so (i.e. "it has its own 'dir_entry' that is used for other purpose").

Thanks.

#9 lore raw
In reply to Junio C Hamano

Sorry for the dupes; resending as plain-text as per list requirements.

Quoted 6 lines · Junio C Hamano
Quoted 3 lines · Alejandro R Sedeño

…

They are both me; it's my way of sticking with my historical personal address and still attaching my work address for work reasons.

Quoted 6 lines

This is a bit unusual; do you want to publish both names (I am assuming that they are the same single person)?

I thought somebody in the earlier discussion identified the topic that was problematic by bisecting. It is a shame to lose that.

I identified it earlier, by inspection because the machine I build on is slow and this was easy to track down.

Quoted 9 lines

Perhaps it is a good idea to rephrase the beginning of the proposed commit log message to mention that, like

592fc5b3 (dir.h: move DTYPE defines from cache.h, 2023-04-22) moved DTYPE macros from cache.h to dir.h, but are still used by cache.h to implement ce_to_dtype(); but cache.h cannot include dir.h because ...

or something?

Happy to rephrase.

-Alejandro

#10 lore raw

PATCH 1/1 statinfo.h: move DTYPE defines from dir.h

In reply to Junio C Hamano

From: Alejandro R. Sedeño <[email protected]>

592fc5b3 (dir.h: move DTYPE defines from cache.h, 2023-04-22) moved DTYPE macros from cache.h to dir.h, but they are still used by cache.h to implement ce_to_dtype(); cache.h cannot include dir.h because that would cause name-hash.c to have two different and conflicting definitions of struct dir_entry. (That should be separately fixed.)

Both dir.h and cache.h include statinfo.h, and this seems a reasonable place for these definitions.

This change fixes a broken build issue on old SunOS.

---
 dir.h      | 14 --------------
 statinfo.h | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 14 deletions(-)
dir.h +0 -14
index 79b85a01ee..d65a40126c 100644
@@ -641,18 +641,4 @@ static inline int starts_with_dot_dot_slash_native(const char *const path)
 	return path_match_flags(path, what | PATH_MATCH_NATIVE);
 }
 
-#if defined(DT_UNKNOWN) && !defined(NO_D_TYPE_IN_DIRENT)
-#define DTYPE(de)	((de)->d_type)
-#else
-#undef DT_UNKNOWN
-#undef DT_DIR
-#undef DT_REG
-#undef DT_LNK
-#define DT_UNKNOWN	0
-#define DT_DIR		1
-#define DT_REG		2
-#define DT_LNK		3
-#define DTYPE(de)	DT_UNKNOWN
-#endif
-
 #endif
statinfo.h +14 -0
index e49e3054ea..fe8df633a4 100644
@@ -21,4 +21,18 @@ struct stat_data {
 	unsigned int sd_size;
 };
 
+#if defined(DT_UNKNOWN) && !defined(NO_D_TYPE_IN_DIRENT)
+#define DTYPE(de)	((de)->d_type)
+#else
+#undef DT_UNKNOWN
+#undef DT_DIR
+#undef DT_REG
+#undef DT_LNK
+#define DT_UNKNOWN	0
+#define DT_DIR		1
+#define DT_REG		2
+#define DT_LNK		3
+#define DTYPE(de)	DT_UNKNOWN
+#endif
+
 #endif
Signature · 1 line
2.41.0.rc2.161.g9c6817b8e7-goog
#11 lore raw
Quoted 11 lines · Alejandro R Sedeño

From: Alejandro R. Sedeño <[email protected]>

592fc5b3 (dir.h: move DTYPE defines from cache.h, 2023-04-22) moved DTYPE macros from cache.h to dir.h, but they are still used by cache.h to implement ce_to_dtype(); cache.h cannot include dir.h because that would cause name-hash.c to have two different and conflicting definitions of struct dir_entry. (That should be separately fixed.)

Both dir.h and cache.h include statinfo.h, and this seems a reasonable place for these definitions.

Quoted 8 lines

This change fixes a broken build issue on old SunOS.

---
 dir.h      | 14 --------------
 statinfo.h | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 14 deletions(-)

Thanks. Looking great.

Quoted 46 lines
dir.h +0 -14
index 79b85a01ee..d65a40126c 100644
@@ -641,18 +641,4 @@ static inline int starts_with_dot_dot_slash_native(const char *const path)
 	return path_match_flags(path, what | PATH_MATCH_NATIVE);
 }
 
-#if defined(DT_UNKNOWN) && !defined(NO_D_TYPE_IN_DIRENT)
-#define DTYPE(de)	((de)->d_type)
-#else
-#undef DT_UNKNOWN
-#undef DT_DIR
-#undef DT_REG
-#undef DT_LNK
-#define DT_UNKNOWN	0
-#define DT_DIR		1
-#define DT_REG		2
-#define DT_LNK		3
-#define DTYPE(de)	DT_UNKNOWN
-#endif
-
 #endif
statinfo.h +14 -0
index e49e3054ea..fe8df633a4 100644
@@ -21,4 +21,18 @@ struct stat_data {
 	unsigned int sd_size;
 };
 
+#if defined(DT_UNKNOWN) && !defined(NO_D_TYPE_IN_DIRENT)
+#define DTYPE(de)	((de)->d_type)
+#else
+#undef DT_UNKNOWN
+#undef DT_DIR
+#undef DT_REG
+#undef DT_LNK
+#define DT_UNKNOWN	0
+#define DT_DIR		1
+#define DT_REG		2
+#define DT_LNK		3
+#define DTYPE(de)	DT_UNKNOWN
+#endif
+
 #endif